fix(#120): fixed a bug with mutexes

y9san9 · Jun 5, 2023 · c3d3da9 · c3d3da9
1 parent c649f0b
commit c3d3da9
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/bot/src/main/kotlin/me/y9san9/prizebot/actors/giveaway/AutoRaffleActor.kt b/bot/src/main/kotlin/me/y9san9/prizebot/actors/giveaway/AutoRaffleActor.kt
@@ -35,8 +35,11 @@ class AutoRaffleActor(private val raffleActor: RaffleActor) : CoroutineScope {
             .forEach { schedule(bot, it, di) }
 
     suspend fun cancelSchedulesRaffle(giveawayId: Long): Boolean {
+        println("[$giveawayId]: CANCELLING RAFFLE")
         return scheduledMutex.withLock {
-            scheduled[giveawayId]?.cancel()
+            println("[$giveawayId]: GOT MUTEX")
+            scheduled[giveawayId]?.cancelAndJoin()
+            println("[$giveawayId]: CANCELLED")
             scheduled.remove(giveawayId) != null
         }
     }
@@ -53,12 +56,13 @@ class AutoRaffleActor(private val raffleActor: RaffleActor) : CoroutineScope {
                 val delayMillis = giveaway.raffleDate.toInstant().toEpochMilli() - Instant.now().toEpochMilli()
                 delay(delayMillis)
 
-                scheduledMutex.withLock {
-                    if (giveaway.id in scheduled && di.getGiveawayById(giveaway.id) != null) {
-                        scheduled.remove(giveaway.id)
-                        handleRaffleResult(bot, di, giveaway, raffleActor.raffle(bot, giveaway, di))
-                    }
+                scheduledMutex.lock()
+                if (giveaway.id in scheduled && di.getGiveawayById(giveaway.id) != null) {
+                    scheduled.remove(giveaway.id)
+                    scheduledMutex.unlock()
+                    handleRaffleResult(bot, di, giveaway, raffleActor.raffle(bot, giveaway, di))
                 }
+                if (scheduledMutex.isLocked) scheduledMutex.unlock()
             }
         }
     }