build: 1.3.8

Author: cssxsh

README.md

@@ -3,7 +3,7 @@
 > 基于 [Mirai Console](https://github.com/mamoe/mirai-console) 和 [百度AI内容审核](https://ai.baidu.com/ai-doc/ANTIPORN/) 的自动禁言助手
 
 [![Release](https://img.shields.io/github/v/release/gnuf0rce/mirai-content-censor)](https://github.com/gnuf0rce/mirai-content-censor/releases)
-[![Downloads](https://img.shields.io/github/downloads/gnuf0rce/mirai-content-censor/total)](https://shields.io/category/downloads)
+[![Downloads](https://img.shields.io/github/downloads/gnuf0rce/mirai-content-censor/total)](https://repo1.maven.org/maven2/io/github/gnuf0rce/mirai-content-censor/)
 [![MiraiForum](https://img.shields.io/badge/post-on%20MiraiForum-yellow)](https://mirai.mamoe.net/topic/293)
 
 同时安装有 [Mirai Administrator](https://github.com/cssxsh/mirai-administrator) 时，将会桥接到服务接口
@@ -23,45 +23,50 @@
 
 位于 `config/io.github.gnuf0rce.content-censor/ContentCensor.yml`
 
-1. `mute` 禁言时间，单位秒，默认1分钟
-2. `recall` 撤回消息的延时，单位秒，默认0秒
-3. `plain` 是否检查文本，默认 true
-4. `image` 是否检查图片，默认 false
-5. `audio` 是否检查语音，默认 false
+1.  `mute` 禁言时间，单位秒，默认1分钟
+2.  `recall` 撤回消息的延时，单位秒，默认0秒
+3.  `plain` 是否检查文本，默认 true
+4.  `image` 是否检查图片，默认 false
+5.  `audio` 是否检查语音，默认 false
+6.  `download` 下载文件再上传(语音/图片)，默认 false
 
 ### 避开审查
 
 拥有权限 `io.github.gnuf0rce.content-censor:no-censor` 的用户将不会被检测
 
 ### 指令
 
-1. `/censor` 测试是否有有违规  
+1.  `/censor` 测试是否有有违规  
     示例: `/censor cnm`
-2. `/censor-record from [sender] [date]` 查看 sender (消息的发送者) 相关的违规记录  
-   示例: `/censor from 123456 2022-07-24`
-3. `/censor-record target [subject] [date]` 查看 subject (消息的接收者) 相关的违规记录  
-   示例: `/censor target 789456 2022-07-24`
+
+2.  `/censor-record from [sender] [date]` 查看 sender (消息的发送者) 相关的违规记录  
+    示例: `/censor from 123456 2022-07-24`
+
+3.  `/censor-record target [subject] [date]` 查看 subject (消息的接收者) 相关的违规记录  
+    示例: `/censor target 789456 2022-07-24`
 
 ### 百度云后台
 
-* 策略管理 <https://ai.baidu.com/censoring/#/strategylist>  
-  配置审查规则、自定义黑白名单、测试验证规则有效性  
-* 数据统计 <https://ai.baidu.com/censoring/#/overview>  
-  统计结果，图表
-* 数据查询 <https://ai.baidu.com/censoring/#/query>  
-  历史审核数据
+*   策略管理 <https://ai.baidu.com/censoring/#/strategylist>  
+    配置审查规则、自定义黑白名单、测试验证规则有效性  
+
+*   数据统计 <https://ai.baidu.com/censoring/#/overview>  
+    统计结果，图表
+
+*   数据查询 <https://ai.baidu.com/censoring/#/query>  
+    历史审核数据
 
 ## 安装
 
 ### MCL 指令安装
 
 **请确认 mcl.jar 的版本是 2.1.0+**  
-`./mcl --update-package io.github.gnuf0rce:mirai-content-censor --channel stable --type plugin`
+`./mcl --update-package io.github.gnuf0rce:mirai-content-censor --channel maven-stable --type plugin`
 
 ### 手动安装
 
-1. 运行 [Mirai Console](https://github.com/mamoe/mirai-console) 生成`plugins`文件夹
-2. 从 [Releases](https://github.com/cssxsh/mirai-content-censor/releases) 下载`jar`并将其放入`plugins`文件夹中
+1.  从 [Releases](https://github.com/gnuf0rce/mirai-content-censor/releases) 或者 [Maven](https://repo1.maven.org/maven2/io/github/gnuf0rce/mirai-content-censor/) 下载 `mirai2.jar`
+2.  将其放入 `plugins` 文件夹中
 
 ## TODO
 

build.gradle.kts

@@ -1,13 +1,13 @@
 plugins {
     kotlin("jvm") version "1.7.20"
     kotlin("plugin.serialization") version "1.7.20"
-    id("net.mamoe.mirai-console") version "2.13.0-RC2"
+    id("net.mamoe.mirai-console") version "2.13.0"
     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.7"
+version = "1.3.8"
 
 mavenCentralPublish {
     useCentralS01()
@@ -26,18 +26,18 @@ repositories {
 }
 
 dependencies {
-    api("xyz.cssxsh.baidu:baidu-aip:3.2.1") {
+    api("xyz.cssxsh.baidu:baidu-aip:3.3.0") {
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
         exclude(group = "org.slf4j")
     }
     implementation("io.github.kasukusakura:silk-codec:0.0.5")
-    compileOnly("xyz.cssxsh.mirai:mirai-administrator:1.2.9")
-    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.4.4")
+    compileOnly("xyz.cssxsh.mirai:mirai-administrator:1.3.0")
+    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.5.0")
     //
     testImplementation(kotlin("test"))
     testImplementation("org.slf4j:slf4j-simple:2.0.3")
-    testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0-RC2")
+    testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0")
 }
 
 mirai {

src/main/kotlin/io/github/gnuf0rce/mirai/censor/MiraiBaiduAipClient.kt

@@ -19,7 +19,7 @@ public object MiraiBaiduAipClient : BaiduAipClient(config = config), CoroutineSc
     override val coroutineContext: CoroutineContext by lazy {
         try {
             MiraiContentCensorPlugin.coroutineContext + CoroutineName("BaiduAipContentCensor")
-        } catch (_: Throwable) {
+        } catch (_: UninitializedPropertyAccessException) {
             CoroutineExceptionHandler { _, throwable ->
                 if (throwable.unwrapCancellationException() !is CancellationException) {
                     logger.error("Exception in coroutine BaiduAipContentCensor", throwable)

src/main/kotlin/io/github/gnuf0rce/mirai/censor/MiraiContentCensorPlugin.kt

@@ -15,7 +15,7 @@ import net.mamoe.mirai.utils.*
 import xyz.cssxsh.mirai.admin.*
 
 public object MiraiContentCensorPlugin : KotlinPlugin(
-    JvmPluginDescription("io.github.gnuf0rce.content-censor", "1.3.6") {
+    JvmPluginDescription("io.github.gnuf0rce.content-censor", "1.3.8") {
         name("content-censor")
         author("cssxsh")
 
@@ -34,7 +34,7 @@ public object MiraiContentCensorPlugin : KotlinPlugin(
             System.setProperty(MiraiContentCensor.IMAGE_CACHE_PATH, image.path)
             NativeLoader.initialize(dataFolder)
         } catch (error: UnsatisfiedLinkError) {
-            logger.error("初始化失败, folder: $dataFolder", error)
+            logger.error("Silk Codec 初始化失败, folder: $dataFolder", error)
         }
     }
 

src/main/kotlin/io/github/gnuf0rce/mirai/censor/MiraiContentCensorUtils.kt

@@ -20,7 +20,7 @@ internal val NoCensorPermission: Permission by lazy {
                 description = "跳过检测",
                 parent = MiraiContentCensorPlugin.parentPermission
             )
-        } catch (_: Throwable) {
+        } catch (_: UninitializedPropertyAccessException) {
             rootPermission
         }
     }
@@ -29,7 +29,7 @@ internal val NoCensorPermission: Permission by lazy {
 internal val logger by lazy {
     try {
         MiraiContentCensorPlugin.logger
-    } catch (_: Throwable) {
+    } catch (_: UninitializedPropertyAccessException) {
         MiraiLogger.Factory.create(MiraiContentCensor::class)
     }
 }