bb-fca 2.0.9 → 2.0.10

package/src/deltas/apis/messaging/sendMessage.ts

@@ -12,10 +12,14 @@ const allowedProperties = {
   location: true,
 };
 
-export default function(defaultFuncs: any, api: any, ctx: any) {
-  async function uploadAttachment(attachments) {
-    var uploads = [];
-    for (var i = 0; i < attachments.length; i++) {
+export default function sendMessage(
+  defaultFuncs: any,
+  api: any,
+  ctx: any,
+): Function {
+  async function uploadAttachment(attachments: any[]): Promise<any[]> {
+    const uploads: any[] = [];
+    for (let i = 0; i < attachments.length; i++) {
       if (!utils.isReadableStream(attachments[i])) {
         throw new Error(
           'Attachment should be a readable stream and not ' +
@@ -42,7 +46,7 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
     return uploads;
   }
 
-  async function getUrl(url) {
+  async function getUrl(url: string): Promise<any> {
     const resData = await defaultFuncs
       .post(
         'https://www.facebook.com/message_share_attachment/fromURI/',
@@ -60,19 +64,18 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
   }
 
   async function sendContent(
-    form,
-    threadID,
-    isSingleUser,
-    messageAndOTID,
-    callback?,
-  ) {
+    form: Record<string, any>,
+    threadID: any,
+    isSingleUser: boolean,
+    messageAndOTID: string,
+  ): Promise<any> {
     // There are three cases here:
     // 1. threadID is of type array, where we're starting a new group chat with users
     //    specified in the array.
     // 2. User is sending a message to a specific user.
     // 3. No additional form params and the message goes to an existing group chat.
     if (utils.getType(threadID) === 'Array') {
-      for (var i = 0; i < threadID.length; i++) {
+      for (let i = 0; i < threadID.length; i++) {
         form['specific_to_list[' + i + ']'] = 'fbid:' + threadID[i];
       }
       form['specific_to_list[' + threadID.length + ']'] = 'fbid:' + ctx.userID;
@@ -131,10 +134,15 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
     return messageInfo;
   }
 
-  return async (msg, threadID, replyToMessage, isSingleUser = false) => {
-    let msgType = utils.getType(msg);
-    let threadIDType = utils.getType(threadID);
-    let messageIDType = utils.getType(replyToMessage);
+  return async function sendMessage(
+    msg: any,
+    threadID: any,
+    replyToMessage?: string,
+    isSingleUser: boolean = false,
+  ): Promise<any> {
+    const msgType = utils.getType(msg);
+    const threadIDType = utils.getType(threadID);
+    const messageIDType = utils.getType(replyToMessage);
     if (msgType !== 'String' && msgType !== 'Object')
       throw new Error(
         'Message should be of type string or object and not ' + msgType + '.',
@@ -156,7 +164,7 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
     if (msgType === 'String') {
       msg = { body: msg };
     }
-    let disallowedProperties = Object.keys(msg).filter(
+    const disallowedProperties = Object.keys(msg).filter(
       (prop) => !allowedProperties[prop],
     );
     if (disallowedProperties.length > 0) {
@@ -164,8 +172,8 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
         'Dissallowed props: `' + disallowedProperties.join(', ') + '`',
       );
     }
-    let messageAndOTID = utils.generateOfflineThreadingID();
-    let form: Record<string, any> = {
+    const messageAndOTID = utils.generateOfflineThreadingID();
+    const form: Record<string, any> = {
       client: 'mercury',
       action_type: 'ma-type:user-generated-message',
       author: 'fbid:' + ctx.userID,
@@ -275,12 +283,6 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
         form['profile_xmd[' + i + '][type]'] = 'p';
       }
     }
-    const result = await sendContent(
-      form,
-      threadID,
-      isSingleUser,
-      messageAndOTID,
-    );
-    return result;
+    return await sendContent(form, threadID, isSingleUser, messageAndOTID);
   };
 }

package/src/deltas/apis/messaging/sendTypingIndicator.ts

@@ -1,6 +1,4 @@
 // @ChoruOfficial
-'use strict';
-
 import utils = require('../../../utils');
 
 /**
@@ -8,16 +6,21 @@ import utils = require('../../../utils');
  * @param {Object} api
  * @param {Object} ctx
  */
-export default function(defaultFuncs: any, api: any, ctx: any) {
+export default function sendTypingIndicator(
+  defaultFuncs: any,
+  api: any,
+  ctx: any,
+): Function {
   /**
    * Sends a typing indicator to a specific thread.
-   * @param {boolean} sendTyping - True to show typing indicator, false to hide.
-   * @param {string} threadID - The ID of the thread to send the typing indicator to.
-   * @param {Function} [callback] - An optional callback function.
+   * @param {boolean} sendTyping - True to show typing, false to hide.
+   * @param {string} threadID - The ID of the thread.
    * @returns {Promise<void>}
    */
-  return async function sendTypingIndicatorV2(sendTyping, threadID, callback) {
-    let count_req = 0;
+  return async function sendTypingIndicator(
+    sendTyping: boolean,
+    threadID: string,
+  ): Promise<void> {
     const wsContent = {
       app_id: 2220391788200892,
       payload: JSON.stringify({
@@ -30,9 +33,10 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
         }),
         version: 5849951561777440,
       }),
-      request_id: ++count_req,
+      request_id: ++ctx.wsReqNumber,
       type: 4,
     };
+
     await new Promise<void>((resolve, reject) =>
       ctx.mqttClient.publish(
         '/ls_req',
@@ -41,8 +45,5 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
         (err, _packet) => (err ? reject(err) : resolve()),
       ),
     );
-    if (callback) {
-      callback();
-    }
   };
 }

package/src/deltas/apis/messaging/setMessageReaction.ts

@@ -1,25 +1,50 @@
-import utils = require("../../../utils");
+import utils = require('../../../utils');
 // @NethWs3Dev
 
-export default function(defaultFuncs: any, api: any, ctx: any) {
-  return async (reaction, messageID) => {
-    if (!reaction) throw new Error("Please enter a valid emoji.");
-    const defData = await defaultFuncs.postFormData("https://www.facebook.com/webgraphql/mutation/", ctx.jar, {}, {
-      doc_id: "1491398900900362",
-      variables: JSON.stringify({
-      data: {
-        client_mutation_id: ctx.clientMutationId++,
-        actor_id: ctx.userID,
-        action: reaction == "" ? "REMOVE_REACTION" : "ADD_REACTION",
-        message_id: messageID,
-        reaction
-      }
-    }),
-      dpr: 1
-    });
-    const resData = await utils.parseAndCheckLogin(ctx.jar, defaultFuncs)(defData);
+/**
+ * @param {Object} defaultFuncs
+ * @param {Object} api
+ * @param {Object} ctx
+ */
+export default function setMessageReaction(
+  defaultFuncs: any,
+  api: any,
+  ctx: any,
+): Function {
+  /**
+   * Sets or removes a reaction on a message.
+   * @param {string} reaction - The emoji to react with, or empty string to remove.
+   * @param {string} messageID - The ID of the message to react to.
+   * @returns {Promise<void>}
+   */
+  return async function setMessageReaction(
+    reaction: string,
+    messageID: string,
+  ): Promise<void> {
+    if (!reaction && reaction !== '')
+      throw new Error('Please enter a valid emoji.');
+    const defData = await defaultFuncs.postFormData(
+      'https://www.facebook.com/webgraphql/mutation/',
+      ctx.jar,
+      {},
+      {
+        doc_id: '1491398900900362',
+        variables: JSON.stringify({
+          data: {
+            client_mutation_id: ctx.clientMutationId++,
+            actor_id: ctx.userID,
+            action:
+              reaction === '' ? 'REMOVE_REACTION' : 'ADD_REACTION',
+            message_id: messageID,
+            reaction,
+          },
+        }),
+        dpr: 1,
+      },
+    );
+    const resData = await utils.parseAndCheckLogin(ctx, defaultFuncs)(defData);
     if (!resData) {
-      throw new Error("setMessageReactionLegacy returned empty object.");
+      throw new Error('setMessageReaction returned empty object.');
     }
   };
-};
+}

package/src/deltas/apis/messaging/shareContact.ts

@@ -1,36 +1,44 @@
-import utils = require("../../../utils");
+import utils = require('../../../utils');
 
 /**
  * @module shareContact
  * @param {Object} defaultFuncs - The default functions provided by the API.
  * @param {Object} api - The full API object.
  * @param {Object} ctx - The context object.
- * @returns {function(text: string, senderID: string, threadID: string, callback: Function): void} - A function to share a contact.
  */
-export default function(defaultFuncs: any, api: any, ctx: any) {
+export default function shareContact(
+  defaultFuncs: any,
+  api: any,
+  ctx: any,
+): Function {
   /**
    * Shares a user's contact information into a specific thread via MQTT.
-   * @param {string} [text] - An optional message to send along with the contact card.
-   * @param {string} senderID - The Facebook user ID of the contact you want to share.
+   * @param {string} text - An optional message to send along with the contact card.
+   * @param {string} senderID - The Facebook user ID of the contact to share.
    * @param {string} threadID - The ID of the thread where the contact will be shared.
-   * @param {Function} [callback] - An optional callback function to be executed.
+   * @param {Function} [callback] - An optional callback function.
+   * @returns {void}
    */
-  return function shareContact(text, senderID, threadID, callback) {
+  return function shareContact(
+    text: string,
+    senderID: string,
+    threadID: string,
+    callback?: Function,
+  ): void {
     if (!ctx.mqttClient) {
       throw new Error('Not connected to MQTT');
     }
 
     ctx.wsReqNumber ??= 0;
     ctx.wsTaskNumber ??= 0;
-
     ctx.wsReqNumber += 1;
     ctx.wsTaskNumber += 1;
 
     const queryPayload = {
       contact_id: senderID,
       sync_group: 1,
-      text: text || "",
-      thread_id: threadID
+      text: text || '',
+      thread_id: threadID,
     };
 
     const query = {
@@ -38,7 +46,7 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
       label: '359',
       payload: JSON.stringify(queryPayload),
       queue_name: 'messenger_contact_sharing',
-      task_id: Math.random() * 1001 << 0,
+      task_id: Math.trunc(Math.random() * 1001),
     };
 
     const context: any = {
@@ -51,13 +59,15 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
       request_id: ctx.wsReqNumber,
       type: 3,
     };
-
     context.payload = JSON.stringify(context.payload);
 
     if (typeof callback === 'function') {
-      ctx.callback_Task[ctx.wsReqNumber] = { callback, type: "shareContact" };
+      ctx.callback_Task[ctx.wsReqNumber] = { callback, type: 'shareContact' };
     }
 
-    ctx.mqttClient.publish('/ls_req', JSON.stringify(context), { qos: 1, retain: false });
+    ctx.mqttClient.publish('/ls_req', JSON.stringify(context), {
+      qos: 1,
+      retain: false,
+    });
   };
-};
+}

package/src/deltas/apis/messaging/stickers.ts

@@ -15,7 +15,7 @@ function formatPackList(data) {
     const storePacks = data?.data?.viewer?.sticker_store?.available_packs?.edges;
     
     const packData = storePacks || trayPacks;
-    if (!packData || !packData.edges) return { packs: [], page_info: { has_next_page: false } };
+    if (!packData?.edges) return { packs: [], page_info: { has_next_page: false } };
 
     const formattedPacks = packData.edges.map(edge => edge.node ? ({
         id: edge.node.id,
@@ -85,7 +85,7 @@ function formatAiStickers(data) {
     })).filter(Boolean);
 }
 
-export default function(defaultFuncs: any, api: any, ctx: any) {
+export default function stickers(defaultFuncs: any, api: any, ctx: any) {
     /**
      * Make a GraphQL request and handle login and error checking
      * @param {object} form - Form data for the request
@@ -159,7 +159,7 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
             allPacks.push(...packs);
             utils.log(`Fetched first page with ${packs.length} packs.`);
 
-            while (page_info && page_info.has_next_page) {
+            while (page_info?.has_next_page) {
                 utils.log("Fetching next page with cursor:", page_info.end_cursor);
 
                 const paginatedForm = {
@@ -252,4 +252,4 @@ export default function(defaultFuncs: any, api: any, ctx: any) {
             return formatAiStickers(res);
         }
     };
-};
+}