@juzi/wechaty 1.0.3 → 1.0.6

package/src/user-modules/room.ts

@@ -46,7 +46,7 @@ import {
   validationMixin,
 }                                       from '../user-mixins/mod.js'
 import {
-  deliverSayableConversationPuppet,
+  deliverSayableConversationPuppet, SayOptions, SayOptionsObject,
 }                                       from '../sayable/mod.js'
 import type {
   SayableSayer,
@@ -61,6 +61,7 @@ import {
 import type {
   MessageInterface,
 }                       from './message.js'
+import { isSayOptionsObject } from '../sayable/types.js'
 
 const MixinBase = wechatifyMixin(
   poolifyMixin(
@@ -355,7 +356,8 @@ class RoomMixin extends MixinBase implements SayableSayer {
   }
 
   say (sayable:  Sayable)                                 : Promise<void | MessageInterface>
-  say (text:     string, ...mentionList: ContactInterface[])       : Promise<void | MessageInterface>
+  say (text: string, options?: SayOptions): Promise<void | MessageInterface>
+  say (text: string, ...options: SayOptions[]): Promise<void | MessageInterface>
   say (textList: TemplateStringsArray, ...varList: any[]) : Promise<void | MessageInterface>
 
   // Huan(202006): allow fall down to the defination to get more flexibility.
@@ -463,19 +465,27 @@ class RoomMixin extends MixinBase implements SayableSayer {
       /**
        * 1. string
        */
-      let mentionList: ContactInterface[] = []
+      let mentionList: (ContactInterface | '@all')[] = []
+      let quoteMessage: MessageInterface | undefined
+      let options: SayOptionsObject
 
       if (varList.length > 0) {
-        const allIsContact = varList.every(c => ContactImpl.valid(c))
+        if (isSayOptionsObject(varList[0])) {
+          options = varList[0] as SayOptionsObject
+          mentionList = options.mentionList || []
+          quoteMessage = options.quoteMessage
+        } else {
+          mentionList = varList as ContactInterface[]
+        }
+
+        const allIsContact = mentionList.every(c => ContactImpl.valid(c) || (c as string) === '@all')
         if (!allIsContact) {
           throw new Error('mentionList must be contact when not using TemplateStringsArray function call.')
         }
 
-        mentionList = [...varList as any]
-
         const AT_SEPARATOR = FOUR_PER_EM_SPACE
         const mentionAlias = await Promise.all(mentionList.map(async contact =>
-          '@' + (await this.alias(contact) || contact.name()),
+          '@' + (contact === '@all' ? 'all' : await this.alias(contact) || contact.name()),
         ))
         const mentionText = mentionAlias.join(AT_SEPARATOR)
 
@@ -487,11 +497,23 @@ class RoomMixin extends MixinBase implements SayableSayer {
       //   contactId : (mentionList.length && mentionList[0].id) || undefined,
       //   roomId    : this.id,
       // }
-      msgId = await this.wechaty.puppet.messageSendText(
-        this.id,
-        text,
-        mentionList.map(c => c.id),
-      )
+      if (quoteMessage) {
+        msgId = await this.wechaty.puppet.messageSendText(
+          this.id,
+          text,
+          {
+            mentionIdList: mentionList.map(c => c === '@all' ? '@all' : c.id),
+            quoteId: quoteMessage.id,
+          },
+        )
+      } else {
+        msgId = await this.wechaty.puppet.messageSendText(
+          this.id,
+          text,
+          mentionList.map(c => c === '@all' ? '@all' : c.id),
+        )
+      }
+
     } else {
       msgId = await deliverSayableConversationPuppet(this.wechaty.puppet)(this.id)(sayable)
     }
@@ -506,7 +528,7 @@ class RoomMixin extends MixinBase implements SayableSayer {
     textList: TemplateStringsArray,
     ...varList: unknown[]
   ) {
-    const mentionList = varList.filter(c => ContactImpl.valid(c)) as ContactInterface[]
+    const mentionList = varList.filter(c => ContactImpl.valid(c) || c === '@all') as (ContactInterface | '@all')[]
 
     // const receiver = {
     //   contactId : (mentionList.length && mentionList[0].id) || undefined,
@@ -561,7 +583,7 @@ class RoomMixin extends MixinBase implements SayableSayer {
       return this.wechaty.puppet.messageSendText(
         this.id,
         finalText,
-        mentionList.map(c => c.id),
+        mentionList.map(c => c === '@all' ? '@all' : c.id),
       )
     }
   }