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

Add queryPreviousNameList

Browse Source
This commit is contained in:
Him188 2019-11-27 20:28:27 +08:00
parent 043eadd149
commit 433e1fdadc
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt
View File

@ -7,6 +7,7 @@ import kotlinx.coroutines.Deferred
import net.mamoe.mirai.Bot import net.mamoe.mirai.Bot
import net.mamoe.mirai.contact.data.Profile import net.mamoe.mirai.contact.data.Profile
import net.mamoe.mirai.network.BotSession import net.mamoe.mirai.network.BotSession
import net.mamoe.mirai.network.protocol.tim.packet.action.PreviousNameList
/** /**
* QQ 对象. * QQ 对象.
@ -33,4 +34,13 @@ interface QQ : Contact {
* 将会同步更新 property [profile] * 将会同步更新 property [profile]
*/ */
suspend fun updateProfile(): Profile suspend fun updateProfile(): Profile
/**
* 查询曾用名.
*
* 曾用名可能是:
* - 昵称
* - 共同群内的群名片
*/
suspend fun queryPreviousNameList(): PreviousNameList
} }

21
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/internal/ContactImpl.kt
View File

@ -13,10 +13,7 @@ import net.mamoe.mirai.message.Message
import net.mamoe.mirai.message.MessageChain import net.mamoe.mirai.message.MessageChain
import net.mamoe.mirai.message.chain import net.mamoe.mirai.message.chain
import net.mamoe.mirai.message.singleChain import net.mamoe.mirai.message.singleChain
import net.mamoe.mirai.network.protocol.tim.packet.action.RequestProfileDetailsPacket import net.mamoe.mirai.network.protocol.tim.packet.action.*
import net.mamoe.mirai.network.protocol.tim.packet.action.RequestProfileDetailsResponse
import net.mamoe.mirai.network.protocol.tim.packet.action.SendFriendMessagePacket
import net.mamoe.mirai.network.protocol.tim.packet.action.SendGroupMessagePacket
import net.mamoe.mirai.network.sessionKey import net.mamoe.mirai.network.sessionKey
import net.mamoe.mirai.utils.SuspendLazy import net.mamoe.mirai.utils.SuspendLazy
@ -41,11 +38,11 @@ internal data class GroupImpl internal constructor(override val bot: Bot, val gr
override suspend fun getMember(id: UInt): Member = override suspend fun getMember(id: UInt): Member =
if (_members.containsKey(id)) _members[id]!! if (_members.containsKey(id)) _members[id]!!
else membersLock.withLock { else membersLock.withLock {
_members.getOrPut(id) { MemberImpl(bot, bot.getQQ(id), this) } _members.getOrPut(id) { MemberImpl(bot.getQQ(id), this) }
} }
override suspend fun sendMessage(message: MessageChain) { override suspend fun sendMessage(message: MessageChain) {
bot.sendPacket(SendGroupMessagePacket(bot.qqAccount, internalId, bot.sessionKey, message)) bot.sendPacket(GroupPacket.Message(bot.qqAccount, internalId, bot.sessionKey, message))
} }
override fun toString(): String = "Group(${this.id})" override fun toString(): String = "Group(${this.id})"
@ -67,18 +64,16 @@ internal data class QQImpl internal constructor(override val bot: Bot, override
return _profile!! return _profile!!
} }
override suspend fun queryPreviousNameList(): PreviousNameList = bot.withSession {
QueryPreviousNamePacket(bot.qqAccount, sessionKey, id).sendAndExpect()
}
override fun toString(): String = "QQ(${this.id})" override fun toString(): String = "QQ(${this.id})"
} }
/** /**
* 群成员 * 群成员
*/ */
internal data class MemberImpl(override val bot: Bot, private val delegate: QQ, override val group: Group) : Member, ContactImpl() { internal data class MemberImpl(private val delegate: QQ, override val group: Group) : QQ by delegate, Member {
override val profile: Deferred<Profile> get() = delegate.profile
override val id: UInt get() = delegate.id
override suspend fun updateProfile(): Profile = delegate.updateProfile()
override suspend fun sendMessage(message: MessageChain) = delegate.sendMessage(message)
override fun toString(): String = "Member(${this.id})" override fun toString(): String = "Member(${this.id})"
} }