From 895c8f6bb3e1d16dcee5cb2d29deca268e11b705 Mon Sep 17 00:00:00 2001 From: Him188 Date: Mon, 14 Dec 2020 12:51:42 +0800 Subject: [PATCH] Add internal Group.uin shortcut for GroupImpl.uin, User.uin and Bot.uin for ContactOrBot.id for clearer logics --- mirai-core/src/commonMain/kotlin/contact/util.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/contact/util.kt b/mirai-core/src/commonMain/kotlin/contact/util.kt index fbddedc4c..373f8c1ee 100644 --- a/mirai-core/src/commonMain/kotlin/contact/util.kt +++ b/mirai-core/src/commonMain/kotlin/contact/util.kt @@ -11,9 +11,8 @@ package net.mamoe.mirai.internal.contact -import net.mamoe.mirai.contact.Contact -import net.mamoe.mirai.contact.Friend -import net.mamoe.mirai.contact.User +import net.mamoe.mirai.Bot +import net.mamoe.mirai.contact.* import net.mamoe.mirai.event.broadcast import net.mamoe.mirai.event.events.* import net.mamoe.mirai.internal.asQQAndroidBot @@ -26,10 +25,15 @@ import net.mamoe.mirai.message.data.Message import net.mamoe.mirai.message.data.QuoteReply import net.mamoe.mirai.message.data.asMessageChain import net.mamoe.mirai.message.data.firstIsInstanceOrNull +import net.mamoe.mirai.utils.cast import net.mamoe.mirai.utils.verbose import kotlin.contracts.InvocationKind import kotlin.contracts.contract +internal inline val Group.uin: Long get() = this.cast().uin +internal inline val User.uin: Long get() = this.id +internal inline val Bot.uin: Long get() = this.id + internal suspend fun Friend.sendMessageImpl( message: Message, friendReceiptConstructor: (MessageSourceToFriendImpl) -> MessageReceipt,