.pre-commit-config.yaml

@@ -3,41 +3,22 @@
 # Update this file:
 #   pre-commit autoupdate
 
-# Set the default language versions for the hooks
-default_language_version:
-  python: python3  # Force all Python hooks to use Python 3
-  node: 22.12.0  # Force all Node hooks to use Node 22.12.0
-
-# Globally exclude files
-# https://pre-commit.com/#top_level-exclude
-exclude: |
-  (?x)(
-    LICENSE|
-    allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
-    \.min\.css|
-    \.min\.js|
-    \.po|
-    \.mo|
-    swagger\.json|
-    static/(.*)/libs/
-  )
-
 repos:
   # Code Upgrades
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.25.0
+    rev: 1.17.0
     hooks:
       - id: django-upgrade
         args: [--target-version=4.2]
 
   # Formatting
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v4.6.0
     hooks:
       # Identify invalid files
       - id: check-ast
@@ -52,9 +33,9 @@ repos:
       - id: detect-private-key
       - id: check-case-conflict
       # Python checks
-#      - id: check-docstring-first
+      #      - id: check-docstring-first
       - id: debug-statements
-#      - id: requirements-txt-fixer
+      #      - id: requirements-txt-fixer
       - id: fix-encoding-pragma
         args: [--remove]
       - id: fix-byte-order-marker
@@ -63,22 +44,45 @@ repos:
         args: [--fix=lf]
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
+        exclude: |
+          (?x)(
+            \.min\.css|
+            \.min\.js|
+            \.po|
+            \.mo|
+            swagger\.json
+          )
       - id: check-executables-have-shebangs
       - id: end-of-file-fixer
+        exclude: |
+          (?x)(
+            \.min\.css|
+            \.min\.js|
+            \.po|
+            \.mo|
+            swagger\.json
+          )
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 3.2.1
+    rev: 2.7.3
     hooks:
       - id: editorconfig-checker
+        exclude: |
+          (?x)(
+            LICENSE|
+            allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
+            \.po|
+            \.mo|
+            swagger\.json
+          )
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.45.0
+    rev: v0.41.0
     hooks:
       - id: markdownlint
-        language: node
         args:
           - --disable=MD013
   # Infrastructure
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.6.0
+    rev: 2.1.3
     hooks:
       - id: pyproject-fmt
         name: pyproject.toml formatter
@@ -86,9 +90,9 @@ repos:
         args:
           - --indent=4
         additional_dependencies:
-          - tox==4.24.1 # https://github.com/tox-dev/tox/releases/latest
+          - tox==4.15.0 # https://github.com/tox-dev/tox/releases/latest
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.24.1
+    rev: v0.18
     hooks:
       - id: validate-pyproject
         name: Validate pyproject.toml

README.md

@@ -1,15 +1,15 @@
 # Alliance Auth
 
