任务缓存

Author: JWJUN233233

NodeBot/Classes/ICommandSender.cs

@@ -10,7 +10,6 @@ namespace NodeBot.Classes
     public interface ICommandSender
     {
         void SendMessage(string message);
-        CqWsSession GetSession();
         NodeBot GetNodeBot();
     }
 }

NodeBot/Classes/IQQSender.cs

@@ -12,6 +12,7 @@ public interface IQQSender : ICommandSender
     {
         long GetNumber();
         long? GetGroupNumber();
+        CqWsSession GetSession();
         void SendMessage(CqMessage msgs);
     }
     public class GroupQQSender : IQQSender
@@ -49,12 +50,12 @@ public CqWsSession GetSession()
 
         public void SendMessage(string message)
         {
-            Session.SendGroupMessage(GroupNumber, new(new CqTextMsg(message)));
+            Bot.SendGroupMessage(GroupNumber, new(new CqTextMsg(message)));
         }
 
         public void SendMessage(CqMessage msgs)
         {
-            Session.SendGroupMessage(GroupNumber, msgs);
+            Bot.SendGroupMessage(GroupNumber, msgs);
         }
     }
     public class UserQQSender : IQQSender
@@ -91,12 +92,12 @@ public CqWsSession GetSession()
 
         public void SendMessage(string message)
         {
-            Session.SendPrivateMessage(QQNumber, new CqMessage(new CqTextMsg(message)));
+            Bot.SendPrivateMessage(QQNumber, new CqMessage(new CqTextMsg(message)));
         }
 
         public void SendMessage(CqMessage msgs)
         {
-            Session.SendPrivateMessage(QQNumber, msgs);
+            Bot.SendPrivateMessage(QQNumber, msgs);
         }
     }
 }

NodeBot/Classes/UserType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NodeBot.Classes
+{
+    public enum UserType
+    {
+        User,
+        Group
+    }
+}

NodeBot/Command/AtAll.cs

@@ -24,11 +24,11 @@ public bool Execute(IQQSender QQSender, CqMessage msgs)
                 tmp.Add(new(user.UserId));
                 if(tmp.Count >= 100)
                 {
-                    QQSender.GetSession().SendGroupMessage(QQSender.GetGroupNumber()!.Value, new(tmp));
+                    QQSender.GetNodeBot().SendGroupMessage(QQSender.GetGroupNumber()!.Value, new(tmp));
                     tmp = new();
                 }
             }
-            QQSender.GetSession().SendGroupMessage(QQSender.GetGroupNumber()!.Value, new(tmp));
+            QQSender.GetNodeBot().SendGroupMessage(QQSender.GetGroupNumber()!.Value, new(tmp));
             return true;
         }
 

NodeBot/NodeBot.cs

@@ -23,6 +23,7 @@ public class NodeBot
         public event EventHandler<ReceiveMessageEvent>? ReceiveMessageEvent;
         public List<ICommand> Commands = new List<ICommand>();
         public List<IService> Services = new List<IService>();
+        public Queue<Task> ToDoQueue = new Queue<Task>();
         public NodeBot(string ip)
         {
             session = new(new()
@@ -33,7 +34,7 @@ public NodeBot(string ip)
             });
             session.PostPipeline.Use(async (context, next) =>
             {
-                if(ReceiveMessageEvent != null)
+                if (ReceiveMessageEvent != null)
                 {
                     ReceiveMessageEvent(this, new(context));
                 }
@@ -45,16 +46,19 @@ public NodeBot(string ip)
             };
             ReceiveMessageEvent += (sender, e) =>
             {
-                if(e.Context is CqPrivateMessagePostContext cqPrivateMessage)
+                if (e.Context is CqPrivateMessagePostContext cqPrivateMessage)
                 {
                     ExecuteCommand(new UserQQSender(session, this, cqPrivateMessage.UserId), cqPrivateMessage.Message);
                 }
-                if(e.Context is CqGroupMessagePostContext cqGroupMessage)
+                if (e.Context is CqGroupMessagePostContext cqGroupMessage)
                 {
-                    ExecuteCommand(new GroupQQSender(session, this, cqGroupMessage.GroupId, cqGroupMessage.UserId), cqGroupMessage.Message);
+                    ExecuteCommand(new GroupQQSender(session ,this, cqGroupMessage.GroupId, cqGroupMessage.UserId), cqGroupMessage.Message);
                 }
             };
         }
+        /// <summary>
+        /// 保存权限数据
+        /// </summary>
         public void SavePermission()
         {
             if (!File.Exists("Permission.json"))
@@ -63,6 +67,9 @@ public void SavePermission()
             }
             File.WriteAllText("Permission.json", Newtonsoft.Json.JsonConvert.SerializeObject(Permissions));
         }
