Version Bump v2.8.8

Require Django-ESI 3.x
(cherry picked from commit 98619a0eb8)
2026-02-04 06:06:19 +01:00 · 2021-10-17 09:34:41 +00:00 · 2021-10-17 09:31:54 +00:00
1061 changed files with 22238 additions and 74745 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -19,6 +19,5 @@ exclude_lines =
    if __name__ == .__main__.:
    def __repr__
    raise AssertionError
-    if TYPE_CHECKING:

 ignore_errors = True
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,28 +0,0 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-tab_width = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.{yaml,yml,less}]
-indent_size = 2
-
-[*.md]
-indent_size = 2
-
-# Makefiles always use tabs for indentation
-[Makefile]
-indent_style = tab
-
-[*.bat]
-indent_style = tab
-
-[{Dockerfile,*.dockerfile}]
-indent_style = space
-indent_size = 4
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,6 +0,0 @@
-# git config blame.ignoreRevsFile .git-blame-ignore-revs
-
-
-
-# Ruff initial formatting storm
-a99315ea55339f0b6010b5c9d8703e51278fcf29
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ htmlcov/
 .tox/
 .coverage
 .cache
+nosetests.xml
 coverage.xml

 # Translations
@@ -69,9 +70,10 @@ celerybeat-schedule
 #gitlab configs
 .gitlab/

+#transifex
+.tx/
+
 #other
 .flake8
-.ruff_cache
 .pylintrc
 Makefile
-alliance_auth.sqlite3
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,11 @@
-.only-default: &only-default
-  only:
-    - master
-    - branches
-    - merge_requests
-
 stages:
-  - pre-commit
-  - gitlab
-  - test
-  - deploy
-  - docker
+- gitlab
+- test
+- deploy

 include:
-  - template: Dependency-Scanning.gitlab-ci.yml
-  - template: Security/SAST.gitlab-ci.yml
-  - template: Security/Secret-Detection.gitlab-ci.yml
+- template: Dependency-Scanning.gitlab-ci.yml
+- template: Security/SAST.gitlab-ci.yml

 before_script:
  - apt-get update && apt-get install redis-server -y
@@ -22,19 +13,6 @@ before_script:
  - python -V
  - pip install wheel tox

-pre-commit-check:
-  <<: *only-default
-  stage: pre-commit
-  image: python:3.12-bookworm
-  # variables:
-  #   PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
-  # cache:
-  #   paths:
-  #     - ${PRE_COMMIT_HOME}
-  script:
-    - pip install pre-commit
-    - pre-commit run --all-files
-
 sast:
  stage: gitlab
  before_script: []
@@ -42,215 +20,75 @@ sast:
 dependency_scanning:
  stage: gitlab
  before_script:
-    - apt-get update && apt-get install redis-server libmariadb-dev -y
-    - redis-server --daemonize yes
-    - python -V
-    - pip install wheel tox
+  - apt-get update && apt-get install redis-server libmariadbclient-dev -y
+  - redis-server --daemonize yes
+  - python -V
+  - pip install wheel tox

-secret_detection:
-  stage: gitlab
-  before_script: []
-
-test-3.10-core:
-  <<: *only-default
-  image: python:3.10-bookworm
-  script:
-    - tox -e py310-core
+test-3.6-core:
+  image: python:3.6-buster
+  script:  
+  - tox -e py36-core  
  artifacts:
    when: always
    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
+      cobertura: coverage.xml

-test-3.11-core:
-  <<: *only-default
-  image: python:3.11-bookworm
-  script:
-    - tox -e py311-core
+test-3.7-core:
+  image: python:3.7-buster
+  script:  
+  - tox -e py37-core
  artifacts:
    when: always
    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
+      cobertura: coverage.xml

-test-3.12-core:
-  <<: *only-default
-  image: python:3.12-bookworm
-  script:
-    - tox -e py312-core
+test-3.8-core:
+  image: python:3.8-buster
+  script:  
+  - tox -e py38-core
  artifacts:
    when: always
    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
+      cobertura: coverage.xml

-test-3.13-core:
-  <<: *only-default
-  image: python:3.13-rc-bookworm
-  script:
-    - tox -e py313-core
+test-3.6-all:
+  image: python:3.6-buster
+  script:  
+  - tox -e py36-all
  artifacts:
    when: always
    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
+      cobertura: coverage.xml

-test-3.10-all:
-  <<: *only-default
-  image: python:3.10-bookworm
-  script:
-    - tox -e py310-all
+test-3.7-all:
+  image: python:3.7-buster
+  script:  
+  - tox -e py37-all
  artifacts:
    when: always
    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
+      cobertura: coverage.xml

-test-3.11-all:
-  <<: *only-default
-  image: python:3.11-bookworm
-  script:
-    - tox -e py311-all
+test-3.8-all:
+  image: python:3.8-buster
+  script:  
+  - tox -e py38-all
  artifacts:
    when: always
    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
