alicezetion 1.0.2 → 1.0.4

package/{alice → src}/logout.js

@@ -3,10 +3,10 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function logout(callback) {
-    var resolveFunc = function(){};
-    var rejectFunc = function(){};
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
     var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
@@ -14,9 +14,8 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     if (!callback) {
       callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
+        if (err) return rejectFunc(err);
+
         resolveFunc(friendList);
       };
     }
@@ -26,18 +25,14 @@ module.exports = function(defaultFuncs, api, ctx) {
     };
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/bluebar/modern_settings_menu/?help_type=364455653583099&show_contextual_help=1",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/bluebar/modern_settings_menu/?help_type=364455653583099&show_contextual_help=1", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        var elem = resData.jsmods.instances[0][2][0].filter(function(v) {
+      .then(function (resData) {
+        var elem = resData.jsmods.instances[0][2][0].filter(function (v) {
           return v.value === "logout";
         })[0];
 
-        var html = resData.jsmods.markup.filter(function(v) {
+        var html = resData.jsmods.markup.filter(function (v) {
           return v[0] === elem.markup.__m;
         })[0][1].__html;
 
@@ -51,21 +46,19 @@ module.exports = function(defaultFuncs, api, ctx) {
           .post("https://www.facebook.com/logout.php", ctx.jar, form)
           .then(utils.saveCookies(ctx.jar));
       })
-      .then(function(res) {
-        if (!res.headers) {
-          throw { error: "An error occurred when logging out." };
-        }
+      .then(function (res) {
+        if (!res.headers) throw { error: "An error occurred when logging out." };
 
         return defaultFuncs
           .get(res.headers.location, ctx.jar)
           .then(utils.saveCookies(ctx.jar));
       })
-      .then(function() {
+      .then(function () {
         ctx.loggedIn = false;
         log.info("logout", "Logged out successfully.");
         callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("logout", err);
         return callback(err);
       });

package/{alice → src}/markAsDelivered.js

@@ -5,51 +5,40 @@ var log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function markAsDelivered(threadID, messageID, callback) {
-    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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
       };
     }
 
-    if (!threadID || !messageID) {
-      return callback("Error: messageID or threadID is not defined");
-    }
+    if (!threadID || !messageID) return callback("Error: messageID or threadID is not defined");
 
     var form = {};
-
     form["message_ids[0]"] = messageID;
     form["thread_ids[" + threadID + "][0]"] = messageID;
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/ajax/mercury/delivery_receipts.php",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/ajax/mercury/delivery_receipts.php", ctx.jar, form)
       .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();
       })
       .catch(function (err) {
         log.error("markAsDelivered", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
-          ctx.loggedIn = false;
-        }
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
+
         return callback(err);
       });
 

package/{alice → src}/markAsRead.js

@@ -9,13 +9,9 @@ module.exports = function (defaultFuncs, api, ctx) {
       callback = read;
       read = true;
     }
-    if (read == undefined) {
-      read = true;
-    }
+    if (read == undefined) read = true;
 
-    if (!callback) {
-      callback = () => { };
-    }
+    if (!callback) callback = () => { };
 
     var form = {};
 
@@ -32,15 +28,12 @@ module.exports = function (defaultFuncs, api, ctx) {
       try {
         resData = await (
           defaultFuncs
-            .post(
-              "https://www.facebook.com/ajax/mercury/change_read_status.php",
-              ctx.jar,
-              form
-            )
+            .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) {
+      }
+      catch (e) {
         callback(e);
         return e;
       }
@@ -48,16 +41,15 @@ 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.") {
-          ctx.loggedIn = false;
-        }
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
         callback(err);
         return err;
       }
 
       callback();
       return null;
-    } else {
+    }
+    else {
       try {
         if (ctx.mqttClient) {
           let err = await new Promise(r => ctx.mqttClient.publish("/mark_thread", JSON.stringify({
@@ -66,12 +58,10 @@ module.exports = function (defaultFuncs, api, ctx) {
             state: read
           }), { qos: 1, retain: false }, r));
           if (err) throw err;
-        } else {
-          throw {
-            error: "You can only use this function after you start listening."
-          };
         }
-      } catch (e) {
+        else throw { error: "You can only use this function after you start listening." };
+      }
+      catch (e) {
         callback(e);
         return e;
       }

package/{alice → src}/markAsReadAll.js

@@ -3,21 +3,19 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function markAsReadAll(callback) {
-    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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
 
@@ -26,25 +24,17 @@ module.exports = function(defaultFuncs, api, ctx) {
     };
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/ajax/mercury/mark_folder_as_read.php",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/ajax/mercury/mark_folder_as_read.php", ctx.jar, form)
       .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("markAsReadAll", err);
         return callback(err);
       });
-
     return returnPromise;
   };
 };

package/{alice → src}/markAsSeen.js

@@ -19,11 +19,10 @@ module.exports = function (defaultFuncs, api, ctx) {
     });
 
     if (!callback) {
-      callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
       };
     }
 
@@ -32,28 +31,18 @@ module.exports = function (defaultFuncs, api, ctx) {
     };
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/ajax/mercury/mark_seen.php",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/ajax/mercury/mark_seen.php", ctx.jar, form)
       .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();
       })
       .catch(function (err) {
         log.error("markAsSeen", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
-          ctx.loggedIn = false;
-        }
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
         return callback(err);
       });
