From 85853b88c17b8ce52e55c028ced9c9294b52045a Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 23 Dec 2020 19:30:15 +0800 Subject: [PATCH] Add ContactOrBot.bot --- mirai-core-api/src/commonMain/kotlin/Bot.kt | 5 +++++ mirai-core-api/src/commonMain/kotlin/contact/Contact.kt | 2 +- mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mirai-core-api/src/commonMain/kotlin/Bot.kt b/mirai-core-api/src/commonMain/kotlin/Bot.kt index 2432b887d..d26690240 100644 --- a/mirai-core-api/src/commonMain/kotlin/Bot.kt +++ b/mirai-core-api/src/commonMain/kotlin/Bot.kt @@ -54,6 +54,11 @@ public interface Bot : CoroutineScope, ContactOrBot, UserOrBot { */ public override val id: Long + /** + * 返回 `this` + */ + public override val bot: Bot get() = this + /** * 昵称 */ diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt b/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt index 6f49aad7a..72a13e9a8 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt @@ -32,7 +32,7 @@ public interface Contact : ContactOrBot, CoroutineScope { * 这个联系对象所属 [Bot]. */ @WeakRefProperty - public val bot: Bot + public override val bot: Bot /** * 可以是 QQ 号码或者群号码. diff --git a/mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt b/mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt index 79df8e405..2fc10aa7a 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt @@ -27,6 +27,11 @@ public interface ContactOrBot : CoroutineScope { */ public val id: Long + /** + * 相关 [Bot] + */ + public val bot: Bot + /** * 头像下载链接 */