Version Bump v2.8.4

Model updates for Mumble Authenticator 1.1

See merge request allianceauth/allianceauth!1303

.gitlab-ci.yml

@@ -1,43 +1,83 @@
 stages:
+- gitlab
 - test
 - deploy
 
+include:
+- template: Dependency-Scanning.gitlab-ci.yml
+- template: Security/SAST.gitlab-ci.yml
+
 before_script:
-- apt-get update && apt-get install redis-server -y
+  - apt-get update && apt-get install redis-server -y
-- redis-server --daemonize yes
+  - redis-server --daemonize yes
-- redis-cli ping
+  - python -V
-- python -V
+  - pip install wheel tox
-- pip install wheel tox
+
+sast:
+  stage: gitlab
+  before_script: []
+
+dependency_scanning:
+  stage: gitlab
+  before_script:
+  - apt-get update && apt-get install redis-server libmariadbclient-dev -y
+  - redis-server --daemonize yes
+  - python -V
+  - pip install wheel tox
 
 test-3.6-core:
   image: python:3.6-buster
   script:  
-  - tox -e py36-core
+  - tox -e py36-core  
+  artifacts:
+    when: always
+    reports:
+      cobertura: coverage.xml
 
 test-3.7-core:
   image: python:3.7-buster
   script:  
   - tox -e py37-core
+  artifacts:
+    when: always
+    reports:
+      cobertura: coverage.xml
 
 test-3.8-core:
   image: python:3.8-buster
   script:  
   - tox -e py38-core
+  artifacts:
+    when: always
+    reports:
+      cobertura: coverage.xml
 
 test-3.6-all:
   image: python:3.6-buster
   script:  
   - tox -e py36-all
+  artifacts:
+    when: always
+    reports:
+      cobertura: coverage.xml
 
 test-3.7-all:
   image: python:3.7-buster
   script:  
   - tox -e py37-all
+  artifacts:
+    when: always
+    reports:
+      cobertura: coverage.xml
 
 test-3.8-all:
   image: python:3.8-buster
   script:  
   - tox -e py38-all
+  artifacts:
+    when: always
+    reports:
+      cobertura: coverage.xml
 
 deploy_production:
   stage: deploy
