From 6f74287a408a5883d2645a39637f09657f81b8d4 Mon Sep 17 00:00:00 2001 From: emile Date: Mon, 2 Sep 2024 09:06:21 +0300 Subject: [PATCH] new --- osinaweb/osichat/consumers.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py index 26e99ce0..7e1eed9d 100644 --- a/osinaweb/osichat/consumers.py +++ b/osinaweb/osichat/consumers.py @@ -576,6 +576,13 @@ class OsitcomChatRoom(WebsocketConsumer): for message in chat_room_messages: message_data = model_to_dict(message) attachment = getattr(message, 'chatmessageattachment', None) + member = message.member + message_data['member'] = { + 'id': member.id, + 'first_name': member.first_name, + 'last_name': member.last_name, + 'image': member.staffprofile.image + } if attachment: message_data['attachment'] = { 'attachment': attachment.attachment, @@ -685,16 +692,15 @@ class OsitcomChatRoom(WebsocketConsumer): if self.client_type == 'mobile_admin': chat_message_data = model_to_dict(chat_message) member = chat_message.member - member_data = { - 'id': member.id, - 'first_name': member.first_name, - 'last_name': member.last_name, - 'image': member.staffprofile.image + chat_message_data['member'] = { + 'id': member.id, + 'first_name': member.first_name, + 'last_name': member.last_name, + 'image': member.staffprofile.image } self.send(text_data=json.dumps({ 'event_type': 'send_message', 'chat_message_data': chat_message_data, - 'member_data': member_data },cls=DjangoJSONEncoder)) elif self.client_type == 'website_admin': html = render_to_string("chat_templates/partials/message.html", context=context)