build: 1.2.6

Author: cssxsh

build.gradle.kts

@@ -1,18 +1,20 @@
 plugins {
-    kotlin("jvm") version "1.6.21"
-    kotlin("plugin.serialization") version "1.6.21"
+    kotlin("jvm") version "1.7.10"
+    kotlin("plugin.serialization") version "1.7.10"
 
-    id("net.mamoe.mirai-console") version "2.12.0"
-    id("net.mamoe.maven-central-publish") version "0.7.1"
+    id("net.mamoe.mirai-console") version "2.12.1"
+    id("me.him188.maven-central-publish") version "1.0.0-dev-3"
 }
 
 group = "xyz.cssxsh.mirai"
-version = "1.2.5"
+version = "1.2.6"
 
 mavenCentralPublish {
     useCentralS01()
     singleDevGithubProject("cssxsh", "mirai-administrator")
     licenseFromGitHubProject("AGPL-3.0", "master")
+    workingDir = System.getenv("PUBLICATION_TEMP")?.let { file(it).resolve(projectName) }
+        ?: project.buildDir.resolve("publishing-tmp")
     publication {
         artifact(tasks.getByName("buildPlugin"))
     }
@@ -24,22 +26,26 @@ repositories {
 }
 
 dependencies {
-    compileOnly("net.mamoe:mirai-core:2.12.0")
-    compileOnly("net.mamoe:mirai-core-utils:2.12.0")
+    compileOnly("net.mamoe:mirai-core:2.12.1")
+    compileOnly("net.mamoe:mirai-core-utils:2.12.1")
     api("com.cronutils:cron-utils:9.1.6") {
         exclude("org.slf4j")
         exclude("org.glassfish")
         exclude("org.javassist")
     }
     compileOnly("javax.validation:validation-api:2.0.1.Final")
 
-    testImplementation(kotlin("test", "1.6.21"))
+    testImplementation(kotlin("test"))
 }
 
 kotlin {
     explicitApi()
 }
 
+mirai {
+    jvmTarget = JavaVersion.VERSION_11
+}
+
 tasks {
     test {
         useJUnitPlatform()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/xyz/cssxsh/mirai/admin/MiraiAdminPlugin.kt

@@ -1,8 +1,11 @@
 package xyz.cssxsh.mirai.admin
 
+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.plugin.*
 import net.mamoe.mirai.console.plugin.jvm.*
+import net.mamoe.mirai.console.util.*
 import net.mamoe.mirai.event.*
 import net.mamoe.mirai.utils.*
 import xyz.cssxsh.mirai.admin.command.*
@@ -13,13 +16,18 @@ public object MiraiAdminPlugin : KotlinPlugin(
     JvmPluginDescription(
         id = "xyz.cssxsh.mirai.plugin.mirai-administrator",
         name = "mirai-administrator",
-        version = "1.2.5",
+        version = "1.2.6",
     ) {
         author("cssxsh")
     }
 ) {
 
     override fun onEnable() {
+        // XXX: mirai console version check
+        check(SemVersion.parseRangeRequirement(">= 2.12.0-RC").test(MiraiConsole.version)) {
+            "$name $version 需要 Mirai-Console 版本 >= 2.12.0，目前版本是 ${MiraiConsole.version}"
+        }
+
         AdminAutoApproverConfig.reload()
         AdminOnlineMessageConfig.reload()
         AdminCommentConfig.reload()

src/main/kotlin/xyz/cssxsh/mirai/admin/MiraiAdministrator.kt

@@ -375,7 +375,7 @@ public object MiraiAdministrator : SimpleListenerHost() {
 
         comments[sender.id] = System.currentTimeMillis()
 
-        val forward = buildForwardMessage {
+        val forward = buildForwardMessage(subject) {
             displayStrategy = object : ForwardMessage.DisplayStrategy {
                 override fun generateTitle(forward: RawForwardMessage): String {
                     return "来自 ${sender.render()} 的留言"

src/main/kotlin/xyz/cssxsh/mirai/admin/MiraiService.kt

@@ -83,7 +83,7 @@ internal fun AdminRequestEventData.render(): String = buildString {
         val bot = try {
             Bot.getInstance(qq).render()
         } catch (_: Throwable) {
-            "$qq"
+            "Bot($qq)"
         }
         appendLine("--- $bot ---")
         for (request in list) {
@@ -129,12 +129,6 @@ internal fun ComparableService.Loader.render(): String = buildString {
     }
 }
 
-@Deprecated("接口定义不明确", ReplaceWith("null"))
-internal fun source(contact: Contact?, event: MessageEvent?): MessageSource? {
-    logger.error { "xyz.cssxsh.mirai.admin.source 方法已废弃" }
-    return null
-}
-
 internal fun target(contact: Contact): MessageSource? {
     for (handler in ComparableService<MessageSourceHandler>()) {
         return try {