Whois command. Some refactorings.

modules/ChatManagement/ChatManagement.csproj

@@ -9,5 +9,8 @@
     <ItemGroup>
       <ProjectReference Include="..\..\Core\Core.csproj" />
     </ItemGroup>
-
+    
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+        <Delete Files="$(OutDir)\TelegramBot.dll" />
+    </Target>
 </Project>

modules/ChatManagement/Handler/Ban.cs

@@ -1,6 +1,9 @@
-using System.Threading.Tasks;
+#nullable enable
+
+using System.Threading.Tasks;
 using BotFramework.Attributes;
 using BotFramework.Enums;
+using Kruzya.TelegramBot.Core.Data;
 using Telegram.Bot;
 using Telegram.Bot.Types;
 
@@ -8,12 +11,14 @@ namespace West.TelegramBot.ChatManagement.Handler
 {
     public class Ban : ManagementHandler
     {
+        public Ban(CoreContext db) : base(db) {}
+
         [Command("ban", CommandParseMode.Both)]
         public async Task HandleBan()
         {
             if (!await CanPunish()) return;
 
-            await BanMember(GetVictim());
+            await BanMember(RepliedUser!);
         }
 
         [Command("unban", CommandParseMode.Both)]
@@ -21,7 +26,7 @@ namespace West.TelegramBot.ChatManagement.Handler
         {
             if (!await CanPunish()) return;
 
-            await Bot.RestrictChatMemberAsync(Chat.Id, GetVictim().Id,
+            await Bot.RestrictChatMemberAsync(Chat.Id, RepliedUser!.Id,
                 new ChatPermissions
                 {
                     CanSendMessages = true,

modules/ChatManagement/Handler/ManagementHandler.cs

@@ -1,6 +1,10 @@
-using System;
+#nullable enable
+
+using System;
 using System.Threading.Tasks;
 using BotFramework;
+using JetBrains.Annotations;
+using Kruzya.TelegramBot.Core.Data;
 using Kruzya.TelegramBot.Core.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;
@@ -9,21 +13,34 @@ using West.TelegramBot.ChatManagement.Extensions;
 
 namespace West.TelegramBot.ChatManagement.Handler
 {
-    public class ManagementHandler : BotEventHandler
+    public abstract class ManagementHandler : BotEventHandler
     {
-        protected User GetVictim()
+        protected readonly CoreContext Db;
-        {
+
-            return RawUpdate.Message?.ReplyToMessage?.From;
+        protected Message? Message => RawUpdate.Message;
-        }
+
+        protected User? RepliedUser => Message?.ReplyToMessage?.From;
         
-        protected async Task<bool> CanPunish()
+        protected ManagementHandler(CoreContext db)
         {
-            return GetVictim() != null && await Bot.CanPunishMember(Chat, From, GetVictim());
+            Db = db;
         }
 
+        protected async Task<Message> Reply(string text)
+        {
+            return await Bot.SendTextMessageAsync(Chat.Id, text,
+                replyToMessageId: Message?.MessageId, parseMode: ParseMode.Html);
+        }
+
+        protected async Task<bool> CanPunish()
+        {
+            return RepliedUser != null && await Bot.CanPunishMember(Chat, From, RepliedUser);
+        }
+        
+        #region Bans
         protected async Task BanMember(User user, DateTime? banEnd = null, bool sendMessage = true)
         {
-            await BanMember(user.Id, banEnd, sendMessage);
+            await BanMember(user.Id, banEnd);
 
             if (sendMessage)
             {
@@ -34,7 +51,7 @@ namespace West.TelegramBot.ChatManagement.Handler
             }
         }
         
-        protected async Task BanMember(long userId, DateTime? banEnd = null, bool sendMessage = true)
+        protected async Task BanMember(long userId, DateTime? banEnd = null)
         {
             await Bot.RestrictChatMemberAsync(
                                 Chat.Id,
@@ -46,5 +63,11 @@ namespace West.TelegramBot.ChatManagement.Handler
                                 banEnd ?? DateTime.Now.AddDays(7)
                                 );
         }
+        #endregion
+        
+        protected async Task<BotUserValue> GetWarnOption(User user)
+        {
+            return await Db.UserValues.FindOrCreateOption(Chat.Id, user.Id, "warnCount");
+        }
     }
 }

modules/ChatManagement/Handler/Reputation.cs

@@ -0,0 +1,32 @@
+#nullable enable
+
+using System.Threading.Tasks;
+using BotFramework.Attributes;
+using BotFramework.Enums;
+using Kruzya.TelegramBot.Core.Data;
+using Kruzya.TelegramBot.Core.Extensions;
+
+namespace West.TelegramBot.ChatManagement.Handler
+{
+    public class Reputation : ManagementHandler
+    {
+        public Reputation(CoreContext db) : base(db)  {}
+
+        [Command("whois", CommandParseMode.Both)]
+        public async Task HandleWhois()
+        {
+            var user = RepliedUser ?? From;
+            var message = $"{user.ToHtml(false)}\n";
+            if (user.IsBot)
+            {
+                message += "<code>Бот</code>";
+            }
+            else
+            {
+                message += $"<code>Предупреждения: {(await GetWarnOption(user)).GetValue<int>()}</code>";
+            }
+
+            await Reply(message);
+        }
+    }
+}

modules/ChatManagement/Handler/Warn.cs

@@ -1,4 +1,6 @@
-using System;
+#nullable enable
+
+using System;
 using System.Threading.Tasks;
 using BotFramework.Attributes;
 using BotFramework.Enums;
@@ -9,25 +11,20 @@ using Telegram.Bot.Types.Enums;
 
 namespace West.TelegramBot.ChatManagement.Handler
 {
-    public class Command : ManagementHandler
+    public class Warn : ManagementHandler
     {
-        private readonly CoreContext _db;
+        public Warn(CoreContext db) : base(db) {}
-        
+
-        public Command(CoreContext db)
-        {
-            _db = db;
-        }
-        
         [Command("warn", CommandParseMode.Both)]
         public async Task HandleWarn()
         {
             if (!await CanPunish()) return;
             
-            var warnUser = GetVictim();
+            var warnUser = RepliedUser!;
-            var warnOption = await GetWarnOption();
+            var warnOption = await GetWarnOption(warnUser);
-            var warnCount = warnOption.GetValue<int>() + 1;
+            var warnCount = warnOption!.GetValue<int>() + 1;
             warnOption.SetValue(warnCount);
-            _db.MarkAsModified(warnOption);
+            Db.MarkAsModified(warnOption);
             
             await Bot.SendTextMessageAsync(Chat.Id, $"{warnUser.ToHtml(false)}<code>, Вам выдано предупреждение! " +
                                                     $"Текущее кол-во: {warnCount}/3</code>", 
@@ -46,21 +43,16 @@ namespace West.TelegramBot.ChatManagement.Handler
         {
             if (!await CanPunish()) return;
 
-            var warnOption = await GetWarnOption();
+            var warnOption = await GetWarnOption(RepliedUser!);
             var warnCount = Math.Max(warnOption.GetValue<int>() - 1, 0);
             warnOption.SetValue(warnCount);
-            _db.MarkAsModified(warnOption);
+            Db.MarkAsModified(warnOption);
             
             await Bot.SendTextMessageAsync(Chat.Id, 
-                $"{GetVictim().ToHtml(false)}<code>, с Вас снято предупреждение! " +
+                $"{RepliedUser.ToHtml(false)}<code>, с Вас снято предупреждение! " +
                 $"Текущее кол-во: {warnCount}/3</code>", 
                 disableNotification: true, 
                 parseMode: ParseMode.Html);
         }
-        
-        private async Task<BotUserValue> GetWarnOption()
-        {
-            return await _db.UserValues.FindOrCreateOption(Chat.Id, GetVictim().Id, "warnCount");
-        }
     }
 }

modules/RichSiteSummary/RichSiteSummary.csproj

@@ -13,5 +13,8 @@
     <ItemGroup>
       <PackageReference Include="CodeHollow.FeedReader" Version="1.2.1" />
     </ItemGroup>
-
+    
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+        <Delete Files="$(OutDir)\TelegramBot.dll" />
+    </Target>
 </Project>