fix: middleware, message check, and database services: rename isSupergroupOrChannel to isValidChatType, remove blacklist terms initialization, update GroupSettingsService to use BlackListJson, and add new methods to

Author: bitsgenix

src/middleware/index.ts

@@ -15,7 +15,7 @@ export class CmdMid {
   static async AdminStatus(ctx: Context, nxt: NextFunction) {
     await new AdminChecker(ctx, nxt).checkAdminStatus();
   }
-  static async isSupergroupOrChannel(ctx: Context, nxt: NextFunction) {
-    await new ActionFilter(ctx, nxt).isSupergroupOrChannel();
+  static async isValidChatType(ctx: Context, nxt: NextFunction) {
+    await new ActionFilter(ctx, nxt).isValidChatType();
   }
 }

src/service/MessageCheck.ts

@@ -163,8 +163,6 @@ export class MessageCheck {
           `Bot added to group ${chat.title} by ${from?.username}`,
           "GROUP"
         );
-        // Initialize blacklist terms from BlackListJson
-        await BlacklistService.storeBlacklistTerms(groupSettings);
       } else {
         logger.info(
           `Bot re-added to existing group ${chat.title} by ${from?.username}`,

src/service/db/group/index.ts

@@ -1,6 +1,7 @@
 import { Context } from "grammy";
 import { DatabaseService } from "..";
 import { GroupSettings } from "../../../entities/GroupSettings";
+import * as BlackListJson from "../../../helper/black_list.json";
 
 export class GroupSettingsService extends DatabaseService {
   private groupSettingsRepo = this.getRepo(GroupSettings);
@@ -23,17 +24,21 @@ export class GroupSettingsService extends DatabaseService {
   async init(ctx: Context) {
     const chat = ctx.chat!;
     const from = ctx.from;
-    return await this.save(
-      await this.create({
-        group_id: chat.id,
-        group_name: chat.title,
-        welcome_message: "",
-        chat_permissions: (await ctx.api.getChat(chat.id)).permissions,
-        rules: "",
-        description: "",
-        black_list: [],
-        added_by_id: from?.id,
-      })
+    const bl = BlackListJson.map((item: { term: string }) =>
+      item.term.toLowerCase()
     );
+    const group = await this.create({
+      group_id: chat.id,
+      group_name: chat.title,
+      welcome_message: "",
+      chat_permissions: (await ctx.api.getChat(chat.id)).permissions,
+      rules: "",
+      description: "",
+      black_list: bl,
+      added_by_id: from?.id,
+      approvedUsers: [],
+      members: [],
+    });
+    return await this.groupSettingsRepo.save(group);
   }
 }

src/service/db/user/Approved.ts

@@ -20,11 +20,20 @@ export class ApprovedUserService extends DatabaseService {
     });
   }
   async getByGroup(groupSettings: GroupSettings): Promise<ApprovedUser[]> {
-  return this.approvedUserRepo.find({
-    where: { group: { id: groupSettings.id } }, // Use the ID to filter
-    relations: ["group"],
-  });
-}
+    return this.approvedUserRepo.find({
+      where: { group: { id: groupSettings.id } }, // Use the ID to filter
+      relations: ["group"],
+    });
+  }
+  async getByUserIdAndGroup(
+    userId: number,
+    groupId: number
+  ): Promise<ApprovedUser | null> {
+    return this.approvedUserRepo.findOne({
+      where: { user: { id: userId }, group: { id: groupId } },
+      relations: ["user", "group"],
+    });
+  }
   async remove(id: number): Promise<void> {
     await this.approvedUserRepo.delete(id);
   }

src/service/db/user/index.ts

@@ -10,7 +10,9 @@ export class UserService extends DatabaseService {
   }
 
   async getByTelegramId(telegramId: number) {
-    return this.userRepo.findOne({ where: { telegram_id: telegramId } });
+    return await this.userRepo.findOne({
+      where: { telegram_id: 6376425576 },
+    });
   }
   async save(user: User) {
     return this.userRepo.save(user);