webfast 0.1.47 → 0.1.49

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

@@ -6,7 +6,7 @@ module.exports = async function(req,res,body,params,command,middleValue) {
         locSendMessage = `Thank you for sending your location\n ${middleValue.location.longitude}\n${middleValue.location.latitude}`;
     }
 
-    const scripting = await program.modules.telegram.script.function.check(program,command,middleValue.chat.id,middleValue,body);
+    const scripting = await program.modules.telegram.script.function.check(program,command,middleValue.from.id,middleValue,body);
     console.log(scripting);
 
     return {

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

@@ -45,7 +45,7 @@ module.exports = async function(program,req,res,body,params,command,middleValue)
     
     locSendMessage = `Image succesfull received`;
 
-    const scripting = await program.modules.telegram.script.function.check(program,command,middleValue.chat.id,middleValue,body);
+    const scripting = await program.modules.telegram.script.function.check(program,command,middleValue.from.id,middleValue,body);
     console.log(scripting);
     
     // Send back

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

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

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

@@ -112,7 +112,9 @@ 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`) {
+                        delete program.modules.telegram.functions.que.line[chatID];
+                    }
                     return false;
                 } else {
                     console.log(`Matched`);
@@ -214,7 +216,7 @@ module.exports = {
                 }
                 buttons = JSON.parse(buttons);
             }
-            await program.modules.telegram.functions.send(program,toSend,middleValue.chat.id,buttons);
+            await program.modules.telegram.functions.send(program,toSend,middleValue.from.id,buttons);
 
             // set que uuid
             program.modules.telegram.functions.que.line[chatID] = current;

package/modules/bots/applications/telegram/scripts/test/script.json

@@ -3,7 +3,12 @@
     "start"     :       {
         "object"  :   {
             "text" : "Test First Title : {{TEST}}",
-            "image" :   "{{URL}}app/content/images/block.png"
+            "image" :   "{{URL}}app/content/images/block.png",
+            "buttons" : [
+                [
+                    { "text": "Test Callback", "callback_data": "other" }
+                ]
+            ]
         },
         "match"    :   {
             "data"  :   [{

package/modules/bots/applications/telegram.js

@@ -48,7 +48,7 @@ module.exports = async function(program,folder) {
                         middleValue.chat.ts = Date.now();
                         middleValue.chat.uuid = program.uuid.v4();
                         let user = await program.modules.data.findOrCreate(`eventgo`,`telegram`,{
-                            id : middleValue.chat.id
+                            id : middleValue.from.id
                         },middleValue.chat);
                         let typeOFF = typeof user;
                         if (middleValue.chat.uuid == user.uuid || user.profileImage == undefined) {
@@ -76,7 +76,13 @@ module.exports = async function(program,folder) {
 
                         try {
                             // Or check if single word
-                            if (middleValue.text.startsWith('/')) {
+                            let starts;
+                            if (middleValue.text != undefined) {
+                                if (middleValue.text.startsWith('/')) {
+                                    starts = true;
+                                }
+                            }
+                            if (starts== true) {
                                 // If it starts with a slash, it might be a command
                                 const parts = middleValue.text.split(' ');
                                 
@@ -125,7 +131,7 @@ module.exports = async function(program,folder) {
                                             case `message`:
                                                 console.log(`We have response, check for response message`);
                                                 const message = respFunc[action];
-                                                await program.modules.telegram.functions.send(program,message,middleValue.chat.id);
+                                                await program.modules.telegram.functions.send(program,message,middleValue.from.id);
                                             break;
                                             default:
                                                 console.error(`Missing Response Action Telegram: ${action}`);
@@ -154,7 +160,7 @@ module.exports = async function(program,folder) {
                                                 case `message`:
                                                     console.log(`We have response, check for response message`);
                                                     const message = respFunc[action];
-                                                    await program.modules.telegram.functions.send(program,message,middleValue.chat.id);
+                                                    await program.modules.telegram.functions.send(program,message,middleValue.from.id);
                                                 break;
                                                 default:
                                                     console.error(`Missing Response Action Telegram: ${action}`);
@@ -163,7 +169,7 @@ module.exports = async function(program,folder) {
                                     } catch (err) {
                                         //console.error(err);
                                         //console.error(`Error For Telegram Function`);
-                                        await program.modules.telegram.functions.send(program,`Unknown Command: ${command}`,middleValue.chat.id);
+                                        await program.modules.telegram.functions.send(program,`Unknown Command: ${command}`,middleValue.from.id);
                                     }
                                 }
 
@@ -176,7 +182,20 @@ module.exports = async function(program,folder) {
                                 
                                 // TODO Catch events for middleware now just respond
                                 const message = `${middleValue.text}`;
-                                const command = message;
+                                let command = message;
+                                if (middleValue.text == undefined) {
+                                    // Check if callback or something
+                                    if (middleValue.message != undefined) {
+                                        if (middleValue.message.reply_markup != undefined) {
+                                            // Grab markup
+                                            const markupData = middleValue.message.reply_markup.inline_keyboard[0][0][`callback_data`];
+                                            // Hoppa
+                                            middleValue.text = markupData;
+                                            command = markupData;
+                                        }
+                                    }
+                                }
+
                                 try {
                                     // Run dynamic the type of middleware
                                     const runFunc   =   await program.modules.telegram.middleware[key][command](req,res,body,params,command,middleValue,program);
@@ -189,7 +208,7 @@ module.exports = async function(program,folder) {
                                         case `message`:
                                             console.log(`We have response, check for response message`);
                                             const message = respFunc[action];
-                                            await program.modules.telegram.functions.send(program,message,middleValue.chat.id);
+                                            await program.modules.telegram.functions.send(program,message,middleValue.from.id);
                                         break;
                                         default:
                                             console.error(`Missing Response Action Telegram: ${action}`);
@@ -198,9 +217,9 @@ module.exports = async function(program,folder) {
                                     //console.error(err);
                                     //console.error(`Error For Telegram Function`);
                                     console.log(`Checking for script`);
-                                    const scripting = await program.modules.telegram.script.function.check(program,command,middleValue.chat.id,middleValue,received);
+                                    const scripting = await program.modules.telegram.script.function.check(program,command,middleValue.from.id,middleValue,received);
                                     /*
-                                    await program.modules.telegram.functions.send(program,`${command}`,middleValue.chat.id,[
+                                    await program.modules.telegram.functions.send(program,`${command}`,middleValue.from.id,[
                                         [
                                             { text: 'EventGO!',  web_app : { url : 'https://cloud.eventgo.today/events/list'}},
                                             { text: 'Create Event', callback_data: 'create_event' },
@@ -237,7 +256,7 @@ module.exports = async function(program,folder) {
                                             case `message`:
                                                 console.log(`We have response, check for response message`);
                                                 const message = respFunc[action];
-                                                await program.modules.telegram.functions.send(program,message,middleValue.chat.id);
+                                                await program.modules.telegram.functions.send(program,message,middleValue.from.id);
                                             break;
                                             default:
                                                 console.error(`Missing Response Action Telegram: ${action}`);

package/package.json

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