Commit a4e85dd4 authored by jiahua.liu's avatar jiahua.liu

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
parents 1cc97422 fa515ed3
......@@ -235,7 +235,6 @@ internal class GroupImpl(
this.checkBotPermissionOperator()
if (oldValue != newValue) {
launch {
bot.network.run {
TroopManagement.GroupOperation.name(
client = bot.client,
......
......@@ -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,
......
......@@ -280,7 +280,11 @@ internal object TroopManagement {
}
object Response : Packet
object Response : Packet {
override fun toString(): String {
return "TroopManagement.GroupOperation.Response"
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment