From 2af8d34729f24824c84831c580bdec2524f43e50 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 14 Jul 2023 06:40:58 +0200 Subject: [PATCH] init chat before starting server so it doesn't check wether it has been inited everytime chat is called --- party/chat.py | 6 ++++++ party/main.py | 10 ++++------ party/static/css/session.css | 3 +-- scripts/generate_mock_messages.py | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/party/chat.py b/party/chat.py index 0cad491..1f456ce 100644 --- a/party/chat.py +++ b/party/chat.py @@ -22,6 +22,12 @@ class Chat: def insertMessage(self, content: str, author: str, timestamp: str): self.collection.insert_one(self.convertToMessage(content, author, timestamp)) + @classmethod + def getNext100Messages(self, skip: int) -> list[dict]: + return list(self.collection.find() + .skip(skip) + .limit(100)) + @classmethod def convertToMessage(self, content: str, author: str, timestamp: str) -> dict: message = { diff --git a/party/main.py b/party/main.py index cd343a6..c483441 100644 --- a/party/main.py +++ b/party/main.py @@ -69,12 +69,9 @@ def api_mate_trinken(row, column): @app.route('/api/chat/', methods=['GET']) def api_chat(): - if not Chat.initialized: - Chat.init() - messages = Chat.getAllMessages() - print(messages) - response = jsonify(success=True, messages=json_util.dumps(messages)) - response.status_code = 200 + messages = Chat.getNext100Messages(0) # 0 offset print(messages) + response = jsonify(success=True, messages=json_util.dumps(messages)) + response.status_code = 200 return response @socketio.on('chat-message') @@ -112,5 +109,6 @@ def page_not_found(error): return render_template('404.html'), response if __name__ == '__main__': + Chat.init() socketio.run(app, debug=True, host='localhost', port=5000) #pragma: no cover diff --git a/party/static/css/session.css b/party/static/css/session.css index c925884..f736f16 100644 --- a/party/static/css/session.css +++ b/party/static/css/session.css @@ -425,6 +425,5 @@ margin-right: auto; #chatBox { background-color: green; - max-height: 200px; - height: 70%; + max-height: 600px; } diff --git a/scripts/generate_mock_messages.py b/scripts/generate_mock_messages.py index ac54b6f..a8ebfff 100644 --- a/scripts/generate_mock_messages.py +++ b/scripts/generate_mock_messages.py @@ -8,6 +8,6 @@ Chat.init() def generate_message(): Chat.insertMessage(fake.text(), fake.name(), fake.date_time().isoformat()) -MESSAGE_COUNT = 1000 +MESSAGE_COUNT = 100000 for i in range(MESSAGE_COUNT): generate_message()