Merge pull request #12 from takayama-lily/dev

-
takayama-lily · Sep 1, 2020 · 44f52bf · 44f52bf
2 parents 9cb2c7d + 6182395
commit 44f52bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/client.js b/client.js
@@ -288,10 +288,10 @@ class AndroidClient extends Client {
                 this.getFriendList(true), this.getGroupList(true)
             ]);
             this.logger.info(`加载了${this.friend_list.size}个好友，${this.group_list.size}个群。`);
-            this.group_list.forEach((v, k)=>{
-                this.getGroupMemberList(k, true);
-            });
             event.emit(this, "system.online");
+            for (let k of this.group_list.keys()) {
+                await this.getGroupMemberList(k, true);
+            }
         });
     }
 

diff --git a/lib/outgoing.js b/lib/outgoing.js
@@ -655,7 +655,7 @@ function buildFriendRequestRequestPacket(flag, approve = true, block = false, c)
         subSrcId:   7,
         actionInfo: {
             type:       approve?2:3,
-            blacklist:  block
+            blacklist:  block?true:false
         },
     });
     return commonUNI(c, CMD.FRIEND_REQ_ACT, body);
@@ -673,7 +673,7 @@ function buildGroupRequestRequestPacket(flag, approve = true, reason = "", block
         actionInfo: {
             type:       approve?11:12,
             groupCode:  group_id,
-            blacklist:  block,
+            blacklist:  block?true:false,
             msg:        reason,
             sig:        BUF0,
         },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oicq",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "QQ protocol!",
   "main": "client.js",
   "scripts": {