fca-smart-shankar 12.0.0 → 13.0.0

package/src/changeGroupImage.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   function handleUpload(image, callback) {
@@ -36,7 +36,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, resData);
       })
       .catch(function (err) {
-        console.error("handleUpload", err);
+        log.error("handleUpload", err);
         return callback(err);
       });
   }
@@ -74,7 +74,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     const form = {
       client: "mercury",
       action_type: "ma-type:log-message",
-      author: "fbid:" + (ctx.userID),
+      author: "fbid:" + (ctx.i_userID || ctx.userID),
       author_email: "",
       ephemeral_ttl_mode: "0",
       is_filtered_content: false,
@@ -125,7 +125,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           return callback();
         })
         .catch(function (err) {
-          console.error("changeGroupImage", err);
+          log.error("changeGroupImage", err);
           return callback(err);
         });
     });

package/src/changeName.js

@@ -27,7 +27,7 @@ module.exports = function (defaultFuncs, api, ctx) {
 
     var { first_name, middle_name, last_name } = input;
     if (!first_name || !last_name) {
-      console.error('changeName', 'name is not be accepted');
+      log.error('changeName', 'name is not be accepted');
       return cb('name is not be accepted');
     }
 
@@ -70,7 +70,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return cb();
       })
       .catch(function (err) {
-        console.error('changeName', err);
+        log.error('changeName', err);
         return cb(err);
       });
 

package/src/changeNickname.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function changeNickname(nickname, threadID, participantID, callback) {
@@ -50,7 +50,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("changeNickname", err);
+        log.error("changeNickname", err);
         return callback(err);
       });
 

package/src/changeThreadColor.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function changeThreadColor(color, threadID, callback) {
@@ -34,7 +34,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           doc_id: "1727493033983591",
           query_params: {
             data: {
-              actor_id: ctx.userID,
+              actor_id: ctx.i_userID || ctx.userID,
               client_mutation_id: "0",
               source: "SETTINGS",
               theme_id: validatedColor,
@@ -56,7 +56,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("changeThreadColor", err);
+        log.error("changeThreadColor", err);
         return callback(err);
       });
 

package/src/changeThreadEmoji.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function changeThreadEmoji(emoji, threadID, callback) {
@@ -46,7 +46,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("changeThreadEmoji", err);
+        log.error("changeThreadEmoji", err);
         return callback(err);
       });
 

package/src/changeUsername.js

@@ -12,13 +12,13 @@ module.exports = function (defaultFuncs, api, ctx) {
 
     if (typeof username == 'function') {
      var error = 'username must be a string, and not ' + utils.getType(username);
-      console.error('changeUsername', error);
+      log.error('changeUsername', error);
       return username(error);
     }
     if (typeof callback == 'function') cb = callback;
     if (typeof username != 'string') {
       var error = 'username must be a string, and not ' + utils.getType(username);
-      console.error('changeUsername', error);
+      log.error('changeUsername', error);
       return cb(error);
     }
 
@@ -50,7 +50,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return cb();
       })
       .catch(function (err) {
-        console.error('changeUsername', err);
+        log.error('changeUsername', err);
         return cb(err);
       });
     

package/src/createCommentPost.js

