From 048a0bbdd6c521d392b77d3bef687c71c255ab25 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Thu, 6 May 2021 12:53:41 +0800
Subject: [PATCH] LoginCommand: Send login results also to ConsoleCommandSender
 (#348)

---
 backend/mirai-console/src/command/BuiltInCommands.kt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/backend/mirai-console/src/command/BuiltInCommands.kt b/backend/mirai-console/src/command/BuiltInCommands.kt
index bd7c69eaf..ea00a8199 100644
--- a/backend/mirai-console/src/command/BuiltInCommands.kt
+++ b/backend/mirai-console/src/command/BuiltInCommands.kt
@@ -42,10 +42,7 @@ import net.mamoe.mirai.console.permission.PermissionService.Companion.permit
 import net.mamoe.mirai.console.permission.PermitteeId
 import net.mamoe.mirai.console.plugin.name
 import net.mamoe.mirai.console.plugin.version
-import net.mamoe.mirai.console.util.AnsiMessageBuilder
-import net.mamoe.mirai.console.util.ConsoleExperimentalApi
-import net.mamoe.mirai.console.util.ConsoleInternalApi
-import net.mamoe.mirai.console.util.sendAnsiMessage
+import net.mamoe.mirai.console.util.*
 import net.mamoe.mirai.event.events.EventCancelledException
 import net.mamoe.mirai.message.nextMessageOrNull
 import net.mamoe.mirai.utils.BotConfiguration
@@ -185,9 +182,9 @@ public object BuiltInCommands {
                     }
                 }.doLogin()
             }.fold(
-                onSuccess = { sendMessage("${it.nick} ($id) Login successful") },
+                onSuccess = { scopeWith(ConsoleCommandSender).sendMessage("${it.nick} ($id) Login successful") },
                 onFailure = { throwable ->
-                    sendMessage(
+                    scopeWith(ConsoleCommandSender).sendMessage(
                         "Login failed: ${throwable.localizedMessage ?: throwable.message ?: throwable.toString()}" +
                             if (this is CommandSenderOnMessage<*>) {
                                 CommandManagerImpl.launch(CoroutineName("stacktrace delayer from Login")) {