Fix bug on logging
This commit is contained in:
parent
019c7a191a
commit
2aaaec5a4b
@ -34,6 +34,7 @@ class LoadLevel(CSRFexemptTemplateView):
|
|||||||
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(player=player,
|
||||||
|
request=request,
|
||||||
action=actions.bloonsa_load_level_by_id,
|
action=actions.bloonsa_load_level_by_id,
|
||||||
note=level.level_id)
|
note=level.level_id)
|
||||||
|
|
||||||
@ -118,6 +119,7 @@ class CompleteLevel(CSRFexemptTemplateView):
|
|||||||
dart_glitch_ever=True)
|
dart_glitch_ever=True)
|
||||||
|
|
||||||
bloonsa_util.log(player=player,
|
bloonsa_util.log(player=player,
|
||||||
|
request=request,
|
||||||
action=actions.bloonsa_submit_score,
|
action=actions.bloonsa_submit_score,
|
||||||
note=level.level_id)
|
note=level.level_id)
|
||||||
|
|
||||||
@ -136,6 +138,7 @@ class RateLevel(CSRFexemptTemplateView):
|
|||||||
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(player=player,
|
||||||
|
request=request,
|
||||||
action=actions.bloonsa_rate_level,
|
action=actions.bloonsa_rate_level,
|
||||||
note=level.level_id)
|
note=level.level_id)
|
||||||
if ratingObject:
|
if ratingObject:
|
||||||
|
|||||||
@ -26,6 +26,7 @@ class GameView(TemplateView):
|
|||||||
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(player=player,
|
||||||
|
request=request,
|
||||||
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={
|
||||||
|
|||||||
@ -123,9 +123,9 @@ AUTH_PASSWORD_VALIDATORS = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
AUTHENTICATION_BACKENDS = (
|
#AUTHENTICATION_BACKENDS = (
|
||||||
"users.backends.CaseInsensitiveModelBackend", # inherits from 'django.contrib.auth.backends.ModelBackend'
|
# "users.backends.CaseInsensitiveModelBackend", # inherits from 'django.contrib.auth.backends.ModelBackend'
|
||||||
)
|
#)
|
||||||
|
|
||||||
# Internationalization
|
# Internationalization
|
||||||
# https://docs.djangoproject.com/en/3.2/topics/i18n/
|
# https://docs.djangoproject.com/en/3.2/topics/i18n/
|
||||||
|
|||||||
@ -39,11 +39,13 @@ class BloonsaUtil:
|
|||||||
return player
|
return player
|
||||||
|
|
||||||
# Update activity timestamp and IP
|
# Update activity timestamp and IP
|
||||||
def tag_player(self, player=None, request=None):
|
def tag_player(self, request, player=None):
|
||||||
if not self.tracking:
|
if not self.tracking:
|
||||||
return
|
return
|
||||||
if request and not request.user.is_authenticated:
|
if request and not request.user.is_authenticated:
|
||||||
return
|
return
|
||||||
|
if not request:
|
||||||
|
return
|
||||||
player = player or 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?
|
||||||
|
|||||||
@ -23,6 +23,7 @@ class LoginView(TemplateView):
|
|||||||
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(player=user.player,
|
||||||
|
request=request,
|
||||||
action=actions.login)
|
action=actions.login)
|
||||||
return redirect("bloonsa_game:game")
|
return redirect("bloonsa_game:game")
|
||||||
|
|
||||||
@ -46,6 +47,7 @@ class RegisterView(TemplateView):
|
|||||||
player.save()
|
player.save()
|
||||||
|
|
||||||
bloonsa_util.log(player=player,
|
bloonsa_util.log(player=player,
|
||||||
|
request=request,
|
||||||
action=actions.login)
|
action=actions.login)
|
||||||
return redirect("bloonsa_game:game")
|
return redirect("bloonsa_game:game")
|
||||||
|
|
||||||
@ -54,8 +56,9 @@ class RegisterView(TemplateView):
|
|||||||
class LogoutView(TemplateView):
|
class LogoutView(TemplateView):
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
if request.user.is_authenticated:
|
if request.user.is_authenticated:
|
||||||
bloonsa_util.init_player(request=request)
|
player = bloonsa_util.init_player(request=request)
|
||||||
bloonsa_util.log(request=request,
|
bloonsa_util.log(request=request,
|
||||||
|
player=player,
|
||||||
action=actions.logout)
|
action=actions.logout)
|
||||||
logout(request)
|
logout(request)
|
||||||
return redirect("bloonsa_game:game")
|
return redirect("bloonsa_game:game")
|
||||||
@ -97,6 +100,7 @@ class ConfigView(LoginRequiredMixin, TemplateView):
|
|||||||
form_config.save()
|
form_config.save()
|
||||||
|
|
||||||
bloonsa_util.log(action=actions.config,
|
bloonsa_util.log(action=actions.config,
|
||||||
|
request=request,
|
||||||
player=request.user.player)
|
player=request.user.player)
|
||||||
# messages.success(request, "Profile updated successfully")
|
# messages.success(request, "Profile updated successfully")
|
||||||
return redirect("users:config")
|
return redirect("users:config")
|
||||||
Loading…
Reference in New Issue
Block a user