Fixed some bugs
This commit is contained in:
parent
2d5f851aa8
commit
462a64fd81
@ -23,7 +23,7 @@ class Author(ModelWithUpdate):
|
||||
|
||||
class Level(models.Model):
|
||||
author = models.ForeignKey(Author, on_delete=models.CASCADE)
|
||||
title = models.CharField(max_length=16)
|
||||
title = models.CharField(max_length=64)
|
||||
level_id = models.IntegerField()
|
||||
darts = models.SmallIntegerField()
|
||||
target = models.SmallIntegerField()
|
||||
|
||||
@ -39,12 +39,12 @@ class BloonsaUtil:
|
||||
return player
|
||||
|
||||
# Update activity timestamp and IP
|
||||
def tag_player(self, request):
|
||||
def tag_player(self, player=None, request=None):
|
||||
if not self.tracking:
|
||||
return
|
||||
if not request.user.is_authenticated:
|
||||
if request and not request.user.is_authenticated:
|
||||
return
|
||||
player = self.init_player(request=request)
|
||||
player = player or self.init_player(request=request)
|
||||
if player.banned:
|
||||
# TODO message popup?
|
||||
logout(request)
|
||||
@ -61,6 +61,7 @@ class BloonsaUtil:
|
||||
if not request or not request.user.is_authenticated:
|
||||
return
|
||||
player = self.init_player(request=request)
|
||||
self.tag_player(request=request, player=player)
|
||||
item = Log(player=player,
|
||||
action=action,
|
||||
note=note)
|
||||
|
||||
@ -29,5 +29,10 @@ def invitecode_validator(invitecode):
|
||||
if len(invitecode) > 64:
|
||||
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")
|
||||
|
||||
if not codeObject.active:
|
||||
raise ValidationError("Invite code inactive")
|
||||
Loading…
Reference in New Issue
Block a user