Merge pull request #16 from takayama-lily/dev

-
takayama-lily · Sep 2, 2020 · 86f9952 · 86f9952
2 parents b1200de + 809c171
commit 86f9952
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 21 deletions.
diff --git a/client.js b/client.js
@@ -227,7 +227,7 @@ class AndroidClient extends Client {
         this.logger = log4js.getLogger(`[BOT:${uin}]`);
         this.logger.level = config.log_level;
 
-        this.sub_appid = config.platform === 1 ? 537062845 : 537062409;
+        this.sub_appid = config.platform === 1 ? 537062845 : (config.platform === 3 ? 537061176 : 537062409);
         this.ignore_self = config.ignore_self;
         this.kickoff_reconn = config.kickoff;
 

diff --git a/lib/incoming.js b/lib/incoming.js
@@ -248,7 +248,7 @@ function decodePushReqEvent(blob, c) {
 /**
  * @returns {void}
  */
-async function decodeMessageSvcResponse(blob, c) {
+function decodeMessageSvcResponse(blob, c) {
     const o = pb.decode("GetMessageResponse", blob);
     if (o.resule > 0){
         c.sync_finished = true;
@@ -279,19 +279,23 @@ async function decodeMessageSvcResponse(blob, c) {
                 c.write(outgoing.buildNewFriendRequestPacket(1, c));
                 continue;
             } else if (type === 33) {
-                const group_id = common.uin2code(user_id);
-                user_id = toInt(head.authUin);
-                if (user_id === c.uin)
-                    await c.getGroupList(true);
-                c.getGroupMemberList(group_id, true);
-                try {
-                    c.group_list.get(group_id).member_count++;
-                    c.group_list.get(group_id).last_join_time = common.timestamp();
-                } catch (e) {}
-                event.emit(c, "notice.group.increase", {
-                    group_id, user_id,
-                    nickname: head.authNick
-                });
+                (async()=>{
+                    const group_id = common.uin2code(user_id);
+                    user_id = toInt(head.authUin);
+                    try {
+                        if (user_id === c.uin)
+                            await c.getGroupList(true);
+                        else {
+                            c.group_list.get(group_id).member_count++;
+                            c.group_list.get(group_id).last_join_time = common.timestamp();
+                        }
+                    } catch (e) {}
+                    await c.getGroupMemberList(group_id, true);
+                    event.emit(c, "notice.group.increase", {
+                        group_id, user_id,
+                        nickname: head.authNick
+                    });
+                })();
                 continue;
             }
             let sub_type, message_id, font, sender = {user_id};

diff --git a/lib/message.js b/lib/message.js
@@ -175,7 +175,7 @@ async function downloadImage(url, cb) {
 
 /**
  * @param {Boolean} is_group 
- * @returns {Boolean} success?
+ * @returns {Boolean|Promise} success?
  */
 async function buildImageMessage(chain, cq, is_group) {
     let {file, url, cache} = cq;
@@ -332,7 +332,7 @@ async function buildMessageFromString(chain, message, escape = false, is_group =
                 break;
             case "image":
                 const task = await buildImageMessage(chain, cq, is_group);
-                if (task)
+                if (task !== false)
                     ++img_cnt;
                 if (task instanceof Promise)
                     tasks.push(task);
@@ -379,11 +379,12 @@ async function buildMessage(message, escape, is_group) {
                         ++face_cnt;
                     break;
                 case "image":
-                    const task = await buildImageMessage(chain, v.data, is_group)
-                    if (task)
+                    const task = await buildImageMessage(chain, v.data, is_group);
+                    if (task !== false)
                         ++img_cnt;
                     if (task instanceof Promise)
                         tasks.push(task);
+                    break;
                 default:
                     break;
             }

diff --git a/lib/outgoing.js b/lib/outgoing.js
@@ -529,6 +529,12 @@ async function toLongMessageElems(uin, elems, c) {
                 msgId: 1,
             },
             msgType: 82,
+            // groupInfo: {
+            //     groupCode: common.uin2code(uin),
+            //     groupRank: 2,
+            //     groupName: Buffer.from("abc"),
+            //     groupCard: c.nickname,
+            // },
         },
         body: {
             richText: {elems},

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.6",
+  "version": "1.0.11",
   "description": "QQ protocol!",
   "main": "client.js",
   "scripts": {