build: 1.2.9

Author: cssxsh

build.gradle.kts

@@ -1,22 +1,22 @@
 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-RC"
     id("me.him188.maven-central-publish") version "1.0.0-dev-3"
 }
 
 group = "xyz.cssxsh.mirai"
-version = "1.2.8"
+version = "1.2.9"
 
 mavenCentralPublish {
     useCentralS01()
     singleDevGithubProject("cssxsh", "mirai-administrator")
     licenseFromGitHubProject("AGPL-3.0")
     workingDir = System.getenv("PUBLICATION_TEMP")?.let { file(it).resolve(projectName) }
-        ?: project.buildDir.resolve("publishing-tmp")
+        ?: buildDir.resolve("publishing-tmp")
     publication {
-        artifact(tasks.getByName("buildPlugin"))
+        artifact(tasks["buildPlugin"])
     }
 }
 
@@ -26,19 +26,19 @@ repositories {
 }
 
 dependencies {
-    compileOnly("net.mamoe:mirai-core:2.13.0-M1")
-    compileOnly("net.mamoe:mirai-core-utils:2.13.0-M1")
+    compileOnly("net.mamoe:mirai-core:2.13.0-RC")
+    compileOnly("net.mamoe:mirai-core-utils:2.13.0-RC")
     api("com.cronutils:cron-utils:9.2.0") {
         exclude("org.slf4j")
         exclude("org.glassfish")
         exclude("org.javassist")
     }
-    implementation("io.ktor:ktor-client-okhttp:2.1.0") {
+    implementation("io.ktor:ktor-client-okhttp:2.1.2") {
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
         exclude(group = "org.slf4j")
     }
-    implementation("io.ktor:ktor-client-encoding:2.1.0") {
+    implementation("io.ktor:ktor-client-encoding:2.1.2") {
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
         exclude(group = "org.slf4j")
@@ -51,8 +51,8 @@ dependencies {
     compileOnly("javax.validation:validation-api:2.0.1.Final")
 
     testImplementation(kotlin("test"))
-    testImplementation("org.slf4j:slf4j-simple:2.0.0")
-    testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0-M1")
+    testImplementation("org.slf4j:slf4j-simple:2.0.3")
+    testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0-RC")
 }
 
 kotlin {

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

@@ -1,5 +1,6 @@
 package xyz.cssxsh.mirai.admin
 
+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
@@ -16,7 +17,7 @@ public object MiraiAdminPlugin : KotlinPlugin(
     JvmPluginDescription(
         id = "xyz.cssxsh.mirai.plugin.mirai-administrator",
         name = "mirai-administrator",
-        version = "1.2.8",
+        version = "1.2.9",
     ) {
         author("cssxsh")
     }
@@ -76,8 +77,8 @@ public object MiraiAdminPlugin : KotlinPlugin(
         AdminSendCommand.unregister()
         AdminTimerCommand.unregister()
 
-        MiraiAdministrator.cancelAll()
-        MiraiMessageRecorder.cancelAll()
+        MiraiAdministrator.cancel()
+        MiraiMessageRecorder.cancel()
 
         AdminCommentConfig.save()
     }

src/main/kotlin/xyz/cssxsh/mirai/admin/command/AdminContactCommand.kt

@@ -68,7 +68,7 @@ public object AdminContactCommand : CompositeCommand(
     @Description("拉黑")
     public suspend fun CommandSender.black(vararg ids: String) {
         val message = try {
-            val args = ids.map(AbstractPermitteeId::parseFromString)
+            val args = ids.mapTo(HashSet(), AbstractPermitteeId::parseFromString)
             AdminBlackListData.ids.addAll(args)
             AdminBlackListData.ids.joinToString("\n") { it.asString() }
         } catch (cause: Exception) {
@@ -83,7 +83,7 @@ public object AdminContactCommand : CompositeCommand(
     @Description("取消拉黑")
     public suspend fun CommandSender.white(vararg ids: String) {
         val message = try {
-            val args = ids.map(AbstractPermitteeId::parseFromString)
+            val args = ids.mapTo(HashSet(), AbstractPermitteeId::parseFromString)
             AdminBlackListData.ids.removeAll(args)
             AdminBlackListData.ids.joinToString("\n") { it.asString() }
         } catch (cause: Exception) {

src/main/kotlin/xyz/cssxsh/mirai/admin/command/AdminFriendCommand.kt

@@ -19,8 +19,17 @@ public object AdminFriendCommand : CompositeCommand(
             buildString {
                 for (bot in Bot.instances) {
                     appendLine("--- ${bot.render()} ---")
-                    for (friend in bot.friends) {
-                        appendLine(friend.render())
+                    try {
+                        for (friendGroup in bot.friendGroups.asCollection()) {
+                            appendLine("### ${friendGroup.name} ###")
+                            for (friend in friendGroup.friends) {
+                                appendLine(friend.render())
+                            }
+                        }
+                    } catch (_: ExceptionInInitializerError) {
+                        for (friend in bot.friends) {
+                            appendLine(friend.render())
+                        }
                     }
                 }
             }