From 0559b1b1abd773af3532ad75e94ed2bb9abbe466 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Fri, 15 Dec 2017 23:42:20 +0100
Subject: [PATCH] Switched to is_authenticated (no parenthesis)
---
api/funkwhale_api/common/permissions.py | 2 +-
api/funkwhale_api/history/views.py | 4 ++--
api/funkwhale_api/music/views.py | 2 +-
api/funkwhale_api/radios/views.py | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/api/funkwhale_api/common/permissions.py b/api/funkwhale_api/common/permissions.py
index 3f13b200..6b61d983 100644
--- a/api/funkwhale_api/common/permissions.py
+++ b/api/funkwhale_api/common/permissions.py
@@ -7,5 +7,5 @@ class ConditionalAuthentication(BasePermission):
def has_permission(self, request, view):
if settings.API_AUTHENTICATION_REQUIRED:
- return request.user and request.user.is_authenticated()
+ return request.user and request.user.is_authenticated
return True
diff --git a/api/funkwhale_api/history/views.py b/api/funkwhale_api/history/views.py
index d65a70f8..32bad606 100644
--- a/api/funkwhale_api/history/views.py
+++ b/api/funkwhale_api/history/views.py
@@ -22,14 +22,14 @@ class ListeningViewSet(mixins.CreateModelMixin,
def get_queryset(self):
queryset = super().get_queryset()
- if self.request.user.is_authenticated():
+ if self.request.user.is_authenticated:
return queryset.filter(user=self.request.user)
else:
return queryset.filter(session_key=self.request.session.session_key)
def get_serializer_context(self):
context = super().get_serializer_context()
- if self.request.user.is_authenticated():
+ if self.request.user.is_authenticated:
context['user'] = self.request.user
else:
context['session_key'] = self.request.session.session_key
diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index 72982e4c..1fd7aa97 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -102,7 +102,7 @@ class TrackViewSet(TagViewSetMixin, SearchMixin, viewsets.ReadOnlyModelViewSet):
queryset = super().get_queryset()
filter_favorites = self.request.GET.get('favorites', None)
user = self.request.user
- if user.is_authenticated() and filter_favorites == 'true':
+ if user.is_authenticated and filter_favorites == 'true':
queryset = queryset.filter(track_favorites__user=user)
return queryset
diff --git a/api/funkwhale_api/radios/views.py b/api/funkwhale_api/radios/views.py
index 1ae788fc..9243d6a9 100644
--- a/api/funkwhale_api/radios/views.py
+++ b/api/funkwhale_api/radios/views.py
@@ -19,14 +19,14 @@ class RadioSessionViewSet(mixins.CreateModelMixin,
def get_queryset(self):
queryset = super().get_queryset()
- if self.request.user.is_authenticated():
+ if self.request.user.is_authenticated:
return queryset.filter(user=self.request.user)
else:
return queryset.filter(session_key=self.request.session.session_key)
def get_serializer_context(self):
context = super().get_serializer_context()
- if self.request.user.is_authenticated():
+ if self.request.user.is_authenticated:
context['user'] = self.request.user
else:
context['session_key'] = self.request.session.session_key
@@ -44,7 +44,7 @@ class RadioSessionTrackViewSet(mixins.CreateModelMixin,
serializer.is_valid(raise_exception=True)
session = serializer.validated_data['session']
try:
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
assert request.user == session.user
else:
assert request.session.session_key == session.session_key
--
GitLab