build: 1.3.9

gnuf0rce · Dec 10, 2022 · d7eaff7 · d7eaff7
1 parent 0384b4d
commit d7eaff7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 31 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,14 @@
 plugins {
-    kotlin("jvm") version "1.7.20"
-    kotlin("plugin.serialization") version "1.7.20"
-    id("net.mamoe.mirai-console") version "2.13.0"
+    kotlin("jvm") version "1.7.22"
+    kotlin("plugin.serialization") version "1.7.22"
+
+    id("net.mamoe.mirai-console") version "2.13.2"
     id("me.him188.maven-central-publish") version "1.0.0-dev-3"
     id("me.him188.kotlin-jvm-blocking-bridge") version "2.2.0-172.1"
 }
 
 group = "io.github.gnuf0rce"
-version = "1.3.8"
+version = "1.3.9"
 
 mavenCentralPublish {
     useCentralS01()
@@ -26,18 +27,18 @@ repositories {
 }
 
 dependencies {
-    api("xyz.cssxsh.baidu:baidu-aip:3.3.0") {
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-        exclude(group = "org.slf4j")
-    }
-    compileOnly("net.mamoe:mirai-silk-converter:0.0.5")
+    api("xyz.cssxsh.baidu:baidu-aip:3.3.0")
     compileOnly("xyz.cssxsh.mirai:mirai-administrator:1.3.0")
-    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.5.0")
-    //
+    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.5.1")
     testImplementation(kotlin("test"))
-    testImplementation("org.slf4j:slf4j-simple:2.0.3")
-    testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0")
+    //
+    implementation(platform("net.mamoe:mirai-bom:2.13.2"))
+    compileOnly("net.mamoe:mirai-console-compiler-common")
+    compileOnly("net.mamoe:mirai-silk-converter:0.0.5")
+    testImplementation("net.mamoe:mirai-logging-slf4j")
+    //
+    implementation(platform("org.slf4j:slf4j-parent:2.0.5"))
+    testImplementation("org.slf4j:slf4j-simple")
 }
 
 mirai {

diff --git a/src/main/kotlin/io/github/gnuf0rce/mirai/censor/MiraiContentCensorPlugin.kt b/src/main/kotlin/io/github/gnuf0rce/mirai/censor/MiraiContentCensorPlugin.kt
@@ -3,7 +3,8 @@ package io.github.gnuf0rce.mirai.censor
 import io.github.gnuf0rce.mirai.censor.command.*
 import io.github.gnuf0rce.mirai.censor.data.*
 import io.github.kasukusakura.silkcodec.*
-import net.mamoe.mirai.console.MiraiConsole
+import kotlinx.coroutines.*
+import net.mamoe.mirai.console.*
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.unregister
 import net.mamoe.mirai.console.extension.*
@@ -15,7 +16,7 @@ import net.mamoe.mirai.utils.*
 import xyz.cssxsh.mirai.admin.*
 
 public object MiraiContentCensorPlugin : KotlinPlugin(
-    JvmPluginDescription("io.github.gnuf0rce.content-censor", "1.3.8") {
+    JvmPluginDescription("io.github.gnuf0rce.content-censor", "1.3.9") {
         name("content-censor")
         author("cssxsh")
 
@@ -45,17 +46,18 @@ public object MiraiContentCensorPlugin : KotlinPlugin(
             with(jvmPluginClasspath) {
                 downloadAndAddToPath(pluginIndependentLibrariesClassLoader, listOf("io.github.kasukusakura:silk-codec:0.0.5"))
             }
-            try {
-                val audio = resolveDataFile("audio")
-                audio.mkdirs()
-                System.setProperty(MiraiContentCensor.AUDIO_CACHE_PATH, audio.path)
-                val image = resolveDataFile("image")
-                image.mkdirs()
-                System.setProperty(MiraiContentCensor.IMAGE_CACHE_PATH, image.path)
-                NativeLoader.initialize(dataFolder)
-            } catch (error: UnsatisfiedLinkError) {
-                logger.error("Silk Codec 初始化失败, folder: $dataFolder", error)
-            }
+        }
+
+        try {
+            val audio = resolveDataFile("audio")
+            audio.mkdirs()
+            System.setProperty(MiraiContentCensor.AUDIO_CACHE_PATH, audio.path)
+            val image = resolveDataFile("image")
+            image.mkdirs()
+            System.setProperty(MiraiContentCensor.IMAGE_CACHE_PATH, image.path)
+            NativeLoader.initialize(dataFolder)
+        } catch (error: UnsatisfiedLinkError) {
+            logger.error("Silk Codec 初始化失败, folder: $dataFolder", error)
         }
 
         try {
@@ -77,13 +79,13 @@ public object MiraiContentCensorPlugin : KotlinPlugin(
             MiraiAdministrator
             logger.info { "插件已桥接至 mirai-administrator" }
         } catch (_: NoClassDefFoundError) {
-            logger.warning { "未安装 mirai-administrator" }
+            logger.warning { "未安装 mirai-administrator, 将启用插件自身的监听器" }
             MiraiContentCensorListener.registerTo(globalEventChannel())
         }
     }
 
     override fun onDisable() {
-        MiraiContentCensorListener.cancelAll()
+        MiraiContentCensorListener.cancel()
         MiraiContentCensorCommand.unregister()
         MiraiCensorRecordCommand.unregister()
 

diff --git a/src/main/kotlin/io/github/gnuf0rce/mirai/censor/MiraiContentCensorUtils.kt b/src/main/kotlin/io/github/gnuf0rce/mirai/censor/MiraiContentCensorUtils.kt
@@ -38,9 +38,9 @@ internal val logger by lazy {
 
 internal val config get() = ContentCensorConfig
 
-internal val plains: MutableMap<String, CensorResult> = WeakHashMap()
+internal val plains: MutableMap<String, CensorResult> = WeakHashMap(1024)
 
-internal val images: MutableMap<String, CensorResult> = WeakHashMap()
+internal val images: MutableMap<String, CensorResult> = WeakHashMap(1024)
 
 public suspend fun censor(message: MessageChain, config: HandleConfig = ContentCensorConfig): List<CensorResult> {
     val results = ArrayList<CensorResult>()