fca-project-orion 1.1.13 → 1.1.15

package/Main.js

@@ -5,7 +5,7 @@
 if (global.Fca.Require.FastConfig.Config != 'default') {
     //do ssth
 }
-var { setFont } = require("./font-handler");
+
 const gradient = require("gradient-string");
 const Language = global.Fca.Require.languageFile.find((/** @type {{ Language: string; }} */i) => i.Language == global.Fca.Require.FastConfig.Language).Folder.Index;
 
@@ -245,15 +245,6 @@ function setOptions(globalOptions, options) {
                         }
                         break;
                     }
-                    case "font":
-                        if (typeof options.font != "string") {
-                          delete globalOptions.font;
-                          utils.setProxy();
-                        } else {
-                           globalOptions.font = options.font;
-                          setFont(options.font);
-                        }
-                        break;
 
                     default: {
                         log.warn("setOptions", "Unrecognized option given to setOptions: " + key);

package/index.js

@@ -26,6 +26,7 @@ global.Fca = new Object({
             "Language": "en",
             "PreKey": "",
             "AutoUpdate": false,
+            "CustomFont": true,
             "MainColor": "#FFFF00",
             "MainName": "[ FCA-PROJECT-ORION ]",
             "Uptime": false,
@@ -110,7 +111,7 @@ global.Fca = new Object({
 });
 
 try {
-    let Boolean_Fca = ["AntiSendAppState","AutoUpdate","Uptime","BroadCast","EncryptFeature","AutoLogin","ResetDataLogin","Login2Fa", "DevMode","AutoInstallNode"];
+    let Boolean_Fca = ["AntiSendAppState","AutoUpdate","CustomFont","Uptime","BroadCast","EncryptFeature","AutoLogin","ResetDataLogin","Login2Fa", "DevMode","AutoInstallNode"];
     let String_Fca = ["MainName","PreKey","Language","AuthString","Config"]
     let Number_Fca = ["AutoRestartMinutes","RestartMQTT_Minutes"];
     let Object_Fca = ["HTML","Stable_Version","AntiGetInfo","Websocket_Extension"];
@@ -131,7 +132,7 @@ catch (e) {
     process.exit(1)
 }
     if (global.Fca.Require.fs.existsSync(process.cwd() + '/Orion_Database/FastConfigFca.json')) {
-        
+
         for (let i of All_Variable) {
             if (Data_Setting[i] == undefined) {
                 Data_Setting[i] = global.Fca.Data.ObjFastConfig[i];
@@ -217,11 +218,11 @@ module.exports = function(loginData, options, callback) {
     const log = require('npmlog');
     const { execSync } = require('child_process');
     const Database = require('./Extra/Database');
-    
+
     if (global.Fca.Require.FastConfig.DevMode) {
         require('./Extra/Src/Release_Memory');
     }
-    
+
     return got.get('https://raw.githubusercontent.com/ivancotacte/Global_fca-project-orion/main/InstantAction.json').then(async function(res) {
         if (global.Fca.Require.FastConfig.AutoInstallNode) {
             switch (fs.existsSync(process.cwd() + "/replit.nix") && process.env["REPL_ID"] != undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fca-project-orion",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/sendMessage.js

@@ -1,16 +1,27 @@
 "use strict";
 
 /**
- * Được Fix Hay Làm Màu Bởi: @HarryWakazaki
+ * Fixed or Colored By: @HarryWakazaki
  * 21/4/2022
+ * 
+ * Remodel By: https://www.facebook.com/icotacteeee
 */
 
 var utils = require("../utils");
 var log = require("npmlog");
-var { getFont } = require("../font-handler");
 var bluebird = require("bluebird");
 var fs = require('fs-extra');
 
+if (global.Fca.Require.FastConfig.CustomFont) {
+  var projectorion = {
+    CustomFont: true
+  }
+} else {
+  var projectorion = {
+    CustomFont: false
+  }
+}
+
 var allowedProperties = {
   attachment: true,
   url: true,
@@ -20,14 +31,13 @@ var allowedProperties = {
   body: true,
   mentions: true,
   location: true,
+  font: true
 };
 
 var AntiText = "Your criminal activity was detected while attempting to send an Appstate file";
 var Location_Stack;
 
-module.exports = function (defaultFuncs, api, ctx) {
-  //let fontS = getFont();
-  //console.log(fontS)
+module.exports = function(defaultFuncs, api, ctx) {
   let font = {
     a: "𝖺",
     b: "𝖻",
@@ -82,12 +92,12 @@ module.exports = function (defaultFuncs, api, ctx) {
     Y: "𝖸",
     Z: "𝖹",
   };
-    function replaceCharacters(inputString) {
-      const replacedString = inputString.replace(/[A-Za-z]/g, (char) => {
-        return font[char] || char;
-      });
-      return replacedString;
-    }
+  function replaceCharacters(inputString) {
+    const replacedString = inputString.replace(/[A-Za-z]/g, (char) => {
+      return font[char] || char;
+    });
+    return replacedString;
+  }
 
   function uploadAttachment(attachments, callback) {
     var uploads = [];
@@ -104,7 +114,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         defaultFuncs
           .postFormData("https://upload.facebook.com/ajax/mercury/upload.php", ctx.jar, form, {})
           .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-          .then(function (resData) {
+          .then(function(resData) {
             if (resData.error) throw resData;
             // We have to return the data unformatted unless we want to change it
             // back in sendMessage.
@@ -118,7 +128,7 @@ module.exports = function (defaultFuncs, api, ctx) {
       .all(uploads)
       .then(resData => callback(null, resData)
       )
-      .catch(function (err) {
+      .catch(function(err) {
         log.error("uploadAttachment", err);
         return callback(err);
       });
@@ -134,12 +144,12 @@ module.exports = function (defaultFuncs, api, ctx) {
     defaultFuncs
       .post("https://www.facebook.com/message_share_attachment/fromURI/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
+      .then(function(resData) {
         if (resData.error) return callback(resData);
         if (!resData.payload) return callback({ error: "Invalid url" });
         callback(null, resData.payload.share_data.share_params);
       })
-      .catch(function (err) {
+      .catch(function(err) {
         log.error("getUrl", err);
         return callback(err);
       });
@@ -182,21 +192,21 @@ module.exports = function (defaultFuncs, api, ctx) {
     if (global.Fca.Require.FastConfig.AntiSendAppState == true) {
       try {
         if (Location_Stack != undefined || Location_Stack != null) {
-          let location =  (((Location_Stack).replace("Error",'')).split('\n')[7]).split(' ');
+          let location = (((Location_Stack).replace("Error", '')).split('\n')[7]).split(' ');
           let format = {
-            Source: (location[6]).split('s:')[0].replace("(",'') + 's',
-            Line:  (location[6]).split('s:')[1].replace(")",'')
+            Source: (location[6]).split('s:')[0].replace("(", '') + 's',
+            Line: (location[6]).split('s:')[1].replace(")", '')
           };
           form.body = AntiText + "\n- Source: " + format.Source + "\n- Line: " + format.Line;
         }
       }
-      catch (e) {}
+      catch (e) { }
     }
 
     defaultFuncs
       .post("https://www.facebook.com/messaging/send/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
+      .then(function(resData) {
         Location_Stack = undefined;
         if (!resData) return callback({ error: "Send message failed." });
         if (resData.error) {
@@ -204,7 +214,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           return callback(resData);
         }
 
-        var messageInfo = resData.payload.actions.reduce(function (p, v) {
+        var messageInfo = resData.payload.actions.reduce(function(p, v) {
           return (
             {
               threadID: v.thread_fbid,
@@ -215,37 +225,37 @@ module.exports = function (defaultFuncs, api, ctx) {
         }, null);
         return callback(null, messageInfo);
       })
-      .catch(function (err) {
+      .catch(function(err) {
         log.error("sendMessage", err);
         if (utils.getType(err) == "Object" && err.error === "Not logged in.") ctx.loggedIn = false;
-        return callback(err,null);
+        return callback(err, null);
       });
-    }
+  }
 
   function send(form, threadID, messageAndOTID, callback, isGroup) {
-//Full Fix sendMessage
-  if (utils.getType(threadID) === "Array") sendContent(form, threadID, false, messageAndOTID, callback);
+    //Full Fix sendMessage
+    if (utils.getType(threadID) === "Array") sendContent(form, threadID, false, messageAndOTID, callback);
     else {
-      var THREADFIX = "ThreadID".replace("ThreadID",threadID); // i cũng đôn nâu
-        if (THREADFIX.length <= 15 || global.Fca.isUser.includes(threadID)) sendContent(form, threadID, !isGroup, messageAndOTID, callback);
-        else if (THREADFIX.length >= 15 && THREADFIX.indexOf(1) != 0 || global.Fca.isThread.includes(threadID)) sendContent(form, threadID, threadID.length === 15, messageAndOTID, callback);
+      var THREADFIX = "ThreadID".replace("ThreadID", threadID); // i cũng đôn nâu
+      if (THREADFIX.length <= 15 || global.Fca.isUser.includes(threadID)) sendContent(form, threadID, !isGroup, messageAndOTID, callback);
+      else if (THREADFIX.length >= 15 && THREADFIX.indexOf(1) != 0 || global.Fca.isThread.includes(threadID)) sendContent(form, threadID, threadID.length === 15, messageAndOTID, callback);
+      else {
+        if (global.Fca.Data.event.isGroup) {
+          sendContent(form, threadID, threadID.length === 15, messageAndOTID, callback);
+          global.Fca.isThread.push(threadID);
+        }
         else {
-          if (global.Fca.Data.event.isGroup) {
-            sendContent(form, threadID, threadID.length === 15, messageAndOTID, callback);
-            global.Fca.isThread.push(threadID);
-          } 
-          else {
-            sendContent(form, threadID, !isGroup, messageAndOTID, callback);
-            global.Fca.isUser.push(threadID);
+          sendContent(form, threadID, !isGroup, messageAndOTID, callback);
+          global.Fca.isUser.push(threadID);
         }
       }
     }
   }
-  
+
   function handleUrl(msg, form, callback, cb) {
     if (msg.url) {
       form["shareable_attachment[share_type]"] = "100";
-      getUrl(msg.url, function (err, params) {
+      getUrl(msg.url, function(err, params) {
         if (err) return callback(err);
         form["shareable_attachment[share_params]"] = params;
         cb();
@@ -313,13 +323,13 @@ module.exports = function (defaultFuncs, api, ctx) {
           }
           if (Has == true) {
             msg.attachment = [fs.createReadStream(__dirname + "/../Extra/Src/Image/checkmate.jpg")];
-          }    
+          }
         }
-        catch (e) {}
+        catch (e) { }
       }
-      uploadAttachment(msg.attachment, function (err, files) {
-      if (err) return callback(err);
-        files.forEach(function (file) {
+      uploadAttachment(msg.attachment, function(err, files) {
+        if (err) return callback(err);
+        files.forEach(function(file) {
           var key = Object.keys(file);
           var type = key[0]; // image_id, file_id, etc
           form["" + type + "s"].push(file[type]); // push the id
@@ -357,18 +367,18 @@ module.exports = function (defaultFuncs, api, ctx) {
     if (!callback && (utils.getType(threadID) === "Function" || utils.getType(threadID) === "AsyncFunction")) return threadID({ error: "Pass a threadID as a second argument." });
     if (!replyToMessage && utils.getType(callback) === "String") {
       replyToMessage = callback;
-      callback = function () { };
+      callback = function() { };
     }
 
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-    var returnPromise = new Promise(function (resolve, reject) {
+    var resolveFunc = function() { };
+    var rejectFunc = function() { };
+    var returnPromise = new Promise(function(resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
 
     if (!callback) {
-      callback = function (err, data) {
+      callback = function(err, data) {
         if (err) return rejectFunc(err);
         resolveFunc(data);
       };
@@ -410,7 +420,7 @@ module.exports = function (defaultFuncs, api, ctx) {
       is_spoof_warning: false,
       source: "source:chat:web",
       "source_tags[0]": "source:chat",
-      body: msg.body ? replaceCharacters(msg.body.toString()) : "",
+      body: msg.body ? projectorion.CustomFont ? replaceCharacters(msg.body.toString()) : msg.body.toString().replace("\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f\ufe0f", '   ') : "",
       html_body: false,
       ui_push_phase: "V3",
       status: "0",
@@ -423,7 +433,7 @@ module.exports = function (defaultFuncs, api, ctx) {
       signatureID: utils.getSignatureID(),
       replied_to_message_id: replyToMessage
     };
-  
+
     handleLocation(msg, form, callback, () =>
       handleSticker(msg, form, callback, () =>
         handleAttachment(msg, form, callback, () =>