2.3.1: Fixed format of attachments

Author: Bjornskjald

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "libfb",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Facebook MQTT library for Node.js",
   "repository": "https://github.com/ChatPlug/libfb-js",
   "main": "dist/index.js",

package.json

@@ -1,12 +1,13 @@
-import Attachment from './Attachment'
+import { FileAttachment, XMAAttachment } from './Attachment'
 
 export default interface Message {
   id: string
   timestamp: number
   authorId: string
   threadId: string
   message: string
-  attachments: Attachment[]
+  fileAttachments: FileAttachment[],
+  mediaAttachments: XMAAttachment[]
   stickerId?: number,
   mentions?: Mention[]
 }

src/types/Message.ts

@@ -3,7 +3,7 @@ import parseBlobAttachment from './parseBlobAttachment'
 import parseXMAAttachment from './parseXMAAttachment'
 import { FileAttachment, XMAAttachment } from '../Attachment'
 
-interface Attachments {
+export interface Attachments {
   fileAttachments: FileAttachment[],
   mediaAttachments: XMAAttachment[]
 }

src/types/attachments/parseAttachments.ts

@@ -2,9 +2,11 @@ import { parseAttachments } from '../Attachment'
 import Message, { Mention } from '../Message'
 
 export default function parseDeltaMessage (delta: any) {
+  const { fileAttachments, mediaAttachments } = parseAttachments(delta.attachments || [])
   return {
     threadId: getThreadId(delta),
-    attachments: delta.attachments ? parseAttachments(delta.attachments) : [],
+    fileAttachments,
+    mediaAttachments,
     authorId: delta.messageMetadata.actorFbId,
     id: delta.messageMetadata.messageId,
     timestamp: delta.messageMetadata.timestamp,

src/types/message/parseDeltaMessage.ts

@@ -1,23 +1,27 @@
 import Message from '../Message'
-import Attachment from '../Attachment'
 import parseXMAAttachment from '../attachments/parseXMAAttachment'
 import parseBlobAttachment from '../attachments/parseBlobAttachment'
+import { Attachments } from '../attachments/parseAttachments'
 
 export default function parseThreadMessage (threadId: string, message: any) {
+  const { fileAttachments, mediaAttachments } = parseAttachments(message)
   return {
     id: message.message_id,
     timestamp: Number(message.timestamp_precise),
     authorId: message.message_sender ? message.message_sender.messaging_actor.id : '',
     threadId,
     message: message.message ? message.message.text : '',
-    attachments: parseAttachments(message),
+    fileAttachments,
+    mediaAttachments,
     stickerId: message.sticker
   } as Message
 }
-function parseAttachments (message: any): Attachment[] {
-  const attachments = message.blob_attachments ? message.blob_attachments.map(parseBlobAttachment) : []
+
+function parseAttachments (message: any): Attachments {
+  const fileAttachments = message.blob_attachments ? message.blob_attachments.map(parseBlobAttachment) : []
   // const attachments = message.blob_attachments ? message.blob_attachments : []
   const xma = message.extensible_attachment
-  if (xma) attachments.push(parseXMAAttachment({ [xma.id]: xma }))
-  return attachments
+  const mediaAttachments = []
+  if (xma) mediaAttachments.push(parseXMAAttachment({ [xma.id]: xma }))
+  return { fileAttachments, mediaAttachments }
 }