alicezetion 1.0.3 → 1.0.4

package/{alice → src}/logout.js

@@ -1,75 +1,68 @@
-"use strict";
-
-var utils = require("../utils");
-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) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
-      };
-    }
-
-    var form = {
-      pmid: "0"
-    };
-
-    defaultFuncs
-      .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) {
-          return v.value === "logout";
-        })[0];
-
-        var html = resData.jsmods.markup.filter(function(v) {
-          return v[0] === elem.markup.__m;
-        })[0][1].__html;
-
-        var form = {
-          fb_dtsg: utils.getFrom(html, '"fb_dtsg" value="', '"'),
-          ref: utils.getFrom(html, '"ref" value="', '"'),
-          h: utils.getFrom(html, '"h" value="', '"')
-        };
-
-        return defaultFuncs
-          .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." };
-        }
-
-        return defaultFuncs
-          .get(res.headers.location, ctx.jar)
-          .then(utils.saveCookies(ctx.jar));
-      })
-      .then(function() {
-        ctx.loggedIn = false;
-        log.info("logout", "Logged out successfully.");
-        callback();
-      })
-      .catch(function(err) {
-        log.error("logout", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+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) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (!callback) {
+      callback = function (err, friendList) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(friendList);
+      };
+    }
+
+    var form = {
+      pmid: "0"
+    };
+
+    defaultFuncs
+      .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) {
+          return v.value === "logout";
+        })[0];
+
+        var html = resData.jsmods.markup.filter(function (v) {
+          return v[0] === elem.markup.__m;
+        })[0][1].__html;
+
+        var form = {
+          fb_dtsg: utils.getFrom(html, '"fb_dtsg" value="', '"'),
+          ref: utils.getFrom(html, '"ref" value="', '"'),
+          h: utils.getFrom(html, '"h" value="', '"')
+        };
+
+        return defaultFuncs
+          .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." };
+
+        return defaultFuncs
+          .get(res.headers.location, ctx.jar)
+          .then(utils.saveCookies(ctx.jar));
+      })
+      .then(function () {
+        ctx.loggedIn = false;
+        log.info("logout", "Logged out successfully.");
+        callback();
+      })
+      .catch(function (err) {
+        log.error("logout", err);
+        return callback(err);
+      });
+
+    return returnPromise;
+  };
+};

package/{alice → src}/markAsDelivered.js

@@ -1,58 +1,47 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-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) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
-      };
-    }
-
-    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
-      )
-      .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("markAsDelivered", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
-          ctx.loggedIn = false;
-        }
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+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) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (!callback) {
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+
+        resolveFunc(data);
+      };
+    }
+
+    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)
+      .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("markAsDelivered", err);
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
+
+        return callback(err);
+      });
+
+    return returnPromise;
+  };
+};

package/{alice → src}/markAsRead.js

@@ -1,80 +1,70 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-  return async function markAsRead(threadID, read, callback) {
-    if (utils.getType(read) === 'Function' || utils.getType(read) === 'AsyncFunction') {
-      callback = read;
-      read = true;
-    }
-    if (read == undefined) {
-      read = true;
-    }
-
-    if (!callback) {
-      callback = () => { };
-    }
-
-    var form = {};
-
-    if (typeof ctx.globalOptions.pageID !== 'undefined') {
-      form["source"] = "PagesManagerMessagesInterface";
-      form["request_user_id"] = ctx.globalOptions.pageID;
-      form["ids[" + threadID + "]"] = read;
-      form["watermarkTimestamp"] = new Date().getTime();
-      form["shouldSendReadReceipt"] = true;
-      form["commerce_last_message_type"] = "";
-      //form["titanOriginatedThreadId"] = utils.generateThreadingID(ctx.clientID);
-
-      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))
-        );
-      } catch (e) {
-        callback(e);
-        return e;
-      }
-
-      if (resData.error) {
-        let err = resData.error;
-        log.error("markAsRead", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
-          ctx.loggedIn = false;
-        }
-        callback(err);
-        return err;
-      }
-
-      callback();
-      return null;
-    } 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));
-          if (err) throw err;
-        } else {
-          throw {
-            error: "You can only use this function after you start listening."
-          };
-        }
-      } catch (e) {
-        callback(e);
-        return e;
-      }
-    }
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function (defaultFuncs, api, ctx) {
+  return async function markAsRead(threadID, read, callback) {
+    if (utils.getType(read) === 'Function' || utils.getType(read) === 'AsyncFunction') {
+      callback = read;
+      read = true;
+    }
+    if (read == undefined) read = true;
+
+    if (!callback) callback = () => { };
+
+    var form = {};
+
+    if (typeof ctx.globalOptions.pageID !== 'undefined') {
+      form["source"] = "PagesManagerMessagesInterface";
+      form["request_user_id"] = ctx.globalOptions.pageID;
+      form["ids[" + threadID + "]"] = read;
+      form["watermarkTimestamp"] = new Date().getTime();
+      form["shouldSendReadReceipt"] = true;
+      form["commerce_last_message_type"] = "";
+      //form["titanOriginatedThreadId"] = utils.generateThreadingID(ctx.clientID);
+
+      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))
+        );
+      }
+      catch (e) {
+        callback(e);
+        return e;
+      }
+
+      if (resData.error) {
+        let err = resData.error;
+        log.error("markAsRead", err);
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
+        callback(err);
+        return err;
+      }
+
+      callback();
+      return null;
+    }
+    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));
+          if (err) throw err;
+        }
+        else throw { error: "You can only use this function after you start listening." };
+      }
+      catch (e) {
+        callback(e);
+        return e;
+      }
+    }
+  };
+};

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

@@ -1,50 +1,40 @@
-"use strict";
-
-var utils = require("../utils");
-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) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
-      };
-    }
-
-    var form = {
-      folder: 'inbox'
-    };
-
-    defaultFuncs
-      .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;
-        }
-
-        return callback();
-      })
-      .catch(function(err) {
-        log.error("markAsReadAll", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
+"use strict";
+
+var utils = require("../utils");
+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) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (!callback) {
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
+      };
+    }
+
+    var form = {
+      folder: 'inbox'
+    };
+
+    defaultFuncs
+      .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;
+        return callback();
+      })
+      .catch(function (err) {
+        log.error("markAsReadAll", err);
+        return callback(err);
+      });
+    return returnPromise;
+  };
 };

package/{alice → src}/markAsSeen.js

@@ -1,59 +1,48 @@
-"use strict";
-
-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") {
-      callback = seen_timestamp;
-      seen_timestamp = Date.now();
-    }
-
-    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 = {
-      seen_timestamp: seen_timestamp
-    };
-
-    defaultFuncs
-      .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;
-        }
-
-        return callback();
-      })
-      .catch(function (err) {
-        log.error("markAsSeen", err);
-        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
-          ctx.loggedIn = false;
-        }
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+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") {
+      callback = seen_timestamp;
+      seen_timestamp = Date.now();
+    }
+
+    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 = {
+      seen_timestamp: seen_timestamp
+    };
+
+    defaultFuncs
+      .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;
+        return callback();
+      })
+      .catch(function (err) {
+        log.error("markAsSeen", err);
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
+        return callback(err);
+      });
+    return returnPromise;
+  };
+};