Add optional long polling usage

Signed-off-by: alfred richardsn <rchrdsn@protonmail.ch>

.env.example

@@ -1,5 +1,6 @@
 # Connection
 TOKEN_FILENAME=/run/secrets/tbtoken
+SET_WEBHOOK=true  # Use long polling if set to false
 INTERNAL_HOST=0.0.0.0
 SERVER_HOST=example.com
 SERVER_PORT=5000
@@ -12,7 +13,6 @@ DATABASE_NAME=tellerbot
 
 # Logging
 LOGGER_LEVEL=INFO
-LOG_FILENAME=/var/log/tellerbot.log
 DATABASE_LOGGING_ENABLED=true
 
 # Chat IDs

README.md

@@ -77,7 +77,7 @@ cp .env.example .env
 11. Install and start [MongoDB server](https://docs.mongodb.com/manual/installation/).
 12. Set environment variables:
 ```bash
-export $(grep -v '^#' .env | xargs)
+export $(sed 's/#.*//' .env | xargs)
 ```
 13. Create database user:
 ```bash

src/app.py

@@ -51,14 +51,17 @@ def main():
     webhook_path = config.WEBHOOK_PATH + "/" + url_token
 
     bot.setup()
-    executor.start_webhook(
-        dispatcher=dp,
-        webhook_path=webhook_path,
-        on_startup=lambda *args: on_startup(webhook_path, *args),
-        on_shutdown=lambda *args: close_blockchains(),
-        host=config.INTERNAL_HOST,
-        port=config.SERVER_PORT,
-    )
+    if config.SET_WEBHOOK:
+        executor.start_webhook(
+            dispatcher=dp,
+            webhook_path=webhook_path,
+            on_startup=lambda *args: on_startup(webhook_path, *args),
+            on_shutdown=lambda *args: close_blockchains(),
+            host=config.INTERNAL_HOST,
+            port=config.SERVER_PORT,
+        )
+    else:
+        executor.start_polling(dispatcher=dp)
     print()  # noqa: T001  Executor stopped with ^C
 
     # Stop all background tasks

src/config.py

@@ -18,11 +18,12 @@
 
 
 DEFAULT_VALUES = {
+    "SET_WEBHOOK": False,
     "INTERNAL_HOST": "127.0.0.1",
     "DATABASE_HOST": "127.0.0.1",
     "DATABASE_PORT": 27017,
     "DATABASE_NAME": "tellerbot",
-    "ESCROW_ENABLED": True,
+    "ESCROW_ENABLED": False,
 }