fix typos, fetching currency for Telegram-Bot

Cryptec · Nov 2, 2022 · 4da58c2 · 4da58c2
1 parent fec29ba
commit 4da58c2
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/Backend/bot/commands/basic_bot_commands.js b/Backend/bot/commands/basic_bot_commands.js
@@ -24,7 +24,7 @@ const basic_bot_commands = function basic_bot_commands() {
             `/info <b>+ title</b>: show the game info and description.`,
             `/wishlist : show the wishlist.`,
             ``,
-            `All commands also work on reply to a message. For example, list all games beginning with the letter 'B', and then reply to a game with /info.`
+            `All commands also work at reply to a message. For example, list all games beginning with the letter 'B', and then reply to a game with /info.`
         ].join("\n");
         return ctx.reply(helpMsg, { parse_mode: "HTML" });
     })
@@ -39,7 +39,7 @@ const basic_bot_commands = function basic_bot_commands() {
             `/info <b>+ title</b>: show the game info and description.`,
             `/wishlist : show the wishlist.`,
             ``,
-            `All commands also work on reply to a message. For example, list all games beginning with the letter 'B', and then reply to a game with /info.`
+            `All commands also work at reply to a message. For example, list all games beginning with the letter 'B', and then reply to a game with /info.`
         ].join("\n");
         return ctx.reply(helpMsg, { parse_mode: "HTML" });
     })

diff --git a/Backend/bot/commands/find_command.js b/Backend/bot/commands/find_command.js
@@ -1,14 +1,19 @@
 process.env["NTBA_FIX_319"] = 1;
 const bot = require('../bot')
-const fetch = require("node-fetch")
+const fetch = require("node-fetch");
+const currency = require('../utils/currency');
 
 require('dotenv').config()
 
 const find_command = function find_command() {
 
 const uri = process.env.BACKEND_URL
 
+
 bot.hears(/^!find|^\/find/i, async (ctx) => {
+
+        const CURRENCY = await currency.getcurrency()
+
         var checkreply = ctx.message.reply_to_message
         if (checkreply === undefined) {
             let getmsg = ctx.message.text
@@ -25,9 +30,9 @@ bot.hears(/^!find|^\/find/i, async (ctx) => {
                                 if (data.answer === 'NoGame') {
                                     return ctx.reply('Game not Found!')
                                 } else if (data.iswishlist === 'true') {
-                                    return ctx.reply(`The Game is on your Wishlist!\r\n \r\n ${data.title}\r\n${data.price},-`)
+                                    return ctx.reply(`The Game is on your Wishlist!\r\n \r\n ${data.title}\r\n${data.price}${CURRENCY}`)
                                 } else {
-                                    return ctx.reply(`${data.title}\r\n${data.price},-`)
+                                    return ctx.reply(`${data.title}\r\n${data.price}${CURRENCY}`)
                                 }
                             });
                         } else {
@@ -48,9 +53,9 @@ bot.hears(/^!find|^\/find/i, async (ctx) => {
                                 if (data.answer === 'NoGame') {
                                     return ctx.reply('Game not Found!')
                                 } else if (data.iswishlist === 'true') {
-                                    return ctx.reply(`The Game is on your Wishlist!\r\n \r\n ${data.title}\r\n${data.price},-`)
+                                    return ctx.reply(`The Game is on your Wishlist!\r\n \r\n ${data.title}\r\n${data.price}${CURRENCY}`)
                                 } else {
-                                    return ctx.reply(`${data.title}\r\n${data.price} ,-`)
+                                    return ctx.reply(`${data.title}\r\n${data.price}${CURRENCY}`)
                                 }
                             });
                         } else {

diff --git a/Backend/bot/utils/currency.js b/Backend/bot/utils/currency.js
@@ -0,0 +1,24 @@
+const fetch = require("node-fetch")
+
+require('dotenv').config()
+
+const uri = process.env.BACKEND_URL
+
+const getcurrency = () => {
+    let fetchCurrency = fetch(uri + '/api/public/currency').then((res) =>
+        res.json()).then(json => json.map(game => {
+
+            if (game.currency === 'EUR') {
+                return('€')
+            } else if (game.currency === 'USD') {
+                return('$')
+            } else if (game.currency === 'BTC') {
+                return('₿')
+            } else {
+                return 'failed getting currency'
+            }
+        }))
+    return fetchCurrency
+}
+
+exports.getcurrency = getcurrency
diff --git a/Backend/routes/public.js b/Backend/routes/public.js
@@ -62,7 +62,7 @@ router.get("/wishlist/:id/detail/:title", (req, res, next) => {
 })
 
 router.get("/public/currency", (req, res, next) => {
-    var params = [req.params.currency]
+    var params = []
     var sql = "select currency from Settings"
     db.all(sql, params, (err, row) => {
       if (err) {

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Some commands to use are:
 `/info <GameTitle>` - Replies the description of the provided title.\
 `/wishlist` - Replies the wishlist.
 
-All commands also work on reply to a message. For example, list all games beginning with the letter 'B', and then reply to a game with `/info`.\
+All commands also work at reply to a message. For example, list all games beginning with the letter 'B', and then reply to a game with `/info`.\
 More detailed infos will be provided in the Bot itself.
 
 ## Information