Skip to content

Commit f934be4

Browse files
committed
11.6.7
1 parent e1e9c85 commit f934be4

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/Midjourney.API/Controllers/SubmitController.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ public async Task<ActionResult<SubmitResultVO>> Imagine([FromBody] SubmitImagine
151151

152152
task.Action = TaskAction.IMAGINE;
153153
task.Prompt = prompt;
154+
task.PromptEn = prompt;
154155
task.BotType = GetBotType(imagineDTO.BotType);
155156

156157
// 转换 --niji 为 Niji Bot
@@ -184,7 +185,6 @@ public async Task<ActionResult<SubmitResultVO>> Imagine([FromBody] SubmitImagine
184185
return Ok(SubmitResultVO.Fail(ReturnCode.VALIDATION_ERROR, "base64格式错误"));
185186
}
186187

187-
task.PromptEn = string.Empty;
188188
task.Description = $"/imagine {prompt}";
189189

190190
NewTaskDoFilter(task, imagineDTO.AccountFilter);
@@ -351,6 +351,7 @@ public async Task<ActionResult<SubmitResultVO>> Shorten([FromBody] SubmitImagine
351351

352352
var prompt = dto.Prompt;
353353
task.Prompt = prompt;
354+
task.PromptEn = prompt;
354355

355356
//var promptEn = TranslatePrompt(prompt, task.RealBotType ?? task.BotType);
356357
//try
@@ -364,7 +365,6 @@ public async Task<ActionResult<SubmitResultVO>> Shorten([FromBody] SubmitImagine
364365
// .SetProperty("bannedWord", e.Message));
365366
//}
366367

367-
task.PromptEn = string.Empty;
368368
task.Description = $"/shorten {prompt}";
369369

370370
NewTaskDoFilter(task, dto.AccountFilter);
@@ -750,7 +750,7 @@ public async Task<ActionResult<SubmitResultVO>> Modal([FromBody] SubmitModalDTO
750750
}
751751

752752
task.Prompt = prompt;
753-
task.PromptEn = string.Empty;
753+
task.PromptEn = prompt;
754754

755755
// 提交 modal 指示为 true
756756
task.RemixAutoSubmit = true;
@@ -824,7 +824,7 @@ public async Task<ActionResult<SubmitResultVO>> Edits([FromBody] SubmitEditsDTO
824824
task.Action = TaskAction.EDIT;
825825
task.Description = $"/edit {editsDTO.Prompt}";
826826
task.Prompt = editsDTO.Prompt;
827-
task.PromptEn = string.Empty;
827+
task.PromptEn = editsDTO.Prompt;
828828

829829
NewTaskDoFilter(task, editsDTO.AccountFilter);
830830

@@ -894,7 +894,7 @@ public async Task<ActionResult<SubmitResultVO>> Retexture([FromBody] SubmitEdits
894894
task.Action = TaskAction.RETEXTURE;
895895
task.Description = $"/retexture {editsDTO.Prompt}";
896896
task.Prompt = editsDTO.Prompt;
897-
task.PromptEn = string.Empty;
897+
task.PromptEn = editsDTO.Prompt;
898898

899899
NewTaskDoFilter(task, editsDTO.AccountFilter);
900900

src/Midjourney.API/Midjourney.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
1010
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
1111
<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
12-
<AssemblyVersion>11.6.6</AssemblyVersion>
12+
<AssemblyVersion>11.6.7</AssemblyVersion>
1313
<DockerfileContext>..\..</DockerfileContext>
1414
</PropertyGroup>
1515

src/Midjourney.Services/DiscordService.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,13 +1736,11 @@ public async Task RedisQueueUpdateProgress(TaskInfoQueue queue)
17361736
// 验证默认提示词
17371737
info.Prompt = CheckBanned(info.Prompt);
17381738

1739-
// 翻译改为异步,翻译并验证英文提示词
1739+
// 如果没有英文,则设置英文
17401740
if (string.IsNullOrWhiteSpace(info.PromptEn))
17411741
{
17421742
info.PromptEn = info.Prompt;
17431743
}
1744-
1745-
info.PromptEn = TranslatePrompt(info.PromptEn, info.RealBotType ?? info.BotType);
17461744
}
17471745
catch (BannedPromptException ex)
17481746
{
@@ -1759,6 +1757,10 @@ public async Task RedisQueueUpdateProgress(TaskInfoQueue queue)
17591757
{
17601758
try
17611759
{
1760+
// 翻译
1761+
info.PromptEn = TranslatePrompt(info.PromptEn, info.RealBotType ?? info.BotType);
1762+
1763+
// 验证
17621764
info.PromptEn = CheckBanned(info.PromptEn);
17631765
}
17641766
catch (BannedPromptException ex)

0 commit comments

Comments
 (0)