From 40fd2b126b962b8eeedb8d4c3e754acf4e6455ce Mon Sep 17 00:00:00 2001 From: Suren Khorenyan Date: Mon, 2 Jul 2018 21:51:48 +0300 Subject: [PATCH 1/2] Fix broadcast example --- examples/broadcast_example.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/broadcast_example.py b/examples/broadcast_example.py index 468da916..40ba5e0c 100644 --- a/examples/broadcast_example.py +++ b/examples/broadcast_example.py @@ -23,7 +23,7 @@ def get_users(): yield from (61043901, 78238238, 78378343, 98765431, 12345678) -async def send_message(user_id: int, text: str) -> bool: +async def send_message(user_id: int, text: str, disable_notification: bool = False) -> bool: """ Safe messages sender @@ -32,7 +32,7 @@ async def send_message(user_id: int, text: str) -> bool: :return: """ try: - await bot.send_message(user_id, 'Hello, World!') + await bot.send_message(user_id, text, disable_notification=disable_notification) except exceptions.BotBlocked: log.error(f"Target [ID:{user_id}]: blocked by user") except exceptions.ChatNotFound: @@ -41,6 +41,8 @@ async def send_message(user_id: int, text: str) -> bool: log.error(f"Target [ID:{user_id}]: Flood limit is exceeded. Sleep {e.timeout} seconds.") await asyncio.sleep(e.timeout) return await send_message(user_id, text) # Recursive call + except exceptions.UserDeactivated: + log.error(f"Target [ID:{user_id}]: user is deactivated") except exceptions.TelegramAPIError: log.exception(f"Target [ID:{user_id}]: failed") else: From 3de1397387f1d767f96d3608cdf18a41ef26ee1c Mon Sep 17 00:00:00 2001 From: ape364 Date: Mon, 9 Jul 2018 23:25:13 +0500 Subject: [PATCH 2/2] Update quick_start.rst replace tab with 4 spaces --- docs/source/quick_start.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/quick_start.rst b/docs/source/quick_start.rst index 9f35c45a..bb052bb5 100644 --- a/docs/source/quick_start.rst +++ b/docs/source/quick_start.rst @@ -27,14 +27,14 @@ Next step: interaction with bots starts with one command. Register your first co @dp.message_handler(commands=['start', 'help']) async def send_welcome(message: types.Message): - await message.reply("Hi!\nI'm EchoBot!\nPowered by aiogram.") + await message.reply("Hi!\nI'm EchoBot!\nPowered by aiogram.") Last step: run long polling. .. code-block:: python3 if __name__ == '__main__': - executor.start_polling(dp) + executor.start_polling(dp) Summary ------- @@ -50,7 +50,7 @@ Summary @dp.message_handler(commands=['start', 'help']) async def send_welcome(message: types.Message): - await message.reply("Hi!\nI'm EchoBot!\nPowered by aiogram.") + await message.reply("Hi!\nI'm EchoBot!\nPowered by aiogram.") if __name__ == '__main__': - executor.start_polling(dp) + executor.start_polling(dp)