fix: correct cooldown

Closes #66
Samarium150 · Dec 18, 2021 · 31fac3c · 31fac3c
1 parent 5e52c2a
commit 31fac3c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 }
 
 group = "io.github.samarium150"
-version = "5.0.0-beta.2"
+version = "5.0.0-beta.3"
 
 repositories {
     mavenLocal()

diff --git a/src/main/kotlin/io/github/samarium150/mirai/plugin/MiraiConsoleLolicon.kt b/src/main/kotlin/io/github/samarium150/mirai/plugin/MiraiConsoleLolicon.kt
@@ -47,7 +47,7 @@ import java.net.Proxy
 object MiraiConsoleLolicon : KotlinPlugin(
     JvmPluginDescription(
         id = "io.github.samarium150.mirai.plugin.mirai-console-lolicon",
-        version = "5.0.0-beta.2",
+        version = "5.0.0-beta.3",
         name = "Lolicon"
     ) {
         author("Samarium150")

diff --git a/src/main/kotlin/io/github/samarium150/mirai/plugin/util/CooldownUtil.kt b/src/main/kotlin/io/github/samarium150/mirai/plugin/util/CooldownUtil.kt
@@ -49,6 +49,21 @@ object CooldownUtil {
         return groupLockMap.getOrPut(id) { Mutex() }
     }
 
+    private fun getLock(subject: Contact?): Mutex? {
+        return when (subject) {
+            is User -> getUserLock(subject.id)
+            is Group -> getGroupLock(subject.id)
+            else -> null
+        }
+    }
+
+    private fun removeLock(subject: Contact?) {
+        when (subject) {
+            is User -> userLockMap.remove(subject.id)
+            is Group -> groupLockMap.remove(subject.id)
+        }
+    }
+
     /**
      * 获取冷却状态
      *
@@ -57,11 +72,7 @@ object CooldownUtil {
      * @see CommandSender.subject
      */
     fun getCooldownStatus(subject: Contact?): Boolean {
-        return when(subject) {
-            is User -> getUserLock(subject.id).isLocked
-            is Group -> getGroupLock(subject.id).isLocked
-            else -> false
-        }
+        return getLock(subject)?.isLocked ?: false
     }
 
     /**
@@ -73,15 +84,11 @@ object CooldownUtil {
      */
     @OptIn(DelicateCoroutinesApi::class)
     suspend fun cooldown(subject: Contact?, time: Int) = GlobalScope.launch {
-        val mutex = when (subject) {
-            is User -> userLockMap.remove(subject.id)
-            is Group -> groupLockMap.remove(subject.id)
-            else -> null
-        }
-        mutex?.withLock {
+        getLock(subject)?.withLock {
             logger.info("${subject}进入冷却")
             delay(time * 1000L)
             logger.info("${subject}已冷却")
         }
+        removeLock(subject)
     }
 }