alicezetion 1.6.9 → 1.7.1

package/{leiamnash → src}/getFriendsList.js

@@ -21,7 +21,7 @@ var GENDERS = {
 };
 
 function formatData(obj) {
-  return Object.keys(obj).map(function(key) {
+  return Object.keys(obj).map(function (key) {
     var user = obj[key];
     return {
       alternateName: user.alternateName,
@@ -39,10 +39,10 @@ function formatData(obj) {
   });
 }
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function getFriendsList(callback) {
-    var resolveFunc = function(){};
-    var rejectFunc = function(){};
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
     var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
@@ -50,31 +50,20 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     if (!callback) {
       callback = function (err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
+        if (err) return rejectFunc(err);
         resolveFunc(friendList);
       };
     }
 
     defaultFuncs
-      .postFormData(
-        "https://www.facebook.com/chat/user_info_all",
-        ctx.jar,
-        {},
-        { viewer: ctx.userID }
-      )
+      .postFormData("https://www.facebook.com/chat/user_info_all", ctx.jar, {}, { viewer: ctx.userID })
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (!resData) {
-          throw { error: "getFriendsList returned empty object." };
-        }
-        if (resData.error) {
-          throw resData;
-        }
+      .then(function (resData) {
+        if (!resData) throw { error: "getFriendsList returned empty object." };
+        if (resData.error) throw resData;
         callback(null, formatData(resData.payload));
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("getFriendsList", err);
         return callback(err);
       });

package/{leiamnash → src}/getThreadHistory.js

@@ -29,10 +29,10 @@ function formatAttachmentsGraphQLResponse(attachment) {
         // @Undocumented
         attributionApp: attachment.attribution_app
           ? {
-              attributionAppID: attachment.attribution_app.id,
-              name: attachment.attribution_app.name,
-              logo: attachment.attribution_app.square_logo
-            }
+            attributionAppID: attachment.attribution_app.id,
+            name: attachment.attribution_app.name,
+            logo: attachment.attribution_app.square_logo
+          }
           : null
 
         // @TODO No idea what this is, should we expose it?
@@ -78,10 +78,10 @@ function formatAttachmentsGraphQLResponse(attachment) {
         // @Undocumented
         attributionApp: attachment.attribution_app
           ? {
-              attributionAppID: attachment.attribution_app.id,
-              name: attachment.attribution_app.name,
-              logo: attachment.attribution_app.square_logo
-            }
+            attributionAppID: attachment.attribution_app.id,
+            name: attachment.attribution_app.name,
+            logo: attachment.attribution_app.square_logo
+          }
           : null
       };
     case "MessageVideo":
@@ -144,56 +144,15 @@ function formatExtensibleAttachment(attachment) {
       url: attachment.story_attachment.url,
 
       title: attachment.story_attachment.title_with_entities.text,
-      description:
-        attachment.story_attachment.description &&
-        attachment.story_attachment.description.text,
-      source:
-        attachment.story_attachment.source == null
-          ? null
-          : attachment.story_attachment.source.text,
-
-      image:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.animated_image == null &&
-            attachment.story_attachment.media.image == null
-            ? null
-            : (
-                attachment.story_attachment.media.animated_image ||
-                attachment.story_attachment.media.image
-              ).uri,
-      width:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.animated_image == null &&
-            attachment.story_attachment.media.image == null
-            ? null
-            : (
-                attachment.story_attachment.media.animated_image ||
-                attachment.story_attachment.media.image
-              ).width,
-      height:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.animated_image == null &&
-            attachment.story_attachment.media.image == null
-            ? null
-            : (
-                attachment.story_attachment.media.animated_image ||
-                attachment.story_attachment.media.image
-              ).height,
-      playable:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.is_playable,
-      duration:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.playable_duration_in_ms,
-      playableUrl:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.playable_url,
+      description: attachment.story_attachment.description && attachment.story_attachment.description.text,
+      source: attachment.story_attachment.source == null ? null : attachment.story_attachment.source.text,
+
+      image: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.animated_image == null && attachment.story_attachment.media.image == null ? null : (attachment.story_attachment.media.animated_image || attachment.story_attachment.media.image).uri,
+      width: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.animated_image == null && attachment.story_attachment.media.image == null ? null : (attachment.story_attachment.media.animated_image || attachment.story_attachment.media.image).width,
+      height: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.animated_image == null && attachment.story_attachment.media.image == null ? null : (attachment.story_attachment.media.animated_image || attachment.story_attachment.media.image).height,
+      playable: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.is_playable,
+      duration: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.playable_duration_in_ms,
+      playableUrl: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.playable_url,
 
       subattachments: attachment.story_attachment.subattachments,
 
@@ -210,54 +169,22 @@ function formatExtensibleAttachment(attachment) {
       //     width: "1280"
       //   }
       //
-      properties: attachment.story_attachment.properties.reduce(function(
-        obj,
-        cur
-      ) {
+      properties: attachment.story_attachment.properties.reduce(function (obj, cur) {
         obj[cur.key] = cur.value.text;
         return obj;
-      },
-      {}),
+      }, {}),
 
       // Deprecated fields
       animatedImageSize: "", // @Legacy
       facebookUrl: "", // @Legacy
       styleList: "", // @Legacy
       target: "", // @Legacy
-      thumbnailUrl:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.animated_image == null &&
-            attachment.story_attachment.media.image == null
-            ? null
-            : (
-                attachment.story_attachment.media.animated_image ||
-                attachment.story_attachment.media.image
-              ).uri, // @Legacy
-      thumbnailWidth:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.animated_image == null &&
-            attachment.story_attachment.media.image == null
-            ? null
-            : (
-                attachment.story_attachment.media.animated_image ||
-                attachment.story_attachment.media.image
-              ).width, // @Legacy
-      thumbnailHeight:
-        attachment.story_attachment.media == null
-          ? null
-          : attachment.story_attachment.media.animated_image == null &&
-            attachment.story_attachment.media.image == null
-            ? null
-            : (
-                attachment.story_attachment.media.animated_image ||
-                attachment.story_attachment.media.image
-              ).height // @Legacy
+      thumbnailUrl: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.animated_image == null && attachment.story_attachment.media.image == null ? null : (attachment.story_attachment.media.animated_image || attachment.story_attachment.media.image).uri, // @Legacy
+      thumbnailWidth: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.animated_image == null && attachment.story_attachment.media.image == null ? null : (attachment.story_attachment.media.animated_image || attachment.story_attachment.media.image).width, // @Legacy
+      thumbnailHeight: attachment.story_attachment.media == null ? null : attachment.story_attachment.media.animated_image == null && attachment.story_attachment.media.image == null ? null : (attachment.story_attachment.media.animated_image || attachment.story_attachment.media.image).height // @Legacy
     };
-  } else {
-    return { error: "Don't know what to do with extensible_attachment." };
   }
+  else return { error: "Don't know what to do with extensible_attachment." };
 }
 
 function formatReactionsGraphQL(reaction) {
@@ -268,24 +195,18 @@ function formatReactionsGraphQL(reaction) {
 }
 
 function formatEventData(event) {
-  if (event == null) {
-    return {};
-  }
+  if (event == null) return {}
 
   switch (event.__typename) {
     case "ThemeColorExtensibleMessageAdminText":
-      return {
-        color: event.theme_color
-      };
+      return { color: event.theme_color };
     case "ThreadNicknameExtensibleMessageAdminText":
       return {
         nickname: event.nickname,
         participantID: event.participant_id
       };
     case "ThreadIconExtensibleMessageAdminText":
-      return {
-        threadIcon: event.thread_icon
-      };
+      return { threadIcon: event.thread_icon };
     case "InstantGameUpdateExtensibleMessageAdminText":
       return {
         gameID: (event.game == null ? null : event.game.id),
@@ -295,9 +216,7 @@ function formatEventData(event) {
         instant_game_update_data: event.instant_game_update_data
       };
     case "GameScoreExtensibleMessageAdminText":
-      return {
-        game_type: event.game_type
-      };
+      return { game_type: event.game_type };
     case "RtcCallLogExtensibleMessageAdminText":
       return {
         event: event.event,
@@ -345,19 +264,15 @@ function formatEventData(event) {
     case "LightweightEventDeleteExtensibleMessageAdminText":
       return {};
     default:
-      return {
-        error: "Don't know what to with event data type " + event.__typename
-      };
+      return { error: "Don't know what to with event data type " + event.__typename };
   }
 }
 
 function formatMessagesGraphQLResponse(data) {
   var messageThread = data.o0.data.message_thread;
-  var threadID = messageThread.thread_key.thread_fbid
-    ? messageThread.thread_key.thread_fbid
-    : messageThread.thread_key.other_user_id;
+  var threadID = messageThread.thread_key.thread_fbid ? messageThread.thread_key.thread_fbid : messageThread.thread_key.other_user_id;
 
-  var messages = messageThread.messages.nodes.map(function(d) {
+  var messages = messageThread.messages.nodes.map(function (d) {
     switch (d.__typename) {
       case "UserMessage":
         // Give priority to stickers. They're seen as normal messages but we've
@@ -393,9 +308,7 @@ function formatMessagesGraphQLResponse(data) {
 
         var mentionsObj = {};
         if (d.message !== null) {
-          d.message.ranges.forEach(e => {
-            mentionsObj[e.entity.id] = d.message.text.substr(e.offset, e.length);
-          });
+          d.message.ranges.forEach(e => mentionsObj[e.entity.id] = d.message.text.substr(e.offset, e.length));
         }
 
         return {
@@ -418,9 +331,7 @@ function formatMessagesGraphQLResponse(data) {
           isUnread: d.unread,
 
           // New
-          messageReactions: d.message_reactions
-            ? d.message_reactions.map(formatReactionsGraphQL)
-            : null,
+          messageReactions: d.message_reactions ? d.message_reactions.map(formatReactionsGraphQL) : null,
           isSponsored: d.is_sponsored,
           snippet: d.snippet
         };
@@ -434,9 +345,7 @@ function formatMessagesGraphQLResponse(data) {
           timestamp: d.timestamp_precise,
           eventType: "change_thread_name",
           snippet: d.snippet,
-          eventData: {
-            threadName: d.thread_name
-          },
+          eventData: { threadName: d.thread_name },
 
           // @Legacy
           author: d.message_sender.id,
@@ -453,26 +362,21 @@ function formatMessagesGraphQLResponse(data) {
           timestamp: d.timestamp_precise,
           eventType: "change_thread_image",
           snippet: d.snippet,
-          eventData:
-            d.image_with_metadata == null
-              ? {} /* removed image */
-              : {
-                  /* image added */
-                  threadImage: {
-                    attachmentID: d.image_with_metadata.legacy_attachment_id,
-                    width: d.image_with_metadata.original_dimensions.x,
-                    height: d.image_with_metadata.original_dimensions.y,
-                    url: d.image_with_metadata.preview.uri
-                  }
-                },
+          eventData: d.image_with_metadata == null
+            ? {} /* removed image */
+            : {
+              /* image added */
+              threadImage: {
+                attachmentID: d.image_with_metadata.legacy_attachment_id,
+                width: d.image_with_metadata.original_dimensions.x,
+                height: d.image_with_metadata.original_dimensions.y,
+                url: d.image_with_metadata.preview.uri
+              }
+            },
 
           // @Legacy
           logMessageType: "log:thread-icon",
-          logMessageData: {
-            thread_icon: d.image_with_metadata
-              ? d.image_with_metadata.preview.uri
-              : null
-          }
+          logMessageData: { thread_icon: d.image_with_metadata ? d.image_with_metadata.preview.uri : null }
         };
       case "ParticipantLeftMessage":
         return {
@@ -486,7 +390,7 @@ function formatMessagesGraphQLResponse(data) {
           snippet: d.snippet,
           eventData: {
             // Array of IDs.
-            participantsRemoved: d.participants_removed.map(function(p) {
+            participantsRemoved: d.participants_removed.map(function (p) {
               return p.id;
             })
           },
@@ -494,7 +398,7 @@ function formatMessagesGraphQLResponse(data) {
           // @Legacy
           logMessageType: "log:unsubscribe",
           logMessageData: {
-            leftParticipantFbId: d.participants_removed.map(function(p) {
+            leftParticipantFbId: d.participants_removed.map(function (p) {
               return p.id;
             })
           }
@@ -511,7 +415,7 @@ function formatMessagesGraphQLResponse(data) {
           snippet: d.snippet,
           eventData: {
             // Array of IDs.
-            participantsAdded: d.participants_added.map(function(p) {
+            participantsAdded: d.participants_added.map(function (p) {
               return p.id;
             })
           },
@@ -519,7 +423,7 @@ function formatMessagesGraphQLResponse(data) {
           // @Legacy
           logMessageType: "log:subscribe",
           logMessageData: {
-            addedParticipants: d.participants_added.map(function(p) {
+            addedParticipants: d.participants_added.map(function (p) {
               return p.id;
             })
           }
@@ -577,15 +481,10 @@ function formatMessagesGraphQLResponse(data) {
   return messages;
 }
 
-module.exports = function(defaultFuncs, api, ctx) {
-  return function getThreadHistoryGraphQL(
-    threadID,
-    amount,
-    timestamp,
-    callback
-  ) {
-    var resolveFunc = function(){};
-    var rejectFunc = function(){};
+module.exports = function (defaultFuncs, api, ctx) {
+  return function getThreadHistoryGraphQL(threadID, amount, timestamp, callback) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
     var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
@@ -593,9 +492,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     if (!callback) {
       callback = function (err, data) {
-        if (err) {
-          return rejectFunc(err);
-        }
+        if (err) return rejectFunc(err);
         resolveFunc(data);
       };
     }
@@ -622,20 +519,15 @@ module.exports = function(defaultFuncs, api, ctx) {
     defaultFuncs
       .post("https://www.facebook.com/api/graphqlbatch/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (resData.error) {
-          throw resData;
-        }
+      .then(function (resData) {
+        if (resData.error) throw resData;
         // This returns us an array of things. The last one is the success /
         // failure one.
         // @TODO What do we do in this case?
-        if (resData[resData.length - 1].error_results !== 0) {
-          throw new Error("There was an error_result.");
-        }
-
+        if (resData[resData.length - 1].error_results !== 0) throw new Error("There was an error_result.");
         callback(null, formatMessagesGraphQLResponse(resData[0]));
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("getThreadHistoryGraphQL", err);
         return callback(err);
       });

package/{leiamnash → src}/getThreadHistoryDeprecated.js

@@ -3,73 +3,54 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function getThreadHistory(threadID, amount, timestamp, 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, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err, threadInfo) {
+        if (err) return rejectFunc(err);
+        resolveFunc(threadInfo);
       };
     }
 
-    if (!callback) {
-      throw { error: "getThreadHistory: need callback" };
-    }
-
+    if (!callback) throw { error: "getThreadHistory: need callback" };
     var form = {
       client: "mercury"
     };
 
-    api.getUserInfo(threadID, function(err, res) {
-      if (err) {
-        return callback(err);
-      }
+    api.getUserInfo(threadID, function (err, res) {
+      if (err) return callback(err);
       var key = Object.keys(res).length > 0 ? "user_ids" : "thread_fbids";
       form["messages[" + key + "][" + threadID + "][offset]"] = 0;
       form["messages[" + key + "][" + threadID + "][timestamp]"] = timestamp;
       form["messages[" + key + "][" + threadID + "][limit]"] = amount;
 
-      if (ctx.globalOptions.pageID)
-        form.request_user_id = ctx.globalOptions.pageID;
+      if (ctx.globalOptions.pageID) form.request_user_id = ctx.globalOptions.pageID;
 
       defaultFuncs
-        .post(
-          "https://www.facebook.com/ajax/mercury/thread_info.php",
-          ctx.jar,
-          form
-        )
+        .post("https://www.facebook.com/ajax/mercury/thread_info.php", ctx.jar, form)
         .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-        .then(function(resData) {
-          if (resData.error) {
-            throw resData;
-          } else if (!resData.payload) {
-            throw { error: "Could not retrieve thread history." };
-          }
+        .then(function (resData) {
+          if (resData.error) throw resData;
+          else if (!resData.payload) throw { error: "Could not retrieve thread history." };
 
           // Asking for message history from a thread with no message history
           // will return undefined for actions here
-          if (!resData.payload.actions) {
-            resData.payload.actions = [];
-          }
+          if (!resData.payload.actions) resData.payload.actions = [];
 
           var userIDs = {};
-          resData.payload.actions.forEach(function(v) {
-            userIDs[v.author.split(":").pop()] = "";
-          });
+          resData.payload.actions.forEach(v => userIDs[v.author.split(":").pop()] = "");
 
-          api.getUserInfo(Object.keys(userIDs), function(err, data) {
+          api.getUserInfo(Object.keys(userIDs), function (err, data) {
             if (err) return callback(err); //callback({error: "Could not retrieve user information in getThreadHistory."});
 
-            resData.payload.actions.forEach(function(v) {
+            resData.payload.actions.forEach(function (v) {
               var sender = data[v.author.split(":").pop()];
               if (sender) v.sender_name = sender.name;
               else v.sender_name = "Facebook User";
@@ -77,13 +58,10 @@ module.exports = function(defaultFuncs, api, ctx) {
               delete v.author;
             });
 
-            callback(
-              null,
-              resData.payload.actions.map(utils.formatHistoryMessage)
-            );
+            callback(null, resData.payload.actions.map(utils.formatHistoryMessage));
           });
         })
-        .catch(function(err) {
+        .catch(function (err) {
           log.error("getThreadHistory", err);
           return callback(err);
         });