alicezetion 1.5.7 → 1.5.8

package/leiamnash/muteThread.js

@@ -1,52 +1,45 @@
-"use strict";
-
-var utils = require("../utils");
-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) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
-      };
-    }
-
-    var form = {
-      thread_fbid: threadID,
-      mute_settings: muteSeconds
-    };
-
-    defaultFuncs
-      .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;
-        }
-
-        return callback();
-      })
-      .catch(function(err) {
-        log.error("muteThread", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+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) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (!callback) {
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
+      };
+    }
+
+    var form = {
+      thread_fbid: threadID,
+      mute_settings: muteSeconds
+    };
+
+    defaultFuncs
+      .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;
+
+        return callback();
+      })
+      .catch(function (err) {
+        log.error("muteThread", err);
+        return callback(err);
+      });
+
+    return returnPromise;
+  };
+};

package/leiamnash/removeUserFromGroup.js

@@ -1,79 +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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
-      };
-    }
-
-    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", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"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/leiamnash/resolvePhotoUrl.js

@@ -1,45 +1,36 @@
-"use strict";
-
-var utils = require("../utils");
-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) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
-      };
-    }
-
-    defaultFuncs
-      .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;
-        }
-
-        var photoUrl = resData.jsmods.require[0][3][0];
-
-        return callback(null, photoUrl);
-      })
-      .catch(err => {
-        log.error("resolvePhotoUrl", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+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) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (!callback) {
+      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 })
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(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/leiamnash/searchForThread.js

@@ -1,53 +1,42 @@
-"use strict";
-
-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) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
-      };
-    }
-
-    var tmpForm = {
-      client: "web_messenger",
-      query: name,
-      offset: 0,
-      limit: 21,
-      index: "fbid"
-    };
-
-    defaultFuncs
-      .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 + "`." });
-        }
-        return callback(
-          null,
-          resData.payload.mercury_payload.threads.map(utils.formatThread)
-        );
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+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) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (!callback) {
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
+      };
+    }
+
+    var tmpForm = {
+      client: "web_messenger",
+      query: name,
+      offset: 0,
+      limit: 21,
+      index: "fbid"
+    };
+
+    defaultFuncs
+      .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 + "`." });
+        return callback(
+          null,
+          resData.payload.mercury_payload.threads.map(utils.formatThread)
+        );
+      });
+    return returnPromise;
+  };
+};

package/leiamnash/sendTypingIndicator.js

@@ -1,103 +1,70 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-  function makeTypingIndicator(typ, threadID, callback, isGroup) {
-    var form = {
-      typ: +typ,
-      to: "",
-      source: "mercury-chat",
-      thread: threadID
-    };
-
-    // 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;
-      }
-      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;
-          }
-
-          return callback();
-        })
-        .catch(function (err) {
-          log.error("sendTypingIndicator", err);
-          if (utils.getType(err) == "Object" && err.error === "Not logged in") {
-            ctx.loggedIn = false;
-          }
-          return callback(err);
-        });
-    } else {
-      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;
-        }
-
-        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;
-            }
-
-            return callback();
-          })
-          .catch(function (err) {
-            log.error("sendTypingIndicator", err);
-            if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
-              ctx.loggedIn = false;
-            }
-            return callback(err);
-          });
-      });
-    }
-  }
-
-  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."
-        );
-      }
-      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."
-          );
-        }
-        cb = () => { };
-      }
-
-      makeTypingIndicator(false, threadID, cb, isGroup);
-    };
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function (defaultFuncs, api, ctx) {
+  function makeTypingIndicator(typ, threadID, callback, isGroup) {
+    var form = {
+      typ: +typ,
+      to: "",
+      source: "mercury-chat",
+      thread: threadID
+    };
+
+    // 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;
+
+      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;
+          return callback();
+        })
+        .catch(function (err) {
+          log.error("sendTypingIndicator", err);
+          if (utils.getType(err) == "Object" && err.error === "Not logged in") ctx.loggedIn = false;
+          return callback(err);
+        });
+    }
+    else {
+      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;
+        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;
+            return callback();
+          })
+          .catch(function (err) {
+            log.error("sendTypingIndicator", err);
+            if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
+            return callback(err);
+          });
+      });
+    }
+  }
+
+  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.");
+      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.");
+        cb = () => { };
+      }
+      makeTypingIndicator(false, threadID, cb, isGroup);
+    };
+  };
+};