From 0c964f3144732f396c9062be4c2cb1918d60612b Mon Sep 17 00:00:00 2001 From: LaoLittle <93422095+LaoLittle@users.noreply.github.com> Date: Thu, 6 Jan 2022 09:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BD=BF=E7=94=A8=20IPAD=20?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=8F=91=E9=80=81=E6=88=B3=E4=B8=80=E6=88=B3?= =?UTF-8?q?=20(#1711)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修改注释 * IPAD协议发送戳一戳时不抛出UnsupportedOperationException * 修改注释 “安卓协议”的描述并不准确，ANDROID_PAD 也是安卓协议，但是完全不支持戳一戳 修改进行明确 * Apply suggestions from code review * Update Nudge.kt Co-authored-by: Initial-heart <63091661+Initial-heart-1@users.noreply.github.com> Co-authored-by: Him188 --- .../src/commonMain/kotlin/message/action/Nudge.kt | 8 ++++---- mirai-core/src/commonMain/kotlin/MiraiImpl.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt b/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt index 29731e547..0064b22fc 100644 --- a/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt +++ b/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt @@ -38,11 +38,11 @@ public sealed class Nudge { /** * 发送戳一戳消息到 [receiver]. * - * 需要 [使用协议][BotConfiguration.protocol] [MiraiProtocol.ANDROID_PHONE]. + * 需要使用支持的[协议][BotConfiguration.protocol] [MiraiProtocol.ANDROID_PHONE] 或 [MiraiProtocol.IPAD]. 自 2.10 起才支持使用 IPAD 协议发送. * * @param receiver 这条 "戳一戳" 消息的接收对象. (不是 "戳" 动作的对象, 而是接收 "A 戳了 B" 这条消息的对象) * @return 成功发送时为 `true`. 若对方禁用 "戳一戳" 功能, 返回 `false`. - * @throws UnsupportedOperationException 当未使用 [安卓协议][MiraiProtocol.ANDROID_PHONE] 时抛出 + * @throws UnsupportedOperationException 当未使用 [ANDROID_PHONE 协议][MiraiProtocol.ANDROID_PHONE] 或 [IPAD 协议][MiraiProtocol.IPAD] 时抛出 * * @see NudgeEvent 事件 * @see Contact.sendNudge @@ -57,11 +57,11 @@ public sealed class Nudge { /** * 发送戳一戳消息. * - * 需要 [使用协议][BotConfiguration.protocol] [MiraiProtocol.ANDROID_PHONE]. + * 需要使用支持的[协议][BotConfiguration.protocol] [MiraiProtocol.ANDROID_PHONE] 或 [MiraiProtocol.IPAD]. 自 2.10 起才支持使用 IPAD 协议发送. * * @return 成功发送时为 `true`. 若对方禁用 "戳一戳" 功能, 返回 `false`. * - * @throws UnsupportedOperationException 当未使用 [安卓协议][MiraiProtocol.ANDROID_PHONE] 时抛出 + * @throws UnsupportedOperationException 当未使用 [ANDROID_PHONE 协议][MiraiProtocol.ANDROID_PHONE] 或 [IPAD 协议][MiraiProtocol.IPAD] 时抛出 * * @see NudgeEvent 事件 */ diff --git a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt index a294f923b..b36278852 100644 --- a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt +++ b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt @@ -781,8 +781,8 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor { } override suspend fun sendNudge(bot: Bot, nudge: Nudge, receiver: Contact): Boolean { - if (bot.configuration.protocol != BotConfiguration.MiraiProtocol.ANDROID_PHONE) { - throw UnsupportedOperationException("nudge is supported only with protocol ANDROID_PHONE") + if ((bot.configuration.protocol != BotConfiguration.MiraiProtocol.ANDROID_PHONE) && (bot.configuration.protocol != BotConfiguration.MiraiProtocol.IPAD)) { + throw UnsupportedOperationException("nudge is supported only with protocol ANDROID_PHONE or IPAD") } bot.asQQAndroidBot()