-[![License](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
-[![Django Versions](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
-[![Stable AA Version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
-[![Pipeline Status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[![license](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
+[![python](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
+[![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
+[![version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
+[![pipeline status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](https://allianceauth.readthedocs.io/?badge=latest)
-[![Test Coverage Report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[![coverage report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Chat on Discord](https://img.shields.io/discord/399006117012832262.svg)](https://discord.gg/fjnHAmk)
 
-A flexible authentication platform for EVE Online to help in-game organizations manage access to applications and services. AA provides both, a stable core, and a robust framework for community development and custom applications.
+An auth system for EVE Online to help in-game organizations manage online service access.
 
 ## Content
 
@@ -22,17 +22,17 @@ A flexible authentication platform for EVE Online to help in-game organizations
 
 ## Overview
 
-Alliance Auth (AA) is a platform that helps Eve Online organizations efficiently manage access to applications and services.
+Alliance Auth (AA) is a web site that helps Eve Online organizations efficiently manage access to applications and services.
 
 Main features:
 
-- Automatically grants or revokes user access to external services (e.g.: Discord, Mumble) based on the user's current membership to [a variety of EVE Online affiliation](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
+- Automatically grants or revokes user access to external services (e.g. Discord, Mumble) and web apps (e.g. SRP requests) based on the user's current membership to [in-game organizations](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
 
 - Provides a central web site where users can directly access web apps (e.g. SRP requests, Fleet Schedule) and manage their access to external services and groups.
 
-- Includes a set of connectors (called ["Services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
+- Includes a set of connectors (called ["services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
 
-- Includes a set of web [Apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
+- Includes a set of web [apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
 
 - Can be easily extended with additional services and apps. Many are provided by the community and can be found here: [Community Creations](https://gitlab.com/allianceauth/community-creations)
 
@@ -42,15 +42,9 @@ For further details about AA - including an installation guide and a full list o
 
 ## Screenshot
 
-Here is an example of the Alliance Auth web site with a mixture of Services, Apps and Community Creations enabled:
+Here is an example of the Alliance Auth web site with some plug-ins apps and services enabled:
 
-### Flatly Theme
-
-![Flatly Theme](docs/_static/images/promotion/SampleInstallation-Flatly.png)
-
-### Darkly Theme
-
-![Darkly Theme](docs/_static/images/promotion/SampleInstallation-Darkly.png)
+![screenshot](https://i.imgur.com/2tnX9kD.png)
 
 ## Support
 

allianceauth/__init__.py

@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '4.8.0'
+__version__ = '4.4.2'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/analytics/admin.py

@@ -1,16 +1,15 @@
 from django.contrib import admin
 
 from .models import AnalyticsIdentifier, AnalyticsTokens
-from solo.admin import SingletonModelAdmin
 
 
 @admin.register(AnalyticsIdentifier)
-class AnalyticsIdentifierAdmin(SingletonModelAdmin):
+class AnalyticsIdentifierAdmin(admin.ModelAdmin):
     search_fields = ['identifier', ]
-    list_display = ['identifier', ]
+    list_display = ('identifier',)
 
 
 @admin.register(AnalyticsTokens)
 class AnalyticsTokensAdmin(admin.ModelAdmin):
     search_fields = ['name', ]
-    list_display = ['name', 'type', ]
+    list_display = ('name', 'type',)

allianceauth/analytics/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class AnalyticsConfig(AppConfig):
     name = 'allianceauth.analytics'
     label = 'analytics'
-    verbose_name = _('Analytics')

allianceauth/analytics/migrations/0010_alter_analyticsidentifier_options.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.2.16 on 2024-12-11 02:17
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0009_remove_analyticstokens_ignore_paths_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='analyticsidentifier',
-            options={'verbose_name': 'Analytics Identifier'},
-        ),
-    ]

allianceauth/analytics/models.py

@@ -1,19 +1,23 @@
-from typing import Literal
 from django.db import models
+from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-from solo.models import SingletonModel
+
 from uuid import uuid4
 
 
-class AnalyticsIdentifier(SingletonModel):
+class AnalyticsIdentifier(models.Model):
 
-    identifier = models.UUIDField(default=uuid4, editable=False)
+    identifier = models.UUIDField(
+        default=uuid4,
+        editable=False)
 
-    def __str__(self) -> Literal['Analytics Identifier']:
-        return "Analytics Identifier"
-
-    class Meta:
-        verbose_name = "Analytics Identifier"
+    def save(self, *args, **kwargs):
+        if not self.pk and AnalyticsIdentifier.objects.exists():
+            # Force a single object
+            raise ValidationError('There is can be only one \
+                                    AnalyticsIdentifier instance')
+        self.pk = self.id = 1  # If this happens to be deleted and recreated, force it to be 1
+        return super().save(*args, **kwargs)
 
 
 class AnalyticsTokens(models.Model):

allianceauth/analytics/tasks.py

@@ -5,7 +5,6 @@ from django.apps import apps
 from celery import shared_task
 from .models import AnalyticsTokens, AnalyticsIdentifier
 from .utils import (
-    existence_baremetal_or_docker,
     install_stat_addons,
     install_stat_tokens,
     install_stat_users)
@@ -68,8 +67,8 @@ def analytics_event(namespace: str,
                 value=value).apply_async(priority=9)
 
 
-@shared_task
-def analytics_daily_stats() -> None:
+@shared_task()
+def analytics_daily_stats():
     """Celery Task: Do not call directly
 
     Gathers a series of daily statistics
@@ -78,7 +77,6 @@ def analytics_daily_stats() -> None:
     users = install_stat_users()
     tokens = install_stat_tokens()
     addons = install_stat_addons()
-    existence_type = existence_baremetal_or_docker()
     logger.debug("Running Daily Analytics Upload")
 
     analytics_event(namespace='allianceauth.analytics',
@@ -86,11 +84,6 @@ def analytics_daily_stats() -> None:
                     label='existence',
                     value=1,
                     event_type='Stats')
-    analytics_event(namespace='allianceauth.analytics',
-                    task='send_install_stats',
-                    label=existence_type,
-                    value=1,
-                    event_type='Stats')
     analytics_event(namespace='allianceauth.analytics',
                     task='send_install_stats',
                     label='users',
@@ -106,6 +99,7 @@ def analytics_daily_stats() -> None:
                     label='addons',
                     value=addons,
                     event_type='Stats')
+
     for appconfig in apps.get_app_configs():
         if appconfig.label in [
             "django_celery_beat",
@@ -141,7 +135,7 @@ def analytics_daily_stats() -> None:
                             event_type='Stats')
 
 
-@shared_task
+@shared_task()
 def send_ga_tracking_celery_event(
         measurement_id: str,
         secret: str,
@@ -171,7 +165,7 @@ def send_ga_tracking_celery_event(
     }
 
     payload = {
-        'client_id': AnalyticsIdentifier.get_solo().identifier.hex,
+        'client_id': AnalyticsIdentifier.objects.get(id=1).identifier.hex,
         "user_properties": {
             "allianceauth_version": {
                 "value": __version__

allianceauth/analytics/tests/test_models.py

@@ -1,8 +1,9 @@
 from allianceauth.analytics.models import AnalyticsIdentifier
+from django.core.exceptions import ValidationError
 
 from django.test.testcases import TestCase
 
-from uuid import uuid4
+from uuid import UUID, uuid4
 
 
 # Identifiers
@@ -13,4 +14,14 @@ uuid_2 = "7aa6bd70701f44729af5e3095ff4b55c"
 class TestAnalyticsIdentifier(TestCase):
 
     def test_identifier_random(self):
-        self.assertNotEqual(AnalyticsIdentifier.get_solo(), uuid4)
+        self.assertNotEqual(AnalyticsIdentifier.objects.get(), uuid4)
+
+    def test_identifier_singular(self):
+        AnalyticsIdentifier.objects.all().delete()
+        AnalyticsIdentifier.objects.create(identifier=uuid_1)
+        # Yeah i have multiple asserts here, they all do the same thing
+        with self.assertRaises(ValidationError):
+            AnalyticsIdentifier.objects.create(identifier=uuid_2)
+        self.assertEqual(AnalyticsIdentifier.objects.count(), 1)
+        self.assertEqual(AnalyticsIdentifier.objects.get(
+            pk=1).identifier, UUID(uuid_1))

allianceauth/analytics/utils.py

@@ -1,4 +1,3 @@
-import os
 from django.apps import apps
 from allianceauth.authentication.models import User
 from esi.models import Token
@@ -35,16 +34,3 @@ def install_stat_addons() -> int:
         The Number of Installed Apps"""
     addons = len(list(apps.get_app_configs()))
     return addons
-
-
-def existence_baremetal_or_docker() -> str:
-    """Checks the Installation Type of an install
-
-    Returns
-    -------
-    str
-        existence_baremetal or existence_docker"""
-    docker_tag = os.getenv('AA_DOCKER_TAG')
-    if docker_tag:
-        return "existence_docker"
-    return "existence_baremetal"

allianceauth/apps.py

@@ -1,4 +1,5 @@
 from django.apps import AppConfig
+from django.core.checks import Warning, Error, register
 
 
 class AllianceAuthConfig(AppConfig):

allianceauth/authentication/apps.py

@@ -1,12 +1,10 @@
 from django.apps import AppConfig
 from django.core.checks import register, Tags
-from django.utils.translation import gettext_lazy as _
 
 
 class AuthenticationConfig(AppConfig):
     name = "allianceauth.authentication"
     label = "authentication"
-    verbose_name = _("Authentication")
 
     def ready(self):
         from allianceauth.authentication import checks, signals  # noqa: F401

allianceauth/authentication/models.py

@@ -1,5 +1,4 @@
 import logging
-from typing import ClassVar
 
 from django.contrib.auth.models import User, Permission
 from django.db import models, transaction
@@ -28,7 +27,7 @@ class State(models.Model):
                                             help_text="Factions to whose members this state is available.")
     public = models.BooleanField(default=False, help_text="Make this state available to any character.")
 
-    objects: ClassVar[StateManager] = StateManager()
+    objects = StateManager()
 
     class Meta:
         ordering = ['-priority']
@@ -138,10 +137,8 @@ class UserProfile(models.Model):
                     sender=self.__class__, user=self.user, state=self.state
                 )
 
-    def __str__(self) -> str:
+    def __str__(self):
         return str(self.user)
-
-
 class CharacterOwnership(models.Model):
     class Meta:
         default_permissions = ('change', 'delete')
@@ -151,7 +148,7 @@ class CharacterOwnership(models.Model):
     owner_hash = models.CharField(max_length=28, unique=True)
     user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')
 
-    objects: ClassVar[CharacterOwnershipManager] = CharacterOwnershipManager()
+    objects = CharacterOwnershipManager()
 
     def __str__(self):
         return f"{self.user}: {self.character}"

allianceauth/authentication/templates/authentication/tokens.html

@@ -1,6 +1,5 @@
 {% extends "allianceauth/base-bs5.html" %}
 
-{% load aa_i18n %}
 {% load i18n %}
 
 {% block page_title %}
@@ -14,7 +13,7 @@
 {% block content %}
     <div>
         <p class="mb-3">
-            {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://developers.eveonline.com/authorized-apps where possible."|urlize %}
+            {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %}
         </p>
 
         <table class="table w-100" id="table_tokens">
@@ -31,7 +30,7 @@
                     <tr>
                         <td style="white-space:initial;">
                             {% for s in t.scopes.all %}
-                                <span class="badge text-bg-secondary">{{ s.name }}</span>
+                                <span class="badge bg-secondary">{{ s.name }}</span>
                             {% endfor %}
                         </td>
 
@@ -51,23 +50,20 @@
 {% block extra_javascript %}
     {% include "bundles/datatables-js-bs5.html" %}
 
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
     <script>
         $(document).ready(() => {
             let grp = 2;
 
-            $('#table_tokens').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
+            const table = $('#table_tokens').DataTable({
                 'columnDefs': [{orderable: false, targets: [0, 1]}, {
                     'visible': false,
                     'targets': grp
                 }],
                 'order': [[grp, 'asc']],
                 'drawCallback': function (settings) {
-                    const api = this.api();
-                    const rows = api.rows({page: 'current'}).nodes();
-                    let last = null;
+                    var api = this.api();
+                    var rows = api.rows({page: 'current'}).nodes();
+                    var last = null;
                     api.column(grp, {page: 'current'})
                         .data()
                         .each((group, i) => {

allianceauth/authentication/templates/public/base.html

@@ -1,24 +1,24 @@
 {% load theme_tags %}
 {% load static %}
 <!DOCTYPE html>
-<html lang="en" {% theme_html_tags %}>
+<html lang="en">
     <head>
-        <!-- Required meta tags -->
         <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <!-- End Required meta tags -->
+        <meta name="description" content="">
+        <meta name="author" content="">
+        <!-- TODO Bundle all the site specific stuff up into its own template for easy override -->
+        <meta property="og:title" content="{{ SITE_NAME }}">
+        <meta property="og:image" content="{{ SITE_URL }}{% static 'allianceauth/icons/apple-touch-icon.png' %}">
+        <meta property="og:description" content="Alliance Auth - An auth system for EVE Online to help in-game organizations manage online service access.">
 
-        <!-- Meta tags -->
-        {% include 'allianceauth/opengraph.html' %}
         {% include 'allianceauth/icons.html' %}
-        <!-- Meta tags -->
 
         <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
         {% theme_css %}
-
         {% include 'bundles/fontawesome.html' %}
-        {% include 'bundles/auth-framework-css.html' %}
 
         {% block extra_include %}
         {% endblock %}

allianceauth/authentication/templates/public/lang_select.html

@@ -1,6 +1,7 @@
 {% load i18n %}
 
-<form class="dropdown-item" action="{% url 'set_language' %}" method="post">
+<div class="dropdown">
+    <form action="{% url 'set_language' %}" method="post">
         {% csrf_token %}
 
         <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
@@ -12,4 +13,5 @@
                 </option>
             {% endfor %}
         </select>
-</form>
+    </form>
+</div>

allianceauth/authentication/templates/public/middle_box.html

@@ -29,7 +29,7 @@
                 </p>
 
                 <p class="text-center">
-                    <a class="text-reset" href="https://developers.eveonline.com/authorized-apps" target="_blank" rel="noopener noreferrer">
+                    <a class="text-reset" href="https://community.eveonline.com/support/third-party-applications/" target="_blank" rel="noopener noreferrer">
                         {% translate "Manage ESI Applications" %}
                     </a>
                 </p>

allianceauth/checks.py

@@ -1,7 +1,3 @@
-"""
-Django system checks for Alliance Auth
-"""
-
 from typing import List
 from django import db
 from django.core.checks import CheckMessage, Error, register, Warning
@@ -20,475 +16,142 @@ B = Configuration
 
 @register()
 def django_settings(app_configs, **kwargs) -> List[CheckMessage]:
-    """
-    Check that Django settings are correctly configured
-
-    :param app_configs:
-    :type app_configs:
-    :param kwargs:
-    :type kwargs:
-    :return:
-    :rtype:
-    """
-
     errors: List[CheckMessage] = []
-
-    # Check for SITE_URL
     if hasattr(settings, "SITE_URL"):
-        # Check if SITE_URL is empty
-        if settings.SITE_URL == "":
-            errors.append(
-                Error(
-                    msg="'SITE_URL' is empty.",
-                    hint="Make sure to set 'SITE_URL' to the URL of your Auth instance. (Without trailing slash)",
-                    id="allianceauth.checks.B011",
-                )
-            )
-        # Check if SITE_URL has a trailing slash
-        elif settings.SITE_URL[-1] == "/":
-            errors.append(
-                Warning(
-                    msg="'SITE_URL' has a trailing slash. This may lead to incorrect links being generated by Auth.",
-                    hint="",
-                    id="allianceauth.checks.B005",
-                )
-            )
-    # SITE_URL not found
+        if settings.SITE_URL[-1] == "/":
+            errors.append(Warning("'SITE_URL' Has a trailing slash. This may lead to incorrect links being generated by Auth.", hint="", id="allianceauth.checks.B005"))
     else:
-        errors.append(
-            Error(
-                msg="No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules.",
-                hint="",
-                id="allianceauth.checks.B006",
-            )
-        )
+        errors.append(Error("No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules.", hint="", id="allianceauth.checks.B006"))
 
-    # Check for CSRF_TRUSTED_ORIGINS
     if hasattr(settings, "CSRF_TRUSTED_ORIGINS") and hasattr(settings, "SITE_URL"):
-        # Check if SITE_URL is not in CSRF_TRUSTED_ORIGINS
         if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
-            errors.append(
-                Warning(
-                    msg="'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified.",
-                    hint="",
-                    id="allianceauth.checks.B007",
-                )
-            )
-    # CSRF_TRUSTED_ORIGINS not found
+            errors.append(Warning("'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified.", hint="", id="allianceauth.checks.B007"))
     else:
-        errors.append(
-            Error(
-                msg="No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified",
-                hint="",
-                id="allianceauth.checks.B008",
-            )
-        )
-
-    # Check for ESI_USER_CONTACT_EMAIL
-    if hasattr(settings, "ESI_USER_CONTACT_EMAIL"):
-        # Check if ESI_USER_CONTACT_EMAIL is empty
-        if settings.ESI_USER_CONTACT_EMAIL == "":
-            errors.append(
-                Error(
-                    msg="'ESI_USER_CONTACT_EMAIL' is empty. A valid email is required as maintainer contact for CCP.",
-                    hint="",
-                    id="allianceauth.checks.B009",
-                )
-            )
-    # ESI_USER_CONTACT_EMAIL not found
-    else:
-        errors.append(
-            Error(
-                msg="No 'ESI_USER_CONTACT_EMAIL' found is settings. A valid email is required as maintainer contact for CCP.",
-                hint="",
-                id="allianceauth.checks.B010",
-            )
-        )
+        errors.append(Error("No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified", hint="", id="allianceauth.checks.B008"))
 
     return errors
 
 
 @register()
 def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:
-    """
-    Check that Redis is a supported version
-
-    :param app_configs:
-    :type app_configs:
-    :param kwargs:
-    :type kwargs:
-    :return:
-    :rtype:
-    """
-
-    allianceauth_redis_install_link = "https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools"
-
     errors: List[CheckMessage] = []
-
     try:
-        redis_version = Pep440Version(get_redis_client().info()["redis_version"])
+        redis_version = Pep440Version(get_redis_client().info()['redis_version'])
     except InvalidVersion:
         errors.append(Warning("Unable to confirm Redis Version"))
-
         return errors
 
-    if (
-        redis_version.major == 7
-        and redis_version.minor == 2
-        and timezone.now()
-        > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc)
-    ):
-        errors.append(
-            Error(
-                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
-                hint=allianceauth_redis_install_link,
-                id="allianceauth.checks.A001",
-            )
-        )
+    if redis_version.major == 7 and redis_version.minor == 2 and timezone.now() > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc):
+        errors.append(Error(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A001"))
     elif redis_version.major == 7 and redis_version.minor == 0:
-        errors.append(
-            Warning(
-                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
-                hint=allianceauth_redis_install_link,
-                id="allianceauth.checks.A002",
-            )
-        )
+        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A002"))
     elif redis_version.major == 6 and redis_version.minor == 2:
-        errors.append(
-            Warning(
-                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
-                hint=allianceauth_redis_install_link,
-                id="allianceauth.checks.A018",
-            )
-        )
+        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A018"))
     elif redis_version.major in [6, 5]:
-        errors.append(
-            Error(
-                msg=f"Redis {redis_version.public} EOL",
-                hint=allianceauth_redis_install_link,
-                id="allianceauth.checks.A003",
-            )
-        )
+        errors.append(Error(f"Redis {redis_version.public} EOL", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A003"))
 
     return errors
 
 
 @register()
 def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
-    """
-    Check that MySQL is a supported version
-
-    :param app_configs:
-    :type app_configs:
-    :param kwargs:
-    :type kwargs:
-    :return:
-    :rtype:
-    """
-
-    mysql_quick_guide_link = "https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/"
-
     errors: List[CheckMessage] = []
 
     for connection in db.connections.all():
         if connection.vendor == "mysql":
             try:
-                mysql_version = Pep440Version(
-                    ".".join(str(i) for i in connection.mysql_version)
-                )
+                mysql_version = Pep440Version(".".join(str(i) for i in connection.mysql_version))
             except InvalidVersion:
                 errors.append(Warning("Unable to confirm MySQL Version"))
-
                 return errors
 
             # MySQL 8
-            if mysql_version.major == 8:
-                if mysql_version.minor == 4 and timezone.now() > timezone.datetime(
-                    year=2032, month=4, day=30, tzinfo=timezone.utc
-                ):
-                    errors.append(
-                        Error(
-                            msg=f"MySQL {mysql_version.public} EOL",
-                            hint=mysql_quick_guide_link,
-                            id="allianceauth.checks.A004",
-                        )
-                    )
-                elif mysql_version.minor == 3:
-                    errors.append(
-                        Warning(
-                            msg=f"MySQL {mysql_version.public} Non LTS",
-                            hint=mysql_quick_guide_link,
-                            id="allianceauth.checks.A005",
-                        )
-                    )
-                elif mysql_version.minor == 2:
-                    errors.append(
-                        Warning(
-                            msg=f"MySQL {mysql_version.public} Non LTS",
-                            hint=mysql_quick_guide_link,
-                            id="allianceauth.checks.A006",
-                        )
-                    )
-                elif mysql_version.minor == 1:
-                    errors.append(
-                        Error(
-                            msg=f"MySQL {mysql_version.public} EOL",
-                            hint=mysql_quick_guide_link,
-                            id="allianceauth.checks.A007",
-                        )
-                    )
-                elif mysql_version.minor == 0 and timezone.now() > timezone.datetime(
-                    year=2026, month=4, day=30, tzinfo=timezone.utc
-                ):
-                    errors.append(
-                        Error(
-                            msg=f"MySQL {mysql_version.public} EOL",
-                            hint=mysql_quick_guide_link,
-                            id="allianceauth.checks.A008",
-                        )
-                    )
-
-            # MySQL below 8
-            # This will also catch Mariadb 5.x
-            elif mysql_version.major < 8:
-                errors.append(
-                    Error(
-                        msg=f"MySQL or MariaDB {mysql_version.public} EOL",
-                        hint=mysql_quick_guide_link,
-                        id="allianceauth.checks.A009",
-                    )
-                )
-
+            if mysql_version.major == 8 and mysql_version.minor == 4 and timezone.now() > timezone.datetime(year=2032, month=4, day=30, tzinfo=timezone.utc):
+                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A004"))
+            elif mysql_version.major == 8 and mysql_version.minor == 3:
+                errors.append(Warning(f"MySQL {mysql_version.public} Non LTS", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A005"))
+            elif mysql_version.major == 8 and mysql_version.minor == 2:
+                errors.append(Warning(f"MySQL {mysql_version.public} Non LTS", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A006"))
+            elif mysql_version.major == 8 and mysql_version.minor == 1:
+                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A007"))
+            elif mysql_version.major == 8 and mysql_version.minor == 0 and timezone.now() > timezone.datetime(year=2026, month=4, day=30, tzinfo=timezone.utc):
+                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A008"))
+            elif mysql_version.major < 8:  # This will also catch Mariadb 5.x
+                errors.append(Error(f"MySQL or MariaDB {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A009"))
     return errors
 
 
 @register()
 def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
-    """
-    Check that MariaDB is a supported version
-
-    :param app_configs:
-    :type app_configs:
-    :param kwargs:
-    :type kwargs:
-    :return:
-    :rtype:
-    """
-
-    mariadb_download_link = "https://mariadb.org/download/?t=repo-config"
-
     errors: List[CheckMessage] = []
 
     for connection in db.connections.all():
-        # TODO: Find a way to determine MySQL vs. MariaDB
-        if connection.vendor == "mysql":
+        if connection.vendor == "mysql":  # Still to find a way to determine MySQL vs MariaDB
             try:
-                mariadb_version = Pep440Version(
-                    ".".join(str(i) for i in connection.mysql_version)
-                )
+                mariadb_version = Pep440Version(".".join(str(i) for i in connection.mysql_version))
             except InvalidVersion:
                 errors.append(Warning("Unable to confirm MariaDB Version"))
-
                 return errors
 
             # MariaDB 11
-            if mariadb_version.major == 11:
-                if mariadb_version.minor == 4 and timezone.now() > timezone.datetime(
-                    year=2029, month=5, day=19, tzinfo=timezone.utc
-                ):
-                    errors.append(
-                        Error(
-                            msg=f"MariaDB {mariadb_version.public} EOL",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A010",
-                        )
-                    )
-                elif mariadb_version.minor == 2:
-                    errors.append(
-                        Warning(
-                            msg=f"MariaDB {mariadb_version.public} Non LTS",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A018",
-                        )
-                    )
-
-                    if timezone.now() > timezone.datetime(
-                        year=2024, month=11, day=21, tzinfo=timezone.utc
-                    ):
-                        errors.append(
-                            Error(
-                                msg=f"MariaDB {mariadb_version.public} EOL",
-                                hint=mariadb_download_link,
-                                id="allianceauth.checks.A011",
-                            )
-                        )
-                elif mariadb_version.minor == 1:
-                    errors.append(
-                        Warning(
-                            msg=f"MariaDB {mariadb_version.public} Non LTS",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A019",
-                        )
-                    )
-
-                    if timezone.now() > timezone.datetime(
-                        year=2024, month=8, day=21, tzinfo=timezone.utc
-                    ):
-                        errors.append(
-                            Error(
-                                msg=f"MariaDB {mariadb_version.public} EOL",
-                                hint=mariadb_download_link,
-                                id="allianceauth.checks.A012",
-                            )
-                        )
-                # Demote versions down here once EOL
-                elif mariadb_version.minor in [0, 3]:
-                    errors.append(
-                        Error(
-                            msg=f"MariaDB {mariadb_version.public} EOL",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A013",
-                        )
-                    )
+            if mariadb_version.major == 11 and mariadb_version.minor == 4 and timezone.now() > timezone.datetime(year=2029, month=5, day=19, tzinfo=timezone.utc):
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A010"))
+            elif mariadb_version.major == 11 and mariadb_version.minor == 2:
+                errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A018"))
+                if timezone.now() > timezone.datetime(year=2024, month=11, day=21, tzinfo=timezone.utc):
+                    errors.append(Error(f"MariaDB {mariadb_version.public}  EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A011"))
+            elif mariadb_version.major == 11 and mariadb_version.minor == 1:
+                errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A019"))
+                if timezone.now() > timezone.datetime(year=2024, month=8, day=21, tzinfo=timezone.utc):
+                    errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A012"))
+            elif mariadb_version.major == 11 and mariadb_version.minor in [0, 3]:  # Demote versions down here once EOL
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A013"))
 
             # MariaDB 10
-            elif mariadb_version.major == 10:
-                if mariadb_version.minor == 11 and timezone.now() > timezone.datetime(
-                    year=2028, month=2, day=10, tzinfo=timezone.utc
-                ):
-                    errors.append(
-                        Error(
-                            msg=f"MariaDB {mariadb_version.public} EOL",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A014",
-                        )
-                    )
-                elif mariadb_version.minor == 6 and timezone.now() > timezone.datetime(
-                    year=2026, month=7, day=6, tzinfo=timezone.utc
-                ):
-                    errors.append(
-                        Error(
-                            msg=f"MariaDB {mariadb_version.public} EOL",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A0015",
-                        )
-                    )
-                elif mariadb_version.minor == 5 and timezone.now() > timezone.datetime(
-                    year=2025, month=6, day=24, tzinfo=timezone.utc
-                ):
-                    errors.append(
-                        Error(
-                            msg=f"MariaDB {mariadb_version.public} EOL",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A016",
-                        )
-                    )
-                # Demote versions down here once EOL
-                elif mariadb_version.minor in [0, 1, 2, 3, 4, 7, 9, 10]:
-                    errors.append(
-                        Error(
-                            msg=f"MariaDB {mariadb_version.public} EOL",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A017",
-                        )
-                    )
+            elif mariadb_version.major == 10 and mariadb_version.minor == 11 and timezone.now() > timezone.datetime(year=2028, month=2, day=10, tzinfo=timezone.utc):
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A014"))
+            elif mariadb_version.major == 10 and mariadb_version.minor == 6 and timezone.now() > timezone.datetime(year=2026, month=7, day=6, tzinfo=timezone.utc):
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A0015"))
+            elif mariadb_version.major == 10 and mariadb_version.minor == 5 and timezone.now() > timezone.datetime(year=2025, month=6, day=24, tzinfo=timezone.utc):
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A016"))
+            elif mariadb_version.major == 10 and mariadb_version.minor in [0, 1, 2, 3, 4, 7, 9, 10]:  # Demote versions down here once EOL
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A017"))
 
     return errors
 
 
 @register()
 def system_package_sqlite(app_configs, **kwargs) -> List[CheckMessage]:
-    """
-    Check that SQLite is a supported version
-
-    :param app_configs:
-    :type app_configs:
-    :param kwargs:
-    :type kwargs:
-    :return:
-    :rtype:
-    """
-
     errors: List[CheckMessage] = []
-
     for connection in db.connections.all():
         if connection.vendor == "sqlite":
             try:
-                sqlite_version = Pep440Version(
-                    ".".join(str(i) for i in sqlite_version_info)
-                )
+                sqlite_version = Pep440Version(".".join(str(i) for i in sqlite_version_info))
             except InvalidVersion:
                 errors.append(Warning("Unable to confirm SQLite Version"))
-
                 return errors
             if sqlite_version.major == 3 and sqlite_version.minor < 27:
-                errors.append(
-                    Error(
-                        msg=f"SQLite {sqlite_version.public} Unsupported by Django",
-                        hint="https://pkgs.org/download/sqlite3",
-                        id="allianceauth.checks.A020",
-                    )
-                )
-
+                errors.append(Error(f"SQLite {sqlite_version.public} Unsupported by Django", hint="https://pkgs.org/download/sqlite3", id="allianceauth.checks.A020"))
     return errors
 
 
 @register()
 def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
-    """
-    Check that SQL settings are correctly configured
-
-    :param app_configs:
-    :type app_configs:
-    :param kwargs:
-    :type kwargs:
-    :return:
-    :rtype:
-    """
-
     errors: List[CheckMessage] = []
-
     for connection in db.connections.all():
         if connection.vendor == "mysql":
             try:
                 if connection.settings_dict["OPTIONS"]["charset"] != "utf8mb4":
-                    errors.append(
-                        Error(
-                            msg=f"SQL Charset is not set to utf8mb4 DB: {connection.alias}",
-                            hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
-                            id="allianceauth.checks.B001",
-                        )
-                    )
+                    errors.append(Error(f"SQL Charset is not set to utf8mb4 DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
             except KeyError:
-                errors.append(
-                    Error(
-                        msg=f"SQL Charset is not set to utf8mb4 DB: {connection.alias}",
-                        hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
-                        id="allianceauth.checks.B001",
-                    )
-                )
+                errors.append(Error(f"SQL Charset is not set to utf8mb4 DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
 
             # This hasn't actually been set on AA yet
             # try:
-            #     if (
-            #         connection.settings_dict["OPTIONS"]["collation"]
-            #         != "utf8mb4_unicode_ci"
-            #     ):
-            #         errors.append(
-            #             Error(
-            #                 msg=f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}",
-            #                 hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
-            #                 id="allianceauth.checks.B001",
-            #             )
-            #         )
+            #     if connection.settings_dict["OPTIONS"]["collation"] != "utf8mb4_unicode_ci":
+            #         errors.append(Error(f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
             # except KeyError:
-            #     errors.append(
-            #         Error(
-            #             msg=f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}",
-            #             hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
-            #             id="allianceauth.checks.B001",
-            #         )
-            #     )
+            #     errors.append(Error(f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
 
         # if connection.vendor == "sqlite":
 
@@ -497,57 +160,19 @@ def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
 
 @register()
 def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
-    """
-    Check that Celery settings are correctly configured
-
-    :param app_configs:
-    :type app_configs:
-    :param kwargs:
-    :type kwargs:
-    :return:
-    :rtype:
-    """
-
     errors: List[CheckMessage] = []
 
     try:
-        if current_app.conf.broker_transport_options != {
-            "priority_steps": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-            "queue_order_strategy": "priority",
-        }:
-            errors.append(
-                Error(
-                    msg="Celery Priorities are not set correctly",
-                    hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc",
-                    id="allianceauth.checks.B003",
-                )
-            )
+        if current_app.conf.broker_transport_options != {'priority_steps': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 'queue_order_strategy': 'priority'}:
+            errors.append(Error("Celery Priorities are not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
     except KeyError:
-        errors.append(
-            Error(
-                msg="Celery Priorities are not set",
-                hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc",
-                id="allianceauth.checks.B003",
-            )
-        )
+        errors.append(Error("Celery Priorities are not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
 
     try:
-        if not current_app.conf.broker_connection_retry_on_startup:
-            errors.append(
-                Error(
-                    msg="Celery broker_connection_retry_on_startup not set correctly",
-                    hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280",
-                    id="allianceauth.checks.B004",
-                )
-            )
+        if current_app.conf.broker_connection_retry_on_startup != True:
+            errors.append(Error("Celery broker_connection_retry_on_startup not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
     except KeyError:
-        errors.append(
-            Error(
-                msg="Celery broker_connection_retry_on_startup not set",
-                hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280",
-                id="allianceauth.checks.B004",
-            )
-        )
+        errors.append(Error("Celery broker_connection_retry_on_startup not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
 
     return errors
 

allianceauth/corputils/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class CorpUtilsConfig(AppConfig):
     name = 'allianceauth.corputils'
     label = 'corputils'
-    verbose_name = _('Corporation Stats')

allianceauth/corputils/models.py

@@ -1,6 +1,5 @@
 import logging
 import os
-from typing import ClassVar
 
 from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
@@ -41,9 +40,9 @@ class CorpStats(models.Model):
         verbose_name = "corp stats"
         verbose_name_plural = "corp stats"
 
-    objects: ClassVar[CorpStatsManager] = CorpStatsManager()
+    objects = CorpStatsManager()
 
-    def __str__(self) -> str:
+    def __str__(self):
         return f"{self.__class__.__name__} for {self.corp}"
 
     def update(self):

allianceauth/corputils/templates/corputils/corpstats.html

@@ -1,6 +1,5 @@
 {% extends 'corputils/base.html' %}
 
-{% load aa_i18n %}
 {% load i18n %}
 {% load humanize %}
 
@@ -138,7 +137,7 @@
                                                                 <td style="width: 30%;">{{ alt.corporation_name }}</td>
                                                                 <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
                                                                 <td style="width: 5%;">
-                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge text-bg-danger" target="_blank">
+                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank">
                                                                         {% translate "Killboard" %}
                                                                     </a>
                                                                 </td>
@@ -175,7 +174,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
                                                 <td>{{ member }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                 </td>
                                                 <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
                                                 <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
@@ -188,7 +187,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                 <td>{{ member.character_name }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                 </td>
                                                 <td></td>
                                                 <td></td>
@@ -219,7 +218,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                 <td>{{ member.character_name }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">
                                                         {% translate "Killboard" %}
                                                     </a>
                                                 </td>
@@ -239,12 +238,9 @@
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
 
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
     <script>
         $(document).ready(() => {
             $('#table-mains').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
                 "columnDefs": [
                     { "sortable": false, "targets": [1] },
                 ],
@@ -253,7 +249,6 @@
             });
 
             $('#table-members').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
                 "columnDefs": [
                     { "searchable": false, "targets": [0, 2] },
                     { "sortable": false, "targets": [0, 2] },
@@ -264,7 +259,6 @@
             });
 
             $('#table-unregistered').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
                 "columnDefs": [
                     { "searchable": false, "targets": [0, 2] },
                     { "sortable": false, "targets": [0, 2] },

allianceauth/corputils/templates/corputils/search.html

@@ -1,6 +1,5 @@
 {% extends "corputils/base.html" %}
 
-{% load aa_i18n %}
 {% load i18n %}
 
 {% block member_data %}
@@ -28,7 +27,7 @@
                             <td><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
                             <td>{{ result.1.character_name }}</td>
                             <td >{{ result.0.corp.corporation_name }}</td>
-                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
                             <td>{{ result.1.main_character.character_name }}</td>
                             <td>{{ result.1.main_character.corporation_name }}</td>
                             <td>{{ result.1.main_character.alliance_name }}</td>
@@ -43,12 +42,9 @@
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
 
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
     <script>
         $(document).ready(() => {
             $('#table-search').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
                 "stateSave": true,
                 "stateDuration": 0
             });

allianceauth/crontab/__init__.py

@@ -1,3 +0,0 @@
-"""
-Alliance Auth Crontab Utilities
-"""

allianceauth/crontab/apps.py

@@ -1,16 +0,0 @@
-"""
-Crontab App Config
-"""
-
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-
-class CrontabConfig(AppConfig):
-    """
-    Crontab App Config
-    """
-
-    name = "allianceauth.crontab"
-    label = "crontab"
-    verbose_name = _("Crontab")

allianceauth/crontab/migrations/0001_initial.py

@@ -1,29 +0,0 @@
-# Generated by Django 4.2.16 on 2025-01-20 06:16
-
-import allianceauth.crontab.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='CronOffset',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('minute', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Minute Offset')),
-                ('hour', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Hour Offset')),
-                ('day_of_month', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Month Offset')),
-                ('month_of_year', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Month of Year Offset')),
-                ('day_of_week', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Week Offset')),
-            ],
-            options={
-                'verbose_name': 'Cron Offsets',
-            },
-        ),
-    ]

allianceauth/crontab/models.py

@@ -1,23 +0,0 @@
-from random import random
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from solo.models import SingletonModel
-
-
-def random_default() -> float:
-    return random()
-
-
-class CronOffset(SingletonModel):
-
-    minute = models.FloatField(_("Minute Offset"), default=random_default)
-    hour = models.FloatField(_("Hour Offset"), default=random_default)
-    day_of_month = models.FloatField(_("Day of Month Offset"), default=random_default)
-    month_of_year = models.FloatField(_("Month of Year Offset"), default=random_default)
-    day_of_week = models.FloatField(_("Day of Week Offset"), default=random_default)
-
-    def __str__(self) -> str:
-        return "Cron Offsets"
-
-    class Meta:
-        verbose_name = "Cron Offsets"

allianceauth/crontab/schedulers.py

@@ -1,70 +0,0 @@
-from django.core.exceptions import ObjectDoesNotExist
-from django_celery_beat.schedulers import (
-    DatabaseScheduler
-)
-from django_celery_beat.models import CrontabSchedule
-from django.db.utils import OperationalError, ProgrammingError
-
-from celery import schedules
-from celery.utils.log import get_logger
-
-from allianceauth.crontab.models import CronOffset
-from allianceauth.crontab.utils import offset_cron
-
-logger = get_logger(__name__)
-
-
-class OffsetDatabaseScheduler(DatabaseScheduler):
-    """
-    Customization of Django Celery Beat, Database Scheduler
-    Takes the Celery Schedule from local.py and applies our AA Framework Cron Offset, if apply_offset is true
-    Otherwise it passes it through as normal
-    """
-
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-
-    def update_from_dict(self, mapping):
-        s = {}
-
-        try:
-            cron_offset = CronOffset.get_solo()
-        except (OperationalError, ProgrammingError, ObjectDoesNotExist) as exc:
-            # This is just incase we haven't migrated yet or something
-            logger.warning(
-                "OffsetDatabaseScheduler: Could not fetch CronOffset (%r). "
-                "Defering to DatabaseScheduler",
-                exc
-            )
-            return super().update_from_dict(mapping)
-
-        for name, entry_fields in mapping.items():
-            try:
-                apply_offset = entry_fields.pop("apply_offset", False)  # Ensure this pops before django tries to save to ORM
-                entry = self.Entry.from_entry(name, app=self.app, **entry_fields)
-
-                if apply_offset:
-                    entry_fields.update({"apply_offset": apply_offset})  # Reapply this as its gets pulled from config inconsistently.
-                    schedule_obj = entry.schedule
-                    if isinstance(schedule_obj, schedules.crontab):
-                        offset_cs = CrontabSchedule.from_schedule(offset_cron(schedule_obj))
-                        offset_cs, created = CrontabSchedule.objects.get_or_create(
-                            minute=offset_cs.minute,
-                            hour=offset_cs.hour,
-                            day_of_month=offset_cs.day_of_month,
-                            month_of_year=offset_cs.month_of_year,
-                            day_of_week=offset_cs.day_of_week,
-                            timezone=offset_cs.timezone,
-                        )
-                        entry.schedule = offset_cron(schedule_obj)  # This gets passed into Celery Beats Memory, important to keep it in sync with the model/DB
-                        entry.model.crontab = offset_cs
-                        entry.model.save()
-                        logger.debug(f"Offset applied for '{name}' due to 'apply_offset' = True.")
-
-                if entry.model.enabled:
-                    s[name] = entry
-
-            except Exception as e:
-                logger.exception("Error updating schedule for %s: %r", name, e)
-
-        self.schedule.update(s)

allianceauth/crontab/tests/test_models.py

@@ -1,63 +0,0 @@
-from unittest.mock import patch
-from django.test import TestCase
-
-from allianceauth.crontab.models import CronOffset
-
-
-class CronOffsetModelTest(TestCase):
-    def test_cron_offset_is_singleton(self):
-        """
-        Test that CronOffset is indeed a singleton and that
-        multiple calls to get_solo() return the same instance.
-        """
-        offset1 = CronOffset.get_solo()
-        offset2 = CronOffset.get_solo()
-
-        # They should be the exact same object in memory
-        self.assertEqual(offset1.pk, offset2.pk)
-
-    def test_default_values_random(self):
-        """
-        Test that the default values are set via random_default() when
-        no explicit value is provided. We'll patch 'random.random' to
-        produce predictable output.
-        """
-        with patch('allianceauth.crontab.models.random', return_value=0.1234):
-            # Force creation of a new CronOffset by clearing the existing one
-            CronOffset.objects.all().delete()
-
-            offset = CronOffset.get_solo()  # This triggers creation
-
-            # All fields should be 0.1234, because we patched random()
-            self.assertAlmostEqual(offset.minute, 0.1234)
-            self.assertAlmostEqual(offset.hour, 0.1234)
-            self.assertAlmostEqual(offset.day_of_month, 0.1234)
-            self.assertAlmostEqual(offset.month_of_year, 0.1234)
-            self.assertAlmostEqual(offset.day_of_week, 0.1234)
-
-    def test_update_offset_values(self):
-        """
-        Test that we can update the offsets and retrieve them.
-        """
-        offset = CronOffset.get_solo()
-        offset.minute = 0.5
-        offset.hour = 0.25
-        offset.day_of_month = 0.75
-        offset.month_of_year = 0.99
-        offset.day_of_week = 0.33
-        offset.save()
-
-        # Retrieve again to ensure changes persist
-        saved_offset = CronOffset.get_solo()
-        self.assertEqual(saved_offset.minute, 0.5)
-        self.assertEqual(saved_offset.hour, 0.25)
-        self.assertEqual(saved_offset.day_of_month, 0.75)
-        self.assertEqual(saved_offset.month_of_year, 0.99)
-        self.assertEqual(saved_offset.day_of_week, 0.33)
-
-    def test_str_representation(self):
-        """
-        Verify the __str__ method returns 'Cron Offsets'.
-        """
-        offset = CronOffset.get_solo()
-        self.assertEqual(str(offset), "Cron Offsets")

allianceauth/crontab/tests/test_utils.py

@@ -1,80 +0,0 @@
-# myapp/tests/test_tasks.py
-
-import logging
-from unittest.mock import patch
-from django.test import TestCase
-from django.db import ProgrammingError
-from celery.schedules import crontab
-
-from allianceauth.crontab.utils import offset_cron
-from allianceauth.crontab.models import CronOffset
-
-logger = logging.getLogger(__name__)
-
-
-class TestOffsetCron(TestCase):
-
-    def test_offset_cron_normal(self):
-        """
-        Test that offset_cron modifies the minute/hour fields
-        based on the CronOffset values when everything is normal.
-        """
-        # We'll create a mock CronOffset instance
-        mock_offset = CronOffset(minute=0.5, hour=0.5)
-
-        # Our initial crontab schedule
-        original_schedule = crontab(
-            minute=[0, 5, 55],
-            hour=[0, 3, 23],
-            day_of_month='*',
-            month_of_year='*',
-            day_of_week='*'
-        )
-
-        # Patch CronOffset.get_solo to return our mock offset
-        with patch('allianceauth.crontab.models.CronOffset.get_solo', return_value=mock_offset):
-            new_schedule = offset_cron(original_schedule)
-
-        # Check the new minute/hour
-        # minute 0 -> 0 + round(60 * 0.5) = 30 % 60 = 30
-        # minute 5 -> 5 + 30 = 35 % 60 = 35
-        # minute 55 -> 55 + 30 = 85 % 60 = 25  --> sorted => 25,30,35
-        self.assertEqual(new_schedule._orig_minute, '25,30,35')
-
-        # hour 0 -> 0 + round(24 * 0.5) = 12 % 24 = 12
-        # hour 3 -> 3 + 12 = 15 % 24 = 15
-        # hour 23 -> 23 + 12 = 35 % 24 = 11 --> sorted => 11,12,15
-        self.assertEqual(new_schedule._orig_hour, '11,12,15')
-
-        # Check that other fields are unchanged
-        self.assertEqual(new_schedule._orig_day_of_month, '*')
-        self.assertEqual(new_schedule._orig_month_of_year, '*')
-        self.assertEqual(new_schedule._orig_day_of_week, '*')
-
-    def test_offset_cron_programming_error(self):
-        """
-        Test that if a ProgrammingError is raised (e.g. before migrations),
-        offset_cron just returns the original schedule.
-        """
-        original_schedule = crontab(minute=[0, 15, 30], hour=[1, 2, 3])
-
-        # Force get_solo to raise ProgrammingError
-        with patch('allianceauth.crontab.models.CronOffset.get_solo', side_effect=ProgrammingError()):
-            new_schedule = offset_cron(original_schedule)
-
-        # Should return the original schedule unchanged
-        self.assertEqual(new_schedule, original_schedule)
-
-    def test_offset_cron_unexpected_exception(self):
-        """
-        Test that if any other exception is raised, offset_cron
-        also returns the original schedule, and logs the error.
-        """
-        original_schedule = crontab(minute='0', hour='0')
-
-        # Force get_solo to raise a generic Exception
-        with patch('allianceauth.crontab.models.CronOffset.get_solo', side_effect=Exception("Something bad")):
-            new_schedule = offset_cron(original_schedule)
-
-        # Should return the original schedule unchanged
-        self.assertEqual(new_schedule, original_schedule)

allianceauth/crontab/utils.py

@@ -1,50 +0,0 @@
-from celery.schedules import crontab
-import logging
-from allianceauth.crontab.models import CronOffset
-from django.db import ProgrammingError
-
-
-logger = logging.getLogger(__name__)
-
-
-def offset_cron(schedule: crontab) -> crontab:
-    """Take a crontab and apply a series of precalculated offsets to spread out tasks execution on remote resources
-
-    Args:
-        schedule (crontab): celery.schedules.crontab()
-
-    Returns:
-        crontab: A crontab with offsetted Minute and Hour fields
-    """
-
-    try:
-        cron_offset = CronOffset.get_solo()
-
-        # Stops this shit from happening 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
-        # It is only cosmetic, but still annoying
-        if schedule._orig_minute == '*':
-            new_minute = '*'
-        else:
-            new_minute = [(m + (round(60 * cron_offset.minute))) % 60 for m in schedule.minute]
-        if schedule._orig_hour == '*':
-            new_hour = '*'
-        else:
-            new_hour = [(m + (round(24 * cron_offset.hour))) % 24 for m in schedule.hour]
-
-        return crontab(
-            minute=",".join(str(m) for m in sorted(new_minute)),
-            hour=",".join(str(h) for h in sorted(new_hour)),
-            day_of_month=schedule._orig_day_of_month,
-            month_of_year=schedule._orig_month_of_year,
-            day_of_week=schedule._orig_day_of_week)
-
-    except ProgrammingError as e:
-        # If this is called before migrations are run hand back the default schedule
-        # These offsets are stored in a Singleton Model,
-        logger.error(e)
-        return schedule
-
-    except Exception as e:
-        # We absolutely cant fail to hand back a schedule
-        logger.error(e)
-        return schedule

allianceauth/eveonline/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class EveonlineConfig(AppConfig):
     name = 'allianceauth.eveonline'
     label = 'eveonline'
-    verbose_name = _('EVE Online')

allianceauth/eveonline/autogroups/apps.py

@@ -1,11 +1,9 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class EveAutogroupsConfig(AppConfig):
     name = 'allianceauth.eveonline.autogroups'
     label = 'eve_autogroups'
-    verbose_name = _('EVE Online Autogroups')
 
     def ready(self):
         import allianceauth.eveonline.autogroups.signals

allianceauth/eveonline/autogroups/models.py

@@ -1,5 +1,4 @@
 import logging
-from typing import ClassVar
 from django.db import models, transaction
 from django.contrib.auth.models import Group, User
 from django.core.exceptions import ObjectDoesNotExist
@@ -39,13 +38,13 @@ class AutogroupsConfigManager(models.Manager):
         """
         if state is None:
             state = user.profile.state
+        for config in self.filter(states=state):
+            # grant user new groups for their state
+            config.update_group_membership_for_user(user)
         for config in self.exclude(states=state):
             # ensure user does not have groups from previous state
             config.remove_user_from_alliance_groups(user)
             config.remove_user_from_corp_groups(user)
-        for config in self.filter(states=state):
-            # grant user new groups for their state
-            config.update_group_membership_for_user(user)
 
 
 class AutogroupsConfig(models.Model):
@@ -79,7 +78,7 @@ class AutogroupsConfig(models.Model):
         max_length=10, default='', blank=True,
         help_text='Any spaces in the group name will be replaced with this.')
 
-    objects: ClassVar[AutogroupsConfigManager] = AutogroupsConfigManager()
+    objects = AutogroupsConfigManager()
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

allianceauth/eveonline/autogroups/tests/test_managers.py

@@ -1,4 +1,3 @@
-from allianceauth.eveonline.models import EveCorporationInfo
 from django.test import TestCase
 from allianceauth.tests.auth_utils import AuthUtils
 
@@ -74,51 +73,3 @@ class AutogroupsConfigManagerTestCase(TestCase):
         AutogroupsConfig.objects.update_groups_for_user(member)
 
         self.assertTrue(update_groups.called)
-
-    def test_update_group_membership_corp_in_two_configs(self):
-        # given
-        member = AuthUtils.create_member('test member')
-        AuthUtils.add_main_character_2(
-            member,
-            character_id='1234',
-            name='test character',
-            corp_id='2345',
-            corp_name='corp name',
-            corp_ticker='TIKK',
-
-        )
-
-        corp = EveCorporationInfo.objects.create(
-            corporation_id='2345',
-            corporation_name='corp name',
-            corporation_ticker='TIKK',
-            member_count=10,
-        )
-
-        member_state = AuthUtils.get_member_state()
-        member_config = AutogroupsConfig.objects.create(corp_groups=True)
-        member_config.states.add(member_state)
-        blue_state = AuthUtils.get_blue_state()
-        blue_state.member_corporations.add(corp)
-        blue_config = AutogroupsConfig.objects.create(corp_groups=True)
-        blue_config.states.add(blue_state)
-
-        member.profile.state = blue_state
-        member.profile.save()
-
-        AutogroupsConfig.objects.update_groups_for_user(member)
-
-        # Checks before test that the role is correctly applied
-        group = blue_config.get_corp_group(corp)
-        self.assertIn(group, member.groups.all())
-
-        # when
-        blue_state.member_corporations.remove(corp)
-        member_state.member_corporations.add(corp)
-        member.profile.state = member_state
-        member.profile.save()
-
-        # then
-        AutogroupsConfig.objects.update_groups_for_user(member)
-        group = member_config.get_corp_group(corp)
-        self.assertIn(group, member.groups.all())

allianceauth/eveonline/managers.py

@@ -14,20 +14,10 @@ class EveCharacterProviderManager:
 class EveCharacterManager(models.Manager):
     provider = EveCharacterProviderManager()
 
-    def exclude_biomassed(self):
-        """
-        Get a queryset of EveCharacter objects, excluding the "Doomheim" corporation (1000001).
-
-        :return:
-        :rtype:
-        """
-
-        return self.exclude(corporation_id=1000001)
-
-    def create_character(self, character_id) -> models.Model:
+    def create_character(self, character_id):
         return self.create_character_obj(self.provider.get_character(character_id))
 
-    def create_character_obj(self, character: providers.Character) -> models.Model:
+    def create_character_obj(self, character: providers.Character):
         return self.create(
             character_id=character.id,
             character_name=character.name,

allianceauth/eveonline/models.py

@@ -1,5 +1,5 @@
 import logging
-from typing import ClassVar, Union
+from typing import Union
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
@@ -75,8 +75,8 @@ class EveAllianceInfo(models.Model):
     alliance_ticker = models.CharField(max_length=254)
     executor_corp_id = models.PositiveIntegerField()
 
-    objects: ClassVar[EveAllianceManager] = EveAllianceManager()
-    provider: ClassVar[EveAllianceProviderManager] = EveAllianceProviderManager()
+    objects = EveAllianceManager()
+    provider = EveAllianceProviderManager()
 
     class Meta:
         indexes = [models.Index(fields=['executor_corp_id',])]
@@ -147,7 +147,7 @@ class EveCorporationInfo(models.Model):
         EveAllianceInfo, blank=True, null=True, on_delete=models.SET_NULL
     )
 
-    objects: ClassVar[EveCorporationManager] = EveCorporationManager()
+    objects = EveCorporationManager()
     provider = EveCorporationProviderManager()
 
     class Meta:
@@ -214,7 +214,7 @@ class EveCharacter(models.Model):
     faction_id = models.PositiveIntegerField(blank=True, null=True, default=None)
     faction_name = models.CharField(max_length=254, blank=True, null=True, default='')
 
-    objects: ClassVar[EveCharacterManager] = EveCharacterManager()
+    objects = EveCharacterManager()
     provider = EveCharacterProviderManager()
 
     class Meta:

allianceauth/eveonline/tasks.py

@@ -1,5 +1,4 @@
 import logging
-from random import randint
 
 from celery import shared_task
 
@@ -10,8 +9,7 @@ from . import providers
 logger = logging.getLogger(__name__)
 
 TASK_PRIORITY = 7
-CHARACTER_AFFILIATION_CHUNK_SIZE = 500
-EVEONLINE_TASK_JITTER = 600
+CHUNK_SIZE = 500
 
 
 def chunks(lst, n):
@@ -21,13 +19,13 @@ def chunks(lst, n):
 
 
 @shared_task
-def update_corp(corp_id: int) -> None:
+def update_corp(corp_id):
     """Update given corporation from ESI"""
     EveCorporationInfo.objects.update_corporation(corp_id)
 
 
 @shared_task
-def update_alliance(alliance_id: int) -> None:
+def update_alliance(alliance_id):
     """Update given alliance from ESI"""
     EveAllianceInfo.objects.update_alliance(alliance_id).populate_alliance()
 
@@ -39,30 +37,23 @@ def update_character(character_id: int) -> None:
 
 
 @shared_task
-def run_model_update() -> None:
+def run_model_update():
     """Update all alliances, corporations and characters from ESI"""
 
-    # Queue update tasks for Known Corporation Models
+    #update existing corp models
     for corp in EveCorporationInfo.objects.all().values('corporation_id'):
-        update_corp.apply_async(
-            args=[corp['corporation_id']],
-            priority=TASK_PRIORITY,
-            countdown=randint(1, EVEONLINE_TASK_JITTER))
+        update_corp.apply_async(args=[corp['corporation_id']], priority=TASK_PRIORITY)
 
-    # Queue update tasks for Known Alliance Models
+    # update existing alliance models
     for alliance in EveAllianceInfo.objects.all().values('alliance_id'):
-        update_alliance.apply_async(
-            args=[alliance['alliance_id']],
-            priority=TASK_PRIORITY,
-            countdown=randint(1, EVEONLINE_TASK_JITTER))
+        update_alliance.apply_async(args=[alliance['alliance_id']], priority=TASK_PRIORITY)
 
-    # Queue update tasks for Known Character Models
+    # update existing character models
     character_ids = EveCharacter.objects.all().values_list('character_id', flat=True)
-    for character_ids_chunk in chunks(character_ids, CHARACTER_AFFILIATION_CHUNK_SIZE):
+    for character_ids_chunk in chunks(character_ids, CHUNK_SIZE):
         update_character_chunk.apply_async(
-            args=[character_ids_chunk],
-            priority=TASK_PRIORITY,
-            countdown=randint(1, EVEONLINE_TASK_JITTER))
+            args=[character_ids_chunk], priority=TASK_PRIORITY
+        )
 
 
 @shared_task
@@ -77,9 +68,8 @@ def update_character_chunk(character_ids_chunk: list):
         logger.info("Failed to bulk update characters. Attempting single updates")
         for character_id in character_ids_chunk:
             update_character.apply_async(
-                args=[character_id],
-                priority=TASK_PRIORITY,
-                countdown=randint(1, EVEONLINE_TASK_JITTER))
+                args=[character_id], priority=TASK_PRIORITY
+            )
         return
 
     affiliations = {
@@ -117,5 +107,5 @@ def update_character_chunk(character_ids_chunk: list):
 
             if corp_changed or alliance_changed or name_changed:
                 update_character.apply_async(
-                    args=[character.get('character_id')],
-                    priority=TASK_PRIORITY)
+                    args=[character.get('character_id')], priority=TASK_PRIORITY
+                )

allianceauth/eveonline/tests/test_providers.py

@@ -723,5 +723,5 @@ class TestEveSwaggerProvider(TestCase):
         my_client = my_provider.client
         operation = my_client.Universe.get_universe_factions()
         self.assertEqual(
-            operation.future.request.headers['User-Agent'], 'allianceauth v1.0.0 dummy@example.net'
+            operation.future.request.headers['User-Agent'], 'allianceauth v1.0.0'
         )

allianceauth/eveonline/tests/test_tasks.py

@@ -84,7 +84,7 @@ class TestUpdateTasks(TestCase):
 @override_settings(CELERY_ALWAYS_EAGER=True)
 @patch('allianceauth.eveonline.providers.esi_client_factory')
 @patch('allianceauth.eveonline.tasks.providers')
-@patch('allianceauth.eveonline.tasks.CHARACTER_AFFILIATION_CHUNK_SIZE', 2)
+@patch('allianceauth.eveonline.tasks.CHUNK_SIZE', 2)
 class TestRunModelUpdate(TransactionTestCase):
     def test_should_run_updates(self, mock_providers, mock_esi_client_factory):
         # given
@@ -139,7 +139,7 @@ class TestRunModelUpdate(TransactionTestCase):
 @patch('allianceauth.eveonline.tasks.update_character', wraps=update_character)
 @patch('allianceauth.eveonline.providers.esi_client_factory')
 @patch('allianceauth.eveonline.tasks.providers')
-@patch('allianceauth.eveonline.tasks.CHARACTER_AFFILIATION_CHUNK_SIZE', 2)
+@patch('allianceauth.eveonline.tasks.CHUNK_SIZE', 2)
 class TestUpdateCharacterChunk(TestCase):
     @staticmethod
     def _updated_character_ids(spy_update_character) -> set:

allianceauth/fleetactivitytracking/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class FatConfig(AppConfig):
     name = 'allianceauth.fleetactivitytracking'
     label = 'fleetactivitytracking'
-    verbose_name = _('Fleet Activity Tracking')

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html

@@ -36,7 +36,7 @@
                         <th class="text-center">{% translate "Character" %}</th>
                         <th class="text-center">{% translate "System" %}</th>
                         <th class="text-center">{% translate "Ship" %}</th>
-                        <th class="text-center">{% translate "EVE time" %}</th>
+                        <th class="text-center">{% translate "Eve Time" %}</th>
                         <th></th>
                     </tr>
 

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html

@@ -72,7 +72,7 @@
                         <tr>
                             <th class="text-center">{% translate "Fleet" %}</th>
                             <th class="text-center">{% translate "Creator" %}</th>
-                            <th class="text-center">{% translate "EVE time" %}</th>
+                            <th class="text-center">{% translate "Eve Time" %}</th>
                             <th class="text-center">{% translate "Duration" %}</th>
                             <th class="text-center">{% translate "Edit" %}</th>
                         </tr>
@@ -80,7 +80,7 @@
                         {% for link in created_fats %}
                             <tr>
                                 <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge text-bg-primary">
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">
                                         {{ link.fleet }}
                                     </a>
                                 </td>

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html

@@ -41,7 +41,7 @@
                         <th scope="col" class="text-center">{% translate "Character" %}</th>
                         <th scope="col" class="text-center">{% translate "System" %}</th>
                         <th scope="col" class="text-center">{% translate "Ship" %}</th>
-                        <th scope="col" class="text-center">{% translate "EVE time" %}</th>
+                        <th scope="col" class="text-center">{% translate "Eve Time" %}</th>
                     </tr>
 
                     {% for fat in fats %}
@@ -89,7 +89,7 @@
                             <th scope="col" class="text-center">{% translate "Name" %}</th>
                             <th scope="col" class="text-center">{% translate "Creator" %}</th>
                             <th scope="col" class="text-center">{% translate "Fleet" %}</th>
-                            <th scope="col" class="text-center">{% translate "EVE time" %}</th>
+                            <th scope="col" class="text-center">{% translate "Eve Time" %}</th>
                             <th scope="col" class="text-center">{% translate "Duration" %}</th>
                             <th scope="col" class="text-center">{% translate "Edit" %}</th>
                         </tr>
@@ -97,7 +97,7 @@
                         {% for link in fatlinks %}
                             <tr>
                                 <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge text-bg-primary">{{ link.fleet }}</a>
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">{{ link.fleet }}</a>
                                 </td>
                                 <td class="text-center">{{ link.creator.username }}</td>
                                 <td class="text-center">{{ link.fleet }}</td>

allianceauth/framework/api/user.py

@@ -10,38 +10,23 @@ from allianceauth.authentication.models import CharacterOwnership
 from allianceauth.eveonline.models import EveCharacter
 
 
-def get_all_characters_from_user(user: User, main_first: bool = False) -> list:
+def get_all_characters_from_user(user: User) -> list:
     """
-    Get all characters from a user
-    This function retrieves all characters associated with a given user, optionally ordering them
-    with the main character first.
-    If the user is None, an empty list is returned.
+    Get all characters from a user or an empty list
+    when no characters are found for the user or the user is None
 
-    :param user: The user whose characters are to be retrieved
-    :type user: User
-    :param main_first: If True, the main character will be listed first
-    :type main_first: bool
-    :return: A list of EveCharacter objects associated with the user
-    :rtype: list[EveCharacter]
+    :param user:
+    :type user:
+    :return:
+    :rtype:
     """
 
     if user is None:
         return []
 
     try:
-        if main_first:
         characters = [
-                char.character
-                for char in CharacterOwnership.objects.filter(user=user).order_by(
-                    "-character__userprofile", "character__character_name"
-                )
-            ]
-        else:
-            characters = [
-                char.character
-                for char in CharacterOwnership.objects.filter(user=user).order_by(
-                    "character__character_name"
-                )
+            char.character for char in CharacterOwnership.objects.filter(user=user)
         ]
     except AttributeError:
         return []

allianceauth/framework/apps.py

@@ -3,7 +3,6 @@ Framework App Config
 """
 
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class FrameworkConfig(AppConfig):
@@ -13,4 +12,3 @@ class FrameworkConfig(AppConfig):
 
     name = "allianceauth.framework"
     label = "framework"
-    verbose_name = _("Framework")

allianceauth/framework/static/allianceauth/framework/css/auth-framework.css

@@ -5,24 +5,6 @@
  * to be used throughout Alliance Auth and its Community Apps
  */
 
-/* General
-------------------------------------------------------------------------------------- */
-@media all {
-    .navbar-toggler.collapsed {
-        transform: rotate(180deg);
-    }
-
-    ul#nav-right:has(li) + ul#nav-right-character-control > li:first-child {
-        display: list-item !important;
-    }
-}
-
-@media all and (max-width: 991px) {
-    ul#nav-left:has(li) + ul#nav-right + ul#nav-right-character-control > li:first-child {
-        display: list-item !important;
-    }
-}
-
 /* Bootstrap fixes
 ------------------------------------------------------------------------------------- */
 @media all {
@@ -31,15 +13,6 @@
     }
 }
 
-/* Image overflow fix
-------------------------------------------------------------------------------------- */
-@media all {
-    img {
-        max-width: 100%;
-        height: auto;
-    }
-}
-
 /* Side Navigation
 ------------------------------------------------------------------------------------- */
 @media all {
@@ -67,14 +40,14 @@
     }
 
     /* Chevron icons */
-    #sidebar-menu span[data-bs-toggle="collapse"][aria-expanded="true"] > i.fa-chevron-down,
-    #sidebar-menu span[data-bs-toggle="collapse"][aria-expanded="false"] > i.fa-chevron-right {
+    #sidebar-menu [data-bs-toggle="collapse"] > i.fa-chevron-down,
+    #sidebar-menu [data-bs-toggle="collapse"].collapsed > i.fa-chevron-right {
         display: block;
         width: 16px;
     }
 
-    #sidebar-menu span[data-bs-toggle="collapse"][aria-expanded="true"] > i.fa-chevron-right,
-    #sidebar-menu span[data-bs-toggle="collapse"][aria-expanded="false"] > i.fa-chevron-down {
+    #sidebar-menu [data-bs-toggle="collapse"] > i.fa-chevron-right,
+    #sidebar-menu [data-bs-toggle="collapse"].collapsed > i.fa-chevron-down {
         display: none;
     }
 }

allianceauth/framework/staticfiles/storage.py

@@ -1,105 +0,0 @@
-"""
-Custom static files storage for Alliance Auth.
-
-This module defines a custom static files storage class for
-Alliance Auth, named `AaManifestStaticFilesStorage`.
-
-Using `ManifestStaticFilesStorage` will give us a hashed name for
-our static files, which is useful for cache busting.
-
-This storage class extends Django's `ManifestStaticFilesStorage` to ignore missing files,
-which the original class does not handle, and log them in debug mode.
-It is useful for handling cases where static files may not exist, such as when a
-CSS file references a background image that is not present in the static files directory.
-
-With debug mode enabled, it will print a message for each missing file when running `collectstatic`,
-which can help identify issues with static file references during development.
-"""
-
-from django.conf import settings
-from django.contrib.staticfiles.storage import ManifestStaticFilesStorage
-
-
-class AaManifestStaticFilesStorage(ManifestStaticFilesStorage):
-    """
-    Custom static files storage that ignores missing files.
-    """
-
-    @classmethod
-    def _cleanup_name(cls, name: str) -> str:
-        """
-        Clean up the name by removing quotes.
-        This method is used to ensure that the name does not contain any quotes,
-        which can cause issues with file paths.
-
-        :param name: The name of the static file.
-        :type name: str
-        :return: The cleaned-up name without quotes.
-        :rtype: str
-        """
-
-        # Remove quotes from the name
-        return name.replace('"', "").replace("'", "")
-
-    def __init__(self, *args, **kwargs):
-        """
-        Initialize the static files storage, ignoring missing files.
-
-        :param args:
-        :type args:
-        :param kwargs:
-        :type kwargs:
-        """
-
-        self.missing_files = []
-
-        super().__init__(*args, **kwargs)
-
-    def hashed_name(self, name, content=None, filename=None):
-        """
-        Generate a hashed name for the given static file, ignoring missing files.
-
-        Ignore missing files, e.g. non-existent background image referenced from css.
-        Returns the original filename if the referenced file doesn't exist.
-
-        :param name: The name of the static file to hash.
-        :type name: str
-        :param content: The content of the static file, if available.
-        :type content: bytes | None
-        :param filename: The original filename of the static file, if available.
-        :type filename: str | None
-        :return: The hashed name of the static file, or the original name if the file is missing.
-        :rtype: str
-        """
-
-        try:
-            clean_name = self._cleanup_name(name)
-
-            return super().hashed_name(clean_name, content, filename)
-        except ValueError as e:
-            if settings.DEBUG:
-                # In debug mode, we log the missing file message
-                message = e.args[0].split(" with ")[0]
-                self.missing_files.append(message)
-                # print(f'\x1b[0;30;41m{message}\x1b[0m')
-
-            return name
-
-    def post_process(self, *args, **kwargs):
-        """
-        Post-process the static files, printing any missing files in debug mode.
-
-        :param args:
-        :type args:
-        :param kwargs:
-        :type kwargs:
-        :return:
-        :rtype:
-        """
-
-        yield from super().post_process(*args, **kwargs)
-
-        if settings.DEBUG:
-            # In debug mode, print the missing files
-            for message in sorted(set(self.missing_files)):
-                print(f"\x1b[0;30;41m{message}\x1b[0m")

allianceauth/framework/templates/framework/header/page-header.html

@@ -2,8 +2,7 @@
 {#    {% include "framework/header/page-header.html" with title="Foobar" subtitle="Barfoo" %}#}
 
 {% if title %}
-    <header class="aa-page-header mb-3">
-        <h1 class="page-header text-center">
+    <h1 class="page-header text-center mb-3">
         {{ title }}
 
         {% if subtitle %}
@@ -11,5 +10,4 @@
             <small class="text-muted">{{ subtitle }}</small>
         {% endif %}
     </h1>
-    </header>
 {% endif %}

allianceauth/groupmanagement/apps.py

@@ -1,11 +1,10 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class GroupManagementConfig(AppConfig):
     name = 'allianceauth.groupmanagement'
     label = 'groupmanagement'
-    verbose_name = _('Group Management')
+    verbose_name = 'Group Management'
 
     def ready(self):
         from . import signals  # noqa: F401

allianceauth/groupmanagement/templates/groupmanagement/audit.html

@@ -1,6 +1,5 @@
 {% extends "allianceauth/base-bs5.html" %}
 
-{% load aa_i18n %}
 {% load static %}
 {% load i18n %}
 {% load navactive %}
@@ -74,8 +73,6 @@
     {% include 'bundles/moment-js.html' with locale=True %}
     {% include 'bundles/filterdropdown-js.html' %}
 
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
     <script>
         $.fn.dataTable.moment = (format, locale) => {
             const types = $.fn.dataTable.ext.type;
@@ -97,7 +94,6 @@
             $.fn.dataTable.moment('YYYY-MMM-D, HH:mm');
 
             $('#log-entries').DataTable({
-                language: {url: '{{ DT_LANG_PATH }}'},
                 order: [[0, 'desc'], [1, 'asc']],
                 filterDropDown:
                     {

allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html

@@ -1,7 +1,6 @@
 {% extends "allianceauth/base-bs5.html" %}
 
 {% load static %}
-{% load aa_i18n %}
 {% load i18n %}
 {% load evelinks %}
 {% load navactive %}
@@ -87,12 +86,9 @@
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
 
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
     <script>
         $(document).ready(() => {
             $('#tab_group_members').DataTable({
-                language: {url: '{{ DT_LANG_PATH }}'},
                 order: [[0, "asc"]],
                 columnDefs: [
                     {

allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html

@@ -39,12 +39,12 @@
 
                             <td>
                                 {% if group.authgroup.hidden %}
-                                    <span class="badge text-bg-info">{% translate "Hidden" %}</span>
+                                    <span class="badge bg-info">{% translate "Hidden" %}</span>
                                 {% endif %}
                                 {% if group.authgroup.open %}
-                                    <span class="badge text-bg-success">{% translate "Open" %}</span>
+                                    <span class="badge bg-success">{% translate "Open" %}</span>
                                 {% else %}
-                                    <span class="badge text-bg-secondary">{% translate "Requestable" %}</span>
+                                    <span class="badge bg-secondary">{% translate "Requestable" %}</span>
                                 {% endif %}
                             </td>
 

allianceauth/groupmanagement/templates/groupmanagement/groups.html

@@ -1,7 +1,6 @@
 {% extends "allianceauth/base-bs5.html" %}
 
 {% load static %}
-{% load aa_i18n %}
 {% load i18n %}
 
 {% block page_title %}
@@ -17,7 +16,7 @@
         <li class="nav-item">
             <a class="nav-link" href="{% url 'groupmanagement:management' %}">{% translate "Group Management" %}
                 {% if req_count %}
-                    <span class="badge text-bg-secondary">{{ req_count }}</span>
+                    <span class="badge bg-secondary">{{ req_count }}</span>
                 {% endif %}
             </a>
         </li>
@@ -33,8 +32,8 @@
                     <th>{% translate "Description" %}</th>
                     <th>
                         {% translate "Leaders" %}<br>
-                        <span class="my-1 me-1 fw-lighter badge text-bg-primary">{% translate "User" %}</span>
-                        <span class="my-1 me-1 fw-lighter badge text-bg-secondary">{% translate "Group" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge bg-primary">{% translate "User" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge bg-secondary">{% translate "Group" %}</span>
                     </th>
                     <th></th>
                 </tr>
@@ -53,13 +52,13 @@
                             {% if g.group.authgroup.group_leaders.all.count %}
                                 {% for leader in g.group.authgroup.group_leaders.all %}
                                     {% if leader.profile.main_character %}
-                                        <span class="my-1 me-1 badge text-bg-primary">{{leader.profile.main_character}}</span>
+                                        <span class="my-1 me-1 badge bg-primary">{{leader.profile.main_character}}</span>
                                     {% endif %}
                                 {% endfor %}
                             {% endif %}
-                            {% if g.group.authgroup.group_leader_groups.all.count %}
+                            {% if g.group.authgroup.group_leaders.all.count %}
                                 {% for group in g.group.authgroup.group_leader_groups.all %}
-                                    <span class="my-1 me-1 badge text-bg-secondary">{{group.name}}</span>
+                                    <span class="my-1 me-1 badge bg-secondary">{{group.name}}</span>
                                 {% endfor %}
                             {% endif %}
                         </td>
@@ -104,13 +103,9 @@
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
 
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
     <script>
         $(document).ready(() => {
-            $('#groupsTable').DataTable({
-                language: {url: '{{ DT_LANG_PATH }}'},
-            });
+            $('#groupsTable').DataTable();
         });
     </script>
 {% endblock %}

allianceauth/groupmanagement/templates/groupmanagement/index.html

@@ -19,7 +19,7 @@
             {% translate "Join Requests" %}
 
             {% if acceptrequests %}
-                <span class="badge text-bg-secondary">{{ acceptrequests|length }}</span>
+                <span class="badge bg-secondary">{{ acceptrequests|length }}</span>
             {% endif %}
         </a>
     </li>
@@ -30,7 +30,7 @@
                 {% translate "Leave Requests" %}
 
                 {% if leaverequests %}
-                    <span class="badge text-bg-secondary">{{ leaverequests|length }}</span>
+                    <span class="badge bg-secondary">{{ leaverequests|length }}</span>
                 {% endif %}
             </a>
         </li>

allianceauth/hrapplications/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class HRApplicationsConfig(AppConfig):
     name = 'allianceauth.hrapplications'
     label = 'hrapplications'
-    verbose_name = _('HR Applications')

allianceauth/hrapplications/models.py

@@ -1,4 +1,3 @@
-from typing import ClassVar
 from django.contrib.auth.models import User
 from django.db import models
 from sortedm2m.fields import SortedManyToManyField
@@ -41,7 +40,7 @@ class Application(models.Model):
     reviewer_character = models.ForeignKey(EveCharacter, on_delete=models.SET_NULL, blank=True, null=True)
     created = models.DateTimeField(auto_now_add=True)
 
-    objects: ClassVar[ApplicationManager] = ApplicationManager()
+    objects = ApplicationManager()
 
     def __str__(self):
         return str(self.user) + " Application To " + str(self.form)

allianceauth/hrapplications/templates/hrapplications/management.html

@@ -43,11 +43,11 @@
                                 <td class="text-center">{{ personal_app.form.corp.corporation_name }}</td>
                                 <td class="text-center">
                                     {% if personal_app.approved == None %}
-                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
+                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
                                     {% elif personal_app.approved == True %}
-                                        <div class="badge text-bg-success">{% translate "Approved" %}</div>
+                                        <div class="badge bg-success">{% translate "Approved" %}</div>
                                     {% else %}
-                                        <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
+                                        <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                     {% endif %}
                                 </td>
                                 <td class="text-center">
@@ -133,14 +133,14 @@
                                             <td class="text-center">
                                                 {% if app.approved == None %}
                                                     {% if app.reviewer_str %}
-                                                        <div class="badge text-bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                     {% else %}
-                                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
+                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
                                                     {% endif %}
                                                 {% elif app.approved == True %}
-                                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
+                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                                 {% else %}
-                                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
+                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                                 {% endif %}
                                             </td>
                                             <td class="text-center">
@@ -177,14 +177,14 @@
                                             <td class="text-center">
                                                 {% if app.approved == None %}
                                                     {% if app.reviewer_str %}
-                                                        <div class="badge text-bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                     {% else %}
-                                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
+                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
                                                     {% endif %}
                                                 {% elif app.approved == True %}
-                                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
+                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                                 {% else %}
-                                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
+                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                                 {% endif %}
                                             </td>
                                             <td class="text-center">

allianceauth/hrapplications/templates/hrapplications/searchview.html

@@ -43,11 +43,11 @@
                             <td>{{ app.form.corp }}</td>
                             <td class="text-center">
                                 {% if app.approved == None %}
-                                    <div class="badge text-bg-warning">{% translate "Pending" %}</div>
+                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
                                 {% elif app.approved == True %}
-                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
+                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
                             <td class="text-end">

allianceauth/hrapplications/templates/hrapplications/view.html

@@ -31,7 +31,7 @@
         </div>
 
         <div class="card mb-3">
-            <div class="card-header text-bg-info">
+            <div class="card-header bg-info">
                 <div class="card-title mb-0">{% translate "Applicant" %}</div>
             </div>
 
@@ -50,7 +50,7 @@
         </div>
 
         <div class="card mb-3">
-            <div class="card-header text-bg-info">
+            <div class="card-header bg-info">
                 <div class="card-title mb-0">{% translate "Characters" %}</div>
             </div>
 

allianceauth/menu/apps.py

@@ -1,7 +1,6 @@
 import logging
 
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 logger = logging.getLogger(__name__)
 
@@ -13,7 +12,6 @@ logger = logging.getLogger(__name__)
 class MenuConfig(AppConfig):
     name = "allianceauth.menu"
     label = "menu"
-    verbose_name = _("Menu")
 
     def ready(self):
         from allianceauth.menu.core import smart_sync

allianceauth/menu/models.py

@@ -1,4 +1,3 @@
-from typing import ClassVar
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
@@ -69,7 +68,7 @@ class MenuItem(models.Model):
         help_text=_("External URL this menu items will link to"),
     )
 
-    objects: ClassVar[MenuItemManager] = MenuItemManager()
+    objects = MenuItemManager()
 
     def __str__(self) -> str:
         return self.text

allianceauth/menu/templates/menu/menu-item-bs5.html

@@ -11,8 +11,8 @@
             data-bs-target="#{{ item.html_id }}"
             aria-expanded="false"
             aria-controls=""
-        {% endif %}
-    ></i>
+        {% endif %}>
+    </i>
     <a
         class="nav-link flex-fill align-self-center me-auto {% if item.navactive %}{% navactive request item.navactive|join:' ' %}{% endif %}"
         {% if item.is_folder %}
@@ -27,7 +27,7 @@
     </a>
 
     {% if item.count >= 1 %}
-        <span class="badge text-bg-primary m-2 align-self-center{% if not item.is_folder %} me-2{% endif %}">
+        <span class="badge bg-primary m-2 align-self-center{% if not item.is_folder %} me-2{% endif %}">
             {{ item.count }}
         </span>
     {% elif item.url %}
@@ -36,7 +36,7 @@
 
     {% if item.is_folder %}
         <span
-            class="pill m-2 align-self-center"
+            class="pill m-2 align-self-center collapsed"
             type="button"
             data-bs-toggle="collapse"
             data-bs-target="#{{ item.html_id }}"

allianceauth/menu/templates/menu/menu-notification-block.html

@@ -2,8 +2,8 @@
 {% load navactive %}
 {% load auth_notifications %}
 
-<li class="nav-item" id="menu_item_notifications">
-    <a class="nav-link {% navactive request 'notifications:' %}" href="{% url 'notifications:list' %}">
+<li class="nav-item {% navactive request 'notifications:' %}" id="menu_item_notifications">
+    <a class="nav-link" href="{% url 'notifications:list' %}">
         {% with unread_count=request.user|user_unread_notification_count %}
             <i class="fa-solid fa-bell{% if unread_count %} text-danger{% endif %}"></i>
         {% endwith %}

allianceauth/menu/templates/menu/menu-user.html

@@ -2,51 +2,28 @@
 {% load evelinks %}
 {% load theme_tags %}
 
-<div
-    id="aa-user-info"
-    class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}"
->
+<div id="aa-user-info" class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
     <div class="d-flex mb-0 w-100">
         <div class="p-2 position-relative m-2">
             {% if user.is_authenticated %}
                 {% with request.user.profile.main_character as main %}
-                    <img
-                        class="rounded-circle"
-                        src="{{ main.character_id|character_portrait_url:64 }}"
-                        alt="{{ main.character_name }}"
-                    >
-
-                    <img
-                        class="rounded-circle position-absolute bottom-0 start-0"
-                        src="{{ main.corporation_logo_url_32 }}"
-                        alt="{{ main.corporation_name }}"
-                    >
-
+                    <img class="rounded-circle" src="{{ main.character_id|character_portrait_url:64 }}" alt="{{ main.character_name }}">
+                    <img class="rounded-circle position-absolute bottom-0 start-0" src="{{ main.corporation_logo_url_32 }}" alt="{{ main.corporation_name }}">
                     {% if main.alliance_id %}
-                        <img
-                            class="rounded-circle position-absolute bottom-0 end-0"
-                            src="{{ main.alliance_logo_url_32 }}"
-                            alt="{{ main.alliance_name }}"
-                        >
+                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.alliance_logo_url_32 }}" alt="{{ main.alliance_name }}">
                     {% elif main.faction_id %}
-                        <img
-                            class="rounded-circle position-absolute bottom-0 end-0"
-                            src="{{ main.faction_logo_url_32 }}"
-                            alt="{{ main.faction_name }}"
-                        >
+                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.faction_logo_url_32 }}" alt="{{ main.faction_name }}">
                     {% endif %}
                 {% endwith %}
             {% else %}
                 {% include "bundles/image-auth-logo.html" with logo_width="64px" %}
             {% endif %}
         </div>
-
         <div class="align-self-center text-start">
             {% if user.is_authenticated %}
                 {% with request.user.profile.main_character as main %}
                     <h5 class="m-0">{{ main.character_name }}</h5>
                     <p class="m-0 small">{{ main.corporation_name }}</p>
-
                     {% if main.alliance_id %}
                         <p class="m-0 small">{{ main.alliance_name }}</p>
                     {% elif main.faction_id %}
@@ -57,106 +34,56 @@
                 <h5 class="m-0">{{ SITE_NAME }}</h5>
             {% endif %}
         </div>
-
         <div class="ms-auto dropup">
             <button type="button" class="h-100 btn" data-bs-toggle="dropdown" aria-expanded="false">
                 <i class="fa-solid fa-gear fa-fw text-light"></i>
             </button>
-
             <ul class="dropdown-menu" style="min-width: 200px;">
                 <li><h6 class="dropdown-header">{% translate "Language" %}</h6></li>
+                <li>
+                    <a class="dropdown-item">{% include "public/lang_select.html" %}</a>
+                </li>
+                <li><h6 class="dropdown-header">{% translate "Theme" %}</h6></li>
 
                 <li>
-                    {% include "public/lang_select.html" %}
-                </li>
-
+                    <a class="dropdown-item">
                         {% theme_select %}
+                    </a>
+                </li>
 
                 {% if user.is_superuser %}
                     <li><hr class="dropdown-divider"></li>
                     <li><h6 class="dropdown-header">{% translate "Super User" %}</h6></li>
-
                     <li>
-                        <a
-                            class="dropdown-item"
-                            href="https://allianceauth.readthedocs.io/"
-                            title="{% translate 'Alliance Auth Documentation' %}"
-                        >
-                            <i class="fa-solid fa-book fa-fw"></i>
-                            {% translate "Alliance Auth Documentation" %}
-                        </a>
+                        <a class="dropdown-item"  href="https://allianceauth.readthedocs.io/" title="Alliance Auth Documentation"><i class="fa-solid fa-book fa-fw"></i> Alliance Auth Documentation</a>
                     </li>
-
                     <li>
-                        <a
-                            class="dropdown-item"
-                            href="https://discord.gg/fjnHAmk"
-                            title="{% translate 'Alliance Auth Discord' %}"
-                        >
-                            <i class="fa-brands fa-discord fa-fw"></i>
-                            {% translate "Alliance Auth Discord" %}
-                        </a>
+                        <a class="dropdown-item"  href="https://discord.gg/fjnHAmk" title="Alliance Auth Discord"><i class="fa-brands fa-discord fa-fw"></i> Alliance Auth Discord</a>
                     </li>
-
                     <li>
-                        <a
-                            class="dropdown-item"
-                            href="https://gitlab.com/allianceauth/allianceauth"
-                            title="{% translate 'Alliance Auth Git' %}"
-                        >
-                            <i class="fa-brands fa-gitlab fa-fw"></i>
-                            {% translate "Alliance Auth Git" %}
-                        </a>
+                        <a class="dropdown-item" href="https://gitlab.com/allianceauth/allianceauth" title="Alliance Auth Git"><i class="fa-brands fa-gitlab fa-fw"></i> Alliance Auth Git</a>
                     </li>
                 {% endif %}
-
                 {% if user.is_staff %}
                 <li>
-                        <a
-                            class="dropdown-item"
-                            href="{% url 'admin:index' %}"
-                            title="{% translate 'Admin' %}"
-                        >
-                            <i class="fa-solid fa-gear fa-fw"></i>
-                            {% translate "Admin" %}
+                    <a class="dropdown-item" href="{% url 'admin:index' %}">
+                        <i class="fa-solid fa-gear fa-fw"></i> {% translate "Admin" %}
                     </a>
                 </li>
                 {% endif %}
-
                 <li><hr class="dropdown-divider"></li>
-
                 {% if user.is_authenticated %}
                     <li>
-                        <a
-                            class="dropdown-item"
-                            href="{% url 'authentication:token_management' %}"
-                            title="{% translate 'Token Management' %}"
-                        >
-                            <i class="fa-solid fa-user-lock fa-fw"></i>
-                            {% translate "Token Management" %}
+                        <a class="dropdown-item" href="{% url 'authentication:token_management' %}">
+                            <i class="fa-solid fa-user-lock fa-fw"></i> Token Management
                         </a>
                     </li>
-
                     <li>
-                        <a
-                            class="dropdown-item text-danger"
-                            href="{% url 'logout' %}"
-                            title="{% translate 'Sign Out' %}"
-                        >
-                            <i class="fa-solid fa-right-from-bracket fa-fw"></i>
-                            {% translate 'Sign Out' %}
-                        </a>
+                        <a class="dropdown-item text-danger" href="{% url 'logout' %}" title="{% translate 'Sign Out' %}"><i class="fa-solid fa-right-from-bracket fa-fw "></i> {% translate 'Sign Out' %}</a>
                     </li>
                 {% else %}
                     <li>
-                        <a
-                            class="dropdown-item text-success"
-                            href="{% url 'authentication:login' %}"
-                            title="{% translate 'Sign In' %}"
-                        >
-                            <i class="fa-solid fa-right-to-bracket fa-fw"></i>
-                            {% translate 'Sign In' %}
-                        </a>
+                        <a class="dropdown-item text-success" href="{% url 'authentication:login' %}" title="{% translate 'Sign In' %}"> <i class="fa-solid fa-right-to-bracket fa-fw "></i> {% translate 'Sign In' %}</a>
                     </li>
                 {% endif %}
             </ul>

allianceauth/menu/templates/menu/sortable-side-menu.html

@@ -5,7 +5,7 @@
 <div class="col-auto px-0">
     <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
         <div>
-            <div class="nav-padding navbar-dark text-bg-dark px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
+            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                 {% if user.is_authenticated %}
                     <ul id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
                         <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">

allianceauth/notifications/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class NotificationsConfig(AppConfig):
     name = 'allianceauth.notifications'
     label = 'notifications'
-    verbose_name = _('Notifications')

allianceauth/notifications/models.py

@@ -1,5 +1,4 @@
 import logging
-from typing import ClassVar
 
 from django.db import models
 from django.contrib.auth.models import User
@@ -57,7 +56,7 @@ class Notification(models.Model):
     timestamp = models.DateTimeField(auto_now_add=True, db_index=True)
     viewed = models.BooleanField(default=False, db_index=True)
 
-    objects: ClassVar[NotificationManager] = NotificationManager()
+    objects = NotificationManager()
 
     def __str__(self) -> str:
         return f"{self.user}: {self.title}"

allianceauth/notifications/templates/notifications/list.html

@@ -15,14 +15,14 @@
     <li class="nav-item">
         <a class="nav-link active" id="unread-tab" data-bs-toggle="tab" data-bs-target="#unread" type="button" role="tab" aria-controls="unread" aria-selected="true">
             {% translate "Unread" %}
-            <span class="badge text-bg-secondary">{{ unread|length }}</span>
+            <span class="badge bg-secondary">{{ unread|length }}</span>
         </a>
     </li>
 
     <li class="nav-item">
         <a class="nav-link" id="read-tab" data-bs-toggle="tab" data-bs-target="#read" type="button" role="tab" aria-controls="read" aria-selected="false">
             {% translate "Read" %}
-            <span class="badge text-bg-secondary">{{ read|length }}</span>
+            <span class="badge bg-secondary">{{ read|length }}</span>
         </a>
     </li>
 {% endblock %}

allianceauth/notifications/templates/notifications/view.html

@@ -17,7 +17,7 @@
     </div>
 
     <div class="card border-{{ notif.level }}">
-        <div class="card-header text-bg-{{ notif.level }}">
+        <div class="card-header bg-{{ notif.level }}">
             {{ notif.timestamp }}
             {{ notif.title }}
         </div>

allianceauth/optimer/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class OptimerConfig(AppConfig):
     name = 'allianceauth.optimer'
     label = 'optimer'
-    verbose_name = _('Fleet Operations')

allianceauth/optimer/templates/optimer/dashboard.ops.html

@@ -14,7 +14,7 @@
                             <th class="text-center">{% translate "Operation" %}</th>
                             <th class="text-center">{% translate "Type" %}</th>
                             <th class="text-center">{% translate "Form Up System" %}</th>
-                            <th class="text-center">{% translate "EVE time" %}</th>
+                            <th class="text-center">{% translate "EVE Time" %}</th>
                         </tr>
                     </thead>
 

allianceauth/optimer/templates/optimer/management.html

@@ -24,8 +24,8 @@
 {% block content %}
     <div>
         <div class="text-center mb-3">
-            <div class="badge text-bg-primary text-start">
-                <b>{% translate "Current EVE time:" %}</b>
+            <div class="badge bg-primary text-start">
+                <b>{% translate "Current Eve Time:" %}</b>
                 <span id="current-time"></span>
             </div>
         </div>
@@ -127,8 +127,8 @@
         };
 
         /**
-         * Get the current EVE time as a string
-         * @returns {string} EVE time string
+         * Get the current Eve time as a string
+         * @returns {string} Eve time string
          */
         const updateClock = () => {
             document.getElementById("current-time").innerHTML = getCurrentEveTimeString();

allianceauth/permissions_tool/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class PermissionsToolConfig(AppConfig):
     name = 'allianceauth.permissions_tool'
     label = 'permissions_tool'
-    verbose_name = _('Permissions Audit')