alicezetion 1.7.0 → 1.7.1

package/src/getThreadInfo.js

@@ -0,0 +1,171 @@
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+function formatEventReminders(reminder) {
+  return {
+    reminderID: reminder.id,
+    eventCreatorID: reminder.lightweight_event_creator.id,
+    time: reminder.time,
+    eventType: reminder.lightweight_event_type.toLowerCase(),
+    locationName: reminder.location_name,
+    // @TODO verify this
+    locationCoordinates: reminder.location_coordinates,
+    locationPage: reminder.location_page,
+    eventStatus: reminder.lightweight_event_status.toLowerCase(),
+    note: reminder.note,
+    repeatMode: reminder.repeat_mode.toLowerCase(),
+    eventTitle: reminder.event_title,
+    triggerMessage: reminder.trigger_message,
+    secondsToNotifyBefore: reminder.seconds_to_notify_before,
+    allowsRsvp: reminder.allows_rsvp,
+    relatedEvent: reminder.related_event,
+    members: reminder.event_reminder_members.edges.map(function (member) {
+      return {
+        memberID: member.node.id,
+        state: member.guest_list_state.toLowerCase()
+      };
+    })
+  };
+}
+
+function formatThreadGraphQLResponse(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;
+
+  // Remove me
+  var lastM = messageThread.last_message;
+  var snippetID = lastM && lastM.nodes && lastM.nodes[0] && lastM.nodes[0].message_sender && lastM.nodes[0].message_sender.messaging_actor ? lastM.nodes[0].message_sender.messaging_actor.id : null;
+  var snippetText = lastM && lastM.nodes && lastM.nodes[0] ? lastM.nodes[0].snippet : null;
+  var lastR = messageThread.last_read_receipt;
+  var lastReadTimestamp = lastR && lastR.nodes && lastR.nodes[0] && lastR.nodes[0].timestamp_precise ? lastR.nodes[0].timestamp_precise : null;
+
+  return {
+    threadID: threadID,
+    threadName: messageThread.name,
+    participantIDs: messageThread.all_participants.edges.map(d => d.node.messaging_actor.id),
+    userInfo: messageThread.all_participants.edges.map(d => ({
+      id: d.node.messaging_actor.id,
+      name: d.node.messaging_actor.name,
+      firstName: d.node.messaging_actor.short_name,
+      vanity: d.node.messaging_actor.username,
+      thumbSrc: d.node.messaging_actor.big_image_src.uri,
+      profileUrl: d.node.messaging_actor.big_image_src.uri,
+      gender: d.node.messaging_actor.gender,
+      type: d.node.messaging_actor.__typename,
+      isFriend: d.node.messaging_actor.is_viewer_friend,
+      isBirthday: !!d.node.messaging_actor.is_birthday //not sure?
+    })),
+    unreadCount: messageThread.unread_count,
+    messageCount: messageThread.messages_count,
+    timestamp: messageThread.updated_time_precise,
+    muteUntil: messageThread.mute_until,
+    isGroup: messageThread.thread_type == "GROUP",
+    isSubscribed: messageThread.is_viewer_subscribed,
+    isArchived: messageThread.has_viewer_archived,
+    folder: messageThread.folder,
+    cannotReplyReason: messageThread.cannot_reply_reason,
+    eventReminders: messageThread.event_reminders ? messageThread.event_reminders.nodes.map(formatEventReminders) : null,
+    emoji: messageThread.customization_info ? messageThread.customization_info.emoji : null,
+    color: messageThread.customization_info && messageThread.customization_info.outgoing_bubble_color ? messageThread.customization_info.outgoing_bubble_color.slice(2) : null,
+    nicknames:
+      messageThread.customization_info &&
+        messageThread.customization_info.participant_customizations
+        ? messageThread.customization_info.participant_customizations.reduce(function (res, val) {
+          if (val.nickname) res[val.participant_id] = val.nickname;
+          return res;
+        }, {})
+        : {},
+    adminIDs: messageThread.thread_admins,
+    approvalMode: Boolean(messageThread.approval_mode),
+    approvalQueue: messageThread.group_approval_queue.nodes.map(a => ({
+      inviterID: a.inviter.id,
+      requesterID: a.requester.id,
+      timestamp: a.request_timestamp,
+      request_source: a.request_source // @Undocumented
+    })),
+
+    // @Undocumented
+    reactionsMuteMode: messageThread.reactions_mute_mode.toLowerCase(),
+    mentionsMuteMode: messageThread.mentions_mute_mode.toLowerCase(),
+    isPinProtected: messageThread.is_pin_protected,
+    relatedPageThread: messageThread.related_page_thread,
+
+    // @Legacy
+    name: messageThread.name,
+    snippet: snippetText,
+    snippetSender: snippetID,
+    snippetAttachments: [],
+    serverTimestamp: messageThread.updated_time_precise,
+    imageSrc: messageThread.image ? messageThread.image.uri : null,
+    isCanonicalUser: messageThread.is_canonical_neo_user,
+    isCanonical: messageThread.thread_type != "GROUP",
+    recipientsLoadable: true,
+    hasEmailParticipant: false,
+    readOnly: false,
+    canReply: messageThread.cannot_reply_reason == null,
+    lastMessageTimestamp: messageThread.last_message ? messageThread.last_message.timestamp_precise : null,
+    lastMessageType: "message",
+    lastReadTimestamp: lastReadTimestamp,
+    threadType: messageThread.thread_type == "GROUP" ? 2 : 1
+  };
+}
+
+module.exports = function (defaultFuncs, api, ctx) {
+  return function getThreadInfoGraphQL(threadID, callback) {
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
+    if (utils.getType(callback) != "Function" && utils.getType(callback) != "AsyncFunction") {
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
+      };
+    }
+
+    // `queries` has to be a string. I couldn't tell from the dev console. This
+    // took me a really long time to figure out. I deserve a cookie for this.
+    var form = {
+      queries: JSON.stringify({
+        o0: {
+          // This doc_id is valid as of July 20th, 2020
+          doc_id: "3449967031715030",
+          query_params: {
+            id: threadID,
+            message_limit: 0,
+            load_messages: false,
+            load_read_receipts: false,
+            before: null
+          }
+        }
+      }),
+      batch_name: "MessengerGraphQLThreadFetcher"
+    };
+
+    defaultFuncs
+      .post("https://www.facebook.com/api/graphqlbatch/", ctx.jar, form)
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .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) {
+          console.log(resData); //Log more info
+          throw new Error("well darn there was an error_result");
+        }
+        callback(null, formatThreadGraphQLResponse(resData[0]));
+      })
+      .catch(function (err) {
+        log.error("getThreadInfoGraphQL", "Can't get thread info");
+        return callback(err);
+      });
+
+    return returnPromise;
+  };
+};

