alicezetion 1.0.0 → 1.0.2

package/alice/{forward.js → forwardAttachment.js}

@@ -3,10 +3,21 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function forwardAttachment(attachmentID, userOrUsers, 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) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc();
+      };
     }
 
     var form = {
@@ -37,11 +48,13 @@ module.exports = function(defaultFuncs, bot, ctx) {
           throw resData;
         }
 
-        return callback(null);
+        return callback();
       })
       .catch(function(err) {
         log.error("forwardAttachment", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{id.js → getCurrentUserID.js}

@@ -1,6 +1,6 @@
 "use strict";
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function getCurrentUserID() {
     return ctx.userID;
   };

package/alice/{friend.js → getFriendsList.js}

@@ -1,6 +1,6 @@
 "use strict";
 
-var cheerio = require("cheerio");
+//var cheerio = require("cheerio");
 var utils = require("../utils");
 var log = require("npmlog");
 
@@ -39,10 +39,22 @@ function formatData(obj) {
   });
 }
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function getFriendsList(callback) {
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
     if (!callback) {
-      throw { error: "getFriendsList: need callback" };
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     defaultFuncs
@@ -66,5 +78,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("getFriendsList", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{history.js → getThreadHistory.js}

@@ -103,7 +103,6 @@ function formatAttachmentsGraphQLResponse(attachment) {
         duration: attachment.playable_duration_in_ms,
         videoType: attachment.video_type.toLowerCase()
       };
-      break;
     case "MessageFile":
       return {
         type: "file",
@@ -364,14 +363,14 @@ function formatMessagesGraphQLResponse(data) {
         // Give priority to stickers. They're seen as normal messages but we've
         // been considering them as attachments.
         var maybeStickerAttachment;
-        if (d.sticker && d.sticker.pack) {
+        if (d.sticker) {
           maybeStickerAttachment = [
             {
               type: "sticker",
               ID: d.sticker.id,
               url: d.sticker.url,
 
-              packID: d.sticker.pack ? d.sticker.pack.id : null,
+              packID: d.sticker.pack.id,
               spriteUrl: d.sticker.sprite_image,
               spriteUrl2x: d.sticker.sprite_image_2x,
               width: d.sticker.width,
@@ -578,15 +577,27 @@ function formatMessagesGraphQLResponse(data) {
   return messages;
 }
 
-module.exports = function(defaultFuncs, bot, ctx) {
+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;
+    });
+
     if (!callback) {
-      throw { error: "getThreadHistoryGraphQL: need callback" };
+      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
@@ -619,7 +630,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         // failure one.
         // @TODO What do we do in this case?
         if (resData[resData.length - 1].error_results !== 0) {
-          throw new Error("well darn there was an error_result");
+          throw new Error("There was an error_result.");
         }
 
         callback(null, formatMessagesGraphQLResponse(resData[0]));
@@ -628,5 +639,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("getThreadHistoryGraphQL", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{gchistorydeprecated.js → getThreadHistoryDeprecated.js}

@@ -3,8 +3,24 @@
 var utils = require("../utils");
 var log = require("npmlog");
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function getThreadHistory(threadID, amount, timestamp, 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 (!callback) {
       throw { error: "getThreadHistory: need callback" };
     }
@@ -72,5 +88,6 @@ module.exports = function(defaultFuncs, bot, ctx) {
           return callback(err);
         });
     });
+    return returnPromise;
   };
 };

package/alice/{gcinfo.js → getThreadInfo.js}

@@ -31,7 +31,12 @@ function formatEventReminders(reminder) {
 }
 
 function formatThreadGraphQLResponse(data) {
-  var messageThread = data.o0.data.message_thread;
+  try{
+    var messageThread = data.o0.data.message_thread;
+  } catch (err){
+    console.error("GetThreadInfoGraphQL", "Can't get this thread info!");
+    return {err: err};
+  }
   var threadID = messageThread.thread_key.thread_fbid
     ? messageThread.thread_key.thread_fbid
     : messageThread.thread_key.other_user_id;
@@ -57,9 +62,19 @@ function formatThreadGraphQLResponse(data) {
   return {
     threadID: threadID,
     threadName: messageThread.name,
-    participantIDs: messageThread.all_participants.nodes.map(function(d) {
-      return d.messaging_actor.id;
-    }),
+    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,
@@ -92,9 +107,15 @@ function formatThreadGraphQLResponse(data) {
           )
         : {},
     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
-    topEmojis: messageThread.top_emojis,
     reactionsMuteMode: messageThread.reactions_mute_mode.toLowerCase(),
     mentionsMuteMode: messageThread.mentions_mute_mode.toLowerCase(),
     isPinProtected: messageThread.is_pin_protected,
@@ -122,10 +143,22 @@ function formatThreadGraphQLResponse(data) {
   };
 }
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function getThreadInfoGraphQL(threadID, callback) {
-    if (!callback) {
-      throw { error: "getThreadInfoGraphQL: need 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
@@ -133,17 +166,18 @@ module.exports = function(defaultFuncs, bot, ctx) {
     var form = {
       queries: JSON.stringify({
         o0: {
-          // This doc_id is valid as of February 1st, 2018.
-          doc_id: "1498317363570230",
+          // This doc_id is valid as of July 20th, 2020
+          doc_id: "3449967031715030",
           query_params: {
             id: threadID,
             message_limit: 0,
-            load_messages: 0,
+            load_messages: false,
             load_read_receipts: false,
             before: null
           }
         }
-      })
+      }),
+      batch_name: "MessengerGraphQLThreadFetcher"
     };
 
     defaultFuncs
@@ -157,7 +191,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         // failure one.
         // @TODO What do we do in this case?
         if (resData[resData.length - 1].error_results !== 0) {
-          throw new Error("well darn there was an error_result");
+          console.error("GetThreadInfo", "Well darn there was an error_result");
         }
 
         callback(null, formatThreadGraphQLResponse(resData[0]));
@@ -166,5 +200,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("getThreadInfoGraphQL", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{gcinfodeprecated.js → getThreadInfoDeprecated.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 getThreadInfo(threadID, callback) {
-    if (!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 = {
       client: "mercury"
@@ -61,5 +75,6 @@ module.exports = function(defaultFuncs, bot, ctx) {
           return callback(err);
         });
     });
+    return returnPromise;
   };
 };

package/alice/{gclist.js → getThreadList.js}

@@ -9,8 +9,8 @@ function createProfileUrl(url, username, id) {
 }
 
 function formatParticipants(participants) {
-  return participants.nodes.map((p)=>{
-    p = p.messaging_actor;
+  return participants.edges.map((p)=>{
+    p = p.node.messaging_actor;
     switch (p["__typename"]) {
       case "User":
         return {
@@ -66,7 +66,7 @@ function formatParticipants(participants) {
           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/facebook-chat-api/issues\n" + JSON.stringify(p, null, 2));
+        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));
         return {
           accountType: p["__typename"],
           userID: utils.formatID(p.id.toString()),
@@ -87,7 +87,8 @@ function formatColor(color) {
 function getThreadName(t) {
   if (t.name || t.thread_key.thread_fbid) return t.name;
 
-  for (let p of t.all_participants.nodes) {
+  for (let po of t.all_participants.edges) {
+    let p = po.node;
     if (p.messaging_actor.id === t.thread_key.other_user_id) return p.messaging_actor.name;
   }
 }
@@ -141,6 +142,7 @@ function formatThreadList(data) {
                          ? (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),
 
       // @Legacy
       participantIDs: formatParticipants(t.all_participants).map(participant => participant.userID),
@@ -149,7 +151,7 @@ function formatThreadList(data) {
   });
 }
 
-module.exports = function(defaultFuncs, bot, 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;
@@ -168,16 +170,29 @@ module.exports = function(defaultFuncs, bot, ctx) {
     if (utils.getType(tags) !== "Array") {
       throw {error: "getThreadList: tags must be an array"};
     }
+
+    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") {
-      throw {error: "getThreadList: need callback"};
+      callback = function (err, data) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(data);
+      };
     }
 
     const form = {
       "av": ctx.globalOptions.pageID,
       "queries": JSON.stringify({
         "o0": {
-          // This doc_id was valid on 2018-04-04.
-          "doc_id": "1349387578499440",
+          // This doc_id was valid on 2020-07-20
+          "doc_id": "3336396659757871",
           "query_params": {
             "limit": limit+(timestamp?1:0),
             "before": timestamp,
@@ -186,7 +201,8 @@ module.exports = function(defaultFuncs, bot, ctx) {
             "includeSeqID": false
           }
         }
-      })
+      }),
+      "batch_name": "MessengerGraphQLThreadlistFetcher"
     };
 
     defaultFuncs
@@ -216,5 +232,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("getThreadList", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{gclistdeprecated.js → getThreadListDeprecated.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 getThreadList(start, end, type, callback) {
     if (utils.getType(callback) === "Undefined") {
       if (utils.getType(end) !== "Number") {

package/alice/{gcimg.js → getThreadPictures.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 getThreadPictures(threadID, offset, limit, callback) {
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
     if (!callback) {
-      throw { error: "getThreadPictures: need callback" };
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     var form = {
@@ -62,5 +74,6 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("Error in getThreadPictures", err);
         callback(err);
       });
+    return returnPromise;
   };
 };

package/alice/{userid.js → getUserID.js}

@@ -17,10 +17,22 @@ function formatData(data) {
   };
 }
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function getUserID(name, callback) {
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
     if (!callback) {
-      throw { error: "getUserID: need callback" };
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     var form = {
@@ -48,5 +60,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("getUserID", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/{userinfo.js → getUserInfo.js}

@@ -7,6 +7,7 @@ function formatData(data) {
   var retObj = {};
 
   for (var prop in data) {
+    // eslint-disable-next-line no-prototype-builtins
     if (data.hasOwnProperty(prop)) {
       var innerObj = data[prop];
       retObj[prop] = {
@@ -18,7 +19,7 @@ function formatData(data) {
         gender: innerObj.gender,
         type: innerObj.type,
         isFriend: innerObj.is_friend,
-        isBirthday: !!innerObj.is_birthday
+        isBirthday: innerObj.is_birthday
       };
     }
   }
@@ -26,10 +27,22 @@ function formatData(data) {
   return retObj;
 }
 
-module.exports = function(defaultFuncs, bot, ctx) {
+module.exports = function(defaultFuncs, api, ctx) {
   return function getUserInfo(id, callback) {
+    var resolveFunc = function(){};
+    var rejectFunc = function(){};
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+
     if (!callback) {
-      throw { error: "getUserInfo: need callback" };
+      callback = function (err, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
     }
 
     if (utils.getType(id) !== "Array") {
@@ -53,5 +66,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("getUserInfo", err);
         return callback(err);
       });
+
+    return returnPromise;
   };
 };

package/alice/handleFriendRequest.js

@@ -0,0 +1,61 @@
+"use strict";
+
+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, friendList) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc(friendList);
+      };
+    }
+
+    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/alice/{msgrequest.js → handleMessageRequest.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 handleMessageRequest(threadID, accept, callback) {
     if (utils.getType(accept) !== "Boolean") {
       throw {
@@ -11,8 +11,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 = {
@@ -47,5 +59,7 @@ module.exports = function(defaultFuncs, bot, ctx) {
         log.error("handleMessageRequest", err);
         return callback(err);
       });
+      
+    return returnPromise;
   };
 };