attempt to add lock

Author: robotzurg

src/commands/moderation/giveWin.ts

@@ -5,11 +5,7 @@ import {
   PermissionFlagsBits,
   SlashCommandBuilder,
 } from 'discord.js'
-import {
-  getMatchIdFromChannel,
-  getUsersInMatch,
-  getUserTeam,
-} from '../../utils/queryDB'
+import { getUsersInMatch, getUserTeam } from '../../utils/queryDB'
 import { pool } from '../../db'
 import { endMatch } from '../../utils/matchHelpers'
 
@@ -38,11 +34,11 @@ export default {
     ),
   async execute(interaction: ChatInputCommandInteraction) {
     try {
-      const matchId = await getMatchIdFromChannel(interaction.channelId)
+      const matchId = interaction.options.getInteger('match-id')
       const userId = interaction.options.getString('user', true)
       if (!matchId) {
         await interaction.reply({
-          content: 'No active match found in this channel.',
+          content: 'No match found.',
           flags: MessageFlags.Ephemeral,
         })
         return

src/utils/cronJobs.ts

@@ -60,8 +60,16 @@ export async function partyDeleteCronJob() {
 // increment elo search globally across all queues
 export async function incrementEloCronJobAllQueues() {
   const speedDefault = 2
+  let isRunning = false
 
   setInterval(async () => {
+    // Skip this iteration if the previous one is still running
+    if (isRunning) {
+      console.log('Matchmaking already running, skipping this iteration')
+      return
+    }
+
+    isRunning = true
     try {
       // get all active queues
       const activeQueues = await getActiveQueues()
@@ -166,6 +174,9 @@ export async function incrementEloCronJobAllQueues() {
       }
     } catch (err) {
       console.error('Error in global matchmaking:', err)
+    } finally {
+      // Always release the lock, even if an error occurred
+      isRunning = false
     }
   }, speedDefault * 1000)
 }