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

Remove BotJoinGroupEvent.Invite.invitorName as not provided by the server

Browse Source
This commit is contained in:
Him188 2020-05-24 14:46:35 +08:00
parent 0b62370d9d
commit 4ac4607902
2 changed files with 4 additions and 7 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat
NewContact.kt
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events
group.kt

5
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/NewContact.kt
View File

@ -15,6 +15,7 @@ import kotlinx.io.core.ByteReadPacket
import kotlinx.io.core.readBytes
import net.mamoe.mirai.contact.Group
import net.mamoe.mirai.event.events.*
import net.mamoe.mirai.getGroupOrNull
import net.mamoe.mirai.qqandroid.QQAndroidBot
import net.mamoe.mirai.qqandroid.message.contextualBugReportException
import net.mamoe.mirai.qqandroid.network.Packet
@ -178,10 +179,10 @@ internal class NewContact {
val group = bot.getNewGroup(groupCode) ?: return null
val invitor = group[actionUin]
BotJoinGroupEvent.Invite(reqUinNick, invitor)
BotJoinGroupEvent.Invite(invitor)
}
5 -> {
val group = bot.getGroup(groupCode)
val group = bot.getGroupOrNull(groupCode) ?: return null
val operator = group[actionUin]
BotLeaveEvent.Kick(operator)
}

6
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt
View File

@ -114,10 +114,6 @@ sealed class BotJoinGroupEvent : GroupEvent, Packet, AbstractEvent() {
*/
@MiraiExperimentalAPI
data class Invite internal constructor(
/**
* 邀请人昵称 (可能为备注或群名片)
*/
val invitorName: String,
/**
* 邀请人
*/
@ -126,7 +122,7 @@ sealed class BotJoinGroupEvent : GroupEvent, Packet, AbstractEvent() {
override val group: Group get() = invitor.group
override fun toString(): String {
return "BotJoinGroupEvent.Invite(invitorName='$invitorName', invitor=$invitor)"
return "BotJoinGroupEvent.Invite(invitor=$invitor)"
}
}
}