v5.9.6

trueai-org · Oct 18, 2024 · e22eb6d · e22eb6d
1 parent 1be3a12
commit e22eb6d
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -88,6 +88,7 @@ The most powerful, complete, full-featured, completely free and open source Midj
 - [x] 支持视频换脸，请遵守相关法律法规，不得用于违法用途
 - [x] 支持自动切换到慢速模式、支持自动切快速模式、支持自动设置慢速
 - [x] 私信 ID 免配置，服务启动时自动获取私信 ID
+- [x] 自动过 Tos not accepted 验证
 
 ## 在线预览
 

diff --git a/src/Midjourney.API/DiscordAccountInitializer.cs b/src/Midjourney.API/DiscordAccountInitializer.cs
@@ -635,6 +635,11 @@ public async Task StartCheckAccount(DiscordAccount account, bool isValidateLock
                             if (account.FastExhausted == true && account.EnableAutoSetRelax == true)
                             {
                                 account.AllowModes = new List<GenerationSpeedMode>() { GenerationSpeedMode.RELAX };
+
+                                if (account.CoreSize > 3)
+                                {
+                                    account.CoreSize = 3;
+                                }
                             }
 
                             try

diff --git a/src/Midjourney.API/wwwroot/index.html b/src/Midjourney.API/wwwroot/index.html
@@ -11,6 +11,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/umi.70f82ef5.js"></script>
+<script src="/umi.8d92f439.js"></script>
 </body>
 </html>
diff --git a/src/Midjourney.API/wwwroot/umi.70f82ef5.js → src/Midjourney.API/wwwroot/umi.8d92f439.js b/src/Midjourney.API/wwwroot/umi.70f82ef5.js → src/Midjourney.API/wwwroot/umi.8d92f439.js
diff --git a/src/Midjourney.Infrastructure/BotMessageListener.cs b/src/Midjourney.Infrastructure/BotMessageListener.cs
@@ -924,9 +924,14 @@ public void OnMessage(JsonElement raw)
                                         if (Account.FastExhausted == true && Account.EnableAutoSetRelax == true)
                                         {
                                             Account.AllowModes = new List<GenerationSpeedMode>() { GenerationSpeedMode.RELAX };
+
+                                            if (Account.CoreSize > 3)
+                                            {
+                                                Account.CoreSize = 3;
+                                            }
                                         }
 
-                                        DbHelper.AccountStore.Update("AllowModes,FastExhausted", Account);
+                                        DbHelper.AccountStore.Update("AllowModes,FastExhausted,CoreSize", Account);
                                         _discordInstance?.ClearAccountCache(Account.Id);
 
                                         // 如果开启自动切换慢速模式
@@ -1078,6 +1083,7 @@ public void OnMessage(JsonElement raw)
                                         || title.Contains("error")
                                         || title.Contains("denied"))
                                     {
+
                                         if (data.TryGetProperty("nonce", out JsonElement noneEle))
                                         {
                                             var nonce = noneEle.GetString();
@@ -1087,6 +1093,39 @@ public void OnMessage(JsonElement raw)
                                                 var task = _discordInstance.GetRunningTaskByNonce(nonce);
                                                 if (task != null)
                                                 {
+                                                    // 需要用户同意 Tos
+                                                    if (title.Contains("Tos not accepted"))
+                                                    {
+                                                        try
+                                                        {
+                                                            var tosData = data.Deserialize<EventData>();
+                                                            var customId = tosData?.Components?.SelectMany(x => x.Components)
+                                                                .Where(x => x.Label == "Accept ToS")
+                                                                .FirstOrDefault()?.CustomId;
+
+                                                            if (!string.IsNullOrWhiteSpace(customId))
+                                                            {
+                                                                var nonce2 = SnowFlake.NextId();
+                                                                var tosRes = _discordInstance.ActionAsync(id, customId, tosData.Flags, nonce2, task)
+                                                                    .ConfigureAwait(false).GetAwaiter().GetResult();
+
+                                                                if (tosRes?.Code == ReturnCode.SUCCESS)
+                                                                {
+                                                                    _logger.Information("处理 Tos 成功 {@0}", Account.ChannelId);
+                                                                    return;
+                                                                }
+                                                                else
+                                                                {
+                                                                    _logger.Information("处理 Tos 失败 {@0}, {@1}", Account.ChannelId, tosRes);
+                                                                }
+                                                            }
+                                                        }
+                                                        catch (Exception ex)
+                                                        {
+                                                            _logger.Error(ex, "处理 Tos 异常 {@0}", Account.ChannelId);
+                                                        }
+                                                    }
+
                                                     var error = $"{title}, {desc}";
 
                                                     task.MessageId = id;

diff --git a/src/Midjourney.Infrastructure/GlobalConfiguration.cs b/src/Midjourney.Infrastructure/GlobalConfiguration.cs
@@ -40,7 +40,7 @@ public class GlobalConfiguration
         /// <summary>
         /// 版本号
         /// </summary>
-        public static string Version { get; set; } = "v5.9.5";
+        public static string Version { get; set; } = "v5.9.6";
 
         /// <summary>
         /// 全局配置项