Merge pull request #60 from Hyz-sui/H-dev

2024.3.5.4

Author: Hyz-sui

Modules/GameState.cs

@@ -102,7 +102,10 @@ public void ChangeMainRole(CustomRoles role)
         {
             var player = Utils.GetPlayerById(PlayerId);
 
-            EventHistory.CurrentInstance?.AddEvent(new RoleChangeEvent(new(player), role));
+            if (AmongUsClient.Instance.AmHost)
+            {
+                EventHistory.CurrentInstance?.AddEvent(new RoleChangeEvent(new(player), role));
+            }
 
             this.PreviousRoles.Add(this.MainRole);
             this.SetMainRole(role);

Modules/Webhook/WebhookManager.cs

@@ -29,9 +29,7 @@ public void StartSend(WebhookMessageBuilder builder)
             logger.Warn("URL設定が正しくありません");
             return;
         }
-        var message = builder.ContentBuilder.ToString();
-        var content = new WebhookRequest(message, builder.UserName, builder.AvatarUrl);
-        var sendTask = SendAsync(content, url);
+        var sendTask = SendAsync(builder, url);
         sendTask.ContinueWith(task =>
         {
             if (task.Exception is { } aggregateException)
@@ -81,7 +79,39 @@ private bool ValidateUrl(string url)
         }
         return webhookUrlRegex.IsMatch(url);
     }
-    public async Task SendAsync(WebhookRequest webhookRequest, string url, CancellationToken cancellationToken = default)
+    public async Task SendAsync(WebhookMessageBuilder builder, string url, CancellationToken cancellationToken = default)
+    {
+        var fullMessage = builder.ContentBuilder.ToString();
+        if (fullMessage.Length <= MaxContentLength)
+        {
+            await SendInnerAsync(fullMessage, builder.UserName, builder.AvatarUrl, url, cancellationToken);
+            return;
+        }
+        // 改行を区切りとして，上限文字数を超えないように分割して送信する
+        // 1行で上限を超えているケースは考慮しない
+        var lines = fullMessage.Split(Environment.NewLine);
+        var partBuilder = new StringBuilder();
+        foreach (var line in lines)
+        {
+            if (partBuilder.Length + line.Length > MaxContentLength)
+            {
+                await SendInnerAsync(partBuilder.ToString(), builder.UserName, builder.AvatarUrl, url, cancellationToken);
+                partBuilder.Clear();
+                await Task.Delay(1000, cancellationToken);
+            }
+            partBuilder.AppendLine(line);
+        }
+        if (partBuilder.Length > 0)
+        {
+            await SendInnerAsync(partBuilder.ToString(), builder.UserName, builder.AvatarUrl, url, cancellationToken);
+        }
+    }
+    private async Task SendInnerAsync(string message, string userName, string avatarUrl, string url, CancellationToken cancellationToken = default)
+    {
+        var content = new WebhookRequest(message, userName, avatarUrl);
+        await SendAsync(content, url, cancellationToken);
+    }
+    private async Task SendAsync(WebhookRequest webhookRequest, string url, CancellationToken cancellationToken = default)
     {
         try
         {
@@ -124,4 +154,6 @@ public void Dispose()
         new("WebhookUrl.txt");
 #endif
     private readonly Regex webhookUrlRegex = new("^(https://(ptb.|canary.)?discord(app)?.com/api/webhooks/)");
+    // 上限2,000文字．文字数カウントの実装が違うかもしれないけどよくわからないので余裕をもたせる
+    private const int MaxContentLength = 1950;
 }

Patches/OutroPatch.cs

@@ -197,7 +197,10 @@ public static void Postfix(EndGameManager __instance)
             }
             LastWinsText = WinnerText.text.RemoveHtmlTags();
 
-            EventHistory.CurrentInstance?.AddEvent(new GameEndEvent(LastWinsText));
+            if (AmongUsClient.Instance.AmHost)
+            {
+                EventHistory.CurrentInstance?.AddEvent(new GameEndEvent(LastWinsText));
+            }
 
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

Patches/PlayerContorolPatch.cs

@@ -153,7 +153,10 @@ public static void Prefix(PlayerControl __instance, [HarmonyArgument(0)] PlayerC
 
             if (isSucceeded)
             {
-                EventHistory.CurrentInstance?.AddEvent(new MurderEvent(new(__instance), new(target), target.GetPlainShipRoom().RoomId));
+                if (AmongUsClient.Instance.AmHost)
+                {
+                    EventHistory.CurrentInstance?.AddEvent(new MurderEvent(new(__instance), new(target), target.GetPlainShipRoom()?.RoomId ?? SystemTypes.Hallway));
+                }
 
                 if (target.shapeshifting)
                 {
@@ -696,7 +699,7 @@ public static bool Prefix(PlayerControl __instance)
             ret &= Workhorse.OnCompleteTask(pc);
             Utils.NotifyRoles();
 
-            if (taskState.IsTaskFinished && Utils.HasTasks(__instance.Data))
+            if (taskState.IsTaskFinished && AmongUsClient.Instance.AmHost && Utils.HasTasks(__instance.Data))
             {
                 EventHistory.CurrentInstance?.AddEvent(new CrewTaskFinishEvent(new(__instance)));
             }

Patches/onGameStartedPatch.cs

@@ -107,7 +107,10 @@ public static void Postfix(AmongUsClient __instance)
             MeetingStates.FirstMeeting = true;
             GameStates.AlreadyDied = false;
 
-            EventHistory.CurrentInstance?.AddEvent(new GameStartEvent());
+            if (AmongUsClient.Instance.AmHost)
+            {
+                EventHistory.CurrentInstance?.AddEvent(new GameStartEvent());
+            }
         }
     }
     [HarmonyPatch(typeof(RoleManager), nameof(RoleManager.SelectRoles))]

Roles/Impostor/EvilHacker.cs

@@ -120,6 +120,7 @@ public override void OnReportDeadBody(PlayerControl reporter, GameData.PlayerInf
 
         // 送信するメッセージを生成
         var previous = -1;
+        builder.Append("<size=70%>");
         foreach (var admin in admins)
         {
             var entry = admin.Value;

main.cs

@@ -55,7 +55,7 @@ public class Main : BasePlugin
         // ==========
         //Sorry for many Japanese comments.
 
-        public static readonly string ForkVersion = "2024.3.5.3";
+        public static readonly string ForkVersion = "2024.3.5.4";
         public static readonly Version ParsedForkVersion = Version.Parse(ForkVersion);
 
         public const string PluginGuid = "com.emptybottle.townofhost";