fca-priyansh 19.0.1 → 20.0.0

package/src/sendMqttMessage.js

@@ -1,71 +1,71 @@
-/* eslint-disable linebreak-style */
-"use strict";
-
-var utils = require("../utils");
-
-module.exports = function (defaultFuncs, api, ctx) {
-	return function(text, threadID, messageID ,callback) {
-		var resolveFunc = function () { };
-		var rejectFunc = function () { };
-
-		var returnPromise = new Promise(function (resolve, reject) {
-			resolveFunc = resolve;
-			rejectFunc = reject;
-		});
-
-        if (!callback && utils.getType(messageID) === "AsyncFunction" || !callback && utils.getType(messageID) === "Function") messageID = callback;
-		
-        if (!callback) {
-			callback = function (err, data) {
-				if (err) return rejectFunc(err);
-				resolveFunc(data);
-			};
-		}
-
-        const Payload = {
-            thread_id: threadID,
-            otid: utils.generateOfflineThreadingID(),
-            source: 524289,
-            send_type: 1,
-            sync_group: 1,
-            mark_thread_read: 0,
-            text: text || "test",
-            initiating_source: 0
-        };
-
-        if (messageID != undefined || messageID != null) Payload.reply_metadata = {
-            reply_source_id: messageID,
-            reply_source_type: 1,
-            reply_type: 0
-        };
-
-        const Form = JSON.stringify({
-            app_id: "2220391788200892",
-            payload: JSON.stringify({
-                tasks: [{
-                        label: 46,
-                        payload: JSON.stringify(Payload),
-                        queue_name: threadID,
-                        task_id: Math.random() * 1001 << 0,
-                        failure_count: null,
-                }],
-                epoch_id: utils.generateOfflineThreadingID(),
-                version_id: '7553237234719461',
-
-            }),
-            request_id: ++ctx.req_ID,
-            type: 3
-        });
-
-		ctx.mqttClient.publish('/ls_req', Form,{
-            qos: 1,
-            retain: false,
-        });
-        ctx.callback_Task[ctx.req_ID] = new Object({
-            callback,
-            type: "sendMqttMessage"
-        });
-        
-		return returnPromise;
-	};
+/* eslint-disable linebreak-style */
+"use strict";
+
+var utils = require("../utils");
+
+module.exports = function (defaultFuncs, api, ctx) {
+	return function(text, threadID, messageID ,callback) {
+		var resolveFunc = function () { };
+		var rejectFunc = function () { };
+
+		var returnPromise = new Promise(function (resolve, reject) {
+			resolveFunc = resolve;
+			rejectFunc = reject;
+		});
+
+        if (!callback && utils.getType(messageID) === "AsyncFunction" || !callback && utils.getType(messageID) === "Function") messageID = callback;
+		
+        if (!callback) {
+			callback = function (err, data) {
+				if (err) return rejectFunc(err);
+				resolveFunc(data);
+			};
+		}
+
+        const Payload = {
+            thread_id: threadID,
+            otid: utils.generateOfflineThreadingID(),
+            source: 524289,
+            send_type: 1,
+            sync_group: 1,
+            mark_thread_read: 0,
+            text: text || "test",
+            initiating_source: 0
+        };
+
+        if (messageID != undefined || messageID != null) Payload.reply_metadata = {
+            reply_source_id: messageID,
+            reply_source_type: 1,
+            reply_type: 0
+        };
+
+        const Form = JSON.stringify({
+            app_id: "2220391788200892",
+            payload: JSON.stringify({
+                tasks: [{
+                        label: 46,
+                        payload: JSON.stringify(Payload),
+                        queue_name: threadID,
+                        task_id: Math.random() * 1001 << 0,
+                        failure_count: null,
+                }],
+                epoch_id: utils.generateOfflineThreadingID(),
+                version_id: '7553237234719461',
+
+            }),
+            request_id: ++ctx.req_ID,
+            type: 3
+        });
+
+		ctx.mqttClient.publish('/ls_req', Form,{
+            qos: 1,
+            retain: false,
+        });
+        ctx.callback_Task[ctx.req_ID] = new Object({
+            callback,
+            type: "sendMqttMessage"
+        });
+        
+		return returnPromise;
+	};
 };

package/src/sendTypingIndicator.js

@@ -1,80 +1,79 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-  function makeTypingIndicator(typ, threadID, callback, isGroup) {
-    var form = {
-      typ: +typ,
-      to: "",
-      source: "mercury-chat",
-      thread: threadID
-    };
-
-    // Check if thread is a single person chat or a group chat
-    // More info on this is in api.sendMessage
-    if (utils.getType(isGroup) == "Boolean") {
-      if (!isGroup) {
-        form.to = threadID;
-      }
-      defaultFuncs
-        .post("https://www.facebook.com/ajax/messaging/typ.php", ctx.jar, form)
-        .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-        .then(function (resData) {
-          if (resData.error) throw resData;
-          return callback();
-        })
-        .catch(function (err) {
-          log.error("sendTypingIndicator", err);
-          if (utils.getType(err) == "Object" && err.error === "Not logged in") {
-            ctx.loggedIn = false;
-          }
-          return callback(err);
-        });
-    }
-    else {
-      api.getUserInfo(threadID, function (err, res) {
-        if (err) return callback(err);
-        // If id is single person chat
-        if (Object.keys(res).length > 0) form.to = threadID;
-        defaultFuncs
-          .post("https://www.facebook.com/ajax/messaging/typ.php", ctx.jar, form)
-          .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-          .then(function (resData) {
-            if (resData.error) throw resData;
-            return callback();
-          })
-          .catch(function (err) {
-            log.error("sendTypingIndicator", err);
-            if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
-            return callback(err);
-          });
-      });
-    }
-  }
-
-  return function sendTypingIndicator(threadID, callback, isGroup) {
-    if (
-      utils.getType(callback) !== "Function" &&
-      utils.getType(callback) !== "AsyncFunction"
-    ) {
-      if (callback) log.warn("sendTypingIndicator", "callback is not a function - ignoring.");
-      callback = () => { };
-    }
-
-    makeTypingIndicator(true, threadID, callback, isGroup);
-
-    return function end(cb) {
-      if (
-        utils.getType(cb) !== "Function" &&
-        utils.getType(cb) !== "AsyncFunction"
-      ) {
-        if (cb) log.warn("sendTypingIndicator", "callback is not a function - ignoring.");
-        cb = () => { };
-      }
-
-      makeTypingIndicator(false, threadID, cb, isGroup);
-    };
-  };
-};
+
+"use strict";
+
+// const utils = require('../../../utils');
+
+/**
+ * @param {Object} defaultFuncs
+ * @param {Object} api
+ * @param {Object} ctx
+ */
+module.exports = function (defaultFuncs, api, ctx) {
+	/**
+	 * Sends a typing indicator to a specific thread.
+	 * @param {boolean|string} sendTyping - True to show typing indicator, false to hide, or threadID if only one parameter.
+	 * @param {string} [threadID] - The ID of the thread to send the typing indicator to.
+	 * @param {Function} [callback] - An optional callback function.
+	 * @returns {Promise<void>}
+	 */
+	return async function sendTypingIndicatorV2(sendTyping, threadID, callback) {
+		// Handle flexible parameter calling:
+		// api.sendTypingIndicator(threadID) -> show typing
+		// api.sendTypingIndicator(true/false, threadID) -> control typing
+		let actualThreadID;
+		let actualSendTyping;
+		
+		if (typeof sendTyping === 'string' || typeof sendTyping === 'number') {
+			// Called with just threadID: sendTypingIndicator(threadID)
+			actualThreadID = sendTyping;
+			actualSendTyping = true; // Default to showing typing
+			// threadID parameter becomes callback
+			if (typeof threadID === 'function') {
+				callback = threadID;
+			}
+		} else {
+			// Called with both parameters: sendTypingIndicator(boolean, threadID)
+			actualSendTyping = sendTyping;
+			actualThreadID = threadID;
+		}
+		
+		// Validate threadID
+		if (!actualThreadID) {
+			const error = new Error('sendTypingIndicator: threadID is required');
+			if (callback) {
+				return callback(error);
+			}
+			throw error;
+		}
+		
+		let count_req = 0;
+		const wsContent = {
+			app_id: 2220391788200892,
+			payload: JSON.stringify({
+				label: 3,
+				payload: JSON.stringify({
+					thread_key: actualThreadID.toString(),
+					is_group_thread: +(actualThreadID.toString().length >= 16),
+					is_typing: +actualSendTyping,
+					attribution: 0
+				}),
+				version: 5849951561777440
+			}),
+			request_id: ++count_req,
+			type: 4
+		};
+		
+		try {
+			await new Promise((resolve, reject) => ctx.mqttClient.publish('/ls_req', JSON.stringify(wsContent), {}, (err, _packet) => err ? reject(err) : resolve()));
+			if (callback) {
+				callback();
+			}
+		} catch (error) {
+			if (callback) {
+				callback(error);
+			} else {
+				throw error;
+			}
+		}
+	};
+};

