Merge remote-tracking branch 'origin/master'

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

@@ -68,38 +68,43 @@ internal class MemberImpl(
     override val coroutineContext: CoroutineContext,
     override val permission: MemberPermission
 ) : ContactImpl(), Member, QQ by qq {
-    override val bot: QQAndroidBot get() = qq.bot
     override val group: GroupImpl by group.unsafeWeakRef()
     val qq: QQImpl by qq.unsafeWeakRef()
 
+    override val bot: QQAndroidBot by bot.unsafeWeakRef()
+
+
     override suspend fun mute(durationSeconds: Int): Boolean {
-        if (bot.uin == this@MemberImpl.qq.id)//不能自己禁言自己
-        {
+        if (bot.uin == this.qq.id) {
             return false
         }
         //判断有无禁言权限
-        val myPermission = group.get(bot.uin).permission
-        if (myPermission == MemberPermission.ADMINISTRATOR || myPermission == MemberPermission.OWNER) {
-            return if (myPermission == MemberPermission.OWNER || (myPermission == MemberPermission.ADMINISTRATOR && permission == MemberPermission.MEMBER)) {
-                bot.network.run {
-                    val response = TroopManagement.Mute(
-                        client = bot.client,
-                        memberUin = id,
-                        groupCode = group.id,
-                        timeInSecond = durationSeconds
-                    ).sendAndExpect<TroopManagement.Mute.Response>()
-                }
-                true
-            } else {
-                false
+        val myPermission = group.botPermission
+        val targetPermission = this.permission
+        if (myPermission != MemberPermission.OWNER) {
+            if (targetPermission == MemberPermission.OWNER || targetPermission == MemberPermission.ADMINISTRATOR) {
+                return false
             }
-        } else {
+        } else if (myPermission == MemberPermission.MEMBER) {
+            return false
+        }
+        try {
+            bot.network.run {
+                val response = TroopManagement.Mute(
+                    client = bot.client,
+                    groupCode = group.id,
+                    memberUin = this@MemberImpl.id,
+                    timeInSecond = durationSeconds
+                ).sendAndExpect<TroopManagement.Mute.Response>()
+            }
+            return true
+        } catch (e: Exception) {
             return false
         }
     }
 
-    override suspend fun unmute() {
-        TODO("not implemented")
+    override suspend fun unmute(): Boolean {
+        return mute(0)
     }
 
 }
@@ -115,6 +120,7 @@ internal class GroupImpl(
     override var members: ContactList<Member>
 ) : ContactImpl(), Group {
     override lateinit var owner: Member
+    override var botPermission: MemberPermission = MemberPermission.MEMBER
 
     override suspend fun quit(): Boolean {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.

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

@@ -178,6 +178,9 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                         coroutineContext = group.coroutineContext,
                         permission = MemberPermission.OWNER
                     )
+                if (it.dwGroupOwnerUin == bot.uin) {
+                    group.botPermission == MemberPermission.OWNER
+                }
                 toGet[group] = contactList
                 bot.groups.delegate.addLast(group)
             }
@@ -217,9 +220,9 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
         bot.logger.info("加入群组: ${fillUntil9(bot.groups.size)}\t\t\t 加载时间: ${currentTimeMillis - friendLoadFinish}ms")
         groupInfo.forEach {
             if (it.value == -1) {
-                bot.logger.error("群组号码: ${fillUntil9(it.key)}\t\t\t 成员数量加载失败")
+                bot.logger.error("群组号码: ${fillUntil9(it.key)}\t 成员数量加载失败\t BOT权限: " + bot.groups[it.key].botPermission.toString())
             } else {
-                bot.logger.info("群组号码: ${fillUntil9(it.key)}\t\t\t 成员数量: ${it.value}")
+                bot.logger.info("群组号码: ${fillUntil9(it.key)}\t 成员数量: ${it.value}\t")
             }
         }
         bot.logger.info("====================Mirai Bot List初始化完毕====================")
@@ -247,7 +250,11 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                             coroutineContext = group.coroutineContext,
                             permission = when {
                                 it.memberUin == owner -> MemberPermission.OWNER
-                                it.dwFlag == 1L -> MemberPermission.ADMINISTRATOR
+                                it.dwFlag == 1L -> MemberPermission.ADMINISTRATOR.apply {
+                                    if (it.memberUin == bot.uin) {
+                                        group.botPermission = MemberPermission.ADMINISTRATOR
+                                    }
+                                }
                                 else -> MemberPermission.MEMBER
                             }
                         )

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

@@ -18,7 +18,7 @@ internal object TroopManagement {
 
     internal object Mute : OutgoingPacketFactory<Mute.Response>("OidbSvc.0x570_8") {
         override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): Response {
-            // this.debugPrintThis()
+            //屁用没有
             return Response
         }
 
@@ -47,16 +47,9 @@ internal object TroopManagement {
                 )
             }
         }
-
         object Response : Packet
     }
 
-    fun Unmute(
-        client: QQAndroidClient,
-        groupCode: Long,
-        memberUin: Long
-    ): OutgoingPacket = Mute.invoke(client, groupCode, memberUin, 0)
-
 
     internal object MuteAll : OutgoingPacketFactory<LoginPacket.LoginPacketResponse>("OidbSvc.0x89a_0") {
         override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): LoginPacket.LoginPacketResponse {

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt

@@ -19,6 +19,9 @@ interface Group : Contact, CoroutineScope {
      */
     val owner: Member
 
+
+    val botPermission: MemberPermission
+
     /**
      * 群名称 (同步事件更新)
      */

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt

@@ -36,7 +36,7 @@ interface Member : QQ, Contact {
     /**
      * 解除禁言
      */
-    suspend fun unmute()
+    suspend fun unmute(): Boolean
 }
 
 @ExperimentalTime