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

Bot.otherClients now does not include self, close #770

Browse Source
This commit is contained in:
Him188 2020-12-26 22:22:06 +08:00
parent d4a8573772
commit 5196cc410a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-api/src/commonMain/kotlin/IMirai.kt
View File

@ -187,10 +187,12 @@ public interface IMirai : LowLevelApiAccessor {
/**
* 获取在线的 [OtherClient] 列表
* @param mayIncludeSelf 服务器返回的列表可能包含 [Bot] 自己. [mayIncludeSelf] 为 `false` 会排除自己
*/
@JvmBlockingBridge
public suspend fun getOnlineOtherClientsList(
bot: Bot,
mayIncludeSelf: Boolean = false
): List<OtherClientInfo>
/**

6
mirai-core/src/commonMain/kotlin/MiraiImpl.kt
View File

@ -159,7 +159,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
group.checkBotPermission(MemberPermission.ADMINISTRATOR)
}
override suspend fun getOnlineOtherClientsList(bot: Bot): List<OtherClientInfo> {
override suspend fun getOnlineOtherClientsList(bot: Bot, mayIncludeSelf: Boolean): List<OtherClientInfo> {
bot.asQQAndroidBot()
val response = bot.network.run {
StatSvc.GetDevLoginInfo(bot.client).sendAndExpect<StatSvc.GetDevLoginInfo.Response>()
@ -172,7 +172,9 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
deviceTypeInfo.orEmpty()
)
return response.deviceList.map { it.toOtherClientInfo() }
return response.deviceList.map { it.toOtherClientInfo() }.let { result ->
if (mayIncludeSelf) result else result.filterNot { it.appId == bot.client.protocol.id.toInt() }
}
}
override suspend fun ignoreMemberJoinRequest(event: MemberJoinRequestEvent, blackList: Boolean) {