enhance and aggregate message

Deliay · Jan 12, 2024 · e7fab28 · e7fab28
1 parent 67d2d10
commit e7fab28
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 11 deletions.
diff --git a/Mikibot.Analyze/Bot/PingtiItemReplaceService.cs b/Mikibot.Analyze/Bot/PingtiItemReplaceService.cs
@@ -69,28 +69,68 @@ private async ValueTask<string> GetReplaceItem(string raw, CancellationToken tok
 
     }
 
-    private readonly List<PlainMessage> messageCache = [];
-    private DateTime lastSendTime = DateTime.Now - TimeSpan.FromSeconds(5);
+    private readonly Dictionary<string, List<PlainMessage>> messageCache = [];
+    private readonly Dictionary<string, DateTime> lastSendTime = [];
     private readonly SemaphoreSlim _lockSend = new(1);
 
+    protected override ValueTask PreRun(CancellationToken token)
+    {
+        _ = Task.Run(async () =>
+        {
+            while (!token.IsCancellationRequested)
+            {
+                await Task.Delay(TimeSpan.FromSeconds(5), token);
+                await _lockSend.WaitAsync();
+                try
+                {
+                    foreach (var (groupId, messages) in messageCache)
+                    {
+                        if (messages.Count > 0)
+                        {
+                            Logger.LogInformation($"处理聚合消息 {groupId} 共 {messages.Count} 条");
+                            await MiraiService.SendMessageToSomeGroup([groupId], token, messages.ToArray());
+                            messages.Clear();
+                        }
+                    }
+                }
+                finally
+                {
+                    _lockSend.Release();
+                }
+            }
+        }, token);
+
+        return ValueTask.CompletedTask;
+    }
+
     protected override async ValueTask Process(GroupMessageReceiver message, CancellationToken token = default)
     {
         foreach (var msg in message.MessageChain)
         {
-            if (msg is PlainMessage plain && plain.Text.StartsWith("!平替") && plain.Text.Length > 3)
+            if (msg is PlainMessage plain && (plain.Text.StartsWith("!平替") || plain.Text.StartsWith("！平替"))  && plain.Text.Length > 3)
             {
-                var item = plain.Text[3..];
-                var replace = await GetReplaceItem(item, token);
-                messageCache.Add(new PlainMessage($"{item} 的平替是 {replace}"));
-
                 await _lockSend.WaitAsync(token);
                 try
                 {
-                    if (DateTime.Now - lastSendTime > TimeSpan.FromSeconds(2))
+                    var item = plain.Text[3..].Trim();
+                    var replace = await GetReplaceItem(item, token);
+
+                    if (!messageCache.TryGetValue(message.GroupId, out var cachedMsgs))
+                    {
+                        messageCache.Add(message.GroupId, cachedMsgs = []);
+                    }
+
+                    cachedMsgs.Add(new PlainMessage($"{item} 的平替是 {replace}"));
+                    if (!lastSendTime.TryGetValue(message.GroupId, out var lastSendAt))
+                    {
+                        lastSendTime.Add(message.GroupId, lastSendAt = DateTime.Now - TimeSpan.FromSeconds(5));
+                    }
+
+                    if (DateTime.Now - lastSendAt > TimeSpan.FromSeconds(5))
                     {
-                        await MiraiService.SendMessageToGroup(message.Sender.Group, token, messageCache.ToArray());
-                        messageCache.Clear();
-                        lastSendTime = DateTime.Now;
+                        await MiraiService.SendMessageToGroup(message.Sender.Group, token, messageCache[message.GroupId].ToArray());
+                        messageCache[message.GroupId].Clear();
+                        lastSendTime[message.GroupId] = DateTime.Now;
                     }
                 }
                 finally

diff --git a/Mikibot.Analyze/Generic/MiraiGroupMessageProcessor.cs b/Mikibot.Analyze/Generic/MiraiGroupMessageProcessor.cs
@@ -32,8 +32,11 @@ private async ValueTask Dequeue(CancellationToken token)
 
     protected abstract ValueTask Process(GroupMessageReceiver message, CancellationToken token = default);
 
+    protected virtual ValueTask PreRun(CancellationToken token) => ValueTask.CompletedTask;
+
     public async Task Run(CancellationToken token)
     {
+        await PreRun(token);
         logger.LogInformation("Mirai group handling message: {}", serviceName);
         miraiService.SubscribeMessage(FilterMessage, token);
         while (!token.IsCancellationRequested)