From 3b3dcff28ba115aa89ea2087ab18cfb9cc2d149b Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 15:37:45 +0200 Subject: [PATCH] Only give the focus to a private channel if it wasn't previously created Signed-off-by: Emmy D'Anello --- chat/consumers.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/chat/consumers.py b/chat/consumers.py index f120ee0..6e65614 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -152,6 +152,18 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): await channel.asave() await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name) + + if user != other_user: + await self.channel_layer.group_send(f"user-{other_user.id}", { + 'type': 'chat.start_private_chat', + 'channel': { + 'id': channel.id, + 'name': f"{user.first_name} {user.last_name}", + 'category': channel.category, + 'read_access': True, + 'write_access': True, + } + }) else: channel = await channel_qs.afirst() @@ -165,17 +177,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'write_access': True, } }) - if user != other_user: - await self.channel_layer.group_send(f"user-{other_user.id}", { - 'type': 'chat.start_private_chat', - 'channel': { - 'id': channel.id, - 'name': f"{user.first_name} {user.last_name}", - 'category': channel.category, - 'read_access': True, - 'write_access': True, - } - }) async def chat_send_message(self, message) -> None: await self.send_json({'type': 'send_message', 'id': message['id'], 'channel_id': message['channel_id'],