build: 1.1.5

README.md

@@ -3,13 +3,13 @@
 > 基于 [Mirai Console](https://github.com/mamoe/mirai-console) 的 MEME 生成插件
 > 
 [![Release](https://img.shields.io/github/v/release/cssxsh/meme-helper)](https://github.com/cssxsh/meme-helper/releases)
-[![Downloads](https://img.shields.io/github/downloads/cssxsh/meme-helper/total)](https://shields.io/category/downloads)
+[![Downloads](https://img.shields.io/github/downloads/cssxsh/meme-helper/total)](https://repo1.maven.org/maven2/xyz/cssxsh/meme-helper/)
 [![MiraiForum](https://img.shields.io/badge/post-on%20MiraiForum-yellow)](https://mirai.mamoe.net/topic/1271)
 
 **使用前应该查阅的相关文档或项目**
 
-* [User Manual](https://github.com/mamoe/mirai/blob/dev/docs/UserManual.md)
-* [Permission Command](https://github.com/mamoe/mirai/blob/dev/mirai-console/docs/BuiltInCommands.md#permissioncommand)
+*   [User Manual](https://github.com/mamoe/mirai/blob/dev/docs/UserManual.md)
+*   [Permission Command](https://github.com/mamoe/mirai/blob/dev/mirai-console/docs/BuiltInCommands.md#permissioncommand)
 
 插件权限ID `xyz.cssxsh.mirai.plugin.meme-helper:*`，使用前授予权限
 
@@ -22,12 +22,12 @@
 
 ### MCL 指令安装
 
-`./mcl --update-package xyz.cssxsh:meme-helper --channel stable --type plugin`
+`./mcl --update-package xyz.cssxsh:meme-helper --channel maven-stable --type plugin`
 
 ### 手动安装
 
-1. 运行 [Mirai Console](https://github.com/mamoe/mirai-console) 生成`plugins`文件夹
-2. 从 [Releases](https://github.com/cssxsh/meme-helper/releases) 下载`jar`并将其放入`plugins`文件夹中
+1.  从 [Releases](https://github.com/cssxsh/meme-helper/releases) 或者 [Maven](https://repo1.maven.org/maven2/xyz/cssxsh/meme-helper/) 下载 `mirai2.jar`
+2.  将其放入 `plugins` 文件夹中
 
 ## 基本功能
 
@@ -73,13 +73,13 @@ PornHub Login 生成
 游戏王 表情包生成
 可以发送 `图片` 或者 `@某人` 或者 `QQ号` 确定卡片图片  
 可以使用 `xxx=yyy`, 指定属性，可选属性有：
-* 卡片名称: `name`
-* 怪兽属性: `attr` = `dark, divine, earth, fire, light, spell, trap, water, wind`
-* 怪兽等级: `level`
-* 怪兽种族: `race`
-* 怪兽攻击: `atk`
-* 怪兽防御: `def`
-* 卡片版权：`copyright`
+*   卡片名称: `name`
+*   怪兽属性: `attr` = `dark, divine, earth, fire, light, spell, trap, water, wind`
+*   怪兽等级: `level`
+*   怪兽种族: `race`
+*   怪兽攻击: `atk`
+*   怪兽防御: `def`
+*   卡片版权：`copyright`
 
 示例: 
 ```

build.gradle.kts

@@ -1,18 +1,17 @@
 plugins {
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.serialization") version "1.7.10"
+    kotlin("jvm") version "1.7.20"
+    kotlin("plugin.serialization") version "1.7.20"
 
-    id("net.mamoe.mirai-console") version "2.13.0-M1"
+    id("net.mamoe.mirai-console") version "2.13.0"
     id("me.him188.maven-central-publish") version "1.0.0-dev-3"
 }
 
 group = "xyz.cssxsh"
-version = "1.1.4"
+version = "1.1.5"
 
 repositories {
     mavenLocal()
     mavenCentral()
-    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
 }
 
 mavenCentralPublish {
@@ -27,18 +26,18 @@ mavenCentralPublish {
 }
 
 dependencies {
-    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.4.4")
-    compileOnly("xyz.cssxsh.mirai:mirai-skia-plugin:1.1.9")
-    compileOnly("xyz.cssxsh:weibo-helper:1.5.5")
-    compileOnly("xyz.cssxsh:bilibili-helper:1.6.5")
-    compileOnly("net.mamoe:mirai-core-utils:2.13.0-M1")
-    compileOnly("net.mamoe:mirai-core:2.13.0-M1")
-    implementation("io.ktor:ktor-client-okhttp:2.1.1") {
+    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.5.0")
+    compileOnly("xyz.cssxsh.mirai:mirai-skia-plugin:1.2.1")
+    compileOnly("xyz.cssxsh:weibo-helper:1.5.8")
+    compileOnly("xyz.cssxsh:bilibili-helper:1.6.6")
+    compileOnly("net.mamoe:mirai-core-utils:2.13.0")
+    compileOnly("net.mamoe:mirai-core:2.13.0")
+    implementation("io.ktor:ktor-client-okhttp:2.1.3") {
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
         exclude(group = "org.slf4j")
     }
-    implementation("io.ktor:ktor-client-encoding:2.1.1") {
+    implementation("io.ktor:ktor-client-encoding:2.1.3") {
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
         exclude(group = "org.slf4j")
@@ -50,10 +49,10 @@ dependencies {
     }
     // Test
     testImplementation(kotlin("test"))
-    testImplementation("xyz.cssxsh.mirai:mirai-skia-plugin:1.1.9")
-    testImplementation("org.slf4j:slf4j-simple:2.0.0")
-    testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0-M1")
-    testImplementation("net.mamoe:mirai-core-utils:2.13.0-M1")
+    testImplementation("xyz.cssxsh.mirai:mirai-skia-plugin:1.2.1")
+    testImplementation("org.slf4j:slf4j-simple:2.0.3")
+    testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0")
+    testImplementation("net.mamoe:mirai-core-utils:2.13.0")
 }
 
 mirai {

src/main/kotlin/MemeHelperPlugin.kt

@@ -1,6 +1,7 @@
 package xyz.cssxsh.mirai.meme
 
-import net.mamoe.mirai.console.MiraiConsole
+import kotlinx.coroutines.*
+import net.mamoe.mirai.console.*
 import net.mamoe.mirai.console.extension.*
 import net.mamoe.mirai.console.plugin.jvm.*
 import net.mamoe.mirai.console.plugin.*
@@ -11,7 +12,7 @@ public object MemeHelperPlugin : KotlinPlugin(
     JvmPluginDescription(
         id = "xyz.cssxsh.mirai.plugin.meme-helper",
         name = "meme-helper",
-        version = "1.1.4",
+        version = "1.1.5",
     ) {
         author("cssxsh")
         dependsOn("xyz.cssxsh.mirai.plugin.mirai-skia-plugin", ">= 1.1.0", false)
@@ -37,7 +38,7 @@ public object MemeHelperPlugin : KotlinPlugin(
     }
 
     override fun onDisable() {
-        MemeHelper.cancelAll()
+        MemeHelper.cancel()
         disableMemeService()
     }
 }