tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Django

Browse Source 
- fix some bugs with mastchmaking
This commit is contained in:
Kum1ta
2024-09-27 13:05:48 +02:00
parent 6fd802a788
commit 32ae90c399
7 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose/requirements/djangoserver/file/server/server/Game.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/09/13 16:20:58 by tomoron #+# #+# #
# Updated: 2024/09/27 03:54:50 by tomoron ### ########.fr #
# Updated: 2024/09/27 13:04:59 by edbernar ### ########.fr #
# #
# **************************************************************************** #
@ -137,8 +137,8 @@ class Game:
self.p1 = socket
self.p1Skin = skin
else:
if(self.opponentLock != socket.id):
socket.sendError("You are not invited to this game", 9013)
if(self.opponentLock and dself.opponentLock != socket.id):
socket.sendError("You are not invited to this game", 9103)
return;
self.p2 = socket
self.p2Skin = skin

9
docker-compose/requirements/djangoserver/file/server/server/typeRequests/changePrivateInfo.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/09/25 23:28:49 by edbernar #+# #+# #
# Updated: 2024/09/27 03:23:10 by tomoron ### ########.fr #
# Updated: 2024/09/27 10:57:55 by edbernar ### ########.fr #
# #
# **************************************************************************** #
@ -18,21 +18,25 @@ import json
@sync_to_async
def changePrivateInfo(socket, content):
whatChanged = ""
try:
user = User.objects.get(id=socket.id)
if ("delete" in content):
whatChanged = "Delete"
user.delete()
socket.scope["session"].delete()
socket.sync_send(json.dumps({"type": "change_private_info", "content": "Successfully deleted."}))
socket.close()
return;
elif ("username" in content):
whatChanged = "Username"
if (not usernameValid(content.get("username"), socket)):
return
user.username = content["username"]
socket.username = content["username"]
socket.scope["session"]['username'] = content["username"]
elif ("new_password" in content):
whatChanged = "Password"
if (not passwordValid(content.get("new_password"), socket)):
return
if (not content.get("old_password")):
@ -43,6 +47,7 @@ def changePrivateInfo(socket, content):
return
user.password = hashlib.md5((user.mail + content["new_password"]).encode()).hexdigest()
elif ("discord" in content):
whatChanged = "Discord"
if (not discordValid(content.get("discord"), socket)):
return
if (content["discord"] == ""):
@ -54,6 +59,6 @@ def changePrivateInfo(socket, content):
return;
user.save()
socket.scope["session"].save()
socket.sync_send(json.dumps({"type": "change_private_info", "content": "Successfully updated."}))
socket.sync_send(json.dumps({"type": "change_private_info", "content": whatChanged + " successfully updated."}))
except Exception as e:
socket.sendError("An unknown error occured", 9027, e)

6
docker-compose/requirements/djangoserver/file/server/server/utils.py
View File

@ -3,13 +3,15 @@
# ::: :::::::: #
# utils.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/09/27 03:36:08 by tomoron #+# #+# #
# Updated: 2024/09/27 03:36:42 by tomoron ### ########.fr #
# Updated: 2024/09/27 11:23:51 by edbernar ### ########.fr #
# #
# **************************************************************************** #
import random
def genString(length):
letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
return(''.join(random.choice(letters) for i in range(length)))