Image support added

Author: FranP-code

package.json

@@ -17,6 +17,7 @@
   "license": "ISC",
   "dependencies": {
     "@notionhq/client": "^1.0.4",
+    "axios": "^0.27.2",
     "dotenv": "^16.0.0",
     "grammy": "^1.7.2",
     "mongoose": "^6.2.10"

src/app/app.js

@@ -6,6 +6,7 @@ const developmentMsg = require('./middlewares/developmentMsg');
 const authCodeHandler = require('./middlewares/authCodeHandler');
 const announcementHandler = require('./middlewares/announcementHandler');
 const chatAction = require('./middlewares/chatAction');
+const cleanSessions = require('./middlewares/cleanSessions');
 
 //Commands
 const start = require('./commands/start');
@@ -28,7 +29,12 @@ const bot = new Bot(process.env.BOT_TOKEN)
 
 // Setting default session for user
 function initialSesionValues() {
-    return {waitingForAuthCode: false, waitingForAnnouncementMessage: false, textsForAdd: []};
+    return {
+        waitingForAuthCode: false,
+        waitingForAnnouncementMessage: false,
+        textsForAdd: [],
+        imagesForAdd: []
+    };
 }
 
 bot.use(session({ initial: initialSesionValues }));
@@ -45,6 +51,9 @@ bot.use(announcementHandler)
 //Set a middleware for send a 'typing' state every time the bot is called
 bot.use(chatAction)
 
+//Set a middleware for check if for each session array, one is full of null objects. In that case, clean it
+bot.use(cleanSessions)
+
 
 //* ---------------- COMMANDS ----------------
 

src/app/events/onCallbackQuery.js

@@ -1,63 +1,97 @@
 const AppController = require("../../controller/AppController")
+const DatabaseQuerys = require("../../controller/DatabaseQuerys")
 
 async function onCallbackQuery(ctx) {
+
     //In case that the cancel button is pressed
-    if (ctx.update.callback_query.data === "cancel_operation") {
+    if (ctx.update.callback_query.data.includes("co_")) {
+
+        //Get dataType
+        const dataType = extractSubstring(ctx.update.callback_query.data, "dt_", "i_")
+        
+        switch (dataType) {
+            case "text":
+                //Get text position
+                const textIndex = parseInt(extractSubstring(ctx.update.callback_query.data, "i_", ""))
+                //Make it null
+                ctx.session.textsForAdd[textIndex] = null
+                break;
+            
+            case "image":
+                //Get image position
+                const position = parseInt(extractSubstring(ctx.update.callback_query.data, "i_", ""))
+                //Make it null
+                ctx.session.imagesForAdd[position] = null
+        
+            default:
+                break;
+            }
         deleteMessage(ctx, ctx.update.callback_query.message.message_id)
         ctx.reply(`Operation canceled 👍`, {parse_mode: "HTML"})
         return
     }
 
     //Get database id
-    const databaseID = extractSubstring(ctx.update.callback_query.data, "database_id", "text_index")
-
-    //Get what text want the user add
-    const textIndex = parseInt(extractSubstring(ctx.update.callback_query.data, "text_index", ""))
-    const text = ctx.session.textsForAdd[textIndex]
-
-    // Check if databaseID and text are defined
-    if (!databaseID || !text) {
-        reportError(ctx)
-        return
+    const databaseID = extractSubstring(ctx.update.callback_query.data, "db_", "dt_")
+
+    //Get dataType
+    const dataType = extractSubstring(ctx.update.callback_query.data, "dt_", "i_")
+
+    let response
+
+    switch (dataType) {
+        case "text":
+            //Get what text want the user add
+            const textIndex = parseInt(extractSubstring(ctx.update.callback_query.data, "i_", ""))
+            const text = ctx.session.textsForAdd[textIndex]
+
+            response = await AppController().addMessageToNotionDatabase(ctx.from.id, databaseID, text)
+        
+            ctx.reply(`<strong>${text.length > 20 ? text + "\n\n</strong>" : text + "</strong> "}added to <strong>${response.databaseTitle}</strong> database 👍`, {parse_mode: "HTML"})
+        
+            // Change this text on array for null
+            ctx.session.textsForAdd[textIndex] = null
+            break;
+
+        case "image":
+            //Get what image want the user add
+            const index = parseInt(extractSubstring(ctx.update.callback_query.data, "i_", ""))
+            const image = ctx.session.imagesForAdd[index]
+            const imageTitle = image.title ? image.title : image.file_path
+
+            response = await AppController().addImageToDatabase(ctx.from.id, databaseID, `https://api.telegram.org/file/bot${process.env.BOT_TOKEN}/${image.file_path}`, imageTitle)
+
+            ctx.reply(`<strong>${imageTitle.length > 20 ? imageTitle + "\n\n</strong>" : imageTitle + "</strong> "}added to <strong>${response.databaseTitle}</strong> database 👍`, {parse_mode: "HTML"})
+
+            // Change this image on array for null
+            ctx.session.imagesForAdd[index] = null
+            break;
+    
+        default:
+            reportError(ctx)
+            break;
     }
 
-    const response = await AppController().addMessageToNotionDatabase(ctx.from.id, databaseID, text)
-
+    //Report in error case
     if (response.status === "error") {
         deleteMessage(ctx, ctx.update.callback_query.message.message_id)
         reportError(ctx)
         return
     }
 
-    ctx.reply(`<strong>${text.length > 20 ? text + "\n\n</strong>" : text + "</strong> "}added to <strong>${response.databaseTitle}</strong> database 👍`, {parse_mode: "HTML"})
+    //Delete DB selector
     deleteMessage(ctx, ctx.update.callback_query.message.message_id)
-
-    // Change this text on array for null
-    ctx.session.textsForAdd[textIndex] = null
-
-    // If all texts on the array are null, clean the array
-    let allTextsAreNull = true
-
-    ctx.session.textsForAdd.forEach(text => {
-        if (text !== null) {
-            allTextsAreNull = false
-        }
-    })
-
-    if (allTextsAreNull) {
-        ctx.session.textsForAdd = []
-    }
 }
 
 //Extract substring function
-function extractSubstring(str, a, b) {
+function extractSubstring(str, start, end) {
 
-    const position = str.indexOf(a) + a.length;
+    const position = str.indexOf(start) + start.length;
 
-    if (!b) {
+    if (!end) {
         return str.substring(position, str.length)
     }
-    return str.substring(position, str.indexOf(b, position));
+    return str.substring(position, str.indexOf(end, position));
 }
 
 // Delete message function

src/app/events/onPhoto.js

@@ -1,9 +1,46 @@
-async function onPhoto() {
-    ctx.reply("<strong>Pictures are not allowed...</strong>", {parse_mode: "HTML"})
-    
-    setTimeout(() => {
-        ctx.reply("<strong>...yet</strong>", {parse_mode: "HTML"})
-    }, 3500)
+const AppController = require('../../controller/AppController.js')
+
+async function onPhoto(ctx) {
+    const data = await ctx.getFile()
+
+    const databases = await AppController().getNotionDatabases(ctx.from.id)
+
+    if (databases.status === "error") {
+        switch (databases.message) {
+            case "no auth code":
+                ctx.reply('No auth code provided\n*Use the /auth command for provide it*', {parse_mode: "MarkdownV2"})
+                break;
+
+            default:
+                ctx.reply('Unknow error\n*Try again later*', {parse_mode: "MarkdownV2"})
+                break;
+        }
+
+        return
+    }
+
+    //If the message have a caption, set it as title propierty
+    if (ctx.update.message.caption) {
+        data.title = ctx.update.message.caption
+    }
+
+    //Add image to array of texts
+    ctx.session.imagesForAdd.push(data)
+
+    //If pass some time delete the text on the array
+    function cleanArray() {
+        if (ctx.session.imagesForAdd.includes(data)) {
+            const index = ctx.session.imagesForAdd.indexOf(data)
+            ctx.session.imagesForAdd.splice(index, 1)
+        }
+    }
+
+    //Delete the item in the imagesForAdd in...
+    setTimeout(cleanArray, 5 * 60 * 1000) //5 Minutes
+
+    const keyboard = await AppController().getKeyboardOfDatabases(databases.results, "❌ Don't upload image", "image", ctx.session.imagesForAdd)
+
+    ctx.reply(`Select the <strong>database</strong> to save this image\n\nIf you atached an caption to this image, <strong>it's gonna be the title of the new page</strong> in the Database\n\n<strong>Remember that this image keeps public</strong>\nDon't upload sensitive data!`, {...keyboard, parse_mode: "HTML"})
 }
 
 module.exports = onPhoto

src/app/events/onText.js

@@ -1,16 +1,17 @@
-async function onText(ctx) {
+const AppController = require('../../controller/AppController')
 
-    const AppController = require('../../controller/AppController')
+async function onText(ctx) {
 
-    const response = await AppController().getNotionDatabases(ctx.from.id)
+    //Get databases
+    const databases = await AppController().getNotionDatabases(ctx.from.id)
 
-    if (response.status === "error") {
+    if (databases.status === "error") {
 
-        switch (response.message) {
+        switch (databases.message) {
             case "no auth code":
                 ctx.reply('No auth code provided\n*Use the /auth command for provide it*', {parse_mode: "MarkdownV2"})
                 break;
-        
+
             default:
                 ctx.reply('Unknow error\n*Try again later*', {parse_mode: "MarkdownV2"})
                 break;
@@ -31,39 +32,15 @@ async function onText(ctx) {
         }
     }
 
-    setTimeout(cleanArray, 5 * 60 * 1000)
+    //Delete the item in the textsForAdd in...
+    setTimeout(cleanArray, 5 * 60 * 1000) //5 Minutes
 
     const botReply = text.length > 20 ? "\n\n" + text : text
 
-    ctx.reply(`Select the <strong>database</strong> to save <strong>${botReply}</strong>`, {
-        reply_markup: {
-            inline_keyboard: [
-                ...response.results.map((obj) => {
-                        const title = obj.title.length <= 0 ?  "Untitled" : obj.title[0].text.content
-
-                        if (obj.properties.telegramIgnore) {
-                            return []
-                        }
+    //Generate Keyboard from the databases
+    const keyboard = await AppController().getKeyboardOfDatabases(databases.results, null, "text", ctx.session.textsForAdd)
 
-                        if (obj.icon) {
-                            return [{
-                                text: `${obj.icon.emoji ? obj.icon.emoji + " " : ""}${title}`,
-                                callback_data: "database_id" + obj.id + "text_index" + JSON.stringify(ctx.session.textsForAdd.length - 1)
-                            }]
-                        } else {
-                            return [{
-                                text: title,
-                                callback_data: "database_id" + obj.id + "text_index" + JSON.stringify(ctx.session.textsForAdd.length - 1)
-                            }]
-                        }
-                    }),
-                    [
-                        {text: "🚫", callback_data: "cancel_operation"}
-                    ]
-                ]
-        },
-        parse_mode: "HTML"
-    })
+    ctx.reply(`Select the <strong>database</strong> to save <strong>${botReply}</strong>`, {...keyboard, parse_mode: "HTML"})
 }
 
 module.exports = onText

src/app/middlewares/cleanSessions.js

@@ -0,0 +1,23 @@
+function cleanSessions(ctx, next) {
+
+    const sessions = [ctx.session.textsForAdd, ctx.session.imagesForAdd]
+    
+    sessions.forEach(session => {
+        // If all elements on the array are null, clean the array
+        let allTextsAreNull = true
+
+        session.forEach(element => {
+            if (element !== null) {
+                allTextsAreNull = false
+            }
+        })
+
+        if (allTextsAreNull) {
+            session = []
+        }
+    });
+
+    next()
+}
+
+module.exports = cleanSessions

src/app/middlewares/developmentMsg.js

@@ -5,7 +5,9 @@ async function developmentMsg (ctx, next) {
         return
     }
 
-    if (ctx.from.id !== parseInt(process.env.MY_USER_ID)) {
+    console.log(ctx.from.id)
+
+    if (ctx.from.id !== parseInt(process.env.MY_USER_ID) && ctx.from.id !== parseInt(process.env.TESTING_USER_ID)) {
         ctx.reply('⚠️ Sorry, this bot is on development for now... \n\nStay alert for new updates! \n\nRepository: https://github.com/FranP-code/Telegram-to-Notion-Bot')
         return
     }