package/src/setMessageReaction.js

@@ -1,109 +1,109 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-  return function setMessageReaction(reaction, messageID, callback, forceCustomReaction) {
-    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);
-      };
-    }
-
-    switch (reaction) {
-      case "\uD83D\uDE0D": //:heart_eyes:
-      case "\uD83D\uDE06": //:laughing:
-      case "\uD83D\uDE2E": //:open_mouth:
-      case "\uD83D\uDE22": //:cry:
-      case "\uD83D\uDE20": //:angry:
-      case "\uD83D\uDC4D": //:thumbsup:
-      case "\uD83D\uDC4E": //:thumbsdown:
-      case "\u2764": //:heart:
-      case "\uD83D\uDC97": //:glowingheart:
-      case "":
-        //valid
-        break;
-      case ":heart_eyes:":
-      case ":love:":
-        reaction = "\uD83D\uDE0D";
-        break;
-      case ":laughing:":
-      case ":haha:":
-        reaction = "\uD83D\uDE06";
-        break;
-      case ":open_mouth:":
-      case ":wow:":
-        reaction = "\uD83D\uDE2E";
-        break;
-      case ":cry:":
-      case ":sad:":
-        reaction = "\uD83D\uDE22";
-        break;
-      case ":angry:":
-        reaction = "\uD83D\uDE20";
-        break;
-      case ":thumbsup:":
-      case ":like:":
-        reaction = "\uD83D\uDC4D";
-        break;
-      case ":thumbsdown:":
-      case ":dislike:":
-        reaction = "\uD83D\uDC4E";
-        break;
-      case ":heart:":
-        reaction = "\u2764";
-        break;
-      case ":glowingheart:":
-        reaction = "\uD83D\uDC97";
-        break;
-      default:
-        if (forceCustomReaction) break;
-        return callback({ error: "Reaction is not a valid emoji." });
-    }
-
-    var variables = {
-      data: {
-        client_mutation_id: ctx.clientMutationId++,
-        actor_id: ctx.userID,
-        action: reaction == "" ? "REMOVE_REACTION" : "ADD_REACTION",
-        message_id: messageID,
-        reaction: reaction
-      }
-    };
-
-    var qs = {
-      doc_id: "1491398900900362",
-      variables: JSON.stringify(variables),
-      dpr: 1
-    };
-
-    defaultFuncs
-      .postFormData(
-        "https://www.facebook.com/webgraphql/mutation/",
-        ctx.jar,
-        {},
-        qs
-      )
-      .then(utils.parseAndCheckLogin(ctx.jar, defaultFuncs))
-      .then(function (resData) {
-        if (!resData) throw { error: "setReaction returned empty object." };
-        if (resData.error) throw resData;
-        callback(null); 
-      })
-      .catch(function (err) {
-        log.error("setReaction", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+var utils = require("../utils");
+var log = require("npmlog");
+
+module.exports = function (defaultFuncs, api, ctx) {
+  return function setMessageReaction(reaction, messageID, callback, forceCustomReaction) {
+    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);
+      };
+    }
+
+    switch (reaction) {
+      case "\uD83D\uDE0D": //:heart_eyes:
+      case "\uD83D\uDE06": //:laughing:
+      case "\uD83D\uDE2E": //:open_mouth:
+      case "\uD83D\uDE22": //:cry:
+      case "\uD83D\uDE20": //:angry:
+      case "\uD83D\uDC4D": //:thumbsup:
+      case "\uD83D\uDC4E": //:thumbsdown:
+      case "\u2764": //:heart:
+      case "\uD83D\uDC97": //:glowingheart:
+      case "":
+        //valid
+        break;
+      case ":heart_eyes:":
+      case ":love:":
+        reaction = "\uD83D\uDE0D";
+        break;
+      case ":laughing:":
+      case ":haha:":
+        reaction = "\uD83D\uDE06";
+        break;
+      case ":open_mouth:":
+      case ":wow:":
+        reaction = "\uD83D\uDE2E";
+        break;
+      case ":cry:":
+      case ":sad:":
+        reaction = "\uD83D\uDE22";
+        break;
+      case ":angry:":
+        reaction = "\uD83D\uDE20";
+        break;
+      case ":thumbsup:":
+      case ":like:":
+        reaction = "\uD83D\uDC4D";
+        break;
+      case ":thumbsdown:":
+      case ":dislike:":
+        reaction = "\uD83D\uDC4E";
+        break;
+      case ":heart:":
+        reaction = "\u2764";
+        break;
+      case ":glowingheart:":
+        reaction = "\uD83D\uDC97";
+        break;
+      default:
+        if (forceCustomReaction) break;
+        return callback({ error: "Reaction is not a valid emoji." });
+    }
+
+    var variables = {
+      data: {
+        client_mutation_id: ctx.clientMutationId++,
+        actor_id: ctx.userID,
+        action: reaction == "" ? "REMOVE_REACTION" : "ADD_REACTION",
+        message_id: messageID,
+        reaction: reaction
+      }
+    };
+
+    var qs = {
+      doc_id: "1491398900900362",
+      variables: JSON.stringify(variables),
+      dpr: 1
+    };
+
+    defaultFuncs
+      .postFormData(
+        "https://www.facebook.com/webgraphql/mutation/",
+        ctx.jar,
+        {},
+        qs
+      )
+      .then(utils.parseAndCheckLogin(ctx.jar, defaultFuncs))
+      .then(function (resData) {
+        if (!resData) throw { error: "setReaction returned empty object." };
+        if (resData.error) throw resData;
+        callback(null); 
+      })
+      .catch(function (err) {
+        log.error("setReaction", err);
+        return callback(err);
+      });
+
+    return returnPromise;
+  };
+};