upd: errors

likeinlife · Feb 17, 2024 · b78ad51 · b78ad51
1 parent a5ba2b4
commit b78ad51
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/cartography/errors.py b/src/cartography/errors.py
@@ -11,20 +11,20 @@ def __init__(self, info: Any) -> None:
 
 
 class PartNomenclatureError(AdditionalInputMixin):
-    msg = "Invalid part"
+    msg = "Некорректная часть номенклатуры"
 
 
 class InvalidLatitudeOrLongitude(AdditionalInputMixin):
-    msg = "Invalid latitude or longitude"
+    msg = "Некорректные координаты"
 
 
 class NoLatitudeCharError(AdditionalInputMixin):
-    msg = "Invalid latitude char"
+    msg = "Некорректная широта"
 
 
 class NoLongitudeIndexError(AdditionalInputMixin):
-    msg = "Invalid longitude index"
+    msg = "Некорректная долгота"
 
 
 class InvalidNomenclatureTitleError(AdditionalInputMixin):
-    msg = "Invalid nomenclature part"
+    msg = "Некорректная номенклатура"
diff --git a/src/tg_bot/handlers/nomenclature_title.py b/src/tg_bot/handlers/nomenclature_title.py
@@ -27,10 +27,7 @@ async def nomenclature_title_handler(
 
     images = NomenclatureFacade.generate_from_nomenclature(message.text)
 
-    media_group: list[InputMediaPhoto] = []
-    for image in images:
-        document = BufferedInputFile(image, "jpeg")
-        media_group.append(InputMediaPhoto(media=document))
+    media_group = [InputMediaPhoto(media=BufferedInputFile(image, "jpeg")) for image in images]
 
     await message.answer_media_group(media_group)  # type: ignore
     await state.clear()
diff --git a/src/tg_bot/middlewares.py b/src/tg_bot/middlewares.py
@@ -56,12 +56,12 @@ async def __call__(
                 logger.error(e.msg, username=event.from_user.username, chat_id=event.from_user.id)
                 await event.answer(e.msg)
             if isinstance(event, Message):
-                logger.error(e.msg, username=event.from_user.username, chat_id=event.from_user.id)  # type: ignore
+                logger.error(e.msg, username=event.chat.username, chat_id=event.chat.id)
                 await event.answer(e.msg)
         except Exception as e:
             if isinstance(event, CallbackQuery):
                 logger.error(e, username=event.from_user.username, chat_id=event.from_user.id, exc_info=True)
                 await event.answer("Unexpected error")
             if isinstance(event, Message):
-                logger.error(e, username=event.from_user.username, chat_id=event.from_user.id, exc_info=True)  # type: ignore
+                logger.error(e, username=event.chat.username, chat_id=event.chat.id, exc_info=True)
                 await event.answer("Unexpected error")