Skip to content

Commit b2132ae

Browse files
authored
Merge pull request #115 from ilyarolf/develop
added try catch block for send to user and edit message functionality
2 parents c2f00ba + 8052933 commit b2132ae

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

services/notification.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,22 @@ async def send_to_admins(message: str | BufferedInputFile, reply_markup: types.I
4646
@staticmethod
4747
async def send_to_user(message: str, telegram_id: int):
4848
bot = Bot(token=TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
49-
await bot.send_message(telegram_id, message)
50-
await bot.session.close()
49+
try:
50+
await bot.send_message(telegram_id, message)
51+
except Exception as e:
52+
logging.error(e)
53+
finally:
54+
await bot.session.close()
5155

5256
@staticmethod
5357
async def edit_message(message: str, source_message_id: int, chat_id: int):
5458
bot = Bot(token=TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
55-
await bot.edit_message_text(text=message, chat_id=chat_id, message_id=source_message_id)
56-
await bot.session.close()
59+
try:
60+
await bot.edit_message_text(text=message, chat_id=chat_id, message_id=source_message_id)
61+
except Exception as e:
62+
logging.error(e)
63+
finally:
64+
await bot.session.close()
5765

5866
@staticmethod
5967
async def payment_expired(user_dto: UserDTO, payment_dto: ProcessingPaymentDTO, table_payment_dto: TablePaymentDTO):
@@ -68,7 +76,8 @@ async def payment_expired(user_dto: UserDTO, payment_dto: ProcessingPaymentDTO,
6876
currency_text=Localizator.get_currency_text(),
6977
status=Localizator.get_text(BotEntity.USER, "status_expired")
7078
)
71-
await NotificationService.edit_message(edited_payment_message, table_payment_dto.message_id, user_dto.telegram_id)
79+
await NotificationService.edit_message(edited_payment_message, table_payment_dto.message_id,
80+
user_dto.telegram_id)
7281
await NotificationService.send_to_user(msg, user_dto.telegram_id)
7382

7483
@staticmethod
@@ -88,7 +97,8 @@ async def new_deposit(payment_dto: ProcessingPaymentDTO, user_dto: UserDTO, tabl
8897
currency_text=Localizator.get_currency_text(),
8998
status=Localizator.get_text(BotEntity.USER, "status_paid")
9099
)
91-
await NotificationService.edit_message(edited_payment_message, table_payment_dto.message_id, user_dto.telegram_id)
100+
await NotificationService.edit_message(edited_payment_message, table_payment_dto.message_id,
101+
user_dto.telegram_id)
92102
if user_dto.telegram_username:
93103
message = Localizator.get_text(BotEntity.ADMIN, "notification_new_deposit_username").format(
94104
username=user_dto.telegram_username,

0 commit comments

Comments
 (0)