QRouland/L3DNC
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BG 63

Browse Source
This commit is contained in:
sidya82 2015-04-08 10:08:59 +02:00
parent a618447482
commit 63f7b0cac4
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
serveur/Server.py
View File

@ -47,7 +47,7 @@ def handleRequest(connection, data):
rejectPrivateMsg(connection, arrayData[1]) rejectPrivateMsg(connection, arrayData[1])
return return
if arrayData[0] == "/pm": if arrayData[0] == "/pm":
privateMsg(connection, arrayData[1], arrayData[2:]) privateMsg(connection, arrayData[1], " ".join(arrayData[2:]))
return return
if arrayData[0] == "/enable": if arrayData[0] == "/enable":
enableUser(connection) enableUser(connection)
@ -154,8 +154,17 @@ def rejectPrivateMsg(connection, pseudo):
connection.sendall("ERR_USER_NOT_FOUND".encode()) connection.sendall("ERR_USER_NOT_FOUND".encode())
else: else:
pm = (c, connection) pm = (c, connection)
pmr = (connection, c)
if pm not in askPM: if pm not in askPM:
connection.sendall("ERR_USER_HAS_NOT_ASK".encode()) if pm in validatePM :
validatePM.remove(pm)
connection.sendall("SUCC_PRIVATE_DISCUSSION_REFUSED".encode())
else :
if pmr in validatePM:
validatePM.remove(pmr)
connection.sendall("SUCC_PRIVATE_DISCUSSION_REFUSED".encode())
else :
connection.sendall("ERR_USER_HAS_NOT_ASK".encode())
else: else:
askPM.remove(pm) askPM.remove(pm)
connection.sendall("SUCC_PRIVATE_DISCUSSION_REFUSED".encode()) connection.sendall("SUCC_PRIVATE_DISCUSSION_REFUSED".encode())