v1.0.0-dev

.gitignore

@@ -5,12 +5,13 @@
 
 
 
-Theresa3rd-Bot/TheresaBot.GoCqHttp/BotImg/
-Theresa3rd-Bot/TheresaBot.MiraiHttpApi/BotImg/
-
-Theresa3rd-Bot/TheresaBot.GoCqHttp/Font/
-Theresa3rd-Bot/TheresaBot.MiraiHttpApi/Font/
+Theresa-Bot/TheresaBot.GoCqHttp/BotImg/
+Theresa-Bot/TheresaBot.MiraiHttpApi/BotImg/
+Theresa-Bot/TheresaBot.OneBot11/BotImg/
 
+Theresa-Bot/TheresaBot.GoCqHttp/Font/
+Theresa-Bot/TheresaBot.MiraiHttpApi/Font/
+Theresa-Bot/TheresaBot.OneBot11/Font/
 
 .config
 

Theresa3rd-Bot/TheresaBot.Main/Cache/CoolingCache.cs → Theresa-Bot/TheresaBot.Core/Cache/CoolingCache.cs

@@ -1,9 +1,9 @@
-using TheresaBot.Main.Common;
-using TheresaBot.Main.Helper;
-using TheresaBot.Main.Model.Cache;
-using TheresaBot.Main.Type;
+using TheresaBot.Core.Common;
+using TheresaBot.Core.Helper;
+using TheresaBot.Core.Model.Cache;
+using TheresaBot.Core.Type;
 
