✔ Discord Master Handle Message ~

bifeldy · Oct 14, 2023 · 900db65 · 900db65
1 parent 2132f0c
commit 900db65
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/dist/fansubid/browser/ngsw.json b/dist/fansubid/browser/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1697259411691,
+  "timestamp": 1697267113397,
   "index": "/index.html",
   "assetGroups": [
     {

diff --git a/dist/fansubid/server/main.js b/dist/fansubid/server/main.js
diff --git a/src/api/main.ts b/src/api/main.ts
@@ -30,6 +30,7 @@ import { ApiKeyService } from './repository/api-key.service';
 import { GlobalService } from './services/global.service';
 import { SocketIoService } from './services/socket-io.service';
 import { ClusterMasterSlaveService } from './services/cluster-master-slave.service';
+import { DiscordService } from './services/discord.service';
 
 export async function ctx(): Promise<INestApplicationContext> {
   return await NestFactory.createApplicationContext(AppModule);
@@ -107,7 +108,9 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
     if (numCPUs > 1) {
       try {
         if (cluster.isMaster) {
-          (await ctx()).get(ClusterMasterSlaveService).masterHandleMessages();
+          const nestCtx = await ctx();
+          nestCtx.get(ClusterMasterSlaveService).masterHandleMessages();
+          await nestCtx.get(DiscordService).startBot();
           gs.log('[APP_MASTER_PID] 💻', process.pid);
           setupMaster(nestApp.getHttpServer(), {
             loadBalancingMethod: 'least-connection'

diff --git a/src/api/services/discord.service.ts b/src/api/services/discord.service.ts
@@ -55,11 +55,14 @@ export class DiscordService {
     private sosmedRepo: SocialMediaService
   ) {
     if (environment.production) {
-      this.startBot();
+      this.setupBot();
+      if (cluster.isWorker) {
+        this.startBot();
+      }
     }
   }
 
-  startBot(): void {
+  setupBot(): void {
     this.bot = new Client({
       restRequestTimeout: 60 * 1000,
       intents: [
@@ -90,7 +93,9 @@ export class DiscordService {
     this.bot.on('messageCreate', (msg: Message) => {
       if (msg.channel.id === environment.discord.channelBotId && msg.content.startsWith('~')) {
         this.gs.log(`[${msg.guild.name}] 🎉 [${(msg.channel as TextChannel).name}] [${msg.author.username}#${msg.author.discriminator}] ${msg.content} 🎶`);
-        this.handleMessage(msg);
+        if (cluster.isMaster) {
+          this.handleMessage(msg);
+        }
       }
     });
     this.bot.on('ready', async () => {
@@ -105,7 +110,14 @@ export class DiscordService {
       this.gs.log(`[DISCORD_SERVICE-MEMBER_LEAVE] 🎉 ${member.user.username}#${member.user.discriminator} - ${member.user.id} 🎶`);
       this.memberLeftRemoveVerifiedDemote(member);
     });
-    this.bot.login(environment.discord.loginToken).catch(err => this.gs.log('[DISCORD_SERVICE-LOGIN] 🎉', err, 'error'));
+  }
+
+  async startBot(): Promise<void> {
+    try {
+      await this.bot.login(environment.discord.loginToken);
+    } catch (error) {
+      this.gs.log('[DISCORD_SERVICE-LOGIN] 🎉', error, 'error');
+    }
   }
 
   async sendNews(message: MessageOptions): Promise<void> {