Skip to content

fix 异常抛出逻辑错误 #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrXiaoM merged 3 commits into from
Apr 2, 2025
Merged

fix 异常抛出逻辑错误 #137

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1e3b19
增加具体原因
MrY-Cat Apr 2, 2025
1d6c443
fix 异常抛出逻辑错误
MrY-Cat Apr 2, 2025
61ab53b
Update MemberWrapper.modifyAdmin()
MrY-Cat Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/MemberWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,23 @@ internal class MemberWrapper(

override suspend fun modifyAdmin(operation: Boolean) {
checkBotPermissionHighest("设置管理员")
val count = group.members.count { it.permission == MemberPermission.ADMINISTRATOR }
if (count >= 15) {
throw IllegalStateException("Failed to grant administrator privileges to member ${id} in group ${impl.groupId}")
val failedInfo = "Failed to grant administrator privileges to member ${id} in group ${impl.groupId}: msg=the number of administrators is already full"
val adminCount = group.members.count { it.permission == MemberPermission.ADMINISTRATOR }
//管理最大人数可能随着QQ运营策略变动，网上信息杂乱难以查到当前准确值，不确定的先设为999不影响逻辑。不过其实只需要后面的判定就可以了，这里如果信息更新不准确可能会误判
val maxCount = when (group.impl.maxMemberCount) {
//3000 -> 30?
//2000 -> 20?
//1000 -> 15?
500 -> 15
else -> 999
}
if (adminCount >= maxCount) throw IllegalStateException(failedInfo)
if (bot.impl.setGroupAdmin(impl.groupId, id, operation)
.check("设置 $id 在群聊 ${group.id} 的管理员状态为 $operation")) {
impl.role = if (operation) "admin" else "member"
queryUpdate()
if (permission != MemberPermission.ADMINISTRATOR) throw IllegalStateException(failedInfo)
}
else throw IllegalStateException("Error: onebot setGroupAdmin check failed")
}

override suspend fun mute(durationSeconds: Int) {
Expand Down