alicezetion 1.7.0 → 1.7.2

package/{leiamnash → src}/logout.js

@@ -5,18 +5,17 @@ var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function logout(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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
+      callback = function(err, friendList) {
+        if (err) return rejectFunc(err);
+
         resolveFunc(friendList);
       };
     }
@@ -52,9 +51,8 @@ module.exports = function(defaultFuncs, api, ctx) {
           .then(utils.saveCookies(ctx.jar));
       })
       .then(function(res) {
-        if (!res.headers) {
+        if (!res.headers)
           throw { error: "An error occurred when logging out." };
-        }
 
         return defaultFuncs
           .get(res.headers.location, ctx.jar)

package/{leiamnash → src}/markAsDelivered.js

@@ -3,27 +3,25 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function (defaultFuncs, api, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function markAsDelivered(threadID, messageID, 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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function(err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
       };
     }
 
-    if (!threadID || !messageID) {
+    if (!threadID || !messageID)
       return callback("Error: messageID or threadID is not defined");
-    }
 
     var form = {};
 
@@ -38,18 +36,16 @@ module.exports = function (defaultFuncs, api, ctx) {
       )
       .then(utils.saveCookies(ctx.jar))
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
-        if (resData.error) {
-          throw resData;
-        }
+      .then(function(resData) {
+        if (resData.error) throw resData;
 
         return callback();
       })
-      .catch(function (err) {
+      .catch(function(err) {
         log.error("markAsDelivered", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.")
           ctx.loggedIn = false;
-        }
+
         return callback(err);
       });
 

package/{leiamnash → src}/markAsRead.js

@@ -3,23 +3,22 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function (defaultFuncs, api, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return async function markAsRead(threadID, read, callback) {
-    if (utils.getType(read) === 'Function' || utils.getType(read) === 'AsyncFunction') {
+    if (
+      utils.getType(read) === "Function" ||
+      utils.getType(read) === "AsyncFunction"
+    ) {
       callback = read;
       read = true;
     }
-    if (read == undefined) {
-      read = true;
-    }
+    if (read == undefined) read = true;
 
-    if (!callback) {
-      callback = () => { };
-    }
+    if (!callback) callback = () => {};
 
     var form = {};
 
-    if (typeof ctx.globalOptions.pageID !== 'undefined') {
+    if (typeof ctx.globalOptions.pageID !== "undefined") {
       form["source"] = "PagesManagerMessagesInterface";
       form["request_user_id"] = ctx.globalOptions.pageID;
       form["ids[" + threadID + "]"] = read;
@@ -30,16 +29,14 @@ module.exports = function (defaultFuncs, api, ctx) {
 
       let resData;
       try {
-        resData = await (
-          defaultFuncs
-            .post(
-              "https://www.facebook.com/ajax/mercury/change_read_status.php",
-              ctx.jar,
-              form
-            )
-            .then(utils.saveCookies(ctx.jar))
-            .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-        );
+        resData = await defaultFuncs
+          .post(
+            "https://www.facebook.com/ajax/mercury/change_read_status.php",
+            ctx.jar,
+            form
+          )
+          .then(utils.saveCookies(ctx.jar))
+          .then(utils.parseAndCheckLogin(ctx, defaultFuncs));
       } catch (e) {
         callback(e);
         return e;
@@ -48,9 +45,8 @@ module.exports = function (defaultFuncs, api, ctx) {
       if (resData.error) {
         let err = resData.error;
         log.error("markAsRead", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.")
           ctx.loggedIn = false;
-        }
         callback(err);
         return err;
       }
@@ -60,17 +56,23 @@ module.exports = function (defaultFuncs, api, ctx) {
     } else {
       try {
         if (ctx.mqttClient) {
-          let err = await new Promise(r => ctx.mqttClient.publish("/mark_thread", JSON.stringify({
-            threadID,
-            mark: "read",
-            state: read
-          }), { qos: 1, retain: false }, r));
+          let err = await new Promise(r =>
+            ctx.mqttClient.publish(
+              "/mark_thread",
+              JSON.stringify({
+                threadID,
+                mark: "read",
+                state: read
+              }),
+              { qos: 1, retain: false },
+              r
+            )
+          );
           if (err) throw err;
-        } else {
+        } else
           throw {
             error: "You can only use this function after you start listening."
           };
-        }
       } catch (e) {
         callback(e);
         return e;

package/{leiamnash → src}/markAsSeen.js

@@ -3,27 +3,28 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function (defaultFuncs, api, ctx) {
-  return function markAsRead(seen_timestamp, callback) {
-    if (utils.getType(seen_timestamp) == "Function" ||
-      utils.getType(seen_timestamp) == "AsyncFunction") {
+module.exports = function(defaultFuncs, api, ctx) {
+  return function markAsSeen(seen_timestamp, callback) {
+    if (
+      utils.getType(seen_timestamp) == "Function" ||
+      utils.getType(seen_timestamp) == "AsyncFunction"
+    ) {
       callback = seen_timestamp;
       seen_timestamp = Date.now();
     }
 
-    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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function(err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
       };
     }
 
@@ -39,18 +40,16 @@ module.exports = function (defaultFuncs, api, ctx) {
       )
       .then(utils.saveCookies(ctx.jar))
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
-        if (resData.error) {
-          throw resData;
-        }
+      .then(function(resData) {
+        if (resData.error) throw resData;
 
         return callback();
       })
-      .catch(function (err) {
+      .catch(function(err) {
         log.error("markAsSeen", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.")
           ctx.loggedIn = false;
-        }
+
         return callback(err);
       });
 

package/{leiamnash → src}/muteThread.js

@@ -6,19 +6,18 @@ var log = require("npmlog");
 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) {
-    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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function(err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
       };
     }
 

package/{leiamnash/setMessageReaction.js → src/react.js}

@@ -4,20 +4,23 @@ var utils = require("../utils");
 var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
-  return function setMessageReaction(reaction, messageID, callback, forceCustomReaction) {
-    var resolveFunc = function(){};
-    var rejectFunc = function(){};
-    var returnPromise = new Promise(function (resolve, reject) {
+  return function setMessageReaction(
+    reaction,
+    messageID,
+    callback,
+    forceCustomReaction
+  ) {
+    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);
       };
     }
 
@@ -68,9 +71,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         reaction = "\uD83D\uDC97";
         break;
       default:
-        if (forceCustomReaction) {
-          break; 
-        }
+        if (forceCustomReaction) break;
         return callback({ error: "Reaction is not a valid emoji." });
     }
 
@@ -99,12 +100,8 @@ module.exports = function(defaultFuncs, api, ctx) {
       )
       .then(utils.parseAndCheckLogin(ctx.jar, defaultFuncs))
       .then(function(resData) {
-        if (!resData) {
-          throw { error: "setReaction returned empty object." };
-        }
-        if (resData.error) {
-          throw resData;
-        }
+        if (!resData) throw { error: "setReaction returned empty object." };
+        if (resData.error) throw resData;
         callback(null);
       })
       .catch(function(err) {

package/{leiamnash → src}/removeUserFromGroup.js

@@ -9,45 +9,41 @@ module.exports = function(defaultFuncs, api, ctx) {
       !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) +
           "."
       };
-    }
 
-    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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function(err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
       };
     }
 
@@ -60,12 +56,9 @@ module.exports = function(defaultFuncs, api, ctx) {
       .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;
-        }
+        if (!resData) throw { error: "Remove from group failed." };
+
+        if (resData.error) throw resData;
 
         return callback();
       })

package/{leiamnash → src}/resolvePhotoUrl.js

@@ -5,19 +5,17 @@ var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function resolvePhotoUrl(photoID, 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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function(err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
 
@@ -27,12 +25,8 @@ module.exports = function(defaultFuncs, api, ctx) {
       })
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
       .then(resData => {
-        if (resData.error) {
-          throw resData;
-        }
-
+        if (resData.error) throw resData;
         var photoUrl = resData.jsmods.require[0][3][0];
-
         return callback(null, photoUrl);
       })
       .catch(err => {

package/{leiamnash → src}/searchForThread.js

@@ -4,19 +4,17 @@ var utils = require("../utils");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function searchForThread(name, 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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function(err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
 
@@ -36,12 +34,9 @@ module.exports = function(defaultFuncs, api, ctx) {
       )
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
-        if (resData.error) {
-          throw resData;
-        }
-        if (!resData.payload.mercury_payload.threads) {
+        if (resData.error) throw resData;
+        if (!resData.payload.mercury_payload.threads)
           return callback({ error: "Could not find thread `" + name + "`." });
-        }
         return callback(
           null,
           resData.payload.mercury_payload.threads.map(utils.formatThread)

package/{leiamnash/markAsReadAll.js → src/seen.js}

@@ -5,24 +5,23 @@ var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function markAsReadAll(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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function(err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
       };
     }
 
     var form = {
-      folder: 'inbox'
+      folder: "inbox"
     };
 
     defaultFuncs
@@ -34,9 +33,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       .then(utils.saveCookies(ctx.jar))
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
-        if (resData.error) {
-          throw resData;
-        }
+        if (resData.error) throw resData;
 
         return callback();
       })
@@ -47,4 +44,4 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     return returnPromise;
   };
-};
+};

package/{leiamnash → src}/sendTypingIndicator.js

@@ -3,7 +3,7 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function (defaultFuncs, api, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   function makeTypingIndicator(typ, threadID, callback, isGroup) {
     var form = {
       typ: +typ,
@@ -21,14 +21,11 @@ module.exports = function (defaultFuncs, api, ctx) {
       defaultFuncs
         .post("https://www.facebook.com/ajax/messaging/typ.php", ctx.jar, form)
         .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-        .then(function (resData) {
-          if (resData.error) {
-            throw resData;
-          }
-
+        .then(function(resData) {
+          if (resData.error) throw resData;
           return callback();
         })
-        .catch(function (err) {
+        .catch(function(err) {
           log.error("sendTypingIndicator", err);
           if (utils.getType(err) == "Object" && err.error === "Not logged in") {
             ctx.loggedIn = false;
@@ -36,31 +33,28 @@ module.exports = function (defaultFuncs, api, ctx) {
           return callback(err);
         });
     } else {
-      api.getUserInfo(threadID, function (err, res) {
-        if (err) {
-          return callback(err);
-        }
-
+      api.getUserInfo(threadID, function(err, res) {
+        if (err) return callback(err);
         // If id is single person chat
-        if (Object.keys(res).length > 0) {
-          form.to = threadID;
-        }
-
+        if (Object.keys(res).length > 0) form.to = threadID;
         defaultFuncs
-          .post("https://www.facebook.com/ajax/messaging/typ.php", ctx.jar, form)
+          .post(
+            "https://www.facebook.com/ajax/messaging/typ.php",
+            ctx.jar,
+            form
+          )
           .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-          .then(function (resData) {
-            if (resData.error) {
-              throw resData;
-            }
-
+          .then(function(resData) {
+            if (resData.error) throw resData;
             return callback();
           })
-          .catch(function (err) {
+          .catch(function(err) {
             log.error("sendTypingIndicator", err);
-            if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+            if (
+              utils.getType(err) == "Object" &&
+              err.error === "Not logged in."
+            )
               ctx.loggedIn = false;
-            }
             return callback(err);
           });
       });
@@ -72,13 +66,12 @@ module.exports = function (defaultFuncs, api, ctx) {
       utils.getType(callback) !== "Function" &&
       utils.getType(callback) !== "AsyncFunction"
     ) {
-      if (callback) {
+      if (callback)
         log.warn(
           "sendTypingIndicator",
           "callback is not a function - ignoring."
         );
-      }
-      callback = () => { };
+      callback = () => {};
     }
 
     makeTypingIndicator(true, threadID, callback, isGroup);
@@ -88,13 +81,12 @@ module.exports = function (defaultFuncs, api, ctx) {
         utils.getType(cb) !== "Function" &&
         utils.getType(cb) !== "AsyncFunction"
       ) {
-        if (cb) {
+        if (cb)
           log.warn(
             "sendTypingIndicator",
             "callback is not a function - ignoring."
           );
-        }
-        cb = () => { };
+        cb = () => {};
       }
 
       makeTypingIndicator(false, threadID, cb, isGroup);