@dongdev/fca-unofficial 2.0.7 → 2.0.10

package/src/api/messaging/markAsRead.js

@@ -1,13 +1,13 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin, saveCookies } = require("../../utils/client");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return async function markAsRead(threadID, read, callback) {
     if (
-      utils.getType(read) === "Function" ||
-      utils.getType(read) === "AsyncFunction"
+      getType(read) === "Function" ||
+      getType(read) === "AsyncFunction"
     ) {
       callback = read;
       read = true;
@@ -39,8 +39,8 @@ module.exports = function(defaultFuncs, api, ctx) {
             ctx.jar,
             form
           )
-          .then(utils.saveCookies(ctx.jar))
-          .then(utils.parseAndCheckLogin(ctx, defaultFuncs));
+          .then(saveCookies(ctx.jar))
+          .then(parseAndCheckLogin(ctx, defaultFuncs));
       } catch (e) {
         callback(e);
         return e;
@@ -49,7 +49,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       if (resData.error) {
         const err = resData.error;
         log.error("markAsRead", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+        if (getType(err) == "Object" && err.error === "Not logged in.") {
           ctx.loggedIn = false;
         }
         callback(err);

package/src/api/messaging/markAsReadAll.js

@@ -1,8 +1,7 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin, saveCookies } = require("../../utils/client");
 module.exports = function(defaultFuncs, api, ctx) {
   return function markAsReadAll(callback) {
     let resolveFunc = function() {};
@@ -31,8 +30,8 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.jar,
         form
       )
-      .then(utils.saveCookies(ctx.jar))
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(saveCookies(ctx.jar))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.error) {
           throw resData;

package/src/api/messaging/markAsSeen.js

@@ -1,13 +1,13 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin, saveCookies } = require("../../utils/client");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function markAsRead(seen_timestamp, callback) {
     if (
-      utils.getType(seen_timestamp) == "Function" ||
-      utils.getType(seen_timestamp) == "AsyncFunction"
+      getType(seen_timestamp) == "Function" ||
+      getType(seen_timestamp) == "AsyncFunction"
     ) {
       callback = seen_timestamp;
       seen_timestamp = Date.now();
@@ -39,8 +39,8 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.jar,
         form
       )
-      .then(utils.saveCookies(ctx.jar))
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(saveCookies(ctx.jar))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.error) {
           throw resData;
@@ -50,7 +50,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       })
       .catch(function(err) {
         log.error("markAsSeen", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+        if (getType(err) == "Object" && err.error === "Not logged in.") {
           ctx.loggedIn = false;
         }
         return callback(err);

package/src/api/messaging/muteThread.js

@@ -1,7 +1,6 @@
 "use strict";
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin, saveCookies } = require("../../utils/client");
 module.exports = function(defaultFuncs, api, ctx) {
   // muteSecond: -1=permanent mute, 0=unmute, 60=one minute, 3600=one hour, etc.
   return function muteThread(threadID, muteSeconds, callback) {
@@ -32,8 +31,8 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.jar,
         form
       )
-      .then(utils.saveCookies(ctx.jar))
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(saveCookies(ctx.jar))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.error) {
           throw resData;

package/src/api/messaging/removeUserFromGroup.js

@@ -1,79 +1,105 @@
 "use strict";
 
-const utils = require("../../utils");
+const { parseAndCheckLogin, getType } = require("../../utils/format");
 const log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
-  return function removeUserFromGroup(userID, threadID, callback) {
-    if (
-      !callback &&
-      (utils.getType(threadID) === "Function" ||
-        utils.getType(threadID) === "AsyncFunction")
-    ) {
-      throw { error: "please pass a threadID as a second argument." };
-    }
-    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) !== "Number" &&
-      utils.getType(userID) !== "String"
-    ) {
-      throw {
-        error:
-          "userID should be of type Number or String and not " +
-          utils.getType(userID) +
-          "."
-      };
-    }
-
-    let resolveFunc = function() {};
-    let rejectFunc = function() {};
-    const returnPromise = new Promise(function(resolve, reject) {
+module.exports = function (defaultFuncs, api, ctx) {
+  function removeUserFromGroupNoMqtt(userID, threadID, callback) {
+    if (!callback && (getType(threadID) === "Function" || getType(threadID) === "AsyncFunction")) throw { error: "please pass a threadID as a second argument." };
+    if (getType(threadID) !== "Number" && getType(threadID) !== "String") throw { error: "threadID should be of type Number or String and not " + getType(threadID) + "." };
+    if (getType(userID) !== "Number" && getType(userID) !== "String") throw { error: "userID should be of type Number or String and not " + getType(userID) + "." };
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
-
     if (!callback) {
-      callback = function(err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
-
-    const form = {
+    var form = {
       uid: userID,
       tid: threadID
     };
-
     defaultFuncs
       .post("https://www.facebook.com/chat/remove_participants", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (!resData) {
-          throw { error: "Remove from group failed." };
-        }
-        if (resData.error) {
-          throw resData;
-        }
-
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
+      .then(function (resData) {
+        if (!resData) throw { error: "Remove from group failed." };
+        if (resData.error) throw resData;
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("removeUserFromGroup", err);
         return callback(err);
       });
-
     return returnPromise;
   };
+  function removeUserFromGroupMqtt(userID, threadID, callback) {
+    if (!ctx.mqttClient) {
+      throw new Error("Not connected to MQTT");
+    }
+    if (!callback && (getType(threadID) === "Function" || getType(threadID) === "AsyncFunction")) throw { error: "please pass a threadID as a second argument." };
+    if (getType(threadID) !== "Number" && getType(threadID) !== "String") throw { error: "threadID should be of type Number or String and not " + getType(threadID) + "." };
+    if (getType(userID) !== "Number" && getType(userID) !== "String") throw { error: "userID should be of type Number or String and not " + getType(userID) + "." };
+    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);
+        resolveFunc(data);
+      };
+    }
+    let count_req = 0;
+    var form = JSON.stringify({
+      "app_id": "2220391788200892",
+      "payload": JSON.stringify({
+        epoch_id: generateOfflineThreadingID(),
+        tasks: [
+          {
+            failure_count: null,
+            label: '140',
+            payload: JSON.stringify({
+              "thread_id": threadID,
+              "contact_id": userID,
+              "sync_group": 1
+            }),
+            queue_name: 'remove_participant_v2',
+            task_id: Math.random() * 1001 << 0
+          }
+        ],
+        version_id: '8798795233522156'
+      }),
+      "request_id": ++count_req,
+      "type": 3
+    });
+    mqttClient.publish('/ls_req', form, (err, data) => {
+      if (err) {
+        callback(err, null);
+        rejectFunc(false);
+      } else {
+        callback(null, true);
+        resolveFunc(true);
+      }
+    });
+    return returnPromise;
+  };
+  return function removeUserFromGroup(userID, threadID, callback) {
+    if (ctx.mqttClient) {
+      try {
+        removeUserFromGroupMqtt(userID, threadID, callback);
+      } catch (e) {
+        removeUserFromGroupNoMqtt(userID, threadID, callback);
+      }
+    } else {
+      removeUserFromGroupNoMqtt(userID, threadID, callback);
+    }
+  };
 };

package/src/api/messaging/resolvePhotoUrl.js

@@ -1,7 +1,6 @@
 "use strict";
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin, saveCookies } = require("../../utils/client");
 module.exports = function(defaultFuncs, api, ctx) {
   return function resolvePhotoUrl(photoID, callback) {
     let resolveFunc = function() {};
@@ -24,7 +23,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       .get("https://www.facebook.com/mercury/attachments/photo", ctx.jar, {
         photo_id: photoID
       })
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(resData => {
         if (resData.error) {
           throw resData;

package/src/api/messaging/searchForThread.js

@@ -1,7 +1,6 @@
 "use strict";
 
-const utils = require("../../utils");
-
+const { parseAndCheckLogin } = require("../../utils/client");
 module.exports = function(defaultFuncs, api, ctx) {
   return function searchForThread(name, callback) {
     let resolveFunc = function() {};
@@ -34,7 +33,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.jar,
         tmpForm
       )
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.error) {
           throw resData;