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

Merge branch 'main' of github.com:Kum1ta/PTME_Transcendence

Browse Source
This commit is contained in:
Kum1ta
2024-11-20 15:04:08 +01:00
parent 9630d4d927 8bb0dc445f
commit ac33e5cf9b
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose/requirements/djangoserver/file/server/server/models.py
View File

@ -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()

12
docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
View File

@ -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,

11
docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
View File

@ -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:49:59 by tomoron ### ########.fr #
# #
# **************************************************************************** #
@ -17,20 +17,13 @@ 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"])
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):
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()