@futdevpro/nts-dynamo 1.11.16 → 1.11.18

package/src/_modules/discord-bot/_services/dibo-io.control-service.ts

@@ -2,7 +2,7 @@ import { Client, GatewayIntentBits, Guild, Collection, GuildMember, Message, Tex
 import * as dotenv from 'dotenv'
 import { DyFM_Error, DyFM_Log, hour, week } from '@futdevpro/fsm-dynamo'
 import { DyNTS_DiBo_Routines_ControlService } from './dibo-routines.control-service'
-import { Commands_ControlService } from './dibo-commands.control-service'
+import { DyNTS_DiBo_Commands_ControlService } from './dibo-commands.control-service'
 import { DyNTS_SingletonService } from '../../../_services/base/singleton.service'
 import { DyNTS_DiBo_Main_ControlService } from './dibo-main.control-service'
 import { DyNTS_global_settings } from '../../../_collections/global-settings.const'
@@ -16,7 +16,8 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
     return DyNTS_DiBo_IO_ControlService.getSingletonInstance();
   } */
 
-  protected readonly mainDiscordBot_CS: DyNTS_DiBo_Main_ControlService;
+  protected abstract getMainDiscordBotControlService(): DyNTS_DiBo_Main_ControlService;
+  protected abstract mainDiscordBot_CS: DyNTS_DiBo_Main_ControlService;
 
   get discordServer(): Guild {
     return this.mainDiscordBot_CS.discordServer;
@@ -28,26 +29,40 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
     return this.mainDiscordBot_CS.botDisplayName;
   }
 
-  protected abstract getCommandsControlService(): Commands_ControlService;
-  protected readonly commands_CS: Commands_ControlService = this.getCommandsControlService();
+  protected abstract getCommandsControlService(): DyNTS_DiBo_Commands_ControlService;
+  protected commands_CS: DyNTS_DiBo_Commands_ControlService;
 
-  protected constructor() {
+  /* protected constructor() {
     super();
+  }   */
 
-    if (!this.discordServer) {
+  async start(issuer: string): Promise<void> {
+    try {
+      this.mainDiscordBot_CS = this.getMainDiscordBotControlService();
+      this.commands_CS = this.getCommandsControlService();
+
+      if (!this.discordServer) {
+        throw new DyFM_Error({
+          ...this.getDefaultErrorSettings(
+            'constructor', 
+            new Error(
+              'Discord server not yet initialized, ' +
+              'should only be called after DyNTS_DiBo_Main_ControlService.start'
+            ), 
+            'system-init'
+          ),
+          errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-C000`,
+        })
+      }
+    } catch (error) {
       throw new DyFM_Error({
-        ...this.getDefaultErrorSettings(
-          'constructor', 
-          new Error(
-            'Discord server not yet initialized, ' +
-            'should only be called after DyNTS_DiBo_Main_ControlService.start'
-          ), 
-          'system-init'
-        ),
-        errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-C000`,
+        ...this.getDefaultErrorSettings('start', error, issuer),
+        errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-S000`,
       })
     }
-  }  
+  }
+
+  /* async  */
 
   async handleNewMessage(message: Message, issuer: string): Promise<void> {
     try {
@@ -111,10 +126,6 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
       const isAllowedChannel = DyNTS_DiBo_global_settings.channelSettings.allowedChannels.includes(
         channelName
       ) || (isDMChannel && DyNTS_DiBo_global_settings.channelSettings.dmIsAllowed);
-      const isAllowedUser = DyNTS_DiBo_global_settings.allowedUsers === 'all' || 
-        DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.id) ||
-        DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.username) ||
-        DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.displayName);
 
       if (!isAllowedChannel) {
         if (DyNTS_DiBo_global_settings.debugLevel >= 2) {
@@ -167,6 +178,11 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
         return false;
       }
 
+      const isAllowedUser = DyNTS_DiBo_global_settings.allowedUsers === 'all' || 
+        DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.id) ||
+        DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.username) ||
+        DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.displayName);
+
       if (!isAllowedUser) {
         if (DyNTS_DiBo_global_settings.debugLevel >= 2) {
           DyFM_Log.warn('🚫❌ not allowed user. END', message.author.username, message.author.displayName)

package/src/_modules/discord-bot/_services/dibo-main.control-service.ts

@@ -83,7 +83,7 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
   protected constructor() {
     super();
 
-    DyNTS_global_settings.bot_settings = DyNTS_DiBo_global_settings;
+    DyNTS_global_settings.bot_settings ??= DyNTS_DiBo_global_settings;
 
     if (this.client) {
       throw new DyFM_Error({
@@ -239,6 +239,7 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
       this.routines_CS = this.getRoutinesControlService();
 
       await this.routines_CS.start(issuer);
+      await this.botIO_CS.start(issuer);
 
     } catch (error) {
       throw new DyFM_Error({

package/src/_modules/discord-bot/_services/dibo-routines.control-service.ts

@@ -9,9 +9,9 @@ import { DyNTS_global_settings } from '../../../_collections/global-settings.con
 
 export abstract class DyNTS_DiBo_Routines_ControlService extends DyNTS_SingletonService {
 
-  static getInstance(): DyNTS_DiBo_Routines_ControlService {
+  /* static getInstance(): DyNTS_DiBo_Routines_ControlService {
     return DyNTS_DiBo_Routines_ControlService.getSingletonInstance();
-  }
+  } */
 
   protected abstract getMainDiscordBotControlService(): DyNTS_DiBo_Main_ControlService;
 

package/src/_modules/discord-bot/index.ts

@@ -27,7 +27,7 @@ export * from './_collections/dibo-operations.util';
 export * from './_models/dibo-command.interface';
 export * from './_models/dibo-last-mention-date.inteface';
 export * from './_models/dibo-last-message-date.interface';
-export * from './_models/global-bot-log-settings.interface';
+export * from './_models/dibo-global-settings.interface';
 
 // SERVICES
 export * from './_services/dibo-commands.control-service';