From 1191d22fd2431678e7d838446cd8220b5e28205c Mon Sep 17 00:00:00 2001 From: mirai Date: Thu, 1 Dec 2022 10:25:11 +0300 Subject: [PATCH] Updated run_server.sh Updated server/server.py --- run_server.sh | 0 server/server.py | 10 ++++++---- 2 files changed, 6 insertions(+), 4 deletions(-) mode change 100644 => 100755 run_server.sh diff --git a/run_server.sh b/run_server.sh old mode 100644 new mode 100755 diff --git a/server/server.py b/server/server.py index 8d77610..f435aad 100644 --- a/server/server.py +++ b/server/server.py @@ -1,9 +1,6 @@ -from email.policy import HTTP -from typing import Any, Coroutine from sanic import Sanic, Request, response from sanic.response import HTTPResponse from cryptography.fernet import Fernet -from sanic.server.websockets.impl import WebsocketImplProtocol import rsa @@ -23,7 +20,12 @@ async def talking(request: Request) -> HTTPResponse: @app.route('/update', methods=["GET", "POST"]) async def talking(request: Request) -> HTTPResponse: - return response.json({"status": actual_messages, "users_in_chat": list(users.keys())}) + return response.json({ + "status": actual_messages, + "users_in_chat": [[username, ip] for username, ip in zip( + users.keys(),users.values() + )] + }) @app.route('/get_key', methods=['GET', 'POST'])