alicezetion 1.0.0 → 1.0.2

package/alice/logout.js

@@ -3,9 +3,23 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function logout(callback) {
-    callback = callback || 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);
+      };
+    }
 
     var form = {
       pmid: "0"
@@ -55,5 +69,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("logout", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{delivered.js → markAsDelivered.js}

@@ -3,10 +3,22 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function (defaultFuncs, bot, ctx) {
+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 () { };
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     if (!threadID || !messageID) {
@@ -35,7 +47,12 @@ module.exports = function (defaultFuncs, bot, ctx) {
       })
       .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/markAsRead.js

@@ -0,0 +1,80 @@
+"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 → markAsReadAll.js}

@@ -3,10 +3,22 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, bot, ctx) {
+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() {};
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     var form = {
@@ -32,5 +44,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("markAsReadAll", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/markAsSeen.js

@@ -0,0 +1,59 @@
+"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;
+  };
+};

package/alice/{mute.js → muteThread.js}

@@ -3,11 +3,23 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, bot, 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 returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
     if (!callback) {
-      callback = function() {};
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     var form = {
@@ -34,5 +46,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("muteThread", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{kick.js → removeUserFromGroup.js}

@@ -3,7 +3,7 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function removeUserFromGroup(userID, threadID, callback) {
     if (
       !callback &&
@@ -35,8 +35,20 @@ module.exports = function(defaultFuncs, bot, ctx) {
       };
     }
 
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
     if (!callback) {
-      callback = function() {};
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     var form = {
@@ -61,5 +73,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("removeUserFromGroup", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{resolveimgurl.js → resolvePhotoUrl.js}

@@ -3,10 +3,22 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, bot, ctx) {
+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) {
-      throw { error: "resolvePhotoUrl: need callback" };
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     defaultFuncs
@@ -27,5 +39,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("resolvePhotoUrl", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{gcsearch.js → searchForThread.js}

@@ -2,10 +2,22 @@
 
 var utils = require("../utils");
 
-module.exports = function(defaultFuncs, bot, ctx) {
+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) {
-      throw { error: "searchForThread: need callback" };
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     var tmpForm = {
@@ -35,5 +47,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
           resData.payload.mercury_payload.threads.map(utils.formatThread)
         );
       });
+
+    return returnPromise;
   };
 };

package/alice/{chat.js → sendMessage.js}

@@ -11,10 +11,11 @@ var allowedProperties = {
   emoji: true,
   emojiSize: true,
   body: true,
-  mentions: true
+  mentions: true,
+  location: true,
 };
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   function uploadAttachment(attachments, callback) {
     var uploads = [];
 
@@ -43,7 +44,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
             {}
           )
           .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-          .then(function(resData) {
+          .then(function (resData) {
             if (resData.error) {
               throw resData;
             }
@@ -58,10 +59,10 @@ module.exports = function(defaultFuncs, bot, ctx) {
     // resolve all promises
     bluebird
       .all(uploads)
-      .then(function(resData) {
+      .then(function (resData) {
         callback(null, resData);
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("uploadAttachment", err);
         return callback(err);
       });
@@ -81,7 +82,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         form
       )
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
+      .then(function (resData) {
         if (resData.error) {
           return callback(resData);
         }
@@ -92,7 +93,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
 
         callback(null, resData.payload.share_data.share_params);
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("getUrl", err);
         return callback(err);
       });
@@ -138,7 +139,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
     defaultFuncs
       .post("https://www.facebook.com/messaging/send/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
+      .then(function (resData) {
         if (!resData) {
           return callback({ error: "Send message failed." });
         }
@@ -148,13 +149,13 @@ module.exports = function(defaultFuncs, bot, ctx) {
             log.warn(
               "sendMessage",
               "Got error 1545012. This might mean that you're not part of the conversation " +
-                threadID
+              threadID
             );
           }
           return callback(resData);
         }
 
-        var messageInfo = resData.payload.actions.reduce(function(p, v) {
+        var messageInfo = resData.payload.actions.reduce(function (p, v) {
           return (
             {
               threadID: v.thread_fbid,
@@ -166,33 +167,45 @@ module.exports = function(defaultFuncs, bot, ctx) {
 
         return callback(null, messageInfo);
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("sendMessage", err);
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+          ctx.loggedIn = false;
+        }
         return callback(err);
       });
   }
 
-  function send(form, threadID, messageAndOTID, callback) {
+  function send(form, threadID, messageAndOTID, callback, isGroup) {
     // We're doing a query to this to check if the given id is the id of
     // a user or of a group chat. The form will be different depending
     // on that.
     if (utils.getType(threadID) === "Array") {
       sendContent(form, threadID, false, messageAndOTID, callback);
     } else {
-      sendContent(
-        form,
-        threadID,
-        threadID.length === 15,
-        messageAndOTID,
-        callback
-      );
+      if (utils.getType(isGroup) != "Boolean") {
+        api.getUserInfo(threadID, function (err, res) {
+          if (err) {
+            return callback(err);
+          }
+          sendContent(
+            form,
+            threadID,
+            Object.keys(res).length > 0,
+            messageAndOTID,
+            callback
+          );
+        });
+      } else {
+        sendContent(form, threadID, !isGroup, messageAndOTID, callback);
+      }
     }
   }
 
   function handleUrl(msg, form, callback, cb) {
     if (msg.url) {
       form["shareable_attachment[share_type]"] = "100";
-      getUrl(msg.url, function(err, params) {
+      getUrl(msg.url, function (err, params) {
         if (err) {
           return callback(err);
         }
@@ -205,6 +218,20 @@ module.exports = function(defaultFuncs, bot, ctx) {
     }
   }
 
+  function handleLocation(msg, form, callback, cb) {
+    if (msg.location) {
+      if (msg.location.latitude == null || msg.location.longitude == null) {
+        return callback({ error: "location property needs both latitude and longitude" });
+      }
+
+      form["location_attachment[coordinates][latitude]"] = msg.location.latitude;
+      form["location_attachment[coordinates][longitude]"] = msg.location.longitude;
+      form["location_attachment[is_current_location]"] = !!msg.location.current;
+    }
+
+    cb();
+  }
+
   function handleSticker(msg, form, callback, cb) {
     if (msg.sticker) {
       form["sticker_id"] = msg.sticker;
@@ -248,12 +275,12 @@ module.exports = function(defaultFuncs, bot, ctx) {
         msg.attachment = [msg.attachment];
       }
 
-      uploadAttachment(msg.attachment, function(err, files) {
+      uploadAttachment(msg.attachment, function (err, files) {
         if (err) {
           return callback(err);
         }
 
-        files.forEach(function(file) {
+        files.forEach(function (file) {
           var key = Object.keys(file);
           var type = key[0]; // image_id, file_id, etc
           form["" + type + "s"].push(file[type]); // push the id
@@ -298,24 +325,37 @@ module.exports = function(defaultFuncs, bot, ctx) {
     cb();
   }
 
-  return function sendMessage(msg, threadID, callback, replyToMessage) {
+  return function sendMessage(msg, threadID, callback, replyToMessage, isGroup) {
+    typeof isGroup == "undefined" ? isGroup = null : "";
     if (
       !callback &&
       (utils.getType(threadID) === "Function" ||
         utils.getType(threadID) === "AsyncFunction")
     ) {
-      return callback({ error: "Pass a threadID as a second argument." });
+      return threadID({ error: "Pass a threadID as a second argument." });
     }
     if (
       !replyToMessage &&
       utils.getType(callback) === "String"
     ) {
       replyToMessage = callback;
-      callback = function() {};
+      callback = function () { };
     }
-      
+
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
     if (!callback) {
-      callback = function() {};
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     var msgType = utils.getType(msg);
@@ -342,7 +382,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
           "."
       });
     }
-    
+
     if (replyToMessage && messageIDType !== 'String') {
       return callback({
         error:
@@ -400,16 +440,20 @@ module.exports = function(defaultFuncs, bot, ctx) {
       replied_to_message_id: replyToMessage
     };
 
-    handleSticker(msg, form, callback, () =>
-      handleAttachment(msg, form, callback, () =>
-        handleUrl(msg, form, callback, () =>
-          handleEmoji(msg, form, callback, () =>
-            handleMention(msg, form, callback, () =>
-              send(form, threadID, messageAndOTID, callback)
+    handleLocation(msg, form, callback, () =>
+      handleSticker(msg, form, callback, () =>
+        handleAttachment(msg, form, callback, () =>
+          handleUrl(msg, form, callback, () =>
+            handleEmoji(msg, form, callback, () =>
+              handleMention(msg, form, callback, () =>
+                send(form, threadID, messageAndOTID, callback, isGroup)
+              )
             )
           )
         )
       )
     );
+
+    return returnPromise;
   };
 };