package/src/getThreadInfoDeprecated.js

@@ -0,0 +1,56 @@
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function (defaultFuncs, api, ctx) {
+  return function getThreadInfo(threadID, 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 = {
+      client: "mercury"
+    };
+
+    api.getUserInfo(threadID, function (err, userRes) {
+      if (err) return callback(err);
+      var key = Object.keys(userRes).length > 0 ? "user_ids" : "thread_fbids";
+      form["threads[" + key + "][0]"] = threadID;
+
+      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)
+        .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+        .then(function (resData) {
+          if (resData.error) throw resData;
+          else if (!resData.payload) throw { error: "Could not retrieve thread Info." };
+
+          var threadData = resData.payload.threads[0];
+          var userData = userRes[threadID];
+
+          if (threadData == null) throw { error: "ThreadData is null" };
+
+          threadData.name = userData != null && userData.name != null ? userData.name : threadData.name;
+          threadData.image_src = userData != null && userData.thumbSrc != null ? userData.thumbSrc : threadData.image_src;
+          callback(null, utils.formatThread(threadData));
+        })
+        .catch(function (err) {
+          log.error("getThreadInfo", err);
+          return callback(err);
+        });
+    });
+    return returnPromise;
+  };
+};

package/{leiamnash → src}/getThreadList.js

