alicezetion 1.3.0 → 1.3.1

package/leiamnash/handleFriendRequest.js

@@ -4,43 +4,58 @@ var utils = require("../utils");
 var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
-    return function handleFriendRequest(userID, 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, data) {
-                if (err) return rejectFunc(err);
-                resolveFunc(data);
-            };
+  return function handleFriendRequest(userID, 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 = {
-            viewer_id: userID,
-            "frefs[0]": "jwl",
-            floc: "friend_center_requests",
-            ref: "/reqs.php",
-            action: (accept ? "confirm" : "reject")
-        };
-
-        defaultFuncs
-            .post("https://www.facebook.com/requests/friends/ajax/", ctx.jar, form)
-            .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-            .then(function(resData) {
-                if (resData.payload.err) throw { err: resData.payload.err };
-                return callback();
-            })
-            .catch(function(err) {
-                log.error("handleFriendRequest", err);
-                return callback(err);
-            });
-
-        return returnPromise;
+    var form = {
+      viewer_id: ctx.userID,
+      "frefs[0]": "jwl",
+      floc: "friend_center_requests",
+      ref: "/reqs.php",
+      action: (accept ? "confirm" : "reject")
     };
-};
+
+    defaultFuncs
+      .post(
+        "https://www.facebook.com/requests/friends/ajax/",
+        ctx.jar,
+        form
+      )
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(function(resData) {
+        if (resData.payload.err) {
+          throw {
+              err: resData.payload.err
+          };
+        }
+
+        return callback();
+      })
+      .catch(function(err) {
+        log.error("handleFriendRequest", err);
+        return callback(err);
+      });
+
+    return returnPromise;
+  };
+};

package/leiamnash/handleMessageRequest.js

@@ -3,21 +3,27 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function (defaultFuncs, api, ctx) {
+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." };
+    if (utils.getType(accept) !== "Boolean") {
+      throw {
+        error: "Please pass a boolean as a second argument."
+      };
+    }
 
-    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, data) {
-        if (err) return rejectFunc(err);
-        resolveFunc(data);
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
       };
     }
 
@@ -25,23 +31,35 @@ module.exports = function (defaultFuncs, api, ctx) {
       client: "mercury"
     };
 
-    if (utils.getType(threadID) !== "Array") threadID = [threadID];
+    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];
+
+    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)
+      .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;
+      .then(function(resData) {
+        if (resData.error) {
+          throw resData;
+        }
+
         return callback();
       })
-      .catch(function (err) {
+      .catch(function(err) {
         log.error("handleMessageRequest", err);
         return callback(err);
       });
-
+      
     return returnPromise;
   };
 };

package/leiamnash/httpGet.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 httpGet(url, form, callback, notAPI) {
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
 
     var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
@@ -17,31 +17,36 @@ module.exports = function (defaultFuncs, api, ctx) {
       callback = form;
       form = {};
     }
+    
     form = form || {};
 
-    callback = callback || function (err, data) {
-      if (err) return rejectFunc(err);
-      resolveFunc(data);
+    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) {
+        .then(function(resData) {
+          callback(null, resData.body.toString());
+        })
+        .catch(function(err) {
           log.error("httpGet", err);
           return callback(err);
         });
-    }
-    else {
+    } else {
       defaultFuncs
         .get(url, ctx.jar, form)
-        .then(resData => callback(null, resData.body.toString()))
-        .catch(function (err) {
+        .then(function(resData) {
+          callback(null, resData.body.toString());
+        })
+        .catch(function(err) {
           log.error("httpGet", err);
           return callback(err);
         });
     }
+
     return returnPromise;
   };
 };

package/leiamnash/httpPost.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 httpGet(url, form, callback, notAPI) {
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
 
     var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
@@ -17,31 +17,36 @@ module.exports = function (defaultFuncs, api, ctx) {
       callback = form;
       form = {};
     }
+
     form = form || {};
 
-    callback = callback || function (err, data) {
-      if (err) return rejectFunc(err);
-      resolveFunc(data);
+    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) {
+        .then(function(resData) {
+          callback(null, resData.body.toString());
+        })
+        .catch(function(err) {
           log.error("httpPost", err);
           return callback(err);
         });
-    }
-    else {
+    } else {
       defaultFuncs
         .post(url, ctx.jar, form, {})
-        .then(resData => callback(null, resData.body.toString()))
-        .catch(function (err) {
+        .then(function(resData) {
+          callback(null, resData.body.toString());
+        })
+        .catch(function(err) {
           log.error("httpPost", err);
           return callback(err);
         });
     }
+
     return returnPromise;
   };
 };

package/leiamnash/listenMqtt.js

@@ -8,6 +8,7 @@ A L I C E » this project recode by one
 */
 
 "use strict";
+
 var utils = require("../utils");
 var log = require("npmlog");
 var mqtt = require('mqtt');
@@ -682,4 +683,4 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.firstListen = false;
         return msgEmitter;
     };
-};
+};

package/leiamnash/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,8 +14,9 @@ module.exports = function (defaultFuncs, api, ctx) {
 
     if (!callback) {
       callback = function (err, friendList) {
-        if (err) return rejectFunc(err);
-
+        if (err) {
+          return rejectFunc(err);
+        }
         resolveFunc(friendList);
       };
     }
@@ -25,14 +26,18 @@ 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;
 
@@ -46,19 +51,21 @@ 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/leiamnash/markAsDelivered.js

@@ -5,40 +5,51 @@ 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, data) {
-        if (err) return rejectFunc(err);
-
-        resolveFunc(data);
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
       };
     }
 
-    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/leiamnash/markAsRead.js

@@ -9,9 +9,13 @@ 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 = {};
 
@@ -28,12 +32,15 @@ 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;
       }
@@ -41,15 +48,16 @@ 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({
@@ -58,10 +66,12 @@ 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."
+          };
         }
-        else throw { error: "You can only use this function after you start listening." };
-      }
-      catch (e) {
+      } catch (e) {
         callback(e);
         return e;
       }

package/leiamnash/markAsReadAll.js

@@ -3,19 +3,21 @@
 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, data) {
-        if (err) return rejectFunc(err);
-        resolveFunc(data);
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
       };
     }
 
@@ -24,17 +26,25 @@ 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/leiamnash/markAsSeen.js

@@ -19,10 +19,11 @@ module.exports = function (defaultFuncs, api, ctx) {
     });
 
     if (!callback) {
-      callback = function (err, data) {
-        if (err) return rejectFunc(err);
-
-        resolveFunc(data);
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
       };
     }
 
@@ -31,18 +32,28 @@ 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/leiamnash/muteThread.js

@@ -3,21 +3,22 @@
 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, data) {
-        if (err) return rejectFunc(err);
-
-        resolveFunc(data);
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
       };
     }
 
@@ -27,15 +28,21 @@ 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);
       });