From c54b039ab1cad15e9cf403e7acf5e815dc6994a4 Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Wed, 20 Nov 2024 14:21:47 +0100
Subject: [PATCH 1/2] add limitations to messages to prevent empty messages or
 too long messages

---
 .../server/server/typeRequests/sendPrivateMessage.py   | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
index df2ba63..3b59eab 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/04 13:44:11 by edbernar          #+#    #+#              #
-#    Updated: 2024/09/14 18:32:14 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/20 14:20:37 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -17,12 +17,6 @@ import json
 
 @sync_to_async
 def sendPrivateMessage(socket, content):
-	# |Tom| Requete pour vérifier si l'user existe 
-	# Si user existe pas, faire ça : socket.sendError("User not found", 9008)
-	# Sinon l'ajouter à la base de données
-	# |Eddy| Si user existe, envoyer le message privé aux deux personnes concernées
-	# sachant que le receveur doit être connecté. Dans le cas contraire, uniquement
-	# l'envoyeur recevra le message.
 
 	try:
 		dest = User.objects.filter(id=content["to"])
@@ -30,7 +24,7 @@ def sendPrivateMessage(socket, content):
 			socket.sendError("User not found", 9008)
 			return
 		user = User.objects.filter(id=socket.id)
-		if(int(content["to"]) == user[0].id):
+		if(int(content["to"]) == user[0].id or len(content["content"]) == 0 or len(content["content"] > 2000)):
 			socket.sendError("Invalid message sent", 9009)
 		new_msg = Message.objects.create(sender=user[0], to=dest[0], content=content["content"])
 		new_msg.save()

From 8bb0dc445f60949961612a30d0d30402c7e2508d Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Wed, 20 Nov 2024 14:50:19 +0100
Subject: [PATCH 2/2] handle deleted user in stats

---
 .../djangoserver/file/server/server/models.py        |  2 +-
 .../file/server/server/typeRequests/getUserInfo.py   | 12 +++++++++---
 .../server/server/typeRequests/sendPrivateMessage.py |  5 ++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/models.py b/docker-compose/requirements/djangoserver/file/server/server/models.py
index 602a6fd..920c578 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/models.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/models.py
@@ -8,7 +8,7 @@ class User(models.Model):
 	id42 = models.DecimalField(max_digits=15, decimal_places=0, null=True, unique=True)
 	pfp = models.CharField(max_length=1024, default="/static/img/default_pfp.jpg")
 	banner = models.CharField(max_length=1024, default="/static/img/default_banner.jpg")
-	mail_verified = models.BooleanField(default=True)
+	mail_verified = models.BooleanField(default=False)
 	github_link = models.CharField(max_length=1024, null=True, blank=True, default=None)
 	discord_username = models.CharField(max_length=1024, null=True, blank=True, default=None)
 	last_login = models.DateTimeField()
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
index 1410618..fd5fa0c 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/09/20 00:16:57 by edbernar          #+#    #+#              #
-#    Updated: 2024/11/20 13:57:49 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/20 14:39:07 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -24,10 +24,16 @@ def getHistory(user, games):
 		opponent = None
 		if(x.player1 == user):
 			player = {"score":int(x.p1Score)}
-			opponent = {"score":int(x.p2Score), "username":x.player2.username, "pfp":x.player2.pfp}
+			if(x.player2 == None):
+				opponent = {"score":int(x.p2Score), "username": "[deleted]", "pfp": "/static/img/default_pfp.jpg"}
+			else:
+				opponent = {"score":int(x.p2Score), "username":x.player2.username, "pfp":x.player2.pfp}
 		else:
 			player = {"score":int(x.p2Score)}
-			opponent = {"score":int(x.p1Score), "username":x.player1.username, "pfp":x.player1.pfp}
+			if(x.player1 == None):
+				opponent = {"score":int(x.p2Score), "username": "[deleted]", "pfp": "/static/img/default_pfp.jpg"}
+			else:
+				opponent = {"score":int(x.p1Score), "username":x.player1.username, "pfp":x.player1.pfp}
 		res.append({
 			"id":x.id,
 			"p1":player,
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
index 3b59eab..f6f0558 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/04 13:44:11 by edbernar          #+#    #+#              #
-#    Updated: 2024/11/20 14:20:37 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/20 14:49:59 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -17,14 +17,13 @@ import json
 
 @sync_to_async
 def sendPrivateMessage(socket, content):
-
 	try:
 		dest = User.objects.filter(id=content["to"])
 		if(not dest.exists()):
 			socket.sendError("User not found", 9008)
 			return
 		user = User.objects.filter(id=socket.id)
-		if(int(content["to"]) == user[0].id or len(content["content"]) == 0 or len(content["content"] > 2000)):
+		if(int(content["to"]) == user[0].id or len(content["content"]) == 0 or len(content["content"]) > 2000):
 			socket.sendError("Invalid message sent", 9009)
 		new_msg = Message.objects.create(sender=user[0], to=dest[0], content=content["content"])
 		new_msg.save()