@@ -9,7 +9,7 @@ function createProfileUrl(url, username, id) {
 }
 
 function formatParticipants(participants) {
-  return participants.edges.map((p)=>{
+  return participants.edges.map((p) => {
     p = p.node.messaging_actor;
     switch (p["__typename"]) {
       case "User":
@@ -21,7 +21,7 @@ function formatParticipants(participants) {
           gender: p.gender,
           url: p.url, // how about making it profileURL
           profilePicture: p.big_image_src.uri,
-          username: (p.username||null),
+          username: (p.username || null),
           // TODO: maybe better names for these?
           isViewerFriend: p.is_viewer_friend, // true/false
           isMessengerUser: p.is_messenger_user, // true/false
@@ -37,7 +37,7 @@ function formatParticipants(participants) {
           name: p.name,
           url: p.url,
           profilePicture: p.big_image_src.uri,
-          username: (p.username||null),
+          username: (p.username || null),
           // uhm... better names maybe?
           acceptsMessengerUserFeedback: p.accepts_messenger_user_feedback, // true/false
           isMessengerUser: p.is_messenger_user, // true/false
@@ -46,27 +46,18 @@ function formatParticipants(participants) {
           isMessageBlockedByViewer: p.is_message_blocked_by_viewer, // true/false
         };
       case "ReducedMessagingActor":
+      case "UnavailableMessagingActor":
         return {
           accountType: p["__typename"],
           userID: utils.formatID(p.id.toString()),
           name: p.name,
           url: createProfileUrl(p.url, p.username, p.id), // in this case p.url is null all the time
           profilePicture: p.big_image_src.uri, // in this case it is default facebook photo, we could determine gender using it
-          username: (p.username||null), // maybe we could use it to generate profile URL?
-          isMessageBlockedByViewer: p.is_message_blocked_by_viewer, // true/false
-        };
-      case "UnavailableMessagingActor":
-        return {
-          accountType: p["__typename"],
-          userID: utils.formatID(p.id.toString()),
-          name: p.name, // "Facebook User" in user's language
-          url: createProfileUrl(p.url, p.username, p.id), // in this case p.url is null all the time
-          profilePicture: p.big_image_src.uri, // default male facebook photo
-          username: (p.username||null), // maybe we could use it to generate profile URL?
+          username: (p.username || null), // maybe we could use it to generate profile URL?
           isMessageBlockedByViewer: p.is_message_blocked_by_viewer, // true/false
         };
       default:
-        log.warn("getThreadList", "Found participant with unsupported typename. Please open an issue at https://github.com/Schmavery/fca-unofficial/issues\n" + JSON.stringify(p, null, 2));
+        log.warn("getThreadList", "Found participant with unsupported typename. Please open an issue at https://github.com/Schmavery/facebook-chat-api/issues\n" + JSON.stringify(p, null, 2));
         return {
           accountType: p["__typename"],
           userID: utils.formatID(p.id.toString()),
@@ -78,9 +69,7 @@ function formatParticipants(participants) {
 
 // "FF8C0077" -> "8C0077"
 function formatColor(color) {
-  if (color && color.match(/^(?:[0-9a-fA-F]{8})$/g)) {
-    return color.slice(2);
-  }
+  if (color && color.match(/^(?:[0-9a-fA-F]{8})$/g)) return color.slice(2);
   return color;
 }
 
@@ -95,24 +84,24 @@ function getThreadName(t) {
 
 function mapNicknames(customizationInfo) {
   return (customizationInfo && customizationInfo.participant_customizations) ? customizationInfo.participant_customizations.map(u => {
-      return {
-        "userID": u.participant_id,
-        "nickname": u.nickname
-      };
-  }):[];
+    return {
+      "userID": u.participant_id,
+      "nickname": u.nickname
+    };
+  }) : [];
 }
 
 function formatThreadList(data) {
   return data.map(t => {
-    let lastMessageNode = (t.last_message&&t.last_message.nodes&&t.last_message.nodes.length>0)?t.last_message.nodes[0]:null;
+    let lastMessageNode = (t.last_message && t.last_message.nodes && t.last_message.nodes.length > 0) ? t.last_message.nodes[0] : null;
     return {
-      threadID: t.thread_key?utils.formatID(t.thread_key.thread_fbid || t.thread_key.other_user_id):null, // shall never be null
+      threadID: t.thread_key ? utils.formatID(t.thread_key.thread_fbid || t.thread_key.other_user_id) : null, // shall never be null
       name: getThreadName(t),
       unreadCount: t.unread_count,
       messageCount: t.messages_count,
-      imageSrc: t.image?t.image.uri:null,
-      emoji: t.customization_info?t.customization_info.emoji:null,
-      color: formatColor(t.customization_info?t.customization_info.outgoing_bubble_color:null),
+      imageSrc: t.image ? t.image.uri : null,
+      emoji: t.customization_info ? t.customization_info.emoji : null,
+      color: formatColor(t.customization_info ? t.customization_info.outgoing_bubble_color : null),
       nicknames: mapNicknames(t.customization_info),
       muteUntil: t.mute_until,
       participants: formatParticipants(t.all_participants),
@@ -123,7 +112,7 @@ function formatThreadList(data) {
       // isPinProtected: t.is_pin_protected, // feature from future? always false (2018-04-04)
       customizationEnabled: t.customization_enabled, // false for ONE_TO_ONE with Page or ReducedMessagingActor
       participantAddMode: t.participant_add_mode_as_string, // "ADD" if "GROUP" and null if "ONE_TO_ONE"
-      montageThread: t.montage_thread?Buffer.from(t.montage_thread.id,"base64").toString():null, // base64 encoded string "message_thread:0000000000000000"
+      montageThread: t.montage_thread ? Buffer.from(t.montage_thread.id, "base64").toString() : null, // base64 encoded string "message_thread:0000000000000000"
       // it is not userID nor any other ID known to me...
       // can somebody inspect it? where is it used?
       // probably Messenger Day uses it
@@ -134,13 +123,13 @@ function formatThreadList(data) {
       timestamp: t.updated_time_precise, // in miliseconds
       // isCanonicalUser: t.is_canonical_neo_user, // is it always false?
       // TODO: how about putting snippet in another object? current implementation does not handle every possibile message type etc.
-      snippet: lastMessageNode?lastMessageNode.snippet:null,
-      snippetAttachments: lastMessageNode?lastMessageNode.extensible_attachment:null, // TODO: not sure if it works
-      snippetSender: lastMessageNode?utils.formatID((lastMessageNode.message_sender.messaging_actor.id || "").toString()):null,
-      lastMessageTimestamp: lastMessageNode?lastMessageNode.timestamp_precise:null, // timestamp in miliseconds
-      lastReadTimestamp: (t.last_read_receipt&&t.last_read_receipt.nodes.length>0)
-                         ? (t.last_read_receipt.nodes[0]?t.last_read_receipt.nodes[0].timestamp_precise:null)
-                         : null, // timestamp in miliseconds
+      snippet: lastMessageNode ? lastMessageNode.snippet : null,
+      snippetAttachments: lastMessageNode ? lastMessageNode.extensible_attachment : null, // TODO: not sure if it works
+      snippetSender: lastMessageNode ? utils.formatID((lastMessageNode.message_sender.messaging_actor.id || "").toString()) : null,
+      lastMessageTimestamp: lastMessageNode ? lastMessageNode.timestamp_precise : null, // timestamp in miliseconds
+      lastReadTimestamp: (t.last_read_receipt && t.last_read_receipt.nodes.length > 0)
+        ? (t.last_read_receipt.nodes[0] ? t.last_read_receipt.nodes[0].timestamp_precise : null)
+        : null, // timestamp in miliseconds
       cannotReplyReason: t.cannot_reply_reason, // TODO: inspect possible values
       approvalMode: Boolean(t.approval_mode),
 
@@ -151,28 +140,21 @@ function formatThreadList(data) {
   });
 }
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function getThreadList(limit, timestamp, tags, callback) {
     if (!callback && (utils.getType(tags) === "Function" || utils.getType(tags) === "AsyncFunction")) {
       callback = tags;
       tags = [""];
     }
-    if (utils.getType(limit) !== "Number" || !Number.isInteger(limit) || limit <= 0) {
-      throw {error: "getThreadList: limit must be a positive integer"};
-    }
-    if (utils.getType(timestamp) !== "Null" &&
-       (utils.getType(timestamp) !== "Number" || !Number.isInteger(timestamp))) {
-      throw {error: "getThreadList: timestamp must be an integer or null"};
-    }
-    if (utils.getType(tags) === "String") {
-      tags = [tags];
-    }
-    if (utils.getType(tags) !== "Array") {
-      throw {error: "getThreadList: tags must be an array"};
-    }
+    if (utils.getType(limit) !== "Number" || !Number.isInteger(limit) || limit <= 0) throw { error: "getThreadList: limit must be a positive integer" };
+
+    if (utils.getType(timestamp) !== "Null" && (utils.getType(timestamp) !== "Number" || !Number.isInteger(timestamp))) throw { error: "getThreadList: timestamp must be an integer or null" };
+
+    if (utils.getType(tags) === "String") tags = [tags];
+    if (utils.getType(tags) !== "Array") throw { error: "getThreadList: tags must be an array" };
 
-    var resolveFunc = function(){};
-    var rejectFunc = function(){};
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
     var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
@@ -180,9 +162,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     if (utils.getType(callback) !== "Function" && utils.getType(callback) !== "AsyncFunction") {
       callback = function (err, data) {
-        if (err) {
-          return rejectFunc(err);
-        }
+        if (err) return rejectFunc(err);
         resolveFunc(data);
       };
     }
@@ -194,7 +174,7 @@ module.exports = function(defaultFuncs, api, ctx) {
           // This doc_id was valid on 2020-07-20
           "doc_id": "3336396659757871",
           "query_params": {
-            "limit": limit+(timestamp?1:0),
+            "limit": limit + (timestamp ? 1 : 0),
             "before": timestamp,
             "tags": tags,
             "includeDeliveryReceipts": true,
@@ -209,13 +189,9 @@ module.exports = function(defaultFuncs, api, ctx) {
       .post("https://www.facebook.com/api/graphqlbatch/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
       .then((resData) => {
-        if (resData[resData.length - 1].error_results > 0) {
-          throw resData[0].o0.errors;
-        }
+        if (resData[resData.length - 1].error_results > 0) throw resData[0].o0.errors;
 
-        if (resData[resData.length - 1].successful_results === 0) {
-          throw {error: "getThreadList: there was no successful_results", res: resData};
-        }
+        if (resData[resData.length - 1].successful_results === 0) throw { error: "getThreadList: there was no successful_results", res: resData };
 
         // When we ask for threads using timestamp from the previous request,
         // we are getting the last thread repeated as the first thread in this response.
@@ -223,13 +199,12 @@ module.exports = function(defaultFuncs, api, ctx) {
         // It is also the reason for increasing limit by 1 when timestamp is set
         // this way user asks for 10 threads, we are asking for 11,
         // but after removing the duplicated one, it is again 10
-        if (timestamp) {
-          resData[0].o0.data.viewer.message_threads.nodes.shift();
-        }
+        if (timestamp) resData[0].o0.data.viewer.message_threads.nodes.shift();
+
         callback(null, formatThreadList(resData[0].o0.data.viewer.message_threads.nodes));
       })
       .catch((err) => {
-        log.error("getThreadList", err);
+        log.error("getThreadList", "ParseAndCheckLogin got status code: 404. Bailing out of trying to parse response.");
         return callback(err);
       });
 

package/src/getThreadListDeprecated.js

@@ -0,0 +1,46 @@
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function (defaultFuncs, api, ctx) {
+  return function getThreadList(start, end, type, callback) {
+    if (utils.getType(callback) === "Undefined") {
+      if (utils.getType(end) !== "Number") throw { error: "Please pass a number as a second argument." };
+      else if (utils.getType(type) === "Function" || utils.getType(type) === "AsyncFunction") {
+        callback = type;
+        type = "inbox"; //default to inbox
+      }
+      else if (utils.getType(type) !== "String") throw { error: "Please pass a String as a third argument. Your options are: inbox, pending, and archived" };
+      else throw { error: "getThreadList: need callback" };
+    }
+
+    if (type === "archived") type = "action:archived";
+    else if (type !== "inbox" && type !== "pending" && type !== "other") throw { error: "type can only be one of the following: inbox, pending, archived, other" };
+
+
+    if (end <= start) end = start + 20;
+
+    var form = {
+      client: "mercury"
+    };
+
+    form[type + "[offset]"] = start;
+    form[type + "[limit]"] = end - start;
+
+    if (ctx.globalOptions.pageID) form.request_user_id = ctx.globalOptions.pageID;
+
+    defaultFuncs
+      .post("https://www.facebook.com/ajax/mercury/threadlist_info.php", ctx.jar, form)
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(function (resData) {
+        if (resData.error) throw resData;
+        log.verbose("getThreadList", JSON.stringify(resData.payload.threads));
+        return callback(null, (resData.payload.threads || []).map(utils.formatThread));
+      })
+      .catch(function (err) {
+        log.error("getThreadList", err);
+        return callback(err);
+      });
+  };
+};

package/src/getThreadPictures.js

@@ -0,0 +1,59 @@
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function (defaultFuncs, api, ctx) {
+  return function getThreadPictures(threadID, offset, limit, 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 = {
+      thread_id: threadID,
+      offset: offset,
+      limit: limit
+    };
+
+    defaultFuncs
+      .post("https://www.facebook.com/ajax/messaging/attachments/sharedphotos.php", ctx.jar, form)
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(function (resData) {
+        if (resData.error) throw resData;
+        return Promise.all(
+          resData.payload.imagesData.map(function (image) {
+            form = {
+              thread_id: threadID,
+              image_id: image.fbid
+            };
+            return defaultFuncs
+              .post("https://www.facebook.com/ajax/messaging/attachments/sharedphotos.php", ctx.jar, form)
+              .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+              .then(function (resData) {
+                if (resData.error) throw resData;
+                // the response is pretty messy
+                var queryThreadID = resData.jsmods.require[0][3][1].query_metadata.query_path[0].message_thread;
+                var imageData = resData.jsmods.require[0][3][1].query_results[queryThreadID].message_images.edges[0].node.image2;
+                return imageData;
+              });
+          })
+        );
+      })
+      .then(resData => callback(null, resData))
+      .catch(function (err) {
+        log.error("Error in getThreadPictures", err);
+        callback(err);
+      });
+    return returnPromise;
+  };
+};

package/{leiamnash → src}/getUserID.js

@@ -17,21 +17,19 @@ function formatData(data) {
   };
 }
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function getUserID(name, 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, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
 
@@ -47,16 +45,13 @@ module.exports = function(defaultFuncs, api, ctx) {
     defaultFuncs
       .get("https://www.facebook.com/ajax/typeahead/search.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;
 
         var data = resData.payload.entries;
-
         callback(null, data.map(formatData));
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("getUserID", err);
         return callback(err);
       });

package/{leiamnash → src}/getUserInfo.js

@@ -27,43 +27,37 @@ function formatData(data) {
   return retObj;
 }
 
-module.exports = function(defaultFuncs, api, ctx) {
+module.exports = function (defaultFuncs, api, ctx) {
   return function getUserInfo(id, 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, userInfo) {
+        if (err) return rejectFunc(err);
+        resolveFunc(userInfo);
       };
     }
 
-    if (utils.getType(id) !== "Array") {
-      id = [id];
-    }
+    if (utils.getType(id) !== "Array") id = [id];
 
     var form = {};
-    id.map(function(v, i) {
+    id.map(function (v, i) {
       form["ids[" + i + "]"] = v;
     });
     defaultFuncs
       .post("https://www.facebook.com/chat/user_info/", 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(null, formatData(resData.payload.profiles));
       })
-      .catch(function(err) {
-        log.error("getUserInfo", err);
+      .catch(function (err) {
+        log.error("getUserInfo", "Can't get user info");
         return callback(err);
       });