From f80b5d0da86484275ebd4c30b3247bc7beb875c4 Mon Sep 17 00:00:00 2001
From: West14 <30056636+West14@users.noreply.github.com>
Date: Mon, 14 Feb 2022 10:35:28 +0200
Subject: [PATCH] [cm] Use file-scoped namespaces.

---
 modules/ChatManagement/Handler/Ban.cs  | 53 ++++++++--------
 modules/ChatManagement/Handler/Warn.cs | 87 +++++++++++++-------------
 2 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/modules/ChatManagement/Handler/Ban.cs b/modules/ChatManagement/Handler/Ban.cs
index 019e812..2d96447 100644
--- a/modules/ChatManagement/Handler/Ban.cs
+++ b/modules/ChatManagement/Handler/Ban.cs
@@ -8,37 +8,36 @@ using Kruzya.TelegramBot.Core.Data;
 using Telegram.Bot;
 using Telegram.Bot.Types;
 
-namespace West.TelegramBot.ChatManagement.Handler
+namespace West.TelegramBot.ChatManagement.Handler;
+
+public class Ban : CommonHandler
 {
-    public class Ban : CommonHandler
+    public Ban(CoreContext db) : base(db) {}
+
+    [Command("ban", CommandParseMode.Both)]
+    public async Task HandleBan()
     {
-        public Ban(CoreContext db) : base(db) {}
+        if (!await CanPunish()) return;
 
-        [Command("ban", CommandParseMode.Both)]
-        public async Task HandleBan()
-        {
-            if (!await CanPunish()) return;
+        await BanMember(RepliedUser!);
+    }
 
-            await BanMember(RepliedUser!);
-        }
+    [Command("unban", CommandParseMode.Both)]
+    public async Task HandleUnban()
+    {
+        if (!await CanPunish()) return;
 
-        [Command("unban", CommandParseMode.Both)]
-        public async Task HandleUnban()
-        {
-            if (!await CanPunish()) return;
-
-            await Bot.RestrictChatMemberAsync(Chat.Id, RepliedUser!.Id,
-                new ChatPermissions
-                {
-                    CanSendMessages = true,
-                    CanChangeInfo = true,
-                    CanInviteUsers = true,
-                    CanPinMessages = true,
-                    CanSendPolls = true,
-                    CanSendMediaMessages = true,
-                    CanSendOtherMessages = true,
-                    CanAddWebPagePreviews = true
-                });
-        }
+        await Bot.RestrictChatMemberAsync(Chat.Id, RepliedUser!.Id,
+            new ChatPermissions
+            {
+                CanSendMessages = true,
+                CanChangeInfo = true,
+                CanInviteUsers = true,
+                CanPinMessages = true,
+                CanSendPolls = true,
+                CanSendMediaMessages = true,
+                CanSendOtherMessages = true,
+                CanAddWebPagePreviews = true
+            });
     }
 }
\ No newline at end of file
diff --git a/modules/ChatManagement/Handler/Warn.cs b/modules/ChatManagement/Handler/Warn.cs
index 72419e4..282ef39 100644
--- a/modules/ChatManagement/Handler/Warn.cs
+++ b/modules/ChatManagement/Handler/Warn.cs
@@ -10,54 +10,53 @@ using Kruzya.TelegramBot.Core.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types.Enums;
 
-namespace West.TelegramBot.ChatManagement.Handler
+namespace West.TelegramBot.ChatManagement.Handler;
+
+public class Warn : CommonHandler
 {
-    public class Warn : CommonHandler
+    public Warn(CoreContext db) : base(db) {}
+
+    [Command("warn", CommandParseMode.Both)]
+    public async Task HandleWarn()
     {
-        public Warn(CoreContext db) : base(db) {}
-
-        [Command("warn", CommandParseMode.Both)]
-        public async Task HandleWarn()
+        if (!await CanPunish()) return;
+            
+        var warnUser = RepliedUser!;
+        var warnOption = await GetWarnOption(warnUser);
+        var warnCount = warnOption!.GetValue<int>() + 1;
+        warnOption.SetValue(warnCount);
+        Db.AddOrUpdate(warnOption);
+            
+        await Bot.SendTextMessageAsync(Chat.Id, $"{warnUser.ToHtml()}<code>, Вам выдано предупреждение! " +
+                                                $"Текущее кол-во: {warnCount}/3</code>", 
+            disableNotification: true, 
+            parseMode: ParseMode.Html);
+            
+        if (warnCount == 3)
         {
-            if (!await CanPunish()) return;
-            
-            var warnUser = RepliedUser!;
-            var warnOption = await GetWarnOption(warnUser);
-            var warnCount = warnOption!.GetValue<int>() + 1;
-            warnOption.SetValue(warnCount);
+            await BanMember(warnUser);
+            warnOption.SetValue(0);
             Db.AddOrUpdate(warnOption);
-            
-            await Bot.SendTextMessageAsync(Chat.Id, $"{warnUser.ToHtml()}<code>, Вам выдано предупреждение! " +
-                                                    $"Текущее кол-во: {warnCount}/3</code>", 
-                disableNotification: true, 
-                parseMode: ParseMode.Html);
-            
-            if (warnCount == 3)
-            {
-                await BanMember(warnUser);
-                warnOption.SetValue(0);
-                Db.AddOrUpdate(warnOption);
-            }
-        }
-
-        [Command("unwarn", CommandParseMode.Both)]
-        public async Task HandleUnwarn()
-        {
-            if (!await CanPunish()) return;
-
-            var warnOption = await GetWarnOption(RepliedUser!);
-            var warnCount = warnOption.GetValue<int>();
-            if (warnCount == 0) return;
-            
-            warnCount = Math.Max(warnCount - 1, 0);
-            warnOption.SetValue(warnCount);
-            Db.AddOrUpdate(warnOption);
-            
-            await Bot.SendTextMessageAsync(Chat.Id, 
-                $"{RepliedUser.ToHtml()}<code>, с Вас снято предупреждение! " +
-                $"Текущее кол-во: {warnCount}/3</code>", 
-                disableNotification: true, 
-                parseMode: ParseMode.Html);
         }
     }
+
+    [Command("unwarn", CommandParseMode.Both)]
+    public async Task HandleUnwarn()
+    {
+        if (!await CanPunish()) return;
+
+        var warnOption = await GetWarnOption(RepliedUser!);
+        var warnCount = warnOption.GetValue<int>();
+        if (warnCount == 0) return;
+            
+        warnCount = Math.Max(warnCount - 1, 0);
+        warnOption.SetValue(warnCount);
+        Db.AddOrUpdate(warnOption);
+            
+        await Bot.SendTextMessageAsync(Chat.Id, 
+            $"{RepliedUser.ToHtml()}<code>, с Вас снято предупреждение! " +
+            $"Текущее кол-во: {warnCount}/3</code>", 
+            disableNotification: true, 
+            parseMode: ParseMode.Html);
+    }
 }
\ No newline at end of file