node-ainzfb-new 1.6.30-test → 1.6.2210-test

package/index.js

@@ -997,7 +997,7 @@ async function loginHelper(appState, email, password, globalOptions, callback, p
             Fetch('https://raw.githubusercontent.com/amogusdevlol/node-ainzfb/main/package.json').then(async(res) => {
                 const localbrand = JSON.parse(readFileSync('./node_modules/node-ainzfb-new/package.json')).version;
                 if (Number(localbrand.replace(/\./g, "")) < Number(JSON.parse(res.body.toString()).version.replace(/\./g, ""))) {
-                    log.warn("[ FCA-SUS ] •", getText.gettext(Language.NewVersionFound, JSON.parse(readFileSync('./node_modules/node-ainzfb/package.json')).version, JSON.parse(res.body.toString()).version));
+                    log.warn("[ FCA-SUS ] •", getText.gettext(Language.NewVersionFound, JSON.parse(readFileSync('./node_modules/node-ainzfb-new/package.json')).version, JSON.parse(res.body.toString()).version));
                     log.warn("[ FCA-SUS ] •", Language.AutoUpdate);
                     try {
                         execSync('npm install node-ainzfb-new@latest', { stdio: 'inherit' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-ainzfb-new",
-  "version": "1.6.30-test",
+  "version": "1.6.2210-test",
   "description": "A Facebook chat API that doesn't rely on XMPP. Will NOT be deprecated after April 30th 2015.",
   "scripts": {
     "test": "mocha",
@@ -37,10 +37,10 @@
     "lodash": "",
     "mqtt": "^4.3.7",
     "node-superfetch": "^0.2.3",
-    "npmlog": "latest",
+    "npmlog": "^1.2.0",
     "path": "latest",
     "pretty-ms": "latest",
-    "request": "latest",
+    "request": "^2.53.0",
     "semver": "latest",
     "sus-support": "git+https://github.com/amogusdevlol/sus-support.git",
     "websocket-stream": "latest"

package/src/addExternalModule.js

@@ -2,22 +2,15 @@
 
 const utils = require("../utils");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function addExternalModule(moduleObj) {
     if (utils.getType(moduleObj) == "Object") {
       for (let apiName in moduleObj) {
-        if (utils.getType(moduleObj[apiName]) == "Function")
-          api[apiName] = moduleObj[apiName](defaultFuncs, api, ctx);
-        else
-          throw new Error(
-            `Item "${apiName}" in moduleObj must be a function, not ${utils.getType(
-              moduleObj[apiName]
-            )}!`
-          );
+        if (utils.getType(moduleObj[apiName]) == "Function") api[apiName] = moduleObj[apiName](defaultFuncs, api, ctx);
+        else throw new Error(`Item "${apiName}" in moduleObj must be a function, not ${utils.getType(moduleObj[apiName])}!`);
+
       }
-    } else
-      throw new Error(
-        `moduleObj must be an object, not ${utils.getType(moduleObj)}!`
-      );
+    }
+    else throw new Error(`moduleObj must be an object, not ${utils.getType(moduleObj)}!`);
   };
 };

package/src/addUserToGroup.js

@@ -3,39 +3,25 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function addUserToGroup(userID, threadID, callback) {
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
-    if (
-      !callback &&
-      (utils.getType(threadID) === "Function" ||
-        utils.getType(threadID) === "AsyncFunction")
-    )
-      throw { error: "please pass a threadID as a second argument." };
+    if (!callback && (utils.getType(threadID) === "Function" || utils.getType(threadID) === "AsyncFunction")) throw { error: "please pass a threadID as a second argument." };
 
     if (!callback) {
-      callback = function(err) {
+      callback = function (err) {
         if (err) return rejectFunc(err);
         resolveFunc();
       };
     }
 
-    if (
-      utils.getType(threadID) !== "Number" &&
-      utils.getType(threadID) !== "String"
-    )
-      throw {
-        error:
-          "ThreadID should be of type Number or String and not " +
-          utils.getType(threadID) +
-          "."
-      };
+    if (utils.getType(threadID) !== "Number" && utils.getType(threadID) !== "String") throw { error: "ThreadID should be of type Number or String and not " + utils.getType(threadID) + "." };
 
     if (utils.getType(userID) !== "Array") userID = [userID];
 
@@ -68,30 +54,21 @@ module.exports = function(defaultFuncs, api, ctx) {
     };
 
     for (var i = 0; i < userID.length; i++) {
-      if (
-        utils.getType(userID[i]) !== "Number" &&
-        utils.getType(userID[i]) !== "String"
-      )
-        throw {
-          error:
-            "Elements of userID should be of type Number or String and not " +
-            utils.getType(userID[i]) +
-            "."
-        };
-      form["log_message_data[added_participants][" + i + "]"] =
-        "fbid:" + userID[i];
+      if (utils.getType(userID[i]) !== "Number" && utils.getType(userID[i]) !== "String") throw { error: "Elements of userID should be of type Number or String and not " + utils.getType(userID[i]) + "." };
+      form["log_message_data[added_participants][" + i + "]"] = "fbid:" + userID[i];
     }
 
     defaultFuncs
       .post("https://www.facebook.com/messaging/send/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
+      .then(function (resData) {
         if (!resData) throw { error: "Add to group failed." };
         if (resData.error) throw resData;
 
+
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("addUserToGroup", err);
         return callback(err);
       });

package/src/changeAdminStatus.js

@@ -6,7 +6,7 @@ const log = require("npmlog");
 module.exports = function(defaultFuncs, api, ctx) {
   return function changeAdminStatus(threadID, adminIDs, adminStatus, callback) {
     if (utils.getType(threadID) !== "String") {
-      throw { error: "changeAdminStatus: threadID must be a string" };
+      throw {error: "changeAdminStatus: threadID must be a string"};
     }
 
     if (utils.getType(adminIDs) === "String") {
@@ -14,22 +14,22 @@ module.exports = function(defaultFuncs, api, ctx) {
     }
 
     if (utils.getType(adminIDs) !== "Array") {
-      throw { error: "changeAdminStatus: adminIDs must be an array or string" };
+      throw {error: "changeAdminStatus: adminIDs must be an array or string"};
     }
 
     if (utils.getType(adminStatus) !== "Boolean") {
-      throw { error: "changeAdminStatus: adminStatus must be a string" };
+      throw {error: "changeAdminStatus: adminStatus must be a string"};
     }
 
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
     if (!callback) {
-      callback = function(err) {
+      callback = function (err) {
         if (err) {
           return rejectFunc(err);
         }
@@ -37,15 +37,12 @@ module.exports = function(defaultFuncs, api, ctx) {
       };
     }
 
-    if (
-      utils.getType(callback) !== "Function" &&
-      utils.getType(callback) !== "AsyncFunction"
-    ) {
-      throw { error: "changeAdminStatus: callback is not a function" };
+    if (utils.getType(callback) !== "Function" && utils.getType(callback) !== "AsyncFunction") {
+      throw {error: "changeAdminStatus: callback is not a function"};
     }
 
     let form = {
-      thread_fbid: threadID
+      "thread_fbid": threadID,
     };
 
     let i = 0;
@@ -55,31 +52,17 @@ module.exports = function(defaultFuncs, api, ctx) {
     form["add"] = adminStatus;
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/messaging/save_admins/?dpr=1",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/messaging/save_admins/?dpr=1", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.error) {
           switch (resData.error) {
             case 1976004:
-              throw {
-                error: "Cannot alter admin status: you are not an admin.",
-                rawResponse: resData
-              };
+              throw { error: "Cannot alter admin status: you are not an admin.", rawResponse: resData };
             case 1357031:
-              throw {
-                error:
-                  "Cannot alter admin status: this thread is not a group chat.",
-                rawResponse: resData
-              };
+              throw { error: "Cannot alter admin status: this thread is not a group chat.", rawResponse: resData };
             default:
-              throw {
-                error: "Cannot alter admin status: unknown error.",
-                rawResponse: resData
-              };
+              throw { error: "Cannot alter admin status: unknown error.", rawResponse: resData };
           }
         }
 
@@ -89,7 +72,8 @@ module.exports = function(defaultFuncs, api, ctx) {
         log.error("changeAdminStatus", err);
         return callback(err);
       });
-
+      
     return returnPromise;
   };
 };
+

package/src/changeArchivedStatus.js

@@ -3,17 +3,17 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function changeArchivedStatus(threadOrThreads, archive, callback) {
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
     if (!callback) {
-      callback = function(err) {
+      callback = function (err) {
         if (err) return rejectFunc(err);
         resolveFunc();
       };
@@ -21,23 +21,17 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     var form = {};
 
-    if (utils.getType(threadOrThreads) === "Array")
-      for (var i = 0; i < threadOrThreads.length; i++)
-        form["ids[" + threadOrThreads[i] + "]"] = archive;
+    if (utils.getType(threadOrThreads) === "Array") for (var i = 0; i < threadOrThreads.length; i++) form["ids[" + threadOrThreads[i] + "]"] = archive;
     else form["ids[" + threadOrThreads + "]"] = archive;
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/ajax/mercury/change_archived_status.php",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/ajax/mercury/change_archived_status.php", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
+      .then(function (resData) {
         if (resData.error) throw resData;
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("changeArchivedStatus", err);
         return callback(err);
       });

package/src/changeBio.js

@@ -3,23 +3,19 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function changeBio(bio, publish, callback) {
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
     if (!callback) {
-      if (
-        utils.getType(publish) == "Function" ||
-        utils.getType(publish) == "AsyncFunction"
-      )
-        callback = publish;
+      if (utils.getType(publish) == "Function" || utils.getType(publish) == "AsyncFunction") callback = publish;
       else {
-        callback = function(err) {
+        callback = function (err) {
           if (err) return rejectFunc(err);
           resolveFunc();
         };
@@ -54,12 +50,12 @@ module.exports = function(defaultFuncs, api, ctx) {
     defaultFuncs
       .post("https://www.facebook.com/api/graphql/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
+      .then(function (resData) {
         if (resData.errors) throw resData;
 
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("changeBio", err);
         return callback(err);
       });

package/src/changeBlockedStatus.js

@@ -3,37 +3,31 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function changeBlockedStatus(userID, block, callback) {
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
     if (!callback) {
-      callback = function(err) {
+      callback = function (err) {
         if (err) return rejectFunc(err);
         resolveFunc();
       };
     }
 
     defaultFuncs
-      .post(
-        `https://www.facebook.com/messaging/${
-          block ? "" : "un"
-        }block_messages/`,
-        ctx.jar,
-        { fbid: userID }
-      )
+      .post(`https://www.facebook.com/messaging/${block ? "" : "un"}block_messages/`, ctx.jar, { fbid: userID })
       .then(utils.saveCookies(ctx.jar))
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
+      .then(function (resData) {
         if (resData.error) throw resData;
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("changeBlockedStatus", err);
         return callback(err);
       });

package/src/changeGroupImage.js

@@ -4,7 +4,7 @@ var utils = require("../utils");
 var log = require("npmlog");
 var bluebird = require("bluebird");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   function handleUpload(image, callback) {
     var uploads = [];
 
@@ -15,14 +15,9 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     uploads.push(
       defaultFuncs
-        .postFormData(
-          "https://upload.facebook.com/ajax/mercury/upload.php",
-          ctx.jar,
-          form,
-          {}
-        )
+        .postFormData("https://upload.facebook.com/ajax/mercury/upload.php", ctx.jar, form, {})
         .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-        .then(function(resData) {
+        .then(function (resData) {
           if (resData.error) throw resData;
 
           return resData.payload.metadata[0];
@@ -33,29 +28,24 @@ module.exports = function(defaultFuncs, api, ctx) {
     bluebird
       .all(uploads)
       .then(resData => callback(null, resData))
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("handleUpload", err);
         return callback(err);
       });
   }
 
   return function changeGroupImage(image, threadID, callback) {
-    if (
-      !callback &&
-      (utils.getType(threadID) === "Function" ||
-        utils.getType(threadID) === "AsyncFunction")
-    )
-      throw { error: "please pass a threadID as a second argument." };
+    if (!callback && (utils.getType(threadID) === "Function" || utils.getType(threadID) === "AsyncFunction")) throw { error: "please pass a threadID as a second argument." };
 
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
     if (!callback) {
-      callback = function(err) {
+      callback = function (err) {
         if (err) return rejectFunc(err);
         resolveFunc();
       };
@@ -91,25 +81,21 @@ module.exports = function(defaultFuncs, api, ctx) {
       timestamp_time_passed: "0"
     };
 
-    handleUpload(image, function(err, payload) {
+    handleUpload(image, function (err, payload) {
       if (err) return callback(err);
 
       form["thread_image_id"] = payload[0]["image_id"];
       form["thread_id"] = threadID;
 
       defaultFuncs
-        .post(
-          "https://www.facebook.com/messaging/set_thread_image/",
-          ctx.jar,
-          form
-        )
+        .post("https://www.facebook.com/messaging/set_thread_image/", ctx.jar, form)
         .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-        .then(function(resData) {
+        .then(function (resData) {
           // check for errors here
           if (resData.error) throw resData;
           return callback();
         })
-        .catch(function(err) {
+        .catch(function (err) {
           log.error("changeGroupImage", err);
           return callback(err);
         });

package/src/changeNickname.js

@@ -3,16 +3,16 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function changeNickname(nickname, threadID, participantID, callback) {
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
     if (!callback) {
-      callback = function(err) {
+      callback = function (err) {
         if (err) return rejectFunc(err);
         resolveFunc();
       };
@@ -25,26 +25,17 @@ module.exports = function(defaultFuncs, api, ctx) {
     };
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/messaging/save_thread_nickname/?source=thread_settings&dpr=1",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/messaging/save_thread_nickname/?source=thread_settings&dpr=1", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (resData.error === 1545014)
-          throw { error: "Trying to change nickname of user isn't in thread" };
-        if (resData.error === 1357031)
-          throw {
-            error:
-              "Trying to change user nickname of a thread that doesn't exist. Have at least one message in the thread before trying to change the user nickname."
-          };
+      .then(function (resData) {
+        if (resData.error === 1545014) throw { error: "Trying to change nickname of user isn't in thread" };
+        if (resData.error === 1357031) throw { error: "Trying to change user nickname of a thread that doesn't exist. Have at least one message in the thread before trying to change the user nickname." };
 
         if (resData.error) throw resData;
 
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("changeNickname", err);
         return callback(err);
       });

package/src/changeThreadColor.js

@@ -3,31 +3,27 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function changeThreadColor(color, threadID, callback) {
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
     if (!callback) {
-      callback = function(err) {
+      callback = function (err) {
         if (err) return rejectFunc(err);
         resolveFunc(err);
       };
     }
 
     var validatedColor = color !== null ? color.toLowerCase() : color; // API only accepts lowercase letters in hex string
-    var colorList = Object.keys(api.threadColors).map(function(name) {
+    var colorList = Object.keys(api.threadColors).map(function (name) {
       return api.threadColors[name];
     });
-    if (!colorList.includes(validatedColor))
-      throw {
-        error:
-          "The color you are trying to use is not a valid thread color. Use api.threadColors to find acceptable values."
-      };
+    if (!colorList.includes(validatedColor)) throw { error: "The color you are trying to use is not a valid thread color. Use api.threadColors to find acceptable values." };
 
     var form = {
       dpr: 1,
@@ -51,13 +47,12 @@ module.exports = function(defaultFuncs, api, ctx) {
     defaultFuncs
       .post("https://www.facebook.com/api/graphqlbatch/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (resData[resData.length - 1].error_results > 0)
-          throw resData[0].o0.errors;
+      .then(function (resData) {
+        if (resData[resData.length - 1].error_results > 0) throw resData[0].o0.errors;
 
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("changeThreadColor", err);
         return callback(err);
       });

package/src/changeThreadEmoji.js

@@ -3,17 +3,17 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function changeThreadEmoji(emoji, threadID, callback) {
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
     if (!callback) {
-      callback = function(err) {
+      callback = function (err) {
         if (err) return rejectFunc(err);
         resolveFunc();
       };
@@ -24,23 +24,15 @@ module.exports = function(defaultFuncs, api, ctx) {
     };
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/messaging/save_thread_emoji/?source=thread_settings&__pc=EXP1%3Amessengerdotcom_pkg",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/messaging/save_thread_emoji/?source=thread_settings&__pc=EXP1%3Amessengerdotcom_pkg", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (resData.error === 1357031)
-          throw {
-            error:
-              "Trying to change emoji of a chat that doesn't exist. Have at least one message in the thread before trying to change the emoji."
-          };
+      .then(function (resData) {
+        if (resData.error === 1357031) throw { error: "Trying to change emoji of a chat that doesn't exist. Have at least one message in the thread before trying to change the emoji." };
         if (resData.error) throw resData;
 
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("changeThreadEmoji", err);
         return callback(err);
       });