wechaty-puppet-matrix 0.0.35 → 0.0.36

package/dist/cjs/src/matrix/events/event-room-join-no-xml.d.ts

@@ -0,0 +1,8 @@
+import type { MessagePayload } from '../../engine-schema.js';
+import type * as PUPPET from '@juzi/wechaty-puppet';
+import type { EventPayload } from './event.js';
+export type Runner<T> = () => Promise<T | null>;
+export declare function executeRunners<T>(runners: Runner<T>[]): Promise<T | null>;
+declare const _default: (puppet: PUPPET.Puppet, message: MessagePayload) => Promise<EventPayload>;
+export default _default;
+//# sourceMappingURL=event-room-join-no-xml.d.ts.map

package/dist/cjs/src/matrix/events/event-room-join-no-xml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-room-join-no-xml.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/event-room-join-no-xml.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AA4B9C,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AAEhD,wBAAsB,cAAc,CAAC,CAAC,EAAG,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAShF;yBAEqB,QAAQ,MAAM,CAAC,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;AAA5F,wBAwHC"}

package/dist/cjs/src/matrix/events/event-room-join-no-xml.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeRunners = executeRunners;
+const is_type_js_1 = require("../utils/is-type.js");
+const types_js_1 = require("../types.js");
+const YOU_INVITE_OTHER_REGEX_LIST = [
+    /^你邀请"(.+)"加入了群聊 {2}/,
+    /^You invited (.+) to the group chat/,
+];
+const OTHER_INVITE_YOU_REGEX_LIST = [
+    /^"([^"]+?)"邀请你加入了群聊，群聊参与人还有：(.+)/,
+    /^(.+) invited you to a group chat with (.+)/,
+];
+const OTHER_INVITE_YOU_AND_OTHER_REGEX_LIST = [
+    /^"([^"]+?)"邀请你和"(.+?)"加入了群聊/,
+    /^(.+?) invited you and (.+?) to (the|a) group chat/,
+];
+const OTHER_INVITE_OTHER_REGEX_LIST = [
+    /^"(.+)"邀请"(.+)"加入了群聊/,
+    /^(.+?) invited (.+?) to (the|a) group chat/,
+];
+const OTHER_JOIN_VIA_YOUR_QRCODE_REGEX_LIST = [
+    /^"?(.+)"通过扫描你分享的二维码加入群聊/,
+    /^"?(.+)" joined group chat via the QR code you shared/,
+];
+const OTHER_JOIN_VIA_OTHER_QRCODE_REGEX_LIST = [
+    /^"(.+)"通过扫描"(.+)"分享的二维码加入群聊/,
+    /^"(.+)" joined the group chat via the QR Code shared by "(.+)"/,
+];
+async function executeRunners(runners) {
+    for (const runner of runners) {
+        const ret = await runner();
+        if (ret) {
+            return ret;
+        }
+    }
+    return null;
+}
+exports.default = async (puppet, message) => {
+    const roomId = message.fromWxid || '';
+    if (!(0, is_type_js_1.isRoomId)(roomId)) {
+        return null;
+    }
+    const timestamp = message.timeStamp;
+    if (message.msgType !== types_js_1.WechatMessageType.Sys && message.msgType !== types_js_1.WechatMessageType.SysTemplate) {
+        return null;
+    }
+    await puppet._updateRoom(roomId);
+    const youInviteOther = async () => {
+        let matches = null;
+        [...YOU_INVITE_OTHER_REGEX_LIST, ...OTHER_JOIN_VIA_YOUR_QRCODE_REGEX_LIST].some((re) => !!(matches = message.msg.match(re)));
+        if (matches) {
+            const inviteName = matches[1];
+            const inviteeId = (await puppet.roomMemberSearch(roomId, inviteName))[0];
+            return {
+                inviteeIdList: [inviteeId],
+                inviterId: puppet.currentUserId,
+                roomId,
+                timestamp,
+            };
+        }
+        return null;
+    };
+    const otherInviteYou = async () => {
+        let matches = null;
+        OTHER_INVITE_YOU_REGEX_LIST.some((re) => !!(matches = message.msg.match(re)));
+        if (matches) {
+            const inviteName = matches[1];
+            const inviterId = (await puppet.roomMemberSearch(roomId, inviteName))[0];
+            return {
+                inviteeIdList: [puppet.currentUserId],
+                inviterId,
+                roomId,
+                timestamp,
+            };
+        }
+        return null;
+    };
+    const otherInviteOther = async () => {
+        let matches = null;
+        [...OTHER_INVITE_YOU_AND_OTHER_REGEX_LIST, ...OTHER_INVITE_OTHER_REGEX_LIST].some((re) => !!(matches = message.msg.match(re)));
+        if (matches) {
+            const inviteeIdList = [];
+            const inviterName = matches[1];
+            const inviterId = (await puppet.roomMemberSearch(roomId, inviterName))[0];
+            const inviteeName = matches[2];
+            const inviteeId = (await puppet.roomMemberSearch(roomId, inviteeName))[0];
+            if (message.msg.includes('你')) {
+                inviteeIdList.push(puppet.currentUserId);
+            }
+            inviteeIdList.push(inviteeId);
+            return {
+                inviteeIdList,
+                inviterId,
+                roomId,
+                timestamp,
+            };
+        }
+        return null;
+    };
+    const otherJoinViaQrCode = async () => {
+        let matches = null;
+        OTHER_JOIN_VIA_OTHER_QRCODE_REGEX_LIST.some((re) => !!(matches = message.msg.match(re)));
+        if (matches) {
+            const inviteeIdList = [];
+            const inviteeName = matches[1];
+            const inviteeId = (await puppet.roomMemberSearch(roomId, inviteeName))[0];
+            inviteeIdList.push(inviteeId);
+            const inviterName = matches[2];
+            const inviterId = (await puppet.roomMemberSearch(roomId, inviterName))[0];
+            return {
+                inviteeIdList,
+                inviterId,
+                roomId,
+                timestamp,
+            };
+        }
+        return null;
+    };
+    const ret = await executeRunners([youInviteOther, otherInviteYou, otherInviteOther, otherJoinViaQrCode]);
+    return ret;
+};

