diff --git a/party/chat.py b/party/chat.py index e0e177a..f6f263f 100644 --- a/party/chat.py +++ b/party/chat.py @@ -1,4 +1,4 @@ -from pymongo import MongoClient, DESCENDING, ASCENDING +from pymongo import MongoClient from datetime import datetime class Chat: @@ -17,7 +17,7 @@ class Chat: @classmethod def getAllMessages(self)-> list[dict]: - messages = self.collection.find().sort('timestamp', DESCENDING) + messages = self.collection.find().sort('timestamp', 1) return list(messages) @classmethod @@ -34,19 +34,11 @@ class Chat: messages = list(self.collection.find() .skip(skip) .limit(count) - .sort('timestamp', DESCENDING)) + .sort('timestamp', 1)) + print(messages) return messages - @classmethod - def sortMessages(self, messages: list[dict], order: str) -> list[dict]: - if order == 'asc': - return sorted(messages, key=lambda message: message['timestamp']) - elif order == 'desc': - return sorted(messages, key=lambda message: message['timestamp'], reverse=True) - else: - return messages - @classmethod def convertToMessage(self, content: str, author: str, timestamp: str) -> dict: message = { diff --git a/party/static/js/chat.js b/party/static/js/chat.js index 410bab7..b246bc3 100644 --- a/party/static/js/chat.js +++ b/party/static/js/chat.js @@ -1,5 +1,5 @@ function getNChatMessages(socket, count, skip) { - socket.emit('chat-get-messages', { count: 100, skip: 0 }, (data) => { + socket.emit('chat-get-messages', { count: 170, skip: 0 }, (data) => { sessionStorage['alreadyLoadedMessages'] += 100; let message_array = []; // dont fucking touch this