From 810120be9207cc2396204e1110a8e32a37889398 Mon Sep 17 00:00:00 2001 From: milimoe Date: Fri, 5 Jul 2024 20:30:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=B8=80=E4=BA=9B=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=BB=91=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ListeningTask/GroupMessageTask.cs | 52 +++++++++++++++++---------- src/Settings/OSMCore.cs | 4 +-- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/src/ListeningTask/GroupMessageTask.cs b/src/ListeningTask/GroupMessageTask.cs index f751a93..c861af3 100644 --- a/src/ListeningTask/GroupMessageTask.cs +++ b/src/ListeningTask/GroupMessageTask.cs @@ -38,8 +38,12 @@ namespace Milimoe.RainBOT.ListeningTask // OSM指令 if (e.detail.Length >= 4 && e.detail[..4] == ".osm") { - MasterCommand.Execute(e.detail, e.user_id, onOSMCore, e.group_id, true); - return; + TaskUtility.NewTask(async () => + { + if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return; + MasterCommand.Execute(e.detail, e.user_id, onOSMCore, e.group_id, true); + return; + }); } if (e.detail.Length >= 5 && (e.detail[..5] == "禁言所有人" || e.detail[..5] == "解禁所有人") && (e.user_id == GeneralSettings.Master || GeneralSettings.UnMuteAccessGroup.Union(GeneralSettings.MuteAccessGroup).Contains(e.user_id)) && Bot.GroupMembers.TryGetValue(e.group_id, out List? members) && members != null) @@ -80,29 +84,41 @@ namespace Milimoe.RainBOT.ListeningTask // 12点大挑战 if (e.detail == "加入12点" || e.detail == "加入12点大挑战") { - if (GeneralSettings.Challenge12ClockGroup.Contains(e.user_id)) + TaskUtility.NewTask(async () => { - _ = Bot.SendGroupMessage(e.group_id, "12点大挑战", "请勿重复加入。"); - } - else - { - GeneralSettings.Challenge12ClockGroup.Add(e.user_id); - _ = Bot.SendGroupMessage(e.group_id, "12点大挑战", "你已成功加入~\r\n发送【退出12点】退出挑战。"); - GeneralSettings.SaveConfig(); - } - return; + if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return; + if (GeneralSettings.Challenge12ClockGroup.Contains(e.user_id)) + { + await Bot.SendGroupMessage(e.group_id, "12点大挑战", "请勿重复加入。"); + } + else + { + GeneralSettings.Challenge12ClockGroup.Add(e.user_id); + await Bot.SendGroupMessage(e.group_id, "12点大挑战", "你已成功加入~\r\n发送【退出12点】退出挑战。"); + GeneralSettings.SaveConfig(); + } + return; + }); } else if ((e.detail == "退出12点" || e.detail == "退出12点大挑战") && GeneralSettings.Challenge12ClockGroup.Contains(e.user_id)) { - GeneralSettings.Challenge12ClockGroup.Remove(e.user_id); - _ = Bot.SendGroupMessage(e.group_id, "12点大挑战", "你已成功退出~\r\n发送【加入12点】即可再次参加。"); - GeneralSettings.SaveConfig(); - return; + TaskUtility.NewTask(async () => + { + if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return; + GeneralSettings.Challenge12ClockGroup.Remove(e.user_id); + await Bot.SendGroupMessage(e.group_id, "12点大挑战", "你已成功退出~\r\n发送【加入12点】即可再次参加。"); + GeneralSettings.SaveConfig(); + return; + }); } else if (e.detail == "12点大挑战") { - _ = Bot.SendGroupMessage(e.group_id, "12点大挑战", "欢迎加入12点大挑战。参加本挑战后，你将在每晚的12点获得8小时禁言和优质的睡眠，确保第二天的精神饱满！\r\n发送【加入12点】即可参加。"); - return; + TaskUtility.NewTask(async () => + { + if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return; + _ = Bot.SendGroupMessage(e.group_id, "12点大挑战", "欢迎加入12点大挑战。参加本挑战后，你将在每晚的12点获得8小时禁言和优质的睡眠，确保第二天的精神饱满！\r\n发送【加入12点】即可参加。"); + return; + }); } // 发图API diff --git a/src/Settings/OSMCore.cs b/src/Settings/OSMCore.cs index 1f0d498..96755c9 100644 --- a/src/Settings/OSMCore.cs +++ b/src/Settings/OSMCore.cs @@ -3,8 +3,8 @@ public class OSMCore { public const string version = "v1.0"; - public const string version2 = "Patch7"; - public const string time = "July 3rd, 2024"; + public const string version2 = "Patch8 Test"; + public const string time = "July 5th, 2024"; public static string Info => $"OSM Core {version} {version2}\r\nAuthor: Milimoe\r\nBuilt on {time}\r\nSee: https://github.com/milimoe"; }