@@ -51,4 +91,4 @@ deploy_production:
     - twine upload dist/*
 
   rules:
-    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_TAG

allianceauth/__init__.py

@@ -1,7 +1,7 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '2.8.2'
+__version__ = '2.8.4'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = '%s v%s' % (__title__, __version__)

allianceauth/authentication/admin.py

@@ -1,10 +1,8 @@
-from django.conf import settings
-
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from django.contrib.auth.models import User as BaseUser, \
     Permission as BasePermission, Group
-from django.db.models import Q, F
+from django.db.models import Count, Q
 from allianceauth.services.hooks import ServicesHook
 from django.db.models.signals import pre_save, post_save, pre_delete, \
     post_delete, m2m_changed
@@ -24,11 +22,6 @@ from allianceauth.eveonline.tasks import update_character
 from .app_settings import AUTHENTICATION_ADMIN_USERS_MAX_GROUPS, \
     AUTHENTICATION_ADMIN_USERS_MAX_CHARS
 
-if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
-    _has_auto_groups = True    
-else:
-    _has_auto_groups = False
-
 
 def make_service_hooks_update_groups_action(service):
     """
@@ -91,8 +84,7 @@ class UserProfileInline(admin.StackedInline):
             if request.user.is_superuser:
                 query |= Q(userprofile__isnull=True)
             else:
-                query |= Q(character_ownership__user=obj)
+                query |= Q(character_ownership__user=obj)        
-        qs = EveCharacter.objects.filter(query)
         formset = super().get_formset(request, obj=obj, **kwargs)
 
         def get_kwargs(self, index):
@@ -121,6 +113,8 @@ def user_profile_pic(obj):
         )
     else:
         return None
+
+
 user_profile_pic.short_description = ''
 
 
@@ -152,6 +146,7 @@ def user_username(obj):
             user_obj.username,
         )
 
+
 user_username.short_description = 'user / main'
 user_username.admin_order_field = 'username'
 
@@ -168,7 +163,8 @@ def user_main_organization(obj):
     else:        
         corporation = user_obj.profile.main_character.corporation_name
         if user_obj.profile.main_character.alliance_id:        
-            result = format_html('{}<br>{}',
+            result = format_html(
+                '{}<br>{}',
                 corporation, 
                 user_obj.profile.main_character.alliance_name
             )
@@ -176,6 +172,7 @@ def user_main_organization(obj):
             result = corporation    
     return result
 
+
 user_main_organization.short_description = 'Corporation / Alliance (Main)'
 user_main_organization.admin_order_field = \
     'profile__main_character__corporation_name'
@@ -205,13 +202,13 @@ class MainCorporationsFilter(admin.SimpleListFilter):
             return qs.all()
         else:    
             if qs.model == User:
-                return qs\
+                return qs.filter(
-                    .filter(profile__main_character__corporation_id=\
+                    profile__main_character__corporation_id=self.value()
-                        self.value())
+                )
             else:
-                return qs\
+                return qs.filter(
-                    .filter(user__profile__main_character__corporation_id=\
+                    user__profile__main_character__corporation_id=self.value()
-                        self.value())
+                )
             
 
 class MainAllianceFilter(admin.SimpleListFilter):
@@ -239,12 +236,11 @@ class MainAllianceFilter(admin.SimpleListFilter):
             return qs.all()
         else:    
             if qs.model == User:
-                return qs\
+                return qs.filter(profile__main_character__alliance_id=self.value())                
-                    .filter(profile__main_character__alliance_id=self.value())                
             else:
-                return qs\
+                return qs.filter(
-                    .filter(user__profile__main_character__alliance_id=\
+                    user__profile__main_character__alliance_id=self.value()
-                        self.value())
+                )
                 
 
 def update_main_character_model(modeladmin, request, queryset):    
@@ -259,6 +255,7 @@ def update_main_character_model(modeladmin, request, queryset):
         'Update from ESI started for {} characters'.format(tasks_count)
     )
 
+
 update_main_character_model.short_description = \
     'Update main character model from ESI'
 
@@ -267,32 +264,16 @@ class UserAdmin(BaseUserAdmin):
     """Extending Django's UserAdmin model
     
     Behavior of groups and characters columns can be configured via settings
-
     """
 
     class Media:
         css = {
             "all": ("authentication/css/admin.css",)
         }
-         
+             
-    class RealGroupsFilter(admin.SimpleListFilter):
+    def get_queryset(self, request):
-        """Custom filter to get groups w/o Autogroups"""
+        qs = super().get_queryset(request)
-        title = 'group'
+        return qs.prefetch_related("character_ownerships__character", "groups")
-        parameter_name = 'group_id__exact'
-
-        def lookups(self, request, model_admin):
-            qs = Group.objects.all().order_by(Lower('name'))
-            if _has_auto_groups:
-                qs = qs\
-                    .filter(managedalliancegroup__isnull=True)\
-                    .filter(managedcorpgroup__isnull=True)                
-            return tuple([(x.pk, x.name) for x in qs])
-
-        def queryset(self, request, queryset):
-            if self.value() is None:
-                return queryset.all()
-            else:    
-                return queryset.filter(groups__pk=self.value())
 
     def get_actions(self, request):
         actions = super(BaseUserAdmin, self).get_actions(request)
@@ -341,11 +322,9 @@ class UserAdmin(BaseUserAdmin):
         return result
     
     inlines = BaseUserAdmin.inlines + [UserProfileInline]
-
+    ordering = ('username', )    
-    ordering = ('username', )
+    list_select_related = ('profile__state', 'profile__main_character')
-    list_select_related = True
+    show_full_result_count = True     
-    show_full_result_count = True 
-    
     list_display = (
         user_profile_pic,
         user_username, 
@@ -358,10 +337,9 @@ class UserAdmin(BaseUserAdmin):
         '_role'
     )    
     list_display_links = None
-
     list_filter = ( 
         'profile__state',
-        RealGroupsFilter,        
+        'groups',        
         MainCorporationsFilter,        
         MainAllianceFilter,
         'is_active',
@@ -375,41 +353,25 @@ class UserAdmin(BaseUserAdmin):
     )
     
     def _characters(self, obj):
-        my_characters = [
+        character_ownerships = list(obj.character_ownerships.all())
-            x.character.character_name 
+        characters = [obj.character.character_name for obj in character_ownerships]
-            for x in CharacterOwnership.objects\
-                .filter(user=obj)\
-                .order_by('character__character_name')\
-                .select_related()
-        ]
         return self._list_2_html_w_tooltips(
-            my_characters, 
+            sorted(characters), 
             AUTHENTICATION_ADMIN_USERS_MAX_CHARS
         )
           
     _characters.short_description = 'characters'
     
-
     def _state(self, obj):
         return obj.profile.state.name
     
     _state.short_description = 'state'
     _state.admin_order_field = 'profile__state'
 
-    def _groups(self, obj):
+    def _groups(self, obj):        
-        if not _has_auto_groups:
+        my_groups = sorted([group.name for group in list(obj.groups.all())])
-            my_groups = [x.name for x in obj.groups.order_by('name')]
-        else:
-            my_groups = [
-                x.name for x in obj.groups\
-                    .filter(managedalliancegroup__isnull=True)\
-                    .filter(managedcorpgroup__isnull=True)\
-                    .order_by('name')
-            ]
-        
         return self._list_2_html_w_tooltips(
-            my_groups, 
+            my_groups, AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
-            AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
         )
        
     _groups.short_description = 'groups'
@@ -446,9 +408,14 @@ class StateAdmin(admin.ModelAdmin):
     list_select_related = True
     list_display = ('name', 'priority', '_user_count')
     
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return qs.annotate(user_count=Count("userprofile__id"))
+
     def _user_count(self, obj):
-        return obj.userprofile_set.all().count()
+        return obj.user_count
     _user_count.short_description = 'Users'
+    _user_count.admin_order_field = 'user_count'
 
     fieldsets = (
         (None, {
@@ -504,7 +471,8 @@ class BaseOwnershipAdmin(admin.ModelAdmin):
             "all": ("authentication/css/admin.css",)
         }
      
-    list_select_related = True
+    list_select_related = (
+        'user__profile__state', 'user__profile__main_character', 'character')    
     list_display = (
         user_profile_pic,
         user_username,
@@ -542,6 +510,7 @@ class CharacterOwnershipAdmin(BaseOwnershipAdmin):
 class PermissionAdmin(admin.ModelAdmin):
     actions = None
     readonly_fields = [field.name for field in BasePermission._meta.fields]
+    search_fields = ('codename', )
     list_display = ('admin_name', 'name', 'codename', 'content_type')
     list_filter = ('content_type__app_label',)
 

allianceauth/authentication/tests/__init__.py

@@ -10,9 +10,10 @@ def get_admin_change_view_url(obj: object) -> str:
         args=(obj.pk,)
     )
 
+
 def get_admin_search_url(ModelClass: type) -> str:
     """returns URL to search URL for model of given object"""
     return '{}{}/'.format(
         reverse('admin:app_list', args=(ModelClass._meta.app_label,)),
         ModelClass.__name__.lower()
-    )
+    )

allianceauth/authentication/tests/test_admin.py

@@ -1,10 +1,8 @@
 from urllib.parse import quote
 from unittest.mock import patch, MagicMock
 
-from django.conf import settings
-from django.contrib import admin
 from django.contrib.admin.sites import AdminSite
-from django.contrib.auth.models import User as BaseUser, Group
+from django.contrib.auth.models import Group
 from django.test import TestCase, RequestFactory, Client
 
 from allianceauth.authentication.models import (
@@ -18,8 +16,7 @@ from allianceauth.tests.auth_utils import AuthUtils
 
 from ..admin import (
     BaseUserAdmin,
-    CharacterOwnershipAdmin,
+    CharacterOwnershipAdmin,    
-    PermissionAdmin,
     StateAdmin,
     MainCorporationsFilter,
     MainAllianceFilter,
@@ -35,11 +32,6 @@ from ..admin import (
 )
 from . import get_admin_change_view_url, get_admin_search_url
 
-if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
-    _has_auto_groups = True
-    from allianceauth.eveonline.autogroups.models import AutogroupsConfig
-else:
-    _has_auto_groups = False
 
 MODULE_PATH = 'allianceauth.authentication.admin'
 
@@ -48,6 +40,7 @@ class MockRequest(object):
     def __init__(self, user=None):
         self.user = user
 
+
 class TestCaseWithTestData(TestCase):
 
     @classmethod
@@ -279,6 +272,7 @@ class TestStateAdmin(TestCaseWithTestData):
         expected = 200
         self.assertEqual(response.status_code, expected)
 
+
 class TestUserAdmin(TestCaseWithTestData):
 
     def setUp(self):
@@ -287,24 +281,12 @@ class TestUserAdmin(TestCaseWithTestData):
             model=User, admin_site=AdminSite()
         )
         self.character_1 = self.user_1.character_ownerships.first().character
-
+           
-    def _create_autogroups(self):
-        """create autogroups for corps and alliances"""
-        if _has_auto_groups:
-            autogroups_config = AutogroupsConfig(
-                corp_groups = True,
-                alliance_groups = True
-            )
-            autogroups_config.save()
-            for state in State.objects.all():
-                autogroups_config.states.add(state)        
-            autogroups_config.update_corp_group_membership(self.user_1)        
-    
-    # column rendering
-
     def test_user_profile_pic_u1(self):
-        expected = ('<img src="https://images.evetech.net/characters/1001/'
+        expected = (
-            'portrait?size=32" class="img-circle">')        
+            '<img src="https://images.evetech.net/characters/1001/'
+            'portrait?size=32" class="img-circle">'
+        )        
         self.assertEqual(user_profile_pic(self.user_1), expected)
 
     def test_user_profile_pic_u3(self):
@@ -351,37 +333,17 @@ class TestUserAdmin(TestCaseWithTestData):
         result = self.modeladmin._characters(self.user_3)
         self.assertEqual(result, expected)
     
-    def test_groups_u1(self):
+    def test_groups_u1(self):        
-        self._create_autogroups()
         expected = 'Group 1'
         result = self.modeladmin._groups(self.user_1)
         self.assertEqual(result, expected)
 
-    def test_groups_u2(self):
+    def test_groups_u2(self):        
-        self._create_autogroups()
         expected = 'Group 2'
         result = self.modeladmin._groups(self.user_2)
         self.assertEqual(result, expected)
     
-    def test_groups_u3(self):        
+    def test_groups_u3(self):                
-        self._create_autogroups()
-        result = self.modeladmin._groups(self.user_3)
-        self.assertIsNone(result)
-
-    @patch(MODULE_PATH + '._has_auto_groups', False)
-    def test_groups_u1_no_autogroups(self):        
-        expected = 'Group 1'
-        result = self.modeladmin._groups(self.user_1)
-        self.assertEqual(result, expected)
-
-    @patch(MODULE_PATH + '._has_auto_groups', False)
-    def test_groups_u2_no_autogroups(self):        
-        expected = 'Group 2'
-        result = self.modeladmin._groups(self.user_2)
-        self.assertEqual(result, expected)
-    
-    @patch(MODULE_PATH + '._has_auto_groups', False)
-    def test_groups_u3_no_autogroups(self):                
         result = self.modeladmin._groups(self.user_3)
         self.assertIsNone(result)
 
@@ -413,8 +375,10 @@ class TestUserAdmin(TestCaseWithTestData):
 
     def test_list_2_html_w_tooltips_w_cutoff(self):
         items = ['one', 'two', 'three']
-        expected = ('<span data-tooltip="one, two, three" '
+        expected = (
-            'class="tooltip">one, two, (...)</span>')
+            '<span data-tooltip="one, two, three" '
+            'class="tooltip">one, two, (...)</span>'
+        )
         result = self.modeladmin._list_2_html_w_tooltips(items, 2)
         self.assertEqual(expected, result)
 
@@ -439,63 +403,7 @@ class TestUserAdmin(TestCaseWithTestData):
         self.assertTrue(mock_message_user.called)
     
     # filters
-
+    
-    def test_filter_real_groups_with_autogroups(self):
-        
-        class UserAdminTest(BaseUserAdmin): 
-            list_filter = (UserAdmin.RealGroupsFilter,)
-                
-        self._create_autogroups()        
-        my_modeladmin = UserAdminTest(User, AdminSite())
-
-        # Make sure the lookups are correct
-        request = self.factory.get('/')
-        request.user = self.user_1
-        changelist = my_modeladmin.get_changelist_instance(request)
-        filters = changelist.get_filters(request)
-        filterspec = filters[0][0]
-        expected = [
-            (self.group_1.pk, self.group_1.name), 
-            (self.group_2.pk, self.group_2.name),
-        ]
-        self.assertEqual(filterspec.lookup_choices, expected)
-
-        # Make sure the correct queryset is returned
-        request = self.factory.get('/', {'group_id__exact': self.group_1.pk})
-        request.user = self.user_1                
-        changelist = my_modeladmin.get_changelist_instance(request)
-        queryset = changelist.get_queryset(request)
-        expected = User.objects.filter(groups__in=[self.group_1])
-        self.assertSetEqual(set(queryset), set(expected))
-
-    @patch(MODULE_PATH + '._has_auto_groups', False)
-    def test_filter_real_groups_no_autogroups(self):
-        
-        class UserAdminTest(BaseUserAdmin): 
-            list_filter = (UserAdmin.RealGroupsFilter,)
-                        
-        my_modeladmin = UserAdminTest(User, AdminSite())
-
-        # Make sure the lookups are correct
-        request = self.factory.get('/')
-        request.user = self.user_1
-        changelist = my_modeladmin.get_changelist_instance(request)
-        filters = changelist.get_filters(request)
-        filterspec = filters[0][0]
-        expected = [
-            (self.group_1.pk, self.group_1.name), 
-            (self.group_2.pk, self.group_2.name),
-        ]
-        self.assertEqual(filterspec.lookup_choices, expected)
-
-        # Make sure the correct queryset is returned
-        request = self.factory.get('/', {'group_id__exact': self.group_1.pk})
-        request.user = self.user_1                
-        changelist = my_modeladmin.get_changelist_instance(request)
-        queryset = changelist.get_queryset(request)
-        expected = User.objects.filter(groups__in=[self.group_1])
-        self.assertSetEqual(set(queryset), set(expected))
-
     def test_filter_main_corporations(self):
         
         class UserAdminTest(BaseUserAdmin): 
@@ -603,7 +511,6 @@ class TestMakeServicesHooksActions(TestCaseWithTestData):
         def sync_nicknames_bulk(self, user):
             pass
          
-
     def test_service_has_update_groups_only(self):        
         service = self.MyServicesHookTypeA()
         mock_service = MagicMock(spec=service)      

allianceauth/authentication/tests/test_templatetags.py

@@ -1,10 +1,10 @@
 from math import ceil
 from unittest.mock import patch
 
-from requests import RequestException
 import requests_mock
 from packaging.version import Version as Pep440Version
 
+from django.core.cache import cache
 from django.test import TestCase
 
 from allianceauth.templatetags.admin_status import (
@@ -12,8 +12,7 @@ from allianceauth.templatetags.admin_status import (
     _fetch_list_from_gitlab,
     _current_notifications, 
     _current_version_summary, 
-    _fetch_notification_issues_from_gitlab,
+    _fetch_notification_issues_from_gitlab,    
-    _fetch_tags_from_gitlab,
     _latests_versions
 )
 
@@ -103,35 +102,51 @@ class TestStatusOverviewTag(TestCase):
 
 class TestNotifications(TestCase):
 
+    def setUp(self) -> None:
+        cache.clear()
+
     @requests_mock.mock()
     def test_fetch_notification_issues_from_gitlab(self, requests_mocker):
+        # given
         url = (
             'https://gitlab.com/api/v4/projects/allianceauth%2Fallianceauth/issues'
             '?labels=announcement'
         )        
         requests_mocker.get(url, json=GITHUB_NOTIFICATION_ISSUES)
+        # when
         result = _fetch_notification_issues_from_gitlab()
+        # then
         self.assertEqual(result, GITHUB_NOTIFICATION_ISSUES)
 
     @patch(MODULE_PATH + '.admin_status.cache')
     def test_current_notifications_normal(self, mock_cache):
+        # given
         mock_cache.get_or_set.return_value = GITHUB_NOTIFICATION_ISSUES
-
+        # when
         result = _current_notifications()
+        # then
         self.assertEqual(result['notifications'], GITHUB_NOTIFICATION_ISSUES[:5])
 
-    @patch(MODULE_PATH + '.admin_status.cache')
+    @requests_mock.mock()    
-    def test_current_notifications_failed(self, mock_cache):
+    def test_current_notifications_failed(self, requests_mocker):
-        mock_cache.get_or_set.side_effect = RequestException
+        # given
-
+        url = (
+            'https://gitlab.com/api/v4/projects/allianceauth%2Fallianceauth/issues'
+            '?labels=announcement'
+        )        
+        requests_mocker.get(url, status_code=404)
+        # when
         result = _current_notifications()
+        # then
         self.assertEqual(result['notifications'], list())
 
     @patch(MODULE_PATH + '.admin_status.cache')
     def test_current_notifications_is_none(self, mock_cache):
+        # given
         mock_cache.get_or_set.return_value = None
-
+        # when
         result = _current_notifications()
+        # then
         self.assertEqual(result['notifications'], list())
 
 
@@ -143,12 +158,17 @@ class TestCeleryQueueLength(TestCase):
 
 class TestVersionTags(TestCase):
 
+    def setUp(self) -> None:
+        cache.clear()
+
     @patch(MODULE_PATH + '.admin_status.__version__', TEST_VERSION)
     @patch(MODULE_PATH + '.admin_status.cache')
-    def test_current_version_info_normal(self, mock_cache):
+    def test_current_version_info_normal(self, mock_cache):        
+        # given
         mock_cache.get_or_set.return_value = GITHUB_TAGS
-
+        # when
         result = _current_version_summary()
+        # then
         self.assertTrue(result['latest_major'])
         self.assertTrue(result['latest_minor'])
         self.assertTrue(result['latest_patch'])
@@ -158,32 +178,41 @@ class TestVersionTags(TestCase):
         self.assertEqual(result['latest_beta_version'], '2.4.6a1')
 
     @patch(MODULE_PATH + '.admin_status.__version__', TEST_VERSION)
-    @patch(MODULE_PATH + '.admin_status.cache')
+    @requests_mock.mock()
-    def test_current_version_info_failed(self, mock_cache):
+    def test_current_version_info_failed(self, requests_mocker):
-        mock_cache.get_or_set.side_effect = RequestException
+        # given
-        
+        url = (
-        expected = {}
+            'https://gitlab.com/api/v4/projects/allianceauth%2Fallianceauth'
+            '/repository/tags'
+        )        
+        requests_mocker.get(url, status_code=500)
+        # when
         result = _current_version_summary()
-        self.assertEqual(result, expected)
+        # then
+        self.assertEqual(result, {})
 
     @requests_mock.mock()
     def test_fetch_tags_from_gitlab(self, requests_mocker):
+        # given
         url = (
             'https://gitlab.com/api/v4/projects/allianceauth%2Fallianceauth'
             '/repository/tags'
         )        
         requests_mocker.get(url, json=GITHUB_TAGS)
-        result = _fetch_tags_from_gitlab()
+        # when
-        self.assertEqual(result, GITHUB_TAGS)
+        result = _current_version_summary()
+        # then
+        self.assertTrue(result)
 
     @patch(MODULE_PATH + '.admin_status.__version__', TEST_VERSION)
     @patch(MODULE_PATH + '.admin_status.cache')
     def test_current_version_info_return_no_data(self, mock_cache):
-        mock_cache.get_or_set.return_value = None
+        # given
-        
+        mock_cache.get_or_set.return_value = None                
-        expected = {}
+        # when
         result = _current_version_summary()
-        self.assertEqual(result, expected)
+        # then
+        self.assertEqual(result, {})
 
 
 class TestLatestsVersion(TestCase):

allianceauth/eveonline/admin.py

@@ -96,24 +96,62 @@ class EveAllianceForm(EveEntityForm):
 
 @admin.register(EveCorporationInfo)
 class EveCorporationInfoAdmin(admin.ModelAdmin):
+    search_fields = ['corporation_name']
+    list_display = ('corporation_name', 'alliance')    
+    list_select_related = ('alliance',)
+    list_filter = (('alliance', admin.RelatedOnlyFieldListFilter),)
+    ordering = ('corporation_name',)
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
     def get_form(self, request, obj=None, **kwargs):
         if not obj or not obj.pk:
             return EveCorporationForm
-        return super(EveCorporationInfoAdmin, self).get_form(request, obj=obj, **kwargs)
+        return super().get_form(request, obj=obj, **kwargs)
 
 
 @admin.register(EveAllianceInfo)
 class EveAllianceInfoAdmin(admin.ModelAdmin):
+    search_fields = ['alliance_name']
+    list_display = ('alliance_name',)        
+    ordering = ('alliance_name',)
+    
+    def has_change_permission(self, request, obj=None):
+        return False
+
     def get_form(self, request, obj=None, **kwargs):
         if not obj or not obj.pk:
             return EveAllianceForm
-        return super(EveAllianceInfoAdmin, self).get_form(request, obj=obj, **kwargs)
+        return super().get_form(request, obj=obj, **kwargs)
 
 
 @admin.register(EveCharacter)
 class EveCharacterAdmin(admin.ModelAdmin):
-    search_fields = ['character_name', 'corporation_name', 'alliance_name', 'character_ownership__user__username']
+    search_fields = [
-    list_display = ('character_name', 'corporation_name', 'alliance_name', 'user', 'main_character')
+        'character_name', 
+        'corporation_name', 
+        'alliance_name', 
+        'character_ownership__user__username'
+    ]
+    list_display = (
+        'character_name', 'corporation_name', 'alliance_name', 'user', 'main_character'
+    )
+    list_select_related = (
+        'character_ownership', 'character_ownership__user__profile__main_character'
+    )
+    list_filter = (
+        'corporation_name', 
+        'alliance_name',         
+        (
+            'character_ownership__user__profile__main_character', 
+            admin.RelatedOnlyFieldListFilter
+        ),
+    )
+    ordering = ('character_name', )
+
+    def has_change_permission(self, request, obj=None):
+        return False
 
     @staticmethod
     def user(obj):

allianceauth/groupmanagement/admin.py

@@ -1,5 +1,4 @@
-from django.conf import settings
+from django.apps import apps
-
 from django.contrib import admin
 from django.contrib.auth.models import Group as BaseGroup, User
 from django.db.models import Count
@@ -10,9 +9,8 @@ from django.dispatch import receiver
 
 from .models import AuthGroup
 from .models import GroupRequest
-from . import signals
 
-if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
+if 'eve_autogroups' in apps.app_configs:    
     _has_auto_groups = True    
 else:
     _has_auto_groups = False
@@ -97,9 +95,10 @@ class HasLeaderFilter(admin.SimpleListFilter):
         else:
             return queryset
 
+
 class GroupAdmin(admin.ModelAdmin):    
-    list_select_related = True
+    list_select_related = ('authgroup',)
-    ordering = ('name', )
+    ordering = ('name',)
     list_display = (
         'name', 
         '_description', 
@@ -118,9 +117,12 @@ class GroupAdmin(admin.ModelAdmin):
     list_filter.append(HasLeaderFilter)
 
     search_fields = ('name', 'authgroup__description')
-    
+        
     def get_queryset(self, request):
         qs = super().get_queryset(request)                
+        if _has_auto_groups:
+            qs = qs.prefetch_related('managedalliancegroup_set', 'managedcorpgroup_set')
+        qs = qs.prefetch_related('authgroup__group_leaders')
         qs = qs.annotate(
             member_count=Count('user', distinct=True),
         )        
@@ -173,13 +175,29 @@ class Group(BaseGroup):
         verbose_name = BaseGroup._meta.verbose_name
         verbose_name_plural = BaseGroup._meta.verbose_name_plural
 
+
 try:
     admin.site.unregister(BaseGroup)
 finally:
     admin.site.register(Group, GroupAdmin)
 
 
-admin.site.register(GroupRequest)
+@admin.register(GroupRequest)
+class GroupRequestAdmin(admin.ModelAdmin):        
+    search_fields = ('user__username', )
+    list_display = ('id', 'group', 'user', '_leave_request', 'status')
+    list_filter = (
+        ('group', admin.RelatedOnlyFieldListFilter),
+        ('user', admin.RelatedOnlyFieldListFilter),
+        'leave_request', 
+        'status'
+    )
+
+    def _leave_request(self, obj) -> True:
+        return obj.leave_request
+    
+    _leave_request.short_description = 'is leave request'
+    _leave_request.boolean = True
 
 
 @receiver(pre_save, sender=Group)

allianceauth/groupmanagement/apps.py

@@ -5,3 +5,6 @@ class GroupManagementConfig(AppConfig):
     name = 'allianceauth.groupmanagement'
     label = 'groupmanagement'
     verbose_name = 'Group Management'
+
+    def ready(self):
+        from . import signals  # noqa: F401

allianceauth/groupmanagement/templates/groupmanagement/index.html

@@ -40,120 +40,121 @@
             </li>
         </ul>
 
-        <div class="tab-content">
+        <div class="panel panel-default panel-tabs-aa">
-            <div id="add" class="tab-pane fade in active panel panel-default">
+            <div class="panel-body">
-                <div class="panel-body">
+                <div class="tab-content">                    
-                    {% if acceptrequests %}
+                    
-                        <div class="table-responsive">
+                    <div id="add" class="tab-pane active">                
-                            <table class="table table-aa">
+                        {% if acceptrequests %}
-                                <thead>
+                            <div class="table-responsive">
-                                    <tr>
+                                <table class="table table-aa">
-                                        <th>{% trans "Character" %}</th>
+                                    <thead>
-                                        <th>{% trans "Organization" %}</th>
-                                        <th>{% trans "Group" %}</th>
-                                        <th></th>
-                                    </tr>
-                                </thead>
-
-                                <tbody>
-                                    {% for acceptrequest in acceptrequests %}
                                         <tr>
-                                            <td>
+                                            <th>{% trans "Character" %}</th>
-                                                <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
+                                            <th>{% trans "Organization" %}</th>
-                                                {% if acceptrequest.main_char %}
+                                            <th>{% trans "Group" %}</th>
-                                                    <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
+                                            <th></th>
-                                                        {{ acceptrequest.main_char.character_name }}
-                                                    </a>
-                                                {% else %}
-                                                    {{ acceptrequest.user.username }}
-                                                {% endif %}
-                                            </td>
-                                            <td>
-                                                {% if acceptrequest.main_char %}
-                                                    <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                        {{ acceptrequest.main_char.corporation_name }}
-                                                    </a><br>
-                                                    {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
-                                                {% else %}
-                                                    {% trans "(unknown)" %}
-                                                {% endif %}
-                                            </td>
-                                            <td>{{ acceptrequest.group.name }}</td>
-                                            <td class="text-right">
-                                                <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
-                                                    {% trans "Accept" %}
-                                                </a>
-
-                                                <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                                                    {% trans "Reject" %}
-                                                </a>
-                                            </td>
                                         </tr>
-                                    {% endfor %}
+                                    </thead>
-                                </tbody>
-                            </table>
-                        </div>
-                    {% else %}
-                        <div class="alert alert-warning text-center">{% trans "No group add requests." %}</div>
-                    {% endif %}
-                </div>
-            </div>
 
-            <div id="leave" class="tab-pane fade panel panel-default">
+                                    <tbody>
-                <div class="panel-body">
+                                        {% for acceptrequest in acceptrequests %}
-                    {% if leaverequests %}
+                                            <tr>
-                        <div class="table-responsive">
+                                                <td>
-                            <table class="table table-aa">
+                                                    <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
-                                <thead>
+                                                    {% if acceptrequest.main_char %}
-                                    <tr>
+                                                        <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
-                                        <th>{% trans "Character" %}</th>
+                                                            {{ acceptrequest.main_char.character_name }}
-                                        <th>{% trans "Organization" %}</th>
+                                                        </a>
-                                        <th>{% trans "Group" %}</th>
+                                                    {% else %}
-                                        <th></th>
+                                                        {{ acceptrequest.user.username }}
-                                    </tr>
+                                                    {% endif %}
-                                </thead>
+                                                </td>
+                                                <td>
+                                                    {% if acceptrequest.main_char %}
+                                                        <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                            {{ acceptrequest.main_char.corporation_name }}
+                                                        </a><br>
+                                                        {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
+                                                    {% else %}
+                                                        {% trans "(unknown)" %}
+                                                    {% endif %}
+                                                </td>
+                                                <td>{{ acceptrequest.group.name }}</td>
+                                                <td class="text-right">
+                                                    <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
+                                                        {% trans "Accept" %}
+                                                    </a>
 
-                                <tbody>
+                                                    <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                                    {% for leaverequest in leaverequests %}
+                                                        {% trans "Reject" %}
+                                                    </a>
+                                                </td>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        {% else %}
+                            <div class="alert alert-warning text-center">{% trans "No group add requests." %}</div>
+                        {% endif %}
+                    </div>            
+                    
+                    <div id="leave" class="tab-pane">                
+                        {% if leaverequests %}
+                            <div class="table-responsive">
+                                <table class="table table-aa">
+                                    <thead>
                                         <tr>
-                                            <td>
+                                            <th>{% trans "Character" %}</th>
-                                                <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
+                                            <th>{% trans "Organization" %}</th>
-                                                {% if leaverequest.main_char %}
+                                            <th>{% trans "Group" %}</th>
-                                                    <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
+                                            <th></th>
-                                                        {{ leaverequest.main_char.character_name }}
-                                                    </a>
-                                                {% else %}
-                                                    {{ leaverequest.user.username }}
-                                                {% endif %}
-                                            </td>
-                                            <td>
-                                                {% if leaverequest.main_char %}
-                                                    <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                        {{ leaverequest.main_char.corporation_name }}
-                                                    </a><br>
-                                                    {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
-                                                {% else %}
-                                                    {% trans "(unknown)" %}
-                                                {% endif %}
-                                            </td>
-                                            <td>{{ leaverequest.group.name }}</td>
-                                            <td class="text-right">
-                                                <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
-                                                    {% trans "Accept" %}
-                                                </a>
-
-                                                <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
-                                                    {% trans "Reject" %}
-                                                </a>
-                                            </td>
                                         </tr>
-                                    {% endfor %}
+                                    </thead>
-                                </tbody>
+
-                            </table>
+                                    <tbody>
-                        </div>
+                                        {% for leaverequest in leaverequests %}
-                    {% else %}
+                                            <tr>
-                        <div class="alert alert-warning text-center">{% trans "No group leave requests." %}</div>
+                                                <td>
-                    {% endif %}
+                                                    <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
+                                                    {% if leaverequest.main_char %}
+                                                        <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
+                                                            {{ leaverequest.main_char.character_name }}
+                                                        </a>
+                                                    {% else %}
+                                                        {{ leaverequest.user.username }}
+                                                    {% endif %}
+                                                </td>
+                                                <td>
+                                                    {% if leaverequest.main_char %}
+                                                        <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                            {{ leaverequest.main_char.corporation_name }}
+                                                        </a><br>
+                                                        {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
+                                                    {% else %}
+                                                        {% trans "(unknown)" %}
+                                                    {% endif %}
+                                                </td>
+                                                <td>{{ leaverequest.group.name }}</td>
+                                                <td class="text-right">
+                                                    <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
+                                                        {% trans "Accept" %}
+                                                    </a>
+
+                                                    <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
+                                                        {% trans "Reject" %}
+                                                    </a>
+                                                </td>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        {% else %}
+                            <div class="alert alert-warning text-center">{% trans "No group leave requests." %}</div>
+                        {% endif %}
+                    </div>
                 </div>
             </div>
         </div>

allianceauth/notifications/templatetags/auth_notifications.py

@@ -33,10 +33,8 @@ def user_unread_notification_count(user: object) -> int:
 
 @register.simple_tag
 def notifications_refresh_time() -> int: 
-    refresh_time = getattr(settings, 'NOTIFICATIONS_REFRESH_TIME', None)
+    refresh_time = getattr(settings, 'NOTIFICATIONS_REFRESH_TIME', Notification.NOTIFICATIONS_REFRESH_TIME_DEFAULT)
-    if (
+    if (not isinstance(refresh_time, int) or refresh_time < 0):
-        refresh_time is None or not isinstance(refresh_time, int) or refresh_time < 0
-    ):
         logger.warning('NOTIFICATIONS_REFRESH_TIME setting is invalid. Using default.')
         refresh_time = Notification.NOTIFICATIONS_REFRESH_TIME_DEFAULT
 

allianceauth/services/modules/mumble/migrations/0012_mumble_client_info.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.1.6 on 2021-03-23 13:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mumble', '0001_squashed_0011_auto_20201011_1009'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mumbleuser',
+            name='last_connect',
+            field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Connection to Mumble', max_length=254, null=True, verbose_name='Last Connection'),
+        ),
+        migrations.AddField(
+            model_name='mumbleuser',
+            name='last_disconnect',
+            field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection to Mumble', max_length=254, null=True, verbose_name='Last Disconnection'),
+        ),
+        migrations.AddField(
+            model_name='mumbleuser',
+            name='release',
+            field=models.TextField(blank=True, editable=False, help_text='The Mumble Release the user last authenticated with', max_length=254, null=True, verbose_name='Mumble Release'),
+        ),
+        migrations.AddField(
+            model_name='mumbleuser',
+            name='version',
+            field=models.IntegerField(blank=True, editable=False, help_text='Client version. Major version in upper 16 bits, followed by 8 bits of minor version and 8 bits of patchlevel. Version 1.2.3 = 0x010203.', null=True, verbose_name='Mumble Version'),
+        ),
+    ]

allianceauth/services/modules/mumble/models.py

@@ -74,7 +74,41 @@ class MumbleUser(AbstractServiceModel):
         editable=False,
         help_text="Hash of Mumble client certificate as presented when user authenticates"
     )
-    display_name = models.CharField(max_length=254, unique=True)
+    display_name = models.CharField(
+        max_length=254,
+        unique=True
+    )
+    release = models.TextField(
+        verbose_name="Mumble Release",
+        max_length=254,
+        blank=True,
+        null=True,
+        editable=False,
+        help_text="The Mumble Release the user last authenticated with"
+    )
+    version = models.IntegerField(
+        verbose_name="Mumble Version",
+        blank=True,
+        null=True,
+        editable=False,
+        help_text="Client version. Major version in upper 16 bits, followed by 8 bits of minor version and 8 bits of patchlevel. Version 1.2.3 = 0x010203."
+    )
+    last_connect = models.DateTimeField(
+        verbose_name="Last Connection",
+        max_length=254,
+        blank=True,
+        null=True,
+        editable=False,
+        help_text="Timestamp of the users Last Connection to Mumble"
+    )
+    last_disconnect = models.DateTimeField(
+        verbose_name="Last Disconnection",
+        max_length=254,
+        blank=True,
+        null=True,
+        editable=False,
+        help_text="Timestamp of the users Last Disconnection to Mumble"
+    )
 
     objects = MumbleManager()
 

allianceauth/srp/form.py

@@ -1,3 +1,5 @@
+import re
+
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
@@ -21,6 +23,11 @@ class SrpFleetUserRequestForm(forms.Form):
         data = self.cleaned_data['killboard_link']
         if "zkillboard.com" not in data:
             raise forms.ValidationError(_("Invalid Link. Please use zKillboard.com"))
+
+        if not re.match(r"http[s]?://zkillboard\.com/kill/\d+\/", data):
+            raise forms.ValidationError(
+                _("Invalid Link. Please post a direct link to a killmail.")
+            )
         return data
 
 

allianceauth/srp/templates/srp/data.html

@@ -10,6 +10,9 @@
     {% include 'bundles/x-editable.css.html' %}
   <link href="{% static 'css/checkbox.css' %}" rel="stylesheet" type="text/css">
   <style>
+  .copy-text-fa-icon:hover {
+    cursor: pointer;
+  }
   .radio label, .checkbox label {
       padding-left: 10px;
   }
@@ -109,7 +112,8 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                                             {{ srpfleetrequest.character.alliance.alliance_ticker }}
                                         {% endif %}
                                         [{{ srpfleetrequest.character.corporation.corporation_ticker }}]
-                                        {{ srpfleetrequest.character.character_name }}
+                                        {{ srpfleetrequest.character.character_name }}&nbsp;<i class="copy-text-fa-icon far fa-copy" data-clipboard-text="{{ srpfleetrequest.character.character_name }}"></i>
+                                        </span>
                                     </td>
                                     <td class="text-center">
                                         <a href="{{ srpfleetrequest.killboard_link }}"
@@ -182,7 +186,24 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
     {% include 'bundles/datatables-js.html' %}
     {% include 'bundles/x-editable-js.html' %}
     {% include 'bundles/moment-js.html' %}
-{% endblock %}
+    {% include 'bundles/clipboard-js.html' %}
+    
+    <script>
+        var clipboard = new ClipboardJS('.copy-text-fa-icon');
+        clipboard.on('success', function (e) {
+        console.info('Action:', e.action);
+        console.info('Text:', e.text);
+        console.info('Trigger:', e.trigger);
+
+        e.clearSelection();
+        });
+
+        clipboard.on('error', function (e) {
+        console.error('Action:', e.action);
+        console.error('Trigger:', e.trigger);
+        });
+    </script>
+{% endblock extra_javascript %}
 
 {% block extra_script %}
   $(document).ready(function() {

allianceauth/static/css/auth-base.css

@@ -43,27 +43,51 @@ ul.list-group.list-group-horizontal > li.list-group-item {
     justify-content: center;
 }
 
-/* style group headers within a table */
+@media all {        
-.tr-group {
+    /* style nav tabs in dark mode*/
-    font-weight: bold;
+    .template-dark-mode .nav-tabs > li.active > a {
-    background-color: #e6e6e6 !important;
+        background-color: rgb(70, 69, 69)!important;
-}
+        color: rgb(255, 255, 255) !important;
+    }
 
-/* default style for tables */
+    .panel-tabs-aa {
-.table-aa > thead > tr > th{
+        border-top: none;
-    border-bottom: 1px solid #f2f2f2;
+        border-top-left-radius: 0%;
-}
+        border-top-right-radius: 0%;
-.table-aa > thead > tr > th{
+    }
-    vertical-align: middle;
+
-}
+    /* style group headers within a table */
-.table-aa > tbody > tr > td{
+    .template-light-mode .tr-group {
-    border-bottom: 1px solid #f2f2f2;
+        font-weight: bold;
-}
+        background-color: #e6e6e6 !important;
-.table-aa > tbody > tr > td {
+    }
-    vertical-align: middle;
+    .template-dark-mode .tr-group {
-}
+        font-weight: bold;
-.table-aa > tbody > tr:last-child {
+        background-color: rgb(105, 105, 105) !important;
-    border-bottom: none;
+    }     
+
+    /* default style for tables */
+    .template-light-mode .table-aa > thead > tr > th{
+        border-bottom: 1px solid #f2f2f2;
+    }
+    .template-dark-mode .table-aa > thead > tr > th{
+        border-bottom: 1px solid rgb(70, 69, 69);
+    }
+    .table-aa > thead > tr > th{
+        vertical-align: middle;
+    }
+    .template-light-mode .table-aa > tbody > tr > td{
+        border-bottom: 1px solid #f2f2f2;
+    }
+    .template-dark-mode .table-aa > tbody > tr > td{
+        border-bottom: 1px solid rgb(70, 69, 69);
+    }
+    .table-aa > tbody > tr > td {
+        vertical-align: middle;
+    }
+    .table-aa > tbody > tr:last-child {
+        border-bottom: none;
+    }
 }
 
 /* highlight active menu items

allianceauth/templates/allianceauth/admin-status/overview.html

@@ -18,9 +18,20 @@
                         {% endfor %}
                     </ul>
                 </div>
-                <div class="text-right" style="position:absolute;bottom:5px;right:5px;">
+
-                    <a href="https://gitlab.com/allianceauth/allianceauth/issues"><span class="label" style="background-color:#e65328;">
+                <div class="text-right" style="position: absolute; bottom: 5px; right: 5px;">
-                        <i class="fab fa-gitlab" aria-hidden="true"></i> Powered by GitLab</span>
+                    <a href="https://gitlab.com/allianceauth/allianceauth/issues" target="_blank" style="margin-right: 0.5rem;">
+                        <span class="label" style="background-color: #e65328;">
+                            <i class="fab fa-gitlab" aria-hidden="true"></i>
+                            {% translate 'Powered by GitLab' %}
+                        </span>
+                    </a>
+
+                    <a href="https://discord.com/invite/fjnHAmk" target="_blank">
+                        <span class="label" style="background-color: rgb(110,133,211);">
+                            <i class="fab fa-discord" aria-hidden="true"></i>
+                            {% translate 'Support Discord' %}
+                        </span>
                     </a>
                 </div>
             </div>

allianceauth/templates/bundles/clipboard-js.html

@@ -1,3 +1,3 @@
 <!-- Start Clipboard.js js from cdnjs -->
-<script type="application/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js"></script>
+<script type="application/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.8/clipboard.min.js" integrity="sha512-sIqUEnRn31BgngPmHt2JenzleDDsXwYO+iyvQ46Mw6RL+udAUZj2n/u/PGY80NxRxynO7R9xIGx5LEzw4INWJQ==" crossorigin="anonymous"></script>
 <!-- End Clipboard.js js from cdnjs -->  

allianceauth/templatetags/admin_status.py

@@ -70,8 +70,8 @@ def _current_notifications() -> dict:
             _fetch_notification_issues_from_gitlab,
             NOTIFICATION_CACHE_TIME
         )
-    except requests.RequestException:
+    except requests.HTTPError:
-        logger.exception('Error while getting gitlab notifications')
+        logger.warning('Error while getting gitlab notifications', exc_info=True)
         top_notifications = []
     else:
         if notifications:
@@ -95,8 +95,8 @@ def _current_version_summary() -> dict:
         tags = cache.get_or_set(
             'git_release_tags', _fetch_tags_from_gitlab, TAG_CACHE_TIME
         )
-    except requests.RequestException:
+    except requests.HTTPError:
-        logger.exception('Error while getting gitlab release tags')
+        logger.warning('Error while getting gitlab release tags', exc_info=True)
         return {}
 
     if not tags:

docs/development/dev_setup/aa-dev-setup-wsl-vsc-v2.md

@@ -25,6 +25,11 @@ The development environment consists of the following components:
 
 We will use the build-in Django development webserver, so we don't need to setup a WSGI server or a web server.
 
+```eval_rst
+.. note::
+   This setup works with both WSL 1 and WSL 2. However, due to the significantly better performance we recommend WSL 2.
+```
+
 ## Requirement
 
 The only requirement is a PC with Windows 10 and Internet connection in order to download the additional software components.
@@ -361,8 +366,7 @@ Here is an example debug config for Celery:
     "module": "celery",
     "cwd": "${workspaceFolder}/myauth",
     "console": "integratedTerminal",
-    "args": [
+    "args": [        
-        "-E",
         "-A",
         "myauth",
         "worker",
@@ -371,7 +375,8 @@ Here is an example debug config for Celery:
         "-P",
         "solo",
     ],
-    "django": true
+    "django": true,
+    "justMyCode": true,
 },
 ```
 
@@ -386,15 +391,14 @@ Finally it makes sense to have a dedicated debug config for running unit tests.
     "request": "launch",
     "program": "${workspaceFolder}/myauth/manage.py",
     "args": [
-        "test",
+        "test",        
-        "-v 2",
         "--keepdb",
         "--debug-mode",
         "--failfast",
         "example",
     ],
-
+    "django": true,
-    "django": true
+    "justMyCode": true
 },
 ```
 
@@ -416,13 +420,31 @@ Finally you may also want to have a debug config to debug a non-Django Python sc
 
 ## Additional tools
 
-The following additional tools are very helpful when developing for AA.
+The following additional tools are very helpful when developing for AA with VS Code:
+
+### Pylance
+
+Pylance is an extension that works alongside Python in Visual Studio Code to provide performant language support: [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance)
 
 ### Code Spell Checker
 
-Typos in your user facing comments can be quite embarrassing. This spell checker helps you avoid them.
+Typos in your user facing comments can be quite embarrassing. This spell checker helps you avoid them: [Code Spell Checker](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker)
 
-Install from here: [Code Spell Checker](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker)
+### markdownlint
+
+Extension for Visual Studio Code - Markdown linting and style checking for Visual Studio Code: [markdownlint](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint)
+
+### GitLens
+
+Extension for Visual Studio Code - Supercharge the Git capabilities built into Visual Studio Code: [GitLens](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
+
+### RST preview
+
+A VS Code extension to preview restructured text and provide syntax highlighting: [RST Preview](https://marketplace.visualstudio.com/items?itemName=tht13.rst-vscode)
+
+### Django Template
+
+This extension adds language colorization support and user snippets for the Django template language to VS Code: [Django Template](https://marketplace.visualstudio.com/items?itemName=bibhasdn.django-html)
 
 ### DBeaver
 

docs/development/tech_docu/api/notifications.rst

@@ -14,7 +14,7 @@ models
 ===========
 
 .. autoclass:: allianceauth.notifications.models.Notification
-    :members: view, set_level, LEVEL_CHOICES
+    :members: LEVEL_CHOICES, mark_viewed, set_level
     :undoc-members:
 
 managers

docs/features/apps/autogroups.md

@@ -42,11 +42,12 @@ Auto Groups are configured via models in the Admin Interface, a user will requir
 +-------------------------------------------+------------------+----------------+
 | Permission                                | Admin Site       | Auth Site      |
 +===========================================+==================+================+
-| eve_autogroups.add_autogroupsconfig	    | Can create model | None.          |
+| eve_autogroups.add_autogroupsconfig       | Can create model | None.          |
 +-------------------------------------------+------------------+----------------+
-| eve_autogroups.change_autogroupsconfig	| Can edit model   | None.          |
+| eve_autogroups.change_autogroupsconfig    | Can edit model   | None.          |
 +-------------------------------------------+------------------+----------------+
-| eve_autogroups.delete_autogroupsconfig	| Can delete model | None.          |
+| eve_autogroups.delete_autogroupsconfig    | Can delete model | None.          |
 +-------------------------------------------+------------------+----------------+
 ```
+
 There exists more models that will be automatically created and maintained by this module, they do not require end-user/admin interaction. `managedalliancegroup` `managedcorpgroups`

docs/features/services/discord.md

@@ -26,7 +26,7 @@ DISCORD_SYNC_NAMES = False
 
 CELERYBEAT_SCHEDULE['discord.update_all_usernames'] = {
     'task': 'discord.update_all_usernames',
-    'schedule': crontab(hour='*/12'),
+    'schedule': crontab(minute=0, hour='*/12'),
 }
 ```
 

docs/features/services/teamspeak3.md

@@ -38,14 +38,14 @@ To install we need a copy of the server. You can find the latest version from [t
 
 Download the server, replacing the link with the link you got earlier.
 
-```url
+```text
 http://dl.4players.de/ts/releases/3.13.2/teamspeak3-server_linux_amd64-3.13.2.tar.bz2
 ```
 
 Now we need to extract the file.
 
 ```bash
-    tar -xf teamspeak3-server_linux_amd64-3.1.0.tar.bz2
+tar -xf teamspeak3-server_linux_amd64-3.1.0.tar.bz2
 ```
 
 ### Create User

