@dongdev/fca-unofficial 2.0.7 → 2.0.8

package/src/api/messaging/createPoll.js

@@ -1,70 +1,43 @@
 "use strict";
 
-const utils = require("../../utils");
-const log = require("npmlog");
-
-module.exports = function(defaultFuncs, api, ctx) {
-  return function createPoll(title, threadID, options, callback) {
-    let resolveFunc = function() {};
-    let rejectFunc = function() {};
-    const returnPromise = new Promise(function(resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      if (utils.getType(options) == "Function") {
-        callback = options;
-        options = null;
-      } else {
-        callback = function(err) {
-          if (err) {
-            return rejectFunc(err);
+const { generateOfflineThreadingID } = require("../../utils/format");
+
+module.exports = function (defaultFuncs, api, ctx) {
+  return async function createPoll(threadID, questionText, options) {
+    let count_req = 0
+    return new Promise((resolve, reject) => {
+      const payload = {
+        epoch_id: generateOfflineThreadingID(),
+        tasks: [
+          {
+            failure_count: null,
+            label: "163",
+            payload: JSON.stringify({
+              question_text: questionText,
+              thread_key: threadID,
+              options: options,
+              sync_group: 1
+            }),
+            queue_name: "poll_creation",
+            task_id: Math.floor(Math.random() * 1001)
           }
-          resolveFunc();
-        };
-      }
-    }
-    if (!options) {
-      options = {};
-    }
-
-    const form = {
-      target_id: threadID,
-      question_text: title
-    };
-
-    // Set fields for options (and whether they are selected initially by the posting user)
-    let ind = 0;
-    for (const opt in options) {
-      if (options.hasOwnProperty(opt)) {
-        form["option_text_array[" + ind + "]"] = opt;
-        form["option_is_selected_array[" + ind + "]"] = options[opt]
-          ? "1"
-          : "0";
-        ind++;
-      }
-    }
-
-    defaultFuncs
-      .post(
-        "https://www.facebook.com/messaging/group_polling/create_poll/?dpr=1",
-        ctx.jar,
-        form
-      )
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (resData.payload.status != "success") {
-          throw resData;
-        }
-
-        return callback();
-      })
-      .catch(function(err) {
-        log.error("createPoll", err);
-        return callback(err);
+        ],
+        version_id: "8768858626531631"
+      };
+
+      const form = JSON.stringify({
+        app_id: "772021112871879",
+        payload: JSON.stringify(payload),
+        request_id: ++count_req,
+        type: 3
       });
 
-    return returnPromise;
+      try {
+        mqttClient.publish("/ls_req", form);
+        resolve();
+      } catch (err) {
+        reject(err);
+      }
+    });
   };
 };

package/src/api/messaging/deleteMessage.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin } = require("../../utils/client");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function deleteMessage(messageOrMessages, callback) {
     let resolveFunc = function() {};
@@ -24,7 +24,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       client: "mercury"
     };
 
-    if (utils.getType(messageOrMessages) !== "Array") {
+    if (getType(messageOrMessages) !== "Array") {
       messageOrMessages = [messageOrMessages];
     }
 
@@ -38,7 +38,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.jar,
         form
       )
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.error) {
           throw resData;

package/src/api/messaging/deleteThread.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin } = require("../../utils/client");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function deleteThread(threadOrThreads, callback) {
     let resolveFunc = function() {};
@@ -24,7 +24,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       client: "mercury"
     };
 
-    if (utils.getType(threadOrThreads) !== "Array") {
+    if (getType(threadOrThreads) !== "Array") {
       threadOrThreads = [threadOrThreads];
     }
 
@@ -38,7 +38,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.jar,
         form
       )
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.error) {
           throw resData;

package/src/api/messaging/forwardAttachment.js

@@ -1,60 +1,51 @@
 "use strict";
 
-const utils = require("../../utils");
-const log = require("npmlog");
+const { generateOfflineThreadingID } = require("../../utils/format");
 
-module.exports = function(defaultFuncs, api, ctx) {
-  return function forwardAttachment(attachmentID, userOrUsers, callback) {
-    let resolveFunc = function() {};
-    let rejectFunc = function() {};
-    const returnPromise = new Promise(function(resolve, reject) {
+module.exports = function (defaultFuncs, api, ctx) {
+  return async function forwardMessage(threadID, forwardedMsgID, callback) {
+    let resolveFunc, rejectFunc;
+    const returnPromise = new Promise((resolve, reject) => {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
     if (!callback) {
-      callback = function(err) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc();
+      callback = (err, data) => {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
-
-    const form = {
-      attachment_id: attachmentID
-    };
-
-    if (utils.getType(userOrUsers) !== "Array") {
-      userOrUsers = [userOrUsers];
-    }
-
-    const timestamp = Math.floor(Date.now() / 1000);
-
-    for (let i = 0; i < userOrUsers.length; i++) {
-      //That's good, the key of the array is really timestmap in seconds + index
-      //Probably time when the attachment will be sent?
-      form["recipient_map[" + (timestamp + i) + "]"] = userOrUsers[i];
-    }
-
-    defaultFuncs
-      .post(
-        "https://www.facebook.com/mercury/attachments/forward/",
-        ctx.jar,
-        form
-      )
-      .then(utils.parseAndCheckLogin(ctx.jar, defaultFuncs))
-      .then(function(resData) {
-        if (resData.error) {
-          throw resData;
+    let count_req = 0
+    const payload = {
+      epoch_id: generateOfflineThreadingID(),
+      tasks: [
+        {
+          failure_count: null,
+          label: "46",
+          payload: JSON.stringify({
+            thread_id: threadID,
+            otid: generateOfflineThreadingID(),
+            source: 65544,
+            send_type: 5,
+            sync_group: 1,
+            mark_thread_read: 0,
+            forwarded_msg_id: forwardedMsgID,
+            strip_forwarded_msg_caption: 0,
+            initiating_source: 1
+          }),
+          queue_name: threadID,
+          task_id: Math.floor(Math.random() * 1001)
         }
-
-        return callback();
-      })
-      .catch(function(err) {
-        log.error("forwardAttachment", err);
-        return callback(err);
-      });
-
+      ],
+      version_id: "8768858626531631"
+    };
+    const form = JSON.stringify({
+      app_id: "772021112871879",
+      payload: JSON.stringify(payload),
+      "request_id": ++count_req,
+      "type": 3
+    });
+    mqttClient.publish("/ls_req", form);
     return returnPromise;
   };
 };

package/src/api/messaging/getFriendsList.js

@@ -1,9 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
+const { formatID } = require("../../utils/format");
 const log = require("npmlog");
-
-// [almost] copy pasted from one of FB's minified file (GenderConst)
+const { parseAndCheckLogin } = require("../../utils/client");
 const GENDERS = {
   0: "unknown",
   1: "female_singular",
@@ -26,7 +25,7 @@ function formatData(obj) {
       alternateName: user.alternateName,
       firstName: user.firstName,
       gender: GENDERS[user.gender],
-      userID: utils.formatID(user.id.toString()),
+      userID: formatID(user.id.toString()),
       isFriend: user.is_friend != null && user.is_friend ? true : false,
       fullName: user.name,
       profilePicture: user.thumbSrc,
@@ -61,9 +60,9 @@ module.exports = function(defaultFuncs, api, ctx) {
         "https://www.facebook.com/chat/user_info_all",
         ctx.jar,
         {},
-        { viewer: ctx.i_userID || ctx.userID }
+        { viewer: ctx.userID }
       )
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (!resData) {
           throw { error: "getFriendsList returned empty object." };

package/src/api/messaging/getMessage.js

@@ -1,13 +1,8 @@
 "use strict";
 
-// Original
-/**
- * @author https://github.com/Schmavery/facebook-chat-api/pull/865
- */
-
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { _formatAttachment } = require("../../utils/format");
+const { parseAndCheckLogin } = require("../../utils/client");
 function formatMessage(threadID, data) {
   switch (data.__typename) {
     case "ThreadNameMessage":
@@ -151,7 +146,7 @@ function formatMessage(threadID, data) {
             ? data.blob_attachments.length.map(att => {
                 let x;
                 try {
-                  x = utils._formatAttachment(att);
+                  x = _formatAttachment(att);
                 } catch (ex) {
                   x = att;
                   x.error = ex;
@@ -272,7 +267,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     defaultFuncs
       .post("https://www.facebook.com/api/graphqlbatch/", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(resData => {
         if (resData[resData.length - 1].error_results > 0) {
           throw resData[0].o0.errors;

package/src/api/messaging/handleMessageRequest.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin } = require("../../utils/client");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function handleMessageRequest(threadID, accept, callback) {
-    if (utils.getType(accept) !== "Boolean") {
+    if (getType(accept) !== "Boolean") {
       throw {
         error: "Please pass a boolean as a second argument."
       };
@@ -31,7 +31,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       client: "mercury"
     };
 
-    if (utils.getType(threadID) !== "Array") {
+    if (getType(threadID) !== "Array") {
       threadID = [threadID];
     }
 
@@ -47,7 +47,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.jar,
         form
       )
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.error) {
           throw resData;

package/src/api/messaging/markAsDelivered.js

@@ -1,7 +1,7 @@
 "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 markAsDelivered(threadID, messageID, callback) {
     let resolveFunc = function() {};
@@ -35,8 +35,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;
@@ -46,7 +46,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       })
       .catch(function(err) {
         log.error("markAsDelivered", 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/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;