+        /// <summary>
+        /// 加载权限数据
+        /// </summary>
         public void LoadPermission()
         {
             if (File.Exists("Permission.json"))
@@ -82,26 +89,39 @@ public void RegisterService(IService service)
         public void Start()
         {
             session.Start();
-            foreach(IService service in Services)
+            foreach (IService service in Services)
             {
                 service.OnStart(this);
             }
+            Task.Run(() =>
+            {
+                while (true)
+                {
+                    Task.Delay(1000);
+                    Task task;
+                    lock (ToDoQueue)
+                    {
+                        task = ToDoQueue.Dequeue();
+                    }
+                    task.Start();
+                }
+            });
         }
         public void CallConsoleInputEvent(string text)
         {
-            if(ConsoleInputEvent != null)
+            if (ConsoleInputEvent != null)
             {
                 ConsoleInputEvent(this, new(text));
             }
         }
         public void ExecuteCommand(ICommandSender sender, string commandLine)
         {
             ICommand? command = GetCommandByCommandLine(commandLine);
-            if(command == null)
+            if (command == null)
             {
                 return;
             }
-            if(sender is ConsoleCommandSender console)
+            if (sender is ConsoleCommandSender console)
             {
                 if (command.IsConsoleCommand())
                 {
@@ -138,9 +158,9 @@ public void ExecuteCommand(IQQSender sender, CqMessage commandLine)
         public ICommand? GetCommandByCommandLine(string command)
         {
             string[] tmp = command.Split(' ');
-            foreach(string s in tmp)
+            foreach (string s in tmp)
             {
-                if(s != string.Empty)
+                if (s != string.Empty)
                 {
                     return FindCommand(s);
                 }
@@ -149,9 +169,9 @@ public void ExecuteCommand(IQQSender sender, CqMessage commandLine)
         }
         public ICommand? FindCommand(string commandName)
         {
-            foreach(ICommand command in Commands)
+            foreach (ICommand command in Commands)
             {
-                if(command.GetName() == commandName)
+                if (command.GetName() == commandName)
                 {
                     return command;
                 }
@@ -169,15 +189,52 @@ public bool HasPermission(ICommand command, long QQNumber)
         }
         public bool HasPermission(ICommand command, ICommandSender sender)
         {
-            if(sender is IQQSender QQSender)
+            if (sender is IQQSender QQSender)
             {
                 return HasPermission(command, QQSender.GetNumber());
             }
-            if(sender is ConsoleCommandSender)
+            if (sender is ConsoleCommandSender)
             {
                 return true;
             }
             return false;
         }
+        public void RunTask(Task task)
+        {
+            lock (ToDoQueue)
+            {
+                ToDoQueue.Enqueue(task);
+            }
+        }
+        public void RunAction(Action action)
+        {
+            Task task = new(action);
+            RunTask(task);
+        }
+        public void SendGroupMessage(long GroupNumber, CqMessage msgs)
+        {
+            RunAction(() =>
+            {
+                session.SendGroupMessage(GroupNumber, msgs);
+            });
+        }
+        public void SendPrivateMessage(long QQNumber, CqMessage msgs)
+        {
+            RunAction(() =>
+            {
+                session.SendPrivateMessage(QQNumber, msgs);
+            });
+        }
+        public void SendMessage(long Number, CqMessage msgs, UserType type)
+        {
+            if(type == UserType.User)
+            {
+                SendPrivateMessage(Number, msgs);
+            }
+            else if(type == UserType.Group)
+            {
+                SendGroupMessage(Number, msgs);
+            }
+        }
     }
 }

NodeBot/github/GitSubscribeInfo.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Numerics;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -16,5 +17,17 @@ public GitSubscribeInfo(string repository, long groupNumber)
             Repository = repository;
             GroupNumber = groupNumber;
         }
+        public static bool operator ==(GitSubscribeInfo left, GitSubscribeInfo right)
+        {
+            if(left.GroupNumber == right.GroupNumber && left.Repository == right.Repository)
+            {
+                return true;    
+            }
+            return false;
+        }
+        public static bool operator !=(GitSubscribeInfo left, GitSubscribeInfo right)
+        {
+            return !(left == right);
+        }
     }
 }

NodeBot/github/WebhookService.cs

@@ -58,7 +58,7 @@ static WebhookService()
                             //msg += $"\n移除  {removed}";
                             //msg += $"\n修改  {modified}";
 
-                            Instance.NodeBot.session.SendGroupMessage(info.GroupNumber, new(new CqTextMsg(msg)));
+                            Instance.NodeBot.SendGroupMessage(info.GroupNumber, new(new CqTextMsg(msg)));
                         }
                     }
                 }