fix bug #26

wechaty · Jan 4, 2021 · 1a33ae0 · 1a33ae0
1 parent 69fa1c1
commit 1a33ae0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/padlocal/schema-mapper/index.ts b/src/padlocal/schema-mapper/index.ts
@@ -4,6 +4,7 @@ import {
   ContactType,
   MessagePayload,
   MessageType,
+  Puppet,
   RoomMemberPayload,
   RoomPayload,
 } from "wechaty-puppet";
@@ -15,7 +16,7 @@ import { log } from "wechaty";
 
 const PRE = "[SchemaMapper]";
 
-export async function padLocalMessageToWechaty(message: Message.AsObject): Promise<MessagePayload> {
+export async function padLocalMessageToWechaty(puppet: Puppet, message: Message.AsObject): Promise<MessagePayload> {
   const wechatMessageType = message.type as WechatMessageType;
   const type = convertMessageType(wechatMessageType);
 
@@ -65,7 +66,12 @@ export async function padLocalMessageToWechaty(message: Message.AsObject): Promi
 
   // set mention list
   if (roomId) {
-    mentionIdList = message.atList;
+    if (message.atList.length === 1 && message.atList[0] === "announcement@all") {
+      const roomPayload = await puppet.roomPayload(roomId);
+      mentionIdList = roomPayload.memberIdList;
+    } else {
+      mentionIdList = message.atList;
+    }
   }
 
   /**

diff --git a/src/puppet-padlocal.ts b/src/puppet-padlocal.ts
@@ -1117,7 +1117,7 @@ class PuppetPadlocal extends Puppet {
   }
 
   public async messageRawPayloadParser(payload: Message.AsObject): Promise<MessagePayload> {
-    return padLocalMessageToWechaty(payload);
+    return padLocalMessageToWechaty(this, payload);
   }
 
   public async messageRawPayload(id: string): Promise<Message.AsObject> {