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

fix logging

Browse Source
This commit is contained in:
Walter 2025-02-28 20:39:49 +01:00
parent d5f77b6878
commit ed24d97bfd
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/bloonsa_api/views.py
View File

@ -35,8 +35,8 @@ class LoadLevel(CSRFexemptTemplateView):
if request.user.is_authenticated: if request.user.is_authenticated:
player: Player = request.user.player player: Player = request.user.player
player.bloonsa_levels_played.add(level) player.bloonsa_levels_played.add(level)
bloonsa_util.log(player=player, bloonsa_util.log(request=request,
request=request, player=player,
action=actions.bloonsa_load_level_by_id, action=actions.bloonsa_load_level_by_id,
note=level.level_id) note=level.level_id)
@ -57,7 +57,8 @@ class RandomLevel(CSRFexemptTemplateView):
if not player.bloonsa_levels_played.filter(pk=level.pk).exists(): if not player.bloonsa_levels_played.filter(pk=level.pk).exists():
level.played_by.add(player) level.played_by.add(player)
level.save() level.save()
bloonsa_util.log(player=player, bloonsa_util.log(request=request,
player=player,
action=actions.bloonsa_load_random_level, action=actions.bloonsa_load_random_level,
note=level.level_id) note=level.level_id)
else: else:
@ -120,8 +121,8 @@ class CompleteLevel(CSRFexemptTemplateView):
score.update(commit=True, score.update(commit=True,
dart_glitch_ever=True) dart_glitch_ever=True)
bloonsa_util.log(player=player, bloonsa_util.log(request=request,
request=request, player=player,
action=actions.bloonsa_submit_score, action=actions.bloonsa_submit_score,
note=level.level_id) note=level.level_id)
@ -139,8 +140,8 @@ class RateLevel(CSRFexemptTemplateView):
level: Level = Level.objects.get(level_id=level_id) level: Level = Level.objects.get(level_id=level_id)
player: Player = request.user.player player: Player = request.user.player
ratingObject = player.bloonsa_level_ratings.filter(level=level).first() ratingObject = player.bloonsa_level_ratings.filter(level=level).first()
bloonsa_util.log(player=player, bloonsa_util.log(request=request,
request=request, player=player,
action=actions.bloonsa_rate_level, action=actions.bloonsa_rate_level,
note=level.level_id) note=level.level_id)
if ratingObject: if ratingObject:

4
app/bloonsa_game/views.py
View File

@ -29,8 +29,8 @@ class GameView(TemplateView):
if type(kwargs.get("pk")) is int: if type(kwargs.get("pk")) is int:
level = Level.objects.get(level_id=kwargs["pk"]) level = Level.objects.get(level_id=kwargs["pk"])
if level: if level:
bloonsa_util.log(player=player, bloonsa_util.log(request=request,
request=request, player=player,
action=actions.bloonsa_load_level_by_url, action=actions.bloonsa_load_level_by_url,
note=level) note=level)
return render(request, "bloonsa_game/game.html", context={ return render(request, "bloonsa_game/game.html", context={

12
app/users/util.py
View File

@ -39,14 +39,14 @@ class BloonsaUtil:
return player return player
# Update activity timestamp and IP # Update activity timestamp and IP
def tag_player(self, request, player): def tag_player(self, request):
if not self.tracking: if not self.tracking:
return return
if not request or not request.user.is_authenticated: if not request and not request.user.is_authenticated:
return return
player.latestActivity = timezone.now() request.user.player.latest_activity = timezone.now()
player.latestIP = self.get_ip(request=request) request.user.player.latest_ip = self.get_ip(request=request)
player.save() request.user.player.save()
def log(self, action, note=None, player=None, request=None): def log(self, action, note=None, player=None, request=None):
if not self.tracking: if not self.tracking:
@ -55,7 +55,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) self.tag_player(request=request)
item = Log(player=player, item = Log(player=player,
action=action, action=action,
note=note) note=note)

15
app/users/views.py
View File

@ -22,8 +22,8 @@ class LoginView(TemplateView):
user = form.get_user() user = form.get_user()
login(request=request, user=user) login(request=request, user=user)
bloonsa_util.init_player(request=request) bloonsa_util.init_player(request=request)
bloonsa_util.log(player=user.player, bloonsa_util.log(request=request,
request=request, player=user.player,
action=actions.login) action=actions.login)
return redirect("bloonsa_game:game") return redirect("bloonsa_game:game")
@ -46,8 +46,8 @@ class RegisterView(TemplateView):
player.invite_code = invite_code player.invite_code = invite_code
player.save() player.save()
bloonsa_util.log(player=player, bloonsa_util.log(request=request,
request=request, player=player,
action=actions.login) action=actions.login)
return redirect("bloonsa_game:game") return redirect("bloonsa_game:game")
@ -95,12 +95,11 @@ class ConfigView(LoginRequiredMixin, TemplateView):
form_user.save() form_user.save()
if form_player.is_valid(): if form_player.is_valid():
form_player.save() form_player.save()
# TODO this form doesn't save for some reason
if form_config.is_valid(): if form_config.is_valid():
form_config.save() form_config.save()
bloonsa_util.log(action=actions.config, bloonsa_util.log(request=request,
request=request, player=request.user.player,
player=request.user.player) action=actions.config)
# messages.success(request, "Profile updated successfully") # messages.success(request, "Profile updated successfully")
return redirect("users:config") return redirect("users:config")