Merge pull request #105 from PROCOLLAB-github/dev

Dev

Author: VeryBigSad

chats/consumers.py

@@ -11,6 +11,7 @@
     WrongChatIdException,
     ChatException,
     UserNotInChatException,
+    UserNotMessageAuthorException,
 )
 from chats.models import (
     BaseChat,
@@ -34,6 +35,7 @@
 from core.utils import get_user_online_cache_key
 from projects.models import Collaborator
 from users.models import CustomUser
+from users.serializers import UserDetailSerializer
 
 
 class ChatConsumer(AsyncJsonWebsocketConsumer):
@@ -97,6 +99,13 @@ async def receive_json(self, content, **kwargs):
                 await self.__process_chat_related_event(event, room_name)
             except ChatException as e:
                 await self.send_json({"error": str(e.get_error())})
+            except KeyError as e:
+                await self.send_json(
+                    {
+                        "error": f"Missing key (might be backend's fault,"
+                        f" but most likely you are missing this field): {e}"
+                    }
+                )
 
         elif event.type in [EventType.SET_ONLINE, EventType.SET_OFFLINE]:
             room_name = EventGroupType.GENERAL_EVENTS
@@ -143,17 +152,19 @@ async def __process_new_direct_message_event(self, event: Event):
             chat_id=chat_id,
             chat_model=DirectChatMessage,
             author=self.user,
-            text=event.content["message"],
+            text=event.content["text"],
             reply_to=event.content["reply_to"],
         )
 
+        # get author of the message's via UserSerializer, check for errors
+        author = await sync_to_async(lambda: (UserDetailSerializer(self.user)).data)()
         content = {
             "type": EventType.NEW_MESSAGE,
             "content": {
                 "message_id": msg.id,
                 "chat_id": msg.chat_id,
                 "chat_type": ChatType.PROJECT,
-                "author_id": msg.author.pk,
+                "author": author,
                 "text": msg.text,
                 "created_at": msg.created_at.timestamp(),
                 "is_edited": msg.is_edited,
@@ -183,10 +194,11 @@ async def __process_new_project_message_event(self, event: Event, room_name: str
             chat_id=chat_id,
             chat_model=ProjectChatMessage,
             author=self.user,
-            text=event.content["message"],
+            text=event.content["text"],
             reply_to=event.content["reply_to"],
         )
 
+        author = await sync_to_async(lambda: (UserDetailSerializer(self.user)).data)()
         await self.channel_layer.group_send(
             room_name,
             {
@@ -195,7 +207,7 @@ async def __process_new_project_message_event(self, event: Event, room_name: str
                     "message_id": msg.id,
                     "chat_id": msg.chat_id,
                     "chat_type": ChatType.PROJECT,
-                    "author_id": msg.author.pk,
+                    "author": author,
                     "text": msg.text,
                     "created_at": msg.created_at.timestamp(),
                     "is_edited": msg.is_edited,
@@ -399,15 +411,20 @@ async def __process_edit_direct_message_event(self, event):
         msg = await sync_to_async(DirectChatMessage.objects.get)(
             pk=event.content["message_id"]
         )
-        msg.text = event.content["message"]
+        if msg.author != self.user:
+            raise UserNotMessageAuthorException(
+                f"User {self.user.id} is not author of message {msg.id}"
+            )
+        msg.text = event.content["text"]
         msg.is_edited = True
         await sync_to_async(msg.save)()
+        author = await sync_to_async(lambda: (UserDetailSerializer(self.user)).data)()
         content = {
             "type": EventType.EDIT_MESSAGE,
             "content": {
                 "message_id": msg.id,
                 "chat_id": msg.chat_id,
-                "author_id": msg.author_id,
+                "author": author,
                 "text": msg.text,
                 "created_at": msg.created_at.timestamp(),
                 "is_edited": msg.is_edited,
@@ -436,13 +453,18 @@ async def __process_edit_project_message_event(self, event, room_name):
         message = await sync_to_async(ProjectChatMessage.objects.get)(
             pk=event.content["message_id"]
         )
+        if message.author != self.user:
+            raise UserNotMessageAuthorException(
+                f"User {self.user.id} is not author of message {message.id}"
+            )
         message.text = event.content["text"]
         message.is_edited = True
         await sync_to_async(message.save)()
+        author = await sync_to_async(lambda: (UserDetailSerializer(self.user)).data)()
         content = {
             "message_id": message.id,
             "chat_id": message.chat_id,
-            "author_id": message.author.pk,
+            "author": author,
             "text": message.text,
             "created_at": message.created_at.timestamp(),
             "is_edited": message.is_edited,

chats/exceptions.py

@@ -15,5 +15,9 @@ class UserNotInChatException(ChatException):
     pass
 
 
+class UserNotMessageAuthorException(ChatException):
+    pass
+
+
 class NonMatchingReplyChatIdException(ChatException):
     pass