package/dist/cjs/src/matrix/events/event-room-join.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-room-join.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/event-room-join.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;yBAiCxB,QAAQ,MAAM,CAAC,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;AAA5F,wBAmKC"}
+{"version":3,"file":"event-room-join.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/event-room-join.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;yBAiCxB,QAAQ,MAAM,CAAC,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;AAA5F,wBAsKC"}

package/dist/cjs/src/matrix/events/event-room-join.js

@@ -39,6 +39,7 @@ exports.default = async (puppet, message) => {
     if (message.msgType !== types_js_1.WechatMessageType.Sys && message.msgType !== types_js_1.WechatMessageType.SysTemplate) {
         return null;
     }
+    await puppet._updateRoom(roomId);
     const jsonPayload = await (0, xml_to_json_js_1.xmlToJson)(message.msg);
     if (!jsonPayload
         || !jsonPayload.sysmsg

package/dist/cjs/src/matrix/events/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/mod.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AASlE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/mod.ts"],"names":[],"mappings":"AAOA,OAAO,EAAkB,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAUlE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAA"}

package/dist/cjs/src/matrix/events/mod.js

@@ -10,11 +10,13 @@ const event_room_join_js_1 = __importDefault(require("./event-room-join.js"));
 const event_room_leave_js_1 = __importDefault(require("./event-room-leave.js"));
 const event_room_topic_js_1 = __importDefault(require("./event-room-topic.js"));
 const event_message_js_1 = __importDefault(require("./event-message.js"));
+const event_room_join_no_xml_js_1 = __importDefault(require("./event-room-join-no-xml.js"));
 const event_js_1 = require("./event.js");
 Object.defineProperty(exports, "EventType", { enumerable: true, get: function () { return event_js_1.EventType; } });
 Object.defineProperty(exports, "parseEvent", { enumerable: true, get: function () { return event_js_1.parseEvent; } });
 (0, event_js_1.addEventParser)(event_js_1.EventType.Friendship, event_friendship_js_1.default);
 (0, event_js_1.addEventParser)(event_js_1.EventType.RoomInvite, event_room_invite_js_1.default);
+(0, event_js_1.addEventParser)(event_js_1.EventType.RoomJoin, event_room_join_no_xml_js_1.default);
 (0, event_js_1.addEventParser)(event_js_1.EventType.RoomJoin, event_room_join_js_1.default);
 (0, event_js_1.addEventParser)(event_js_1.EventType.RoomLeave, event_room_leave_js_1.default);
 (0, event_js_1.addEventParser)(event_js_1.EventType.RoomTopic, event_room_topic_js_1.default);

package/dist/esm/src/matrix/events/event-room-join-no-xml.d.ts

@@ -0,0 +1,8 @@
+import type { MessagePayload } from '../../engine-schema.js';
+import type * as PUPPET from '@juzi/wechaty-puppet';
+import type { EventPayload } from './event.js';
+export type Runner<T> = () => Promise<T | null>;
+export declare function executeRunners<T>(runners: Runner<T>[]): Promise<T | null>;
+declare const _default: (puppet: PUPPET.Puppet, message: MessagePayload) => Promise<EventPayload>;
+export default _default;
+//# sourceMappingURL=event-room-join-no-xml.d.ts.map

package/dist/esm/src/matrix/events/event-room-join-no-xml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-room-join-no-xml.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/event-room-join-no-xml.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AA4B9C,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AAEhD,wBAAsB,cAAc,CAAC,CAAC,EAAG,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAShF;yBAEqB,QAAQ,MAAM,CAAC,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;AAA5F,wBAwHC"}

package/dist/esm/src/matrix/events/event-room-join-no-xml.js

@@ -0,0 +1,119 @@
+import { isRoomId } from '../utils/is-type.js';
+import { WechatMessageType } from '../types.js';
+const YOU_INVITE_OTHER_REGEX_LIST = [
+    /^你邀请"(.+)"加入了群聊 {2}/,
+    /^You invited (.+) to the group chat/,
+];
+const OTHER_INVITE_YOU_REGEX_LIST = [
+    /^"([^"]+?)"邀请你加入了群聊，群聊参与人还有：(.+)/,
+    /^(.+) invited you to a group chat with (.+)/,
+];
+const OTHER_INVITE_YOU_AND_OTHER_REGEX_LIST = [
+    /^"([^"]+?)"邀请你和"(.+?)"加入了群聊/,
+    /^(.+?) invited you and (.+?) to (the|a) group chat/,
+];
+const OTHER_INVITE_OTHER_REGEX_LIST = [
+    /^"(.+)"邀请"(.+)"加入了群聊/,
+    /^(.+?) invited (.+?) to (the|a) group chat/,
+];
+const OTHER_JOIN_VIA_YOUR_QRCODE_REGEX_LIST = [
+    /^"?(.+)"通过扫描你分享的二维码加入群聊/,
+    /^"?(.+)" joined group chat via the QR code you shared/,
+];
+const OTHER_JOIN_VIA_OTHER_QRCODE_REGEX_LIST = [
+    /^"(.+)"通过扫描"(.+)"分享的二维码加入群聊/,
+    /^"(.+)" joined the group chat via the QR Code shared by "(.+)"/,
+];
+export async function executeRunners(runners) {
+    for (const runner of runners) {
+        const ret = await runner();
+        if (ret) {
+            return ret;
+        }
+    }
+    return null;
+}
+export default async (puppet, message) => {
+    const roomId = message.fromWxid || '';
+    if (!isRoomId(roomId)) {
+        return null;
+    }
+    const timestamp = message.timeStamp;
+    if (message.msgType !== WechatMessageType.Sys && message.msgType !== WechatMessageType.SysTemplate) {
+        return null;
+    }
+    await puppet._updateRoom(roomId);
+    const youInviteOther = async () => {
+        let matches = null;
+        [...YOU_INVITE_OTHER_REGEX_LIST, ...OTHER_JOIN_VIA_YOUR_QRCODE_REGEX_LIST].some((re) => !!(matches = message.msg.match(re)));
+        if (matches) {
+            const inviteName = matches[1];
+            const inviteeId = (await puppet.roomMemberSearch(roomId, inviteName))[0];
+            return {
+                inviteeIdList: [inviteeId],
+                inviterId: puppet.currentUserId,
+                roomId,
+                timestamp,
+            };
+        }
+        return null;
+    };
+    const otherInviteYou = async () => {
+        let matches = null;
+        OTHER_INVITE_YOU_REGEX_LIST.some((re) => !!(matches = message.msg.match(re)));
+        if (matches) {
+            const inviteName = matches[1];
+            const inviterId = (await puppet.roomMemberSearch(roomId, inviteName))[0];
+            return {
+                inviteeIdList: [puppet.currentUserId],
+                inviterId,
+                roomId,
+                timestamp,
+            };
+        }
+        return null;
+    };
+    const otherInviteOther = async () => {
+        let matches = null;
+        [...OTHER_INVITE_YOU_AND_OTHER_REGEX_LIST, ...OTHER_INVITE_OTHER_REGEX_LIST].some((re) => !!(matches = message.msg.match(re)));
+        if (matches) {
+            const inviteeIdList = [];
+            const inviterName = matches[1];
+            const inviterId = (await puppet.roomMemberSearch(roomId, inviterName))[0];
+            const inviteeName = matches[2];
+            const inviteeId = (await puppet.roomMemberSearch(roomId, inviteeName))[0];
+            if (message.msg.includes('你')) {
+                inviteeIdList.push(puppet.currentUserId);
+            }
+            inviteeIdList.push(inviteeId);
+            return {
+                inviteeIdList,
+                inviterId,
+                roomId,
+                timestamp,
+            };
+        }
+        return null;
+    };
+    const otherJoinViaQrCode = async () => {
+        let matches = null;
+        OTHER_JOIN_VIA_OTHER_QRCODE_REGEX_LIST.some((re) => !!(matches = message.msg.match(re)));
+        if (matches) {
+            const inviteeIdList = [];
+            const inviteeName = matches[1];
+            const inviteeId = (await puppet.roomMemberSearch(roomId, inviteeName))[0];
+            inviteeIdList.push(inviteeId);
+            const inviterName = matches[2];
+            const inviterId = (await puppet.roomMemberSearch(roomId, inviterName))[0];
+            return {
+                inviteeIdList,
+                inviterId,
+                roomId,
+                timestamp,
+            };
+        }
+        return null;
+    };
+    const ret = await executeRunners([youInviteOther, otherInviteYou, otherInviteOther, otherJoinViaQrCode]);
+    return ret;
+};

