misc

chr233 · Aug 17, 2023 · ce7050e · ce7050e
1 parent 2168e14
commit ce7050e
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 17 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>2.1.5.4</Version>
+		<Version>2.1.6.0</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/XinjingdailyBot.Command/SuperCommand.cs b/XinjingdailyBot.Command/SuperCommand.cs
@@ -221,10 +221,17 @@ async Task<string> exec()
     [TextCmd("COMMAND", EUserRights.SuperCmd, Description = "设置命令菜单")]
     public async Task ResponseCommand(Message message)
     {
-        bool result = await _commandHandler.GetCommandsMenu();
+        bool result = await _commandHandler.SetCommandsMenu();
         await _botClient.SendCommandReply(result ? "设置菜单成功" : "设置菜单失败", message, autoDelete: false);
     }
 
+    [TextCmd("CLEARCOMMAND", EUserRights.SuperCmd, Description = "设置命令菜单")]
+    public async Task ResponseClearCommand(Message message)
+    {
+        bool result = await _commandHandler.ClearCommandsMenu();
+        await _botClient.SendCommandReply(result ? "清除菜单成功" : "清除菜单失败", message, autoDelete: false);
+    }
+
     /// <summary>
     /// 重新计算用户投稿数量
     /// </summary>

diff --git a/XinjingdailyBot.Interface/Bot/Handler/ICommandHandler.cs b/XinjingdailyBot.Interface/Bot/Handler/ICommandHandler.cs
@@ -19,7 +19,7 @@ public interface ICommandHandler
     /// 设置菜命令单
     /// </summary>
     /// <returns></returns>
-    Task<bool> GetCommandsMenu();
+    Task<bool> SetCommandsMenu();
     /// <summary>
     /// 注册命令
     /// </summary>
@@ -39,4 +39,5 @@ public interface ICommandHandler
     /// <param name="query"></param>
     /// <returns></returns>
     Task OnQueryCommandReceived(Users dbUser, CallbackQuery query);
+    Task<bool> ClearCommandsMenu();
 }
diff --git a/XinjingdailyBot.Service/Bot/Handler/CommandHandler.cs b/XinjingdailyBot.Service/Bot/Handler/CommandHandler.cs
@@ -449,7 +449,7 @@ public string GetAvilabeCommands(Users dbUser)
         }
     }
 
-    public async Task<bool> GetCommandsMenu()
+    public async Task<bool> SetCommandsMenu()
     {
         var cmds = new List<BotCommand>();
 
@@ -474,6 +474,7 @@ void AddCommands(EUserRights right)
 
         AddCommands(EUserRights.None);
         AddCommands(EUserRights.NormalCmd);
+        await _botClient.SetMyCommandsAsync(cmds, null);
         await _botClient.SetMyCommandsAsync(cmds, new BotCommandScopeAllPrivateChats());
         await _botClient.SetMyCommandsAsync(cmds, new BotCommandScopeAllGroupChats());
 
@@ -484,4 +485,16 @@ void AddCommands(EUserRights right)
         await _botClient.SetMyCommandsAsync(cmds, new BotCommandScopeChatAdministrators { ChatId = _channelService.ReviewGroup.Id });
         return true;
     }
+
+    public async Task<bool> ClearCommandsMenu()
+    {
+        var cmds = new List<BotCommand>();
+
+        await _botClient.SetMyCommandsAsync(cmds);
+        await _botClient.SetMyCommandsAsync(cmds, new BotCommandScopeAllPrivateChats());
+        await _botClient.SetMyCommandsAsync(cmds, new BotCommandScopeAllGroupChats());
+        await _botClient.SetMyCommandsAsync(cmds, new BotCommandScopeAllChatAdministrators());
+        await _botClient.SetMyCommandsAsync(cmds, new BotCommandScopeChatAdministrators { ChatId = _channelService.ReviewGroup.Id });
+        return true;
+    }
 }