-namespace TheresaBot.Main.Cache
+namespace TheresaBot.Core.Cache
 {
     public static class CoolingCache
     {

Theresa3rd-Bot/TheresaBot.Main/Cache/GameCahce.cs → Theresa-Bot/TheresaBot.Core/Cache/GameCahce.cs

@@ -1,9 +1,9 @@
-using TheresaBot.Main.Command;
-using TheresaBot.Main.Exceptions;
-using TheresaBot.Main.Game;
-using TheresaBot.Main.Relay;
+using TheresaBot.Core.Command;
+using TheresaBot.Core.Exceptions;
+using TheresaBot.Core.Game;
+using TheresaBot.Core.Relay;
 
-namespace TheresaBot.Main.Cache
+namespace TheresaBot.Core.Cache
 {
     public static class GameCahce
     {

Theresa3rd-Bot/TheresaBot.Main/Cache/PixivRankingCache.cs → Theresa-Bot/TheresaBot.Core/Cache/PixivRankingCache.cs

@@ -1,7 +1,7 @@
-using TheresaBot.Main.Mode;
-using TheresaBot.Main.Model.Cache;
+using TheresaBot.Core.Mode;
+using TheresaBot.Core.Model.Cache;
 
-namespace TheresaBot.Main.Cache
+namespace TheresaBot.Core.Cache
 {
     public static class PixivRankingCache
     {

Theresa3rd-Bot/TheresaBot.Main/Cache/PixivUserProfileCache.cs → Theresa-Bot/TheresaBot.Core/Cache/PixivUserProfileCache.cs

@@ -1,6 +1,6 @@
-using TheresaBot.Main.Model.Cache;
+using TheresaBot.Core.Model.Cache;
 
-namespace TheresaBot.Main.Cache
+namespace TheresaBot.Core.Cache
 {
     public static class PixivUserProfileCache
     {

Theresa3rd-Bot/TheresaBot.Main/Cache/ProcessCache.cs → Theresa-Bot/TheresaBot.Core/Cache/ProcessCache.cs

@@ -1,9 +1,9 @@
-using TheresaBot.Main.Command;
-using TheresaBot.Main.Exceptions;
-using TheresaBot.Main.Model.Process;
-using TheresaBot.Main.Relay;
+using TheresaBot.Core.Command;
+using TheresaBot.Core.Exceptions;
+using TheresaBot.Core.Model.Process;
+using TheresaBot.Core.Relay;
 
-namespace TheresaBot.Main.Cache
+namespace TheresaBot.Core.Cache
 {
     public static class ProcessCache
     {

Theresa3rd-Bot/TheresaBot.Main/Cache/RepeatCache.cs → Theresa-Bot/TheresaBot.Core/Cache/RepeatCache.cs

@@ -1,8 +1,8 @@
-using TheresaBot.Main.Common;
-using TheresaBot.Main.Helper;
-using TheresaBot.Main.Model.Cache;
+using TheresaBot.Core.Common;
+using TheresaBot.Core.Helper;
+using TheresaBot.Core.Model.Cache;
 
-namespace TheresaBot.Main.Cache
+namespace TheresaBot.Core.Cache
 {
     public static class RepeatCache
     {

Theresa-Bot/TheresaBot.Core/Command/BaseCommand.cs

@@ -0,0 +1,70 @@
+using TheresaBot.Core.Helper;
+using TheresaBot.Core.Reporter;
+using TheresaBot.Core.Session;
+using TheresaBot.Core.Type;
+
+namespace TheresaBot.Core.Command
+{
+    public abstract class BaseCommand
+    {
+        /// <summary>
+        /// 协议返回的消息ID
+        /// </summary>
+        public abstract long MessageId { get; }
+        /// <summary>
+        /// 发送请求的成员ID
+        /// </summary>
+        public abstract long MemberId { get; }
+        /// <summary>
+        /// 发送请求的成员昵称
+        /// </summary>
+        public abstract string MemberName { get; }
+        /// <summary>
+        /// 包含前缀的指令和指令内容内容
+        /// </summary>
+        public string Instruction { get; init; }
+        /// <summary>
+        /// 指令
+        /// </summary>
+        public string Command { get; set; }
+        /// <summary>
+        /// 指令前缀
+        /// </summary>
+        public string Prefix { get; set; }
+        /// <summary>
+        /// 第一行消息内容的中参数内容
+        /// </summary>
+        public string[] Params { get; init; }
+        /// <summary>
+        /// 不包含指令前缀和指令的第一行的内容
+        /// </summary>
+        public string KeyWord { get; set; }
+        /// <summary>
+        /// 不包含指令前缀和指令的消息内容
+        /// </summary>
+        public string Content { get; set; }
+        /// <summary>
+        /// 指令类型
+        /// </summary>
+        public CommandType CommandType { get; init; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public BaseSession Session { get; init; }
+
+        public BaseCommand(BaseSession baseSession, CommandType commandType, string message, string instruction, string command, string prefix)
+        {
+            this.Prefix = prefix;
+            this.Command = command;
+            this.Instruction = instruction;
+            this.CommandType = commandType;
+            this.Session = baseSession;
+            this.Content = message.SplitKeyWord(command);
+            this.KeyWord = instruction.SplitKeyWord(command);
+            this.Params = instruction.SplitKeyParams(command);
+        }
+
+        public abstract Task<bool> InvokeAsync(BaseSession session, BaseReporter reporter);
+
+    }
+}

Theresa3rd-Bot/TheresaBot.Main/Command/GroupCommand.cs → Theresa-Bot/TheresaBot.Core/Command/GroupCommand.cs

@@ -1,10 +1,10 @@
-using TheresaBot.Main.Datas;
-using TheresaBot.Main.Model.Invoker;
-using TheresaBot.Main.Reporter;
-using TheresaBot.Main.Session;
-using TheresaBot.Main.Type;
+using TheresaBot.Core.Datas;
+using TheresaBot.Core.Model.Invoker;
+using TheresaBot.Core.Reporter;
+using TheresaBot.Core.Session;
+using TheresaBot.Core.Type;
 
-namespace TheresaBot.Main.Command
+namespace TheresaBot.Core.Command
 {
     public abstract class GroupCommand : BaseCommand
     {
@@ -14,13 +14,13 @@ public abstract class GroupCommand : BaseCommand
 
         private CommandHandler<GroupCommand> HandlerInvoker { get; init; }
 
-        public GroupCommand(BaseSession baseSession, CommandType commandType, string instruction, string command, string prefix)
-            : base(baseSession, commandType, instruction, command, prefix)
+        public GroupCommand(BaseSession baseSession, CommandType commandType, string message, string instruction, string command, string prefix)
+            : base(baseSession, commandType, message, instruction, command, prefix)
         {
         }
 
-        public GroupCommand(BaseSession baseSession, CommandHandler<GroupCommand> invoker, string instruction, string command, string prefix)
-            : base(baseSession, invoker.CommandType, instruction, command, prefix)
+        public GroupCommand(BaseSession baseSession, CommandHandler<GroupCommand> invoker, string message, string instruction, string command, string prefix)
+            : base(baseSession, invoker.CommandType, message, instruction, command, prefix)
         {
             this.HandlerInvoker = invoker;
         }

Theresa3rd-Bot/TheresaBot.Main/Command/GroupQuoteCommand.cs → Theresa-Bot/TheresaBot.Core/Command/GroupQuoteCommand.cs

@@ -1,16 +1,16 @@
-using TheresaBot.Main.Datas;
-using TheresaBot.Main.Model.Invoker;
-using TheresaBot.Main.Reporter;
-using TheresaBot.Main.Session;
+using TheresaBot.Core.Datas;
+using TheresaBot.Core.Model.Invoker;
+using TheresaBot.Core.Reporter;
+using TheresaBot.Core.Session;
 
-namespace TheresaBot.Main.Command
+namespace TheresaBot.Core.Command
 {
     public abstract class GroupQuoteCommand : GroupCommand
     {
         protected CommandHandler<GroupQuoteCommand> HandlerInvoker { get; init; }
 
-        public GroupQuoteCommand(BaseSession baseSession, CommandHandler<GroupQuoteCommand> invoker, string instruction, string command, string prefix)
-            : base(baseSession, invoker.CommandType, instruction, command, prefix)
+        public GroupQuoteCommand(BaseSession baseSession, CommandHandler<GroupQuoteCommand> invoker, string message, string instruction, string command, string prefix)
+            : base(baseSession, invoker.CommandType, message, instruction, command, prefix)
         {
             this.HandlerInvoker = invoker;
         }

Theresa3rd-Bot/TheresaBot.Main/Command/PrivateCommand.cs → Theresa-Bot/TheresaBot.Core/Command/PrivateCommand.cs

@@ -1,16 +1,16 @@
-using TheresaBot.Main.Datas;
-using TheresaBot.Main.Model.Invoker;
-using TheresaBot.Main.Reporter;
-using TheresaBot.Main.Session;
+using TheresaBot.Core.Datas;
+using TheresaBot.Core.Model.Invoker;
+using TheresaBot.Core.Reporter;
+using TheresaBot.Core.Session;
 
-namespace TheresaBot.Main.Command
+namespace TheresaBot.Core.Command
 {
     public abstract class PrivateCommand : BaseCommand
     {
         private CommandHandler<PrivateCommand> HandlerInvoker { get; init; }
 
-        public PrivateCommand(BaseSession baseSession, CommandHandler<PrivateCommand> invoker, string instruction, string command, string prefix)
-            : base(baseSession, invoker.CommandType, instruction, command, prefix)
+        public PrivateCommand(BaseSession baseSession, CommandHandler<PrivateCommand> invoker, string message, string instruction, string command, string prefix)
+            : base(baseSession, invoker.CommandType, message, instruction, command, prefix)
         {
             this.HandlerInvoker = invoker;
         }

Theresa3rd-Bot/TheresaBot.Main/Common/BotConfig.cs → Theresa-Bot/TheresaBot.Core/Common/BotConfig.cs

@@ -1,12 +1,12 @@
-using TheresaBot.Main.Helper;
-using TheresaBot.Main.Model.Bot;
-using TheresaBot.Main.Model.Config;
+using TheresaBot.Core.Helper;
+using TheresaBot.Core.Model.Bot;
+using TheresaBot.Core.Model.Config;
 
-namespace TheresaBot.Main.Common
+namespace TheresaBot.Core.Common
 {
     public static class BotConfig
     {
-        public const string BotVersion = "0.11.4";
+        public const string BotVersion = "1.0.0";
         public const string BotHomepage = "https://www.theresa3rd.cn";
         public static BotInfos BotInfos = new BotInfos(0, "Bot");
         public static List<long> AcceptGroups = new();
@@ -26,6 +26,7 @@ public static class BotConfig
         public static SubscribeConfig SubscribeConfig = new SubscribeConfig();
         public static TimingSetuConfig TimingSetuConfig = new TimingSetuConfig();
         public static PixivRankingConfig PixivRankingConfig = new PixivRankingConfig();
+        public static PixivCollectionConfig PixivCollectionConfig = new PixivCollectionConfig();
         public static WordCloudConfig WordCloudConfig = new WordCloudConfig();
         public static GameConfig GameConfig = new GameConfig();
 

Theresa3rd-Bot/TheresaBot.Main/Common/DataPath.cs → Theresa-Bot/TheresaBot.Core/Common/DataPath.cs

@@ -1,4 +1,4 @@
-namespace TheresaBot.Main.Common
+namespace TheresaBot.Core.Common
 {
     public static class DataPath
     {