feat(command): Added initGroupSetting decorator to several methods in BlacklistService, MuteService, and Rules classes; added logging to WarnService class; and made minor formatting changes.

Author: bitsgenix

src/service/command/blacklist.ts

@@ -4,11 +4,13 @@ import { GroupSettings } from "../../entities/GroupSettings";
 import * as BlackListJson from "../../helper/black_list.json";
 import { Context } from "grammy";
 import { GroupSettingsService } from "../db/group";
+import { initGroupSetting } from "../../decorators/db";
 
 export class BlacklistService {
-  private static GroupSettings = new GroupSettingsService()
+  private static GroupSettings = new GroupSettingsService();
   // Store JSON terms into the database
   @SafeExecution()
+  @initGroupSetting()
   static async storeBlacklistTerms(groupSettings: GroupSettings) {
     const newTerms = BlackListJson.map((item: { term: string }) =>
       item.term.toLowerCase()
@@ -26,6 +28,7 @@ export class BlacklistService {
 
   // Display the blacklist in a formatted manner
   @SafeExecution()
+  @initGroupSetting()
   static async BlackList(ctx: Context) {
     const groupId = ctx.chat?.id;
     if (!groupId) {
@@ -49,6 +52,7 @@ export class BlacklistService {
 
   // Add new term to the blacklist
   @SafeExecution()
+  @initGroupSetting()
   static async addBlackList(ctx: Context) {
     const groupId = ctx.chat?.id;
     if (!groupId) {
@@ -75,11 +79,12 @@ export class BlacklistService {
   }
 
   @SafeExecution()
+  @initGroupSetting()
   static async remove(ctx: Context) {
     const groupId = ctx.chat?.id!;
     const termToRemove = String(ctx.match);
     const repo = BlacklistService.GroupSettings;
-    const groupSettings = await repo.getByGroupId(groupId)
+    const groupSettings = await repo.getByGroupId(groupId);
     if (!groupSettings || !groupSettings.black_list) {
       return ctx.reply("The blacklist is currently empty.");
     }

src/service/command/mute.ts

@@ -1,5 +1,6 @@
 import { Context } from "grammy";
 import { MESSAGE } from "../../helper/message";
+import { initGroupSetting } from "../../decorators/db";
 
 export class MuteService {
   private userId: number;
@@ -13,10 +14,11 @@ export class MuteService {
   /**
    * Mutes a user with an optional expiration time.
    */
+  @initGroupSetting()
   async mute(expiration?: Date | null) {
     await this.isMute(false, expiration!);
     return MESSAGE.MUTE_SET(
-      (this.ctx.message?.reply_to_message?.from!) || (this.ctx.message?.from!),
+      this.ctx.message?.reply_to_message?.from! || this.ctx.message?.from!,
       expiration!
     );
   }
@@ -43,6 +45,7 @@ export class MuteService {
   /**
    * Lifts the mute restrictions.
    */
+  @initGroupSetting()
   async unmute() {
     await this.isMute(true);
     return MESSAGE.MUTE_CLEAR(this.ctx.message?.reply_to_message?.from!);

src/service/command/rules.ts

@@ -1,7 +1,9 @@
 import { Context } from "grammy";
 import { GroupSettingsService } from "../db/group";
+import { initGroupSetting } from "../../decorators/db";
 
 export class Rules {
+  @initGroupSetting()
   static async rules(ctx: Context) {
     const groupId = ctx.chat?.id;
 
@@ -12,7 +14,7 @@ export class Rules {
     const rulesInput = String(ctx.match).trim();
     const groupRepo: GroupSettingsService = new GroupSettingsService();
 
-    let groupSettings = await groupRepo.getByGroupId(groupId)
+    let groupSettings = await groupRepo.getByGroupId(groupId);
 
     // Check if the admin wants to delete all rules
     if (rulesInput.toLowerCase() === "r") {
@@ -29,10 +31,10 @@ export class Rules {
 
     // If the user provides new rules input, update the rules
     if (rulesInput) {
-      groupSettings!.rules = rulesInput;
+      groupSettings!.rules +="\n"+ rulesInput;
       await groupRepo.save(groupSettings!);
       return ctx.reply(
-        `Group rules have been updated:\n${groupSettings!.rules}`
+        `Group rules have been updated:${groupSettings!.rules}\n`
       );
     } else {
       // If no rules input, display the existing rules

src/service/command/warn.ts

@@ -3,7 +3,9 @@ import { BanService } from "./ban";
 import { MESSAGE } from "../../helper/message";
 import { UserService } from "../db/user";
 import { WarningServiceDb } from "../db/user/warning";
-
+import { Logger } from "../../config/logger";
+import { SafeExecution } from "../../decorators/SafeExecution";
+const logger = new Logger({file:"warnService.log",level:'debug',timestampFormat:'locale',})
 export class WarnService {
   private userId: number;
   private ctx: Context;
@@ -20,10 +22,11 @@ export class WarnService {
   /**
    * Adds a warning to a user.
    */
+  // @SafeExecution()
   async warn(reason: string = "unknown") {
     let user = await this.userRepo.findByRelations(this.userId, "warnings");
-
     if (!user) {
+      logger.info('User not found, creating new user', 'WARN_SERVICE', { userId: this.userId });
       user = await this.userRepo.createUser(this.ctx, this.userId);
     }
     // Create and save the new warning
@@ -32,16 +35,19 @@ export class WarnService {
       reason,
     });
     await this.warnRepo.save(warning);
-
+    logger.info('Warning added to user', 'WARN_SERVICE', { userId: this.userId, warningId: warning.id });
     // Update user warnings list
     user.warnings.push(warning);
     await this.userRepo.save(user);
+    logger.debug('User warnings updated', 'WARN_SERVICE', { userId: this.userId, warningCount: user.warnings.length });
 
     // Check warning count
-    const warningCount = await this.warnRepo.count(user)
+    const warningCount = await this.warnRepo.count(user);
     if (warningCount >= 3) {
+      logger.warn('User has reached warning limit', 'WARN_SERVICE', { userId: this.userId, warningCount });
       const msg: string = await new BanService(this.ctx, this.userId).ban();
-      await this.warnRepo.clear({ user });
+      await this.warnRepo.clear(user.id);
+      logger.info('User banned and warnings cleared', 'WARN_SERVICE', { userId: this.userId, message: msg });
       return { warning, banned: true, message: msg };
     }
     return { warning, banned: false, count: warningCount };
@@ -50,29 +56,39 @@ export class WarnService {
   /**
    * Clears all warnings for a user.
    */
+  @SafeExecution()
   async clear() {
+    logger.debug('Attempting to clear warnings for user', 'WARN_SERVICE', { userId: this.userId });
     const user = await this.userRepo.findByRelations(this.userId, "warnings");
     if (!user) {
+      logger.info('No warnings found for user', 'WARN_SERVICE', { userId: this.userId });
       return MESSAGE.NO_WARNINGS();
     }
 
-    await this.warnRepo.clear(user.warnings!);
+    await this.warnRepo.clear(user.id);
     user.warnings = [];
     await this.userRepo.save(user);
+    logger.info('All warnings cleared for user', 'WARN_SERVICE', { userId: this.userId });
 
     return MESSAGE.WARN_CLEAR();
   }
 
   /**
    * Counts the number of warnings for a user.
    */
+  @SafeExecution()
   async count(): Promise<number> {
-    const user = await this.userRepo.findByRelations(this.userId, "warnings");
+    logger.debug('Counting warnings for user', 'WARN_SERVICE', { userId: this.userId });
 
+    const user = await this.userRepo.findByRelations(this.userId, "warnings");
     if (!user) {
+      logger.info('No user found for warning count', 'WARN_SERVICE', { userId: this.userId });
       return 0;
     }
 
-    return user.warnings.length;
+    const warningCount = user.warnings.length;
+    logger.debug('Warning count for user', 'WARN_SERVICE', { userId: this.userId, warningCount });
+
+    return warningCount;
   }
 }