ynerant
/
plateforme-tfjm2
mirror of https://gitlab.com/animath/si/plateforme.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Only give the focus to a private channel if it wasn't previously created 

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
Emmy D'Anello 2024-04-28 15:37:45 +02:00
parent d6aa5eb0cc
commit 3b3dcff28b
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chat/consumers.py
View File

@ -152,6 +152,18 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
await channel.asave() await channel.asave()
await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name) 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: else:
channel = await channel_qs.afirst() channel = await channel_qs.afirst()
@ -165,17 +177,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
'write_access': True, '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: async def chat_send_message(self, message) -> None:
await self.send_json({'type': 'send_message', 'id': message['id'], 'channel_id': message['channel_id'], await self.send_json({'type': 'send_message', 'id': message['id'], 'channel_id': message['channel_id'],