docs/maintenance/apps.md

@@ -1,4 +1,6 @@
-# Adding and Removing Apps
+# App Maintenance
+
+## Adding and Removing Apps
 
 Your auth project is just a regular Django project - you can add in [other Django apps](https://djangopackages.org/) as desired. Most come with dedicated setup guides, but here is the general procedure:
 
@@ -8,3 +10,17 @@ Your auth project is just a regular Django project - you can add in [other Djang
 4. restart AA with `supervisorctl restart myauth:`
 
 If you ever want to remove an app, you should first clear it from the database to avoid dangling foreign keys: `python manage.py migrate appname zero`. Then you can remove it from your auth project's `INSTALLED_APPS` list.
+
+## Permission Cleanup
+
+Mature Alliance Auth installations, or those with actively developed extensions may find themselves with stale or duplicated Permission models.
+
+This can make it confusing for admins to apply the right permissions, contribute to larger queries in backend management or simply look unsightly.
+
+```python
+    python manage.py remove_stale_contenttypes --include-stale-apps
+```
+
+This inbuilt Django command will step through each contenttype and offer to delete it, displaying what exactly this will cascade to delete. Pay attention and ensure you understand exactly what is being removed before answering `yes`.
+
+This should only cleanup uninstalled apps, deprecated permissions within apps should be cleaned up using Data Migrations by each responsible application.

setup.py

@@ -22,7 +22,7 @@ install_requires = [
     'celery>=4.3.0,<5.0.0,!=4.4.4',  # 4.4.4 is missing a dependency
     'celery_once>=2.0.1',
 
-    'django>=3.1.1,<4.0.0',
+    'django>=3.1.1,<3.2.0',
     'django-bootstrap-form',
     'django-registration>=3.1',
     'django-sortedm2m',
@@ -71,7 +71,7 @@ setup(
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
         'Operating System :: POSIX :: Linux',