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

Fixed some register bugs

Browse Source
This commit is contained in:
Walter 2025-02-18 16:52:16 +01:00
parent 25f79e9e21
commit 96233f5df3
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/bloonsa_api/views.py
View File

@ -48,6 +48,7 @@ class RandomLevel(CSRFexemptTemplateView):
bloonsa_util.tag_player(request=request) bloonsa_util.tag_player(request=request)
player: Player = request.user.player player: Player = request.user.player
# Make this filter only beaten_by
level: Level = Level.objects.order_by("?").filter(~Q(played_by=player)).first() level: Level = Level.objects.order_by("?").filter(~Q(played_by=player)).first()
if not level: if not level:
level: Level = Level.objects.order_by("?").first() level: Level = Level.objects.order_by("?").first()

2
app/bloonsa_game/templates/bloonsa_game/modules/profilebox.html
View File

@ -5,7 +5,7 @@
<div id="profile-box"> <div id="profile-box">
<div id="avatar-box"> <div id="avatar-box">
<img id="avatar" src="{% static 'bloonsa_game/img/profilebox/user.png' %}"> <img id="avatar" src="{{ user.player.avatar.url }}">
</div> </div>
<div id="profile-user"> <div id="profile-user">

7
app/users/util.py
View File

@ -23,9 +23,8 @@ class BloonsaUtil:
def init_player(self, request): def init_player(self, request):
if not request.user.is_authenticated: if not request.user.is_authenticated:
return return
player = request.user.player if hasattr(request.user, "player"):
if player: return request.user.player
return player
ip = self.get_ip(request=request) ip = self.get_ip(request=request)
player = Player(user=request.user, player = Player(user=request.user,
creation_ip=ip, creation_ip=ip,
@ -39,8 +38,6 @@ class BloonsaUtil:
return return
if not request.user.is_authenticated: if not request.user.is_authenticated:
return return
player = request.user.player
if not player:
player = self.init_player(request=request) player = self.init_player(request=request)
if player.banned: if player.banned:
# TODO message popup? # TODO message popup?

3
app/users/views.py
View File

@ -38,8 +38,7 @@ class RegisterView(TemplateView):
user = form.save() user = form.save()
player = bloonsa_util.init_player(request=request) player = bloonsa_util.init_player(request=request)
login(request=request, user=user) login(request=request, user=user)
bloonsa_util.log(player=player,
bloonsa_util.log(player=user.player,
action=actions.login) action=actions.login)
return redirect("bloonsa_game:game") return redirect("bloonsa_game:game")