alicezetion 1.5.3 → 1.5.4

package/leiamnash/handleMessageRequest.js

@@ -1,49 +1,65 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (/** @type {{ post: any; postFormData?: (arg0: string, arg1: any, arg2: any, arg3: {}) => any; get?: (arg0: any, arg1: any) => Promise<any>; }} */ defaultFuncs, /** @type {any} */ api, /** @type {{ jar: any; fb_dtsg?: string; ttstamp?: string; }} */ ctx) {
-  return function handleMessageRequest(/** @type {string | any[]} */ threadID, /** @type {any} */ accept, /** @type {((err: any, data: any) => void) | ((arg0: undefined) => any)} */ callback) {
-    if (utils.getType(accept) !== "Boolean") throw { error: "Please pass a boolean as a second argument." };
-
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (/** @type {any} */ err, /** @type {any} */ data) {
-        if (err) return rejectFunc(err);
-        resolveFunc(data);
-      };
-    }
-
-    var form = {
-      client: "mercury"
-    };
-
-    if (utils.getType(threadID) !== "Array") threadID = [threadID];
-
-    var messageBox = accept ? "inbox" : "other";
-
-    for (var i = 0; i < threadID.length; i++) form[messageBox + "[" + i + "]"] = threadID[i];
-
-    defaultFuncs
-      .post("https://www.facebook.com/ajax/mercury/move_thread.php", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (/** @type {{ error: any; }} */ resData) {
-        if (resData.error) throw resData;
-
-        return callback();
-      })
-      .catch(function (/** @type {string} */ err) {
-        log.error("handleMessageRequest", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function(defaultFuncs, api, ctx) {
+  return function handleMessageRequest(threadID, accept, callback) {
+    if (utils.getType(accept) !== "Boolean") {
+      throw {
+        error: "Please pass a boolean as a second argument."
+      };
+    }
+
+    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 = {
+      client: "mercury"
+    };
+
+    if (utils.getType(threadID) !== "Array") {
+      threadID = [threadID];
+    }
+
+    var messageBox = accept ? "inbox" : "other";
+
+    for (var i = 0; i < threadID.length; i++) {
+      form[messageBox + "[" + i + "]"] = threadID[i];
+    }
+
+    defaultFuncs
+      .post(
+        "https://www.facebook.com/ajax/mercury/move_thread.php",
+        ctx.jar,
+        form
+      )
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(function(resData) {
+        if (resData.error) {
+          throw resData;
+        }
+
+        return callback();
+      })
+      .catch(function(err) {
+        log.error("handleMessageRequest", err);
+        return callback(err);
+      });
+      
+    return returnPromise;
+  };
+};

package/leiamnash/httpGet.js

@@ -1,49 +1,52 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-  return function httpGet(url, form, callback, notAPI) {
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback && (utils.getType(form) == "Function" || utils.getType(form) == "AsyncFunction")) {
-      callback = form;
-      form = {};
-    }
-
-    form = form || {};
-
-    callback = callback || function (err, data) {
-      if (err) return rejectFunc(err);
-      resolveFunc(data);
-    };
-
-    if (notAPI) {
-      utils
-        .get(url, ctx.jar, form, ctx.globalOptions)
-        .then(resData => callback(null, resData.body.toString()))
-        .catch(function (err) {
-          log.error("httpGet", err);
-          return callback(err);
-        });
-    }
-    else {
-      defaultFuncs
-        .get(url, ctx.jar, form)
-        .then(resData => callback(null, resData.body.toString()))
-        .catch(function (err) {
-          log.error("httpGet", err);
-          return callback(err);
-        });
-    }
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function(defaultFuncs, api, ctx) {
+  return function httpGet(url, form, callback, notAPI) {
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (!callback && (utils.getType(form) == "Function" || utils.getType(form) == "AsyncFunction")) {
+      callback = form;
+      form = {};
+    }
+    
+    form = form || {};
+
+    callback = callback || function(err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
+    };
+
+    if (notAPI) {
+      utils
+        .get(url, ctx.jar, form, ctx.globalOptions)
+        .then(function(resData) {
+          callback(null, resData.body.toString());
+        })
+        .catch(function(err) {
+          log.error("httpGet", err);
+          return callback(err);
+        });
+    } else {
+      defaultFuncs
+        .get(url, ctx.jar, form)
+        .then(function(resData) {
+          callback(null, resData.body.toString());
+        })
+        .catch(function(err) {
+          log.error("httpGet", err);
+          return callback(err);
+        });
+    }
+
+    return returnPromise;
+  };
+};

package/leiamnash/httpPost.js

@@ -1,48 +1,52 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-  return function httpGet(url, form, callback, notAPI) {
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback && (utils.getType(form) == "Function" || utils.getType(form) == "AsyncFunction")) {
-      callback = form;
-      form = {};
-    }
-
-    form = form || {};
-
-    callback = callback || function (err, data) {
-      if (err) return rejectFunc(err);
-      resolveFunc(data);
-    };
-
-    if (notAPI) {
-      utils
-        .post(url, ctx.jar, form, ctx.globalOptions)
-        .then(resData => callback(null, resData.body.toString()))
-        .catch(function (err) {
-          log.error("httpPost", err);
-          return callback(err);
-        });
-    }
-    else {
-      defaultFuncs
-        .post(url, ctx.jar, form, {})
-        .then(resData => callback(null, resData.body.toString()))
-        .catch(function (err) {
-          log.error("httpPost", err);
-          return callback(err);
-        });
-    }
-    return returnPromise;
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function(defaultFuncs, api, ctx) {
+  return function httpGet(url, form, callback, notAPI) {
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (!callback && (utils.getType(form) == "Function" || utils.getType(form) == "AsyncFunction")) {
+      callback = form;
+      form = {};
+    }
+
+    form = form || {};
+
+    callback = callback || function(err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
+    };
+
+    if (notAPI) {
+      utils
+        .post(url, ctx.jar, form, ctx.globalOptions)
+        .then(function(resData) {
+          callback(null, resData.body.toString());
+        })
+        .catch(function(err) {
+          log.error("httpPost", err);
+          return callback(err);
+        });
+    } else {
+      defaultFuncs
+        .post(url, ctx.jar, form, {})
+        .then(function(resData) {
+          callback(null, resData.body.toString());
+        })
+        .catch(function(err) {
+          log.error("httpPost", err);
+          return callback(err);
+        });
+    }
+
+    return returnPromise;
+  };
+};