wechaty-puppet-matrix 0.0.23 → 0.0.26

package/src/puppet-matrix.ts

@@ -1,10 +1,10 @@
-import { log }              from '@juzi/wechaty-puppet'
-import * as PUPPET          from '@juzi/wechaty-puppet'
+import { log } from '@juzi/wechaty-puppet'
+import * as PUPPET from '@juzi/wechaty-puppet'
 import type { FileBoxInterface } from 'file-box'
 import {
   FileBox,
   FileBoxType,
-}          from 'file-box'
+} from 'file-box'
 import type { ContactPayload, MessagePayload } from './engine-schema.js'
 import type { FileBoxMetadataMessage } from './matrix/types.js'
 import Client from './matrix/service/request.js'
@@ -59,7 +59,8 @@ class PuppetMatrix extends PUPPET.Puppet {
   private _verifyInterval?: ReturnType<typeof setInterval> | null
   private _qrcodeStatuasInterval?: ReturnType<typeof setInterval> | null
   private _getQrcodeTimes: number
-  public static override readonly  VERSION = VERSION
+  private _roomJoinTemp: Record<string, string> = {}
+  public static override readonly VERSION = VERSION
   /**
    * UUIDify:
    *  We need to clone a FileBox
@@ -70,6 +71,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     super(options)
 
     this.options.engine = Client
+    this._roomJoinTemp = {}
     this._getQrcodeTimes = 0
     this.options.maxGetQrcoderTimes = 20
 
@@ -108,14 +110,14 @@ class PuppetMatrix extends PUPPET.Puppet {
 
     await this._startPuppetHeart(true)
     if (this._client) {
-      this._client.on('login', this.wrapAsync(async ({ robotInfo } : { robotInfo: ContactPayload }) => {
+      this._client.on('login', this.wrapAsync(async ({ robotInfo }: { robotInfo: ContactPayload }) => {
         log.info(PRE, `login success: ${robotInfo.name}`)
         await this.onLogin(robotInfo)
       }))
-      this._client.on('message', this.wrapAsync(async (message:MessagePayload) => {
+      this._client.on('message', this.wrapAsync(async (message: MessagePayload) => {
         await this._onPushMessage(message)
       }))
-      this._client.on('contact', this.wrapAsync(async ({ contactInfo }:{ friendShip:PUPPET.payloads.FriendshipReceive, contactInfo: ContactPayload, type: PUPPET.types.Friendship }) => {
+      this._client.on('contact', this.wrapAsync(async ({ contactInfo }: { friendShip: PUPPET.payloads.FriendshipReceive, contactInfo: ContactPayload, type: PUPPET.types.Friendship }) => {
         await this._cacheMgr!.setContact(contactInfo.wxid, contactInfo)
         await this._cacheMgr?.setFriendshipRawPayload(contactInfo.wxid, {
           id: contactInfo.wxid,
@@ -154,12 +156,26 @@ class PuppetMatrix extends PUPPET.Puppet {
         this.emit('room-leave', payload)
       }))
       this._client.on('room-join', this.wrapAsync(async ({ roomId, inviterId, joinIds, joinUsers }: { roomId: string, inviterId: string, joinIds: string[], joinUsers: ContactPayload[] }) => {
+
+        for (const joinId of joinIds) {
+          if (this._roomJoinTemp[`${roomId}-${joinId}`]) {
+            joinIds = joinIds.filter(id => id !== joinId)
+          } else {
+            this._roomJoinTemp[`${roomId}-${joinId}`] = joinId
+            const temTimer = setTimeout(() => {
+              delete this._roomJoinTemp[`${roomId}-${joinId}`]
+              clearTimeout(temTimer)
+            }, 50000)
+          }
+        }
+
         const payload = {
-          inviteeIdList : joinIds,
+          inviteeIdList: joinIds,
           inviterId,
           roomId,
-          timestamp     : getUnixTime(Date.now()),
+          timestamp: getUnixTime(Date.now()),
         }
+
         for (const joinUser of joinUsers) {
           await this._cacheMgr?.updateSingleRoomMember(roomId, joinUser)
           const roomInfo = await this._cacheMgr?.getRoom(roomId)
@@ -168,14 +184,17 @@ class PuppetMatrix extends PUPPET.Puppet {
             await this._cacheMgr?.setRoom(roomId, roomInfo)
           }
         }
-        this.emit('room-join', payload)
+
+        if (joinIds.length) {
+          this.emit('room-join', payload)
+        }
       }))
       this._client.on('logout', this.wrapAsync(async (message: string) => {
         log.info(PRE, 'Logout event: %s', message)
         await this.logout(message)
       }))
 
-      this._client.on('verify-code', this.wrapAsync(async ({ ticket, uuid } : {ticket: string, uuid: string, status: number}) => {
+      this._client.on('verify-code', this.wrapAsync(async ({ ticket, uuid }: { ticket: string, uuid: string, status: number }) => {
         log.info(PRE, 'verify-code: %s, %s', ticket, uuid)
         this._qrcodeTicket = ticket
         if (!this._verifyInterval) {
@@ -188,7 +207,12 @@ class PuppetMatrix extends PUPPET.Puppet {
             } as any)
           }, 5000)
         }
-
+      }))
+      this._client.on('expired', this.wrapAsync(async (expired: boolean) => {
+        if (expired) {
+          log.info(PRE, 'Token has expired')
+          void this.onStop()
+        }
       }))
     }
     addRunningPuppet(this)
@@ -230,7 +254,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     }
   }
 
-  private getQrcodeTicket (authurl: string):string {
+  private getQrcodeTicket (authurl: string): string {
     if (!authurl || !authurl.startsWith('http')) return ''
     const url = new URL(authurl)
     const searchParams = new URLSearchParams(url.search.slice(1))
@@ -286,7 +310,7 @@ class PuppetMatrix extends PUPPET.Puppet {
           await this.onQrCodeEvent(scanStatus.status, qrcode.qrcodeUrl)
         }
 
-      },  8000)
+      }, 8000)
     } else {
       if (this._getQrcodeTimes && this._getQrcodeTimes > 5) {
         log.info(PRE, '由于多次请求二维码失败，已停止请求，请检查你的网络环境，重启容器后再试。')
@@ -341,7 +365,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     }
     log.silly(
       PRE,
-        `scan event, status: ${ScanStatusName[scanStatus]}${url ? ', with qrcode: ' + url : ''}`,
+      `scan event, status: ${ScanStatusName[scanStatus]}${url ? ', with qrcode: ' + url : ''}`,
     )
 
     this.emit('scan', {
@@ -355,7 +379,7 @@ class PuppetMatrix extends PUPPET.Puppet {
   }
 
   // 登录
-  private async onLogin (user: ContactPayload):Promise<void> {
+  private async onLogin (user: ContactPayload): Promise<void> {
     try {
       // create cache manager firstly
       if (!this._client) {
@@ -415,6 +439,8 @@ class PuppetMatrix extends PUPPET.Puppet {
   private async _stopClient (): Promise<void> {
     this.__currentUserId = undefined
     this.__currentUserId = undefined
+    this._client?.destroy()
+    this._client = undefined
     if (this._cacheMgr) {
       log.info(PRE, 'colse cache')
       await this._cacheMgr.close()
@@ -476,7 +502,7 @@ class PuppetMatrix extends PUPPET.Puppet {
 
   // 获取自己的二维码
   override async contactSelfQRCode (): Promise<string> {
-    return this._client?.getUserQrcode()  || ''
+    return this._client?.getUserQrcode() || ''
   }
 
   // 设置自己的签名 暂不支持
@@ -490,10 +516,10 @@ class PuppetMatrix extends PUPPET.Puppet {
   }
 
   // 查询或设置用户备注
-  override contactAlias (contactId: string)                      : Promise<string>
-  override contactAlias (contactId: string, alias: string | null): Promise<void>
+  override contactAlias(contactId: string): Promise<string>
+  override contactAlias(contactId: string, alias: string | null): Promise<void>
 
-  override async contactAlias (contactId : string, alias?    : string | null): Promise<string | void> {
+  override async contactAlias (contactId: string, alias?: string | null): Promise<string | void> {
     const contact = await this.contactRawPayload(contactId)
     if (alias) {
       // contact is stranger, set alias in cache, to update after user is added
@@ -521,10 +547,10 @@ class PuppetMatrix extends PUPPET.Puppet {
   }
 
   // 获取用户头像
-  override async contactAvatar (contactId: string)                          : Promise<FileBoxInterface>
-  override async contactAvatar (contactId: string, file: FileBoxInterface)  : Promise<void>
+  override async contactAvatar(contactId: string): Promise<FileBoxInterface>
+  override async contactAvatar(contactId: string, file: FileBoxInterface): Promise<void>
 
-  override async contactAvatar (contactId: string, file?: FileBoxInterface) : Promise<void | FileBoxInterface> {
+  override async contactAvatar (contactId: string, file?: FileBoxInterface): Promise<void | FileBoxInterface> {
     if (file) {
       return PUPPET.throwUnsupportedError('set avatar is not unsupported')
     }
@@ -571,12 +597,12 @@ class PuppetMatrix extends PUPPET.Puppet {
   }
 
   // 删除标签
-  override async tagTagDelete (tagIdList: string[]) : Promise<void> {
+  override async tagTagDelete (tagIdList: string[]): Promise<void> {
     return PUPPET.throwUnsupportedError(tagIdList)
   }
 
   // 获取用户标签
-  override async tagTagContactList (contactId?: string) : Promise<string[]> {
+  override async tagTagContactList (contactId?: string): Promise<string[]> {
     return PUPPET.throwUnsupportedError(contactId)
   }
 
@@ -587,7 +613,7 @@ class PuppetMatrix extends PUPPET.Puppet {
    * 通过好友请求
    * @param friendshipId
    */
-  override async friendshipAccept (friendshipId : string): Promise<void> {
+  override async friendshipAccept (friendshipId: string): Promise<void> {
     const friendship: PUPPET.payloads.FriendshipReceive = (await this.friendshipRawPayload(
       friendshipId,
     )) as PUPPET.payloads.FriendshipReceive
@@ -650,7 +676,7 @@ class PuppetMatrix extends PUPPET.Puppet {
         hello = (option as any).hello
       }
     }
-    await this._client?.addFriendByWxid({ content: hello, ticket,  scene: addContactScene, wxid: contactId })
+    await this._client?.addFriendByWxid({ content: hello, ticket, scene: addContactScene, wxid: contactId })
   }
 
   /**
@@ -675,7 +701,7 @@ class PuppetMatrix extends PUPPET.Puppet {
    * @param scene 场景值 1=qq 3=微信号 6=单向添加 10和13=通讯录 14=群聊 15=手机号 17=名片 30=扫一扫
    * @private
    */
-  private async _friendshipSearch (id: string, scene?:string): Promise<null | string> {
+  private async _friendshipSearch (id: string, scene?: string): Promise<null | string> {
     const cachedContactSearch = await this._cacheMgr!.getContactSearch(id)
     if (cachedContactSearch) {
       return id
@@ -815,7 +841,7 @@ class PuppetMatrix extends PUPPET.Puppet {
    * 解析h5链接
    * @param messageId
    */
-  override async messageUrl (messageId: string)  : Promise<PUPPET.payloads.UrlLink> {
+  override async messageUrl (messageId: string): Promise<PUPPET.payloads.UrlLink> {
     const rawPayload = await this.messageRawPayload(messageId)
     const payload = await this.messageRawPayloadParser(rawPayload)
 
@@ -837,7 +863,7 @@ class PuppetMatrix extends PUPPET.Puppet {
    * 解析h5链接
    * @param messageId
    */
-  override async messageLocation (messageId: string)  : Promise<PUPPET.payloads.Location> {
+  override async messageLocation (messageId: string): Promise<PUPPET.payloads.Location> {
     const rawPayload = await this.messageRawPayload(messageId)
     const payload = await this.messageRawPayloadParser(rawPayload)
 
@@ -888,9 +914,9 @@ class PuppetMatrix extends PUPPET.Puppet {
     const metadata: FileBoxMetadataMessage = fileBox.metadata as FileBoxMetadataMessage
 
     const fileType
-            = fileBox.mediaType && fileBox.mediaType !== 'application/octet-stream'
-              ? fileBox.mediaType
-              : path.extname(fileBox.name)
+      = fileBox.mediaType && fileBox.mediaType !== 'application/octet-stream'
+        ? fileBox.mediaType
+        : path.extname(fileBox.name)
 
     // @ts-ignore
     const fileUrl = fileBox.remoteUrl || ''
@@ -908,7 +934,7 @@ class PuppetMatrix extends PUPPET.Puppet {
       }
     } else if (fileBox.mediaType === 'audio/silk') {
       PUPPET.throwUnsupportedError(conversationId, fileBox)
-    } else if (fileType.includes('video/mp4') ||  fileType.includes('.mp4')) {
+    } else if (fileType.includes('video/mp4') || fileType.includes('.mp4')) {
       const msgInfo = await this._client?.sendVideo(conversationId, fileUrl, this._self?.wxid)
       if (msgInfo) {
         await this._cacheMgr?.setMessage(msgInfo.id, msgInfo)
@@ -1054,8 +1080,8 @@ class PuppetMatrix extends PUPPET.Puppet {
    ***************************************************************************/
 
   // 拉人进群
-  override async roomAdd (roomId    : string, contactId : string): Promise<void> {
-    let type:number = 1 // 1 直接拉 2 发送邀请链接  人数超过40需要对方同意
+  override async roomAdd (roomId: string, contactId: string): Promise<void> {
+    let type: number = 1 // 1 直接拉 2 发送邀请链接  人数超过40需要对方同意
     if (roomId) {
       const ret = await this.roomRawPayload(roomId)
       if (ret && ret.memberNum && ret.memberNum > 38) {
@@ -1078,16 +1104,16 @@ class PuppetMatrix extends PUPPET.Puppet {
 
   // 创建群聊
   override async roomCreate (
-    contactIdList : string[],
-    topic         : string,
+    contactIdList: string[],
+    topic: string,
   ): Promise<string> {
     return this._client?.creatRoom(contactIdList, topic) || ''
   }
 
   // 删除群聊 暂不支持
   override async roomDel (
-    roomId    : string,
-    contactId : string,
+    roomId: string,
+    contactId: string,
   ): Promise<void> {
     return PUPPET.throwUnsupportedError(roomId, contactId)
   }
@@ -1107,22 +1133,22 @@ class PuppetMatrix extends PUPPET.Puppet {
     return this._client?.roomQuit(roomId)
   }
 
-  override async roomTopic (roomId: string)                : Promise<string>
-  override async roomTopic (roomId: string, topic: string) : Promise<void>
+  override async roomTopic(roomId: string): Promise<string>
+  override async roomTopic(roomId: string, topic: string): Promise<void>
 
   // 修改群名称
   override async roomTopic (
-    roomId : string,
-    topic? : string,
+    roomId: string,
+    topic?: string,
   ): Promise<void | string> {
     await this._client?.setGroupName(roomId, topic)
   }
 
-  override async roomAnnounce (roomId: string)                : Promise<string>
-  override async roomAnnounce (roomId: string, text: string)  : Promise<void>
+  override async roomAnnounce(roomId: string): Promise<string>
+  override async roomAnnounce(roomId: string, text: string): Promise<void>
 
   // 修改群公告
-  override async roomAnnounce (roomId: string, text?: string) : Promise<void | string> {
+  override async roomAnnounce (roomId: string, text?: string): Promise<void | string> {
     if (text !== undefined) {
       await this._client?.sendAnnouncement(roomId, text)
     }
@@ -1130,7 +1156,7 @@ class PuppetMatrix extends PUPPET.Puppet {
   }
 
   // 获取群成员列表
-  override async roomMemberList (roomId: string) : Promise<string[]> {
+  override async roomMemberList (roomId: string): Promise<string[]> {
     const roomMemberMap = await this._getRoomMemberList(roomId)
     return Object.values(roomMemberMap).map((m) => m.wxid)
   }
@@ -1201,7 +1227,7 @@ class PuppetMatrix extends PUPPET.Puppet {
    * 查找群基础信息
    * @param id
    */
-  override async roomRawPayload (id: string): Promise<ContactPayload|undefined> {
+  override async roomRawPayload (id: string): Promise<ContactPayload | undefined> {
     let ret = await this._cacheMgr!.getRoom(id)
     if (!ret) {
       const contact = await this._refreshContact(id)
@@ -1215,21 +1241,28 @@ class PuppetMatrix extends PUPPET.Puppet {
    * @param roomId
    * @param contactId
    */
-  override async roomMemberRawPayload (roomId: string, contactId: string): Promise<ContactPayload>  {
+  override async roomMemberRawPayload (roomId: string, contactId: string): Promise<ContactPayload> {
     const roomMemberMap = await this._getRoomMemberList(roomId)
     if (roomMemberMap[contactId]) {
       return roomMemberMap[contactId]!
     }
-    const newMap = await this._getRoomMemberList(roomId, true)
+    const memberInfo = await this._updateRoomMemberMap(roomId, contactId)
+
+    const ret = await this._cacheMgr!.getRoomMember(roomId)
+    if (ret) {
+      const newMap = await this._getRoomMemberList(roomId, true)
 
-    return newMap[contactId]!
+      return newMap[contactId] || memberInfo
+    } else {
+      return memberInfo
+    }
   }
 
   /**
    * 解析群成员信息
    * @param rawPayload
    */
-  override async roomMemberRawPayloadParser (rawPayload: ContactPayload): Promise<PUPPET.payloads.RoomMember>  {
+  override async roomMemberRawPayloadParser (rawPayload: ContactPayload): Promise<PUPPET.payloads.RoomMember> {
     return engineRoomMemberToWechaty(rawPayload)
   }
 
@@ -1283,7 +1316,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     if (!PUPPET.payloads.isPostClient(payload)) {
       throw new Error('can only publish client post now')
     }
-    const momentInfo:any = {
+    const momentInfo: any = {
       content: '',
       mentionIdList: [],
       visibledList: [],
@@ -1310,7 +1343,7 @@ class PuppetMatrix extends PUPPET.Puppet {
             const fileUrl = fileBox.remoteUrl || ''
             if (fileBox.mediaType.startsWith('image/')) {
               momentInfo.imageUrls.push(fileUrl)
-            } else if (fileType.includes('video/mp4') ||  fileType.includes('.mp4')) {
+            } else if (fileType.includes('video/mp4') || fileType.includes('.mp4')) {
               momentInfo.videoUrl = fileUrl
             }
           }
@@ -1360,8 +1393,8 @@ class PuppetMatrix extends PUPPET.Puppet {
   }
 
   override async postRawPayloadParser (payload: PUPPET.payloads.Post): Promise<PUPPET.payloads.Post> {
-  // log.silly('PuppetService', 'postRawPayloadParser({id:%s})', payload.id)
-  // passthrough
+    // log.silly('PuppetService', 'postRawPayloadParser({id:%s})', payload.id)
+    // passthrough
     return payload
   }
 
@@ -1421,6 +1454,62 @@ class PuppetMatrix extends PUPPET.Puppet {
     return ret
   }
 
+  // 更新群成员列表，新增
+  private async _updateRoomMemberMap (roomId: string, contactId: string): Promise<ContactPayload> {
+    if (!this._cacheMgr) {
+      return {
+        avatar: '',
+        city: '',
+        country: '',
+        name: '',
+        alias: '',
+        province: '',
+        wxid: contactId,
+        sex: 0,
+        wxNum: '',
+      }
+    }
+
+    const ret = await this._cacheMgr!.getRoomMember(roomId)
+    if (ret) {
+      const existContact = await this._cacheMgr!.getContact(contactId)
+      if (existContact) {
+        ret[contactId] = existContact as ContactPayload
+        await this._updateRoomMember(roomId, ret)
+        return existContact
+      } else {
+        const contact = await this._client?.searchContact([ contactId ])
+        if (!Array.isArray(contact)) {
+          ret[contactId] = contact as ContactPayload
+          await this._updateRoomMember(roomId, ret)
+          return contact as ContactPayload
+        }
+        return {
+          avatar: '',
+          city: '',
+          country: '',
+          name: '',
+          alias: '',
+          province: '',
+          wxid: contactId,
+          sex: 0,
+          wxNum: '',
+        }
+      }
+    }
+    return {
+      avatar: '',
+      city: '',
+      country: '',
+      name: '',
+      alias: '',
+      province: '',
+      wxid: contactId,
+      sex: 0,
+      wxNum: '',
+    }
+  }
+
   // 更新联系人缓存
   private async _updateContactCache (contact: ContactPayload): Promise<void> {
     if (!contact.wxid) {
@@ -1434,7 +1523,7 @@ class PuppetMatrix extends PUPPET.Puppet {
       const roomId = contact.wxid
       let finalPayload: ContactPayload = contact
       if (oldRoomPayload) {
-        finalPayload = Object.assign(oldRoomPayload, contact)
+        finalPayload = { ...oldRoomPayload, ...contact }
       }
       await this._cacheMgr!.setRoom(roomId, finalPayload)
 
@@ -1446,7 +1535,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     } else {
       const oldContactPaylod = await this._cacheMgr!.getContact(contact.wxid)
       if (oldContactPaylod) {
-        await this._cacheMgr!.setContact(contact.wxid, Object.assign(oldContactPaylod, contact))
+        await this._cacheMgr!.setContact(contact.wxid, { ...oldContactPaylod, ...contact })
       } else {
         await this._cacheMgr!.setContact(contact.wxid, contact)
       }
@@ -1466,7 +1555,7 @@ class PuppetMatrix extends PUPPET.Puppet {
    * 更新群成员信息
    * @param roomId
    */
-  public async _updateRoom (roomId:string) {
+  public async _updateRoom (roomId: string) {
     if (!roomId) {
       log.warn(PRE, 'roomid is required for updateRoom')
       return
@@ -1539,9 +1628,20 @@ class PuppetMatrix extends PUPPET.Puppet {
         break
       }
       case EventType.RoomJoin: {
-        // const roomJoin: PUPPET.payloads.EventRoomJoin = event.payload
-        // await this._updateRoomMember(roomJoin.roomId)
-        // this.emit('room-join', roomJoin)
+        const roomJoin: PUPPET.payloads.EventRoomJoin = event.payload
+        await this._updateRoomMember(roomJoin.roomId)
+        for (const joinId of roomJoin.inviteeIdList) {
+          if (this._roomJoinTemp[`${roomJoin.roomId}-${joinId}`]) {
+            roomJoin.inviteeIdList = roomJoin.inviteeIdList.filter(id => id !== joinId)
+          } else {
+            this._roomJoinTemp[`${roomJoin.roomId}-${joinId}`] = joinId
+            const temTimer = setTimeout(() => {
+              delete this._roomJoinTemp[`${roomJoin.roomId}-${joinId}`]
+              clearTimeout(temTimer)
+            }, 50000)
+          }
+        }
+        this.emit('room-join', roomJoin)
         break
       }
       case EventType.RoomLeave: {
@@ -1552,8 +1652,8 @@ class PuppetMatrix extends PUPPET.Puppet {
         break
       }
       case EventType.RoomTopic: {
-        // const roomTopic: PUPPET.payloads.EventRoomTopic = event.payload
-        // this.emit('room-topic', roomTopic)
+        const roomTopic: PUPPET.payloads.EventRoomTopic = event.payload
+        this.emit('room-topic', roomTopic)
         break
       }
     }
@@ -1602,7 +1702,7 @@ class PuppetMatrix extends PUPPET.Puppet {
    * @param messagePayload
    * @private
    */
-  private async _getMessageImageFileBox (messageId: string, messagePayload: MessagePayload):Promise<FileBoxInterface> {
+  private async _getMessageImageFileBox (messageId: string, messagePayload: MessagePayload): Promise<FileBoxInterface> {
     const imageInfo: ImageMessagePayload = await parseImageMessagePayload(messagePayload)
     if (!imageInfo.file_id) {
       log.error(`Can not get file for message: ${messageId}`)
@@ -1611,7 +1711,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     return FileBox.fromUrl(url)
   }
 
-  private async _getMessageAudioFileBox (messageId: string, messagePayload: MessagePayload):Promise<FileBoxInterface> {
+  private async _getMessageAudioFileBox (messageId: string, messagePayload: MessagePayload): Promise<FileBoxInterface> {
     const audioInfo: AudioMessagePayload = await parseAudioMessagePayload(messagePayload)
     if (!audioInfo.length) {
       log.error(`Can not get file for message: ${messageId}`)
@@ -1620,7 +1720,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     return FileBox.fromUrl(url)
   }
 
-  private async _getMessageVideoFileBox (messageId: string, messagePayload: MessagePayload):Promise<FileBoxInterface> {
+  private async _getMessageVideoFileBox (messageId: string, messagePayload: MessagePayload): Promise<FileBoxInterface> {
     const videoInfo: VideoMessagePayload = await parseVideoMessagePayload(messagePayload)
     if (!videoInfo.file_id) {
       log.error(`Can not get file for message: ${messageId}`)
@@ -1636,7 +1736,7 @@ class PuppetMatrix extends PUPPET.Puppet {
    * @param messagePayload
    * @private
    */
-  private async _getMessageFileFileBox (messageId: string, messagePayload: MessagePayload):Promise<FileBoxInterface> {
+  private async _getMessageFileFileBox (messageId: string, messagePayload: MessagePayload): Promise<FileBoxInterface> {
     const appPayload: AppMessagePayload = await parseAppmsgMessagePayload(messagePayload.msg)
     if (!appPayload.appattach?.attachid) {
       log.error(`Can not get file for message: ${messageId}`)