package/dist/esm/src/matrix/events/event-room-join.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-room-join.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/event-room-join.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;yBAiCxB,QAAQ,MAAM,CAAC,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;AAA5F,wBAmKC"}
+{"version":3,"file":"event-room-join.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/event-room-join.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;yBAiCxB,QAAQ,MAAM,CAAC,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;AAA5F,wBAsKC"}

package/dist/esm/src/matrix/events/event-room-join.js

@@ -37,6 +37,7 @@ export default async (puppet, message) => {
     if (message.msgType !== WechatMessageType.Sys && message.msgType !== WechatMessageType.SysTemplate) {
         return null;
     }
+    await puppet._updateRoom(roomId);
     const jsonPayload = await xmlToJson(message.msg);
     if (!jsonPayload
         || !jsonPayload.sysmsg

package/dist/esm/src/matrix/events/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/mod.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AASlE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/events/mod.ts"],"names":[],"mappings":"AAOA,OAAO,EAAkB,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAUlE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAA"}

package/dist/esm/src/matrix/events/mod.js

@@ -4,9 +4,11 @@ import roomJoinParser from './event-room-join.js';
 import roomLeaveParser from './event-room-leave.js';
 import roomTopicParser from './event-room-topic.js';
 import messageParser from './event-message.js';
+import roomJoinNoXmlParser from './event-room-join-no-xml.js';
 import { addEventParser, EventType, parseEvent } from './event.js';
 addEventParser(EventType.Friendship, friendShipParser);
 addEventParser(EventType.RoomInvite, roomInviteParser);
+addEventParser(EventType.RoomJoin, roomJoinNoXmlParser);
 addEventParser(EventType.RoomJoin, roomJoinParser);
 addEventParser(EventType.RoomLeave, roomLeaveParser);
 addEventParser(EventType.RoomTopic, roomTopicParser);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-matrix",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "description": "Puppet matrix for Wechaty",
   "type": "module",
   "typings": "./dist/esm/src/mod.d.ts",

package/src/matrix/events/event-room-join-no-xml.ts

@@ -0,0 +1,165 @@
+import type { MessagePayload } from '../../engine-schema.js'
+import type * as PUPPET from '@juzi/wechaty-puppet'
+import { isRoomId } from '../utils/is-type.js'
+import type { EventPayload } from './event.js'
+import { WechatMessageType } from '../types.js'
+
+const YOU_INVITE_OTHER_REGEX_LIST = [
+  /^你邀请"(.+)"加入了群聊 {2}/,
+  /^You invited (.+) to the group chat/,
+]
+const OTHER_INVITE_YOU_REGEX_LIST = [
+  /^"([^"]+?)"邀请你加入了群聊，群聊参与人还有：(.+)/,
+  /^(.+) invited you to a group chat with (.+)/,
+]
+const OTHER_INVITE_YOU_AND_OTHER_REGEX_LIST = [
+  /^"([^"]+?)"邀请你和"(.+?)"加入了群聊/,
+  /^(.+?) invited you and (.+?) to (the|a) group chat/,
+]
+const OTHER_INVITE_OTHER_REGEX_LIST = [
+  /^"(.+)"邀请"(.+)"加入了群聊/,
+  /^(.+?) invited (.+?) to (the|a) group chat/,
+]
+const OTHER_JOIN_VIA_YOUR_QRCODE_REGEX_LIST = [
+  /^"?(.+)"通过扫描你分享的二维码加入群聊/,
+  /^"?(.+)" joined group chat via the QR code you shared/,
+]
+const OTHER_JOIN_VIA_OTHER_QRCODE_REGEX_LIST = [
+  /^"(.+)"通过扫描"(.+)"分享的二维码加入群聊/,
+  /^"(.+)" joined the group chat via the QR Code shared by "(.+)"/,
+]
+
+export type Runner<T> = () => Promise<T | null>;
+
+export async function executeRunners<T> (runners: Runner<T>[]): Promise<T | null> {
+  for (const runner of runners) {
+    const ret = await runner()
+    if (ret) {
+      return ret
+    }
+  }
+
+  return null
+}
+
+export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<EventPayload> => {
+  const roomId = message.fromWxid || ''
+  if (!isRoomId(roomId)) {
+    return null
+  }
+
+  const timestamp = message.timeStamp
+  // 都是系统消息
+  if (message.msgType !== WechatMessageType.Sys && message.msgType !== WechatMessageType.SysTemplate) {
+    return null
+  }
+
+  // @ts-ignore
+  await puppet._updateRoom(roomId)
+  /**
+   * 1. You Invite Other to join the Room
+   * (including other join var qr code you shared)
+   * /^你邀请"(.+)"加入了群聊 {2}\$revoke\$/,
+   * /^" ?(.+)"通过扫描你分享的二维码加入群聊/,
+   */
+  const youInviteOther = async () => {
+    let matches: null | string[] = null;
+    [ ...YOU_INVITE_OTHER_REGEX_LIST, ...OTHER_JOIN_VIA_YOUR_QRCODE_REGEX_LIST ].some((re) => !!(matches = message.msg.match(re)))
+
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (matches) {
+      const inviteName = matches[1]!
+      const inviteeId = (await puppet.roomMemberSearch(roomId, inviteName))[0]!
+
+      return {
+        inviteeIdList: [ inviteeId ],
+        inviterId: puppet.currentUserId,
+        roomId,
+        timestamp,
+      } as PUPPET.payloads.EventRoomJoin
+    }
+    return null
+  }
+
+  /**
+   * 2. Other Invite you to join the Room
+   * /^"([^"]+?)"邀请你加入了群聊/,
+   */
+  const otherInviteYou = async () => {
+    let matches: null | string[] = null
+    OTHER_INVITE_YOU_REGEX_LIST.some((re) => !!(matches = message.msg.match(re)))
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (matches) {
+      const inviteName = matches[1]!
+      const inviterId = (await puppet.roomMemberSearch(roomId, inviteName))[0]!
+
+      return {
+        inviteeIdList: [ puppet.currentUserId ],
+        inviterId,
+        roomId,
+        timestamp,
+      } as PUPPET.payloads.EventRoomJoin
+    }
+    return null
+  }
+
+  /**
+   * 3. Other invite you and others to join the room
+   * /^"([^"]+?)"邀请你和"(.+?)"加入了群聊/,
+   * /^"(.+)"邀请"(.+)"加入了群聊/,
+   */
+  const otherInviteOther = async () => {
+    let matches: null | string[] = null;
+    [ ...OTHER_INVITE_YOU_AND_OTHER_REGEX_LIST, ...OTHER_INVITE_OTHER_REGEX_LIST ].some((re) => !!(matches = message.msg.match(re)))
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (matches) {
+      const inviteeIdList = []
+      const inviterName = matches[1]
+      const inviterId = (await puppet.roomMemberSearch(roomId, inviterName))[0]
+      const inviteeName = matches[2]
+      const inviteeId = (await puppet.roomMemberSearch(roomId, inviteeName))[0]
+      // 如果包含ni则把机器人的id放进去
+      if (message.msg.includes('你')) {
+        inviteeIdList.push(puppet.currentUserId)
+      }
+      inviteeIdList.push(inviteeId)
+      return {
+        inviteeIdList,
+        inviterId,
+        roomId,
+        timestamp,
+      } as PUPPET.payloads.EventRoomJoin
+    }
+    return null
+  }
+
+  /**
+   * 4. Other Invite Other via Qrcode to join a Room
+   * /^" (.+)"通过扫描"(.+)"分享的二维码加入群聊/,
+   */
+  const otherJoinViaQrCode = async () => {
+    let matches: null | string[] = null
+    OTHER_JOIN_VIA_OTHER_QRCODE_REGEX_LIST.some((re) => !!(matches = message.msg.match(re)))
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (matches) {
+      const inviteeIdList = []
+
+      const inviteeName = matches[1]!
+      const inviteeId = (await puppet.roomMemberSearch(roomId, inviteeName))[0]!
+      inviteeIdList.push(inviteeId)
+
+      const inviterName = matches[2]
+      const inviterId = (await puppet.roomMemberSearch(roomId, inviterName))[0]!
+      return {
+        inviteeIdList,
+        inviterId,
+        roomId,
+        timestamp,
+      } as PUPPET.payloads.EventRoomJoin
+    }
+    return null
+  }
+  const ret = await executeRunners([ youInviteOther, otherInviteYou, otherInviteOther, otherJoinViaQrCode ])
+
+  return ret
+}

package/src/matrix/events/event-room-join.ts

@@ -46,6 +46,9 @@ export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<E
     return null
   }
 
+  // @ts-ignore
+  await puppet._updateRoom(roomId)
+
   const jsonPayload = await xmlToJson(message.msg)
   if (
     !jsonPayload

package/src/matrix/events/mod.ts

@@ -4,10 +4,12 @@ import roomJoinParser from './event-room-join.js'
 import roomLeaveParser from './event-room-leave.js'
 import roomTopicParser from './event-room-topic.js'
 import messageParser from './event-message.js'
+import roomJoinNoXmlParser from './event-room-join-no-xml.js'
 import { addEventParser, EventType, parseEvent } from './event.js'
 
 addEventParser(EventType.Friendship, friendShipParser)
 addEventParser(EventType.RoomInvite, roomInviteParser)
+addEventParser(EventType.RoomJoin, roomJoinNoXmlParser)
 addEventParser(EventType.RoomJoin, roomJoinParser)
 addEventParser(EventType.RoomLeave, roomLeaveParser)
 addEventParser(EventType.RoomTopic, roomTopicParser)