refactor(service/bot) BotOverseer and Spam classes: removed logger statements, updated imports, and modified spam time logic

Author: bitsgenix

src/service/bot/index.ts

@@ -1,8 +1,7 @@
 import { Context } from "grammy";
 import { ChatMemberAdministrator, ChatMemberOwner, User } from "grammy/types";
 import { SafeExecution } from "../../decorators/SafeExecution";
-import { BotInfo, RepliedMessage } from "../../types/types";
-import { logger } from "../../config/logger";
+import { BotInfo, RepliedMessage } from "../../types/index";
 export class BotOverseer {
   private ctx: Context;
 
@@ -16,17 +15,11 @@ export class BotOverseer {
   async isBotAdmin(): Promise<boolean> {
     const botInfo = await this.getBotInfo();
     if (!botInfo) {
-      logger.error("Bot info is not available.", undefined, "isBotAdmin");
       return false;
     }
 
     const chatMember = await this.ctx.getChatMember(botInfo.id);
     if (!chatMember) {
-      logger.error(
-        "Failed to fetch chat member info for the bot.",
-        undefined,
-        "isBotAdmin"
-      );
       return false;
     }
     return ["administrator", "creator"].includes(chatMember.status);
@@ -75,20 +68,12 @@ export class BotOverseer {
   @SafeExecution()
   async getUser(): Promise<User> {
     const user = await this.ctx.message?.from;
-    if (!user) {
-      logger.error(
-        "User information is not available in the context in getUser",
-        undefined,
-        "BotOverseer Class",
-        {
-          context: this.ctx,
-        }
-      );
-    }
     return user!;
   }
   @SafeExecution()
-  async userInGroup(msg: string = "The user is no longer a member of this group."): Promise<boolean | undefined> {
+  async userInGroup(
+    msg: string = "The user is no longer a member of this group."
+  ): Promise<boolean | undefined> {
     const id = await this.getRepliedUserId();
     if (!id) {
       await this.ctx.reply(

src/service/bot/spam.ts

@@ -2,15 +2,14 @@ import { Context } from "grammy";
 import { WarnService } from "../command/warn";
 import { SafeExecution } from "../../decorators/SafeExecution";
 import { MessageCheck } from "../MessageCheck";
+import { GroupSettingsService } from "../db/group";
 
 export class Spam {
   static MessageCounts: Map<
     number,
     { count: number; lastMessageTime: number }
   > = new Map();
 
-  static messageFlags: { [groupId: number]: { [date: string]: boolean } } = {};
-
   @SafeExecution()
   static isWithinTimeRange(current: Date, start: string, end: string): boolean {
     const [startHour, startMinute] = start.split(":").map(Number);
@@ -25,36 +24,37 @@ export class Spam {
   }
 
   @SafeExecution()
-  static isExactTime(current: Date): boolean {
-    const randomTime = Spam.getRandomTime();
-    const [targetHour, targetMinute] = randomTime.split(":").map(Number);
-    return (
-      current.getHours() === targetHour && current.getMinutes() === targetMinute
-    );
-  }
-
-  private static getRandomTime(): string {
-    const times = ["01:00", "01:05"];
-    return times[Math.floor(Math.random() * times.length)];
+  static async toggleSpamTime(ctx: Context, toggle: boolean) {
+     const groupId = ctx.chat!.id;
+     const groupRepo = new GroupSettingsService();
+     const groupSettings = await groupRepo.getByGroupId(groupId);
+     if (groupSettings) {
+       if (toggle && !groupSettings.isSpamTime) {
+         groupSettings.isSpamTime = toggle;
+         await groupRepo.save(groupSettings);
+         await ctx.reply("Spam time has started! 🎉");
+       } else if (!toggle && groupSettings.isSpamTime) {
+         groupSettings.isSpamTime = toggle;
+         await groupRepo.save(groupSettings);
+       }
+     }
   }
 
   @SafeExecution()
-  static async WarnSpam(ctx: Context) {
-    const chatId = ctx.chat!.id;
+  static async checkAndToggleSpamTime(ctx: Context) {
     const now = new Date();
-    const todayKey = now.toISOString().split("T")[0];
 
-    // Check if within the specified time range
-    if (!Spam.messageFlags[chatId]) {
-      Spam.messageFlags[chatId] = {};
+    // Check if it's within spam time (12:45 AM to 1:00 AM)
+    if (await Spam.isWithinTimeRange(now, "00:45", "13:00")) {
+      await Spam.toggleSpamTime(ctx, true);
+    } else {
+      await Spam.toggleSpamTime(ctx, false);
     }
+  }
 
-    if (!Spam.messageFlags[chatId][todayKey]) {
-      if (await Spam.isWithinTimeRange(now, "00:45", "00:59")) {
-        await ctx.reply("بوی اسپم تایم میاد 😋");
-        Spam.messageFlags[chatId][todayKey] = true;
-      }
-    }
+  @SafeExecution()
+  static async WarnSpam(ctx: Context) {
+    await Spam.checkAndToggleSpamTime(ctx);
 
     // Existing spam check logic
     if (ctx.message?.sticker || ctx.message?.animation) {
@@ -76,7 +76,7 @@ export class Spam {
             return;
           }
         } else {
-          userData.count = 1; // Reset count if outside the time window
+          userData.count = 1; 
         }
         userData.lastMessageTime = currentTime;
         Spam.MessageCounts.set(userId, userData);
@@ -107,4 +107,4 @@ export class Spam {
       );
     }
   }
-}
+}