Use file-scoped namespaces

Core/Handler/CommonHandler.cs

@@ -9,54 +9,53 @@ using Telegram.Bot;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
 
-namespace Kruzya.TelegramBot.Core.Handler
+namespace Kruzya.TelegramBot.Core.Handler;
+
+public abstract class CommonHandler : BotEventHandler
 {
-    public abstract class CommonHandler : BotEventHandler
+    protected readonly CoreContext Db;
+
+    protected Message? Message => RawUpdate.Message;
+
+    protected User? RepliedUser => Message?.ReplyToMessage?.From;
+
+    protected CommonHandler(CoreContext db)
     {
-        protected readonly CoreContext Db;
+        Db = db;
+    }
 
-        protected Message? Message => RawUpdate.Message;
+    protected virtual async Task<Message> Reply(string text)
+    {
+        return await Bot.SendTextMessageAsync(Chat.Id, text,
+            replyToMessageId: Message?.MessageId, parseMode: ParseMode.Html);
+    }
 
-        protected User? RepliedUser => Message?.ReplyToMessage?.From;
-
-        protected CommonHandler(CoreContext db)
-        {
-            Db = db;
-        }
-
-        protected virtual 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);
-        }
+    protected async Task<bool> CanPunish()
+    {
+        return RepliedUser != null && await Bot.CanPunishMember(Chat, From, RepliedUser);
+    }
 
 
-        protected async Task BanMember(long userId, DateTime banEnd)
-        {
-            await Bot.RestrictChatMemberAsync(
-                                Chat.Id,
-                                userId,
-                                new ChatPermissions
-                                {
-                                    CanSendMessages = false
-                                },
-                                banEnd
-                                );
-        }
+    protected async Task BanMember(long userId, DateTime banEnd)
+    {
+        await Bot.RestrictChatMemberAsync(
+            Chat.Id,
+            userId,
+            new ChatPermissions
+            {
+                CanSendMessages = false
+            },
+            banEnd
+        );
+    }
 
-        protected async Task<BotUserValue> GetWarnOption(User user)
-        {
-            return await Db.UserValues.FindOrCreateOption(Chat.Id, user.Id, "warnCount");
-        }
+    protected async Task<BotUserValue> GetWarnOption(User user)
+    {
+        return await Db.UserValues.FindOrCreateOption(Chat.Id, user.Id, "warnCount");
+    }
 
-        protected async Task AnswerQuery(string id, string? message = null)
-        {
-            await Bot.AnswerCallbackQueryAsync(id, message);
-        }
+    protected async Task AnswerQuery(string id, string? message = null)
+    {
+        await Bot.AnswerCallbackQueryAsync(id, message);
     }
 }

Core/Handler/GeneralHandler.cs

@@ -6,71 +6,70 @@ using Kruzya.TelegramBot.Core.Data;
 using Microsoft.EntityFrameworkCore;
 using Telegram.Bot.Types;
 
-namespace Kruzya.TelegramBot.Core.Handler
+namespace Kruzya.TelegramBot.Core.Handler;
+
+public class GeneralHandler : BotEventHandler
 {
-    public class GeneralHandler : BotEventHandler
+    [AttributeUsage(AttributeTargets.Method)]
+    public sealed class HandleEverythingAttribute : HandlerAttribute
     {
-        [AttributeUsage(AttributeTargets.Method)]
-        public sealed class HandleEverythingAttribute : HandlerAttribute
+        protected override bool CanHandle(HandlerParams param)
         {
-            protected override bool CanHandle(HandlerParams param)
-            {
-                return true;
-            }
-        }
-
-        protected readonly CoreContext databaseContext;
-
-        public GeneralHandler(CoreContext dbCtx)
-        {
-            databaseContext = dbCtx;
-        }
-
-        [HandleEverything]
-        [Priority(short.MaxValue - 10)]
-        public async Task<bool> Listener()
-        {
-            foreach (var message in new Message[] { RawUpdate.Message, RawUpdate.EditedMessage, RawUpdate.ChannelPost, RawUpdate.EditedChannelPost })
-            {
-                if (message == null)
-                {
-                    continue;
-                }
-
-                await VerifyChatPair(message);
-            }
-
             return true;
         }
+    }
 
-        public async Task VerifyChatPair(Message message)
-        {
-            await VerifyChatPair(message.Chat, message.From);
-        }
+    protected readonly CoreContext databaseContext;
 
-        public async Task VerifyChatPair(Chat chat, User user)
-        {
-            await VerifyChatPair(chat.Id, user.Id);
-        }
+    public GeneralHandler(CoreContext dbCtx)
+    {
+        databaseContext = dbCtx;
+    }
 
-        public async Task VerifyChatPair(long chat, long user)
+    [HandleEverything]
+    [Priority(short.MaxValue - 10)]
+    public async Task<bool> Listener()
+    {
+        foreach (var message in new Message[] { RawUpdate.Message, RawUpdate.EditedMessage, RawUpdate.ChannelPost, RawUpdate.EditedChannelPost })
         {
-            var hasEntry = await databaseContext.Users.AnyAsync(e => e.ChatId == chat && e.UserId == user);
-            if (hasEntry)
+            if (message == null)
             {
-                return;
+                continue;
             }
 
-            await MakeChatPair(chat, user);
+            await VerifyChatPair(message);
         }
 
-        public async Task MakeChatPair(long chat, long user)
+        return true;
+    }
+
+    public async Task VerifyChatPair(Message message)
+    {
+        await VerifyChatPair(message.Chat, message.From);
+    }
+
+    public async Task VerifyChatPair(Chat chat, User user)
+    {
+        await VerifyChatPair(chat.Id, user.Id);
+    }
+
+    public async Task VerifyChatPair(long chat, long user)
+    {
+        var hasEntry = await databaseContext.Users.AnyAsync(e => e.ChatId == chat && e.UserId == user);
+        if (hasEntry)
         {
-            await databaseContext.Users.AddAsync(new BotUser()
-            {
-                ChatId = chat,
-                UserId = user
-            });
+            return;
         }
+
+        await MakeChatPair(chat, user);
+    }
+
+    public async Task MakeChatPair(long chat, long user)
+    {
+        await databaseContext.Users.AddAsync(new BotUser()
+        {
+            ChatId = chat,
+            UserId = user
+        });
     }
 }