github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-13 23:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
This commit is contained in:
jiahua.liu 2020-02-07 14:55:56 +08:00
commit a4e85dd4ac
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
View File

@ -235,8 +235,7 @@ internal class GroupImpl(
this.checkBotPermissionOperator()
if (oldValue != newValue) {
launch {
bot.network.run {
bot.network.run {
TroopManagement.GroupOperation.name(
client = bot.client,
groupCode = id,

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View File

@ -181,7 +181,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
val group =
GroupImpl(
bot = bot,
coroutineContext = this.coroutineContext,
coroutineContext = bot.coroutineContext,
id = troopNum.groupCode,
uin = troopNum.groupUin,
initName = troopNum.groupName,

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

@ -280,7 +280,11 @@ internal object TroopManagement {
}
object Response : Packet
object Response : Packet {
override fun toString(): String {
return "TroopManagement.GroupOperation.Response"
}
}
}