new

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,7 +692,7 @@ class OsitcomChatRoom(WebsocketConsumer):
         if self.client_type == 'mobile_admin':
             chat_message_data = model_to_dict(chat_message)
             member = chat_message.member
-            member_data = {
+            chat_message_data['member'] = {
                     'id': member.id,
                     'first_name': member.first_name,  
                     'last_name': member.last_name,
@@ -694,7 +701,6 @@ class OsitcomChatRoom(WebsocketConsumer):
             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)