shadowx-fca 2.5.0 → 2.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shadowx-fca",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "Unofficial Facebook Chat API for Node.js with Auto-Update System -  modify by Mueid Mursalin Rifat",
   "main": "index.js",
   "files": [
@@ -50,6 +50,6 @@
     "ws": "^8.18.1"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   }
 }

package/src/GetBotInfo.js

@@ -1,6 +1,6 @@
 "use strict";
-// sahilchat-fca — GetBotInfo
-// Author: S4hiilAns4ri (github.com/S4hiilAns4ri)
+// shadowx-fca — GetBotInfo
+// Author: Modified for shadowx-fca
 
 const utils = require('../utils');
 
@@ -12,7 +12,7 @@ module.exports = (defaultFuncs, api, ctx) => {
    */
   return function GetBotInfo(netData) {
     if (!netData || !Array.isArray(netData)) {
-      utils.error("GetBotInfo", "netData is not a valid array.");
+      utils.log("GetBotInfo", "netData is not a valid array.");
       return null;
     }
 
@@ -20,10 +20,14 @@ module.exports = (defaultFuncs, api, ctx) => {
       for (const scriptData of netData) {
         if (!scriptData.require) continue;
         for (const req of scriptData.require) {
-          if (Array.isArray(req) && req[0] === key && req[2]) return req[2];
-          if (Array.isArray(req) && req[3]?.[0]?.__bbox?.define) {
+          if (Array.isArray(req) && req[0] === key && req[2]) {
+            return req[2];
+          }
+          if (Array.isArray(req) && req[3] && req[3][0] && req[3][0].__bbox && req[3][0].__bbox.define) {
             for (const def of req[3][0].__bbox.define) {
-              if (Array.isArray(def) && def[0].endsWith(key) && def[2]) return def[2];
+              if (Array.isArray(def) && def[0] && def[0].endsWith(key) && def[2]) {
+                return def[2];
+              }
             }
           }
         }
@@ -33,25 +37,30 @@ module.exports = (defaultFuncs, api, ctx) => {
 
     const currentUserData = findConfig("CurrentUserInitialData");
     const dtsgInitialData = findConfig("DTSGInitialData");
-    const dtsgInitData    = findConfig("DTSGInitData");
-    const lsdData         = findConfig("LSD");
+    const dtsgInitData = findConfig("DTSGInitData");
+    const lsdData = findConfig("LSD");
 
     if (!currentUserData || !dtsgInitialData) {
-      utils.error("GetBotInfo", "Could not find required data (CurrentUserInitialData or DTSGInitialData).");
+      utils.log("GetBotInfo", "Could not find required data (CurrentUserInitialData or DTSGInitialData).");
       return null;
     }
 
     return {
-      name      : currentUserData.NAME,
-      firstName : currentUserData.SHORT_NAME,
-      uid       : currentUserData.USER_ID,
-      appID     : currentUserData.APP_ID,
-      dtsgToken : dtsgInitialData.token,
-      lsdToken  : lsdData?.token,
-      dtsgInit  : dtsgInitData ? { token: dtsgInitData.token, async_get_token: dtsgInitData.async_get_token } : undefined,
-      getCtx     : (key) => ctx[key],
-      getOptions : (key) => ctx.globalOptions[key],
-      getRegion  : () => ctx?.region,
+      name: currentUserData.NAME || null,
+      firstName: currentUserData.SHORT_NAME || null,
+      uid: currentUserData.USER_ID || null,
+      appID: currentUserData.APP_ID || null,
+      dtsgToken: dtsgInitialData.token || null,
+      lsdToken: lsdData?.token || null,
+      dtsgInit: dtsgInitData ? { 
+        token: dtsgInitData.token, 
+        async_get_token: dtsgInitData.async_get_token 
+      } : undefined,
+      getCtx: (key) => ctx ? ctx[key] : null,
+      getOptions: (key) => ctx && ctx.globalOptions ? ctx.globalOptions[key] : null,
+      getRegion: () => ctx?.region || null,
+      getUserID: () => ctx?.userID || currentUserData?.USER_ID || null,
+      getJar: () => ctx?.jar || null
     };
   };
-};
+};

package/src/OldMessage.js

@@ -19,9 +19,10 @@ module.exports = function (defaultFuncs, api, ctx) {
   function uploadAttachment(attachments, callback) {
     var uploads = [];
 
-    // create an array of promises
     for (var i = 0; i < attachments.length; i++) {
-      if (!utils.isReadableStream(attachments[i])) throw { error: "Attachment should be a readable stream and not " + utils.getType(attachments[i]) + "." };
+      if (!utils.isReadableStream(attachments[i])) {
+        throw { error: "Attachment should be a readable stream and not " + utils.getType(attachments[i]) + "." };
+      }
       var form = {
         upload_1024: attachments[i],
         voice_clip: "true"
@@ -33,14 +34,11 @@ module.exports = function (defaultFuncs, api, ctx) {
           .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
           .then(function (resData) {
             if (resData.error) throw resData;
-            // We have to return the data unformatted unless we want to change it
-            // back in sendMessage.
             return resData.payload.metadata[0];
           })
       );
     }
 
-    // resolve all promises
     bluebird
       .all(uploads)
       .then(resData => callback(null, resData))
@@ -72,26 +70,25 @@ module.exports = function (defaultFuncs, api, ctx) {
   }
 
   function sendContent(form, threadID, isSingleUser, messageAndOTID, callback) {
-    // 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++) form["specific_to_list[" + i + "]"] = "fbid:" + threadID[i];
+      for (var i = 0; i < threadID.length; i++) {
+        form["specific_to_list[" + i + "]"] = "fbid:" + threadID[i];
+      }
       form["specific_to_list[" + threadID.length + "]"] = "fbid:" + ctx.userID;
       form["client_thread_id"] = "root:" + messageAndOTID;
       log.info("sendMessage", "Sending message to multiple users: " + threadID);
-    }
-    else {
-      // This means that threadID is the id of a user, and the chat
-      // is a single person chat
-      if (isSingleUser) {
+    } else {
+      // Auto-detect if it's a DM
+      const threadIDStr = threadID.toString();
+      const isDM = isSingleUser === true || threadIDStr.length === 15 || !threadIDStr.match(/^\d{16,}$/);
+      
+      if (isDM) {
         form["specific_to_list[0]"] = "fbid:" + threadID;
         form["specific_to_list[1]"] = "fbid:" + ctx.userID;
         form["other_user_fbid"] = threadID;
+      } else {
+        form["thread_fbid"] = threadID;
       }
-      else form["thread_fbid"] = threadID;
     }
 
     if (ctx.globalOptions.pageID) {
@@ -113,21 +110,18 @@ module.exports = function (defaultFuncs, api, ctx) {
         if (resData.error) {
           if (resData.error === 1545012) {
             log.warn("sendMessage", "Got error 1545012. This might mean that you're not part of the conversation " + threadID);
-          }
-          else {
+          } else {
             log.error("sendMessage", resData);
           }
           return callback(resData);
         }
 
         var messageInfo = resData.payload.actions.reduce(function (p, v) {
-          return (
-            {
-              threadID: v.thread_fbid,
-              messageID: v.message_id,
-              timestamp: v.timestamp
-            } || p
-          );
+          return {
+            threadID: v.thread_fbid,
+            messageID: v.message_id,
+            timestamp: v.timestamp
+          } || p;
         }, null);
 
         return callback(null, messageInfo);
@@ -139,17 +133,6 @@ module.exports = function (defaultFuncs, api, ctx) {
       });
   }
 
-  function send(form, threadID, messageAndOTID, callback, isGroup) {
-    // We're doing a query to this to check if the given id is the id of
-    // a user or of a group chat. The form will be different depending
-    // on that.
-    if (utils.getType(threadID) === "Array") sendContent(form, threadID, false, messageAndOTID, callback);
-    else {
-      if (utils.getType(isGroup) != "Boolean") sendContent(form, threadID, threadID.length === 15, messageAndOTID, callback);
-      else sendContent(form, threadID, !isGroup, messageAndOTID, callback);
-    }
-  }
-
   function handleUrl(msg, form, callback, cb) {
     if (msg.url) {
       form["shareable_attachment[share_type]"] = "100";
@@ -158,13 +141,16 @@ module.exports = function (defaultFuncs, api, ctx) {
         form["shareable_attachment[share_params]"] = params;
         cb();
       });
+    } else {
+      cb();
     }
-    else cb();
   }
 
   function handleLocation(msg, form, callback, cb) {
     if (msg.location) {
-      if (msg.location.latitude == null || msg.location.longitude == null) return callback({ error: "location property needs both latitude and longitude" });
+      if (msg.location.latitude == null || msg.location.longitude == null) {
+        return callback({ error: "location property needs both latitude and longitude" });
+      }
       form["location_attachment[coordinates][latitude]"] = msg.location.latitude;
       form["location_attachment[coordinates][longitude]"] = msg.location.longitude;
       form["location_attachment[is_current_location]"] = !!msg.location.current;
@@ -178,11 +164,17 @@ module.exports = function (defaultFuncs, api, ctx) {
   }
 
   function handleEmoji(msg, form, callback, cb) {
-    if (msg.emojiSize != null && msg.emoji == null) return callback({ error: "emoji property is empty" });
+    if (msg.emojiSize != null && msg.emoji == null) {
+      return callback({ error: "emoji property is empty" });
+    }
     if (msg.emoji) {
       if (msg.emojiSize == null) msg.emojiSize = "medium";
-      if (msg.emojiSize != "small" && msg.emojiSize != "medium" && msg.emojiSize != "large") return callback({ error: "emojiSize property is invalid" });
-      if (form["body"] != null && form["body"] != "") return callback({ error: "body is not empty" });
+      if (msg.emojiSize != "small" && msg.emojiSize != "medium" && msg.emojiSize != "large") {
+        return callback({ error: "emojiSize property is invalid" });
+      }
+      if (form["body"] != null && form["body"] != "") {
+        return callback({ error: "body is not empty" });
+      }
       form["body"] = msg.emoji;
       form["tags[0]"] = "hot_emoji_size:" + msg.emojiSize;
     }
@@ -197,23 +189,22 @@ module.exports = function (defaultFuncs, api, ctx) {
       form["video_ids"] = [];
       form["audio_ids"] = [];
 
-      if (utils.getType(msg.attachment) !== "Array") msg.attachment = [msg.attachment];
-      if (msg.attachment.every(e=>/_id$/.test(e[0]))) {
-        //console.log(msg.attachment)
-        msg.attachment.map(e=>form[`${e[0]}s`].push(e[1]));
-        return cb();
-        }
+      if (utils.getType(msg.attachment) !== "Array") {
+        msg.attachment = [msg.attachment];
+      }
+      
       uploadAttachment(msg.attachment, function (err, files) {
         if (err) return callback(err);
         files.forEach(function (file) {
           var key = Object.keys(file);
-          var type = key[0]; // image_id, file_id, etc
-          form["" + type + "s"].push(file[type]); // push the id
+          var type = key[0];
+          form[type + "s"].push(file[type]);
         });
         cb();
       });
+    } else {
+      cb();
     }
-    else cb();
   }
 
   function handleMention(msg, form, callback, cb) {
@@ -221,10 +212,16 @@ module.exports = function (defaultFuncs, api, ctx) {
       for (let i = 0; i < msg.mentions.length; i++) {
         const mention = msg.mentions[i];
         const tag = mention.tag;
-        if (typeof tag !== "string") return callback({ error: "Mention tags must be strings." });
+        if (typeof tag !== "string") {
+          return callback({ error: "Mention tags must be strings." });
+        }
         const offset = msg.body.indexOf(tag, mention.fromIndex || 0);
-        if (offset < 0) log.warn("handleMention", 'Mention for "' + tag + '" not found in message string.');
-        if (mention.id == null) log.warn("handleMention", "Mention id should be non-null.");
+        if (offset < 0) {
+          log.warn("handleMention", 'Mention for "' + tag + '" not found in message string.');
+        }
+        if (mention.id == null) {
+          log.warn("handleMention", "Mention id should be non-null.");
+        }
 
         const id = mention.id || 0;
         const emptyChar = '\u200E';
@@ -239,44 +236,67 @@ module.exports = function (defaultFuncs, api, ctx) {
   }
 
   return function sendMessage(msg, threadID, callback, replyToMessage, isGroup) {
-    typeof isGroup == "undefined" ? isGroup = null : "";
-    if (!callback && (utils.getType(threadID) === "Function" || utils.getType(threadID) === "AsyncFunction")) return threadID({ error: "Pass a threadID as a second argument." });
-    if (!replyToMessage && utils.getType(callback) === "String") {
+    // Handle parameter shifting
+    if (typeof callback === "string") {
+      isGroup = replyToMessage;
       replyToMessage = callback;
-      callback = function () { };
+      callback = function () {};
+    } else if (typeof threadID === "function") {
+      callback = threadID;
+      threadID = null;
+    }
+
+    if (!callback || typeof callback !== "function") {
+      callback = function () {};
     }
 
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
+    var resolveFunc = function () {};
+    var rejectFunc = function () {};
     var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
-    if (!callback) {
-      callback = function (err, data) {
-        if (err) return rejectFunc(err);
+    var originalCallback = callback;
+    callback = function (err, data) {
+      if (err) {
+        originalCallback(err);
+        rejectFunc(err);
+      } else {
+        originalCallback(null, data);
         resolveFunc(data);
-      };
-    }
+      }
+    };
 
     var msgType = utils.getType(msg);
     var threadIDType = utils.getType(threadID);
-    var messageIDType = utils.getType(replyToMessage);
 
-    if (msgType !== "String" && msgType !== "Object") return callback({ error: "Message should be of type string or object and not " + msgType + "." });
+    if (msgType !== "String" && msgType !== "Object") {
+      return callback({ error: "Message should be of type string or object and not " + msgType + "." });
+    }
+
+    if (threadIDType !== "Array" && threadIDType !== "Number" && threadIDType !== "String") {
+      return callback({ error: "ThreadID should be of type number, string, or array and not " + threadIDType + "." });
+    }
 
-    // Changing this to accomodate an array of users
-    if (threadIDType !== "Array" && threadIDType !== "Number" && threadIDType !== "String") return callback({ error: "ThreadID should be of type number, string, or array and not " + threadIDType + "." });
+    if (msgType === "String") {
+      msg = { body: msg };
+    }
 
-    if (replyToMessage && messageIDType !== 'String') return callback({ error: "MessageID should be of type string and not " + threadIDType + "." });
+    // Determine isSingleUser
+    var isSingleUser = !isGroup;
+    if (isGroup === null || typeof isGroup === "undefined") {
+      const threadIDStr = threadID.toString();
+      isSingleUser = threadIDStr.length === 15 || !threadIDStr.match(/^\d{16,}$/);
+    }
 
-    if (msgType === "String") msg = { body: msg };
     var disallowedProperties = Object.keys(msg).filter(prop => !allowedProperties[prop]);
-    if (disallowedProperties.length > 0) return callback({ error: "Dissallowed props: `" + disallowedProperties.join(", ") + "`" });
+    if (disallowedProperties.length > 0) {
+      return callback({ error: "Dissallowed props: `" + disallowedProperties.join(", ") + "`" });
+    }
 
     var messageAndOTID = utils.generateOfflineThreadingID();
-    // console.log(messageAndOTID)
+    
     var form = {
       client: "mercury",
       action_type: "ma-type:user-generated-message",
@@ -307,51 +327,23 @@ module.exports = function (defaultFuncs, api, ctx) {
       manual_retry_cnt: "0",
       has_attachment: !!(msg.attachment || msg.url || msg.sticker),
       signatureID: utils.getSignatureID(),
-      replied_to_message_id: replyToMessage
+      replied_to_message_id: replyToMessage || undefined
     };
-    // console.log(form)
-
-    const configSource = (global.GoatBot && global.GoatBot.config) ? global.GoatBot.config : ctx.config || {};
-    const enableTypingIndicator = typeof configSource.enableTypingIndicator !== 'undefined' ? configSource.enableTypingIndicator : ctx.config?.enableTypingIndicator;
-    const typingDuration = Number(configSource.typingDuration || ctx.config?.typingDuration || 4000);
-
-    if (enableTypingIndicator) {
-        api.sendTypingIndicator(true, threadID, () => {});
-        const originalCallback = callback;
-        callback = (err, data) => {
-            api.sendTypingIndicator(false, threadID, () => {});
-            originalCallback(err, data);
-        };
-        setTimeout(() => {
-            handleLocation(msg, form, callback, () =>
-              handleSticker(msg, form, callback, () =>
-                handleAttachment(msg, form, callback, () =>
-                  handleUrl(msg, form, callback, () =>
-                    handleEmoji(msg, form, callback, () =>
-                      handleMention(msg, form, callback, () =>
-                        sendContent(form, threadID, isSingleUser, messageAndOTID, callback)
-                      )
-                    )
-                  )
-                )
-              )
-            );
-        }, typingDuration);
-    } else {
-        handleLocation(msg, form, callback, () =>
-          handleSticker(msg, form, callback, () =>
-            handleAttachment(msg, form, callback, () =>
-              handleUrl(msg, form, callback, () =>
-                handleEmoji(msg, form, callback, () =>
-                  handleMention(msg, form, callback, () =>
-                    sendContent(form, threadID, isSingleUser, messageAndOTID, callback)
-                  )
-                )
+
+    handleLocation(msg, form, callback, () =>
+      handleSticker(msg, form, callback, () =>
+        handleAttachment(msg, form, callback, () =>
+          handleUrl(msg, form, callback, () =>
+            handleEmoji(msg, form, callback, () =>
+              handleMention(msg, form, callback, () =>
+                sendContent(form, threadID, isSingleUser, messageAndOTID, callback)
               )
             )
           )
-        );
-    }
+        )
+      )
+    );
+
     return returnPromise;
   };
 };

package/src/comment.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const utils = require('../utils');
+const log = require('npmlog');  // Add npmlog for proper logging
 
 /**
  * Handles the upload of attachments (images/videos) for a comment.
@@ -45,7 +46,7 @@ async function handleUpload(defaultFuncs, ctx, msg, form) {
  * @param {object} form - The main form object.
  */
 function handleURL(msg, form) {
-    if (typeof msg.url === 'string') {
+    if (typeof msg.url === 'string' && msg.url.trim()) {
         form.input.attachments.push({
             link: {
                 external: {
@@ -62,21 +63,21 @@ function handleURL(msg, form) {
  * @param {object} form - The main form object.
  */
 function handleMentions(msg, form) {
-    if (!msg.mentions) return;
+    if (!msg.mentions || !Array.isArray(msg.mentions)) return;
 
     for (const item of msg.mentions) {
         const { tag, id, fromIndex } = item;
         if (typeof tag !== 'string' || !id) {
-            utils.warn('createCommentPost', 'Mentions must have a string "tag" and an "id".');
+            log.warn('createCommentPost', 'Mentions must have a string "tag" and an "id".');
             continue;
         }
         const offset = msg.body.indexOf(tag, fromIndex || 0);
         if (offset < 0) {
-            utils.warn('createCommentPost', `Mention for "${tag}" not found in message string.`);
+            log.warn('createCommentPost', `Mention for "${tag}" not found in message string.`);
             continue;
         }
         form.input.message.ranges.push({
-            entity: { id },
+            entity: { id: String(id) },
             length: tag.length,
             offset
         });
@@ -124,8 +125,8 @@ async function createContent(defaultFuncs, ctx, form) {
     // Try to extract comment info from response
     try {
         const commentEdge = res?.data?.comment_create?.feedback_comment_edge;
-        const id    = commentEdge?.node?.id    || null;
-        const url   = commentEdge?.node?.feedback?.url || null;
+        const id = commentEdge?.node?.id || null;
+        const url = commentEdge?.node?.feedback?.url || null;
         const count = res?.data?.comment_create?.feedback?.total_comment_count || 0;
         return { id, url, count };
     } catch (_) {
@@ -146,7 +147,10 @@ module.exports = function(defaultFuncs, api, ctx) {
     return async function createCommentPost(msg, postID, replyCommentID, callback) {
         let cb;
         const returnPromise = new Promise((resolve, reject) => {
-            cb = (error, info) => info ? resolve(info) : reject(error);
+            cb = (error, info) => {
+                if (error) reject(error);
+                else resolve(info);
+            };
         });
 
         if (typeof replyCommentID === 'function') {
@@ -154,17 +158,26 @@ module.exports = function(defaultFuncs, api, ctx) {
             replyCommentID = null;
         }
         if (typeof callback === 'function') {
-            cb = callback;
+            const originalCb = cb;
+            cb = (error, info) => {
+                if (error) {
+                    callback(error);
+                    originalCb(error);
+                } else {
+                    callback(null, info);
+                    originalCb(null, info);
+                }
+            };
         }
 
         if (typeof msg !== 'string' && typeof msg !== 'object') {
             const error = 'Message must be a string or an object.';
-            utils.error('createCommentPost', error);
+            log.error('createCommentPost', error);
             return cb(error);
         }
         if (typeof postID !== 'string') {
             const error = 'postID must be a string.';
-            utils.error('createCommentPost', error);
+            log.error('createCommentPost', error);
             return cb(error);
         }
 
@@ -203,11 +216,11 @@ module.exports = function(defaultFuncs, api, ctx) {
             handleSticker(messageObject, form);
             const info = await createContent(defaultFuncs, ctx, form);
             cb(null, info);
+            return info;
         } catch (err) {
-            utils.error('createCommentPost', err);
+            log.error('createCommentPost', err);
             cb(err);
+            throw err;
         }
-
-        return returnPromise;
     };
-};
+};