diff --git a/docs/EventList.md b/docs/EventList.md index e3053e459..1fd7f9274 100644 --- a/docs/EventList.md +++ b/docs/EventList.md @@ -22,7 +22,7 @@ - Bot 重新登录: BotReloginEvent - Bot 头像改变: BotAvatarChangedEvent - Bot 昵称改变: BotNickChangedEvent -- Bot 被戳: BotNudgedEvent +- Bot 被戳: NudgeEvent ### 消息 - 被动收到消息:MessageEvent @@ -101,4 +101,4 @@ - 一个账号请求添加机器人为好友: NewFriendRequestEvent - 好友头像改变: FriendAvatarChangedEvent - 好友昵称改变: FriendNickChangedEvent -- 好友输入状态改变: FriendInputStatusChangedEvent \ No newline at end of file +- 好友输入状态改变: FriendInputStatusChangedEvent diff --git a/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt b/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt index 1832159bf..40c59c7e7 100644 --- a/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt +++ b/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt @@ -449,8 +449,12 @@ public interface MiraiConsoleImplementation : CoroutineScope { init { Runtime.getRuntime().addShutdownHook(thread(false, name = "Mirai Console Shutdown Hook") { if (instanceInitialized) { - runBlocking { - shutdown() + try { + runBlocking { + shutdown() + } + } catch (_ : InterruptedException) { + } } }) @@ -509,4 +513,4 @@ public interface MiraiConsoleImplementation : CoroutineScope { } } } -} \ No newline at end of file +} diff --git a/mirai-console/backend/mirai-console/src/command/resolve/CommandCallInterceptor.kt b/mirai-console/backend/mirai-console/src/command/resolve/CommandCallInterceptor.kt index 845e3503d..4c2a534ff 100644 --- a/mirai-console/backend/mirai-console/src/command/resolve/CommandCallInterceptor.kt +++ b/mirai-console/backend/mirai-console/src/command/resolve/CommandCallInterceptor.kt @@ -147,8 +147,8 @@ public inline fun InterceptResult.fold( callsInPlace(onIntercepted, InvocationKind.AT_MOST_ONCE) callsInPlace(otherwise, InvocationKind.AT_MOST_ONCE) } - value?.let(otherwise) - reason?.let(onIntercepted) + value?.let { return otherwise(it) } + reason?.let { return onIntercepted(it) } UNREACHABLE_CLAUSE } diff --git a/mirai-core/src/commonMain/kotlin/utils/MiraiProtocolInternal.kt b/mirai-core/src/commonMain/kotlin/utils/MiraiProtocolInternal.kt index e6560cd29..152b0cc9e 100644 --- a/mirai-core/src/commonMain/kotlin/utils/MiraiProtocolInternal.kt +++ b/mirai-core/src/commonMain/kotlin/utils/MiraiProtocolInternal.kt @@ -34,31 +34,31 @@ internal class MiraiProtocolInternal( protocols[protocol] ?: error("Internal Error: Missing protocol $protocol") init { - //Updated from MiraiGo (2023/1/12) + //Updated from MiraiGo (2023/3/7) protocols[MiraiProtocol.ANDROID_PHONE] = MiraiProtocolInternal( apkId = "com.tencent.mobileqq", - id = 537143097, - ver = "8.9.23.9425", - sdkVer = "6.0.0.2530", + id = 537151682, + ver = "8.9.33.10335", + sdkVer = "6.0.0.2534", miscBitMap = 150470524, subSigMap = 0x10400, mainSigMap = 16724722, sign = "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D", - buildTime = 1640921786L, + buildTime = 1673599898L, ssoVersion = 19, supportsQRLogin = false, ) - //Updated from MiraiGo (2023/1/12) + //Updated from MiraiGo (2023/3/7) protocols[MiraiProtocol.ANDROID_PAD] = MiraiProtocolInternal( apkId = "com.tencent.mobileqq", - id = 537142586, - ver = "8.9.23.9425", - sdkVer = "6.0.0.2530", + id = 537151218, + ver = "8.9.33.10335", + sdkVer = "6.0.0.2534", miscBitMap = 150470524, subSigMap = 0x10400, mainSigMap = 16724722, sign = "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D", - buildTime = 1640921786L, + buildTime = 1673599898L, ssoVersion = 19, supportsQRLogin = false, )