From 2d638061770d95705b87b8e0cb52df79223a6c0e Mon Sep 17 00:00:00 2001 From: sidya82 Date: Thu, 16 Apr 2015 12:37:41 +0200 Subject: [PATCH 1/2] fix ask fil --- server/Server.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/Server.py b/server/Server.py index bd3059d..9cfe1fc 100644 --- a/server/Server.py +++ b/server/Server.py @@ -181,16 +181,16 @@ def handle_request(connection, data): reject_private_message(connection, array_data[1]) return if array_data[0] == "/pm": - private_message(connection, array_data[1], " ".join(array_data[2:])) + private_message(connection, array_data[1], " ".join(array_data[2:]).strip()) return if array_data[0] == "/pmfile": - ask_file(connection, array_data[1], " ".join(array_data[2:])) + ask_file(connection, array_data[1], " ".join(array_data[2:]).strip()) return if array_data[0] == "/acceptfile": - accept_file(connection, array_data[1], " ".join(array_data[3:]), array_data[2]) + accept_file(connection, array_data[1], " ".join(array_data[3:]).strip(), array_data[2]) return if array_data[0] == "/rejectfile": - reject_file(connection, array_data[1], " ".join(array_data[2:])) + reject_file(connection, array_data[1], " ".join(array_data[2:]).strip()) return connection.sendall("{}".format(COMMAND_NOT_FOUND).encode()) else: From cd0452122a41031f31ec1819272ca9cca8ede88a Mon Sep 17 00:00:00 2001 From: sidya82 Date: Thu, 16 Apr 2015 12:38:40 +0200 Subject: [PATCH 2/2] fix ask fil --- server/Server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/Server.py b/server/Server.py index 9cfe1fc..36b976b 100644 --- a/server/Server.py +++ b/server/Server.py @@ -310,7 +310,7 @@ def ask_private_message(connection, pseudo): ERR_ALREADY_ASKED_FOR_PM), Log.lvl.INFO) else: askPM.append(pm) - log.printL("askPm {}".format(askPM), Log.lvl.DEBUG) + #log.printL("askPm {}".format(askPM), Log.lvl.DEBUG) c.sendall("{} {}".format(ASKING_FOR_PM, usersConnected[connection][1]).encode()) log.printL("Send to {} : {} {}".format(usersConnected[c][0], ASKING_FOR_PM, usersConnected[connection][1]), Log.lvl.INFO)