github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-15 07:37:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add BotUnmuteEvent

Browse Source
This commit is contained in:
Him188 2020-02-12 23:54:27 +08:00
parent 9694991592
commit cc42069196
2 changed files with 33 additions and 14 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive
OnlinePush.kt
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events
BotEvents.kt

24
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View File

@ -132,9 +132,9 @@ internal class OnlinePush {
bot.getGroupByUin(groupUin).let { group ->
val member = group[target] as MemberImpl
this.discardExact(1)
return MemberLeaveEvent.Kick(member, group.members[readUInt().toLong()].also {
group.members.delegate.remove(it)
})
return MemberLeaveEvent.Kick(member.also {
group.members.delegate.remove(member)
}, group.members[readUInt().toLong()])
}
}
}
@ -187,14 +187,18 @@ internal class OnlinePush {
)
}
} else {
if (target == bot.uin) {
}
val member = group[target]
if (time == 0) {
MemberUnmuteEvent(operator = operator, member = member)
return if (target == bot.uin) {
if (time == 0) {
BotUnmuteEvent(operator)
} else
BotMuteEvent(durationSeconds = time, operator = operator)
} else {
MemberMuteEvent(operator = operator, member = member, durationSeconds = time)
val member = group[target]
if (time == 0) {
MemberUnmuteEvent(operator = operator, member = member)
} else {
MemberMuteEvent(operator = operator, member = member, durationSeconds = time)
}
}
}
}

23
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
View File

@ -129,12 +129,27 @@ data class BotGroupPermissionChangeEvent(
*/
data class BotMuteEvent(
val durationSeconds: Int,
override val group: Group,
/**
* 操作人. 为 null 则为机器人操作
* 操作人.
*/
val operator: Member?
) : GroupEvent, Packet, BotPassiveEvent
val operator: Member
) : GroupEvent, Packet, BotPassiveEvent {
override val group: Group
get() = operator.group
}
/**
* Bot 被取消禁言
*/
data class BotUnmuteEvent(
/**
* 操作人.
*/
val operator: Member
) : GroupEvent, Packet, BotPassiveEvent {
override val group: Group
get() = operator.group
}
/**
* Bot 加入了一个新群