From f5a0ba86b11f37baa0b26e90a418a84a0c5c06b2 Mon Sep 17 00:00:00 2001 From: urec56 Date: Thu, 29 Aug 2024 18:33:51 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D1=8C=D0=BC=D0=B0=20=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F/=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BE=D0=BE?= =?UTF-8?q?=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/dao/message.py | 8 ++++++++ app/services/chat_service.py | 3 +-- app/tasks/email_templates.py | 10 +++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/dao/message.py b/app/dao/message.py index 8c3924f..98d5dce 100644 --- a/app/dao/message.py +++ b/app/dao/message.py @@ -41,6 +41,10 @@ class MessageDAO: async def delete_message(self, message_id: UUID) -> None: await self.message.update_one({"id": str(message_id)}, {"$set": {"visibility": False}}) + await self.message.update_one( + {"answer_id": str(message_id)}, + {"$set": {"answer_message": None, "answer_image_url": None}} + ) async def get_some_messages(self, chat_id: int, message_number_from: int, messages_to_get: int) -> SMessageRawList: cursor = self.message.find({"visibility": True, "chat_id": chat_id}) @@ -52,6 +56,10 @@ class MessageDAO: {"id": str(message_id)}, {"$set": {"message": new_message, "image_url": new_image_url}} ) + await self.message.update_one( + {"answer_id": str(message_id)}, + {"$set": {"answer_message": new_message, "answer_image_url": new_image_url}} + ) async def get_messages_from_ids(self, messages_ids: list[UUID]) -> SMessageRawList: cursor = self.message.find({"visibility": True, "id": {"$in": [str(message_id) for message_id in messages_ids]}}) diff --git a/app/services/chat_service.py b/app/services/chat_service.py index 53ef656..2419e3b 100644 --- a/app/services/chat_service.py +++ b/app/services/chat_service.py @@ -3,8 +3,7 @@ from urllib.parse import urljoin from pydantic import ValidationError -from app.chat.exceptions import UserDontHavePermissionException, UserCanNotReadThisChatException, \ - UserAlreadyInChatException +from app.chat.exceptions import UserDontHavePermissionException, UserCanNotReadThisChatException from app.chat.shemas import SAllowedChats, SChangeData, SPinnedChats, SChat from app.config import settings from app.services.redis_service import RedisService diff --git a/app/tasks/email_templates.py b/app/tasks/email_templates.py index 09e463c..5bdb5f8 100644 --- a/app/tasks/email_templates.py +++ b/app/tasks/email_templates.py @@ -26,15 +26,15 @@ def create_registration_confirmation_template( Submiting + padding: 0;"> - - + + - - + +