From ba5128aa8db45a116c0f036c699d0773c4402206 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 21 Mar 2020 16:49:54 -0600 Subject: [PATCH] fix silly bug --- chat_box/consumers.py | 7 +++---- resources/base.scss | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chat_box/consumers.py b/chat_box/consumers.py index 4d6599b..1588053 100644 --- a/chat_box/consumers.py +++ b/chat_box/consumers.py @@ -33,6 +33,8 @@ class ChatConsumer(AsyncWebsocketConsumer): async def receive(self, text_data): text_data_json = json.loads(text_data) message = text_data_json['message'] + time = save_data_and_get_time(message) + message['time'] = format_time(time) # Send message to room group await self.channel_layer.group_send( @@ -46,8 +48,6 @@ class ChatConsumer(AsyncWebsocketConsumer): # Receive message from room group async def chat_message(self, event): message = event['message'] - time = save_data_and_get_time(message) - message['time'] = format_time(time) # Send message to WebSocket await self.send(text_data=json.dumps({ 'message': message, @@ -58,8 +58,7 @@ class ChatConsumer(AsyncWebsocketConsumer): def save_data_and_get_time(message): new_message = Message(body=message['body'], author=Profile.objects - .get(id=message['author_id']), + .get(pk=message['author_id']), ) new_message.save() - HttpResponseRedirect(reverse('chat')) return new_message.time diff --git a/resources/base.scss b/resources/base.scss index bd7b002..6c624ad 100644 --- a/resources/base.scss +++ b/resources/base.scss @@ -115,6 +115,7 @@ body { font-family: "Segoe UI", "Lucida Grande", Arial, sans-serif; color: #000; height: 100%; + overflow-x: hidden; } .unselectable {