fix #726: replaced is_authenticated() and is_anonymous() calls with props gets

misago/acl/panels.py

@@ -14,7 +14,7 @@ class MisagoACLPanel(Panel):
     def nav_subtitle(self):
         misago_user = self.get_stats().get('misago_user')
 
-        if misago_user and misago_user.is_authenticated():
+        if misago_user and misago_user.is_authenticated:
             return misago_user.username
         else:
             return _("Anonymous user")

misago/acl/testutils.py

@@ -29,7 +29,7 @@ def override_acl(user, new_acl):
     final_cache = deepcopy(user.acl)
     final_cache.update(new_acl)
 
-    if user.is_authenticated():
+    if user.is_authenticated:
         user._acl_cache = final_cache
         user.acl_key = md5(str(user.pk).encode()).hexdigest()[:8]
         user.save(update_fields=['acl_key'])

misago/admin/auth.py

@@ -19,7 +19,7 @@ def make_user_admin_token(user):
 
 # Admin session state controls
 def is_admin_session(request):
-    if request.user.is_anonymous():
+    if request.user.is_anonymous:
         return False
 
     if not request.user.is_staff:

misago/core/rest_permissions.py

@@ -6,7 +6,7 @@ from rest_framework.permissions import SAFE_METHODS, BasePermission
 
 class IsAuthenticatedOrReadOnly(BasePermission):
     def has_permission(self, request, view):
-        if request.user.is_anonymous() and request.method not in SAFE_METHODS:
+        if request.user.is_anonymous and request.method not in SAFE_METHODS:
             raise PermissionDenied(_("This action is not available to guests."))
         else:
             return True

misago/readtracker/categoriestracker.py

@@ -15,7 +15,7 @@ def make_read_aware(user, categories):
     if not hasattr(categories, '__iter__'):
         categories = [categories]
 
-    if user.is_anonymous():
+    if user.is_anonymous:
         make_read(categories)
         return None
 

misago/readtracker/threadstracker.py

@@ -20,7 +20,7 @@ def make_threads_read_aware(user, threads):
     if not threads:
         return
 
-    if user.is_anonymous():
+    if user.is_anonymous:
         make_read(threads)
     else:
         make_categories_threads_read_aware(user, threads)
@@ -81,12 +81,12 @@ def make_thread_read_aware(user, thread):
     thread.is_new = False
     thread.read_record = None
 
-    if user.is_anonymous():
+    if user.is_anonymous:
         thread.last_read_on = timezone.now()
     else:
         thread.last_read_on = user.joined_on
 
-    if user.is_authenticated() and is_date_tracked(thread.last_post_on, user):
+    if user.is_authenticated and is_date_tracked(thread.last_post_on, user):
         thread.is_read = False
         thread.is_new = True
 

misago/threads/api/threadendpoints/editor.py

@@ -11,7 +11,7 @@ from ...threadtypes import trees_map
 
 
 def thread_start_editor(request):
-    if request.user.is_anonymous():
+    if request.user.is_anonymous:
         raise PermissionDenied(_("You need to be signed in to start threads."))
 
     # list of categories that allow or contain subcategories that allow new threads

misago/threads/middleware.py

@@ -9,7 +9,7 @@ from .viewmodels import filter_read_threads_queryset
 
 class UnreadThreadsCountMiddleware(MiddlewareMixin):
     def process_request(self, request):
-        if request.user.is_anonymous():
+        if request.user.is_anonymous:
             return
 
         if not request.user.acl['can_use_private_threads']:

misago/threads/models/poll.py

@@ -65,7 +65,7 @@ class Poll(models.Model):
         return self.thread_type.get_poll_votes_api_url(self)
 
     def make_choices_votes_aware(self, user):
-        if user.is_anonymous():
+        if user.is_anonymous:
             for choice in self.choices:
                 choice['selected'] = False
             return

misago/threads/permissions/attachments.py

