github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-21 13:54:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[console] Unwrap InvocationTargetException when executing commands (#2258)

Browse Source
This commit is contained in:
cssxsh 2022-10-28 21:07:40 +08:00 committed by GitHub
parent 5bf9fdf5b6
commit 03fc3a3445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mirai-console/backend/mirai-console/src/internal/command/CommandManagerImpl.kt
View File

@ -28,6 +28,7 @@ import net.mamoe.mirai.message.data.Message
import net.mamoe.mirai.message.data.toMessageChain
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.childScope
import java.lang.reflect.InvocationTargetException
import java.util.concurrent.locks.ReentrantLock
import kotlin.coroutines.CoroutineContext
@ -168,6 +169,12 @@ internal suspend fun executeCommandImpl(
CommandExecuteResult.Success(resolved.callee, call, resolved)
} catch (e: CommandArgumentParserException) {
CommandExecuteResult.IllegalArgument(e, resolved.callee, call, resolved)
} catch (e: InvocationTargetException) {
when (val target = e.cause) {
is CommandArgumentParserException -> CommandExecuteResult.IllegalArgument(target, resolved.callee, call, resolved)
null -> CommandExecuteResult.ExecutionFailed(e, resolved.callee, call, resolved)
else -> CommandExecuteResult.ExecutionFailed(target, resolved.callee, call, resolved)
}
} catch (e: Throwable) {
CommandExecuteResult.ExecutionFailed(e, resolved.callee, call, resolved)
}