@juzi/wechaty 1.0.73 → 1.0.75

package/src/package-json.ts

@@ -4,10 +4,10 @@
  */
 import type { PackageJsonWechaty } from './config'
 
-export const GIT_COMMIT_HASH: string = 'f845a2616af42a3a8bec582520c0a0042f00b18e'
+export const GIT_COMMIT_HASH: string = '6e9df753e465ef01b41f5a99a87b6c013f176a3e'
 export const packageJson: PackageJsonWechaty = {
   "name": "@juzi/wechaty",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "description": "Wechaty is a RPA SDK for Chatbot Makers.",
   "type": "module",
   "exports": {
@@ -139,7 +139,7 @@ export const packageJson: PackageJsonWechaty = {
     "@chatie/eslint-config": "^1.0.4",
     "@chatie/semver": "^0.4.7",
     "@chatie/tsconfig": "^4.6.3",
-    "@juzi/wechaty-puppet": "^1.0.66",
+    "@juzi/wechaty-puppet": "^1.0.68",
     "@juzi/wechaty-puppet-mock": "^1.0.1",
     "@swc/core": "1.3.44",
     "@swc/helpers": "^0.3.6",

package/src/schemas/wechaty-events.ts

@@ -73,6 +73,7 @@ type WechatyEventListenerTagGroup           = (type: PUPPET.types.TagGroupEvent,
 type WechatyEventListenerPostComment        = (comment: PostInterface, post: PostInterface) => void | Promise<void>
 type WechatyEventListenerPostTap            = (post: PostInterface, contact: ContactInterface, type: PUPPET.types.Tap, tap: boolean, date?: Date) => void | Promise<void>
 type WechatyEventListenerVerifyCode         = (id: string, message: string, scene: PUPPET.types.VerifyCodeScene, status: PUPPET.types.VerifyCodeStatus) => void | Promise<void>
+type WechatyEventListenerDirty              = (id: string, type: PUPPET.types.Dirty) => void | Promise<void>
 
 /**
  * @desc       Wechaty Class Event Type
@@ -261,6 +262,7 @@ interface WechatyEventListeners {
   'post-comment'       : WechatyEventListenerPostComment
   'post-tap'           : WechatyEventListenerPostTap
   'verify-code'        : WechatyEventListenerVerifyCode
+  'dirty'              : WechatyEventListenerDirty
 }
 
 const WechatyEventEmitter = EventEmitter as any as new () => TypedEventEmitter<
@@ -302,6 +304,7 @@ export type {
   WechatyEventListenerPostComment,
   WechatyEventListenerPostTap,
   WechatyEventListenerVerifyCode,
+  WechatyEventListenerDirty,
 }
 export {
   WechatyEventEmitter,

package/src/user-modules/message.ts

@@ -996,16 +996,24 @@ class MessageMixin extends MixinBase implements SayableSayer {
   /**
    * Check if a message is mention self.
    *
-   * @returns {Promise<boolean>} - Return `true` for mention me.
+   * @returns {boolean} - Return `true` for mention me.
    * @example
-   * if (await message.mentionSelf()) {
+   * if (message.mentionSelf()) {
    *  console.log('this message were mentioned me! [You were mentioned] tip ([有人@我]的提示)')
    * }
    */
-  async mentionSelf (): Promise<boolean> {
-    const currentUserId = this.wechaty.puppet.currentUserId
-    const mentionList = await this.mentionList()
-    return mentionList.some(contact => contact.id === currentUserId)
+  mentionSelf (): boolean {
+    if (this.payload?.roomId
+      && 'mentionIdList' in this.payload
+      && Array.isArray(this.payload.mentionIdList)
+    ) {
+      const currentUserId = this.wechaty.puppet.currentUserId
+      // const mentionList = await this.mentionList()
+      const mentionIdList = this.payload.mentionIdList
+      return mentionIdList.some(id => id === currentUserId)
+    } else {
+      return false
+    }
   }
 
   /**

package/src/wechaty-mixins/puppet-mixin.ts

@@ -649,7 +649,7 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
                     const differences = diffPayload<PUPPET.payloads.Contact>(oldPayload, newPayload)
                     if (differences.length === 0) {
                       log.info('WechatyPuppetMixin', `got dirty for contact ${payloadId} but cannot find any difference. old payload: ${JSON.stringify(oldPayload)}, new payload: ${JSON.stringify(newPayload)}`)
-                      return
+                      break
                     }
 
                     const importantDifferences = differences.filter(ele => ele && ContactImportantFields.some(key => key === ele.key))
@@ -721,7 +721,7 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
 
                     if (differences.length === 0) {
                       log.info('WechatyPuppetMixin', `got dirty for room ${payloadId} but cannot find any difference. old payload: ${JSON.stringify(oldPayload)}, new payload: ${JSON.stringify(newPayload)}`)
-                      return
+                      break
                     }
 
                     const importantDifferences = differences.filter(ele => ele && RoomImportantFields.some(key => key === ele.key))
@@ -778,6 +778,7 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
                   default:
                     throw new Error('unknown payload type: ' + payloadType)
                 }
+                this.emit('dirty', payloadId, payloadType)
               } catch (e) {
                 this.emit('error', GError.from(e))
               }