From 1c76c7d797981d4ba1882e35dc8f76282d792282 Mon Sep 17 00:00:00 2001 From: Davte Date: Sat, 20 Jun 2020 15:31:42 +0200 Subject: [PATCH] Send error message if database could not be sent --- davtelepot/administration_tools.py | 8 ++------ davtelepot/messages.py | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/davtelepot/administration_tools.py b/davtelepot/administration_tools.py index a878116..731ddc1 100644 --- a/davtelepot/administration_tools.py +++ b/davtelepot/administration_tools.py @@ -544,13 +544,9 @@ async def _send_bot_database(bot: Bot, user_record: OrderedDict, language: str): language=language ) ) - if isinstance(sent_update, Exception): - return bot.get_message( - 'admin', 'db_command', 'db_sent', - language=language - ) return bot.get_message( - 'admin', 'db_command', 'db_sent', + 'admin', 'db_command', + ('error' if isinstance(sent_update, Exception) else 'db_sent'), language=language ) diff --git a/davtelepot/messages.py b/davtelepot/messages.py index c54b016..2af5d5f 100644 --- a/davtelepot/messages.py +++ b/davtelepot/messages.py @@ -37,9 +37,21 @@ default_admin_messages = { 'it': "🔄 Clicka di nuovo per confermare", }, 'db_command': { + 'db_sent': { + 'en': "Database sent.", + 'it': "Database inviato.", + }, 'description': { 'en': "Ask for bot database via Telegram", - 'it': "Ricevi il database del bot via Telegram" + 'it': "Ricevi il database del bot via Telegram", + }, + 'error': { + 'en': "Error sending database.", + 'it': "Errore durante l'invio del database.", + }, + 'file_caption': { + 'en': "Here is bot database.", + 'it': "Ecco il database!" }, 'not_sqlite': { 'en': "Only SQLite databases may be sent via Telegram, since they " @@ -49,14 +61,6 @@ default_admin_messages = { "in quanto composti di un solo file.\n" "Questo bot ha invece un database `{db_type}`." }, - 'file_caption': { - 'en': "Here is bot database.", - 'it': "Ecco il database!" - }, - 'db_sent': { - 'en': "Database sent.", - 'it': "Database inviato." - } }, 'error': { 'text': {