refactor(bot): files, including app.ts, AdminCommands.ts, UserCommands.ts, BotMiddleware.ts, ReportCommand.ts, Catch.ts, and ChatInfo.ts, with changes to error handling, admin checks, and message replies.

Author: m-mdy-m

package-lock.json

@@ -19,7 +19,7 @@
     "test": "mocha --config .mochar.json",
     "clean": "rm -rf dist",
     "main": "npm run build & node --env-file=.env dist/app.js",
-    "start": "NODE_ENV=development node -r ts-node/register --env-file=.env src/app.ts",
+    "start": "NODE_ENV=development node --trace-uncaught -r ts-node/register --env-file=.env src/app.ts",
     "start:deploy": "npm run build && NODE_ENV=production node dist/app.js"
   },
   "repository": {
@@ -46,12 +46,7 @@
     "pg": "^8.13.1"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.16",
-    "@types/mocha": "^10.0.7",
     "@types/pg": "^8.11.10",
-    "@types/supertest": "^6.0.2",
-    "chai": "^5.1.1",
-    "mocha": "^10.7.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   }

package.json

@@ -13,7 +13,7 @@ async function main() {
       const db = ServiceProvider.getInstance();
       await db.close();
       logger.info('Database closed.');
-    } catch (error:any) {
+    } catch (error: any) {
       logger.error('Error during shutdown:', error);
     } finally {
       process.exit(0);
@@ -25,7 +25,7 @@ async function main() {
 
   process.on('uncaughtException', (error) => {
     console.error('Uncaught Exception:', error);
-    process.exit(1); 
+    process.exit(1);
   });
 }
 main().catch((error) => console.error('Application error:', error));

src/app.ts

@@ -1,16 +1,16 @@
-import { Context, InlineKeyboard } from 'grammy';
+import { Context } from 'grammy';
 import { BotReply } from '../../../utils/chat/BotReply';
 import { Catch } from '../../../decorators/Catch';
 import { AdminValidationService } from '../../service/admin/validation';
 import { ApprovedService } from '../../service/admin/Approved';
 import { BanService } from '../../service/admin/Ban';
 import { WarnService } from '../../service/admin/Warn';
-import { parseDuration, tehranZone } from '../../../utils';
 import { MuteService } from '../../service/admin/Mute';
 import { AdminService } from '../../service/admin/Admin';
 import { BlackListService } from '../../service/admin/Blacklist';
 import { ChatInfo } from '../../../utils/chat/ChatInfo';
 import { GroupSettingsService } from '../../service/admin/Welcome';
+import { User } from 'grammy/types';
 export class AdminCommands {
   /** Approved Commands */
   @Catch({
@@ -119,8 +119,11 @@ export class AdminCommands {
   }
   static async warns(ctx: Context) {
     const reply = new BotReply(ctx);
-    const user = ctx.message?.reply_to_message?.from!;
-
+    const replyMessage = ctx.message?.reply_to_message;
+    let user = ctx.message?.reply_to_message?.from!;
+    if (replyMessage?.forum_topic_created) {
+      user = ctx.from!;
+    }
     const { warnings } = await WarnService.getUserWarnById(ctx);
 
     if (warnings >= 0) {

src/bot/commands/admin/AdminCommands.ts

@@ -66,6 +66,7 @@ export class UserCommands {
    * or when someone replies to the bot with this command.
    * This is typically used for fun purposes,
    */
+  @Catch()
   static async codetime(ctx: Context) {
     const user = ctx.from;
     if (!user) return;

src/bot/commands/user/UserCommands.ts

@@ -44,6 +44,7 @@ export class CopBot {
       }
     } else {
       try {
+        await this._bot.api.getUpdates({ offset: -1 });
         await this._bot.start({
           onStart: (botInfo) => {
             console.log(`Bot started in long-polling mode! Username: ${botInfo.username}`);
@@ -135,7 +136,8 @@ export class CopBot {
   @Catch()
   async initial(): Promise<void> {
     new GenerateCommand(this._bot).generate();
-    await this.start();
     await this.message();
+    await this.start();
+    console.log('Bot Is Start');
   }
 }

src/bot/index.ts

@@ -8,6 +8,14 @@ export class BotMiddleware {
     const reply = new BotReply(ctx);
     const chatInfo = new ChatInfo(ctx);
     const userIsAdmin = await chatInfo.userIsAdmin();
+    const command = ctx.message?.text?.split('/')[1].split(' ')[0].toLowerCase().trim();
+    if (command === 'warns') {
+      if (isMiddleware) {
+        return nxt!();
+      } else {
+        return true;
+      }
+    }
     if (!userIsAdmin) {
       await reply.textReply('Sorry, but you need to be an admin to use this command!');
       return false;
@@ -59,7 +67,14 @@ Sorry, but I don't have the necessary permissions to perform this action. Please
    */
   static async adminCheckForRepliedUser(ctx: Context, nxt: NextFunction | null, isMiddleware: boolean = true) {
     const reply = new BotReply(ctx);
-    const repliedUserId = ctx.message?.reply_to_message?.from?.id!;
+    const replyMeseage = ctx.message?.reply_to_message!;
+    let repliedUserId: number | null;
+    if (replyMeseage && !replyMeseage?.forum_topic_created) {
+      repliedUserId = replyMeseage!.from?.id!;
+    } else {
+      repliedUserId = null;
+    }
+
     const admins = await ctx.api.getChatAdministrators(ctx.chat!.id);
     const isAdmin = admins!.some((admin) => admin.user.id === repliedUserId);
     const command = ctx.message?.text?.split('/')[1].split(' ')[0].toLowerCase().trim();

src/bot/middleware/BotMiddleware.ts

@@ -1,5 +1,6 @@
 import { Context } from 'grammy';
 import { BotReply } from '../../../utils/chat/BotReply';
+import { ChatInfo } from '../../../utils/chat/ChatInfo';
 
 export class ReportCommand {
   // Store pending reports with user IDs as keys
@@ -13,11 +14,16 @@ export class ReportCommand {
    */
   static async report(ctx: Context) {
     const reply = new BotReply(ctx);
-
+    const chatInfo = new ChatInfo(ctx);
+    const isAdmin = await chatInfo.isAdmin(ctx.message?.reply_to_message?.from!.id!);
+    if (isAdmin) {
+      await reply.textReply('This user is an admin and cannot be processed for this action.');
+      return;
+    }
     // Ensure the report command is a reply to another message
     const reportedMessage = ctx.message?.reply_to_message;
     if (!reportedMessage || !reportedMessage.from) {
-      await ctx.reply('Please use the /report command by replying to the message you want to report.');
+      await reply.textReply('Please use the /report command by replying to the message you want to report.');
       return;
     }
 

src/bot/service/user/ReportCommand.ts

@@ -1,4 +1,4 @@
-import { Context } from 'grammy';
+import { Context, GrammyError } from 'grammy';
 import { ErrorResponse } from '../types/ResponseTypes';
 import logger from '../utils/logger';
 import { ServiceProvider } from '../service/database/ServiceProvider';
@@ -10,6 +10,10 @@ export function Catch(customResponse?: ErrorResponse) {
       try {
         return await originalMethod.apply(this, args);
       } catch (error: any) {
+        if (error instanceof GrammyError && error.error_code === 400 && error.description === 'Bad Request: message to be replied not found') {
+          console.warn(`Message not found to reply to. Skipping...`);
+          return;
+        }
         if (error.error_code === 403 && error.description.includes('bot was kicked')) {
           const chatId = error.payload?.chat_id;
           logger.warn(`[Warning] Bot was kicked from a group (chat_id: ${error.payload.chat_id}). Skipping.`);
@@ -25,10 +29,6 @@ export function Catch(customResponse?: ErrorResponse) {
           category: 'General',
         };
         logger.error(`[Category: ${errorResponse.category}] Error in ${target.constructor.name}.${propKey}(): ${error.message}`);
-        // Send the error message to the user (if context is available)
-        if (ctx && typeof ctx.reply === 'function') {
-          await ctx.reply(errorResponse.message);
-        }
       }
     };
 

src/decorators/Catch.ts

@@ -46,7 +46,7 @@ export class MessagesService {
 
       if (user.id !== this._ctx.me?.id) {
         // Notify the group about the member leaving
-        const username = user.username ? `@${user.username}` : user.first_name;
+        const username = user.username ? `${user.username}` : user.first_name;
         await this._ctx.reply(`${username} has left the chat.`);
       }
     }
@@ -71,7 +71,7 @@ export class MessagesService {
       group = await groupService.save(this._ctx);
     }
     const approvedUsers = group.approved_users.map(Number);
-    const isAdmin = await this._chatInfo.isAdmin(this._ctx, userId);
+    const isAdmin = await this._chatInfo.isAdmin(userId);
     // Allow approved users and admins to bypass blacklist checks
     if (approvedUsers.includes(+userId) || isAdmin) {
       return;