@@ -63,13 +63,13 @@ def build_acl(acl, roles, key_name):
 ACL's for targets
 """
 def add_acl_to_attachment(user, attachment):
-    if user.is_authenticated() and user.id == attachment.uploader_id:
+    if user.is_authenticated and user.id == attachment.uploader_id:
         attachment.acl.update({
             'can_delete': True,
         })
     else:
         attachment.acl.update({
-            'can_delete': user.is_authenticated() and user.acl['can_delete_other_users_attachments'],
+            'can_delete': user.is_authenticated and user.acl['can_delete_other_users_attachments'],
         })
 
 

misago/threads/permissions/polls.py

@@ -115,7 +115,7 @@ def register_with(registry):
 ACL tests
 """
 def allow_start_poll(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to start polls."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -136,7 +136,7 @@ can_start_poll = return_boolean(allow_start_poll)
 
 
 def allow_edit_poll(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to edit polls."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -168,7 +168,7 @@ can_edit_poll = return_boolean(allow_edit_poll)
 
 
 def allow_delete_poll(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to delete polls."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -199,7 +199,7 @@ can_delete_poll = return_boolean(allow_delete_poll)
 
 
 def allow_vote_poll(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to vote in polls."))
 
     if target.has_selected_choices and not target.allow_revotes:

misago/threads/permissions/privatethreads.py

@@ -175,7 +175,7 @@ def register_with(registry):
 ACL tests
 """
 def allow_use_private_threads(user):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to use private threads."))
     if not user.acl['can_use_private_threads']:
         raise PermissionDenied(_("You can't use private threads."))

misago/threads/permissions/threads.py

@@ -329,7 +329,7 @@ def add_acl_to_category(user, category):
         can_see_posts_likes=algebra.greater,
     )
 
-    if user.is_authenticated():
+    if user.is_authenticated:
         algebra.sum_acls(category.acl, acls=[category_acl],
             can_start_threads=algebra.greater,
             can_reply_threads=algebra.greater,
@@ -402,7 +402,7 @@ def add_acl_to_post(user, post):
 
 
 def add_acl_to_event(user, event):
-    if user.is_authenticated():
+    if user.is_authenticated:
         category_acl = user.acl['categories'].get(event.category_id, {})
         can_hide_events = category_acl.get('can_hide_events', 0)
     else:
@@ -436,7 +436,7 @@ def add_acl_to_reply(user, post):
 
     if not post.acl['can_see_hidden']:
         post.acl['can_see_hidden'] = post.id == post.thread.first_post_id
-    if user.is_authenticated() and post.acl['can_see_likes']:
+    if user.is_authenticated and post.acl['can_see_likes']:
         post.acl['can_like'] = category_acl.get('can_like_posts', False)
 
 
@@ -458,10 +458,10 @@ def allow_see_thread(user, target):
     if not (category_acl['can_see'] and category_acl['can_browse']):
         raise Http404()
 
-    if target.is_hidden and (user.is_anonymous() or not category_acl['can_hide_threads']):
+    if target.is_hidden and (user.is_anonymous or not category_acl['can_hide_threads']):
         raise Http404()
 
-    if user.is_anonymous() or user.pk != target.starter_id:
+    if user.is_anonymous or user.pk != target.starter_id:
         if not category_acl['can_see_all_threads']:
             raise Http404()
 
@@ -471,7 +471,7 @@ can_see_thread = return_boolean(allow_see_thread)
 
 
 def allow_start_thread(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to start threads."))
 
     category_acl = user.acl['categories'].get(target.pk, {
@@ -488,7 +488,7 @@ can_start_thread = return_boolean(allow_start_thread)
 
 
 def allow_reply_thread(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to reply threads."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -508,7 +508,7 @@ can_reply_thread = return_boolean(allow_reply_thread)
 
 
 def allow_edit_thread(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to edit threads."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -544,7 +544,7 @@ def allow_see_post(user, target):
     })
 
     if not target.is_event and target.is_unapproved:
-        if user.is_anonymous():
+        if user.is_anonymous:
             raise Http404()
 
         if not category_acl['can_approve_content'] and user.id != target.poster_id:
@@ -556,7 +556,7 @@ can_see_post = return_boolean(allow_see_post)
 
 
 def allow_edit_post(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to edit posts."))
 
     if target.is_event:
@@ -595,7 +595,7 @@ can_edit_post = return_boolean(allow_edit_post)
 
 
 def allow_unhide_post(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to reveal posts."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -632,7 +632,7 @@ can_unhide_post = return_boolean(allow_unhide_post)
 
 
 def allow_hide_post(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to hide posts."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -669,7 +669,7 @@ can_hide_post = return_boolean(allow_hide_post)
 
 
 def allow_delete_post(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to delete posts."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -706,7 +706,7 @@ can_delete_post = return_boolean(allow_delete_post)
 
 
 def allow_protect_post(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to protect posts."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -721,7 +721,7 @@ can_protect_post = return_boolean(allow_protect_post)
 
 
 def allow_approve_post(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to approve posts."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -738,7 +738,7 @@ can_approve_post = return_boolean(allow_approve_post)
 
 
 def allow_move_post(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to move posts."))
 
     category_acl = user.acl['categories'].get(target.category_id, {
@@ -757,7 +757,7 @@ can_move_post = return_boolean(allow_move_post)
 
 
 def allow_delete_event(user, target):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to delete events."))
 
     category_acl = user.acl['categories'].get(target.category_id)
@@ -771,7 +771,7 @@ can_delete_event = return_boolean(allow_delete_event)
 Permission check helpers
 """
 def can_change_owned_thread(user, target):
-    if user.is_anonymous() or user.pk != target.starter_id:
+    if user.is_anonymous or user.pk != target.starter_id:
         return False
 
     if target.category.is_closed or target.is_closed:
@@ -825,7 +825,7 @@ def exclude_invisible_threads(user, categories, queryset):
 
             if can_mod and can_hide:
                 show_all.append(category)
-            elif user.is_authenticated():
+            elif user.is_authenticated:
                 if not can_mod and not can_hide:
                     show_accepted_visible.append(category)
                 elif not can_mod:
@@ -834,7 +834,7 @@ def exclude_invisible_threads(user, categories, queryset):
                     show_visible.append(category)
             else:
                 show_accepted_visible.append(category)
-        elif user.is_authenticated():
+        elif user.is_authenticated:
             if can_hide:
                 show_owned.append(category)
             else:
@@ -845,7 +845,7 @@ def exclude_invisible_threads(user, categories, queryset):
         conditions = Q(category__in=show_all)
 
     if show_accepted_visible:
-        if user.is_authenticated():
+        if user.is_authenticated:
             condition = Q(
                 Q(starter=user) | Q(is_unapproved=False),
                 category__in=show_accepted_visible,
@@ -910,7 +910,7 @@ def exclude_invisible_threads(user, categories, queryset):
 
 def exclude_invisible_posts(user, category, queryset):
     if not category.acl['can_approve_content']:
-        if user.is_authenticated():
+        if user.is_authenticated:
             queryset = queryset.filter(Q(is_unapproved=False) | Q(poster=user))
         else:
             queryset = queryset.exclude(is_unapproved=True)

misago/threads/subscriptions.py

@@ -15,7 +15,7 @@ def make_threads_subscription_aware(user, threads):
     if not threads:
         return
 
-    if user.is_anonymous():
+    if user.is_anonymous:
         for thread in threads:
             thread.subscription = None
     else:
@@ -33,7 +33,7 @@ def make_threads_subscription_aware(user, threads):
 
 
 def make_thread_subscription_aware(user, thread):
-    if user.is_anonymous():
+    if user.is_anonymous:
         thread.subscription = None
     else:
         try:

misago/threads/utils.py

@@ -40,7 +40,7 @@ def add_categories_to_items(root_category, categories, items):
 
 
 def add_likes_to_posts(user, posts):
-    if user.is_anonymous():
+    if user.is_anonymous:
         return
 
     posts_map = {}

misago/threads/viewmodels/threads.py

@@ -84,7 +84,7 @@ class ViewModel(object):
         if list_type not in LISTS_NAMES:
             raise Http404()
 
-        if request.user.is_anonymous():
+        if request.user.is_anonymous:
             if list_type in LIST_DENIED_MESSAGES:
                 raise PermissionDenied(LIST_DENIED_MESSAGES[list_type])
         else:

misago/threads/views/attachment.py

@@ -51,7 +51,7 @@ def serve_file(request, pk, secret, thumbnail):
 
 
 def allow_file_download(request, attachment):
-    is_authenticated = request.user.is_authenticated()
+    is_authenticated = request.user.is_authenticated
 
     if not is_authenticated or request.user.id != attachment.uploader_id:
         if not attachment.post_id:

misago/users/api/auth.py

@@ -47,7 +47,7 @@ GET /auth/ will return current auth user, either User or AnonymousUser
 """
 @api_view()
 def session_user(request):
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         UserSerializer = AuthenticatedUserSerializer
     else:
         UserSerializer = AnonymousUserSerializer
@@ -169,7 +169,7 @@ def change_forgotten_password(request, pk, token):
         except User.DoesNotExist:
             raise PasswordChangeFailed(invalid_message)
 
-        if request.user.is_authenticated() and request.user.id != user.id:
+        if request.user.is_authenticated and request.user.id != user.id:
             raise PasswordChangeFailed(invalid_message)
         if not is_password_change_token_valid(user, token):
             raise PasswordChangeFailed(invalid_message)

misago/users/api/rest_permissions.py

@@ -32,7 +32,7 @@ class UnbannedOnly(BasePermission):
 
 class UnbannedAnonOnly(UnbannedOnly):
     def has_permission(self, request, view):
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             raise PermissionDenied(_("This action is not available to signed in users."))
 
         self.is_request_banned(request)

misago/users/api/users.py

@@ -47,7 +47,7 @@ class UserViewSetPermission(BasePermission):
 
 
 def allow_self_only(user, pk, message):
-    if user.is_anonymous():
+    if user.is_anonymous:
         raise PermissionDenied(_("You have to sign in to perform this action."))
     if user.pk != int(pk):
         raise PermissionDenied(message)

misago/users/apps.py

@@ -47,7 +47,7 @@ class MisagoUsersConfig(AppConfig):
 
     def register_default_user_profile_pages(self):
         def can_see_names_history(request, profile):
-            if request.user.is_authenticated():
+            if request.user.is_authenticated:
                 is_account_owner = profile.pk == request.user.pk
                 has_permission = request.user.acl['can_see_users_name_history']
                 return is_account_owner or has_permission
@@ -55,7 +55,7 @@ class MisagoUsersConfig(AppConfig):
                 return False
 
         def can_see_ban_details(request, profile):
-            if request.user.is_authenticated():
+            if request.user.is_authenticated:
                 if request.user.acl['can_see_ban_details']:
                     from .bans import get_user_ban
                     return bool(get_user_ban(profile))

misago/users/context_processors.py

@@ -35,10 +35,10 @@ def preload_user_json(request):
         return {}
 
     request.frontend_context.update({
-        'isAuthenticated': request.user.is_authenticated(),
+        'isAuthenticated': bool(request.user.is_authenticated),
     })
 
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         request.frontend_context.update({
             'user': AuthenticatedUserSerializer(request.user).data
         })

misago/users/decorators.py

@@ -10,7 +10,7 @@ from .models import BAN_IP, Ban
 
 def deny_authenticated(f):
     def decorator(request, *args, **kwargs):
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             raise PermissionDenied(
                 _("This page is not available to signed in users."))
         else:
@@ -20,7 +20,7 @@ def deny_authenticated(f):
 
 def deny_guests(f):
     def decorator(request, *args, **kwargs):
-        if request.user.is_anonymous():
+        if request.user.is_anonymous:
             raise PermissionDenied(
                 _("You have to sign in to access this page."))
         else:

misago/users/middleware.py

@@ -20,7 +20,7 @@ class RealIPMiddleware(MiddlewareMixin):
 
 class UserMiddleware(MiddlewareMixin):
     def process_request(self, request):
-        if request.user.is_anonymous():
+        if request.user.is_anonymous:
             request.user = AnonymousUser()
         elif not request.user.is_staff:
             if get_request_ip_ban(request) or get_user_ban(request.user):
@@ -30,7 +30,7 @@ class UserMiddleware(MiddlewareMixin):
 
 class OnlineTrackerMiddleware(MiddlewareMixin):
     def process_request(self, request):
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             try:
                 request._misago_online_tracker = request.user.online_tracker
             except Online.DoesNotExist:
@@ -43,7 +43,7 @@ class OnlineTrackerMiddleware(MiddlewareMixin):
             online_tracker = request._misago_online_tracker
 
             if online_tracker:
-                if request.user.is_anonymous():
+                if request.user.is_anonymous:
                     tracker.stop_tracking(request, online_tracker)
                 else:
                     tracker.update_tracker(request, online_tracker)

misago/users/permissions/decorators.py

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 
 def authenticated_only(f):
     def perm_decorator(user, target):
-        if user.is_authenticated():
+        if user.is_authenticated:
             return f(user, target)
         else:
             messsage = _("You have to sig in to perform this action.")
@@ -14,7 +14,7 @@ def authenticated_only(f):
 
 def anonymous_only(f):
     def perm_decorator(user, target):
-        if user.is_anonymous():
+        if user.is_anonymous:
             return f(user, target)
         else:
             messsage = _("Only guests can perform this action.")

misago/users/tests/test_testutils.py

@@ -10,22 +10,22 @@ class UserTestCaseTests(UserTestCase):
     def test_get_anonymous_user(self):
         """get_anonymous_user returns anon user instance"""
         user = self.get_anonymous_user()
-        self.assertFalse(user.is_authenticated())
-        self.assertTrue(user.is_anonymous())
+        self.assertFalse(user.is_authenticated)
+        self.assertTrue(user.is_anonymous)
 
     def test_get_authenticated_user(self):
         """get_authenticated_user returns auth user instance"""
         user = self.get_authenticated_user()
-        self.assertTrue(user.is_authenticated())
-        self.assertFalse(user.is_anonymous())
+        self.assertTrue(user.is_authenticated)
+        self.assertFalse(user.is_anonymous)
         self.assertFalse(user.is_staff)
         self.assertFalse(user.is_superuser)
 
     def test_get_superuser(self):
         """get_superuser returns auth user instance"""
         user = self.get_superuser()
-        self.assertTrue(user.is_authenticated())
-        self.assertFalse(user.is_anonymous())
+        self.assertTrue(user.is_authenticated)
+        self.assertFalse(user.is_anonymous)
         self.assertTrue(user.is_staff)
         self.assertTrue(user.is_superuser)
 

misago/users/views/auth.py

@@ -27,6 +27,6 @@ def login(request):
 @never_cache
 @csrf_protect
 def logout(request):
-    if request.method == 'POST' and request.user.is_authenticated():
+    if request.method == 'POST' and request.user.is_authenticated:
         auth.logout(request)
     return redirect(settings.LOGIN_REDIRECT_URL)

misago/users/views/forgottenpassword.py

@@ -35,7 +35,7 @@ def reset_password_form(request, pk, token):
     requesting_user = get_object_or_404(User.objects, pk=pk)
 
     try:
-        if (request.user.is_authenticated() and
+        if (request.user.is_authenticated and
                 request.user.id != requesting_user.id):
             message = _("%(user)s, your link has expired. "
                         "Please request new link and try again.")

misago/users/views/profile.py

@@ -76,13 +76,13 @@ def render(request, template, context):
         if section['is_active']:
             context['active_section'] = section
 
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         is_authenticated_user = context['profile'].pk == request.user.pk
     else:
         is_authenticated_user = False
     context['is_authenticated_user'] = is_authenticated_user
 
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         if is_authenticated_user:
             context['show_email'] = True
         else: