refactor(commands-adminCommands) removed db initialization, added Catch decorators, updated imports and variable references, and added new methods and logic."

Author: m-mdy-m

src/app.ts

@@ -3,7 +3,7 @@ import { ServiceProvider } from './service/database/ServiceProvider';
 import logger from './utils/logger';
 async function main() {
   const cop = CopBot.getInstance();
-  const db = await ServiceProvider.initialize();
+  await ServiceProvider.initialize();
   logger.info('initialize Database');
   await cop.initial();
   logger.info('initial bot');

src/bot/commands/admin/AdminCommands.ts

@@ -135,24 +135,40 @@ export class AdminCommands {
     await reply.markdownReply(`${warns}`);
   }
   /** Mute Commands */
+  @Catch()
   static async mute(ctx: Context) {
     const reply = new BotReply(ctx);
     const message = await MuteService.muteUser(ctx);
     return await reply.textReply(message);
   }
+  @Catch()
   static async unmute(ctx: Context) {
     const reply = new BotReply(ctx);
     const message = await MuteService.unmuteUser(ctx);
     return await reply.textReply(message);
   }
   /** Admin Command  */
+  @Catch()
   static async grant(ctx: Context) {
     const reply = new BotReply(ctx);
+    const chatInfo = new ChatInfo(ctx);
+    const isOwner = await chatInfo.userIsOwner();
+    if (isOwner) {
+      await reply.textReply('The owner of the chat cannot be granted administrator privileges.');
+      return;
+    }
     const grantUser = await AdminService.grant(ctx);
     await reply.textReply(grantUser);
   }
+  @Catch()
   static async revoke(ctx: Context) {
     const reply = new BotReply(ctx);
+    const chatInfo = new ChatInfo(ctx);
+    const isOwner = await chatInfo.userIsOwner();
+    if (isOwner) {
+      await reply.textReply("You cannot revoke the owner's rights.");
+      return;
+    }
     const revokeUser = await AdminService.revoke(ctx);
     await reply.textReply(revokeUser);
   }

src/bot/commands/genearl/GeneralCommands.ts

@@ -4,7 +4,7 @@ import { BotReply } from '../../../utils/chat/BotReply';
 import { help, start, commands } from '../../../utils/jsons/botMessages.json';
 import { ChatInfo } from '../../../utils/chat/ChatInfo';
 import { DateCommand } from '../../service/general/date';
-import { info, user_support } from '../../../../docs/BotInfo.json';
+import * as BotInfoJson from '../../../../docs/BotInfo.json';
 /**
  * Reason for lowercase command names:
  *
@@ -92,10 +92,10 @@ export class GeneralCommands {
 
     // Contact information from BotInfo.json
     const contactMessage = `
-**Help Contact**: ${user_support.help_contact}\n\r
-**Support Email**: ${user_support.support_email}
+**Help Contact**: ${BotInfoJson.user_support.help_contact}\n\r
+**Support Email**: ${BotInfoJson.user_support.support_email}
 **Support Groups**:
-    ${user_support.support_groups.map((group) => `- ${group.name}: ${group.link}`).join('\n')}
+    ${BotInfoJson.user_support.support_groups.map((group) => `- ${group.name}: ${group.link}`).join('\n')}
 
 Please reach out to us for assistance.
     `;
@@ -113,14 +113,14 @@ Please reach out to us for assistance.
     // Extract detailed information from BotInfo.json
     const botInfoMessage = `
     **Bot Information**:
-    - **Name**: ${info.bot_name}
-    - **Version**: ${info.bot_version}
-    - **Status**: ${info.bot_status}
-    - **Creation Date**: ${new Date(info.created_at).toLocaleString()}
-    - **Last Updated**: ${new Date(info.last_update).toLocaleString()}
-    - **Supported Languages**: ${info.supported_languages.join(', ')}
+    - **Name**: ${BotInfoJson.info.bot_name}
+    - **Version**: ${BotInfoJson.info.bot_version}
+    - **Status**: ${BotInfoJson.info.bot_status}
+    - **Creation Date**: ${new Date(BotInfoJson.info.created_at).toLocaleString()}
+    - **Last Updated**: ${new Date(BotInfoJson.info.last_update).toLocaleString()}
+    - **Supported Languages**: ${BotInfoJson.info.supported_languages.join(', ')}
 
-**Description**: ${info.description}
+**Description**: ${BotInfoJson.info.description}
     
 This bot is designed to deliver fast and secure responses to users.
     `;

src/utils/chat/ChatInfo.ts

@@ -56,6 +56,12 @@ export class ChatInfo {
 
     return chatMember.status === 'administrator' || chatMember.status === 'creator';
   }
+  async userIsOwner(): Promise<boolean> {
+    const userId = this._ctx.from!.id;
+    const chatMember = await this._ctx.getChatMember(userId);
+
+    return chatMember.status === 'creator';
+  }
   async userReplyIsAdmin(): Promise<boolean | undefined> {
     const reply = new BotReply(this._ctx);
     const repliedMessage = await reply.getReplyMessage();