diff --git a/mirai-console/README.MD b/mirai-console/README.MD new file mode 100644 index 000000000..120e65bb8 --- /dev/null +++ b/mirai-console/README.MD @@ -0,0 +1,4 @@ +### Mirai Console +#### Mirai Console allows you to run Mirai in command lines. +#### More Importantly, Mirai Console support <b>Plugins</b> + diff --git a/mirai-console/src/main/kotlin/MiraiConsole.kt b/mirai-console/src/main/kotlin/MiraiConsole.kt index 4cdd0b47a..61e726269 100644 --- a/mirai-console/src/main/kotlin/MiraiConsole.kt +++ b/mirai-console/src/main/kotlin/MiraiConsole.kt @@ -1,5 +1,4 @@ -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking import net.mamoe.mirai.Bot import net.mamoe.mirai.alsoLogin import net.mamoe.mirai.plugin.PluginManager @@ -40,8 +39,13 @@ tailrec fun processNextCommandLine() { val qqNumber = commandArgs[1].toLong() val qqPassword = commandArgs[2] println("login...") - GlobalScope.launch { - Bot(qqNumber, qqPassword).alsoLogin() + + runBlocking { + try { + Bot(qqNumber, qqPassword).alsoLogin() + } catch (e: Exception) { + println("login failed") + } } } } diff --git a/mirai-plugins/image-sender/artifact/mirai-plugin-image-sender.jar b/mirai-plugins/image-sender/artifact/mirai-plugin-image-sender.jar index 4d317a317..4085cd215 100644 Binary files a/mirai-plugins/image-sender/artifact/mirai-plugin-image-sender.jar and b/mirai-plugins/image-sender/artifact/mirai-plugin-image-sender.jar differ