diff --git a/XinjingdailyBot.Service/Data/PostService.cs b/XinjingdailyBot.Service/Data/PostService.cs
@@ -527,21 +527,29 @@ public async Task SetPostTag(NewPosts post, string payload, CallbackQuery callba
 
     public async Task RejetPost(NewPosts post, Users dbUser, RejectReasons rejectReason)
     {
-        post.RejectReason = rejectReason.Name;
-        post.CountReject = rejectReason.IsCount;
-        post.ReviewerUID = dbUser.UserID;
-        post.Status = EPostStatus.Rejected;
-        post.ModifyAt = DateTime.Now;
-        await Updateable(post).UpdateColumns(static x => new {
-            x.RejectReason,
-            x.CountReject,
-            x.ReviewerUID,
-            x.Status,
-            x.ModifyAt
-        }).ExecuteCommandAsync();
-
         var poster = await _userService.Queryable().FirstAsync(x => x.UserID == post.PosterUID);
 
+        if (poster.IsBan)
+        {
+            await RejectIfBan(post, poster, dbUser, null);
+            return;
+        }
+        else
+        {
+            post.RejectReason = rejectReason.Name;
+            post.CountReject = rejectReason.IsCount;
+            post.ReviewerUID = dbUser.UserID;
+            post.Status = EPostStatus.Rejected;
+            post.ModifyAt = DateTime.Now;
+            await Updateable(post).UpdateColumns(static x => new {
+                x.RejectReason,
+                x.CountReject,
+                x.ReviewerUID,
+                x.Status,
+                x.ModifyAt
+            }).ExecuteCommandAsync();
+        }
+
         //修改审核群消息
         string reviewMsg = _textHelperService.MakeReviewMessage(poster, dbUser, post.Anonymous, rejectReason.FullText);
         await _botClient.EditMessageTextAsync(post.ReviewActionChatID, (int)post.ReviewActionMsgID, reviewMsg, parseMode: ParseMode.Html, disableWebPagePreview: true);
@@ -634,10 +642,48 @@ public async Task RejetPost(NewPosts post, Users dbUser, RejectReasons rejectRea
         }
     }
 
+    /// <summary>
+    /// 拒绝封禁用户的投稿
+    /// </summary>
+    /// <param name="post"></param>
+    /// <param name="poster"></param>
+    /// <param name="reviewer"></param>
+    /// <param name="callbackQuery"></param>
+    /// <returns></returns>
+    private async Task RejectIfBan(NewPosts post, Users poster, Users reviewer, CallbackQuery? callbackQuery)
+    {
+        post.RejectReason = "封禁自动拒绝";
+        post.CountReject = true;
+        post.ReviewerUID = reviewer.UserID;
+        post.Status = EPostStatus.Rejected;
+        post.ModifyAt = DateTime.Now;
+        await Updateable(post).UpdateColumns(static x => new {
+            x.RejectReason,
+            x.CountReject,
+            x.ReviewerUID,
+            x.Status,
+            x.ModifyAt
+        }).ExecuteCommandAsync();
+
+        if (callbackQuery != null)
+        {
+            await _botClient.AutoReplyAsync("此用户已被封禁，无法通过审核", callbackQuery);
+
+            string reviewMsg = _textHelperService.MakeReviewMessage(poster, reviewer, post.Anonymous, "此用户已被封禁");
+            await _botClient.EditMessageTextAsync(callbackQuery.Message!, reviewMsg, parseMode: ParseMode.Html, disableWebPagePreview: true);
+        }
+    }
+
     public async Task AcceptPost(NewPosts post, Users dbUser, bool inPlan, CallbackQuery callbackQuery)
     {
         var poster = await _userService.Queryable().FirstAsync(x => x.UserID == post.PosterUID);
 
+        if (poster.IsBan)
+        {
+            await RejectIfBan(post, poster, dbUser, callbackQuery);
+            return;
+        }
+
         ChannelOptions? channel = null;
         if (post.IsFromChannel)
         {