mirror of
https://github.com/Balshgit/mosgortrans.git
synced 2025-09-11 13:00:40 +03:00
Compare commits
No commits in common. "b3b2217115d0bfa755d5a7bcd340f3aed9c99772" and "585367e621f60c2d9d72fa8e44e88d5310c7c88a" have entirely different histories.
b3b2217115
...
585367e621
11
README.md
11
README.md
@ -22,16 +22,7 @@ sudo systemctl start mosgortrans.service
|
|||||||
python main.py
|
python main.py
|
||||||
```
|
```
|
||||||
|
|
||||||
- set `START_WITH_WEBHOOK` to blank
|
- change bash bot-start.sh to python main.py
|
||||||
|
|
||||||
## Delete or set webhook manually
|
|
||||||
|
|
||||||
url: https://api.telegram.org/bot{TELEGRAM_TOKEN}/{method}Webhook?url={WEBHOOK_URL}
|
|
||||||
|
|
||||||
methods:
|
|
||||||
- delete
|
|
||||||
- set
|
|
||||||
|
|
||||||
|
|
||||||
## Local development clean:
|
## Local development clean:
|
||||||
|
|
||||||
|
@ -5,11 +5,13 @@ WEBHOOK_HOST="https://mydomain.com"
|
|||||||
WEBHOOK_PATH="/transport"
|
WEBHOOK_PATH="/transport"
|
||||||
|
|
||||||
# webserver settings
|
# webserver settings
|
||||||
WEBAPP_HOST="0.0.0.0"
|
WEBAPP_HOST="127.0.0.1"
|
||||||
WEBAPP_PORT="8080"
|
WEBAPP_PORT="8080"
|
||||||
|
|
||||||
# set to true to start with webhook. Else bot will start on polling method
|
# set to true to start with webhook. Else bot will start on polling method
|
||||||
START_WITH_WEBHOOK="true"
|
START_WITH_WEBHOOK="true"
|
||||||
|
|
||||||
|
GECKO_DRIVER_VERSION="0.32.0"
|
||||||
|
|
||||||
# chat ids for scheduler tasks
|
# chat ids for scheduler tasks
|
||||||
CHAT_IDS="123456789,987654321"
|
CHAT_IDS="123456789,987654321"
|
@ -27,7 +27,7 @@ class Application:
|
|||||||
TELEGRAM_API_TOKEN, '{TELEGRAM_API_TOKEN}'
|
TELEGRAM_API_TOKEN, '{TELEGRAM_API_TOKEN}'
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.scheduler.start()
|
bot_scheduler.start()
|
||||||
|
|
||||||
async def _on_shutdown(self, dp: Dispatcher) -> None:
|
async def _on_shutdown(self, dp: Dispatcher) -> None:
|
||||||
logger.warning('Shutting down..')
|
logger.warning('Shutting down..')
|
||||||
|
@ -47,13 +47,12 @@ bot_cron_jobs = {
|
|||||||
|
|
||||||
|
|
||||||
class BotScheduler:
|
class BotScheduler:
|
||||||
scheduler = AsyncIOScheduler()
|
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
cron_jobs: dict[str, dict[str, Any]],
|
cron_jobs: dict[str, dict[str, Any]],
|
||||||
):
|
):
|
||||||
self.cron_jobs = cron_jobs
|
self.cron_jobs = cron_jobs
|
||||||
|
self.scheduler = AsyncIOScheduler()
|
||||||
|
|
||||||
def add_scheduler_jobs(self, jobs_name: str) -> None:
|
def add_scheduler_jobs(self, jobs_name: str) -> None:
|
||||||
cron_jobs = self.cron_jobs.get(jobs_name)
|
cron_jobs = self.cron_jobs.get(jobs_name)
|
||||||
|
@ -21,5 +21,4 @@ if __name__ == '__main__':
|
|||||||
if START_WITH_WEBHOOK:
|
if START_WITH_WEBHOOK:
|
||||||
web.run_app(app=app, host=WEBAPP_HOST, port=WEBAPP_PORT)
|
web.run_app(app=app, host=WEBAPP_HOST, port=WEBAPP_PORT)
|
||||||
else:
|
else:
|
||||||
application.scheduler.start()
|
|
||||||
application.bot_polling()
|
application.bot_polling()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user