From 535eb18695e7c1829da3c15b43911d482e339df4 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Thu, 11 Apr 2024 23:04:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ListeningTask/GroupMessageTask.cs | 25 ++++++++++++++++++++++---
 src/Settings/Bot.cs                   |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/ListeningTask/GroupMessageTask.cs b/src/ListeningTask/GroupMessageTask.cs
index b6b5fd6..e66db5b 100644
--- a/src/ListeningTask/GroupMessageTask.cs
+++ b/src/ListeningTask/GroupMessageTask.cs
@@ -144,7 +144,7 @@ namespace Milimoe.RainBOT.ListeningTask
                         return;
                     });
                 }
-                if (e.detail.Contains("丁真") || e.detail == "一眼丁真" || e.detail == "一眼顶针")
+                if (e.detail == "一眼丁真" || e.detail == "一眼顶针")
                 {
                     TaskUtility.NewTask(async () =>
                     {
@@ -155,9 +155,8 @@ namespace Milimoe.RainBOT.ListeningTask
                         return;
                     });
                 }
-                if (EEWords.Any(e.detail.Contains))
+                if (EEWords.Any(e.detail.Contains) && e.CheckThrow(20, out _))
                 {
-                    if (BlackList.Times.TryGetValue(e.user_id, out long bltimes) && bltimes > 5) return;
                     GroupMessageContent content = new(e.group_id);
                     content.message.Add(new ImageMessage("file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"img\ee.png"));
                     _ = Bot.SendGroupMessage(e.group_id, "Image", content);
@@ -275,6 +274,26 @@ namespace Milimoe.RainBOT.ListeningTask
                     });
                     return;
                 }
+                if (e.user_id == GeneralSettings.Master && e.detail.Length > 4 && e.detail[..2] == "重置" && (e.detail[^2..] == "运势"))
+                {
+                    TaskUtility.NewTask(async () =>
+                    {
+                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
+                        string[] strs = e.detail.Replace("重置", "").Replace("运势", "").Trim().Split(' ');
+                        foreach (string str_qq in strs)
+                        {
+                            if (long.TryParse(str_qq.Trim().Replace("@", ""), out long qq))
+                            {
+                                if (qq == GeneralSettings.BotQQ && !Daily.UserDailys.ContainsKey(qq))
+                                {
+                                    Daily.UserDailys.Remove(GeneralSettings.BotQQ);
+                                    await Bot.SendGroupMessage(e.group_id, "重置运势", "已重置" + Bot.GetMemberNickName(e.group_id, qq) + "（" + qq + "）的今日运势。");
+                                }
+                            }
+                        }
+                    });
+                    return;
+                }
 
                 // 下面是开启了OSM Core的群组才能使用的功能
                 if (!onOSMCore) return;
diff --git a/src/Settings/Bot.cs b/src/Settings/Bot.cs
index 7d97a63..7c3e31d 100644
--- a/src/Settings/Bot.cs
+++ b/src/Settings/Bot.cs
@@ -111,7 +111,7 @@ namespace Milimoe.RainBOT.Settings
                     await Task.Delay(1000 * GeneralSettings.BlackFrozenTime);
                     BlackList.Times.Remove(user_id);
                 });
-                await (send_group ? SendFriendMessage(target_id, "黑名单", content) : SendFriendMessage(target_id, "黑名单", content));
+                await (send_group ? SendGroupMessage(target_id, "黑名单", content) : SendFriendMessage(target_id, "黑名单", content));
                 return false;
             }
             else