webfast 0.1.49 → 0.1.51

package/modules/bots/applications/telegram/middleware/message/start.js

@@ -4,6 +4,7 @@ module.exports = async function(req,res,body,params,command,middleValue,received
     
     // Do the script thing
     if (middleValue.text.startsWith(`/`)) {
+        middleValue.origin = middleValue.text;
         middleValue.text = `start`;
         const scripting = await program.modules.telegram.script.function.check(program,command,middleValue.from.id,middleValue,received);
         console.log(`Scripting`);

package/modules/bots/applications/telegram/que.js

@@ -29,6 +29,7 @@ module.exports = {
         try {
 
             let scriptStart = `start`;
+            
             // It's new
             if (program.modules.telegram.script.int[command] == undefined && program.modules.telegram.functions.que.line[chatID] == undefined) {
                 // Send message we don't know
@@ -42,6 +43,13 @@ module.exports = {
             let current;
 
             let theUUID = program.uuid.v4();
+            
+            if (program.modules.telegram.functions.que.line[chatID] != undefined && middleValue.origin != undefined) {
+                if (middleValue.origin.startsWith(`/`)) {
+                    delete program.modules.telegram.functions.que.line[chatID];
+                }
+            }
+
             if (program.modules.telegram.functions.que.line[chatID] != undefined) {
                 // It's original que
                 // Process response
@@ -57,7 +65,8 @@ module.exports = {
                 // Check if text then we need to match if not we probably need to run only function and go to next one
                 let matched = false;
                 let anwserData;
-                if (middleValue.text != undefined) {
+                if (middleValue.text != undefined || middleValue.data != undefined) {
+                    
                     console.log(`Match Text`);
                     // Loop through match
                     anwserData = middleValue.text;
@@ -91,7 +100,13 @@ module.exports = {
                                 case command:
                                     console.log(`It's the dynamic thing`);
                                     matched = matchCheck;
-                                    let variable = data.message[command]
+                                    let variable;
+                                    if (data.message != undefined) {
+                                        variable = data.message[command]
+                                    } else if (data.callback_query != undefined) {
+                                        variable = data.callback_query
+                                    }
+
                                     anwserData = {
                                         type : command,
                                         data : variable
@@ -112,7 +127,7 @@ module.exports = {
                     // Send command when wrong // or buttons like reset button
                     // check what to do
                     // check if stop
-                    if (middleValue.text == `reset` || middleValue.text `stop`) {
+                    if (String(middleValue.text) == `reset` || String(middleValue.text) == `stop`) {
                         delete program.modules.telegram.functions.que.line[chatID];
                     }
                     return false;
@@ -159,6 +174,13 @@ module.exports = {
             // Get item
             const theScript = script[scriptStart];
 
+            if (scriptStart == `finish`) {
+                // Delete from list
+                setTimeout(function(){
+                    delete program.modules.telegram.functions.que.line[chatID];
+                },150);
+            }
+
             // Create replacelist
             let replace = {
                 "{{URL}}"   :   process.env.url,

package/modules/bots/applications/telegram.js

@@ -77,6 +77,14 @@ module.exports = async function(program,folder) {
                         try {
                             // Or check if single word
                             let starts;
+                            if (middleValue.text == undefined && key == `callback_query`) {
+                                if (middleValue.data.startsWith(`/`)) {
+                                    middleValue.text = middleValue.data.slice(1);
+                                    middleValue.origin = middleValue.data;
+                                } else {
+                                    middleValue.text = middleValue.data;
+                                }
+                            }
                             if (middleValue.text != undefined) {
                                 if (middleValue.text.startsWith('/')) {
                                     starts = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webfast",
-  "version": "0.1.49",
+  "version": "0.1.51",
   "description": "WebFast! Bot Application, including TON mini-apps for makign it easy and fast to build ini-apps",
   "main": "index.js",
   "repository": {

package/example.js

@@ -1,68 +0,0 @@
-const path = require(`path`);
-const contentPath = path.join(__dirname,`example`,`content`)
-let setArray = {
-    wget : '/usr/local/bin/wget',
-    process : {
-        ts : Date.now(),
-        socket : {
-            api : {
-                list : function(program,ws,json,data,path) {
-                    // Example to create process for websocket path action and process data
-                    console.log(`Example of list process`);
-
-                    function generateRandomText(length) {
-                        const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-                        let result = '';
-                      
-                        for (let i = 0; i < length; i++) {
-                          result += characters.charAt(Math.floor(Math.random() * characters.length));
-                        }
-                      
-                        return result;
-                      }
-
-                      
-                    // Loop for example through 
-                    let exampleData = {
-                        list : [],
-                        ell : data.ell,
-                        action : data.action
-                    }
-
-                    const pushData = {};
-                    for (let i in data.other.items) {
-                        const item = data.other.items[i];
-                        // We have itme
-                        const id = item.id;
-                        const key = item.name;
-
-                        pushData[key] = {
-                            id : id,
-                            text : generateRandomText(10)
-                        }
-                    }
-
-                    pushData.uuid = program.uuid.v4();
-                    exampleData.list.push(pushData);
-
-                    // Send websocket message create standard
-                    const sendObject = {
-                        func : data.function,
-                        data : exampleData,
-                        js : `console.log("RUN FROM BACKEND")`
-                    }
-
-                    // Sedn back to front-end 
-                    //ws.send();
-                    
-                    return sendObject;
-                }
-            }
-        }
-    },
-    contentPath : contentPath
-};
-
-
-let program = require(path.join(__dirname,`index.js`))(setArray);
-console.log(`Required`);