The system for responding to likes has been redesigned

Author: devvsima

app/handlers/dating/inbox.py

@@ -3,8 +3,10 @@
 from aiogram import F, types
 from aiogram.filters.state import StateFilter
 from aiogram.fsm.context import FSMContext
+from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.business.dating_service import send_user_like_alert
 from app.business.profile_service import complaint_to_profile, send_profile_with_dist
 from app.constans import EFFECTS_DICTIONARY
 from app.handlers.common.start import start_command
@@ -14,10 +16,50 @@
 from app.states.default import LikeResponse
 from app.text import message_text as mt
 from database.models import UserModel
+from database.models.match import MatchModel, MatchStatus
 from database.services import Match, Profile, User
 from loader import bot
 
 
+async def _send_mutual_like_notifications(session: AsyncSession, user: UserModel) -> None:
+    """
+    Отправляет уведомления о взаимных лайках для матчей со статусом Accepted,
+    которые исходят от пользователя
+    """
+    effect_id = EFFECTS_DICTIONARY["🎉"]
+
+    # Найти все матчи со статусом Accepted, где пользователь является отправителем
+    result = await session.execute(
+        select(MatchModel)
+        .where(MatchModel.sender_id == user.id)
+        .where(MatchModel.status == MatchStatus.Accepted)
+        .where(MatchModel.is_active == True)
+    )
+    accepted_matches = result.scalars().all()
+    for match in accepted_matches:
+        try:
+            # Получаем профиль получателя
+            receiver = await User.get_with_profile(session, match.receiver_id)
+            await send_profile_with_dist(session=session, user=user, profile=receiver.profile)
+            if receiver and receiver.profile:
+                # Генерируем ссылку и текст
+                link = generate_user_link(id=receiver.id, username=receiver.username)
+                text = mt.LIKE_ACCEPT(user.language).format(
+                    link, html.escape(receiver.profile.name)
+                )
+
+                # Отправляем уведомление
+                await bot.send_message(
+                    chat_id=user.id, text=text, message_effect_id=effect_id, parse_mode="HTML"
+                )
+
+                # Деактивируем матч, чтобы не отправлять уведомление повторно
+                await Match.update(session=session, id=match.id, is_active=False)
+
+        except Exception as e:
+            pass
+
+
 @dating_router.message(StateFilter(None), F.text == "📭")
 async def match_archive(
     message: types.Message, state: FSMContext, user: UserModel, session: AsyncSession
@@ -30,18 +72,21 @@ async def match_archive(
         username=message.from_user.username,
     )  # needs to be redone
 
+    # Проверяем и отправляем уведомления о взаимных лайках
+    await _send_mutual_like_notifications(session, user)
+
     if liker_ids := await Match.get_user_matchs(session, message.from_user.id):
-        text = mt.ARCHIVE_SEARCH.format(len(liker_ids))
+        text = mt.ARCHIVE_SEARCH(user.language).format(len(liker_ids))
         await message.answer(text=text, reply_markup=match_kb)
 
         await state.update_data(ids=liker_ids)
         profile = await Profile.get(session, liker_ids[0])
         match_data = await Match.get(session, user.id, profile.id)
         await send_profile_with_dist(user=user, profile=profile, session=session)
         if match_data and match_data.message:
-            await message.answer(mt.MESSAGE_TO_YOU.format(match_data.message))
+            await message.answer(mt.MESSAGE_TO_YOU(user.language).format(match_data.message))
     else:
-        await message.answer(mt.LIKE_ARCHIVE)
+        await message.answer(mt.LIKE_ARCHIVE(user.language))
         await start_command(message=message, user=user, state=state)
 
 
@@ -56,19 +101,31 @@ async def _match_atchive_callback(
         id=user.id,
         username=callback.from_user.username,
     )  # needs to be redone
-    await callback.message.answer(text=mt.SEARCH, reply_markup=match_kb)
+    await callback.message.answer(text=mt.SEARCH(user.language), reply_markup=match_kb)
     await callback.answer()
 
+    # Проверяем и отправляем уведомления о взаимных лайках
+    await _send_mutual_like_notifications(session, user)
+
     if liker_ids := await Match.get_user_matchs(session, callback.from_user.id):
         await state.update_data(ids=liker_ids)
         profile = await Profile.get(session, liker_ids[0])
         match_data = await Match.get(session, user.id, profile.id)
         await send_profile_with_dist(user=user, profile=profile, session=session)
         if match_data and match_data.message:
-            await callback.message.answer(mt.MESSAGE_TO_YOU.format(match_data.message))
+            await callback.message.answer(
+                mt.MESSAGE_TO_YOU(user.language).format(match_data.message)
+            )
     else:
-        await callback.message.answer(mt.LIKE_ARCHIVE)
-        await start_command(callback.message, user=user, state=state)
+        # from app.keyboards.default.base import menu_kb
+
+        await callback.message.answer(mt.LIKE_ARCHIVE(user.language))
+        # await state.clear()
+        # await callback.message.answer(
+        #     mt.MENU,
+        #     reply_markup=menu_kb,
+        # )
+        await start_command(message=callback.message, user=user, state=state)
 
 
 @dating_router.message(
@@ -82,27 +139,17 @@ async def _match_response(
     ids = data.get("ids")
 
     another_user = await User.get_with_profile(session, ids[0])
+    match_data = await Match.get(session, user.id, another_user.id)
 
     if message.text == "❤️":
-        effect_id = EFFECTS_DICTIONARY["🎉"]
         """Отправка пользователю который ответил на лайк"""
-        link = generate_user_link(id=another_user.id, username=another_user.username)
-        text = mt.LIKE_ACCEPT(another_user.language).format(
-            link, html.escape(another_user.profile.name)
-        )
-        try:
-            await bot.send_message(chat_id=user.id, text=text, message_effect_id=effect_id)
-        except:
-            ...
-        """Отправка пользователю которому ответили на лайк"""
-        link = generate_user_link(id=user.id, username=user.username)
-        text = mt.LIKE_ACCEPT_ALERT(user.language).format(link, html.escape(user.profile.name))
-        try:
-            await bot.send_message(chat_id=another_user.id, text=text, message_effect_id=effect_id)
-        except:
-            ...
+        await like_accept(session=session, user=user, another_user=another_user, match=match_data)
     elif message.text == "👎":
         pass
+        await Match.update(
+            session=session, id=match_data.id, status=MatchStatus.Rejected, is_active=False
+        )
+
     elif message.text == "💢":
         await message.answer(mt.COMPLAINT, reply_markup=compleint_kb())
         return
@@ -115,8 +162,8 @@ async def _match_response(
             reason=message.text,
         )
     elif message.text == "↩️":
-        await message.answer(mt.SEARCH, reply_markup=match_kb)
-    await Match.delete(session, user.id, another_user.id)
+        await message.answer(mt.SEARCH(user.language), reply_markup=match_kb)
+    # await Match.delete(session, user.id, another_user.id)
 
     ids.pop(0)
     await state.update_data(ids=ids)
@@ -125,9 +172,9 @@ async def _match_response(
         match_data = await Match.get(session, user.id, profile.id)
         await send_profile_with_dist(user=user, profile=profile, session=session)
         if match_data and match_data.message:
-            await message.answer(mt.MESSAGE_TO_YOU.format(match_data.message))
+            await message.answer(mt.MESSAGE_TO_YOU(user.language).format(match_data.message))
     else:
-        await message.answer(mt.EMPTY_PROFILE_SEARCH)
+        await message.answer(mt.EMPTY_PROFILE_SEARCH(user.language))
         await start_command(message=message, user=user, state=state)
 
 
@@ -140,3 +187,39 @@ def generate_user_link(id: int, username: str = None) -> str:
     if username:
         return f"https://t.me/{username}"
     return f"tg://user?id={id}"
+
+
+async def like_accept(
+    session: AsyncSession, user: UserModel, another_user: UserModel, match: MatchModel
+):
+    effect_id = EFFECTS_DICTIONARY["🎉"]
+    if match.status == MatchStatus.Accepted:
+        # Если изначальный отправитель получил взимный лайк и зашел в inbox
+        sender = user
+        reciver = another_user
+        await Match.update(session=session, id=match.id, is_active=False)
+
+        link = generate_user_link(id=reciver.id, username=reciver.username)
+        text = mt.LIKE_ACCEPT(sender.language).format(link, html.escape(reciver.profile.name))
+        try:
+            await bot.send_message(
+                chat_id=sender.id, text=text, message_effect_id=effect_id, parse_mode="HTML"
+            )
+        except:
+            ...
+
+    else:
+        # Если изначальный отправитель не этот же человек
+        sender = another_user
+        reciver = user
+        await Match.update(session=session, id=match.id, status=MatchStatus.Accepted)
+        await send_user_like_alert(session, sender)
+
+        link = generate_user_link(id=sender.id, username=sender.username)
+        text = mt.LIKE_ACCEPT(reciver.language).format(link, html.escape(sender.profile.name))
+        try:
+            await bot.send_message(
+                chat_id=reciver.id, text=text, message_effect_id=effect_id, parse_mode="HTML"
+            )
+        except:
+            ...

app/handlers/dating/search.py

@@ -15,7 +15,6 @@
 from app.text import message_text as mt
 from database.models import UserModel
 from database.services import Match, Profile, User
-from database.services.complaint import Compleint
 from database.services.search import search_profiles
 
 
@@ -25,7 +24,7 @@ async def _search_command(
 ) -> None:
     """Бот подбирает анкеты, соответствующие предпочтениям пользователя, и предлагает их"""
 
-    await message.answer(mt.SEARCH, reply_markup=search_kb)
+    await message.answer(mt.SEARCH(user.language), reply_markup=search_kb)
 
     if profile_list := await search_profiles(session, user.profile):
         await state.set_state(Search.search)
@@ -66,7 +65,7 @@ async def _search_profile(
         pass
     elif message.text == "📩":
         await state.set_state(Search.message)
-        await message.answer(mt.MAILING_TO_USER, reply_markup=return_to_menu_kb)
+        await message.answer(mt.MAILING_TO_USER(user.language), reply_markup=return_to_menu_kb)
         return
 
     if message.text == "💢":
@@ -109,7 +108,7 @@ async def _search_profile_mailing_(
     await state.set_state(Search.search)
 
     if message.text == "↩️":
-        await message.answer(mt.CANNCELED_LETTER, reply_markup=search_kb)
+        await message.answer(mt.CANNCELED_LETTER(user.language), reply_markup=search_kb)
         await send_profile_with_dist(user=user, profile=another_user.profile, session=session)
 
         return
@@ -142,7 +141,7 @@ async def next_profile(
         await state.update_data(ids=profile_list)
         await send_profile_with_dist(user=user, profile=profile, session=session)
     else:
-        await message.answer(mt.EMPTY_PROFILE_SEARCH)
+        await message.answer(mt.EMPTY_PROFILE_SEARCH(user.language))
         await start_command(message=message, user=user, state=state)
 
 
@@ -155,6 +154,6 @@ async def like_profile(
     is_create = await Match.create(session, message.from_user.id, another_user.id, mail_text)
 
     if is_create:
-        matchs_count = len(await Match.get_user_matchs(session, message.from_user.id))
+        matchs_count = len(await Match.get_user_matchs(session, another_user.id))
         if matchs_count == 1 or matchs_count % 3 == 0:
             await send_user_like_alert(session, another_user)

app/middlewares/__init__.py

@@ -20,12 +20,14 @@ def setup_middlewares(dp: Dispatcher) -> None:
     common_router.message.middleware(CommonMiddleware())
     common_router.callback_query.middleware(CommonMiddleware())
     common_router.message.middleware(i18n_middleware)
+    common_router.callback_query.middleware(i18n_middleware)
 
     dating_router.message.middleware(LoggingMiddleware())
     dating_router.callback_query.middleware(LoggingMiddleware())
     dating_router.message.middleware(DatingMiddleware())
     dating_router.callback_query.middleware(DatingMiddleware())
     dating_router.message.middleware(i18n_middleware)
+    dating_router.callback_query.middleware(i18n_middleware)
 
     admin_router.message.middleware(LoggingMiddleware())
     admin_router.callback_query.middleware(LoggingMiddleware())

app/text.py

@@ -97,21 +97,17 @@ def ACTIVATE_PROFILE_ALERT(self):
         return _("✅ Твоя анкета успешно восстановлена! Теперь ты снова можешь пользоваться ботом.")
 
     # Поиск анкет
-    @property
-    def SEARCH(self):
-        return _("🔍 Выполняется поиск...")
+    def SEARCH(self, language: str = None):
+        return _("🔍 Выполняется поиск...", locale=language)
 
-    @property
-    def ARCHIVE_SEARCH(self):
-        return _("Твоя анкета понравилась {} людям! Давай посмотрим, кто это:")
+    def ARCHIVE_SEARCH(self, language: str = None):
+        return _("Твоя анкета понравилась {} людям! Давай посмотрим, кто это:", locale=language)
 
-    @property
-    def INVALID_PROFILE_SEARCH(self):
-        return _("Подходящих анкет не найдено. Попробуй выбрать другой город. 🌍")
+    def INVALID_PROFILE_SEARCH(self, language: str = None):
+        return _("Подходящих анкет не найдено. Попробуй выбрать другой город. 🌍", locale=language)
 
-    @property
-    def EMPTY_PROFILE_SEARCH(self):
-        return _("Анкеты закончились. Попробуй позже! 😊")
+    def EMPTY_PROFILE_SEARCH(self, language: str = None):
+        return _("Анкеты закончились. Попробуй позже! 😊", locale=language)
 
     # Лайки и сообщения
     def LIKE_PROFILE(self, language: str):
@@ -120,9 +116,8 @@ def LIKE_PROFILE(self, language: str):
             locale=language,
         )
 
-    @property
-    def LIKE_ARCHIVE(self):
-        return _("Пока никто не поставил тебе лайк, но всё ещё впереди!")
+    def LIKE_ARCHIVE(self, language: str = None):
+        return _("Пока никто не поставил тебе лайк, но всё ещё впереди!", locale=language)
 
     def LIKE_ACCEPT(self, language: str):
         return _("Надеюсь вы хорошо проведете время ;) <a href='{}'>{}</a>", locale=language)
@@ -133,9 +128,8 @@ def LIKE_ACCEPT_ALERT(self, language: str):
             locale=language,
         )
 
-    @property
-    def MESSAGE_TO_YOU(self):
-        return _("Сообщение для тебя:\n{}")
+    def MESSAGE_TO_YOU(self, language: str = None):
+        return _("Сообщение для тебя:\n{}", locale=language)
 
     # Сообщения и рассылка
     @property

database/models/match.py

@@ -19,3 +19,4 @@ class MatchModel(BaseModel):
     receiver_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
     message: Mapped[str] = mapped_column(String(250), nullable=True)
     status: Mapped[int] = mapped_column(Integer, server_default="1")
+    is_active: Mapped[bool] = mapped_column(server_default="True", nullable=False)