From 58eac01cad2b9b5e7dadf9c5a4502c8c5aa9f8aa Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Mon, 29 Jun 2020 22:10:52 +0800
Subject: [PATCH] Fix frontend

---
 .gitignore                                        |  5 ++++-
 .../mirai/console/command/BuiltInCommands.kt      |  2 +-
 .../mirai/console/pure/MiraiConsolePureLoader.kt  | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0e3b5b181..1d533f749 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,4 +43,7 @@ keys.properties
 /plugins/
 
 bintray.user.txt
-bintray.key.txt
\ No newline at end of file
+bintray.key.txt
+
+token.txt
+/*/token.txt
\ No newline at end of file
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/BuiltInCommands.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/BuiltInCommands.kt
index f8ac425b1..a57c3c5f4 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/BuiltInCommands.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/BuiltInCommands.kt
@@ -48,7 +48,7 @@ object BuiltInCommands {
     }
 
     object Help : SimpleCommand(
-        ConsoleCommandOwner, "help", "?",
+        ConsoleCommandOwner, "help",
         description = "Gets help about the console."
     ) {
         init {
diff --git a/frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt b/frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt
index 64ffb127d..1386edb3e 100644
--- a/frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt
+++ b/frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt
@@ -21,9 +21,12 @@
 package net.mamoe.mirai.console.pure
 
 import kotlinx.coroutines.isActive
+import net.mamoe.mirai.console.MiraiConsole
 import net.mamoe.mirai.console.command.CommandExecuteStatus
+import net.mamoe.mirai.console.command.CommandPrefix
 import net.mamoe.mirai.console.command.ConsoleCommandSender
 import net.mamoe.mirai.console.command.executeCommandDetailed
+import net.mamoe.mirai.console.job
 import net.mamoe.mirai.console.pure.MiraiConsolePure.Companion.start
 import net.mamoe.mirai.console.utils.ConsoleInternalAPI
 import net.mamoe.mirai.message.data.Message
@@ -42,8 +45,8 @@ object MiraiConsolePureLoader {
 
 
 internal fun startup() {
-    startConsoleThread()
     MiraiConsolePure().start()
+    startConsoleThread()
 }
 
 internal fun startConsoleThread() {
@@ -51,7 +54,11 @@ internal fun startConsoleThread() {
         val consoleLogger = DefaultLogger("Console")
         kotlinx.coroutines.runBlocking {
             while (isActive) {
-                val next = MiraiConsoleFrontEndPure.requestInput("")
+                val next = MiraiConsoleFrontEndPure.requestInput("").let {
+                    if (it.startsWith(CommandPrefix)) {
+                        it
+                    } else CommandPrefix + it
+                }
                 if (next.isBlank()) {
                     continue
                 }
@@ -71,6 +78,10 @@ internal fun startConsoleThread() {
                 }
             }
         }
+    }.let { thread ->
+        MiraiConsole.job.invokeOnCompletion {
+            thread.interrupt()
+        }
     }
 }