chat ws with pfp is working
This commit is contained in:
@@ -51,7 +51,9 @@ class ChatConsumer(AsyncWebsocketConsumer):
|
||||
"type": "chat.message",
|
||||
"message_id": message.id,
|
||||
"message": message.content,
|
||||
"sender_id": user.id,
|
||||
"sender": user.username,
|
||||
"sender_avatar": user.avatar.url if user.avatar else None,
|
||||
})
|
||||
|
||||
elif msg_type == "new_reply_chat_message":
|
||||
@@ -66,7 +68,9 @@ class ChatConsumer(AsyncWebsocketConsumer):
|
||||
"message_id": message.id,
|
||||
"message": message.content,
|
||||
"reply_to_id": data.get("reply_to_id"),
|
||||
"sender_id": user.id,
|
||||
"sender": user.username,
|
||||
"sender_avatar": user.avatar.url if user.avatar else None,
|
||||
})
|
||||
|
||||
elif msg_type == "reaction":
|
||||
@@ -116,7 +120,9 @@ class ChatConsumer(AsyncWebsocketConsumer):
|
||||
"type": "new_chat_message",
|
||||
"message_id": event["message_id"],
|
||||
"message": event["message"],
|
||||
"sender_id": event["sender_id"],
|
||||
"sender": event["sender"],
|
||||
"sender_avatar": event["sender_avatar"],
|
||||
}))
|
||||
|
||||
async def reply_chat_message(self, event):
|
||||
@@ -125,7 +131,9 @@ class ChatConsumer(AsyncWebsocketConsumer):
|
||||
"message_id": event["message_id"],
|
||||
"message": event["message"],
|
||||
"reply_to_id": event["reply_to_id"],
|
||||
"sender_id": event["sender_id"],
|
||||
"sender": event["sender"],
|
||||
"sender_avatar": event["sender_avatar"],
|
||||
}))
|
||||
|
||||
async def edit_message(self, event):
|
||||
@@ -178,7 +186,8 @@ class ChatConsumer(AsyncWebsocketConsumer):
|
||||
|
||||
@database_sync_to_async
|
||||
def _is_chat_member(chat_id, user):
|
||||
return Chat.objects.filter(pk=chat_id, members=user).exists()
|
||||
from django.db.models import Q
|
||||
return Chat.objects.filter(Q(pk=chat_id), Q(members=user) | Q(owner=user)).exists()
|
||||
|
||||
|
||||
@database_sync_to_async
|
||||
|
||||
Reference in New Issue
Block a user