Public/bloonsworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some bugs

Browse Source
This commit is contained in:
Walter 2025-02-21 04:22:28 +01:00
parent 2d5f851aa8
commit 462a64fd81
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/bloonsa_game/models.py
View File

@ -23,7 +23,7 @@ class Author(ModelWithUpdate):
class Level(models.Model): class Level(models.Model):
author = models.ForeignKey(Author, on_delete=models.CASCADE) author = models.ForeignKey(Author, on_delete=models.CASCADE)
title = models.CharField(max_length=16) title = models.CharField(max_length=64)
level_id = models.IntegerField() level_id = models.IntegerField()
darts = models.SmallIntegerField() darts = models.SmallIntegerField()
target = models.SmallIntegerField() target = models.SmallIntegerField()

7
app/users/util.py
View File

@ -39,12 +39,12 @@ class BloonsaUtil:
return player return player
# Update activity timestamp and IP # Update activity timestamp and IP
def tag_player(self, request): def tag_player(self, player=None, request=None):
if not self.tracking: if not self.tracking:
return return
if not request.user.is_authenticated: if request and not request.user.is_authenticated:
return return
player = self.init_player(request=request) player = player or self.init_player(request=request)
if player.banned: if player.banned:
# TODO message popup? # TODO message popup?
logout(request) logout(request)
@ -61,6 +61,7 @@ class BloonsaUtil:
if not request or not request.user.is_authenticated: if not request or not request.user.is_authenticated:
return return
player = self.init_player(request=request) player = self.init_player(request=request)
self.tag_player(request=request, player=player)
item = Log(player=player, item = Log(player=player,
action=action, action=action,
note=note) note=note)

7
app/users/validators.py
View File

@ -29,5 +29,10 @@ def invitecode_validator(invitecode):
if len(invitecode) > 64: if len(invitecode) > 64:
raise ValidationError("Invite code too long") raise ValidationError("Invite code too long")
if not InviteCode.objects.filter(code=invitecode).exists(): codeObject = InviteCode.objects.filter(code=invitecode).first()
if not codeObject:
raise ValidationError("Invite code doesn't exist") raise ValidationError("Invite code doesn't exist")
if not codeObject.active:
raise ValidationError("Invite code inactive")