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

Fix unread messages count 

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
Emmy D'Anello 2024-04-29 00:39:08 +02:00
parent 90bec6bf5e
commit bd416318ac
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chat/consumers.py
View File

@ -3,7 +3,7 @@
from channels.generic.websocket import AsyncJsonWebsocketConsumer from channels.generic.websocket import AsyncJsonWebsocketConsumer
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db.models import Count, Exists, OuterRef, Q from django.db.models import Count, F, Q
from registration.models import Registration from registration.models import Registration
from .models import Channel, Message from .models import Channel, Message
@ -93,7 +93,9 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
'unread_messages': channel.unread_messages, 'unread_messages': channel.unread_messages,
} }
async for channel in self.read_channels.prefetch_related('invited') async for channel in self.read_channels.prefetch_related('invited')
.annotate(unread_messages=Count('messages', filter=~Q(messages__users_read=user))).all() .annotate(total_messages=Count('messages', distinct=True))
.annotate(read_messages=Count('messages', filter=Q(messages__users_read=user), distinct=True))
.annotate(unread_messages=F('total_messages') - F('read_messages')).all()
] ]
} }
await self.send_json(message) await self.send_json(message)
@ -160,8 +162,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
messages = Message.objects \ messages = Message.objects \
.filter(channel=channel) \ .filter(channel=channel) \
.annotate(read=Exists(User.objects.filter(pk=self.scope['user'].pk) .annotate(read=Count('users_read', filter=Q(users_read=self.scope['user']))) \
.filter(pk=OuterRef('users_read')))) \
.order_by('-created_at')[offset:offset + limit].all() .order_by('-created_at')[offset:offset + limit].all()
await self.send_json({ await self.send_json({
'type': 'fetch_messages', 'type': 'fetch_messages',
@ -173,7 +174,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
'author_id': message.author_id, 'author_id': message.author_id,
'author': await message.aget_author_name(), 'author': await message.aget_author_name(),
'content': message.content, 'content': message.content,
'read': message.read, 'read': message.read > 0,
} }
async for message in messages async for message in messages
])) ]))
@ -239,7 +240,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
'content': message['content']}) 'content': message['content']})
async def chat_edit_message(self, message) -> None: async def chat_edit_message(self, message) -> None:
print(message)
await self.send_json({'type': 'edit_message', 'id': message['id'], 'channel_id': message['channel_id'], await self.send_json({'type': 'edit_message', 'id': message['id'], 'channel_id': message['channel_id'],
'content': message['content']}) 'content': message['content']})

1
chat/static/chat.js
View File

@ -157,6 +157,7 @@ function fetchPreviousMessages() {
} }
function receiveFetchedMessages(data) { function receiveFetchedMessages(data) {
console.log(data)
let channel_id = data['channel_id'] let channel_id = data['channel_id']
let new_messages = data['messages'] let new_messages = data['messages']