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

SERVER DE LA MUERTE V2.0

This commit is contained in:
sidya82 2015-04-08 21:28:40 +02:00
parent 6c6a7f87aa
commit 4836141b2d
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
serveur/Server.py
View File

@ -22,8 +22,10 @@ def handleConnection(connection, client_address):
def handleRequest(connection, data):
#try:
arrayData = data.split(" ")
### Command for user with nickname ###
if usersConnected[connection][1] is not None:
if (not arrayData[0][0] == "/"):
if not arrayData[0][0] == "/" and usersConnected[connection][2]:
connection.sendall("SUCC_MESSAGE_SENDED".encode())
broadcastMsg(connection, "NEW_MSG {} {} ".format(usersConnected[connection][1], data))
return
@ -37,27 +39,6 @@ def handleRequest(connection, data):
if arrayData[0] == "/userlistaway":
userListAway(connection)
return
if arrayData[0] == "/askpm":
askPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/acceptpm":
acceptPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/rejectpm":
rejectPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/pm":
privateMsg(connection, arrayData[1], " ".join(arrayData[2:]))
return
if arrayData[0] == "/pmfile":
askFile(connection,arrayData[1],arrayData[2])
return
if arrayData[0] == "/acceptfile":
acceptFile(connection, arrayData[1], arrayData[2],arrayData[3])
return
if arrayData[0] == "/rejectfile":
rejectFile(connection, arrayData[1], " ".join(arrayData[2:]))
return
if arrayData[0] == "/enable":
enableUser(connection)
return
@ -67,8 +48,36 @@ def handleRequest(connection, data):
if arrayData[0] == "/quit":
connection.shutdown(socket.SHUT_RD)
return
### Command available for enable only ###
if not usersConnected[connection][2] :
connection.sendall("ERR_U_ARE_DISABLE".encode())
return
else :
if arrayData[0] == "/askpm":
askPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/acceptpm":
acceptPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/rejectpm":
rejectPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/pm":
privateMsg(connection, arrayData[1], " ".join(arrayData[2:]))
return
if arrayData[0] == "/pmfile":
askFile(connection,arrayData[1],arrayData[2])
return
if arrayData[0] == "/acceptfile":
acceptFile(connection, arrayData[1], arrayData[2],arrayData[3])
return
if arrayData[0] == "/rejectfile":
rejectFile(connection, arrayData[1], " ".join(arrayData[2:]))
return
connection.sendall("ERR_COMMAND_NOT_FOUND".encode())
else:
### Command for user without nickname
if arrayData[0] == "/newname":
newName(connection, arrayData[1])
return