@@ -135,12 +135,12 @@ module.exports = function (defaultFuncs, api, ctx) {
 
     if (typeof msg == 'function') {
       var error = 'Message must be a string or object!!';
-      console.error('createCommentPost', error);
+      log.error('createCommentPost', error);
       return msg(error);
     }
     if (typeof postID == 'function') {
       var error = 'postID must be a string!!';
-      console.error('createCommentPost', error);
+      log.error('createCommentPost', error);
       return postID(error);
     }
     if (typeof callback == 'string') {
@@ -167,12 +167,12 @@ module.exports = function (defaultFuncs, api, ctx) {
       msg.body ? typeof msg.body == 'object' ? msg.body = JSON.stringify(msg.body) : null : msg.body = '';
     } else {
       var error = 'Message must be a string or object!!';
-      console.error('createCommentPost', error);
+      log.error('createCommentPost', error);
       return cb(error);
     }
     if (typeof postID != 'string') {
       var error = 'postID must be a string!!';
-      console.error('createCommentPost', error);
+      log.error('createCommentPost', error);
       return cb(error);
     }
 
@@ -221,7 +221,7 @@ module.exports = function (defaultFuncs, api, ctx) {
       .then(_ => createContent(form))
       .then(info => cb(null, info))
       .catch(function (err) {
-        console.error('createCommentPost', err);
+        log.error('createCommentPost', err);
         return cb(null, err);
       })
 

package/src/createNewGroup.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function createNewGroup(participantIDs, groupTitle, callback) {
@@ -42,18 +42,18 @@ module.exports = function (defaultFuncs, api, ctx) {
         fbid: participantIDs[n],
       });
     }
-    pids.push({ fbid: ctx.userID });
+    pids.push({ fbid: ctx.i_userID || ctx.userID });
 
     const form = {
       fb_api_caller_class: "RelayModern",
       fb_api_req_friendly_name: "MessengerGroupCreateMutation",
-      av: ctx.userID,
+      av: ctx.i_userID || ctx.userID,
       //This doc_id is valid as of January 11th, 2020
       doc_id: "577041672419534",
       variables: JSON.stringify({
         input: {
           entry_point: "jewel_new_group",
-          actor_id: ctx.userID,
+          actor_id: ctx.i_userID || ctx.userID,
           participants: pids,
           client_mutation_id: Math.round(Math.random() * 1024).toString(),
           thread_settings: {
@@ -79,7 +79,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         );
       })
       .catch(function (err) {
-        console.error("createNewGroup", err);
+        log.error("createNewGroup", err);
         return callback(err);
       });
 

package/src/createPoll.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function createPoll(title, threadID, options, callback) {
@@ -62,7 +62,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("createPoll", err);
+        log.error("createPoll", err);
         return callback(err);
       });
 

package/src/createPost.js

@@ -164,7 +164,7 @@ module.exports = function (defaultFuncs, api, ctx) {
 
     if (typeof msg == 'function') {
       var error = 'Msg must be a string or object and not function';
-      console.error('createPost', error);
+      log.error('createPost', error);
       return msg(error);
     }
     if (typeof callback == 'function') cb = callback;
@@ -172,7 +172,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     var typeMsg = utils.getType(msg);
     if (!['Object', 'String'].includes(typeMsg)) {
       var error = 'Msg must be a string or object and not ' + typeMsg;
-      console.error('createPost', error);
+      log.error('createPost', error);
       return cb(error);
     } else if (typeMsg == 'String') msg = { body: msg };
     msg.allowUserID = msg.allowUserID ? !Array.isArray(msg.allowUserID) ? [msg.allowUserID] : msg.allowUserID : null;
@@ -262,12 +262,13 @@ module.exports = function (defaultFuncs, api, ctx) {
       .then(_ => handleUrl(msg, form))
       .then(_ => handleMention(msg, form))
       .then(_ => createContent(form))
-      .then((res) => {
+      .then(function (res) {
         if (res.error || res.errors) throw res;
+
         return cb(null, (res[0] || res).data.story_create.story.url);
       })
-      .catch((err) => {
-        //console.error('createPost', err);
+      .catch(function (err) {
+        log.error('createPost', err);
         return cb(err);
       });
 

package/src/deleteMessage.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function deleteMessage(messageOrMessages, callback) {
@@ -47,7 +47,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("deleteMessage", err);
+        log.error("deleteMessage", err);
         return callback(err);
       });
 

package/src/deleteThread.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function deleteThread(threadOrThreads, callback) {
@@ -47,7 +47,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("deleteThread", err);
+        log.error("deleteThread", err);
         return callback(err);
       });
 

package/src/editMessage.js

@@ -1,8 +1,11 @@
 "use_strict";
+/**
+ * @author RFS-ADRENO
+ * @rewrittenBy Isai Ivanov
+ */
+const generateOfflineThreadingId = require('../utils');
 
-const { generateOfflineThreadingID } = require('../utils');
-
-function isCallable(func) {
+function canBeCalled(func) {
   try {
     Reflect.apply(func, null, []);
     return true;
@@ -11,49 +14,58 @@ function isCallable(func) {
   }
 }
 
-module.exports = function (defaultFuncs, api, ctx) {
+/**
+ * A function for editing bot's messages.
+ * @param {string} text - The text with which the bot will edit its messages.
+ * @param {string} messageID - The message ID of the message the bot will edit.
+ * @param {Object} callback - Callback for the function.
+ */
 
+module.exports = function(defaultFuncs, api, ctx) {
   return function editMessage(text, messageID, callback) {
-
-
     if (!ctx.mqttClient) {
       throw new Error('Not connected to MQTT');
     }
+    
+    // modified and fix by kenneth panio the edit now works on secondary profile accounts
 
     ctx.wsReqNumber ??= 0;
     ctx.wsTaskNumber ??= 0;
+
     ctx.wsReqNumber += 1;
     ctx.wsTaskNumber += 1;
 
-    const taskPayload = {
+    const queryPayload = {
       message_id: messageID,
       text: text,
     };
 
-    const task = {
+    const query = {
       failure_count: null,
       label: '742',
-      payload: JSON.stringify(taskPayload),
+      payload: JSON.stringify(queryPayload),
       queue_name: 'edit_message',
       task_id: ctx.wsTaskNumber,
     };
 
-    const content = {
+    const context = {
       app_id: '2220391788200892',
       payload: {
         data_trace_id: null,
-        epoch_id: parseInt(generateOfflineThreadingID()),
-        tasks: [],
+        epoch_id: parseInt(generateOfflineThreadingId),
+        tasks: [query],
         version_id: '6903494529735864',
       },
       request_id: ctx.wsReqNumber,
       type: 3,
     };
 
-    content.payload.tasks.push(task);
-    content.payload = JSON.stringify(content.payload);
+    context.payload = JSON.stringify(context.payload);
 
-  /* if (isCallable(callback)) ctx.reqCallbacks[ctx.wsReqNumber] = callback; */
-   ctx.mqttClient.publish('/ls_req', JSON.stringify(content), { qos: 1, retain: false });
-  };
-}
+    if (canBeCalled(callback)) {
+      ctx.reqCallbacks[ctx.wsReqNumber] = callback;
+    }
+
+    ctx.mqttClient.publish('/ls_req', JSON.stringify(context), { qos: 1, retain: false });
+  }
+}

package/src/follow.js

@@ -7,18 +7,18 @@
  * Example:
  * api.follow("100090794779367", true); // Set true to follow, false if otherwise.
  */
- 
- //Fixed by Neth
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function follow(senderID, boolean, callback) {
-    /*if (!ctx.mqttClient) {
+    if (!ctx.mqttClient) {
       throw new Error("Not connected to MQTT");
-    }*/
+    }
+
     let form;
+
     if (boolean) {
       form = {
-        av: ctx.userID,
+        av: ctx.userID || ctx.i_userID,
         fb_api_req_friendly_name: "CometUserFollowMutation",
         fb_api_caller_class: "RelayModern",
         doc_id: "25472099855769847",
@@ -30,7 +30,7 @@ module.exports = function (defaultFuncs, api, ctx) {
             subscribe_location: "PROFILE",
             subscribee_id: senderID,
             tracking: null,
-            actor_id: ctx.userID,
+            actor_id: ctx.userID || ctx.i_userID,
             client_mutation_id: "1",
           },
           scale: 1,
@@ -38,7 +38,7 @@ module.exports = function (defaultFuncs, api, ctx) {
       };
     } else {
       form = {
-        av: ctx.userID,
+        av: ctx.userID || ctx.i_userID,
         fb_api_req_friendly_name: "CometUserUnfollowMutation",
         fb_api_caller_class: "RelayModern",
         doc_id: "25472099855769847",
@@ -51,7 +51,7 @@ module.exports = function (defaultFuncs, api, ctx) {
             subscribe_location: "PROFILE",
             tracking: null,
             unsubscribee_id: senderID,
-            actor_id: ctx.userID,
+            actor_id: ctx.userID || ctx.i_userID,
             client_mutation_id: "10",
           },
           scale: 1,

package/src/forwardAttachment.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function forwardAttachment(attachmentID, userOrUsers, callback) {
@@ -51,7 +51,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("forwardAttachment", err);
+        log.error("forwardAttachment", err);
         return callback(err);
       });
 

package/src/getAccess.js

@@ -83,7 +83,7 @@ module.exports = function (defaultFuncs, api, ctx) {
                   return pCb(null, res[1][1]);
                 })
                 .catch(function (err) {
-                  console.error('getAccess', err.error || err);
+                  log.error('getAccess', err.error || err);
                   return pCb(err);
                 });
     
@@ -103,7 +103,7 @@ module.exports = function (defaultFuncs, api, ctx) {
             }
         })
         .catch(function (err) {
-          console.error('getAccess', typeof callback == 'function' ? (err.error || err) : err);
+          log.error('getAccess', typeof callback == 'function' ? (err.error || err) : err);
           return cb(err);
         });
 

package/src/getAvatarUser.js

@@ -60,7 +60,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     if (!Array.isArray(userIDs)) userIDs = [userIDs];
     var [height, width] = size;
     if (!ctx.access_token) {
-      console.error('getAvatarUser', 'Cant get access_token');
+      log.error('getAvatarUser', 'Cant get access_token');
       return cb('Cant get access_token');
     };
     
@@ -69,7 +69,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return cb(null, res);
       })
       .catch(function (err) {
-        console.error('getAvatarUser', err);
+        log.error('getAvatarUser', err);
         return cb(err);
       });
 

package/src/getCurrentUserID.js

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

package/src/getFriendsList.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 // [almost] copy pasted from one of FB's minified file (GenderConst)
 const GENDERS = {
@@ -61,7 +61,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         "https://www.facebook.com/chat/user_info_all",
         ctx.jar,
         {},
-        { viewer: ctx.userID },
+        { viewer: ctx.i_userID || ctx.userID },
       )
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
       .then(function (resData) {
@@ -74,7 +74,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, formatData(resData.payload));
       })
       .catch(function (err) {
-        console.error("getFriendsList", err);
+        log.error("getFriendsList", err);
         return callback(err);
       });
 

package/src/getMessage.js

@@ -6,7 +6,7 @@
  */
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 function formatMessage(threadID, data) {
   switch (data.__typename) {
@@ -294,7 +294,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         }
       })
       .catch((err) => {
-        console.error("getMessage", err);
+        log.error("getMessage", err);
         callback(err);
       });
 

package/src/getThreadHistory.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 function getExtension(original_extension, filename = "") {
   if (original_extension) {
@@ -671,7 +671,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, formatMessagesGraphQLResponse(resData[0]));
       })
       .catch(function (err) {
-        console.error("getThreadHistoryGraphQL", err);
+        log.error("getThreadHistoryGraphQL", err);
         return callback(err);
       });
 

package/src/getThreadHistoryDeprecated.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function getThreadHistory(threadID, amount, timestamp, callback) {
@@ -84,7 +84,7 @@ module.exports = function(defaultFuncs, api, ctx) {
           });
         })
         .catch(function(err) {
-          console.error("getThreadHistory", err);
+          log.error("getThreadHistory", err);
           return callback(err);
         });
     });

package/src/getThreadInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 function formatEventReminders(reminder) {
   return {

package/src/getThreadInfoDeprecated.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function getThreadInfo(threadID, callback) {
@@ -71,7 +71,7 @@ module.exports = function(defaultFuncs, api, ctx) {
           callback(null, utils.formatThread(threadData));
         })
         .catch(function(err) {
-          console.error("getThreadInfo", err);
+          log.error("getThreadInfo", err);
           return callback(err);
         });
     });

package/src/getThreadList.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 function formatEventReminders(reminder) {
   return {
@@ -213,7 +213,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     }
 
     const form = {
-      av: ctx.userID,
+      av: ctx.i_userID || ctx.userID,
       queries: JSON.stringify({
         o0: {
           // This doc_id was valid on 2020-07-20
@@ -261,7 +261,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         );
       })
       .catch((err) => {
-        console.error("getThreadList", err);
+        log.error("getThreadList", err);
         return callback(err);
       });