feat: 🎸 scan type

juzibot · Jan 3, 2024 · 9fec60f · 9fec60f
1 parent 5f16d07
commit 9fec60f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -132,7 +132,7 @@
     "@chatie/eslint-config": "^1.0.4",
     "@chatie/semver": "^0.4.7",
     "@chatie/tsconfig": "^4.6.3",
-    "@juzi/wechaty-puppet": "^1.0.75",
+    "@juzi/wechaty-puppet": "^1.0.76",
     "@juzi/wechaty-puppet-mock": "^1.0.1",
     "@swc/core": "1.3.44",
     "@swc/helpers": "^0.3.6",

diff --git a/src/schemas/wechaty-events.ts b/src/schemas/wechaty-events.ts
@@ -56,7 +56,7 @@ type WechatyEventListenerRoomLeave          = (room: RoomInterface, leaverList:
 type WechatyEventListenerRoomTopic          = (room: RoomInterface, newTopic: string, oldTopic: string, changer: ContactInterface, date?: Date) => void | Promise<void>
 type WechatyEventListenerRoomAnnounce       = (room: RoomInterface, newAnnounce: string, changer: ContactInterface, oldAnnounce?: string, date?: Date) => void | Promise<void>
 type WechatyEventListenerRoomOwner          = (room: RoomInterface, newOwner: ContactInterface, oldOwner: ContactInterface) => void | Promise<void>
-type WechatyEventListenerScan               = (qrcode: string, status: PUPPET.types.ScanStatus, data?: string) => void | Promise<void>
+type WechatyEventListenerScan               = (qrcode: string, status: PUPPET.types.ScanStatus, data: string, type: PUPPET.types.ScanType) => void | Promise<void>
 type WechatyEventListenerStartStop          = () => void | Promise<void>
 type WechatyEventListenerContactTagAdd      = (contact: ContactInterface, tagList: TagInterface[]) => void | Promise<void>
 type WechatyEventListenerContactTagRemove   = (contact: ContactInterface, tagList: TagInterface[]) => void | Promise<void>

diff --git a/src/wechaty-mixins/puppet-mixin.ts b/src/wechaty-mixins/puppet-mixin.ts
@@ -29,6 +29,7 @@ import type {
 import type { GErrorMixin } from './gerror-mixin.js'
 import type { IoMixin }     from './io-mixin.js'
 import { checkUntilChanged } from '../pure-functions/retry-policy.js'
+import { ScanType } from '@juzi/wechaty-puppet/types'
 
 const PUPPET_MEMORY_NAME = 'puppet'
 
@@ -541,7 +542,7 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
           case 'scan':
             puppet.on('scan', async payload => {
               this.__readyState.inactive(true)
-              this.emit('scan', payload.qrcode || '', payload.status, payload.data)
+              this.emit('scan', payload.qrcode || '', payload.status, payload.data || '', payload.type || ScanType.Unknown)
             })
             break