fix: 🐛 allow empty room-announce changer

juzibot · Aug 19, 2024 · 1d53f3f · 1d53f3f
1 parent c7722ed
commit 1d53f3f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/schemas/room-events.ts b/src/schemas/room-events.ts
@@ -103,7 +103,7 @@ type RoomEventListenerJoin    = (this: RoomInterface, inviteeList: ContactInterf
 type RoomEventListenerLeave   = (this: RoomInterface, leaverList: ContactInterface[], remover?: ContactInterface, date?: Date)  => void | Promise<void>
 type RoomEventListenerMessage = (this: RoomInterface, message: MessageInterface, date?: Date)                                   => void | Promise<void>
 type RoomEventListenerTopic   = (this: RoomInterface, topic: string, oldTopic: string, changer: ContactInterface, date?: Date)  => void | Promise<void>
-type RoomEventListenerAnnounce= (this: RoomInterface, announce: string, changer: ContactInterface, oldAnnounce?: string, date?: Date)  => void | Promise<void>
+type RoomEventListenerAnnounce= (this: RoomInterface, announce: string, changer?: ContactInterface, oldAnnounce?: string, date?: Date)  => void | Promise<void>
 type RoomEventListenerOwner = (this: RoomInterface, newOwner: ContactInterface, oldOwner: ContactInterface) => void | Promise<void>
 
 interface RoomEventListeners {

diff --git a/src/schemas/wechaty-events.ts b/src/schemas/wechaty-events.ts
@@ -54,7 +54,7 @@ type WechatyEventListenerRoomInvite         = (roomInvitation: RoomInvitationInt
 type WechatyEventListenerRoomJoin           = (room: RoomInterface, inviteeList: ContactInterface[], inviter: ContactInterface, date?: Date) => void | Promise<void>
 type WechatyEventListenerRoomLeave          = (room: RoomInterface, leaverList: ContactInterface[], remover?: ContactInterface, date?: Date) => void | Promise<void>
 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 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, type: PUPPET.types.ScanType, createDate: Date, expireDate?: Date) => void | Promise<void>
 type WechatyEventListenerStartStop          = () => void | Promise<void>

diff --git a/src/wechaty-mixins/puppet-mixin.ts b/src/wechaty-mixins/puppet-mixin.ts
@@ -526,9 +526,13 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
                 }
 
                 await room.sync()
-                const changer = await this.Contact.find({ id: payload.changerId })
-                if (!changer) {
-                  throw new Error('no changer found for id: ' + payload.changerId)
+                let changer: ContactInterface | undefined
+                try {
+                  if (payload.changerId) {
+                    changer = await this.Contact.find({ id: payload.changerId })
+                  }
+                } catch (e) {
+                  log.warn('room-announce', 'room-announce event error: %s', (e as Error).message)
                 }
                 const date = timestampToDate(payload.timestamp)
                 this.emit('room-announce', room, payload.newAnnounce, changer, payload.oldAnnounce, date)