feat: update to mirai-console 2.0-M2

Author: Samarium150

README.md

@@ -7,7 +7,7 @@
 <br>
 在群内随机发送图片(30s自动撤回+60s冷却)，支持关键词检索
 <br>
-适配Mirai-console ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/mamoe/mirai-console)
+适配Mirai-console ![GitHub tag](https://img.shields.io/badge/version-2.0--M2-blue)
 <br>
 可以在 [Lolicon API](https://api.lolicon.app/#/setu) 申请apikey来增加调用额度
 ## Configuration and Plugin Data

build.gradle.kts

@@ -3,11 +3,11 @@ plugins {
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.0-M1-1"
+    id("net.mamoe.mirai-console") version "2.0-M2"
 }
 
 group = "com.github.samarium150"
-version = "1.0"
+version = "1.1"
 
 repositories {
     mavenLocal()

src/main/kotlin/Lolicon.kt

@@ -1,14 +1,15 @@
 package com.github.samarium150.mirai.plugin
 
 import kotlinx.coroutines.*
+import kotlinx.io.errors.IOException
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.console.command.CommandSender
 import net.mamoe.mirai.console.command.CompositeCommand
 import net.mamoe.mirai.contact.Contact
+import net.mamoe.mirai.contact.Contact.Companion.sendImage
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.User
 import net.mamoe.mirai.message.MessageReceipt
-import net.mamoe.mirai.utils.sendImage
 import java.net.URL
 
 /**
@@ -78,7 +79,8 @@ object Lolicon: CompositeCommand(
             val response: Response = RequestHandler.get(request)
             Main.logger.info(response.toReadable())
             for (imageData in response.data) {
-                val receipt = subject?.sendImage(RequestHandler.download(imageData.url))
+                val stream = RequestHandler.download(imageData.url)
+                val receipt = subject?.sendImage(stream)
                 sendMessage(imageData.toReadable())
                 if (receipt != null) {
                     Timer.setCoolDown(subject)
@@ -96,6 +98,8 @@ object Lolicon: CompositeCommand(
                         }
                     }
                 }
+                @Suppress("BlockingMethodInNonBlockingContext")
+                withContext(Dispatchers.IO) { try { stream.close() } catch (e: IOException) {} }
             }
         } catch (e: Exception) {
             Main.logger.error(e)

src/main/kotlin/Main.kt

@@ -17,6 +17,7 @@ import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
 import net.mamoe.mirai.console.util.ConsoleExperimentalApi
 import net.mamoe.mirai.event.Listener
 import net.mamoe.mirai.event.events.MessageEvent
+import net.mamoe.mirai.event.globalEventChannel
 import net.mamoe.mirai.event.subscribeAlways
 import net.mamoe.mirai.utils.info
 
@@ -50,35 +51,35 @@ object Main: KotlinPlugin(
         /**
          * Subscribe events
          */
-        commandListener = subscribeAlways(
-            coroutineContext = CoroutineExceptionHandler { _, throwable ->
+        commandListener =
+            globalEventChannel().subscribeAlways(MessageEvent::class, CoroutineExceptionHandler { _, throwable ->
                 logger.error(throwable)
             },
-            concurrency = Listener.ConcurrencyKind.CONCURRENT,
-            priority = Listener.EventPriority.NORMAL
-        ) call@{
-            if (!enabled) return@call
-            val sender = this.toCommandSender()
-            when (val result = CommandManager.executeCommand(sender, message)) {
-                is CommandExecuteResult.IllegalArgument -> {
-                    result.exception.message?.let { sender.sendMessage(it) }
-                    // intercept()
-                }
-                is CommandExecuteResult.ExecutionFailed -> {
-                    val owner = result.command.owner
-                    val (logger, printOwner) = when (owner) {
-                        is JvmPlugin -> owner.logger to false
-                        else -> MiraiConsole.mainLogger to true
+                Listener.ConcurrencyKind.CONCURRENT,
+                Listener.EventPriority.NORMAL
+            ) call@ {
+                if (!enabled) return@call
+                val sender = this.toCommandSender()
+                when (val result = CommandManager.executeCommand(sender, message)) {
+                    is CommandExecuteResult.IllegalArgument -> {
+                        result.exception.message?.let { sender.sendMessage(it) }
+                        // intercept()
+                    }
+                    is CommandExecuteResult.ExecutionFailed -> {
+                        val owner = result.command.owner
+                        val (logger, printOwner) = when (owner) {
+                            is JvmPlugin -> owner.logger to false
+                            else -> MiraiConsole.mainLogger to true
+                        }
+                        logger.warning(
+                            "Exception in executing command `$message`" +
+                                if (printOwner) ", command owned by $owner" else "",
+                            result.exception
+                        )
+                        // intercept()
                     }
-                    logger.warning(
-                        "Exception in executing command `$message`" +
-                            if (printOwner) ", command owned by $owner" else "",
-                        result.exception
-                    )
-                    // intercept()
                 }
             }
-        }
 
         /**
          * Register commands

src/main/kotlin/Timer.kt

@@ -44,7 +44,7 @@ object Timer {
      * Asynchronously cool down for users
      *
      * @param key [Long] User's id
-     * @return [Deferred]<[Unit]>
+     * @return [Deferred]
      */
     private suspend fun userCoolingDownAsync(key: Long) = GlobalScope.async(start = CoroutineStart.LAZY) {
         delay(60000L)
@@ -55,7 +55,7 @@ object Timer {
      * Asynchronously cool down for groups
      *
      * @param key [Long] Group's id
-     * @return [Deferred]<[Unit]>
+     * @return [Deferred]
      */
     private suspend fun groupCoolingDownAsync(key: Long) = GlobalScope.async(start = CoroutineStart.LAZY) {
         delay(60000L)