config: add telegram api key at the end of webhook url

This elimates a possible mistake while configuring the bot.
hacettepeoyt · Mar 18, 2024 · 11f3d84 · 11f3d84
1 parent 8e7971a
commit 11f3d84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/__main__.py b/src/__main__.py
@@ -30,12 +30,12 @@ def validate():
         exit(2)
 
     if config.WEBHOOK_CONNECTED:
-        if config.WEBHOOK_URL == config.TELEGRAM_API_KEY:
-            print("ERROR: Please make sure you configured a WEBHOOK_URL if you are using webhook rather than polling!")
+        if config.WEBHOOK_URL[1:] == config.TELEGRAM_API_KEY:
+            print("ERROR: Please make sure you configured a WEBHOOK_URL when WEBHOOK_CONNECTED is True")
             exit(2)
 
         if not config.PORT:
-            print("ERROR: Please make sure you configured a valid PORT number!")
+            print("ERROR: Please make sure you configured a valid PORT number when WEBHOOK_CONNECTED is True")
             exit(2)
 
 

diff --git a/src/config.py b/src/config.py
@@ -31,7 +31,7 @@
 # Polling or Webhook?
 WEBHOOK_CONNECTED: bool = config.get("WEBHOOK_CONNECTED", False)
 PORT: str = config.get("PORT", "31415")
-WEBHOOK_URL: str = config.get("WEBHOOK_URL", "")
+WEBHOOK_URL: str = config.get("WEBHOOK_URL", "") + "/" + TELEGRAM_API_KEY
 
 # Conversation timeout values
 FEEDBACK_TIMEOUT: int = config.get("FEEDBACK_TIMEOUT", 300)