-
     return returnPromise;
   };
 };

package/{alice → src}/muteThread.js

@@ -3,22 +3,21 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+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 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);
       };
     }
 
@@ -28,21 +27,15 @@ module.exports = function(defaultFuncs, api, ctx) {
     };
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/ajax/mercury/change_mute_thread.php",
-        ctx.jar,
-        form
-      )
+      .post("https://www.facebook.com/ajax/mercury/change_mute_thread.php", ctx.jar, form)
       .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("muteThread", err);
         return callback(err);
       });

package/src/removeUserFromGroup.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var utils = require("../utils");
+var 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) + "." };
+
+    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);
+      };
+    }
+
+    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;
+        return callback();
+      })
+      .catch(function (err) {
+        log.error("removeUserFromGroup", "» Bailing out of trying to parse response");
+        return callback(err);
+      });
+    return returnPromise;
+  };
+};

package/{alice → src}/resolvePhotoUrl.js

@@ -3,43 +3,34 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function resolvePhotoUrl(photoID, callback) {
-    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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
 
     defaultFuncs
-      .get("https://www.facebook.com/mercury/attachments/photo", ctx.jar, {
-        photo_id: photoID
-      })
+      .get("https://www.facebook.com/mercury/attachments/photo", ctx.jar, { photo_id: photoID })
       .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 => {
         log.error("resolvePhotoUrl", err);
         return callback(err);
       });
-
     return returnPromise;
   };
 };

package/{alice → src}/searchForThread.js

@@ -2,21 +2,19 @@
 
 var utils = require("../utils");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function searchForThread(name, callback) {
-    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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
 
@@ -29,25 +27,16 @@ module.exports = function(defaultFuncs, api, ctx) {
     };
 
     defaultFuncs
-      .post(
-        "https://www.facebook.com/ajax/mercury/search_threads.php",
-        ctx.jar,
-        tmpForm
-      )
+      .post("https://www.facebook.com/ajax/mercury/search_threads.php", ctx.jar, tmpForm)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (resData.error) {
-          throw resData;
-        }
-        if (!resData.payload.mercury_payload.threads) {
-          return callback({ error: "Could not find thread `" + name + "`." });
-        }
+      .then(function (resData) {
+        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)
         );
       });
-
     return returnPromise;
   };
 };

package/{alice → src}/sendTypingIndicator.js

@@ -15,52 +15,36 @@ module.exports = function (defaultFuncs, api, ctx) {
     // Check if thread is a single person chat or a group chat
     // More info on this is in api.sendMessage
     if (utils.getType(isGroup) == "Boolean") {
-      if (!isGroup) {
-        form.to = threadID;
-      }
+      if (!isGroup) form.to = threadID;
+
       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;
-          }
-
+          if (resData.error) throw resData;
           return callback();
         })
         .catch(function (err) {
           log.error("sendTypingIndicator", err);
-          if (utils.getType(err) == "Object" && err.error === "Not logged in") {
-            ctx.loggedIn = false;
-          }
+          if (utils.getType(err) == "Object" && err.error === "Not logged in") ctx.loggedIn = false;
           return callback(err);
         });
-    } else {
+    }
+    else {
       api.getUserInfo(threadID, function (err, res) {
-        if (err) {
-          return callback(err);
-        }
-
+        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)
           .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
           .then(function (resData) {
-            if (resData.error) {
-              throw resData;
-            }
-
+            if (resData.error) throw resData;
             return callback();
           })
           .catch(function (err) {
             log.error("sendTypingIndicator", err);
-            if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
-              ctx.loggedIn = false;
-            }
+            if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
             return callback(err);
           });
       });
@@ -68,35 +52,18 @@ module.exports = function (defaultFuncs, api, ctx) {
   }
 
   return function sendTypingIndicator(threadID, callback, isGroup) {
-    if (
-      utils.getType(callback) !== "Function" &&
-      utils.getType(callback) !== "AsyncFunction"
-    ) {
-      if (callback) {
-        log.warn(
-          "sendTypingIndicator",
-          "callback is not a function - ignoring."
-        );
-      }
+    if (utils.getType(callback) !== "Function" && utils.getType(callback) !== "AsyncFunction") {
+      if (callback) log.warn("sendTypingIndicator", "callback is not a function - ignoring.");
       callback = () => { };
     }
 
     makeTypingIndicator(true, threadID, callback, isGroup);
 
     return function end(cb) {
-      if (
-        utils.getType(cb) !== "Function" &&
-        utils.getType(cb) !== "AsyncFunction"
-      ) {
-        if (cb) {
-          log.warn(
-            "sendTypingIndicator",
-            "callback is not a function - ignoring."
-          );
-        }
+      if (utils.getType(cb) !== "Function" && utils.getType(cb) !== "AsyncFunction") {
+        if (cb) log.warn("sendTypingIndicator", "callback is not a function - ignoring.");
         cb = () => { };
       }
-
       makeTypingIndicator(false, threadID, cb, isGroup);
     };
   };