refactor(command): BlacklistService to extract getBlackList method and updated GenerateCommand to modify command creation logic and add logging

Author: bitsgenix

src/service/command/blacklist.ts

@@ -1,4 +1,3 @@
-import { Repository } from "typeorm";
 import { SafeExecution } from "../../decorators/SafeExecution";
 import { GroupSettings } from "../../entities/GroupSettings";
 import * as BlackListJson from "../../helper/black_list.json";
@@ -12,20 +11,21 @@ export class BlacklistService {
   @SafeExecution()
   @initGroupSetting()
   static async storeBlacklistTerms(groupSettings: GroupSettings) {
-    const newTerms = BlackListJson.map((item: { term: string }) =>
-      item.term.toLowerCase()
-    );
-
+    const bl = this.getBlackList()
     const existingBlacklist = groupSettings.black_list || [];
 
     // Add only new terms
-    const updatedBlacklist = [...new Set([...existingBlacklist, ...newTerms])];
+    const updatedBlacklist = [...new Set([...existingBlacklist, ...bl])];
 
     groupSettings.black_list = updatedBlacklist;
     await BlacklistService.GroupSettings.save(groupSettings);
     return updatedBlacklist;
   }
-
+  static getBlackList() {
+    return BlackListJson.map((item: { term: string }) =>
+      item.term.toLowerCase()
+    );
+  }
   // Display the blacklist in a formatted manner
   @SafeExecution()
   @initGroupSetting()
@@ -102,4 +102,4 @@ export class BlacklistService {
 
     return ctx.reply("The desired word was removed from the blacklist");
   }
-}
+}

src/service/command/generator.ts

@@ -3,6 +3,7 @@ import { Command } from "../../controller/command";
 import { CmdMid } from "../../middleware";
 import { botIsAdmin } from "../../middleware/isAdmin";
 import { COMMANDS } from "../../helper";
+import { Logger } from "../../config/logger";
 export class GenerateCommand {
   private bot: Bot;
   constructor(bot: Bot) {
@@ -11,7 +12,7 @@ export class GenerateCommand {
   private create(name: string, mids?: ((ctx: Context, next: NextFunction) => Promise<void>)[]) {
     const middleware = mids ? this.compose(mids) : undefined;
     if (middleware) {
-      this.bot.command(name, botIsAdmin, middleware, Command.handleCommand);
+      this.bot.command(name, middleware, botIsAdmin, Command.handleCommand);
     } else {
       this.bot.command(name, Command.handleCommand);
     }
@@ -47,30 +48,31 @@ export class GenerateCommand {
    */
   generate() {
     for (const command of COMMANDS) {
-      if (["start", "help", "date","future","rules","shahin"].includes(command)) {
-        this.create(command);
-      } else if (
-        ["lock", "blacklist", "abl", "unLock", "rmbl","approvedList"].includes(command)
-      ) {
-        this.create(command, [CmdMid.isSupergroupOrChannel,CmdMid.AdminStatus]);
-      } else if (["purge"].includes(command)) {
-        this.create(command, [CmdMid.isSupergroupOrChannel,CmdMid.isReplied, CmdMid.AdminStatus]);
-      } else if (["unBan"].includes(command)) {
-        this.create(command, [
-          CmdMid.isSupergroupOrChannel,
-          CmdMid.isReplied,
-          CmdMid.AdminStatus,
-          CmdMid.adminCheckForRepliedUser,
-        ]);
-      } else {
-        this.create(command, [
-          CmdMid.userInGroup,
-          CmdMid.isSupergroupOrChannel,
-          CmdMid.isReplied,
-          CmdMid.AdminStatus,
-          CmdMid.adminCheckForRepliedUser,
-        ]);
-      }
+        if (["start", "help", "date", "future"].includes(command)) {
+            this.create(command);
+        } else if (["rules", "shahin"].includes(command)) {
+            this.create(command, [CmdMid.isValidChatType]);
+        } else if (["lock", "blacklist", "abl", "unLock", "rmbl", "approvedList"].includes(command)) {
+            this.create(command, [CmdMid.isValidChatType, CmdMid.AdminStatus]);
+        } else if (["purge"].includes(command)) {
+            this.create(command, [CmdMid.isValidChatType, CmdMid.isReplied, CmdMid.AdminStatus]);
+        } else if (["unBan"].includes(command)) {
+            this.create(command, [
+                CmdMid.isValidChatType,
+                CmdMid.isReplied,
+                CmdMid.AdminStatus,
+                CmdMid.adminCheckForRepliedUser,
+            ]);
+        } else {
+            this.create(command, [
+                CmdMid.userInGroup,
+                CmdMid.isValidChatType,
+                CmdMid.isReplied,
+                CmdMid.AdminStatus,
+                CmdMid.adminCheckForRepliedUser,
+            ]);
+        }
     }
-  }
+}
+
 }