From 39c32c7cb99ea9ad108866f9c3c396742f3c5642 Mon Sep 17 00:00:00 2001
From: "jiahua.liu" <n@mamoe.net>
Date: Tue, 4 Feb 2020 14:30:12 +0800
Subject: [PATCH] Bot Permission

---
 .../network/QQAndroidBotNetworkHandler.kt     | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
index 281006471..6a6e9a1b7 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
@@ -179,7 +179,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                         permission = MemberPermission.OWNER
                     )
                 if (it.dwGroupOwnerUin == bot.uin) {
-                    group.botPermission == MemberPermission.OWNER
+                    group.botPermission = MemberPermission.OWNER
                 }
                 toGet[group] = contactList
                 bot.groups.delegate.addLast(group)
@@ -189,9 +189,9 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                     launch {
                         try {
                             getTroopMemberList(it.key, it.value, it.key.owner.id)
-                            groupInfo[it.key.uin] = it.value.size
+                            groupInfo[it.key.id] = it.value.size
                         } catch (e: Exception) {
-                            groupInfo[it.key.uin] = -1
+                            groupInfo[it.key.id] = -1
                             bot.logger.info("群${it.key.uin}的列表拉取失败, 将采用动态加入")
                         }
                     }
@@ -206,25 +206,30 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
         }
 
         //===log===//
-        fun fillUntil9(long: Number): String {
+        fun fillUntil(long: Number, size: Int): String {
             val x = long.toString()
-            return " ".repeat(
-                if (9 - x.length > 0) {
-                    9 - x.length
+            return x + " ".repeat(
+                if (size - x.length > 0) {
+                    size - x.length
                 } else {
                     0
                 }
-            ) + x
+            )
         }
 
         bot.logger.info("====================Mirai Bot List初始化完毕====================")
-        bot.logger.info("好友数量: ${fillUntil9(bot.qqs.size)}\t\t\t 加载时间: ${friendLoadFinish - startTime}ms")
-        bot.logger.info("加入群组: ${fillUntil9(bot.groups.size)}\t\t\t 加载时间: ${currentTimeMillis - friendLoadFinish}ms")
+        bot.logger.info("好友数量: ${fillUntil(bot.qqs.size, 9)}\t\t\t 加载时间: ${friendLoadFinish - startTime}ms")
+        bot.logger.info("加入群组: ${fillUntil(bot.groups.size, 9)}\t\t\t 加载时间: ${currentTimeMillis - friendLoadFinish}ms")
         groupInfo.forEach {
             if (it.value == -1) {
-                bot.logger.error("群组号码: ${fillUntil9(it.key)}\t 成员数量加载失败")
+                bot.logger.error("群组号码: ${fillUntil(it.key, 9)}\t 成员数量加载失败")
             } else {
-                bot.logger.info("群组号码: ${fillUntil9(it.key)}\t 成员数量: ${it.value}\t BOT权限: " + bot.groups[it.key].botPermission.toString() + "")
+                bot.logger.info(
+                    "群组号码: ${fillUntil(it.key, 9)}\t 成员数量: ${fillUntil(
+                        it.value,
+                        4
+                    )}\t BOT权限: " + bot.groups[it.key].botPermission.toString() + ""
+                )
             }
         }
         bot.logger.info("====================Mirai Bot List初始化完毕====================")
@@ -252,15 +257,13 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                             coroutineContext = group.coroutineContext,
                             permission = when {
                                 it.memberUin == owner -> MemberPermission.OWNER
-                                it.dwFlag == 1L -> MemberPermission.ADMINISTRATOR.apply {
-                                    if (it.memberUin == bot.uin) {
-                                        group.botPermission = MemberPermission.ADMINISTRATOR
-                                    }
-                                }
+                                it.dwFlag == 1L -> MemberPermission.ADMINISTRATOR
                                 else -> MemberPermission.MEMBER
                             }
                         )
                     )
+                } else if (it.dwFlag == 1L) {
+                    group.botPermission = MemberPermission.ADMINISTRATOR
                 }
             }
             size += data.members.size