Merge pull request #79 from jmatheusbueno/fix/telegram-message-userid

adding validation when requesting commands by telegram
newerton · Feb 2, 2022 · dd1d5d1 · dd1d5d1 · rafilckz · Feb 9, 2022
2 parents 79ecb03 + caa21dc
commit dd1d5d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/config/version.yaml b/config/version.yaml
@@ -1,5 +1,5 @@
   version:
-    app: "1.5.20"
-    config_file: "1.5.20"
+    app: "1.5.21"
+    config_file: "1.5.21"
     emergency: "false"
 
diff --git a/src/services/telegram.py b/src/services/telegram.py
@@ -84,32 +84,35 @@ def start(self):
         self.bot = Bot(botFatherToken)
         self.bot.set_my_commands(Commands, language_code='en')
 
+        def userHasPermission(self, update: Update):
+            return True if f'{update.message.from_user.id}' in self.telegramConfig['chat_ids'] else False
+
         def sendPrint(update: Update, context: CallbackContext) -> None:
-            if f'{update.message.from_user.id}' in self.telegramConfig['chat_ids']:
-                self.commandSendPrint(update)
+          if userHasPermission(self, update):
+            self.commandSendPrint(update)
 
         def sendChatId(update: Update, context: CallbackContext) -> None:
-            if f'{update.message.from_user.id}' in self.telegramConfig['chat_ids']:
+            if userHasPermission(self, update):
                 self.commandSendChatId(update)
 
         def sendMap(update: Update, context: CallbackContext) -> None:
-            if f'{update.message.from_user.id}' in self.telegramConfig['chat_ids']:
+            if userHasPermission(self, update):
                 self.commandSendMap(update)
 
         def sendBcoin(update: Update, context: CallbackContext) -> None:
-            if f'{update.message.from_user.id}' in self.telegramConfig['chat_ids']:
+            if userHasPermission(self, update):
                 self.commandSendBcoin(update)
 
         def sendDonation(update: Update, context: CallbackContext) -> None:
-            if f'{update.message.from_user.id}' in self.telegramConfig['chat_ids']:
+            if userHasPermission(self, update):
                 self.commandSendDonation(update)
 
         def sendAllHeroesToWork(update: Update, context: CallbackContext) -> None:
-            if f'{update.message.from_user.id}' in self.telegramConfig['chat_ids']:
+            if userHasPermission(self, update):
                 self.commandAllHeroesToWork(update)
 
         def sendAllHeroesToRest(update: Update, context: CallbackContext) -> None:
-            if f'{update.message.from_user.id}' in self.telegramConfig['chat_ids']:
+            if userHasPermission(self, update):
                 self.commandAllHeroesToRest(update)
 
         commands = [