-
-test-3.12-all:
-  <<: *only-default
-  image: python:3.12-bookworm
-  script:
-    - tox -e py312-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.13-all:
-  <<: *only-default
-  image: python:3.13-rc-bookworm
-  script:
-    - tox -e py313-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-build-test:
-  stage: test
-  image: python:3.12-bookworm
-
-  before_script:
-    - python -m pip install --upgrade pip
-    - python -m pip install --upgrade build
-    - python -m pip install --upgrade setuptools wheel
-
-  script:
-    - python -m build
-
-  artifacts:
-    when: always
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
-    paths:
-      - dist/*
-    expire_in: 1 year
-
-test-docs:
-  <<: *only-default
-  image: python:3.12-bookworm
-  script:
-    - tox -e docs
+      cobertura: coverage.xml

 deploy_production:
  stage: deploy
-  image: python:3.12-bookworm
+  image: python:3.8-buster

  before_script:
-    - python -m pip install --upgrade pip
-    - python -m pip install --upgrade build
-    - python -m pip install --upgrade setuptools wheel twine
+    - pip install twine wheel

  script:
-    - python -m build
-    - python -m twine upload dist/*
+    - python setup.py sdist bdist_wheel
+    - twine upload dist/*

  rules:
-    - if: $CI_COMMIT_TAG
-
-build-image:
-  before_script: []
-  image: docker:27
-  stage: docker
-  services:
-    - docker:27-dind
-  script: |
-    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
-    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_SHORT_SHA
-    CURRENT_TAG=$CI_REGISTRY_IMAGE/auth:$CI_COMMIT_TAG
-    MINOR_TAG=$CI_REGISTRY_IMAGE/auth:$(echo $CI_COMMIT_TAG | cut -d '.' -f 1-2)
-    MAJOR_TAG=$CI_REGISTRY_IMAGE/auth:$(echo $CI_COMMIT_TAG | cut -d '.' -f 1)
-    LATEST_TAG=$CI_REGISTRY_IMAGE/auth:latest
-
-    docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
-    docker run --privileged --rm tonistiigi/binfmt --install all
-    docker buildx create --use --name new-builder
-    docker buildx build . --tag $IMAGE_TAG --tag $CURRENT_TAG --tag $MINOR_TAG --tag $MAJOR_TAG --tag $LATEST_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: delayed
-      start_in: 10 minutes
-
-build-image-dev:
-  before_script: []
-  image: docker:27
-  stage: docker
-  services:
-    - docker:27-dind
-  script: |
-    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
-    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
-
-    docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
-    docker run --privileged --rm tonistiigi/binfmt --install all
-    docker buildx create --use --name new-builder
-    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
-  rules:
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""'
-      when: manual
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != ""'
-      when: never
-
-build-image-mr:
-  before_script: []
-  image: docker:27
-  stage: docker
-  services:
-    - docker:27-dind
-  script: |
-    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
-    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME-$CI_COMMIT_SHORT_SHA
-
-    docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
-    docker run --privileged --rm tonistiigi/binfmt --install all
-    docker buildx create --use --name new-builder
-    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: manual
-    - if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
-      when: never
+    - if: $CI_COMMIT_TAG
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,8 +1,8 @@
 # Bug

 - I have searched [issues](https://gitlab.com/allianceauth/allianceauth/issues?scope=all&utf8=%E2%9C%93&state=all) (Y/N):
- What Version of Alliance Auth:
- What Operating System:
+- What Version of Alliance Auth: 
+- What Operating System: 
 - Version of other components relevant to issue eg. Service, Database:

 Please include a brief description of your issue here.
@@ -11,4 +11,4 @@ Please include steps to reproduce the issue

 Please include any tracebacks or logs

-Please include the results of the command `pip list`
+Please include the results of the command `pip list`
--- a/.gitlab/issue_templates/Feature
+++ b/.gitlab/issue_templates/Feature
@@ -4,4 +4,4 @@

 - Is this a Service (external integration), a Module (Alliance Auth extension) or an enhancement to an existing service/module.

- Describe why its useful to you or others.
+- Describe why its useful to you or others.
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,98 +0,0 @@
-# Apply to all files without committing:
-#   pre-commit run --all-files
-# 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/|
-    telnetlib\.py|
-    \.ice
-  )
-
-repos:
-  # Code Upgrades
-  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.25.0
-    hooks:
-      - id: django-upgrade
-        args: [--target-version=5.2]
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
-    hooks:
-      - id: pyupgrade
-        args: [--py310-plus]
-
-  # Formatting
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
-    hooks:
-      # Identify invalid files
-      - id: check-ast
-      - id: check-yaml
-      - id: check-json
-      - id: check-toml
-      - id: check-xml
-      # git checks
-      - id: check-merge-conflict
-      - id: check-added-large-files
-        args: [--maxkb=1000]
-      - id: detect-private-key
-      - id: check-case-conflict
-      # Python checks
-#      - id: check-docstring-first
-      - id: debug-statements
-#      - id: requirements-txt-fixer
-      - id: fix-encoding-pragma
-        args: [--remove]
-      - id: fix-byte-order-marker
-      # General quality checks
-      - id: mixed-line-ending
-        args: [--fix=lf]
-      - id: trailing-whitespace
-        args: [--markdown-linebreak-ext=md]
-      - id: check-executables-have-shebangs
-      - id: end-of-file-fixer
-  - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 3.2.1
-    hooks:
-      - id: editorconfig-checker
-  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.45.0
-    hooks:
-      - id: markdownlint
-        language: node
-        args:
-          - --disable=MD013
-
-  # Infrastructure
-  - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.6.0
-    hooks:
-      - id: pyproject-fmt
-        args:
-          - --indent=4
-        additional_dependencies:
-          - tox==4.26.0 # https://github.com/tox-dev/tox/releases/latest
-  - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.5.0
-    hooks:
-      - id: tox-ini-fmt
-  - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.24.1
-    hooks:
-      - id: validate-pyproject
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -5,28 +5,19 @@
 # Required
 version: 2

-# Set the version of Python and other tools you might need
-build:
-  os: ubuntu-24.04
-  apt_packages:
-    - redis
-  tools:
-    python: "3.12"
-  jobs:
-    post_system_dependencies:
-      - redis-server --daemonize yes
-
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
  configuration: docs/conf.py

+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all

-# Python requirements required to build your docs
+# Optionally set the version of Python and requirements required to build your docs
 python:
+  version: 3.7
  install:
-    - method: pip
-      path: .
-      extra_requirements:
-        - docs
+    - requirements: docs/requirements.txt
--- a/.tx/transifex.yml
+++ b/.tx/transifex.yml
@@ -1,10 +0,0 @@
-filters:
-  - filter_type: file
-    file_format: PO
-    source_file: allianceauth/locale/en/LC_MESSAGES/django.po
-    source_language: en
-    translation_files_expression: allianceauth/locale/<lang>/LC_MESSAGES/django.po
-
-settings:
-  language_mapping:
-    zh-Hans: zh_Hans
--- a/1
+++ b/1
@@ -337,3 +337,4 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
+
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -0,0 +1,7 @@
+include LICENSE
+include README.md
+include MANIFEST.in
+graft allianceauth
+
+global-exclude __pycache__
+global-exclude *.py[co]
--- a/README.md
+++ b/README.md
@@ -1,56 +1,50 @@
 # 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)
-[![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)
+[![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)](http://allianceauth.readthedocs.io/?badge=latest)
+[![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

 - [Overview](#overview)
- [Documentation](https://allianceauth.rtfd.io)
+- [Documentation](http://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
- [Developer Team](#development-team)
+- [Developer Team](#developer-team)
 - [Contributing](#contributing)

 ## 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)

- English :flag_gb:, Chinese :flag_cn:, German :flag_de:, Spanish :flag_es:, Korean :flag_kr:, Russian :flag_ru:, Italian :flag_it:, French :flag_fr:, Japanese :flag_jp: and Ukrainian :flag_ua: Localization
+- English :flag_gb:, Chinese :flag_cn:, German :flag_de:, Spanish :flag_es:, Korean :flag_kr: and Russian :flag_ru: localization

-For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](https://allianceauth.rtfd.io).
+For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](http://allianceauth.rtfd.io).

 ## 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

@@ -62,15 +56,13 @@ Here is an example of the Alliance Auth web site with a mixture of Services, App

 - [Aaron Kable](https://gitlab.com/aaronkable/)
 - [Ariel Rin](https://gitlab.com/soratidus999/)
+- [Basraah](https://gitlab.com/basraah/)
 - [Col Crunch](https://gitlab.com/colcrunch/)
 - [Erik Kalkoken](https://gitlab.com/ErikKalkoken/)
- [Rounon Dax](https://gitlab.com/ppfeufer)
- [snipereagle1](https://gitlab.com/mckernanin)

 ### Former Developers

 - [Adarnof](https://gitlab.com/adarnof/)
- [Basraah](https://gitlab.com/basraah/)

 ### Beta Testers / Bug Fixers

--- a/allianceauth/init.py
+++ b/allianceauth/init.py
@@ -1,11 +1,8 @@
-"""An auth system for EVE Online to help in-game organizations
-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__ = '5.0.0a3'
-__title__ = 'AllianceAuth'
+__version__ = '2.8.8'
+__title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
-NAME = f'{__title__} v{__version__}'
+NAME = '%s v%s' % (__title__, __version__)
+default_app_config = 'allianceauth.apps.AllianceAuthConfig'
--- a/allianceauth/admin_status/admin.py
+++ b/allianceauth/admin_status/admin.py
@@ -1,19 +0,0 @@
-"""Admin site for admin status applicaton"""
-from django.contrib import admin
-
-from allianceauth.admin_status.models import ApplicationAnnouncement
-
-
-@admin.register(ApplicationAnnouncement)
-class ApplicationAnnouncementAdmin(admin.ModelAdmin):
-    list_display = ["application_name", "announcement_number", "announcement_text", "hide_announcement"]
-    list_filter = ["hide_announcement"]
-    ordering = ["application_name", "announcement_number"]
-    readonly_fields = ["application_name", "announcement_number", "announcement_text", "announcement_url"]
-    fields = ["application_name", "announcement_number", "announcement_text", "announcement_url", "hide_announcement"]
-
-    def has_add_permission(self, request):
-        return False
-
-    def has_delete_permission(self, request, obj=None):
-        return False
--- a/allianceauth/admin_status/apps.py
+++ b/allianceauth/admin_status/apps.py
@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class AdminStatusApplication(AppConfig):
-    name = 'allianceauth.admin_status'
-    label = 'admin_status'
--- a/allianceauth/admin_status/hooks.py
+++ b/allianceauth/admin_status/hooks.py
@@ -1,207 +0,0 @@
-import hashlib
-import logging
-from dataclasses import dataclass
-from enum import Enum
-from urllib.parse import quote_plus
-
-import requests
-
-from django.core.cache import cache
-
-from allianceauth.hooks import get_hooks, register
-
-logger = logging.getLogger(__name__)
-
-# timeout for all requests
-REQUESTS_TIMEOUT = 5    # 5 seconds
-# max pages to be fetched from gitlab
-MAX_PAGES = 50
-# Cache time
-NOTIFICATION_CACHE_TIME = 300  # 5 minutes
-
-
-@dataclass
-class Announcement:
-    """
-    Dataclass storing all data for an announcement to be sent arround
-    """
-    application_name: str
-    announcement_url: str
-    announcement_number: int
-    announcement_text: str
-
-    @classmethod
-    def build_from_gitlab_issue_dict(cls, application_name: str, gitlab_issue: dict) -> "Announcement":
-        """Builds the announcement from the JSON dict of a GitLab issue"""
-        return Announcement(application_name, gitlab_issue["web_url"], gitlab_issue["iid"], gitlab_issue["title"])
-
-    @classmethod
-    def build_from_github_issue_dict(cls, application_name: str, github_issue: dict) -> "Announcement":
-        """Builds the announcement from the JSON dict of a GitHub issue"""
-        return Announcement(application_name, github_issue["html_url"], github_issue["number"], github_issue["title"])
-
-    def get_hash(self):
-        """Get a hash of the Announcement for comparison"""
-        name = f"{self.application_name}.{self.announcement_number}"
-        hash_value = hashlib.sha256(name.encode("utf-8")).hexdigest()
-        return hash_value
-
-
-@dataclass
-class AppAnnouncementHook:
-    """
-    A hook for an application to send GitHub/GitLab issues as announcements on the dashboard
-
-    Args:
-        - app_name: The name of your application
-        - repository_namespace: The namespace of the remote repository of your application source code.
-            It should look like `<username>/<application_name>`.
-        - repository_kind: Enumeration to determine if your repository is a GitHub or GitLab repository.
-        - label: The label applied to issues that should be seen as announcements, case-sensitive.
-            Default value: `announcement`
-    """
-    class Service(Enum):
-        """Simple enumeration to determine which api should be called to access issues"""
-        GITLAB = "gitlab"
-        GITHUB = "github"
-
-    app_name: str
-    repository_namespace: str
-    repository_kind: Service
-    label: str = "announcement"
-
-
-    def get_announcement_list(self) -> list[Announcement]:
-        """
-        Checks the application repository to find issues with the `Announcement` tag and return their title and link to
-        be displayed.
-        """
-        logger.debug("Getting announcement list for the app %s", self.app_name)
-        match self.repository_kind:
-            case AppAnnouncementHook.Service.GITHUB:
-                announcement_list = self._get_github_announcement_list()
-            case AppAnnouncementHook.Service.GITLAB:
-                announcement_list = self._get_gitlab_announcement_list()
-            case _:
-                announcement_list = []
-
-        logger.debug("Announcements for app %s: %s", self.app_name, announcement_list)
-        return announcement_list
-
-    def _get_github_announcement_list(self) -> list[Announcement]:
-        """
-        Return the issue list for a GitHub repository
-        Will filter if the `pull_request` attribute is present
-        """
-        raw_list = _fetch_list_from_github(
-            f"https://api.github.com/repos/{self.repository_namespace}/issues"
-            f"?labels={self.label}"
-        )
-        return [Announcement.build_from_github_issue_dict(self.app_name, github_issue) for github_issue in raw_list]
-
-    def _get_gitlab_announcement_list(self) -> list[Announcement]:
-        """Return the issues list for a GitLab repository"""
-        raw_list = _fetch_list_from_gitlab(
-            f"https://gitlab.com/api/v4/projects/{quote_plus(self.repository_namespace)}/issues"
-            f"?labels={self.label}&state=opened")
-        return [Announcement.build_from_gitlab_issue_dict(self.app_name, gitlab_issue) for gitlab_issue in raw_list]
-
-@register("app_announcement_hook")
-def alliance_auth_announcements_hook():
-    return AppAnnouncementHook("AllianceAuth", "allianceauth/allianceauth", AppAnnouncementHook.Service.GITLAB)
-
-def get_all_applications_announcements() -> list[Announcement]:
-    """
-    Retrieve all known application announcements and returns them
-    """
-    application_notifications = []
-
-    hooks = [fn() for fn in get_hooks("app_announcement_hook")]
-    for hook in hooks:
-        logger.debug(hook)
-        try:
-            application_notifications.extend(cache.get_or_set(
-                f"{hook.app_name}_notification_issues",
-                hook.get_announcement_list,
-                NOTIFICATION_CACHE_TIME,
-            ))
-        except requests.HTTPError:
-            logger.warning("Error when getting %s notifications", hook, exc_info=True)
-
-    logger.debug(application_notifications)
-    if application_notifications:
-        application_notifications = application_notifications[:10]
-
-    return application_notifications
-
-
-def _fetch_list_from_gitlab(url: str, max_pages: int = MAX_PAGES) -> list:
-    """returns a list from the GitLab API. Supports paging"""
-    result = []
-
-    for page in range(1, max_pages + 1):
-        try:
-            request = requests.get(
-                url, params={'page': page}, timeout=REQUESTS_TIMEOUT
-            )
-            request.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            error_str = str(e)
-
-            logger.warning(
-                f'Unable to fetch from GitLab API. Error: {error_str}',
-                exc_info=True,
-            )
-
-            return result
-
-        result += request.json()
-
-        if 'x-total-pages' in request.headers:
-            try:
-                total_pages = int(request.headers['x-total-pages'])
-            except ValueError:
-                total_pages = None
-        else:
-            total_pages = None
-
-        if not total_pages or page >= total_pages:
-            break
-
-    return result
-
-def _fetch_list_from_github(url: str, max_pages: int = MAX_PAGES) -> list:
-    """returns a list from the GitHub API. Supports paging"""
-
-    result = []
-    for page in range(1, max_pages+1):
-        try:
-            request = requests.get(
-                url,
-                params={'page': page},
-                headers={
-                    "Accept": "application/vnd.github+json",
-                    "X-GitHub-Api-Version": "2022-11-28"
-                },
-                timeout=REQUESTS_TIMEOUT,
-            )
-            request.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            error_str = str(e)
-
-            logger.warning(
-                f'Unable to fetch from GitHub API. Error: {error_str}',
-                exc_info=True,
-            )
-
-            return result
-
-        result += request.json()
-        logger.debug(request.json())
-
-        # https://docs.github.com/en/rest/using-the-rest-api/using-pagination-in-the-rest-api?apiVersion=2022-11-28
-        # See Example creating a pagination method
-        if not ('link' in request.headers and 'rel=\"next\"' in request.headers['link']):
-            break
-
-    return result
--- a/allianceauth/admin_status/managers.py
+++ b/allianceauth/admin_status/managers.py
@@ -1,57 +0,0 @@
-from typing import TYPE_CHECKING
-
-from django.db import models
-
-from allianceauth.admin_status.hooks import (
-    Announcement,
-    get_all_applications_announcements,
-)
-from allianceauth.services.hooks import get_extension_logger
-
-if TYPE_CHECKING:
-    from .models import ApplicationAnnouncement
-
-logger = get_extension_logger(__name__)
-
-class ApplicationAnnouncementManager(models.Manager):
-
-    def sync_and_return(self):
-        """
-        Checks all hooks if new notifications need to be created.
-        Return all notification objects after
-        """
-        logger.info("Syncing announcements")
-        current_announcements = get_all_applications_announcements()
-        self._delete_obsolete_announcements(current_announcements)
-        self._store_new_announcements(current_announcements)
-
-        return self.all()
-
-    def _delete_obsolete_announcements(self, current_announcements: list[Announcement]):
-        """Deletes all announcements stored in the database that aren't retrieved anymore"""
-        hashes = [announcement.get_hash() for announcement in current_announcements]
-        self.exclude(announcement_hash__in=hashes).delete()
-
-    def _store_new_announcements(self, current_announcements: list[Announcement]):
-        """Stores a new database object for new application announcements"""
-
-        for current_announcement in current_announcements:
-            try:
-                announcement = self.get(announcement_hash=current_announcement.get_hash())
-            except self.model.DoesNotExist:
-                self.create_from_announcement(current_announcement)
-            else:
-                # if exists update the text only
-                if announcement.announcement_text != current_announcement.announcement_text:
-                    announcement.announcement_text = current_announcement.announcement_text
-                    announcement.save()
-
-    def create_from_announcement(self, announcement: Announcement) -> "ApplicationAnnouncement":
-        """Creates from the Announcement dataclass"""
-        return self.create(
-            application_name=announcement.application_name,
-            announcement_number=announcement.announcement_number,
-            announcement_text=announcement.announcement_text,
-            announcement_url=announcement.announcement_url,
-            announcement_hash=announcement.get_hash(),
-        )
--- a/allianceauth/admin_status/migrations/0001_initial.py
+++ b/allianceauth/admin_status/migrations/0001_initial.py
@@ -1,33 +0,0 @@
-# Generated by Django 5.1.9 on 2025-05-18 15:43
-
-import django.db.models.manager
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ApplicationAnnouncement',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('application_name', models.CharField(help_text='Name of the application that issued the announcement', max_length=50)),
-                ('announcement_number', models.IntegerField(help_text='Issue number on the notification source')),
-                ('announcement_text', models.TextField(help_text='Issue title text displayed on the dashboard', max_length=300)),
-                ('announcement_url', models.TextField(max_length=200)),
-                ('announcement_hash', models.CharField(default=None, editable=False, help_text='hash of an announcement. Must be nullable for unique comparison.', max_length=64, null=True, unique=True)),
-                ('hide_announcement', models.BooleanField(default=False, help_text='Set to true if the announcement should not be displayed on the dashboard')),
-            ],
-            options={
-                'constraints': [models.UniqueConstraint(fields=('application_name', 'announcement_number'), name='functional_pk_applicationissuenumber')],
-            },
-            managers=[
-                ('object', django.db.models.manager.Manager()),
-            ],
-        ),
-    ]
--- a/allianceauth/admin_status/migrations/init.py
+++ b/allianceauth/admin_status/migrations/init.py
--- a/allianceauth/admin_status/models.py
+++ b/allianceauth/admin_status/models.py
@@ -1,45 +0,0 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-from allianceauth.admin_status.managers import ApplicationAnnouncementManager
-
-
-class ApplicationAnnouncement(models.Model):
-    """
-    Announcement originating from an application
-    """
-    object = ApplicationAnnouncementManager()
-
-    application_name = models.CharField(max_length=50, help_text=_("Name of the application that issued the announcement"))
-    announcement_number = models.IntegerField(help_text=_("Issue number on the notification source"))
-    announcement_text = models.TextField(max_length=300, help_text=_("Issue title text displayed on the dashboard"))
-    announcement_url = models.TextField(max_length=200)
-
-    announcement_hash = models.CharField(
-        max_length=64,
-        default=None,
-        unique=True,
-        editable=False,
-        help_text="hash of an announcement."
-    )
-
-    hide_announcement = models.BooleanField(
-        default=False,
-        help_text=_("Set to true if the announcement should not be displayed on the dashboard")
-    )
-
-    class Meta:
-        # Should be updated to a composite key when the switch to Django 5.2 is made
-        # https://docs.djangoproject.com/en/5.2/topics/composite-primary-key/
-        constraints = [
-            models.UniqueConstraint(
-                fields=["application_name", "announcement_number"], name="functional_pk_applicationissuenumber"
-            )
-        ]
-
-    def __str__(self):
-        return f"{self.application_name} announcement #{self.announcement_number}"
-
-    def is_hidden(self) -> bool:
-        """Function in case rules are made in the future to force hide/force show some announcements"""
-        return self.hide_announcement
--- a/allianceauth/admin_status/templates/admin-status/celery_bar_partial.html
+++ b/allianceauth/admin_status/templates/admin-status/celery_bar_partial.html
@@ -1,13 +0,0 @@
-{% load humanize %}
-{% load admin_status %}
-
-<div
-    class="progress-bar text-bg-{{ level }} task-status-progress-bar"
-    role="progressbar"
-    aria-valuenow="{% decimal_widthratio tasks_count tasks_total 100 %}"
-    aria-valuemin="0"
-    aria-valuemax="100"
-    style="width: {% decimal_widthratio tasks_count tasks_total 100 %}%;"
->
-    <span>{% widthratio tasks_count tasks_total 100 %}%</span>
-</div>
--- a/allianceauth/admin_status/templates/admin-status/esi_check.html
+++ b/allianceauth/admin_status/templates/admin-status/esi_check.html
@@ -1,37 +0,0 @@
-{% load i18n %}
-<div id="esi-alert" class="col-12 collapse">
-    <div class="alert alert-warning">
-        <p class="text-center ">{% translate 'Your Server received an ESI error response code of ' %}<b id="esi-code">?</b></p>
-        <hr>
-        <pre id="esi-data" class="text-center text-wrap"></pre>
-    </div>
-</div>
-
-<script>
-    const elemCard = document.getElementById("esi-alert");
-    const elemMessage = document.getElementById("esi-data");
-    const elemCode = document.getElementById("esi-code");
-
-    fetch('{% url "authentication:esi_check" %}')
-        .then((response) => {
-            if (response.ok) {
-                return response.json();
-            }
-            throw new Error("Something went wrong");
-        })
-        .then((responseJson) => {
-            console.log("ESI Check: ", JSON.stringify(responseJson, null, 2));
-
-            const status = responseJson.status;
-            if (status !== 200) {
-                elemCode.textContent = status
-                elemMessage.textContent = responseJson.data.error;
-                new bootstrap.Collapse(elemCard, {
-                    toggle: true
-                })
-            }
-        })
-        .catch((error) => {
-            console.log(error);
-        });
-</script>
--- a/allianceauth/admin_status/templates/admin-status/overview.html
+++ b/allianceauth/admin_status/templates/admin-status/overview.html
@@ -1,166 +0,0 @@
-{% load i18n %}
-{% load humanize %}
-
-{% if notifications %}
-    <div id="aa-dashboard-panel-admin-application-notifications" class="col-12 mb-3">
-        <div class="card">
-            <div class="card-body">
-                {% translate "Announcements" as widget_title %}
-                {% include "framework/dashboard/widget-title.html" with title=widget_title %}
-
-                <div>
-                    <ul class="list-group">
-                        {% for notif in notifications %}
-                            <li class="list-group-item">
-                                <span class="badge text-bg-success me-2">{% translate "Open" %}</span>
-                                <a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
-                            </li>
-                        {% empty %}
-                            <div class="alert alert-primary" role="alert">
-                                {% translate "No notifications at this time" %}
-                            </div>
-                        {% endfor %}
-                    </ul>
-
-                    <div class="text-end pt-3">
-                        <a href="https://gitlab.com/allianceauth/allianceauth/issues" target="_blank" class="me-1 text-decoration-none">
-                            <span class="badge text-bg-danger">
-                                <i class="fab fa-gitlab" aria-hidden="true"></i>
-                                {% translate 'Powered by GitLab' %}
-                            </span>
-                        </a>
-                        <a href="https://discord.com/invite/fjnHAmk" target="_blank" class="text-decoration-none">
-                            <span class="badge text-bg-info">
-                                <i class="fab fa-discord" aria-hidden="true"></i>
-                                {% translate 'Support Discord' %}
-                            </span>
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endif %}
-
-<div class="col-12 mb-3">
-    <div class="card">
-        <div class="card-body row">
-            <div id="aa-dashboard-panel-software-version" class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
-                {% translate "Software Version" as widget_title %}
-                {% include "framework/dashboard/widget-title.html" with title=widget_title %}
-
-                <div>
-                    <ul class="list-group list-group-horizontal w-100" role="group" aria-label="{% translate 'Software Version' %}">
-                        <li class="list-group-item w-100">
-                            <div class="btn h-100 w-100 cursor-default">
-                                <h5 class="list-group-item-heading">{% translate "Current" %}</h5>
-                                <p class="list-group-item-text">{{ current_version }}</p>
-                            </div>
-                        </li>
-
-                        <li class="list-group-item text-bg-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %} w-100">
-                            <a class="btn h-100 w-100" href="https://gitlab.com/allianceauth/allianceauth/-/releases/v{{ latest_patch_version }}">
-                                <h5 class="list-group-item-heading">{% translate "Latest Stable" %}</h5>
-
-                                <p class="list-group-item-text">
-                                    <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
-                                    {{ latest_patch_version }}
-                                    {% if not latest_patch %}<br>{% translate "Update available" %}{% endif %}
-                                </p>
-                            </a>
-                        </li>
-
-                        {% if latest_beta %}
-                            <li class="list-group-item text-bg-info w-100">
-                                <a class="btn h-100 w-100" href="https://gitlab.com/allianceauth/allianceauth/-/releases/v{{ latest_beta_version }}">
-                                    <h5 class="list-group-item-heading">{% translate "Latest Pre-Release" %}</h5>
-
-                                    <p class="list-group-item-text">
-                                        <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
-                                        {{ latest_beta_version }}
-                                        <br>{% translate "Pre-Release available" %}
-                                    </p>
-                                </a>
-                            </li>
-                        {% endif %}
-                    </ul>
-                </div>
-            </div>
-
-            <div id="aa-dashboard-panel-task-queue" class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
-                {% translate "Task Queue" as widget_title %}
-                {% include "framework/dashboard/widget-title.html" with title=widget_title %}
-
-                <div>
-                    <p>
-                        {% blocktranslate with total=tasks_total|intcomma latest=earliest_task|timesince|default:"?" %}
-                            Status of {{ total }} processed tasks • last {{ latest }}
-                        {% endblocktranslate %}
-                    </p>
-
-                    <div
-                        class="progress"
-                        style="height: 21px;"
-                        title="{{ tasks_succeeded|intcomma }} succeeded, {{ tasks_retried|intcomma }} retried, {{ tasks_failed|intcomma }} failed"
-                    >
-                        {% include "admin-status/celery_bar_partial.html" with label="suceeded" level="success" tasks_count=tasks_succeeded %}
-                        {% include "admin-status/celery_bar_partial.html" with label="retried" level="info" tasks_count=tasks_retried %}
-                        {% include "admin-status/celery_bar_partial.html" with label="failed" level="danger" tasks_count=tasks_failed %}
-                    </div>
-
-                    <p>
-                        <span id="task-counts">?</span> {% translate 'running' %} |
-                        <span id="queued-tasks-count">?</span> {% translate 'queued' %}
-                    </p>
-                </div>
-            </div>
-            <div class="text-end pt-3">
-                <a href="https://gitlab.com/allianceauth/allianceauth/issues" target="_blank" class="me-1 text-decoration-none">
-                            <span class="badge" style="background-color: rgb(230 83 40);">
-                                <i class="fab fa-gitlab" aria-hidden="true"></i>
-                                {% translate 'Powered by GitLab' %}
-                            </span>
-                </a>
-                <a href="https://discord.com/invite/fjnHAmk" target="_blank" class="text-decoration-none">
-                            <span class="badge" style="background-color: rgb(110 133 211);">
-                                <i class="fab fa-discord" aria-hidden="true"></i>
-                                {% translate 'Support Discord' %}
-                            </span>
-                </a>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    const elemRunning = document.getElementById("task-counts");
-    const elemQueued = document.getElementById("queued-tasks-count");
-
-    fetch('{% url "authentication:task_counts" %}')
-        .then((response) => {
-            if (response.ok) {
-                return response.json();
-            }
-            throw new Error("Something went wrong");
-        })
-        .then((responseJson) => {
-            const running = responseJson.tasks_running;
-            if (running == null) {
-                elemRunning.textContent = "N/A";
-            } else {
-                elemRunning.textContent = running.toLocaleString();
-            }
-
-            const queued = responseJson.tasks_queued;
-            if (queued == null) {
-                elemQueued.textContent = "N/A";
-            } else {
-                elemQueued.textContent = queued.toLocaleString();
-            }
-        })
-        .catch((error) => {
-            console.log(error);
-            elemRunning.textContent = "ERROR";
-            elemQueued.textContent = "ERROR";
-        });
-</script>
--- a/allianceauth/admin_status/templatetags/init.py
+++ b/allianceauth/admin_status/templatetags/init.py
--- a/allianceauth/admin_status/templatetags/admin_status.py
+++ b/allianceauth/admin_status/templatetags/admin_status.py
@@ -1,181 +0,0 @@
-import logging
-
-import requests
-from packaging.version import InvalidVersion, Version as Pep440Version
-
-from django import template
-from django.conf import settings
-from django.core.cache import cache
-
-from allianceauth import __version__
-from allianceauth.admin_status.models import ApplicationAnnouncement
-from allianceauth.authentication.task_statistics.counters import (
-    dashboard_results,
-)
-
-register = template.Library()
-
-# cache timers
-TAG_CACHE_TIME = 3600  # 1 hours
-NOTIFICATION_CACHE_TIME = 300  # 5 minutes
-# timeout for all requests
-REQUESTS_TIMEOUT = 5    # 5 seconds
-# max pages to be fetched from gitlab
-MAX_PAGES = 50
-
-GITLAB_AUTH_REPOSITORY_TAGS_URL = (
-    'https://gitlab.com/api/v4/projects/allianceauth%2Fallianceauth/repository/tags'
-)
-
-logger = logging.getLogger(__name__)
-
-
-@register.simple_tag()
-def decimal_widthratio(this_value, max_value, max_width) -> str:
-    if max_value == 0:
-        return str(0)
-
-    return str(round(this_value / max_value * max_width, 2))
-
-
-@register.inclusion_tag('admin-status/overview.html')
-def status_overview() -> dict:
-    response = {
-        "notifications": [],
-        "current_version": __version__,
-        "tasks_succeeded": 0,
-        "tasks_retried": 0,
-        "tasks_failed": 0,
-        "tasks_total": 0,
-        "tasks_hours": 0,
-        "earliest_task": None,
-    }
-    response.update(_current_notifications())
-    response.update(_current_version_summary())
-    response.update(_celery_stats())
-    return response
-
-
-def _celery_stats() -> dict:
-    hours = getattr(settings, "ALLIANCEAUTH_DASHBOARD_TASKS_MAX_HOURS", 24)
-    results = dashboard_results(hours=hours)
-    return {
-        "tasks_succeeded": results.succeeded,
-        "tasks_retried": results.retried,
-        "tasks_failed": results.failed,
-        "tasks_total": results.total,
-        "tasks_hours": results.hours,
-        "earliest_task": results.earliest_task,
-    }
-
-
-def _current_notifications() -> dict:
-    """returns announcements from AllianceAuth and third party applications"""
-
-    application_notifications = ApplicationAnnouncement.object.sync_and_return()
-
-    response = {
-        'notifications': application_notifications,
-    }
-    return response
-
-def _current_version_summary() -> dict:
-    """returns the current version info"""
-    try:
-        tags = cache.get_or_set(
-            'git_release_tags', _fetch_tags_from_gitlab, TAG_CACHE_TIME
-        )
-    except requests.HTTPError:
-        logger.warning('Error while getting gitlab release tags', exc_info=True)
-        return {}
-
-    if not tags:
-        return {}
-
-    (
-        latest_patch_version,
-        latest_beta_version
-    ) = _latests_versions(tags)
-    current_version = Pep440Version(__version__)
-
-    has_latest_patch = \
-        current_version >= latest_patch_version if latest_patch_version else False
-    has_current_beta = \
-        current_version <= latest_beta_version \
-        and latest_patch_version <= latest_beta_version \
-        if latest_beta_version else False
-
-    response = {
-        'latest_patch': has_latest_patch,
-        'latest_beta': has_current_beta,
-        'current_version': str(current_version),
-        'latest_patch_version': str(latest_patch_version),
-        'latest_beta_version': str(latest_beta_version)
-    }
-    return response
-
-
-def _fetch_tags_from_gitlab():
-    return _fetch_list_from_gitlab(GITLAB_AUTH_REPOSITORY_TAGS_URL)
-
-
-def _latests_versions(tags: list) -> tuple:
-    """returns latests version from given tags list
-
-    Non-compliant tags will be ignored
-    """
-    versions = []
-    betas = []
-    for tag in tags:
-        try:
-            version = Pep440Version(tag.get('name'))
-        except InvalidVersion:
-            pass
-        else:
-            if version.is_prerelease or version.is_devrelease:
-                betas.append(version)
-            else:
-                versions.append(version)
-
-    latest_patch_version = max(versions)
-    latest_beta_version = max(betas)
-    return (
-        latest_patch_version,
-        latest_beta_version
-    )
-
-
-def _fetch_list_from_gitlab(url: str, max_pages: int = MAX_PAGES) -> list:
-    """returns a list from the GitLab API. Supports paging"""
-    result = []
-
-    for page in range(1, max_pages + 1):
-        try:
-            request = requests.get(
-                url, params={'page': page}, timeout=REQUESTS_TIMEOUT
-            )
-            request.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            error_str = str(e)
-
-            logger.warning(
-                f'Unable to fetch from GitLab API. Error: {error_str}',
-                exc_info=True,
-            )
-
-            return result
-
-        result += request.json()
-
-        if 'x-total-pages' in request.headers:
-            try:
-                total_pages = int(request.headers['x-total-pages'])
-            except ValueError:
-                total_pages = None
-        else:
-            total_pages = None
-
-        if not total_pages or page >= total_pages:
-            break
-
-    return result
--- a/allianceauth/admin_status/tests/init.py
+++ b/allianceauth/admin_status/tests/init.py
--- a/allianceauth/admin_status/tests/test_hooks.py
+++ b/allianceauth/admin_status/tests/test_hooks.py
@@ -1,194 +0,0 @@
-import requests_mock
-
-from allianceauth.admin_status.hooks import Announcement
-from allianceauth.services.hooks import AppAnnouncementHook
-from allianceauth.utils.testing import NoSocketsTestCase
-
-
-class TestHooks(NoSocketsTestCase):
-
-    @requests_mock.mock()
-    def test_fetch_gitlab(self, requests_mocker):
-        # given
-        announcement_hook = AppAnnouncementHook("test GitLab app", "r0kym/allianceauth-example-plugin",
-                                                AppAnnouncementHook.Service.GITLAB)
-        requests_mocker.get(
-            "https://gitlab.com/api/v4/projects/r0kym%2Fallianceauth-example-plugin/issues?labels=announcement&state=opened",
-            json=[
-                {
-                    "id": 166279127,
-                    "iid": 1,
-                    "project_id": 67653102,
-                    "title": "Test GitLab issue",
-                    "description": "Test issue",
-                    "state": "opened",
-                    "created_at": "2025-04-20T21:26:57.914Z",
-                    "updated_at": "2025-04-21T11:04:30.501Z",
-                    "closed_at": None,
-                    "closed_by": None,
-                    "labels": [
-                        "announcement"
-                    ],
-                    "milestone": None,
-                    "assignees": [],
-                    "author": {
-                        "id": 14491514,
-                        "username": "r0kym",
-                        "public_email": "",
-                        "name": "T'rahk Rokym",
-                        "state": "active",
-                        "locked": False,
-                        "avatar_url": "https://gitlab.com/uploads/-/system/user/avatar/14491514/avatar.png",
-                        "web_url": "https://gitlab.com/r0kym"
-                    },
-                    "type": "ISSUE",
-                    "assignee": None,
-                    "user_notes_count": 0,
-                    "merge_requests_count": 0,
-                    "upvotes": 0,
-                    "downvotes": 0,
-                    "due_date": None,
-                    "confidential": False,
-                    "discussion_locked": None,
-                    "issue_type": "issue",
-                    "web_url": "https://gitlab.com/r0kym/allianceauth-example-plugin/-/issues/1",
-                    "time_stats": {
-                        "time_estimate": 0,
-                        "total_time_spent": 0,
-                        "human_time_estimate": None,
-                        "human_total_time_spent": None
-                    },
-                    "task_completion_status": {
-                        "count": 0,
-                        "completed_count": 0
-                    },
-                    "blocking_issues_count": 0,
-                    "has_tasks": True,
-                    "task_status": "0 of 0 checklist items completed",
-                    "_links": {
-                        "self": "https://gitlab.com/api/v4/projects/67653102/issues/1",
-                        "notes": "https://gitlab.com/api/v4/projects/67653102/issues/1/notes",
-                        "award_emoji": "https://gitlab.com/api/v4/projects/67653102/issues/1/award_emoji",
-                        "project": "https://gitlab.com/api/v4/projects/67653102",
-                        "closed_as_duplicate_of": None
-                    },
-                    "references": {
-                        "short": "#1",
-                        "relative": "#1",
-                        "full": "r0kym/allianceauth-example-plugin#1"
-                    },
-                    "severity": "UNKNOWN",
-                    "moved_to_id": None,
-                    "imported": False,
-                    "imported_from": "none",
-                    "service_desk_reply_to": None
-                }
-            ]
-        )
-        # when
-        announcements = announcement_hook.get_announcement_list()
-        # then
-        self.assertEqual(len(announcements), 1)
-        self.assertIn(Announcement(
-            application_name="test GitLab app",
-            announcement_url="https://gitlab.com/r0kym/allianceauth-example-plugin/-/issues/1",
-            announcement_number=1,
-            announcement_text="Test GitLab issue"
-        ), announcements)
-
-    @requests_mock.mock()
-    def test_fetch_github(self, requests_mocker):
-        # given
-        announcement_hook = AppAnnouncementHook("test GitHub app", "r0kym/test", AppAnnouncementHook.Service.GITHUB)
-        requests_mocker.get(
-            "https://api.github.com/repos/r0kym/test/issues?labels=announcement",
-            json=[
-                {
-                    "url": "https://api.github.com/repos/r0kym/test/issues/1",
-                    "repository_url": "https://api.github.com/repos/r0kym/test",
-                    "labels_url": "https://api.github.com/repos/r0kym/test/issues/1/labels{/name}",
-                    "comments_url": "https://api.github.com/repos/r0kym/test/issues/1/comments",
-                    "events_url": "https://api.github.com/repos/r0kym/test/issues/1/events",
-                    "html_url": "https://github.com/r0kym/test/issues/1",
-                    "id": 3007269496,
-                    "node_id": "I_kwDOOc2YvM6zP0p4",
-                    "number": 1,
-                    "title": "GitHub issue",
-                    "user": {
-                        "login": "r0kym",
-                        "id": 56434393,
-                        "node_id": "MDQ6VXNlcjU2NDM0Mzkz",
-                        "avatar_url": "https://avatars.githubusercontent.com/u/56434393?v=4",
-                        "gravatar_id": "",
-                        "url": "https://api.github.com/users/r0kym",
-                        "html_url": "https://github.com/r0kym",
-                        "followers_url": "https://api.github.com/users/r0kym/followers",
-                        "following_url": "https://api.github.com/users/r0kym/following{/other_user}",
-                        "gists_url": "https://api.github.com/users/r0kym/gists{/gist_id}",
-                        "starred_url": "https://api.github.com/users/r0kym/starred{/owner}{/repo}",
-                        "subscriptions_url": "https://api.github.com/users/r0kym/subscriptions",
-                        "organizations_url": "https://api.github.com/users/r0kym/orgs",
-                        "repos_url": "https://api.github.com/users/r0kym/repos",
-                        "events_url": "https://api.github.com/users/r0kym/events{/privacy}",
-                        "received_events_url": "https://api.github.com/users/r0kym/received_events",
-                        "type": "User",
-                        "user_view_type": "public",
-                        "site_admin": False
-                    },
-                    "labels": [
-                        {
-                            "id": 8487814480,
-                            "node_id": "LA_kwDOOc2YvM8AAAAB-enFUA",
-                            "url": "https://api.github.com/repos/r0kym/test/labels/announcement",
-                            "name": "announcement",
-                            "color": "aaaaaa",
-                            "default": False,
-                            "description": None
-                        }
-                    ],
-                    "state": "open",
-                    "locked": False,
-                    "assignee": None,
-                    "assignees": [],
-                    "milestone": None,
-                    "comments": 0,
-                    "created_at": "2025-04-20T22:41:10Z",
-                    "updated_at": "2025-04-21T11:05:08Z",
-                    "closed_at": None,
-                    "author_association": "OWNER",
-                    "active_lock_reason": None,
-                    "sub_issues_summary": {
-                        "total": 0,
-                        "completed": 0,
-                        "percent_completed": 0
-                    },
-                    "body": None,
-                    "closed_by": None,
-                    "reactions": {
-                        "url": "https://api.github.com/repos/r0kym/test/issues/1/reactions",
-                        "total_count": 0,
-                        "+1": 0,
-                        "-1": 0,
-                        "laugh": 0,
-                        "hooray": 0,
-                        "confused": 0,
-                        "heart": 0,
-                        "rocket": 0,
-                        "eyes": 0
-                    },
-                    "timeline_url": "https://api.github.com/repos/r0kym/test/issues/1/timeline",
-                    "performed_via_github_app": None,
-                    "state_reason": None
-                }
-            ]
-        )
-        # when
-        announcements = announcement_hook.get_announcement_list()
-        # then
-        self.assertEqual(len(announcements), 1)
-        self.assertIn(Announcement(
-            application_name="test GitHub app",
-            announcement_url="https://github.com/r0kym/test/issues/1",
-            announcement_number=1,
-            announcement_text="GitHub issue"
-        ), announcements)
--- a/allianceauth/admin_status/tests/test_managers.py
+++ b/allianceauth/admin_status/tests/test_managers.py
@@ -1,75 +0,0 @@
-from unittest.mock import patch
-
-from allianceauth.admin_status.hooks import Announcement
-from allianceauth.admin_status.models import ApplicationAnnouncement
-from allianceauth.utils.testing import NoSocketsTestCase
-
-MODULE_PATH = 'allianceauth.admin_status.managers'
-
-DEFAULT_ANNOUNCEMENTS = [
-    Announcement(
-        application_name="Test GitHub Application",
-        announcement_number=1,
-        announcement_text="GitHub issue",
-        announcement_url="https://github.com/r0kym/test/issues/1",
-    ),
-    Announcement(
-        application_name="Test Gitlab Application",
-        announcement_number=1,
-        announcement_text="GitLab issue",
-        announcement_url="https://gitlab.com/r0kym/allianceauth-example-plugin/-/issues/1",
-    )
-]
-
-class TestSyncManager(NoSocketsTestCase):
-
-    def setUp(self):
-        ApplicationAnnouncement.object.create(
-            application_name="Test GitHub Application",
-            announcement_number=1,
-            announcement_text="GitHub issue",
-            announcement_url="https://github.com/r0kym/test/issues/1",
-            announcement_hash="9dbedb9c47529bb43cfecb704768a35d085b145930e13cced981623e5f162a85",
-        )
-        ApplicationAnnouncement.object.create(
-            application_name="Test Gitlab Application",
-            announcement_number=1,
-            announcement_text="GitLab issue",
-            announcement_url="https://gitlab.com/r0kym/allianceauth-example-plugin/-/issues/1",
-            announcement_hash="8955a9c12a1cfa9e1776662bdaf111147b84e35c79f24bfb758e35333a18b1bd",
-        )
-
-    @patch(MODULE_PATH + '.get_all_applications_announcements')
-    def test_announcements_stay_as_is(self, all_announcements_mocker):
-        # given
-        announcement_ids = set(ApplicationAnnouncement.object.values_list("id", flat=True))
-        all_announcements_mocker.return_value = DEFAULT_ANNOUNCEMENTS
-        # when
-        ApplicationAnnouncement.object.sync_and_return()
-        # then
-        self.assertEqual(ApplicationAnnouncement.object.count(), 2)
-        self.assertEqual(set(ApplicationAnnouncement.object.values_list("id", flat=True)), announcement_ids)
-
-    @patch(MODULE_PATH + '.get_all_applications_announcements')
-    def test_announcement_add(self, all_announcements_mocker):
-        # given
-        returned_announcements = DEFAULT_ANNOUNCEMENTS + [Announcement(application_name="Test Application", announcement_number=1, announcement_text="New test announcement", announcement_url="https://example.com")]
-        all_announcements_mocker.return_value = returned_announcements
-        # when
-        ApplicationAnnouncement.object.sync_and_return()
-        # then
-        self.assertEqual(ApplicationAnnouncement.object.count(), 3)
-        self.assertTrue(ApplicationAnnouncement.object.filter(application_name="Test Application", announcement_number=1, announcement_text="New test announcement", announcement_url="https://example.com"))
-
-    @patch(MODULE_PATH + '.get_all_applications_announcements')
-    def test_announcement_remove(self, all_announcements_mocker):
-        # given
-        all_announcements_mocker.return_value = DEFAULT_ANNOUNCEMENTS
-        ApplicationAnnouncement.object.sync_and_return()
-        self.assertEqual(ApplicationAnnouncement.object.count(), 2)
-        all_announcements_mocker.return_value = DEFAULT_ANNOUNCEMENTS[:1]
-        # when
-        ApplicationAnnouncement.object.sync_and_return()
-        # then
-        self.assertEqual(ApplicationAnnouncement.object.count(), 1)
-        self.assertTrue(ApplicationAnnouncement.object.filter(application_name="Test GitHub Application").exists())
--- a/allianceauth/analytics/init.py
+++ b/allianceauth/analytics/init.py
--- a/allianceauth/analytics/admin.py
+++ b/allianceauth/analytics/admin.py
@@ -1,17 +0,0 @@
-from solo.admin import SingletonModelAdmin
-
-from django.contrib import admin
-
-from .models import AnalyticsIdentifier, AnalyticsTokens
-
-
-@admin.register(AnalyticsIdentifier)
-class AnalyticsIdentifierAdmin(SingletonModelAdmin):
-    search_fields = ['identifier', ]
-    list_display = ['identifier', ]
-
-
-@admin.register(AnalyticsTokens)
-class AnalyticsTokensAdmin(admin.ModelAdmin):
-    search_fields = ['name', ]
-    list_display = ['name', 'type', ]
--- a/allianceauth/analytics/apps.py
+++ b/allianceauth/analytics/apps.py
@@ -1,8 +0,0 @@
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-
-class AnalyticsConfig(AppConfig):
-    name = 'allianceauth.analytics'
-    label = 'analytics'
-    verbose_name = _('Analytics')
--- a/allianceauth/analytics/fixtures/disable_analytics.json
+++ b/allianceauth/analytics/fixtures/disable_analytics.json
@@ -1,20 +0,0 @@
-[
-    {
-    "model": "analytics.AnalyticsTokens",
-    "pk": 1,
-    "fields": {
-        "name": "AA Team Public Google Analytics (V4)",
-        "type": "GA-V4",
-        "token": "G-6LYSMYK8DE",
-        "secret": "KLlpjLZ-SRGozS5f5wb_kw",
-        "send_stats": "False"
-        }
-    },
-    {
-        "model": "analytics.AnalyticsIdentifier",
-        "pk": 1,
-        "fields": {
-            "identifier": "ab33e241fbf042b6aa77c7655a768af7"
-        }
-    }
-]
--- a/allianceauth/analytics/migrations/0001_initial.py
+++ b/allianceauth/analytics/migrations/0001_initial.py
@@ -1,43 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-30 13:11
-
-import uuid
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AnalyticsIdentifier',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('identifier', models.UUIDField(default=uuid.uuid4, editable=False)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='AnalyticsPath',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('ignore_path', models.CharField(default='/example/', max_length=254)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='AnalyticsTokens',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=254)),
-                ('type', models.CharField(choices=[('GA-U', 'Google Analytics Universal'), ('GA-V4', 'Google Analytics V4')], max_length=254)),
-                ('token', models.CharField(max_length=254)),
-                ('send_page_views', models.BooleanField(default=False)),
-                ('send_celery_tasks', models.BooleanField(default=False)),
-                ('send_stats', models.BooleanField(default=False)),
-                ('ignore_paths', models.ManyToManyField(blank=True, to='analytics.AnalyticsPath')),
-            ],
-        ),
-    ]
--- a/allianceauth/analytics/migrations/0002_add_AA_Team_Token.py
+++ b/allianceauth/analytics/migrations/0002_add_AA_Team_Token.py
@@ -1,34 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-30 08:53
-
-from django.db import migrations
-
-
-def add_aa_team_token(apps, schema_editor):
-    # We can't import the Person model directly as it may be a newer
-    # version than this migration expects. We use the historical version.
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    token = Tokens()
-    token.type = 'GA-U'
-    token.token = 'UA-186249766-2'
-    token.send_page_views = True
-    token.send_celery_tasks = True
-    token.send_stats = True
-    token.name = 'AA Team Public Google Analytics (Universal)'
-    token.save()
-
-
-def remove_aa_team_token(apps, schema_editor):
-    # Have to define some code to remove this identifier
-    # In case of migration rollback?
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    Tokens.objects.filter(token="UA-186249766-2").delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0001_initial'),
-        ]
-
-    operations = [migrations.RunPython(add_aa_team_token, remove_aa_team_token)
-                    ]
--- a/allianceauth/analytics/migrations/0003_Generate_Identifier.py
+++ b/allianceauth/analytics/migrations/0003_Generate_Identifier.py
@@ -1,29 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-30 08:53
-
-from django.db import migrations
-
-
-def generate_identifier(apps, schema_editor):
-    # We can't import the Person model directly as it may be a newer
-    # version than this migration expects. We use the historical version.
-    Identifier = apps.get_model('analytics', 'AnalyticsIdentifier')
-    identifier = Identifier()
-    identifier.id = 1
-    identifier.save()
-
-
-def zero_identifier(apps, schema_editor):
-    # Have to define some code to remove this identifier
-    # In case of migration rollback?
-    Identifier = apps.get_model('analytics', 'AnalyticsIdentifier')
-    Identifier.objects.filter(id=1).delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0002_add_AA_Team_Token'),
-    ]
-
-    operations = [migrations.RunPython(generate_identifier, zero_identifier)
-                    ]
--- a/allianceauth/analytics/migrations/0004_auto_20211015_0502.py
+++ b/allianceauth/analytics/migrations/0004_auto_20211015_0502.py
@@ -1,42 +0,0 @@
-# Generated by Django 3.1.13 on 2021-10-15 05:02
-
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import migrations
-
-
-def modify_aa_team_token_add_page_ignore_paths(apps, schema_editor):
-    # Add /admin/ and /user_notifications_count/ path to ignore
-
-    AnalyticsPath = apps.get_model('analytics', 'AnalyticsPath')
-    admin = AnalyticsPath.objects.create(ignore_path=r"^\/admin\/.*")
-    user_notifications_count = AnalyticsPath.objects.create(ignore_path=r"^\/user_notifications_count\/.*")
-
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    token = Tokens.objects.get(token="UA-186249766-2")
-    token.ignore_paths.add(admin, user_notifications_count)
-
-
-def undo_modify_aa_team_token_add_page_ignore_paths(apps, schema_editor):
-    #
-    AnalyticsPath = apps.get_model('analytics', 'AnalyticsPath')
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-
-    token = Tokens.objects.get(token="UA-186249766-2")
-    try:
-        admin = AnalyticsPath.objects.get(ignore_path=r"^\/admin\/.*", analyticstokens=token)
-        user_notifications_count = AnalyticsPath.objects.get(ignore_path=r"^\/user_notifications_count\/.*", analyticstokens=token)
-        admin.delete()
-        user_notifications_count.delete()
-    except ObjectDoesNotExist:
-        # Its fine if it doesnt exist, we just dont want them building up when re-migrating
-        pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0003_Generate_Identifier'),
-    ]
-
-    operations = [migrations.RunPython(modify_aa_team_token_add_page_ignore_paths, undo_modify_aa_team_token_add_page_ignore_paths)
-    ]
--- a/allianceauth/analytics/migrations/0005_alter_analyticspath_ignore_path.py
+++ b/allianceauth/analytics/migrations/0005_alter_analyticspath_ignore_path.py
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.8 on 2021-10-17 16:26
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0004_auto_20211015_0502'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='analyticspath',
-            name='ignore_path',
-            field=models.CharField(default='/example/', help_text='Regex Expression, If matched no Analytics Page View is sent', max_length=254),
-        ),
-    ]
--- a/allianceauth/analytics/migrations/0006_more_ignore_paths.py
+++ b/allianceauth/analytics/migrations/0006_more_ignore_paths.py
@@ -1,40 +0,0 @@
-# Generated by Django 3.2.8 on 2021-10-19 01:47
-
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import migrations
-
-
-def modify_aa_team_token_add_page_ignore_paths(apps, schema_editor):
-    # Add the /account/activate path to ignore
-
-    AnalyticsPath = apps.get_model('analytics', 'AnalyticsPath')
-    account_activate = AnalyticsPath.objects.create(ignore_path=r"^\/account\/activate\/.*")
-
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    token = Tokens.objects.get(token="UA-186249766-2")
-    token.ignore_paths.add(account_activate)
-
-
-def undo_modify_aa_team_token_add_page_ignore_paths(apps, schema_editor):
-    #
-    AnalyticsPath = apps.get_model('analytics', 'AnalyticsPath')
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-
-    token = Tokens.objects.get(token="UA-186249766-2")
-
-    try:
-        account_activate = AnalyticsPath.objects.get(ignore_path=r"^\/account\/activate\/.*", analyticstokens=token)
-        account_activate.delete()
-    except ObjectDoesNotExist:
-        # Its fine if it doesnt exist, we just dont want them building up when re-migrating
-        pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0005_alter_analyticspath_ignore_path'),
-    ]
-
-    operations = [
-        migrations.RunPython(modify_aa_team_token_add_page_ignore_paths, undo_modify_aa_team_token_add_page_ignore_paths)
-    ]
--- a/allianceauth/analytics/migrations/0007_analyticstokens_secret.py
+++ b/allianceauth/analytics/migrations/0007_analyticstokens_secret.py
@@ -1,18 +0,0 @@
-# Generated by Django 4.0.6 on 2022-08-30 05:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0006_more_ignore_paths'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='analyticstokens',
-            name='secret',
-            field=models.CharField(blank=True, max_length=254),
-        ),
-    ]
--- a/allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token
+++ b/allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token
@@ -1,64 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-30 08:53
-
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import migrations
-
-
-def add_aa_team_token(apps, schema_editor):
-    # We can't import the Person model directly as it may be a newer
-    # version than this migration expects. We use the historical version.
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    AnalyticsPath = apps.get_model('analytics', 'AnalyticsPath')
-    token = Tokens()
-    try:
-        ua_token = Tokens.objects.get(token="UA-186249766-2")
-        original_send_page_views = ua_token.send_page_views
-        original_send_celery_tasks = ua_token.send_celery_tasks
-        original_send_stats = ua_token.send_stats
-    except ObjectDoesNotExist:
-        original_send_page_views = True
-        original_send_celery_tasks = True
-        original_send_stats = True
-
-    try:
-        user_notifications_count = AnalyticsPath.objects.get(ignore_path=r"^\/user_notifications_count\/.*",)
-    except ObjectDoesNotExist:
-        user_notifications_count = AnalyticsPath.objects.create(ignore_path=r"^\/user_notifications_count\/.*")
-
-    try:
-        admin = AnalyticsPath.objects.get(ignore_path=r"^\/admin\/.*")
-    except ObjectDoesNotExist:
-        admin = AnalyticsPath.objects.create(ignore_path=r"^\/admin\/.*")
-
-    try:
-        account_activate = AnalyticsPath.objects.get(ignore_path=r"^\/account\/activate\/.*")
-    except ObjectDoesNotExist:
-        account_activate = AnalyticsPath.objects.create(ignore_path=r"^\/account\/activate\/.*")
-
-    token.type = 'GA-V4'
-    token.token = 'G-6LYSMYK8DE'
-    token.secret = 'KLlpjLZ-SRGozS5f5wb_kw'
-    token.send_page_views = original_send_page_views
-    token.send_celery_tasks = original_send_celery_tasks
-    token.send_stats = original_send_stats
-    token.name = 'AA Team Public Google Analytics (V4)'
-    token.save()
-    token.ignore_paths.add(admin, user_notifications_count, account_activate)
-    token.save()
-
-
-def remove_aa_team_token(apps, schema_editor):
-    # Have to define some code to remove this identifier
-    # In case of migration rollback?
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0007_analyticstokens_secret'),
-    ]
-
-    operations = [migrations.RunPython(
-        add_aa_team_token, remove_aa_team_token)]
--- a/allianceauth/analytics/migrations/0009_remove_analyticstokens_ignore_paths_and_more.py
+++ b/allianceauth/analytics/migrations/0009_remove_analyticstokens_ignore_paths_and_more.py
@@ -1,28 +0,0 @@
-# Generated by Django 4.0.10 on 2023-05-08 05:24
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0008_add_AA_GA-4_Team_Token '),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='analyticstokens',
-            name='ignore_paths',
-        ),
-        migrations.RemoveField(
-            model_name='analyticstokens',
-            name='send_celery_tasks',
-        ),
-        migrations.RemoveField(
-            model_name='analyticstokens',
-            name='send_page_views',
-        ),
-        migrations.DeleteModel(
-            name='AnalyticsPath',
-        ),
-    ]
--- a/allianceauth/analytics/migrations/0010_alter_analyticsidentifier_options.py
+++ b/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'},
-        ),
-    ]
--- a/allianceauth/analytics/migrations/0011_v5squash.py
+++ b/allianceauth/analytics/migrations/0011_v5squash.py
@@ -1,56 +0,0 @@
-# Generated by Django 5.1.6 on 2025-03-04 01:03
-
-# This was built by Deleting Every Migration, Creating one from scratch
-# And porting in anything necessary
-
-import uuid
-
-from django.db import migrations, models
-
-
-def add_aa_team_token(apps, schema_editor):
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    token = Tokens()
-
-    token.type = 'GA-V4'
-    token.token = 'G-6LYSMYK8DE'
-    token.secret = 'KLlpjLZ-SRGozS5f5wb_kw'
-    token.name = 'AA Team Public Google Analytics (V4)'
-    token.save()
-
-
-class Migration(migrations.Migration):
-
-    replaces = [('analytics', '0001_initial'), ('analytics', '0002_add_AA_Team_Token'), ('analytics', '0003_Generate_Identifier'), ('analytics', '0004_auto_20211015_0502'), ('analytics', '0005_alter_analyticspath_ignore_path'), ('analytics', '0006_more_ignore_paths'), ('analytics', '0007_analyticstokens_secret'), ('analytics', '0008_add_AA_GA-4_Team_Token '), ('analytics', '0009_remove_analyticstokens_ignore_paths_and_more'), ('analytics', '0010_alter_analyticsidentifier_options')]
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AnalyticsIdentifier',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('identifier', models.UUIDField(default=uuid.uuid4, editable=False)),
-            ],
-            options={
-                'verbose_name': 'Analytics Identifier',
-            },
-        ),
-        migrations.CreateModel(
-            name='AnalyticsTokens',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=254)),
-                ('type', models.CharField(choices=[('GA-U', 'Google Analytics Universal'), ('GA-V4', 'Google Analytics V4')], max_length=254)),
-                ('token', models.CharField(max_length=254)),
-                ('secret', models.CharField(blank=True, max_length=254)),
-                ('send_stats', models.BooleanField(default=False)),
-            ],
-        ),
-        migrations.RunPython(
-            add_aa_team_token
-        ),
-    ]
--- a/allianceauth/analytics/migrations/init.py
+++ b/allianceauth/analytics/migrations/init.py
--- a/allianceauth/analytics/models.py
+++ b/allianceauth/analytics/models.py
@@ -1,34 +0,0 @@
-from typing import Literal
-from uuid import uuid4
-
-from solo.models import SingletonModel
-
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-
-class AnalyticsIdentifier(SingletonModel):
-
-    identifier = models.UUIDField(default=uuid4, editable=False)
-
-    def __str__(self) -> Literal['Analytics Identifier']:
-        return "Analytics Identifier"
-
-    class Meta:
-        verbose_name = "Analytics Identifier"
-
-
-class AnalyticsTokens(models.Model):
-
-    class Analytics_Type(models.TextChoices):
-        GA_U = 'GA-U', _('Google Analytics Universal')
-        GA_V4 = 'GA-V4', _('Google Analytics V4')
-
-    name = models.CharField(max_length=254)
-    type = models.CharField(max_length=254, choices=Analytics_Type.choices)
-    token = models.CharField(max_length=254, blank=False)
-    secret = models.CharField(max_length=254, blank=True)
-    send_stats = models.BooleanField(default=False)
-
-    def __str__(self) -> str:
-        return self.name
--- a/allianceauth/analytics/tasks.py
+++ b/allianceauth/analytics/tasks.py
@@ -1,206 +0,0 @@
-import logging
-
-import requests
-from celery import shared_task
-
-from django.apps import apps
-from django.conf import settings
-
-from allianceauth import __version__
-
-from .models import AnalyticsIdentifier, AnalyticsTokens
-from .utils import existence_baremetal_or_docker, install_stat_addons, install_stat_tokens, install_stat_users
-
-logger = logging.getLogger(__name__)
-
-BASE_URL = "https://www.google-analytics.com"
-
-DEBUG_URL = f"{BASE_URL}/debug/mp/collect"
-COLLECTION_URL = f"{BASE_URL}/mp/collect"
-
-if getattr(settings, "ANALYTICS_ENABLE_DEBUG", False) and settings.DEBUG:
-    # Force sending of analytics data during in a debug/test environment
-    # Useful for developers working on this feature.
-    logger.warning(
-        "You have 'ANALYTICS_ENABLE_DEBUG' Enabled! "
-        "This debug instance will send analytics data!")
-    DEBUG_URL = COLLECTION_URL
-
-ANALYTICS_URL = COLLECTION_URL
-
-if settings.DEBUG is True:
-    ANALYTICS_URL = DEBUG_URL
-
-
-def analytics_event(namespace: str,
-                    task: str,
-                    label: str = "",
-                    result: str = "",
-                    value: int = 1,
-                    event_type: str = 'Celery'):
-    """
-    Send a Google Analytics Event for each token stored
-    Includes check for if its enabled/disabled
-
-    Args:
-        `namespace` (str): Celery Namespace
-        `task` (str): Task Name
-        `label` (str): Optional, additional task label
-        `result` (str): Optional, Task Success/Exception
-        `value` (int): Optional, If bulk, Query size, can be a Boolean
-        `event_type` (str): Optional, Celery or Stats only, Default to Celery
-    """
-    for token in AnalyticsTokens.objects.filter(type='GA-V4'):
-        if event_type == 'Stats':
-            allowed = token.send_stats
-        else:
-            allowed = False
-
-        if allowed is True:
-            send_ga_tracking_celery_event.s(
-                measurement_id=token.token,
-                secret=token.secret,
-                namespace=namespace,
-                task=task,
-                label=label,
-                result=result,
-                value=value).apply_async(priority=9)
-
-
-@shared_task
-def analytics_daily_stats() -> None:
-    """Celery Task: Do not call directly
-
-    Gathers a series of daily statistics
-    Sends analytics events containing them
-    """
-    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',
-                    task='send_install_stats',
-                    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',
-                    value=users,
-                    event_type='Stats')
-    analytics_event(namespace='allianceauth.analytics',
-                    task='send_install_stats',
-                    label='tokens',
-                    value=tokens,
-                    event_type='Stats')
-    analytics_event(namespace='allianceauth.analytics',
-                    task='send_install_stats',
-                    label='addons',
-                    value=addons,
-                    event_type='Stats')
-    for appconfig in apps.get_app_configs():
-        if appconfig.label in [
-            "django_celery_beat",
-            "bootstrapform",
-            "messages",
-            "sessions",
-            "auth",
-            "staticfiles",
-            "users",
-            "addons",
-            "admin",
-            "humanize",
-            "contenttypes",
-            "sortedm2m",
-            "django_bootstrap5",
-            "tokens",
-            "authentication",
-            "services",
-            "framework",
-            "notifications"
-            "eveonline",
-            "navhelper",
-            "analytics",
-            "menu",
-            "theme"
-        ]:
-            pass
-        else:
-            analytics_event(namespace='allianceauth.analytics',
-                            task='send_extension_stats',
-                            label=appconfig.label,
-                            value=1,
-                            event_type='Stats')
-
-
-@shared_task
-def send_ga_tracking_celery_event(
-        measurement_id: str,
-        secret: str,
-        namespace: str,
-        task: str,
-        label: str = "",
-        result: str = "",
-        value: int = 1):
-    """Celery Task: Do not call directly
-
-    Sends an events to GA
-
-    Parameters
-    ----------
-    `measurement_id` (str): GA Token
-    `secret` (str): GA Authentication Secret
-    `namespace` (str): Celery Namespace
-    `task` (str): Task Name
-    `label` (str): Optional, additional task label
-    `result` (str): Optional, Task Success/Exception
-    `value` (int): Optional, If bulk, Query size, can be a binary True/False
-    """
-
-    parameters = {
-        'measurement_id': measurement_id,
-        'api_secret': secret
-    }
-
-    payload = {
-        'client_id': AnalyticsIdentifier.get_solo().identifier.hex,
-        "user_properties": {
-            "allianceauth_version": {
-                "value": __version__
-            }
-        },
-        'non_personalized_ads': True,
-        "events": [{
-            "name": "celery_event",
-            "params": {
-                    "namespace": namespace,
-                    "task": task,
-                    'result': result,
-                    'label': label,
-                    "value": value
-            }
-        }]
-    }
-    try:
-        response = requests.post(
-            ANALYTICS_URL,
-            params=parameters,
-            json=payload,
-            timeout=10)
-        response.raise_for_status()
-        logger.debug(
-            f"Analytics Celery/Stats Event HTTP{response.status_code}")
-        return response.status_code
-    except requests.exceptions.HTTPError as e:
-        logger.debug(e)
-        return response.status_code
-    except requests.exceptions.ConnectionError as e:
-        logger.debug(e)
-        return "Failed"
--- a/allianceauth/analytics/tests/init.py
+++ b/allianceauth/analytics/tests/init.py
--- a/allianceauth/analytics/tests/test_models.py
+++ b/allianceauth/analytics/tests/test_models.py
@@ -1,15 +0,0 @@
-from uuid import uuid4
-
-from django.test.testcases import TestCase
-
-from allianceauth.analytics.models import AnalyticsIdentifier
-
-# Identifiers
-uuid_1 = "ab33e241fbf042b6aa77c7655a768af7"
-uuid_2 = "7aa6bd70701f44729af5e3095ff4b55c"
-
-
-class TestAnalyticsIdentifier(TestCase):
-
-    def test_identifier_random(self):
-        self.assertNotEqual(AnalyticsIdentifier.get_solo(), uuid4)
--- a/allianceauth/analytics/tests/test_tasks.py
+++ b/allianceauth/analytics/tests/test_tasks.py
@@ -1,66 +0,0 @@
-import requests_mock
-
-from django.test.utils import override_settings
-
-from allianceauth.analytics.tasks import analytics_event, send_ga_tracking_celery_event
-from allianceauth.utils.testing import NoSocketsTestCase
-
-GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/mp/collect'
-
-
-@override_settings(CELERY_ALWAYS_EAGER=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True)
-@requests_mock.Mocker()
-class TestAnalyticsTasks(NoSocketsTestCase):
-    def test_analytics_event(self, requests_mocker):
-        requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
-        analytics_event(
-            namespace='allianceauth.analytics',
-            task='send_tests',
-            label='test',
-            value=1,
-            result="Success",
-            event_type='Stats')
-
-    def test_send_ga_tracking_celery_event_sent(self, requests_mocker):
-        # given
-        requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
-        token = 'G-6LYSMYK8DE'
-        secret = 'KLlpjLZ-SRGozS5f5wb_kw',
-        category = 'test'
-        action = 'test'
-        label = 'test'
-        value = '1'
-        # when
-        task = send_ga_tracking_celery_event(
-            token,
-            secret,
-            category,
-            action,
-            label,
-            value)
-        # then
-        self.assertEqual(task, 200)
-
-    def test_send_ga_tracking_celery_event_success(self, requests_mocker):
-        # given
-        requests_mocker.register_uri(
-            'POST',
-            GOOGLE_ANALYTICS_DEBUG_URL,
-            json={"validationMessages": []}
-        )
-        token = 'G-6LYSMYK8DE'
-        secret = 'KLlpjLZ-SRGozS5f5wb_kw',
-        category = 'test'
-        action = 'test'
-        label = 'test'
-        value = '1'
-        # when
-        task = send_ga_tracking_celery_event(
-            token,
-            secret,
-            category,
-            action,
-            label,
-            value)
-        # then
-        self.assertTrue(task, 200)
--- a/allianceauth/analytics/tests/test_utils.py
+++ b/allianceauth/analytics/tests/test_utils.py
@@ -1,54 +0,0 @@
-from django.apps import apps
-from django.test.testcases import TestCase
-
-from allianceauth.analytics.utils import install_stat_addons, install_stat_users
-from allianceauth.authentication.models import User
-
-
-def create_testdata():
-    User.objects.all().delete()
-    User.objects.create_user(
-        'user_1'
-        'abc@example.com',
-        'password'
-    )
-    User.objects.create_user(
-        'user_2'
-        'abc@example.com',
-        'password'
-    )
-    # Token.objects.all().delete()
-    # Token.objects.create(
-    #            character_id=101,
-    #            character_name='character1',
-    #            access_token='my_access_token'
-    # )
-    # Token.objects.create(
-    #            character_id=102,
-    #            character_name='character2',
-    #            access_token='my_access_token'
-    # )
-
-
-class TestAnalyticsUtils(TestCase):
-
-    def test_install_stat_users(self):
-        create_testdata()
-        expected = 2
-
-        users = install_stat_users()
-        self.assertEqual(users, expected)
-
-    # def test_install_stat_tokens(self):
-    #    create_testdata()
-    #    expected = 2
-    #
-    #   tokens = install_stat_tokens()
-    #   self.assertEqual(tokens, expected)
-
-    def test_install_stat_addons(self):
-        # this test does what its testing...
-        # but helpful for existing as a sanity check
-        expected = len(list(apps.get_app_configs()))
-        addons = install_stat_addons()
-        self.assertEqual(addons, expected)
--- a/allianceauth/analytics/utils.py
+++ b/allianceauth/analytics/utils.py
@@ -1,53 +0,0 @@
-import os
-
-from django.apps import apps
-
-from esi.models import Token
-
-from allianceauth.authentication.models import User
-
-
-def install_stat_users() -> int:
-    """Count and Return the number of User accounts
-
-    Returns
-    -------
-    int
-        The Number of User objects"""
-    users = User.objects.count()
-    return users
-
-
-def install_stat_tokens() -> int:
-    """Count and Return the number of ESI Tokens Stored
-
-    Returns
-    -------
-    int
-        The Number of Token Objects"""
-    tokens = Token.objects.count()
-    return tokens
-
-
-def install_stat_addons() -> int:
-    """Count and Return the number of Django Applications Installed
-
-    Returns
-    -------
-    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"
--- a/allianceauth/apps.py
+++ b/allianceauth/apps.py
@@ -3,6 +3,3 @@ from django.apps import AppConfig

 class AllianceAuthConfig(AppConfig):
    name = 'allianceauth'
-
-    def ready(self) -> None:
-        import allianceauth.checks # noqa
--- a/allianceauth/authentication/init.py
+++ b/allianceauth/authentication/init.py
@@ -0,0 +1 @@
+default_app_config = 'allianceauth.authentication.apps.AuthenticationConfig'
--- a/allianceauth/authentication/admin.py
+++ b/allianceauth/authentication/admin.py
@@ -1,22 +1,26 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.models import Group, Permission as BasePermission, User as BaseUser
+from django.contrib.auth.models import User as BaseUser, \
+    Permission as BasePermission, Group
 from django.db.models import Count, Q
+from allianceauth.services.hooks import ServicesHook
+from django.db.models.signals import pre_save, post_save, pre_delete, \
+    post_delete, m2m_changed
 from django.db.models.functions import Lower
-from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
 from django.dispatch import receiver
-from django.urls import reverse
+from django.forms import ModelForm
 from django.utils.html import format_html
+from django.urls import reverse
 from django.utils.text import slugify

-from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
-from allianceauth.eveonline.tasks import update_character
+from allianceauth.authentication.models import State, get_guest_state,\
+    CharacterOwnership, UserProfile, OwnershipRecord
 from allianceauth.hooks import get_hooks
-from allianceauth.services.hooks import ServicesHook
-
-from .app_settings import AUTHENTICATION_ADMIN_USERS_MAX_CHARS, AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
-from .forms import UserChangeForm, UserProfileForm
+from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo,\
+    EveAllianceInfo
+from allianceauth.eveonline.tasks import update_character
+from .app_settings import AUTHENTICATION_ADMIN_USERS_MAX_GROUPS, \
+    AUTHENTICATION_ADMIN_USERS_MAX_CHARS


 def make_service_hooks_update_groups_action(service):
@@ -32,8 +36,8 @@ def make_service_hooks_update_groups_action(service):
            for user in queryset:  # queryset filtering doesn't work here?
                service.update_groups(user)

-    update_service_groups.__name__ = str(f'update_{slugify(service.name)}_groups')
-    update_service_groups.short_description = f"Sync groups for selected {service.title} accounts"
+    update_service_groups.__name__ = str('update_{}_groups'.format(slugify(service.name)))
+    update_service_groups.short_description = "Sync groups for selected {} accounts".format(service.title)
    return update_service_groups


@@ -50,15 +54,24 @@ def make_service_hooks_sync_nickname_action(service):
            for user in queryset:  # queryset filtering doesn't work here?
                service.sync_nickname(user)

-    sync_nickname.__name__ = str(f'sync_{slugify(service.name)}_nickname')
-    sync_nickname.short_description = f"Sync nicknames for selected {service.title} accounts"
+    sync_nickname.__name__ = str('sync_{}_nickname'.format(slugify(service.name)))
+    sync_nickname.short_description = "Sync nicknames for selected {} accounts".format(service.title)
    return sync_nickname


+class QuerysetModelForm(ModelForm):
+    # allows specifying FK querysets through kwarg
+    def __init__(self, querysets=None, *args, **kwargs):
+        querysets = querysets or {}
+        super().__init__(*args, **kwargs)
+        for field, qs in querysets.items():
+            self.fields[field].queryset = qs
+
+
 class UserProfileInline(admin.StackedInline):
    model = UserProfile
    readonly_fields = ('state',)
-    form = UserProfileForm
+    form = QuerysetModelForm
    verbose_name = ''
    verbose_name_plural = 'Profile'

@@ -71,7 +84,7 @@ class UserProfileInline(admin.StackedInline):
            if request.user.is_superuser:
                query |= Q(userprofile__isnull=True)
            else:
-                query |= Q(character_ownership__user=obj)
+                query |= Q(character_ownership__user=obj)        
        formset = super().get_formset(request, obj=obj, **kwargs)

        def get_kwargs(self, index):
@@ -86,7 +99,6 @@ class UserProfileInline(admin.StackedInline):
        return False


-@admin.display(description="")
 def user_profile_pic(obj):
    """profile pic column data for user objects

@@ -99,39 +111,46 @@ def user_profile_pic(obj):
            '<img src="{}" class="img-circle">',
            user_obj.profile.main_character.portrait_url(size=32)
        )
-    return None
+    else:
+        return None
+
+
+user_profile_pic.short_description = ''


-@admin.display(description="user / main", ordering="username")
 def user_username(obj):
    """user column data for user objects

    works for both User objects and objects with `user` as FK to User
    To be used for all user based admin lists
-    """
+    """    
    link = reverse(
-        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
+        'admin:{}_{}_change'.format(
+            obj._meta.app_label,
+            type(obj).__name__.lower()
+        ), 
        args=(obj.pk,)
    )
    user_obj = obj.user if hasattr(obj, 'user') else obj
    if user_obj.profile.main_character:
        return format_html(
            '<strong><a href="{}">{}</a></strong><br>{}',
-            link,
+            link, 
            user_obj.username,
            user_obj.profile.main_character.character_name
        )
-    return format_html(
-        '<strong><a href="{}">{}</a></strong>',
-        link,
-        user_obj.username,
-    )
+    else:
+        return format_html(
+            '<strong><a href="{}">{}</a></strong>',
+            link, 
+            user_obj.username,
+        )
+
+
+user_username.short_description = 'user / main'
+user_username.admin_order_field = 'username'


-@admin.display(
-    description="Corporation / Alliance (Main)",
-    ordering="profile__main_character__corporation_name"
-)
 def user_main_organization(obj):
    """main organization column data for user objects

@@ -140,13 +159,23 @@ def user_main_organization(obj):
    """
    user_obj = obj.user if hasattr(obj, 'user') else obj
    if not user_obj.profile.main_character:
-        return ''
-    result = user_obj.profile.main_character.corporation_name
-    if user_obj.profile.main_character.alliance_id:
-        result += f'<br>{user_obj.profile.main_character.alliance_name}'
-    elif user_obj.profile.main_character.faction_name:
-        result += f'<br>{user_obj.profile.main_character.faction_name}'
-    return format_html(result)
+        result = None
+    else:        
+        corporation = user_obj.profile.main_character.corporation_name
+        if user_obj.profile.main_character.alliance_id:        
+            result = format_html(
+                '{}<br>{}',
+                corporation, 
+                user_obj.profile.main_character.alliance_name
+            )
+        else:
+            result = corporation    
+    return result
+
+
+user_main_organization.short_description = 'Corporation / Alliance (Main)'
+user_main_organization.admin_order_field = \
+    'profile__main_character__corporation_name'


 class MainCorporationsFilter(admin.SimpleListFilter):
@@ -165,20 +194,22 @@ class MainCorporationsFilter(admin.SimpleListFilter):
            .distinct()\
            .order_by(Lower('corporation_name'))
        return tuple(
-            (x['corporation_id'], x['corporation_name']) for x in qs
+            [(x['corporation_id'], x['corporation_name']) for x in qs]
        )

    def queryset(self, request, qs):
        if self.value() is None:
            return qs.all()
-        if qs.model == User:
-            return qs.filter(
-                profile__main_character__corporation_id=self.value()
-            )
-        return qs.filter(
-            user__profile__main_character__corporation_id=self.value()
-        )
-
+        else:    
+            if qs.model == User:
+                return qs.filter(
+                    profile__main_character__corporation_id=self.value()
+                )
+            else:
+                return qs.filter(
+                    user__profile__main_character__corporation_id=self.value()
+                )
+            

 class MainAllianceFilter(admin.SimpleListFilter):
    """Custom filter to filter on alliances from mains only
@@ -190,62 +221,29 @@ class MainAllianceFilter(admin.SimpleListFilter):
    parameter_name = 'main_alliance_id__exact'

    def lookups(self, request, model_admin):
-        qs = (
-            EveCharacter.objects
-            .exclude(alliance_id=None)
-            .exclude(userprofile=None)
-            .values('alliance_id', 'alliance_name')
-            .distinct()
+        qs = EveCharacter.objects\
+            .exclude(alliance_id=None)\
+            .exclude(userprofile=None)\
+            .values('alliance_id', 'alliance_name')\
+            .distinct()\
            .order_by(Lower('alliance_name'))
-        )
        return tuple(
-            (x['alliance_id'], x['alliance_name']) for x in qs
+            [(x['alliance_id'], x['alliance_name']) for x in qs]
        )

    def queryset(self, request, qs):
        if self.value() is None:
            return qs.all()
-        if qs.model == User:
-            return qs.filter(profile__main_character__alliance_id=self.value())
-        return qs.filter(
-            user__profile__main_character__alliance_id=self.value()
-        )
+        else:    
+            if qs.model == User:
+                return qs.filter(profile__main_character__alliance_id=self.value())                
+            else:
+                return qs.filter(
+                    user__profile__main_character__alliance_id=self.value()
+                )
+                

-
-class MainFactionFilter(admin.SimpleListFilter):
-    """Custom filter to filter on factions from mains only
-
-    works for both User objects and objects with `user` as FK to User
-    To be used for all user based admin lists
-    """
-    title = 'faction'
-    parameter_name = 'main_faction_id__exact'
-
-    def lookups(self, request, model_admin):
-        qs = (
-            EveCharacter.objects
-            .exclude(faction_id=None)
-            .exclude(userprofile=None)
-            .values('faction_id', 'faction_name')
-            .distinct()
-            .order_by(Lower('faction_name'))
-        )
-        return tuple(
-            (x['faction_id'], x['faction_name']) for x in qs
-        )
-
-    def queryset(self, request, qs):
-        if self.value() is None:
-            return qs.all()
-        if qs.model == User:
-            return qs.filter(profile__main_character__faction_id=self.value())
-        return qs.filter(
-            user__profile__main_character__faction_id=self.value()
-        )
-
-
-@admin.display(description="Update main character model from ESI")
-def update_main_character_model(modeladmin, request, queryset):
+def update_main_character_model(modeladmin, request, queryset):    
    tasks_count = 0
    for obj in queryset:
        if obj.profile.main_character:
@@ -253,75 +251,36 @@ def update_main_character_model(modeladmin, request, queryset):
            tasks_count += 1

    modeladmin.message_user(
-        request, f'Update from ESI started for {tasks_count} characters'
+        request, 
+        'Update from ESI started for {} characters'.format(tasks_count)
    )


+update_main_character_model.short_description = \
+    'Update main character model from ESI'
+
+
 class UserAdmin(BaseUserAdmin):
    """Extending Django's UserAdmin model
-
+    
    Behavior of groups and characters columns can be configured via settings
    """

-    inlines = [UserProfileInline]
-    ordering = ('username', )
-    list_select_related = ('profile__state', 'profile__main_character')
-    show_full_result_count = True
-    list_display = (
-        user_profile_pic,
-        user_username,
-        '_state',
-        '_groups',
-        user_main_organization,
-        '_characters',
-        'is_active',
-        'date_joined',
-        '_role'
-    )
-    list_display_links = None
-    list_filter = (
-        'profile__state',
-        'groups',
-        MainCorporationsFilter,
-        MainAllianceFilter,
-        MainFactionFilter,
-        'is_active',
-        'date_joined',
-        'is_staff',
-        'is_superuser'
-    )
-    search_fields = ('username', 'character_ownerships__character__character_name')
-    readonly_fields = ('date_joined', 'last_login')
-    filter_horizontal = ('groups', 'user_permissions',)
-    form = UserChangeForm
-
    class Media:
        css = {
-            "all": ("allianceauth/authentication/css/admin.css",)
+            "all": ("authentication/css/admin.css",)
        }
-
+             
    def get_queryset(self, request):
        qs = super().get_queryset(request)
        return qs.prefetch_related("character_ownerships__character", "groups")

-    def get_form(self, request, obj=None, **kwargs):
-        """Inject current request into change form object."""
-
-        MyForm = super().get_form(request, obj, **kwargs)
-        if obj:
-            class MyFormInjected(MyForm):
-                def __new__(cls, *args, **kwargs):
-                    kwargs['request'] = request
-                    return MyForm(*args, **kwargs)
-
-            return MyFormInjected
-        return MyForm
-
    def get_actions(self, request):
-        actions = super().get_actions(request)
+        actions = super(BaseUserAdmin, self).get_actions(request)
+
        actions[update_main_character_model.__name__] = (
-            update_main_character_model,
-            update_main_character_model.__name__,
+            update_main_character_model, 
+            update_main_character_model.__name__, 
            update_main_character_model.short_description
        )

@@ -331,21 +290,21 @@ class UserAdmin(BaseUserAdmin):
            if svc.update_groups.__module__ != ServicesHook.update_groups.__module__:
                action = make_service_hooks_update_groups_action(svc)
                actions[action.__name__] = (
-                    action,
+                    action, 
                    action.__name__,
                    action.short_description
                )
-
+            
            # Create sync nickname action if service implements it
            if svc.sync_nickname.__module__ != ServicesHook.sync_nickname.__module__:
                action = make_service_hooks_sync_nickname_action(svc)
                actions[action.__name__] = (
-                    action, action.__name__,
+                    action, action.__name__, 
                    action.short_description
                )
        return actions

-    def _list_2_html_w_tooltips(self, my_items: list, max_items: int) -> str:
+    def _list_2_html_w_tooltips(self, my_items: list, max_items: int) -> str:    
        """converts list of strings into HTML with cutoff and tooltip"""
        items_truncated_str = ', '.join(my_items[:max_items])
        if not my_items:
@@ -361,24 +320,61 @@ class UserAdmin(BaseUserAdmin):
                items_truncated_str
            )
        return result
-
+    
+    inlines = BaseUserAdmin.inlines + [UserProfileInline]
+    ordering = ('username', )    
+    list_select_related = ('profile__state', 'profile__main_character')
+    show_full_result_count = True     
+    list_display = (
+        user_profile_pic,
+        user_username, 
+        '_state', 
+        '_groups',
+        user_main_organization,
+        '_characters',
+        'is_active',
+        'date_joined',
+        '_role'
+    )    
+    list_display_links = None
+    list_filter = ( 
+        'profile__state',
+        'groups',        
+        MainCorporationsFilter,        
+        MainAllianceFilter,
+        'is_active',
+        'date_joined',
+        'is_staff',
+        'is_superuser'
+    )
+    search_fields = (
+        'username', 
+        'character_ownerships__character__character_name'
+    )
+    
    def _characters(self, obj):
        character_ownerships = list(obj.character_ownerships.all())
        characters = [obj.character.character_name for obj in character_ownerships]
        return self._list_2_html_w_tooltips(
-            sorted(characters),
+            sorted(characters), 
            AUTHENTICATION_ADMIN_USERS_MAX_CHARS
        )
-
-    @admin.display(ordering="profile__state")
+          
+    _characters.short_description = 'characters'
+    
    def _state(self, obj):
        return obj.profile.state.name
+    
+    _state.short_description = 'state'
+    _state.admin_order_field = 'profile__state'

-    def _groups(self, obj):
-        my_groups = sorted(group.name for group in list(obj.groups.all()))
+    def _groups(self, obj):        
+        my_groups = sorted([group.name for group in list(obj.groups.all())])
        return self._list_2_html_w_tooltips(
            my_groups, AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
        )
+       
+    _groups.short_description = 'groups'

    def _role(self, obj):
        if obj.is_superuser:
@@ -386,9 +382,11 @@ class UserAdmin(BaseUserAdmin):
        elif obj.is_staff:
            role = 'Staff'
        else:
-            role = 'User'
+            role = 'User'        
        return role
-
+    
+    _role.short_description = 'role'
+    
    def has_change_permission(self, request, obj=None):
        return request.user.has_perm('auth.change_user')

@@ -398,41 +396,26 @@ class UserAdmin(BaseUserAdmin):
    def has_delete_permission(self, request, obj=None):
        return request.user.has_perm('auth.delete_user')

-    def get_object(self, *args , **kwargs):
-        obj = super().get_object(*args , **kwargs)
-        self.obj = obj  # storing current object for use in formfield_for_manytomany
-        return obj
-
    def formfield_for_manytomany(self, db_field, request, **kwargs):
+        """overriding this formfield to have sorted lists in the form"""
        if db_field.name == "groups":
-            groups_qs = Group.objects.filter(authgroup__states__isnull=True)
-            obj_state = self.obj.profile.state
-            if obj_state:
-                matching_groups_qs = Group.objects.filter(authgroup__states=obj_state)
-                groups_qs = groups_qs | matching_groups_qs
-            kwargs["queryset"] = groups_qs.order_by(Lower("name"))
+            kwargs["queryset"] = Group.objects.all().order_by(Lower('name'))        
        return super().formfield_for_manytomany(db_field, request, **kwargs)

-    def get_readonly_fields(self, request, obj=None):
-        if obj and not request.user.is_superuser:
-            return self.readonly_fields + (
-                "is_staff", "is_superuser", "user_permissions"
-            )
-        return self.readonly_fields
-

@admin.register(State)
-class StateAdmin(admin.ModelAdmin):
+class StateAdmin(admin.ModelAdmin):    
    list_select_related = True
    list_display = ('name', 'priority', '_user_count')
-
+    
    def get_queryset(self, request):
        qs = super().get_queryset(request)
        return qs.annotate(user_count=Count("userprofile__id"))

-    @admin.display(description="Users", ordering="user_count")
    def _user_count(self, obj):
        return obj.user_count
+    _user_count.short_description = 'Users'
+    _user_count.admin_order_field = 'user_count'

    fieldsets = (
        (None, {
@@ -440,24 +423,22 @@ class StateAdmin(admin.ModelAdmin):
        }),
        ('Membership', {
            'fields': (
-                'public',
-                'member_characters',
-                'member_corporations',
-                'member_alliances',
-                'member_factions'
+                'public', 
+                'member_characters', 
+                'member_corporations', 
+                'member_alliances'
            ),
        })
    )
    filter_horizontal = [
-        'member_characters',
-        'member_corporations',
-        'member_alliances',
-        'member_factions',
+        'member_characters', 
+        'member_corporations', 
+        'member_alliances', 
        'permissions'
    ]

    def formfield_for_manytomany(self, db_field, request, **kwargs):
-        """overriding this formfield to have sorted lists in the form"""
+        """overriding this formfield to have sorted lists in the form"""        
        if db_field.name == "member_characters":
            kwargs["queryset"] = EveCharacter.objects.all()\
                .order_by(Lower('character_name'))
@@ -467,17 +448,14 @@ class StateAdmin(admin.ModelAdmin):
        elif db_field.name == "member_alliances":
            kwargs["queryset"] = EveAllianceInfo.objects.all()\
                .order_by(Lower('alliance_name'))
-        elif db_field.name == "member_factions":
-            kwargs["queryset"] = EveFactionInfo.objects.all()\
-                .order_by(Lower('faction_name'))
        elif db_field.name == "permissions":
            kwargs["queryset"] = Permission.objects.select_related("content_type").all()
        return super().formfield_for_manytomany(db_field, request, **kwargs)
-
+        
    def has_delete_permission(self, request, obj=None):
        if obj == get_guest_state():
            return False
-        return super().has_delete_permission(request, obj=obj)
+        return super(StateAdmin, self).has_delete_permission(request, obj=obj)

    def get_fieldsets(self, request, obj=None):
        if obj == get_guest_state():
@@ -486,17 +464,17 @@ class StateAdmin(admin.ModelAdmin):
                    'fields': ('permissions', 'priority'),
                }),
            )
-        return super().get_fieldsets(request, obj=obj)
-
-    def get_readonly_fields(self, request, obj=None):
-        if not request.user.is_superuser:
-            return self.readonly_fields + ("permissions",)
-        return self.readonly_fields
-
+        return super(StateAdmin, self).get_fieldsets(request, obj=obj)
+    

 class BaseOwnershipAdmin(admin.ModelAdmin):
+    class Media:
+        css = {
+            "all": ("authentication/css/admin.css",)
+        }
+     
    list_select_related = (
-        'user__profile__state', 'user__profile__main_character', 'character')
+        'user__profile__state', 'user__profile__main_character', 'character')    
    list_display = (
        user_profile_pic,
        user_username,
@@ -504,26 +482,20 @@ class BaseOwnershipAdmin(admin.ModelAdmin):
        'character',
    )
    search_fields = (
-        'user__username',
-        'character__character_name',
-        'character__corporation_name',
-        'character__alliance_name',
-        'character__faction_name'
+        'user__username', 
+        'character__character_name', 
+        'character__corporation_name', 
+        'character__alliance_name'
    )
-    list_filter = (
-        MainCorporationsFilter,
+    list_filter = (                 
+        MainCorporationsFilter,        
        MainAllianceFilter,
    )

-    class Media:
-        css = {
-            "all": ("allianceauth/authentication/css/admin.css",)
-        }
-
    def get_readonly_fields(self, request, obj=None):
        if obj and obj.pk:
            return 'owner_hash', 'character'
-        return ()
+        return tuple()


@admin.register(OwnershipRecord)
--- a/allianceauth/authentication/app_settings.py
+++ b/allianceauth/authentication/app_settings.py
@@ -2,14 +2,14 @@ from django.conf import settings


 def _clean_setting(
-    name: str,
-    default_value: object,
+    name: str,     
+    default_value: object,         
    min_value: int = None,
    max_value: int = None,
    required_type: type = None
 ):
    """cleans the input for a custom setting
-
+    
    Will use `default_value` if settings does not exit or has the wrong type
    or is outside define boundaries (for int only)

@@ -18,22 +18,22 @@ def _clean_setting(
    Will assume `min_value` of 0 for int (can be overriden)

    Returns cleaned value for setting
-    """
+    """                
    if default_value is None and not required_type:
        raise ValueError('You must specify a required_type for None defaults')
-
+    
    if not required_type:
        required_type = type(default_value)

-    if min_value is None and required_type is int:
-        min_value = 0
-
+    if min_value is None and required_type == int:
+        min_value = 0        
+        
    if (hasattr(settings, name)
        and isinstance(getattr(settings, name), required_type)
        and (min_value is None or getattr(settings, name) >= min_value)
        and (max_value is None or getattr(settings, name) <= max_value)
-    ):
-        return getattr(settings, name)
+    ):        
+        return getattr(settings, name)    
    else:
        return default_value

@@ -43,3 +43,4 @@ AUTHENTICATION_ADMIN_USERS_MAX_GROUPS = \

 AUTHENTICATION_ADMIN_USERS_MAX_CHARS = \
    _clean_setting('AUTHENTICATION_ADMIN_USERS_MAX_CHARS', 5)
+
--- a/allianceauth/authentication/apps.py
+++ b/allianceauth/authentication/apps.py
@@ -1,18 +1,12 @@
 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")
+    name = 'allianceauth.authentication'
+    label = 'authentication'

    def ready(self):
-        from allianceauth.authentication import checks, signals  # noqa: F401
-        from allianceauth.authentication.task_statistics import (
-            signals as celery_signals,
-        )
-
+        super(AuthenticationConfig, self).ready()
+        from allianceauth.authentication import checks, signals
        register(Tags.security)(checks.check_login_scopes_setting)
-        celery_signals.reset_counters()
--- a/allianceauth/authentication/auth_hooks.py
+++ b/allianceauth/authentication/auth_hooks.py
@@ -1,60 +0,0 @@
-from allianceauth import hooks
-from allianceauth.hooks import DashboardItemHook
-
-from .views import dashboard_admin, dashboard_characters, dashboard_esi_check, dashboard_groups
-
-
-class UserCharactersHook(DashboardItemHook):
-    def __init__(self):
-        DashboardItemHook.__init__(
-            self,
-            dashboard_characters,
-            5
-        )
-
-
-class UserGroupsHook(DashboardItemHook):
-    def __init__(self):
-        DashboardItemHook.__init__(
-            self,
-            dashboard_groups,
-            5
-        )
-
-
-class AdminHook(DashboardItemHook):
-    def __init__(self):
-        DashboardItemHook.__init__(
-            self,
-            dashboard_admin,
-            1
-        )
-
-
-class ESICheckHook(DashboardItemHook):
-    def __init__(self):
-        DashboardItemHook.__init__(
-            self,
-            dashboard_esi_check,
-            0
-        )
-
-
-@hooks.register('dashboard_hook')
-def register_character_hook():
-    return UserCharactersHook()
-
-
-@hooks.register('dashboard_hook')
-def register_groups_hook():
-    return UserGroupsHook()
-
-
-@hooks.register('dashboard_hook')
-def register_admin_hook():
-    return AdminHook()
-
-
-@hooks.register('dashboard_hook')
-def register_esi_hook():
-    return ESICheckHook()
--- a/allianceauth/authentication/backends.py
+++ b/allianceauth/authentication/backends.py
@@ -1,9 +1,10 @@
 import logging

 from django.contrib.auth.backends import ModelBackend
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import User, Permission
+
+from .models import UserProfile, CharacterOwnership, OwnershipRecord

-from .models import CharacterOwnership, OwnershipRecord, UserProfile

 logger = logging.getLogger(__name__)

@@ -11,9 +12,9 @@ logger = logging.getLogger(__name__)
 class StateBackend(ModelBackend):
    @staticmethod
    def _get_state_permissions(user_obj):
-        """returns permissions for state of given user object"""
+        """returns permissions for state of given user object"""        
        if hasattr(user_obj, "profile") and user_obj.profile:
-            return Permission.objects.filter(state=user_obj.profile.state)
+            return Permission.objects.filter(state=user_obj.profile.state)            
        else:
            return Permission.objects.none()

@@ -35,21 +36,17 @@ class StateBackend(ModelBackend):
        try:
            ownership = CharacterOwnership.objects.get(character__character_id=token.character_id)
            if ownership.owner_hash == token.character_owner_hash:
-                logger.debug(f'Authenticating {ownership.user} by ownership of character {token.character_name}')
-                if ownership.user.profile.main_character:
-                    if ownership.user.profile.main_character.character_id == token.character_id:
-                        return ownership.user
-                    else:  # this is an alt, enforce main only.
-                        return None
+                logger.debug('Authenticating {0} by ownership of character {1}'.format(ownership.user, token.character_name))
+                return ownership.user
            else:
-                logger.debug(f'{token.character_name} has changed ownership. Creating new user account.')
+                logger.debug('{0} has changed ownership. Creating new user account.'.format(token.character_name))
                ownership.delete()
                return self.create_user(token)
        except CharacterOwnership.DoesNotExist:
            try:
                # insecure legacy main check for pre-sso registration auth installs
                profile = UserProfile.objects.get(main_character__character_id=token.character_id)
-                logger.debug(f'Authenticating {profile.user} by their main character {profile.main_character} without active ownership.')
+                logger.debug('Authenticating {0} by their main character {1} without active ownership.'.format(profile.user, profile.main_character))
                # attach an ownership
                token.user = profile.user
                CharacterOwnership.objects.create_by_token(token)
@@ -60,20 +57,15 @@ class StateBackend(ModelBackend):
                if records.exists():
                    # we've seen this character owner before. Re-attach to their old user account
                    user = records[0].user
-                    if user.profile.main_character:
-                        if user.profile.main_character.character_id != token.character_id:
-                            # this is an alt, enforce main only due to trust issues in SSO.
-                            return None
-
                    token.user = user
                    co = CharacterOwnership.objects.create_by_token(token)
-                    logger.debug(f'Authenticating {user} by matching owner hash record of character {co.character}')
-
-                    # set this as their main by default as they have none
-                    user.profile.main_character = co.character
-                    user.profile.save()
+                    logger.debug('Authenticating {0} by matching owner hash record of character {1}'.format(user, co.character))
+                    if not user.profile.main_character:
+                        # set this as their main by default if they have none
+                        user.profile.main_character = co.character
+                        user.profile.save()
                    return user
-            logger.debug(f'Unable to authenticate character {token.character_name}. Creating new user.')
+            logger.debug('Unable to authenticate character {0}. Creating new user.'.format(token.character_name))
            return self.create_user(token)

    def create_user(self, token):
@@ -85,7 +77,7 @@ class StateBackend(ModelBackend):
        co = CharacterOwnership.objects.create_by_token(token)  # assign ownership to this user
        user.profile.main_character = co.character  # assign main character as token character
        user.profile.save()
-        logger.debug(f'Created new user {user}')
+        logger.debug('Created new user {0}'.format(user))
        return user

    @staticmethod
@@ -95,10 +87,10 @@ class StateBackend(ModelBackend):
        if User.objects.filter(username__startswith=name).exists():
            u = User.objects.filter(username__startswith=name)
            num = len(u)
-            username = f"{name}_{num}"
+            username = "%s_%s" % (name, num)
            while u.filter(username=username).exists():
                num += 1
-                username = f"{name}_{num}"
+                username = "%s_%s" % (name, num)
        else:
            username = name
        return username
--- a/allianceauth/authentication/checks.py
+++ b/allianceauth/authentication/checks.py
@@ -1,5 +1,5 @@
-from django.conf import settings
 from django.core.checks import Error
+from django.conf import settings


 def check_login_scopes_setting(*args, **kwargs):
--- a/allianceauth/authentication/constants.py
+++ b/allianceauth/authentication/constants.py
@@ -1,12 +0,0 @@
-from django.utils.translation import gettext_lazy as _
-
-# Overide ESI messages in the dashboard widget
-# when the returned messages are not helpful or out of date
-ESI_ERROR_MESSAGE_OVERRIDES = {
-    420: _("This software has exceeded the error limit for ESI. "
-            "If you are a user, please contact the maintainer of this software."
-            " If you are a developer/maintainer, please make a greater "
-            "effort in the future to receive valid responses. For tips on how, "
-            "come have a chat with us in ##3rd-party-dev-and-esi on the EVE "
-            "Online Discord. https://www.eveonline.com/discord")
-}
--- a/allianceauth/authentication/core/init.py
+++ b/allianceauth/authentication/core/init.py
--- a/allianceauth/authentication/core/celery_workers.py
+++ b/allianceauth/authentication/core/celery_workers.py
@@ -1,47 +0,0 @@
-"""API for interacting with celery workers."""
-
-import itertools
-import logging
-
-from amqp.exceptions import ChannelError
-from celery import current_app
-
-from django.conf import settings
-
-logger = logging.getLogger(__name__)
-
-
-def active_tasks_count() -> int | None:
-    """Return count of currently active tasks
-    or None if celery workers are not online.
-    """
-    inspect = current_app.control.inspect()
-    return _tasks_count(inspect.active())
-
-
-def _tasks_count(data: dict) -> int | None:
-    """Return count of tasks in data from celery inspect API."""
-    try:
-        tasks = itertools.chain(*data.values())
-    except AttributeError:
-        return None
-    return len(list(tasks))
-
-
-def queued_tasks_count() -> int | None:
-    """Return count of queued tasks. Return None if there was an error."""
-    try:
-        with current_app.connection_or_acquire() as conn:
-            result = conn.default_channel.queue_declare(
-                queue=getattr(settings, "CELERY_DEFAULT_QUEUE", "celery"), passive=True
-            )
-            return result.message_count
-
-    except ChannelError:
-        # Queue doesn't exist, probably empty
-        return 0
-
-    except Exception:
-        logger.exception("Failed to get celery queue length")
-
-    return None
--- a/allianceauth/authentication/decorators.py
+++ b/allianceauth/authentication/decorators.py
@@ -1,28 +1,18 @@
-from collections.abc import Callable, Iterable
-from functools import wraps
-
-from django.contrib import messages
-from django.contrib.auth.decorators import login_required, user_passes_test
+from django.conf.urls import include
+from django.contrib.auth.decorators import user_passes_test
 from django.core.exceptions import PermissionDenied
+from functools import wraps
 from django.shortcuts import redirect
-from django.urls import include
+from django.contrib import messages
 from django.utils.translation import gettext_lazy as _
+from django.contrib.auth.decorators import login_required


 def user_has_main_character(user):
    return bool(user.profile.main_character)


-def decorate_url_patterns(
-    urls, decorator: Callable, excluded_views: Iterable | None = None
-):
-    """Decorate views given in url patterns except when they are explicitly excluded.
-
-    Args:
-        - urls: Django URL patterns
-        - decorator: Decorator to be added to each view
-        - exclude_views: Optional iterable of view names to be excluded
-    """
+def decorate_url_patterns(urls, decorator):
    url_list, app_name, namespace = include(urls)

    def process_patterns(url_patterns):
@@ -32,8 +22,6 @@ def decorate_url_patterns(
                process_patterns(pattern.url_patterns)
            else:
                # this is a pattern
-                if excluded_views and pattern.lookup_str in excluded_views:
-                    return
                pattern.callback = decorator(pattern.callback)

    process_patterns(url_list)
--- a/allianceauth/authentication/forms.py
+++ b/allianceauth/authentication/forms.py
@@ -1,66 +1,8 @@
 from django import forms
-from django.contrib.auth.forms import UserChangeForm as BaseUserChangeForm
-from django.contrib.auth.models import Group
-from django.core.exceptions import ValidationError
-from django.forms import ModelForm
-from django.utils.translation import gettext_lazy as _
-
+from django.utils.translation import ugettext_lazy as _
 from allianceauth.authentication.models import User
-
-
 class RegistrationForm(forms.Form):
    email = forms.EmailField(label=_('Email'), max_length=254, required=True)

    class _meta:
        model = User
-
-
-class UserProfileForm(ModelForm):
-    """Allows specifying FK querysets through kwarg"""
-
-    def __init__(self, querysets=None, *args, **kwargs):
-        querysets = querysets or {}
-        super().__init__(*args, **kwargs)
-        for field, qs in querysets.items():
-            self.fields[field].queryset = qs
-
-
-class UserChangeForm(BaseUserChangeForm):
-    """Add custom cleaning to UserChangeForm"""
-
-    def __init__(self, *args, **kwargs):
-        self.request = kwargs.pop("request")  # Inject current request into form object
-        super().__init__(*args, **kwargs)
-
-    def clean(self):
-        cleaned_data = super().clean()
-        if not self.request.user.is_superuser:
-            if self.instance:
-                current_restricted = set(
-                    self.instance.groups.filter(
-                        authgroup__restricted=True
-                    ).values_list("pk", flat=True)
-                )
-            else:
-                current_restricted = set()
-            new_restricted = set(
-                cleaned_data["groups"].filter(
-                    authgroup__restricted=True
-                ).values_list("pk", flat=True)
-            )
-            if current_restricted != new_restricted:
-                restricted_removed = current_restricted - new_restricted
-                restricted_added = new_restricted - current_restricted
-                restricted_changed = restricted_removed | restricted_added
-                restricted_names_qs = Group.objects.filter(
-                    pk__in=restricted_changed
-                ).values_list("name", flat=True)
-                restricted_names = ",".join(list(restricted_names_qs))
-                raise ValidationError(
-                    {
-                        "groups": _(
-                            "You are not allowed to add or remove these "
-                            "restricted groups: {}".format(restricted_names)
-                        )
-                    }
-                )
--- a/allianceauth/authentication/hmac_urls.py
+++ b/allianceauth/authentication/hmac_urls.py
@@ -1,14 +1,14 @@
-from django.urls import include, path, re_path
+from django.conf.urls import url, include

 from allianceauth.authentication import views

 urlpatterns = [
-    path('activate/complete/', views.activation_complete, name='registration_activation_complete'),
+    url(r'^activate/complete/$', views.activation_complete, name='registration_activation_complete'),
    # The activation key can make use of any character from the
    # URL-safe base64 alphabet, plus the colon as a separator.
-    re_path(r'^activate/(?P<activation_key>[-:\w]+)/$', views.ActivationView.as_view(), name='registration_activate'),
-    path('register/', views.RegistrationView.as_view(), name='registration_register'),
-    path('register/complete/', views.registration_complete, name='registration_complete'),
-    path('register/closed/', views.registration_closed, name='registration_disallowed'),
-    path('', include('django.contrib.auth.urls')),
-]
+    url(r'^activate/(?P<activation_key>[-:\w]+)/$', views.ActivationView.as_view(), name='registration_activate'),
+    url(r'^register/$', views.RegistrationView.as_view(), name='registration_register'),
+    url(r'^register/complete/$', views.registration_complete, name='registration_complete'),
+    url(r'^register/closed/$', views.registration_closed, name='registration_disallowed'),
+    url(r'', include('django.contrib.auth.urls')),
+]
--- a/allianceauth/authentication/management/commands/checkmains.py
+++ b/allianceauth/authentication/management/commands/checkmains.py
@@ -1,5 +1,4 @@
 from django.core.management.base import BaseCommand
-
 from allianceauth.authentication.models import UserProfile


@@ -12,9 +11,10 @@ class Command(BaseCommand):
        if profiles.exists():
            for profile in profiles:
                self.stdout.write(self.style.ERROR(
-                    f'{profile.main_character} does not have an ownership. Resetting user {profile.user} main character.'))
+                    '{0} does not have an ownership. Resetting user {1} main character.'.format(profile.main_character,
+                                                                                                profile.user)))
                profile.main_character = None
                profile.save()
-            self.stdout.write(self.style.WARNING(f'Reset {profiles.count()} main characters.'))
+            self.stdout.write(self.style.WARNING('Reset {0} main characters.'.format(profiles.count())))
        else:
            self.stdout.write(self.style.SUCCESS('All main characters have active ownership.'))
--- a/allianceauth/authentication/managers.py
+++ b/allianceauth/authentication/managers.py
@@ -1,7 +1,7 @@
 import logging

 from django.db import transaction
-from django.db.models import Manager, Q, QuerySet
+from django.db.models import Manager, QuerySet, Q

 from allianceauth.eveonline.models import EveCharacter

@@ -16,8 +16,6 @@ def available_states_query(character):
        query |= Q(member_corporations__corporation_id=character.corporation_id)
    if character.alliance_id:
        query |= Q(member_alliances__alliance_id=character.alliance_id)
-    if character.faction_id:
-        query |= Q(member_factions__faction_id=character.faction_id)
    return query


@@ -25,7 +23,8 @@ class CharacterOwnershipManager(Manager):
    def create_by_token(self, token):
        if not EveCharacter.objects.filter(character_id=token.character_id).exists():
            EveCharacter.objects.create_character(token.character_id)
-        return self.create(character=EveCharacter.objects.get(character_id=token.character_id), user=token.user, owner_hash=token.character_owner_hash)
+        return self.create(character=EveCharacter.objects.get(character_id=token.character_id), user=token.user,
+                           owner_hash=token.character_owner_hash)


 class StateQuerySet(QuerySet):
@@ -51,7 +50,7 @@ class StateQuerySet(QuerySet):
            for state in self:
                for profile in state.userprofile_set.all():
                    profile.assign_state(state=self.model.objects.exclude(pk=state.pk).get_for_user(profile.user))
-        super().delete()
+        super(StateQuerySet, self).delete()


 class StateManager(Manager):
--- a/allianceauth/authentication/middleware.py
+++ b/allianceauth/authentication/middleware.py
@@ -1,55 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.utils.deprecation import MiddlewareMixin
-
-logger = logging.getLogger(__name__)
-
-
-class UserSettingsMiddleware(MiddlewareMixin):
-    def process_response(self, request, response):
-        """Django Middleware: User Settings."""
-
-        # Intercept the built in django /setlang/ view and also save it to Database.
-        # Note the annoymous user check, only logged in users will ever hit the DB here
-        if request.path == '/i18n/setlang/' and not request.user.is_anonymous:
-            try:
-                request.user.profile.language = request.POST['language']
-                request.user.profile.save()
-            except Exception as e:
-                logger.exception(e)
-
-        # Only act during the login flow, _after_ user is activated (step 2: post-sso)
-        elif request.path == '/sso/login' and not request.user.is_anonymous:
-            # Set the Language Cookie, if it doesnt match the DB
-            # Null = hasnt been set by the user ever, dont act.
-            try:
-                if request.user.profile.language != request.LANGUAGE_CODE and request.user.profile.language is not None:
-                    response.set_cookie(key=settings.LANGUAGE_COOKIE_NAME,
-                                        value=request.user.profile.language,
-                                        max_age=settings.LANGUAGE_COOKIE_AGE)
-            except Exception as e:
-                logger.exception(e)
-
-            # AA v3 NIGHT_MODE
-            # Set our Night mode flag from the DB
-            # Null = hasnt been set by the user ever, dont act.
-            #
-            # Night mode intercept is not needed in this middleware.
-            # is saved direct to DB in NightModeRedirectView
-            try:
-                if request.user.profile.night_mode is not None:
-                    request.session["NIGHT_MODE"] = request.user.profile.night_mode
-            except Exception as e:
-                logger.exception(e)
-
-            # AA v4 Themes
-            # Null = has not been set by the user ever, dont act
-            # DEFAULT_THEME or DEFAULT_THEME_DARK will be used in get_theme()
-            try:
-                if request.user.profile.theme is not None:
-                    request.session["THEME"] = request.user.profile.theme
-            except Exception as e:
-                logger.exception(e)
-
-        return response
--- a/allianceauth/authentication/migrations/0001_initial.py
+++ b/allianceauth/authentication/migrations/0001_initial.py
@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-05 21:38
+from __future__ import unicode_literals

-import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion


 class Migration(migrations.Migration):
--- a/allianceauth/authentication/migrations/0002_auto_20160907_1914.py
+++ b/allianceauth/authentication/migrations/0002_auto_20160907_1914.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-07 19:14
+from __future__ import unicode_literals

 from django.db import migrations

--- a/allianceauth/authentication/migrations/0003_authservicesinfo_state.py
+++ b/allianceauth/authentication/migrations/0003_authservicesinfo_state.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-09 20:29
+from __future__ import unicode_literals

 from django.db import migrations, models

--- a/allianceauth/authentication/migrations/0004_create_permissions.py
+++ b/allianceauth/authentication/migrations/0004_create_permissions.py
@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-09 23:19
+from __future__ import unicode_literals

 from django.db import migrations

-
 def create_permissions(apps, schema_editor):
    User = apps.get_model('auth', 'User')
    ContentType = apps.get_model('contenttypes', 'ContentType')
--- a/allianceauth/authentication/migrations/0005_delete_perms.py
+++ b/allianceauth/authentication/migrations/0005_delete_perms.py
@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-09 23:11
+from __future__ import unicode_literals

 from django.db import migrations

-
 def delete_permissions(apps, schema_editor):
    User = apps.get_model('auth', 'User')
    ContentType = apps.get_model('contenttypes', 'ContentType')
@@ -16,7 +17,7 @@ def create_permissions(apps, schema_editor):
    Permission = apps.get_model('auth', 'Permission')
    ct = ContentType.objects.get_for_model(User)
    Permission.objects.get_or_create(codename="member", content_type=ct, name="member")
-    Permission.objects.get_or_create(codename="blue_member", content_type=ct, name="blue_member")
+    Permission.objects.get_or_create(codename="blue_member", content_type=ct, name="blue_member") 


 class Migration(migrations.Migration):
--- a/allianceauth/authentication/migrations/0006_auto_20160910_0542.py
+++ b/allianceauth/authentication/migrations/0006_auto_20160910_0542.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-10 05:42
+from __future__ import unicode_literals

 from django.db import migrations

--- a/allianceauth/authentication/migrations/0007_remove_authservicesinfo_is_blue.py
+++ b/allianceauth/authentication/migrations/0007_remove_authservicesinfo_is_blue.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-10 21:50
+from __future__ import unicode_literals

 from django.db import migrations

--- a/allianceauth/authentication/migrations/0008_set_state.py
+++ b/allianceauth/authentication/migrations/0008_set_state.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-12 13:04
+from __future__ import unicode_literals

 from django.db import migrations

--- a/allianceauth/authentication/migrations/0009_auto_20161021_0228.py
+++ b/allianceauth/authentication/migrations/0009_auto_20161021_0228.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.2 on 2016-10-21 02:28
+from __future__ import unicode_literals

 from django.db import migrations, models

--- a/allianceauth/authentication/migrations/0010_only_one_authservicesinfo.py
+++ b/allianceauth/authentication/migrations/0010_only_one_authservicesinfo.py
@@ -1,15 +1,16 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2017-01-07 06:47
+from __future__ import unicode_literals

 from django.db import migrations

-
 def count_completed_fields(model):
    return len([True for key, value in model.__dict__.items() if bool(value)])

 def forward(apps, schema_editor):
    # this ensures only one model exists per user
    AuthServicesInfo = apps.get_model('authentication', 'AuthServicesInfo')
-    users = {a.user for a in AuthServicesInfo.objects.all()}
+    users = set([a.user for a in AuthServicesInfo.objects.all()])
    for u in users:
        auths = AuthServicesInfo.objects.filter(user=u)
        if auths.count() > 1:
--- a/allianceauth/authentication/migrations/0011_authservicesinfo_user_onetoonefield.py
+++ b/allianceauth/authentication/migrations/0011_authservicesinfo_user_onetoonefield.py
@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2017-01-07 07:11
+from __future__ import unicode_literals

-import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion


 class Migration(migrations.Migration):
--- a/allianceauth/authentication/migrations/0012_remove_add_delete_authservicesinfo_permissions.py
+++ b/allianceauth/authentication/migrations/0012_remove_add_delete_authservicesinfo_permissions.py
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-01-12 00:59
+from __future__ import unicode_literals

-from django.db import migrations
-
+from django.db import migrations, models

 def remove_permissions(apps, schema_editor):
    ContentType = apps.get_model('contenttypes', 'ContentType')
--- a/allianceauth/authentication/migrations/0013_service_modules.py
+++ b/allianceauth/authentication/migrations/0013_service_modules.py
@@ -1,9 +1,11 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.2 on 2016-12-11 23:14
-
-import logging
+from __future__ import unicode_literals

 from django.db import migrations

+import logging
+
 logger = logging.getLogger(__name__)


--- a/allianceauth/authentication/migrations/0014_fleetup_permission.py
+++ b/allianceauth/authentication/migrations/0014_fleetup_permission.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.1 on 2016-09-09 23:19
+from __future__ import unicode_literals

 from django.db import migrations

--- a/allianceauth/authentication/migrations/0015_user_profiles.py
+++ b/allianceauth/authentication/migrations/0015_user_profiles.py
@@ -1,12 +1,13 @@
+# -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-03-22 23:09
+from __future__ import unicode_literals

+import allianceauth.authentication.models
 import django.db.models.deletion
 from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.db import migrations, models

-import allianceauth.authentication.models
-

 def create_guest_state(apps, schema_editor):
    State = apps.get_model('authentication', 'State')
@@ -106,8 +107,8 @@ def populate_ownerships(apps, schema_editor):
    EveCharacter = apps.get_model('eveonline', 'EveCharacter')

    unique_character_owners = [t['character_id'] for t in
-                                Token.objects.all().values('character_id').annotate(n=models.Count('user')) if
-                                t['n'] == 1 and EveCharacter.objects.filter(character_id=t['character_id']).exists()]
+                               Token.objects.all().values('character_id').annotate(n=models.Count('user')) if
+                               t['n'] == 1 and EveCharacter.objects.filter(character_id=t['character_id']).exists()]

    tokens = Token.objects.filter(character_id__in=unique_character_owners)
    for c_id in unique_character_owners:
@@ -170,7 +171,8 @@ def recreate_authservicesinfo(apps, schema_editor):

    # repopulate main characters
    for profile in UserProfile.objects.exclude(main_character__isnull=True).select_related('user', 'main_character'):
-        AuthServicesInfo.objects.update_or_create(user=profile.user, defaults={'main_char_id': profile.main_character.character_id})
+        AuthServicesInfo.objects.update_or_create(user=profile.user,
+                                                  defaults={'main_char_id': profile.main_character.character_id})

    # repopulate states we understand
    for profile in UserProfile.objects.exclude(state__name='Guest').filter(
--- a/allianceauth/authentication/migrations/0016_ownershiprecord.py
+++ b/allianceauth/authentication/migrations/0016_ownershiprecord.py
@@ -1,8 +1,8 @@
 # Generated by Django 2.0.4 on 2018-04-14 18:28

-import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion


 def create_initial_records(apps, schema_editor):
--- a/allianceauth/authentication/migrations/0017_remove_fleetup_permission.py
+++ b/allianceauth/authentication/migrations/0017_remove_fleetup_permission.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 from django.db import migrations


--- a/allianceauth/authentication/migrations/0018_alter_state_name_length.py
+++ b/allianceauth/authentication/migrations/0018_alter_state_name_length.py
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.8 on 2021-10-20 05:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0017_remove_fleetup_permission'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='state',
-            name='name',
-            field=models.CharField(max_length=32, unique=True),
-        ),
-    ]
--- a/allianceauth/authentication/migrations/0018_state_member_factions.py
+++ b/allianceauth/authentication/migrations/0018_state_member_factions.py
@@ -1,19 +0,0 @@
-# Generated by Django 3.1.13 on 2021-10-12 20:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('eveonline', '0015_factions'),
-        ('authentication', '0017_remove_fleetup_permission'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='state',
-            name='member_factions',
-            field=models.ManyToManyField(blank=True, help_text='Factions to whose members this state is available.', to='eveonline.EveFactionInfo'),
-        ),
-    ]
--- a/allianceauth/authentication/migrations/0019_merge_20211026_0919.py
+++ b/allianceauth/authentication/migrations/0019_merge_20211026_0919.py
@@ -1,14 +0,0 @@
-# Generated by Django 3.2.8 on 2021-10-26 09:19
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0018_alter_state_name_length'),
-        ('authentication', '0018_state_member_factions'),
-    ]
-
-    operations = [
-    ]
--- a/allianceauth/authentication/migrations/0020_userprofile_language_userprofile_night_mode.py
+++ b/allianceauth/authentication/migrations/0020_userprofile_language_userprofile_night_mode.py
@@ -1,23 +0,0 @@
-# Generated by Django 4.0.2 on 2022-02-26 03:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0019_merge_20211026_0919'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='userprofile',
-            name='language',
-            field=models.CharField(blank=True, choices=[('en', 'English'), ('de', 'German'), ('es', 'Spanish'), ('zh-hans', 'Chinese Simplified'), ('ru', 'Russian'), ('ko', 'Korean'), ('fr', 'French'), ('ja', 'Japanese'), ('it', 'Italian')], default='', max_length=10, verbose_name='Language'),
-        ),
-        migrations.AddField(
-            model_name='userprofile',
-            name='night_mode',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Night Mode'),
-        ),
-    ]
--- a/allianceauth/authentication/migrations/0021_alter_userprofile_language.py
+++ b/allianceauth/authentication/migrations/0021_alter_userprofile_language.py
@@ -1,34 +0,0 @@
-# Generated by Django 4.0.10 on 2023-05-28 15:36
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("authentication", "0020_userprofile_language_userprofile_night_mode"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="userprofile",
-            name="language",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("en", "English"),
-                    ("de", "German"),
-                    ("es", "Spanish"),
-                    ("zh-hans", "Chinese Simplified"),
-                    ("ru", "Russian"),
-                    ("ko", "Korean"),
-                    ("fr", "French"),
-                    ("ja", "Japanese"),
-                    ("it", "Italian"),
-                    ("uk", "Ukrainian"),
-                ],
-                default="",
-                max_length=10,
-                verbose_name="Language",
-            ),
-        ),
-    ]
--- a/allianceauth/authentication/migrations/0022_userprofile_theme.py
+++ b/allianceauth/authentication/migrations/0022_userprofile_theme.py
@@ -1,18 +0,0 @@
-# Generated by Django 4.0.10 on 2023-10-07 07:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0021_alter_userprofile_language'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='userprofile',
-            name='theme',
-            field=models.CharField(blank=True, help_text='Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps', max_length=200, null=True, verbose_name='Theme'),
-        ),
-    ]
--- a/allianceauth/authentication/migrations/0023_alter_userprofile_language.py
+++ b/allianceauth/authentication/migrations/0023_alter_userprofile_language.py
@@ -1,18 +0,0 @@
-# Generated by Django 4.2.13 on 2024-05-12 09:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0022_userprofile_theme'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='userprofile',
-            name='language',
-            field=models.CharField(blank=True, choices=[('en', 'English'), ('de', 'German'), ('es', 'Spanish'), ('zh-hans', 'Chinese Simplified'), ('ru', 'Russian'), ('ko', 'Korean'), ('fr', 'French'), ('ja', 'Japanese'), ('it', 'Italian'), ('uk', 'Ukrainian'), ('pl', 'Polish')], default='', max_length=10, verbose_name='Language'),
-        ),
-    ]
--- a/allianceauth/authentication/migrations/0024_alter_userprofile_language.py
+++ b/allianceauth/authentication/migrations/0024_alter_userprofile_language.py
@@ -1,18 +0,0 @@
-# Generated by Django 4.2 on 2024-09-13 09:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0023_alter_userprofile_language'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='userprofile',
-            name='language',
-            field=models.CharField(blank=True, choices=[('en', 'English'), ('cs-cz', 'Czech'), ('de', 'German'), ('es', 'Spanish'), ('it-it', 'Italian'), ('ja', 'Japanese'), ('ko-kr', 'Korean'), ('fr-fr', 'French'), ('ru', 'Russian'), ('nl-nl', 'Dutch'), ('pl-pl', 'Polish'), ('uk', 'Ukrainian'), ('zh-hans', 'Simplified Chinese')], default='', max_length=10, verbose_name='Language'),
-        ),
-    ]
--- a/allianceauth/authentication/migrations/0025_v5squash.py
+++ b/allianceauth/authentication/migrations/0025_v5squash.py
@@ -1,124 +0,0 @@
-# Generated by Django 5.1.6 on 2025-03-04 02:44
-
-import django.contrib.auth.models
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-import allianceauth.authentication.models
-
-
-def create_states(apps, schema_editor) -> None:
-    State = apps.get_model('authentication', 'State')
-
-    State.objects.update_or_create(name="Guest", defaults={'priority': 0, 'public': True})[0]
-    State.objects.update_or_create(name="Blue", defaults={'priority': 50, 'public': False})[0]
-    State.objects.update_or_create(name="Member", defaults={'priority': 100, 'public': False})[0]
-
-
-def create_states_reverse(apps, schema_editor) -> None:
-    pass
-
-
-class Migration(migrations.Migration):
-
-    replaces = [('authentication', '0001_initial'), ('authentication', '0002_auto_20160907_1914'), ('authentication', '0003_authservicesinfo_state'), ('authentication', '0004_create_permissions'), ('authentication', '0005_delete_perms'), ('authentication', '0006_auto_20160910_0542'), ('authentication', '0007_remove_authservicesinfo_is_blue'), ('authentication', '0008_set_state'), ('authentication', '0009_auto_20161021_0228'), ('authentication', '0010_only_one_authservicesinfo'), ('authentication', '0011_authservicesinfo_user_onetoonefield'), ('authentication', '0012_remove_add_delete_authservicesinfo_permissions'), ('authentication', '0013_service_modules'), ('authentication', '0014_fleetup_permission'), ('authentication', '0015_user_profiles'), ('authentication', '0016_ownershiprecord'), ('authentication', '0017_remove_fleetup_permission'), ('authentication', '0018_state_member_factions'), ('authentication', '0018_alter_state_name_length'), ('authentication', '0019_merge_20211026_0919'), ('authentication', '0020_userprofile_language_userprofile_night_mode'), ('authentication', '0021_alter_userprofile_language'), ('authentication', '0022_userprofile_theme'), ('authentication', '0023_alter_userprofile_language'), ('authentication', '0024_alter_userprofile_language')]
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('esi', '0012_fix_token_type_choices'),
-        ('eveonline', '0019_v5squash'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='CharacterOwnership',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('owner_hash', models.CharField(max_length=28, unique=True)),
-                ('character', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='character_ownership', to='eveonline.evecharacter')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='character_ownerships', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'default_permissions': ('change', 'delete'),
-                'ordering': ['user', 'character__character_name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='State',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=32, unique=True)),
-                ('priority', models.IntegerField(help_text='Users get assigned the state with the highest priority available to them.', unique=True)),
-                ('public', models.BooleanField(default=False, help_text='Make this state available to any character.')),
-                ('member_alliances', models.ManyToManyField(blank=True, help_text='Alliances to whose members this state is available.', to='eveonline.eveallianceinfo')),
-                ('member_characters', models.ManyToManyField(blank=True, help_text='Characters to which this state is available.', to='eveonline.evecharacter')),
-                ('member_corporations', models.ManyToManyField(blank=True, help_text='Corporations to whose members this state is available.', to='eveonline.evecorporationinfo')),
-                ('permissions', models.ManyToManyField(blank=True, to='auth.permission')),
-                ('member_factions', models.ManyToManyField(blank=True, help_text='Factions to whose members this state is available.', to='eveonline.evefactioninfo')),
-            ],
-            options={
-                'ordering': ['-priority'],
-            },
-        ),
-        migrations.CreateModel(
-            name='UserProfile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('main_character', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.evecharacter')),
-                ('state', models.ForeignKey(default=allianceauth.authentication.models.get_guest_state_pk, on_delete=django.db.models.deletion.SET_DEFAULT, to='authentication.state')),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)),
-                ('night_mode', models.BooleanField(blank=True, null=True, verbose_name='Night Mode')),
-                ('theme', models.CharField(blank=True, help_text='Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps', max_length=200, null=True, verbose_name='Theme')),
-                ('language', models.CharField(blank=True, choices=[('en', 'English'), ('cs-cz', 'Czech'), ('de', 'German'), ('es', 'Spanish'), ('it-it', 'Italian'), ('ja', 'Japanese'), ('ko-kr', 'Korean'), ('fr-fr', 'French'), ('ru', 'Russian'), ('nl-nl', 'Dutch'), ('pl-pl', 'Polish'), ('uk', 'Ukrainian'), ('zh-hans', 'Simplified Chinese')], default='', max_length=10, verbose_name='Language')),
-            ],
-            options={
-                'default_permissions': ('change',),
-            },
-        ),
-        migrations.CreateModel(
-            name='Permission',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-                'verbose_name': 'permission',
-                'verbose_name_plural': 'permissions',
-            },
-            bases=('auth.permission',),
-            managers=[
-                ('objects', django.contrib.auth.models.PermissionManager()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='User',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-            },
-            bases=('auth.user',),
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='OwnershipRecord',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('owner_hash', models.CharField(db_index=True, max_length=28)),
-                ('created', models.DateTimeField(auto_now=True)),
-                ('character', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ownership_records', to='eveonline.evecharacter')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ownership_records', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'ordering': ['-created'],
-            },
-        ),
-        migrations.RunPython(create_states, create_states_reverse),
-
-    ]
--- a/allianceauth/authentication/models.py
+++ b/allianceauth/authentication/models.py
@@ -1,11 +1,9 @@
 import logging
-from typing import ClassVar

-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import User, Permission
 from django.db import models, transaction
-from django.utils.translation import gettext_lazy as _
-
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
+from django.utils.translation import ugettext_lazy as _
+from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo
 from allianceauth.notifications import notify

 from .managers import CharacterOwnershipManager, StateManager
@@ -14,32 +12,25 @@ logger = logging.getLogger(__name__)


 class State(models.Model):
-    name = models.CharField(max_length=32, unique=True)
+    name = models.CharField(max_length=20, unique=True)
    permissions = models.ManyToManyField(Permission, blank=True)
-    priority = models.IntegerField(
-        unique=True, help_text="Users get assigned the state with the highest priority available to them."
-    )
+    priority = models.IntegerField(unique=True,
+                                   help_text="Users get assigned the state with the highest priority available to them.")

-    member_characters = models.ManyToManyField(
-        EveCharacter, blank=True, help_text="Characters to which this state is available."
-    )
-    member_corporations = models.ManyToManyField(
-        EveCorporationInfo, blank=True, help_text="Corporations to whose members this state is available."
-    )
-    member_alliances = models.ManyToManyField(
-        EveAllianceInfo, blank=True, help_text="Alliances to whose members this state is available."
-    )
-    member_factions = models.ManyToManyField(
-        EveFactionInfo, blank=True, help_text="Factions to whose members this state is available."
-    )
+    member_characters = models.ManyToManyField(EveCharacter, blank=True,
+                                               help_text="Characters to which this state is available.")
+    member_corporations = models.ManyToManyField(EveCorporationInfo, blank=True,
+                                                 help_text="Corporations to whose members this state is available.")
+    member_alliances = models.ManyToManyField(EveAllianceInfo, blank=True,
+                                              help_text="Alliances 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"]
+        ordering = ['-priority']

-    def __str__(self) -> str:
+    def __str__(self):
        return self.name

    def available_to_character(self, character):
@@ -52,14 +43,14 @@ class State(models.Model):
        with transaction.atomic():
            for profile in self.userprofile_set.all():
                profile.assign_state(state=State.objects.exclude(pk=self.pk).get_for_user(profile.user))
-        super().delete(**kwargs)
+        super(State, self).delete(**kwargs)


-def get_guest_state() -> State:
+def get_guest_state():
    try:
-        return State.objects.get(name="Guest")
+        return State.objects.get(name='Guest')
    except State.DoesNotExist:
-        return State.objects.create(name="Guest", priority=0, public=True)
+        return State.objects.create(name='Guest', priority=0, public=True)


 def get_guest_state_pk():
@@ -67,92 +58,60 @@ def get_guest_state_pk():


 class UserProfile(models.Model):
-    class Language(models.TextChoices):
-        """
-        Choices for UserProfile.language
-        """
+    class Meta:
+        default_permissions = ('change',)

-        # Sorted by Language Code alphabetical order + English at top
-        ENGLISH = "en", _("English")
-        CZECH = "cs-cz", _("Czech")  # Not yet at 50% translated
-        GERMAN = "de", _("German")
-        SPANISH = "es", _("Spanish")
-        ITALIAN = "it-it", _("Italian")
-        JAPANESE = "ja", _("Japanese")
-        KOREAN = "ko-kr", _("Korean")
-        FRENCH = "fr-fr", _("French")
-        RUSSIAN = "ru", _("Russian")
-        DUTCH = "nl-nl", _("Dutch")
-        POLISH = "pl-pl", _("Polish")
-        UKRAINIAN = "uk", _("Ukrainian")
-        CHINESE = "zh-hans", _("Simplified Chinese")
-
-    user = models.OneToOneField(User, related_name="profile", on_delete=models.CASCADE)
+    user = models.OneToOneField(User, related_name='profile', on_delete=models.CASCADE)
    main_character = models.OneToOneField(EveCharacter, blank=True, null=True, on_delete=models.SET_NULL)
    state = models.ForeignKey(State, on_delete=models.SET_DEFAULT, default=get_guest_state_pk)
-    language = models.CharField(_("Language"), max_length=10, choices=Language.choices, blank=True, default="")
-    night_mode = models.BooleanField(_("Night Mode"), blank=True, null=True)
-    theme = models.CharField(  # noqa:DJ001 Null has a specific meaning, never set by user
-        _("Theme"),
-        max_length=200,
-        blank=True,
-        null=True,
-        help_text="Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps",
-    )

-    class Meta:
-        default_permissions = ("change",)
-
-    def __str__(self) -> str:
-        return str(self.user)
-
-    def assign_state(self, state=None, commit=True) -> None:
+    def assign_state(self, state=None, commit=True):
        if not state:
            state = State.objects.get_for_user(self.user)
        if self.state != state:
            self.state = state
            if commit:
-                logger.info(f"Updating {self.user} state to {self.state}")
-                self.save(update_fields=["state"])
+                logger.info('Updating {} state to {}'.format(self.user, self.state))
+                self.save(update_fields=['state'])
                notify(
-                    self.user,
-                    _(f"State changed to: {state}"),
-                    _("Your user's state is now: %(state)s") % ({"state": state}),
-                    "info",
+                    self.user, 
+                    _('State changed to: %s' % state),
+                    _('Your user\'s state is now: %(state)s')
+                    % ({'state': state}),
+                    'info'
                )
                from allianceauth.authentication.signals import state_changed
+                state_changed.send(
+                    sender=self.__class__, user=self.user, state=self.state
+                )

-                # We need to ensure we get up to date perms here as they will have just changed.
-                # Clear all attribute caches and reload the model that will get passed to the signals!
-                self.refresh_from_db()
-
-                state_changed.send(sender=self.__class__, user=self.user, state=self.state)
+    def __str__(self):
+        return str(self.user)


 class CharacterOwnership(models.Model):
-
-    character = models.OneToOneField(EveCharacter, on_delete=models.CASCADE, related_name='character_ownership')
-    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()
-
    class Meta:
        default_permissions = ('change', 'delete')
        ordering = ['user', 'character__character_name']

-    def __str__(self) -> str:
-        return f"{self.user}: {self.character}"
+    character = models.OneToOneField(EveCharacter, on_delete=models.CASCADE, related_name='character_ownership')
+    owner_hash = models.CharField(max_length=28, unique=True)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')
+
+    objects = CharacterOwnershipManager()
+
+    def __str__(self):
+        return "%s: %s" % (self.user, self.character)


 class OwnershipRecord(models.Model):
-    character = models.ForeignKey(EveCharacter, on_delete=models.CASCADE, related_name="ownership_records")
+    character = models.ForeignKey(EveCharacter, on_delete=models.CASCADE, related_name='ownership_records')
    owner_hash = models.CharField(max_length=28, db_index=True)
-    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="ownership_records")
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='ownership_records')
    created = models.DateTimeField(auto_now=True)

    class Meta:
-        ordering = ["-created"]
+        ordering = ['-created']

-    def __str__(self) -> str:
-        return f"{self.user}: {self.character} on {self.created}"
+    def __str__(self):
+        return "%s: %s on %s" % (self.user, self.character, self.created)
--- a/allianceauth/authentication/signals.py
+++ b/allianceauth/authentication/signals.py
@@ -1,19 +1,17 @@
 import logging

+from .models import CharacterOwnership, UserProfile, get_guest_state, State, OwnershipRecord
 from django.contrib.auth.models import User
 from django.db.models import Q
-from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
-from django.dispatch import Signal, receiver
-
+from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed
+from django.dispatch import receiver, Signal
 from esi.models import Token

 from allianceauth.eveonline.models import EveCharacter

-from .models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
-
 logger = logging.getLogger(__name__)

-state_changed = Signal()
+state_changed = Signal(providing_args=['user', 'state'])


 def trigger_state_check(state):
@@ -31,32 +29,27 @@ def trigger_state_check(state):
@receiver(m2m_changed, sender=State.member_characters.through)
 def state_member_characters_changed(sender, instance, action, *args, **kwargs):
    if action.startswith('post_'):
-        logger.debug(f'State {instance} member characters changed. Re-evaluating membership.')
+        logger.debug('State {} member characters changed. Re-evaluating membership.'.format(instance))
        trigger_state_check(instance)


@receiver(m2m_changed, sender=State.member_corporations.through)
 def state_member_corporations_changed(sender, instance, action, *args, **kwargs):
    if action.startswith('post_'):
-        logger.debug(f'State {instance} member corporations changed. Re-evaluating membership.')
+        logger.debug('State {} member corporations changed. Re-evaluating membership.'.format(instance))
        trigger_state_check(instance)


@receiver(m2m_changed, sender=State.member_alliances.through)
 def state_member_alliances_changed(sender, instance, action, *args, **kwargs):
    if action.startswith('post_'):
-        logger.debug(f'State {instance} member alliances changed. Re-evaluating membership.')
+        logger.debug('State {} member alliances changed. Re-evaluating membership.'.format(instance))
        trigger_state_check(instance)

-@receiver(m2m_changed, sender=State.member_factions.through)
-def state_member_factions_changed(sender, instance, action, *args, **kwargs):
-    if action.startswith('post_'):
-        logger.debug(f'State {instance} member factions changed. Re-evaluating membership.')
-        trigger_state_check(instance)

@receiver(post_save, sender=State)
 def state_saved(sender, instance, *args, **kwargs):
-    logger.debug(f'State {instance} saved. Re-evaluating membership.')
+    logger.debug('State {} saved. Re-evaluating membership.'.format(instance))
    trigger_state_check(instance)


@@ -67,22 +60,23 @@ def reassess_on_profile_save(sender, instance, created, *args, **kwargs):
    if not created:
        update_fields = kwargs.pop('update_fields', []) or []
        if 'state' not in update_fields:
-            logger.debug(f'Profile for {instance.user} saved without state change. Re-evaluating state.')
+            logger.debug('Profile for {} saved without state change. Re-evaluating state.'.format(instance.user))
            instance.assign_state()


@receiver(post_save, sender=User)
 def create_required_models(sender, instance, created, *args, **kwargs):
-    # ensure all users have our Sub-Models
+    # ensure all users have a model
    if created:
-        logger.debug(f'User {instance} created. Creating default UserProfile.')
+        logger.debug('User {} created. Creating default UserProfile.'.format(instance))
        UserProfile.objects.get_or_create(user=instance)


@receiver(post_save, sender=Token)
 def record_character_ownership(sender, instance, created, *args, **kwargs):
    if created:
-        logger.debug(f'New token for {instance.user} character {instance.character_name} saved. Evaluating ownership.')
+        logger.debug('New token for {0} character {1} saved. Evaluating ownership.'.format(instance.user,
+                                                                                           instance.character_name))
        if instance.user:
            query = Q(owner_hash=instance.character_owner_hash) & Q(user=instance.user)
        else:
@@ -91,21 +85,26 @@ def record_character_ownership(sender, instance, created, *args, **kwargs):
        CharacterOwnership.objects.filter(character__character_id=instance.character_id).exclude(query).delete()
        # create character if needed
        if EveCharacter.objects.filter(character_id=instance.character_id).exists() is False:
-            logger.debug(f'Token is for a new character. Creating model for {instance.character_name} ({instance.character_id})')
+            logger.debug('Token is for a new character. Creating model for {0} ({1})'.format(instance.character_name,
+                                                                                             instance.character_id))
            EveCharacter.objects.create_character(instance.character_id)
        char = EveCharacter.objects.get(character_id=instance.character_id)
        # check if we need to create ownership
        if instance.user and not CharacterOwnership.objects.filter(
                character__character_id=instance.character_id).exists():
-            logger.debug(f"Character {instance.character_name} is not yet owned. Assigning ownership to {instance.user}")
-            CharacterOwnership.objects.update_or_create(character=char, defaults={'owner_hash': instance.character_owner_hash, 'user': instance.user})
+            logger.debug("Character {0} is not yet owned. Assigning ownership to {1}".format(instance.character_name,
+                                                                                             instance.user))
+            CharacterOwnership.objects.update_or_create(character=char,
+                                                        defaults={'owner_hash': instance.character_owner_hash,
+                                                                  'user': instance.user})


@receiver(pre_delete, sender=CharacterOwnership)
 def validate_main_character(sender, instance, *args, **kwargs):
    try:
        if instance.user.profile.main_character == instance.character:
-            logger.info(f"Ownership of a main character {instance.character} has been revoked. Resetting {instance.user} main character.")
+            logger.info("Ownership of a main character {0} has been revoked. Resetting {1} main character.".format(
+                instance.character, instance.user))
            # clear main character as user no longer owns them
            instance.user.profile.main_character = None
            instance.user.profile.save()
@@ -117,7 +116,7 @@ def validate_main_character(sender, instance, *args, **kwargs):
@receiver(post_delete, sender=Token)
 def validate_ownership(sender, instance, *args, **kwargs):
    if not Token.objects.filter(character_owner_hash=instance.character_owner_hash).filter(refresh_token__isnull=False).exists():
-        logger.info(f"No remaining tokens to validate ownership of character {instance.character_name}. Revoking ownership.")
+        logger.info("No remaining tokens to validate ownership of character {0}. Revoking ownership.".format(instance.character_name))
        CharacterOwnership.objects.filter(owner_hash=instance.character_owner_hash).delete()


@@ -128,11 +127,11 @@ def assign_state_on_active_change(sender, instance, *args, **kwargs):
        old_instance = User.objects.get(pk=instance.pk)
        if old_instance.is_active != instance.is_active:
            if instance.is_active:
-                logger.debug(f"User {instance} has been activated. Assigning state.")
+                logger.debug("User {0} has been activated. Assigning state.".format(instance))
                instance.profile.assign_state()
            else:
                logger.debug(
-                    f"User {instance} has been deactivated. Revoking state and assigning to guest state.")
+                    "User {0} has been deactivated. Revoking state and assigning to guest state.".format(instance))
                instance.profile.state = get_guest_state()
                instance.profile.save(update_fields=['state'])

@@ -141,10 +140,10 @@ def assign_state_on_active_change(sender, instance, *args, **kwargs):
 def check_state_on_character_update(sender, instance, *args, **kwargs):
    # if this is a main character updating, check that user's state
    try:
-        logger.debug(f"Character {instance} has been saved. Assessing owner's state for changes.")
+        logger.debug("Character {0} has been saved. Assessing owner's state for changes.".format(instance))
        instance.userprofile.assign_state()
    except UserProfile.DoesNotExist:
-        logger.debug(f"Character {instance} is not a main character. No state assessment required.")
+        logger.debug("Character {0} is not a main character. No state assessment required.".format(instance))
        pass


@@ -154,7 +153,7 @@ def ownership_record_creation(sender, instance, created, *args, **kwargs):
        records = OwnershipRecord.objects.filter(owner_hash=instance.owner_hash).filter(character=instance.character)
        if records.exists():
            if records[0].user == instance.user:  # most recent record is sorted first
-                logger.debug(f"Already have ownership record of {instance.character} by user {instance.user}")
+                logger.debug("Already have ownership record of {0} by user {1}".format(instance.character, instance.user))
                return
-        logger.info(f"Character {instance.character} has a new owner {instance.user}. Creating ownership record.")
-        OwnershipRecord.objects.create(user=instance.user, character=instance.character, owner_hash=instance.owner_hash)
+        logger.info("Character {0} has a new owner {1}. Creating ownership record.".format(instance.character, instance.user))
+        OwnershipRecord.objects.create(user=instance.user, character=instance.character, owner_hash=instance.owner_hash)
--- a/allianceauth/authentication/static/allianceauth/authentication/css/admin.css
+++ b/allianceauth/authentication/static/allianceauth/authentication/css/admin.css
@@ -1,31 +0,0 @@
-/*
-CSS for allianceauth admin site
-*/
-
-/* styling for profile pic */
-.img-circle {
-    border-radius: 50%;
-}
-
-.column-user_profile_pic {
-    white-space: nowrap;
-    width: 1px;
-}
-
-/* tooltip */
-.tooltip {
-    position: relative;
-}
-
-.tooltip:hover::after {
-    background-color: rgb(255 255 204);
-    border: 1px rgb(128 128 128) solid;
-    color: rgb(0 0 0);
-    content: attr(data-tooltip);
-    left: 1em;
-    min-width: 200px;
-    padding: 8px;
-    position: absolute;
-    top: 1.1em;
-    z-index: 1;
-}
--- a/allianceauth/authentication/static/authentication/css/admin.css
+++ b/allianceauth/authentication/static/authentication/css/admin.css
@@ -0,0 +1,29 @@
+/* 
+CSS for allianceauth admin site 
+*/
+
+/* styling for profile pic */
+.img-circle { 
+    border-radius: 50%; 
+}
+.column-user_profile_pic {     
+    width: 1px;
+    white-space: nowrap;
+}
+
+/* tooltip */
+.tooltip {
+    position: relative ;
+}
+.tooltip:hover::after {
+    content: attr(data-tooltip) ;
+    position: absolute ;
+    top: 1.1em ;
+    left: 1em ;
+    min-width: 200px ;
+    border: 1px #808080 solid ;
+    padding: 8px ;
+    color: black ;
+    background-color: rgb(255, 255, 204) ;
+    z-index: 1 ;
+} 
--- a/allianceauth/authentication/static/allianceauth/authentication/img/background.jpg
+++ b/allianceauth/authentication/static/allianceauth/authentication/img/background.jpg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ariel Rin	7412675bfb	Version Bump v2.8.8	2021-10-17 09:34:41 +00:00
Joel Falknau	ad953efe77	Require Django-ESI 3.x (cherry picked from commit `98619a0eb8`)	2021-10-17 09:31:54 +00:00
				`@@ -0,0 +1 @@`
				`default_app_config = 'allianceauth.authentication.apps.AuthenticationConfig'`