Merge branch 'main' into development

.gitignore

@@ -6,6 +6,7 @@ src/config/*.env
 /dist
 /lib
 /node_modules
+/lib    
 
 #migration
 migrate.json

src/functions/fetchMessages.ts

@@ -66,7 +66,7 @@ async function getNeedDataFromMessage(message: Message, threadInfo?: threadInfo)
       channelName: threadInfo?.channelName ? threadInfo?.channelName : '',
       threadId: threadInfo?.threadId ? threadInfo?.threadId : null,
       threadName: threadInfo?.threadName ? threadInfo?.threadName : null,
-      isGeneratedByWebhook: message.webhookId ? true : false
+      isGeneratedByWebhook: message.webhookId ? true : false,
     };
   } else {
     return {
@@ -83,7 +83,7 @@ async function getNeedDataFromMessage(message: Message, threadInfo?: threadInfo)
       channelName: message.channel instanceof TextChannel ? message.channel.name : null,
       threadId: null,
       threadName: null,
-      isGeneratedByWebhook: message.webhookId ? true : false
+      isGeneratedByWebhook: message.webhookId ? true : false,
     };
   }
 }
@@ -169,10 +169,10 @@ async function fetchMessages(
           channelName: channel.parent?.name,
         })
         : await pushMessagesToArray(connection, messagesToStore, [...fetchedMessages.values()]);
+      await rawInfoService.createRawInfos(connection, messagesToStore);
       options[fetchDirection] = boundaryMessage.id;
       fetchedMessages = await channel.messages.fetch(options);
     }
-    await rawInfoService.createRawInfos(connection, messagesToStore);
   } catch (err) {
     logger.error(
       { guild_id: connection.name, channel_id: channel.id, fetchDirection, err },

src/index.ts

@@ -169,20 +169,19 @@ async function app() {
       host: config.redis.host,
       port: config.redis.port,
       password: config.redis.password,
-    },
+    }
   });
   queue.add('cronJob', {}, {
     repeat: {
       cron: '0 0 * * *', // Run once 00:00 UTC
-      // cron: '* * * * *', // Run every minute
-      // every: 10000
     },
     jobId: 'cronJob', // Optional: Provide a unique ID for the job
-    attempts: 1, // Number of times to retry the job if it fails
+    attempts: 0, // Number of times to retry the job if it fails
     backoff: {
       type: 'exponential',
       delay: 1000, // Initial delay between retries in milliseconds
     },
+
   } as never);
 
   // Create a worker to process the job
@@ -201,6 +200,7 @@ async function app() {
         port: config.redis.port,
         password: config.redis.password,
       },
+      lockDuration: 79200000, // 22 hours
     }
   );
 

src/migrations/db/1695210587863-add-isgeneratedbyweebhook-to-rawinfo-schema.ts

@@ -1,24 +1,17 @@
 import 'dotenv/config';
-import { Client, GatewayIntentBits, } from 'discord.js';
+import { Client, GatewayIntentBits } from 'discord.js';
 import { guildService } from '../../database/services';
 import { connectDB } from '../../database';
 import config from '../../config';
 import webhookLogic from '../utils/webhookLogic';
 import DatabaseManager from '../../database/connection';
 
-const {
-    Guilds,
-    GuildMembers,
-    GuildMessages,
-    GuildPresences,
-    DirectMessages
-} = GatewayIntentBits;
-
+const { Guilds, GuildMembers, GuildMessages, GuildPresences, DirectMessages } = GatewayIntentBits;
 
 export const up = async () => {
-    const client = new Client({
-        intents: [Guilds, GuildMembers, GuildMessages, GuildPresences, DirectMessages],
-    });
+  const client = new Client({
+    intents: [Guilds, GuildMembers, GuildMessages, GuildPresences, DirectMessages],
+  });
 
     await client.login(config.discord.botToken);
     await connectDB();
@@ -30,7 +23,5 @@ export const up = async () => {
 };
 
 export const down = async () => {
-    // TODO: Implement rollback logic if needed
+  // TODO: Implement rollback logic if needed
 };
-
-

src/migrations/utils/template.ts

@@ -10,6 +10,5 @@ export const up = async () => {
 };
 
 export const down = async () => {
-    await connectDB()
-
-};
+  await connectDB();
+};