Merge branch 'v0.8'

Nanjiren01 · Sep 21, 2023 · 2c59447 · 2c59447
2 parents 26d888a + f298774
commit 2c59447
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts
@@ -498,28 +498,28 @@ export class ChatGPTApi implements LLMApi {
             const entireContent =
               prefixContent + `[![${taskId}](${imgUrl})](${imgUrl})`;
             isFinished = true;
-            options.onFinish(entireContent);
 
             botMessage.attr.imgUrl = imgUrl;
             // if (statusResJson.action === "DESCRIBE" && statusResJson.prompt) {
             //     botMessage.content += `\n${statusResJson.prompt}`;
             // }
             botMessage.attr.status = "SUCCESS";
             botMessage.attr.finished = true;
+            options.onFinish(entireContent);
             break;
           }
           case 40:
             content =
               statusResJson.data.error || Locale.Midjourney.UnknownReason;
             isFinished = true;
+            botMessage.attr.status = "FAILURE";
+            botMessage.attr.finished = true;
             options.onFinish(
               prefixContent +
                 `**${
                   Locale.Midjourney.TaskStatus
                 }:** [${new Date().toLocaleString()}] - ${content}`,
             );
-            botMessage.attr.status = "FAILURE";
-            botMessage.attr.finished = true;
             break;
           case 0:
             content = Locale.Midjourney.TaskNotStart;