- moved strings to strings.js

- added default parameter from sendTelegramMessage,...

src/db/utils.js

@@ -1,3 +1,4 @@
+const { strings_en } = require("../strings");
 const { sendTelegramMessage } = require("../telegram");
 const { User, Contact } = require("./db");
 
@@ -11,7 +12,7 @@ function addContact(telegram, withUserID, done) {
           );
           sendTelegramMessage(
             withUser.telegram,
-            "Someone scanned your QR code. You will be notified if they are tested positive with Covid. If you are tested positive, please tell this bot /COVIDPOSITIVE",
+            strings_en.telegram_qr_scanned,
             () => {}
           );
           done(true, "Successfully added contact");

src/routes/TelegramWebhookRoute.js

@@ -1,21 +1,26 @@
 const { Op } = require("sequelize");
 const { User, Contact } = require("../db/db");
+const { strings_en } = require("../strings");
 const { sendTelegramMessage } = require("../telegram");
 
 function TelegramWebhookRoute(req, res) {
 
     try{
-        const messageText = req.body.message.text;
-        const telegramID = req.body.message.from.id;
-        if (messageText.toLowerCase() == "/covidpositive") {
-            userInfected(telegramID, (result) => {
-                if(result.saved){
-                    sendTelegramMessage(telegramID, "Thanks for informing us. We will notify the people you were in contact with!", ()=>{});
-                    informContacts(telegramID, ()=>{});
-                }else{
-                    sendTelegramMessage(telegramID, "Sorry, something went wrong.", ()=>{});
-                }
-            });
+        if(req.body.message.connected_website){
+            sendTelegramMessage(req.body.message.from.id, "Thanks for using OurSejahtera! Let's stay safer together <3");
+        }else{
+            const messageText = req.body.message.text;
+            const telegramID = req.body.message.from.id;
+            if (messageText.toLowerCase() == "/covidpositive") {
+                userInfected(telegramID, (result) => {
+                    if(result.saved){
+                        sendTelegramMessage(telegramID, strings_en.telegram_inform_positive);
+                        informContacts(telegramID);
+                    }else{
+                        sendTelegramMessage(telegramID, "Sorry, something went wrong.");
+                    }
+                });
+            }
         }
     }
     catch(e){
@@ -23,10 +28,12 @@ function TelegramWebhookRoute(req, res) {
     }
 
 
+    
+
     res.send();
 }
 
-function informContacts(telegramID, doneCallback){
+function informContacts(telegramID, doneCallback=()=>{}){
     User.findOne({
         where: {
             telegram: telegramID,
@@ -47,7 +54,7 @@ function informContacts(telegramID, doneCallback){
                             id: otherPersonID,
                         }
                     }).then(otherPerson => {
-                        sendTelegramMessage(otherPerson.telegram, "You're infected.", ()=>{});
+                        sendTelegramMessage(otherPerson.telegram, strings_en.telegram_inform_infect);
                     });
                 });
             });

src/strings.js

@@ -0,0 +1,16 @@
+const strings_en = {
+    telegram_inform_infect: "ATTENTION! Someone you have been \
+in contact with has reported being tested POSITIVE with \
+COVID19. Please maintain a self-quarantine until getting \
+tested, and follow all local guidelines.",
+
+    telegram_inform_positive: "Thanks for informing us. We will \
+notify the people you were in contact with! Please follow all \
+local COVID19 guidelines.",
+
+    telegram_qr_scanned: "Someone scanned your QR code. You will \
+be notified if they report being tested positive with COVID19. If \
+you are tested positive, please tell me /COVIDPOSITIVE",
+};
+
+exports.strings_en = strings_en;

src/telegram.js

@@ -16,7 +16,7 @@ function setTelegramWebHook(done) {
     });
 }
 
-function sendTelegramMessage(telegramID, message, done) {
+function sendTelegramMessage(telegramID, message, done=()=>{}) {
   const url = `https://api.telegram.org/bot${process.env.TELEGRAM_TOKEN}/sendMessage`;
   axios
     .post(url, {