Merge pull request #91 from juzibot/feat/room-dynamic-qrcode

Feat/room dynamic qrcode
juzibot · Nov 15, 2024 · b7522d6 · b7522d6
2 parents 7bd906a + 5108320
commit b7522d6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@juzi/wechaty",
-  "version": "1.0.101",
+  "version": "1.0.102",
   "description": "Wechaty is a RPA SDK for Chatbot Makers.",
   "type": "module",
   "exports": {

diff --git a/src/user-modules/room-invitation.ts b/src/user-modules/room-invitation.ts
@@ -50,6 +50,13 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
     return newRoomInvitation
   }
 
+  static async acceptByQRCode (qrcode: string): Promise<PUPPET.types.RoomInvitationAcceptByQRCode> {
+    if (!qrcode) {
+      throw new Error('acceptByQRCode() qrcode is required')
+    }
+    return this.wechaty.puppet.roomInvitationAcceptByQRCode(qrcode)
+  }
+
   /**
    * @hideconstructor
    * Instance Properties
@@ -85,8 +92,6 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
     ].join('')
   }
 
-  async accept ()             : Promise<void>
-  async accept (qrcode: string) : Promise<PUPPET.types.RoomInvitationAcceptByQRCode>
   /**
    * Accept Room Invitation
    *
@@ -104,15 +109,11 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
    * }
    * .start()
    */
-  async accept (qrcode?: string): Promise<void | PUPPET.types.RoomInvitationAcceptByQRCode> {
+  async accept (): Promise<void> {
     log.verbose('RoomInvitation', 'accept()')
 
     try {
-      if (qrcode) {
-        return this.wechaty.puppet.roomInvitationAcceptByQRCode(qrcode)
-      } else {
-        await this.wechaty.puppet.roomInvitationAccept(this.id)
-      }
+      await this.wechaty.puppet.roomInvitationAccept(this.id)
 
       const inviter = await this.inviter()
       const topic   = await this.topic()

diff --git a/src/user-modules/room.ts b/src/user-modules/room.ts
@@ -117,6 +117,19 @@ class RoomMixin extends MixinBase implements SayableSayer {
     }
   }
 
+  /**
+   * Parse the dynamic QR Code of the room
+   * @param {string} url
+   * @returns {Promise<PUPPET.types.RoomParseDynamicQRCode>}
+   */
+  static async parseDynamicQRCode (url: string): Promise<PUPPET.types.RoomParseDynamicQRCode> {
+    log.info('Room', 'parseDynamicQRCode(%s)', url)
+    if (!url) {
+      throw new Error('parseDynamicQRCode() url is required')
+    }
+    return this.wechaty.puppet.roomParseDynamicQRCode(url)
+  }
+
   /**
    * The filter to find the room:  {topic: string | RegExp}
    *
@@ -968,15 +981,6 @@ class RoomMixin extends MixinBase implements SayableSayer {
     return guardQrCodeValue(qrcodeValue)
   }
 
-  /**
-   * Parse the dynamic QR Code of the room
-   * @param {string} url
-   * @returns {Promise<PUPPET.types.RoomParseDynamicQRCode>}
-   */
-  async parseDynamicQRCode (url: string): Promise<PUPPET.types.RoomParseDynamicQRCode> {
-    return this.wechaty.puppet.roomParseDynamicQRCode(url)
-  }
-
   /**
    * Return contact's roomAlias in the room
    * @param {ContactInterface} contact