diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 75f57e3b..5ffff0c7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -25,21 +25,21 @@ repos:
       - id: mixed-line-ending
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.9.1
     hooks:
       - id: ruff
-      # - id: ruff-format
+      - id: ruff-format
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        args: ["--profile=black"]
+  # - repo: https://github.com/pycqa/isort
+  #   rev: 5.13.2
+  #   hooks:
+  #     - id: isort
+  #       args: ["--profile=black"]
 
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black
+  # - repo: https://github.com/psf/black
+  #   rev: 24.4.2
+  #   hooks:
+  #     - id: black
 
   - repo: https://github.com/Riverside-Healthcare/djLint
     rev: v1.36.4
diff --git a/README.md b/README.md
index 9aca018b..879e26c9 100644
--- a/README.md
+++ b/README.md
@@ -75,4 +75,4 @@ Please see [docs/install.md](docs/install.md)
  - To translate NeoDB to more languages, please join [our project on Weblate](https://hosted.weblate.org/projects/neodb/neodb/)
 
 ## Sponsor
-If you like this project, please consider donating to [NeoDB on ko-fi](https://ko-fi.com/neodb), or our friends at [NiceDB](https://patreon.com/tertius) without whom this project won't be possible.
+If you like this project, please consider donating to [NeoDB.social on ko-fi](https://ko-fi.com/neodb), or [Takahē](https://www.patreon.com/takahe) and [NiceDB](https://patreon.com/tertius) without whom this project won't be possible.
diff --git a/catalog/admin.py b/catalog/admin.py
index 8c38f3f3..846f6b40 100644
--- a/catalog/admin.py
+++ b/catalog/admin.py
@@ -1,3 +1 @@
-from django.contrib import admin
-
 # Register your models here.
diff --git a/catalog/api.py b/catalog/api.py
index 6f667e72..38f383fd 100644
--- a/catalog/api.py
+++ b/catalog/api.py
@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Any, Callable, List, Optional, Tuple, Type
+from typing import List
 
 from django.core.cache import cache
 from django.http import HttpResponse
diff --git a/catalog/apps.py b/catalog/apps.py
index 004f317e..53f8547a 100644
--- a/catalog/apps.py
+++ b/catalog/apps.py
@@ -7,12 +7,9 @@ class CatalogConfig(AppConfig):
 
     def ready(self):
         # load key modules in proper order, make sure class inject and signal works as expected
-        from catalog import api, models, sites
         from catalog.models import init_catalog_audit_log, init_catalog_search_models
-        from journal import models as journal_models
 
         # register cron jobs
-        from catalog.jobs import DiscoverGenerator, PodcastUpdater  # isort:skip
 
         init_catalog_search_models()
         init_catalog_audit_log()
diff --git a/catalog/book/models.py b/catalog/book/models.py
index 0e8c1646..40b94e56 100644
--- a/catalog/book/models.py
+++ b/catalog/book/models.py
@@ -33,8 +33,6 @@ from catalog.common import (
     Item,
     ItemCategory,
     ItemInSchema,
-    ItemSchema,
-    ItemType,
     PrimaryLookupIdDescriptor,
     jsondata,
 )
@@ -286,7 +284,7 @@ class Edition(Item):
                         logger.warning(f"Unable to find work for {work_res}")
                 else:
                     logger.warning(
-                        f'Unable to find resource for {w["id_type"]}:{w["id_value"]}'
+                        f"Unable to find resource for {w['id_type']}:{w['id_value']}"
                     )
                     work = Work.objects.filter(
                         primary_lookup_id_type=w["id_type"],
@@ -431,7 +429,7 @@ class Work(Item):
                         logger.warning(f"Unable to find edition for {edition_res}")
                 else:
                     logger.warning(
-                        f'Unable to find resource for {e["id_type"]}:{e["id_value"]}'
+                        f"Unable to find resource for {e['id_type']}:{e['id_value']}"
                     )
                     edition = Edition.objects.filter(
                         primary_lookup_id_type=e["id_type"],
diff --git a/catalog/common/downloaders.py b/catalog/common/downloaders.py
index 38801ecf..73a14903 100644
--- a/catalog/common/downloaders.py
+++ b/catalog/common/downloaders.py
@@ -1,5 +1,4 @@
 import json
-import logging
 import re
 import time
 from io import BytesIO, StringIO
diff --git a/catalog/common/jsondata.py b/catalog/common/jsondata.py
index 4765f9b3..316ee571 100644
--- a/catalog/common/jsondata.py
+++ b/catalog/common/jsondata.py
@@ -1,20 +1,16 @@
 # pyright: reportIncompatibleMethodOverride=false
 import copy
-from base64 import b64decode, b64encode
+from base64 import b64encode
 from datetime import date, datetime
 from functools import partialmethod
 from hashlib import sha256
-from importlib import import_module
 
-import django
-import loguru
 from cryptography.fernet import Fernet, MultiFernet
 from django.conf import settings
 from django.core.exceptions import FieldError
 from django.db.models import DEFERRED, fields  # type:ignore
 from django.utils import dateparse, timezone
 from django.utils.encoding import force_bytes
-from django.utils.translation import gettext_lazy as _
 from django_jsonform.forms.fields import JSONFormField as DJANGO_JSONFormField
 
 # from django.db.models import JSONField as DJANGO_JSONField
@@ -22,7 +18,6 @@ from django_jsonform.forms.fields import JSONFormField as DJANGO_JSONFormField
 # from django.contrib.postgres.fields import ArrayField as DJANGO_ArrayField
 from django_jsonform.models.fields import ArrayField as DJANGO_ArrayField
 from django_jsonform.models.fields import JSONField as DJANGO_JSONField
-from loguru import logger
 
 
 class Patched_DJANGO_JSONField(DJANGO_JSONField):
diff --git a/catalog/common/models.py b/catalog/common/models.py
index 82380136..bbe32826 100644
--- a/catalog/common/models.py
+++ b/catalog/common/models.py
@@ -1,19 +1,17 @@
 import re
 import uuid
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Iterable, Self, Sequence, Type, cast
+from typing import TYPE_CHECKING, Any, Self
 
 from auditlog.context import disable_auditlog
-from auditlog.models import AuditlogHistoryField, LogEntry
+from auditlog.models import LogEntry
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.signing import b62_decode, b62_encode
 from django.db import connection, models
-from django.db.models import QuerySet, Value
-from django.template.defaultfilters import default
+from django.db.models import QuerySet
 from django.utils import timezone
-from django.utils.translation import get_language
 from django.utils.translation import gettext_lazy as _
 from loguru import logger
 from ninja import Field, Schema
@@ -72,36 +70,24 @@ class IdType(models.TextChoices):
     IMDB = "imdb", _("IMDb")  # type:ignore[reportCallIssue]
     TMDB_TV = "tmdb_tv", _("TMDB TV Serie")  # type:ignore[reportCallIssue]
     TMDB_TVSeason = "tmdb_tvseason", _("TMDB TV Season")  # type:ignore[reportCallIssue]
-    TMDB_TVEpisode = "tmdb_tvepisode", _(
-        "TMDB TV Episode"
-    )  # type:ignore[reportCallIssue]
+    TMDB_TVEpisode = "tmdb_tvepisode", _("TMDB TV Episode")  # type:ignore[reportCallIssue]
     TMDB_Movie = "tmdb_movie", _("TMDB Movie")  # type:ignore[reportCallIssue]
     Goodreads = "goodreads", _("Goodreads")  # type:ignore[reportCallIssue]
-    Goodreads_Work = "goodreads_work", _(
-        "Goodreads Work"
-    )  # type:ignore[reportCallIssue]
+    Goodreads_Work = "goodreads_work", _("Goodreads Work")  # type:ignore[reportCallIssue]
     GoogleBooks = "googlebooks", _("Google Books")  # type:ignore[reportCallIssue]
     DoubanBook = "doubanbook", _("Douban Book")  # type:ignore[reportCallIssue]
-    DoubanBook_Work = "doubanbook_work", _(
-        "Douban Book Work"
-    )  # type:ignore[reportCallIssue]
+    DoubanBook_Work = "doubanbook_work", _("Douban Book Work")  # type:ignore[reportCallIssue]
     DoubanMovie = "doubanmovie", _("Douban Movie")  # type:ignore[reportCallIssue]
     DoubanMusic = "doubanmusic", _("Douban Music")  # type:ignore[reportCallIssue]
     DoubanGame = "doubangame", _("Douban Game")  # type:ignore[reportCallIssue]
     DoubanDrama = "doubandrama", _("Douban Drama")  # type:ignore[reportCallIssue]
-    DoubanDramaVersion = "doubandrama_version", _(
-        "Douban Drama Version"
-    )  # type:ignore[reportCallIssue]
+    DoubanDramaVersion = "doubandrama_version", _("Douban Drama Version")  # type:ignore[reportCallIssue]
     BooksTW = "bookstw", _("BooksTW Book")  # type:ignore[reportCallIssue]
     Bandcamp = "bandcamp", _("Bandcamp")  # type:ignore[reportCallIssue]
     Spotify_Album = "spotify_album", _("Spotify Album")  # type:ignore[reportCallIssue]
     Spotify_Show = "spotify_show", _("Spotify Podcast")  # type:ignore[reportCallIssue]
-    Discogs_Release = "discogs_release", _(
-        "Discogs Release"
-    )  # type:ignore[reportCallIssue]
-    Discogs_Master = "discogs_master", _(
-        "Discogs Master"
-    )  # type:ignore[reportCallIssue]
+    Discogs_Release = "discogs_release", _("Discogs Release")  # type:ignore[reportCallIssue]
+    Discogs_Master = "discogs_master", _("Discogs Master")  # type:ignore[reportCallIssue]
     MusicBrainz = "musicbrainz", _("MusicBrainz ID")  # type:ignore[reportCallIssue]
     # DoubanBook_Author = "doubanbook_author", _("Douban Book Author")  # type:ignore[reportCallIssue]
     # DoubanCelebrity = "doubanmovie_celebrity", _("Douban Movie Celebrity")  # type:ignore[reportCallIssue]
@@ -142,13 +128,9 @@ class ItemType(models.TextChoices):
     Album = "music", _("Album")  # type:ignore[reportCallIssue]
     Game = "game", _("Game")  # type:ignore[reportCallIssue]
     Podcast = "podcast", _("Podcast Program")  # type:ignore[reportCallIssue]
-    PodcastEpisode = "podcastepisode", _(
-        "Podcast Episode"
-    )  # type:ignore[reportCallIssue]
+    PodcastEpisode = "podcastepisode", _("Podcast Episode")  # type:ignore[reportCallIssue]
     Performance = "performance", _("Performance")  # type:ignore[reportCallIssue]
-    PerformanceProduction = "production", _(
-        "Production"
-    )  # type:ignore[reportCallIssue]
+    PerformanceProduction = "production", _("Production")  # type:ignore[reportCallIssue]
     FanFic = "fanfic", _("Fanfic")  # type:ignore[reportCallIssue]
     Exhibition = "exhibition", _("Exhibition")  # type:ignore[reportCallIssue]
     Collection = "collection", _("Collection")  # type:ignore[reportCallIssue]
diff --git a/catalog/common/sites.py b/catalog/common/sites.py
index c3acee24..d56451f1 100644
--- a/catalog/common/sites.py
+++ b/catalog/common/sites.py
@@ -10,7 +10,7 @@ ResourceContent persists as an ExternalResource which may link to an Item
 import json
 import re
 from dataclasses import dataclass, field
-from typing import Any, Callable, Type, TypeVar
+from typing import Type, TypeVar
 
 import django_rq
 import requests
diff --git a/catalog/common/tests.py b/catalog/common/tests.py
index 0df16a31..ac8498d2 100644
--- a/catalog/common/tests.py
+++ b/catalog/common/tests.py
@@ -1,10 +1,6 @@
 from django.test import TestCase
 
 from common.models import (
-    LANGUAGE_CHOICES,
-    LOCALE_CHOICES,
-    SCRIPT_CHOICES,
-    SITE_DEFAULT_LANGUAGE,
     SITE_PREFERRED_LANGUAGES,
     SITE_PREFERRED_LOCALES,
     detect_language,
diff --git a/catalog/game/models.py b/catalog/game/models.py
index b6911563..28f030be 100644
--- a/catalog/game/models.py
+++ b/catalog/game/models.py
@@ -1,17 +1,14 @@
 from datetime import date
 
 from django.db import models
-from django.template.defaultfilters import default
 from django.utils.translation import gettext_lazy as _
 
 from catalog.common import (
     BaseSchema,
-    ExternalResource,
     IdType,
     Item,
     ItemCategory,
     ItemInSchema,
-    ItemSchema,
     ItemType,
     PrimaryLookupIdDescriptor,
     jsondata,
diff --git a/catalog/jobs/__init__.py b/catalog/jobs/__init__.py
index a2ebd698..b824d4b9 100644
--- a/catalog/jobs/__init__.py
+++ b/catalog/jobs/__init__.py
@@ -1,2 +1,7 @@
 from .discover import DiscoverGenerator
 from .podcast import PodcastUpdater
+
+__all__ = [
+    "DiscoverGenerator",
+    "PodcastUpdater",
+]
diff --git a/catalog/jobs/discover.py b/catalog/jobs/discover.py
index 9a18d603..5e366df8 100644
--- a/catalog/jobs/discover.py
+++ b/catalog/jobs/discover.py
@@ -7,7 +7,6 @@ from django.db.models import Count, F, Q
 from django.utils import timezone
 from loguru import logger
 
-from boofilsic.settings import MIN_MARKS_FOR_DISCOVER
 from catalog.models import *
 from common.models import SITE_PREFERRED_LOCALES, BaseJob, JobManager
 from journal.models import (
@@ -19,7 +18,6 @@ from journal.models import (
     q_item_in_category,
 )
 from takahe.utils import Takahe
-from users.models import APIdentity
 
 MAX_ITEMS_PER_PERIOD = 12
 MIN_MARKS = settings.MIN_MARKS_FOR_DISCOVER
diff --git a/catalog/jobs/podcast.py b/catalog/jobs/podcast.py
index 3b464854..f21e960a 100644
--- a/catalog/jobs/podcast.py
+++ b/catalog/jobs/podcast.py
@@ -1,6 +1,4 @@
-import pprint
 from datetime import timedelta
-from time import sleep
 
 from loguru import logger
 
@@ -30,6 +28,6 @@ class PodcastUpdater(BaseJob):
                 site = RSS(p.feed_url)
                 site.scrape_additional_data()
                 c2 = p.episodes.count()
-                logger.info(f"updated {p}, {c2-c} new episodes.")
+                logger.info(f"updated {p}, {c2 - c} new episodes.")
                 count += c2 - c
         logger.info(f"Podcasts update finished, {count} new episodes total.")
diff --git a/catalog/management/commands/cat.py b/catalog/management/commands/cat.py
index f2c13cd1..c650930a 100644
--- a/catalog/management/commands/cat.py
+++ b/catalog/management/commands/cat.py
@@ -46,4 +46,4 @@ class Command(BaseCommand):
             resource = site.scrape()
             pprint.pp(resource.metadata)
             pprint.pp(resource.lookup_ids)
-        self.stdout.write(self.style.SUCCESS(f"Done."))
+        self.stdout.write(self.style.SUCCESS("Done."))
diff --git a/catalog/management/commands/catalog.py b/catalog/management/commands/catalog.py
index a5c28bed..c37b3946 100644
--- a/catalog/management/commands/catalog.py
+++ b/catalog/management/commands/catalog.py
@@ -1,6 +1,3 @@
-import pprint
-import re
-
 from django.contrib.contenttypes.models import ContentType
 from django.core.management.base import BaseCommand
 from django.db.models import Count, F
@@ -9,7 +6,6 @@ from tqdm import tqdm
 from catalog.book.tests import uniq
 from catalog.models import *
 from common.models.lang import detect_language
-from journal.models import update_journal_for_merged_item
 
 
 class Command(BaseCommand):
@@ -49,7 +45,7 @@ class Command(BaseCommand):
             self.integrity()
         if options["localize"]:
             self.localize()
-        self.stdout.write(self.style.SUCCESS(f"Done."))
+        self.stdout.write(self.style.SUCCESS("Done."))
 
     def localize(self):
         c = Item.objects.all().count()
@@ -94,14 +90,14 @@ class Command(BaseCommand):
                 cls.objects.filter(is_deleted=True).delete()
 
     def integrity(self):
-        self.stdout.write(f"Checking circulated merge...")
+        self.stdout.write("Checking circulated merge...")
         for i in Item.objects.filter(merged_to_item=F("id")):
             self.stdout.write(f"! {i} : {i.absolute_url}?skipcheck=1")
             if self.fix:
                 i.merged_to_item = None
                 i.save()
 
-        self.stdout.write(f"Checking chained merge...")
+        self.stdout.write("Checking chained merge...")
         for i in (
             Item.objects.filter(merged_to_item__isnull=False)
             .annotate(n=Count("merged_from_items"))
@@ -113,14 +109,14 @@ class Command(BaseCommand):
                     j.merged_to_item = i.merged_to_item
                     j.save()
 
-        self.stdout.write(f"Checking deleted merge...")
+        self.stdout.write("Checking deleted merge...")
         for i in Item.objects.filter(merged_to_item__isnull=False, is_deleted=True):
             self.stdout.write(f"! {i} : {i.absolute_url}?skipcheck=1")
             if self.fix:
                 i.is_deleted = False
                 i.save()
 
-        self.stdout.write(f"Checking deleted item with external resources...")
+        self.stdout.write("Checking deleted item with external resources...")
         for i in (
             Item.objects.filter(is_deleted=True)
             .annotate(n=Count("external_resources"))
@@ -132,7 +128,7 @@ class Command(BaseCommand):
                     r.item = None
                     r.save()
 
-        self.stdout.write(f"Checking merged item with external resources...")
+        self.stdout.write("Checking merged item with external resources...")
         for i in (
             Item.objects.filter(merged_to_item__isnull=False)
             .annotate(n=Count("external_resources"))
@@ -145,7 +141,7 @@ class Command(BaseCommand):
                     r.save()
 
         tvshow_ct_id = ContentType.objects.get_for_model(TVShow).id
-        self.stdout.write(f"Checking TVShow merged to other class...")
+        self.stdout.write("Checking TVShow merged to other class...")
         for i in (
             TVShow.objects.filter(merged_to_item__isnull=False)
             .filter(merged_to_item__isnull=False)
@@ -161,7 +157,7 @@ class Command(BaseCommand):
                 if self.fix:
                     i.recast_to(i.merged_to_item.__class__)  # type:ignore
 
-        self.stdout.write(f"Checking TVSeason is child of other class...")
+        self.stdout.write("Checking TVSeason is child of other class...")
         for i in TVSeason.objects.filter(show__isnull=False).exclude(
             show__polymorphic_ctype_id=tvshow_ct_id
         ):
@@ -172,7 +168,7 @@ class Command(BaseCommand):
                 i.show = None
                 i.save()
 
-        self.stdout.write(f"Checking deleted item with child TV Season...")
+        self.stdout.write("Checking deleted item with child TV Season...")
         for i in TVSeason.objects.filter(show__is_deleted=True):
             if not i.show:
                 continue
@@ -181,7 +177,7 @@ class Command(BaseCommand):
                 i.show.is_deleted = False
                 i.show.save()
 
-        self.stdout.write(f"Checking merged item with child TV Season...")
+        self.stdout.write("Checking merged item with child TV Season...")
         for i in TVSeason.objects.filter(show__merged_to_item__isnull=False):
             if not i.show:
                 continue
diff --git a/catalog/management/commands/index.py b/catalog/management/commands/index.py
index 1a07cb59..bbcafb96 100644
--- a/catalog/management/commands/index.py
+++ b/catalog/management/commands/index.py
@@ -1,12 +1,8 @@
 import pprint
-from datetime import timedelta
 from time import sleep
-from typing import TYPE_CHECKING
 
-from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.core.paginator import Paginator
-from django.utils import timezone
 from tqdm import tqdm
 
 from catalog.models import Item
diff --git a/catalog/migrations/0001_initial_0_10.py b/catalog/migrations/0001_initial_0_10.py
index 98697371..9c8cdc08 100644
--- a/catalog/migrations/0001_initial_0_10.py
+++ b/catalog/migrations/0001_initial_0_10.py
@@ -3,7 +3,6 @@
 import uuid
 
 import django.db.models.deletion
-from django.conf import settings
 from django.db import migrations, models
 
 import catalog.common.utils
diff --git a/catalog/migrations/0011_remove_item_last_editor.py b/catalog/migrations/0011_remove_item_last_editor.py
index c5f3948e..e6ffea41 100644
--- a/catalog/migrations/0011_remove_item_last_editor.py
+++ b/catalog/migrations/0011_remove_item_last_editor.py
@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("catalog", "0010_alter_item_polymorphic_ctype"),
     ]
diff --git a/catalog/migrations/0012_alter_model_i18n.py b/catalog/migrations/0012_alter_model_i18n.py
index bae8c7b9..db7754ed 100644
--- a/catalog/migrations/0012_alter_model_i18n.py
+++ b/catalog/migrations/0012_alter_model_i18n.py
@@ -6,7 +6,6 @@ import catalog.common.utils
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("catalog", "0011_alter_externalresource_id_type_and_more"),
     ]
diff --git a/catalog/models.py b/catalog/models.py
index a32bba28..8ebca194 100644
--- a/catalog/models.py
+++ b/catalog/models.py
@@ -38,7 +38,7 @@ from .tv.models import (
     TVShowSchema,
 )
 
-from .search.models import Indexer, ExternalSearchResultItem  # isort:skip
+from .search.models import Indexer  # isort:skip
 
 
 # class Exhibition(Item):
diff --git a/catalog/movie/models.py b/catalog/movie/models.py
index bfe4b66c..db09fff4 100644
--- a/catalog/movie/models.py
+++ b/catalog/movie/models.py
@@ -3,12 +3,10 @@ from django.utils.translation import gettext_lazy as _
 
 from catalog.common import (
     BaseSchema,
-    ExternalResource,
     IdType,
     Item,
     ItemCategory,
     ItemInSchema,
-    ItemSchema,
     ItemType,
     PrimaryLookupIdDescriptor,
     jsondata,
diff --git a/catalog/music/models.py b/catalog/music/models.py
index 2fe917e3..c629d972 100644
--- a/catalog/music/models.py
+++ b/catalog/music/models.py
@@ -6,12 +6,10 @@ from django.utils.translation import pgettext_lazy
 
 from catalog.common import (
     BaseSchema,
-    ExternalResource,
     IdType,
     Item,
     ItemCategory,
     ItemInSchema,
-    ItemSchema,
     ItemType,
     PrimaryLookupIdDescriptor,
     jsondata,
diff --git a/catalog/performance/models.py b/catalog/performance/models.py
index abdc899e..11ba735d 100644
--- a/catalog/performance/models.py
+++ b/catalog/performance/models.py
@@ -391,7 +391,9 @@ class PerformanceProduction(Item):
         return (
             self.cover.url  # type:ignore
             if self.cover and self.cover != settings.DEFAULT_ITEM_COVER
-            else self.show.cover_image_url if self.show else None
+            else self.show.cover_image_url
+            if self.show
+            else None
         )
 
     def update_linked_items_from_external_resource(self, resource: ExternalResource):
diff --git a/catalog/podcast/models.py b/catalog/podcast/models.py
index cb5b426c..ed50a9ab 100644
--- a/catalog/podcast/models.py
+++ b/catalog/podcast/models.py
@@ -6,14 +6,10 @@ from ninja import Field
 
 from catalog.common import (
     BaseSchema,
-    ExternalResource,
     IdType,
     Item,
     ItemCategory,
     ItemInSchema,
-    ItemSchema,
-    ItemType,
-    PrimaryLookupIdDescriptor,
     jsondata,
 )
 from catalog.common.models import LIST_OF_ONE_PLUS_STR_SCHEMA, LanguageListField
diff --git a/catalog/podcast/tests.py b/catalog/podcast/tests.py
index 8ab25897..19b1ad58 100644
--- a/catalog/podcast/tests.py
+++ b/catalog/podcast/tests.py
@@ -62,7 +62,7 @@ class PodcastRSSFeedTestCase(TestCase):
         site = SiteManager.get_site_by_url(t_url)
         site.get_resource_ready()
         self.assertEqual(site.ready, True)
-        metadata = site.resource.metadata
+        # metadata = site.resource.metadata
         self.assertIsNotNone(site.get_item().cover.url)
         self.assertIsNotNone(site.get_item().recent_episodes[0].title)
         self.assertIsNotNone(site.get_item().recent_episodes[0].link)
@@ -74,7 +74,7 @@ class PodcastRSSFeedTestCase(TestCase):
         site = SiteManager.get_site_by_url(t_url)
         site.get_resource_ready()
         self.assertEqual(site.ready, True)
-        metadata = site.resource.metadata
+        # metadata = site.resource.metadata
         self.assertIsNotNone(site.get_item().recent_episodes[0].title)
         self.assertIsNotNone(site.get_item().recent_episodes[0].link)
         self.assertIsNotNone(site.get_item().recent_episodes[0].media_url)
diff --git a/catalog/search/external.py b/catalog/search/external.py
index 5191322a..ac52529d 100644
--- a/catalog/search/external.py
+++ b/catalog/search/external.py
@@ -1,6 +1,5 @@
 import asyncio
 import logging
-import time
 from urllib.parse import quote_plus, urlparse
 
 import httpx
@@ -90,7 +89,7 @@ class GoogleBooks:
     @classmethod
     def search(cls, q, page=1):
         results = []
-        api_url = f"https://www.googleapis.com/books/v1/volumes?country=us&q={quote_plus(q)}&startIndex={SEARCH_PAGE_SIZE*(page-1)}&maxResults={SEARCH_PAGE_SIZE}&maxAllowedMaturityRating=MATURE"
+        api_url = f"https://www.googleapis.com/books/v1/volumes?country=us&q={quote_plus(q)}&startIndex={SEARCH_PAGE_SIZE * (page - 1)}&maxResults={SEARCH_PAGE_SIZE}&maxAllowedMaturityRating=MATURE"
         try:
             j = requests.get(api_url, timeout=2).json()
             if "items" in j:
@@ -183,7 +182,7 @@ class Spotify:
     @classmethod
     def search(cls, q, page=1):
         results = []
-        api_url = f"https://api.spotify.com/v1/search?q={q}&type=album&limit={SEARCH_PAGE_SIZE}&offset={page*SEARCH_PAGE_SIZE}"
+        api_url = f"https://api.spotify.com/v1/search?q={q}&type=album&limit={SEARCH_PAGE_SIZE}&offset={page * SEARCH_PAGE_SIZE}"
         try:
             headers = {"Authorization": f"Bearer {get_spotify_token()}"}
             j = requests.get(api_url, headers=headers, timeout=2).json()
@@ -255,7 +254,7 @@ class ApplePodcast:
     @classmethod
     def search(cls, q, page=1):
         results = []
-        search_url = f"https://itunes.apple.com/search?entity=podcast&limit={page*SEARCH_PAGE_SIZE}&term={quote_plus(q)}"
+        search_url = f"https://itunes.apple.com/search?entity=podcast&limit={page * SEARCH_PAGE_SIZE}&term={quote_plus(q)}"
         try:
             r = requests.get(search_url, timeout=2).json()
             for p in r["results"][(page - 1) * SEARCH_PAGE_SIZE :]:
@@ -291,7 +290,7 @@ class IGDB:
 class Fediverse:
     @staticmethod
     async def search_task(host, q, category=None):
-        api_url = f"https://{host}/api/catalog/search?query={quote_plus(q)}{'&category='+category if category else ''}"
+        api_url = f"https://{host}/api/catalog/search?query={quote_plus(q)}{'&category=' + category if category else ''}"
         async with httpx.AsyncClient() as client:
             results = []
             try:
diff --git a/catalog/search/models.py b/catalog/search/models.py
index f6279539..68e2c99b 100644
--- a/catalog/search/models.py
+++ b/catalog/search/models.py
@@ -6,7 +6,6 @@ import django_rq
 from auditlog.context import set_actor
 from django.conf import settings
 from django.core.cache import cache
-from django.utils.translation import gettext_lazy as _
 from loguru import logger
 from rq.job import Job
 
diff --git a/catalog/search/typesense.py b/catalog/search/typesense.py
index 81ff83b4..715b1441 100644
--- a/catalog/search/typesense.py
+++ b/catalog/search/typesense.py
@@ -1,6 +1,5 @@
 import types
 from datetime import timedelta
-from pprint import pprint
 from time import sleep
 
 import django_rq
diff --git a/catalog/search/views.py b/catalog/search/views.py
index 7d471559..e7debf38 100644
--- a/catalog/search/views.py
+++ b/catalog/search/views.py
@@ -1,5 +1,4 @@
 import re
-from urllib.parse import quote
 
 import django_rq
 from django.conf import settings
@@ -7,7 +6,6 @@ from django.contrib.auth.decorators import login_required
 from django.core.cache import cache
 from django.core.exceptions import BadRequest
 from django.shortcuts import redirect, render
-from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 from rq.job import Job
@@ -162,7 +160,7 @@ def external_search(request):
     keywords = request.GET.get("q", default="").strip()
     page_number = int_(request.GET.get("page"), 1)
     items = ExternalSources.search(category, keywords, page_number) if keywords else []
-    cache_key = f"search_{category if category!='movietv' else 'movie,tv'}_{keywords}"
+    cache_key = f"search_{category if category != 'movietv' else 'movie,tv'}_{keywords}"
     dedupe_urls = cache.get(cache_key, [])
     items = [i for i in items if i.source_url not in dedupe_urls]
 
diff --git a/catalog/sites/__init__.py b/catalog/sites/__init__.py
index 28e1beaf..7688fd69 100644
--- a/catalog/sites/__init__.py
+++ b/catalog/sites/__init__.py
@@ -25,3 +25,33 @@ from .tmdb import TMDB_Movie
 from .ypshuo import Ypshuo
 
 # from .apple_podcast import ApplePodcast
+
+__all__ = [
+    "SiteManager",
+    "ArchiveOfOurOwn",
+    "AppleMusic",
+    "Bandcamp",
+    "Bangumi",
+    "BoardGameGeek",
+    "BooksTW",
+    "DiscogsMaster",
+    "DiscogsRelease",
+    "DoubanBook",
+    "DoubanDrama",
+    "DoubanGame",
+    "DoubanMovie",
+    "DoubanMusic",
+    "FediverseInstance",
+    "Goodreads",
+    "GoogleBooks",
+    "IGDB",
+    "IMDB",
+    "JJWXC",
+    "Qidian",
+    "RSS",
+    "Spotify",
+    "Steam",
+    "TMDB_Movie",
+    "Ypshuo",
+    # "ApplePodcast",
+]
diff --git a/catalog/sites/ao3.py b/catalog/sites/ao3.py
index 1e79c39c..6e5fcfca 100644
--- a/catalog/sites/ao3.py
+++ b/catalog/sites/ao3.py
@@ -1,5 +1,3 @@
-import logging
-
 from catalog.book.models import *
 from catalog.common import *
 
diff --git a/catalog/sites/apple_music.py b/catalog/sites/apple_music.py
index 3f8ca6bd..b6149138 100644
--- a/catalog/sites/apple_music.py
+++ b/catalog/sites/apple_music.py
@@ -10,7 +10,6 @@ Scraping the website directly.
 
 import json
 import logging
-from threading import local
 
 import dateparser
 
diff --git a/catalog/sites/bgg.py b/catalog/sites/bgg.py
index 50a032e7..c1c01f25 100644
--- a/catalog/sites/bgg.py
+++ b/catalog/sites/bgg.py
@@ -6,8 +6,6 @@ ref: https://boardgamegeek.com/wiki/page/BGG_XML_API2
 
 import html
 
-from langdetect import detect
-from loguru import logger
 
 from catalog.common import *
 from catalog.game.models import GameReleaseType
diff --git a/catalog/sites/bookstw.py b/catalog/sites/bookstw.py
index 6049f0f2..67b11bbb 100644
--- a/catalog/sites/bookstw.py
+++ b/catalog/sites/bookstw.py
@@ -3,7 +3,6 @@ import logging
 from catalog.book.models import *
 from catalog.book.utils import *
 from catalog.common import *
-from common.models.lang import detect_language
 
 from .douban import *
 
diff --git a/catalog/sites/discogs.py b/catalog/sites/discogs.py
index 550bb34e..5a903fa0 100644
--- a/catalog/sites/discogs.py
+++ b/catalog/sites/discogs.py
@@ -2,10 +2,8 @@
 Discogs.
 """
 
-import json
 import logging
 
-import requests
 from django.conf import settings
 
 from catalog.common import *
diff --git a/catalog/sites/douban.py b/catalog/sites/douban.py
index f228aaa2..f513e1b0 100644
--- a/catalog/sites/douban.py
+++ b/catalog/sites/douban.py
@@ -37,12 +37,10 @@ class DoubanDownloader(ProxiedDownloader):
 class DoubanSearcher:
     @classmethod
     def search(cls, cat: ItemCategory, c: str, q: str, p: int = 1):
-        url = f"https://search.douban.com/{c}/subject_search?search_text={q}&start={15*(p-1)}"
+        url = f"https://search.douban.com/{c}/subject_search?search_text={q}&start={15 * (p - 1)}"
         content = DoubanDownloader(url).download().html()
         j = json.loads(
-            content.xpath(
-                "//script[text()[contains(.,'window.__DATA__')]]/text()"
-            )[  # type:ignore
+            content.xpath("//script[text()[contains(.,'window.__DATA__')]]/text()")[  # type:ignore
                 0
             ]
             .split("window.__DATA__ = ")[1]  # type:ignore
diff --git a/catalog/sites/douban_drama.py b/catalog/sites/douban_drama.py
index 63d10141..c12022c9 100644
--- a/catalog/sites/douban_drama.py
+++ b/catalog/sites/douban_drama.py
@@ -7,7 +7,7 @@ from catalog.common import *
 from catalog.models import *
 from common.models.lang import detect_language
 
-from .douban import DoubanDownloader, DoubanSearcher
+from .douban import DoubanDownloader
 
 
 def _cache_key(url):
diff --git a/catalog/sites/douban_game.py b/catalog/sites/douban_game.py
index 0fce5479..51c34935 100644
--- a/catalog/sites/douban_game.py
+++ b/catalog/sites/douban_game.py
@@ -1,5 +1,3 @@
-import logging
-
 import dateparser
 
 from catalog.common import *
@@ -7,7 +5,7 @@ from catalog.models import *
 from common.models.lang import detect_language
 from common.models.misc import uniq
 
-from .douban import DoubanDownloader, DoubanSearcher
+from .douban import DoubanDownloader
 
 
 @SiteManager.register
diff --git a/catalog/sites/douban_movie.py b/catalog/sites/douban_movie.py
index 36ccb87a..bb0e7a8f 100644
--- a/catalog/sites/douban_movie.py
+++ b/catalog/sites/douban_movie.py
@@ -1,5 +1,5 @@
 import json
-import logging
+import re
 
 from loguru import logger
 
@@ -10,7 +10,7 @@ from common.models.lang import detect_language
 from common.models.misc import int_
 
 from .douban import DoubanDownloader, DoubanSearcher
-from .tmdb import TMDB_TV, TMDB_TVSeason, query_tmdb_tv_episode, search_tmdb_by_imdb_id
+from .tmdb import TMDB_TV, search_tmdb_by_imdb_id
 
 
 @SiteManager.register
diff --git a/catalog/sites/douban_music.py b/catalog/sites/douban_music.py
index af57ddf7..af4f41c4 100644
--- a/catalog/sites/douban_music.py
+++ b/catalog/sites/douban_music.py
@@ -1,5 +1,3 @@
-import logging
-
 import dateparser
 
 from catalog.common import *
diff --git a/catalog/sites/fedi.py b/catalog/sites/fedi.py
index 92cef330..0ea2729f 100644
--- a/catalog/sites/fedi.py
+++ b/catalog/sites/fedi.py
@@ -1,5 +1,3 @@
-import re
-
 from django.conf import settings
 from django.core.validators import URLValidator
 from loguru import logger
diff --git a/catalog/sites/goodreads.py b/catalog/sites/goodreads.py
index 891fec1d..ca5650f6 100644
--- a/catalog/sites/goodreads.py
+++ b/catalog/sites/goodreads.py
@@ -1,6 +1,5 @@
 import json
 import logging
-import re
 from datetime import datetime
 
 from django.utils.timezone import make_aware
diff --git a/catalog/sites/imdb.py b/catalog/sites/imdb.py
index d563fdd0..93c64f2a 100644
--- a/catalog/sites/imdb.py
+++ b/catalog/sites/imdb.py
@@ -1,6 +1,6 @@
 import json
 import logging
-
+import re
 from catalog.common import *
 from catalog.movie.models import *
 from catalog.tv.models import *
diff --git a/catalog/sites/qidian.py b/catalog/sites/qidian.py
index a65464d1..eaf7f3db 100644
--- a/catalog/sites/qidian.py
+++ b/catalog/sites/qidian.py
@@ -1,5 +1,3 @@
-import logging
-
 from catalog.common import *
 from catalog.models import *
 
diff --git a/catalog/sites/rss.py b/catalog/sites/rss.py
index 9456cc50..21d11cb9 100644
--- a/catalog/sites/rss.py
+++ b/catalog/sites/rss.py
@@ -7,7 +7,6 @@ import bleach
 import podcastparser
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator
 from django.utils.timezone import make_aware
 
diff --git a/catalog/sites/spotify.py b/catalog/sites/spotify.py
index 5cea0cc7..ef1456bb 100644
--- a/catalog/sites/spotify.py
+++ b/catalog/sites/spotify.py
@@ -2,7 +2,6 @@
 Spotify
 """
 
-import datetime
 import logging
 import time
 
diff --git a/catalog/sites/steam.py b/catalog/sites/steam.py
index 963434e0..ea0c9f23 100644
--- a/catalog/sites/steam.py
+++ b/catalog/sites/steam.py
@@ -1,7 +1,5 @@
 import logging
-import re
 
-import dateparser
 from django.conf import settings
 
 from catalog.common import *
diff --git a/catalog/sites/tmdb.py b/catalog/sites/tmdb.py
index 760a8155..fdc77275 100644
--- a/catalog/sites/tmdb.py
+++ b/catalog/sites/tmdb.py
@@ -242,9 +242,9 @@ class TMDB_TV(AbstractSite):
                 lambda s: {
                     "model": "TVSeason",
                     "id_type": IdType.TMDB_TVSeason,
-                    "id_value": f'{self.id_value}-{s["season_number"]}',
+                    "id_value": f"{self.id_value}-{s['season_number']}",
                     "title": s["name"],
-                    "url": f'{self.url}/season/{s["season_number"]}',
+                    "url": f"{self.url}/season/{s['season_number']}",
                 },
                 res_data["seasons"],
             )
@@ -359,7 +359,7 @@ class TMDB_TVSeason(AbstractSite):
         pd.metadata["title"] = (
             pd.metadata["title"]
             if pd.metadata.get("title")
-            else f'Season {d["season_number"]}'
+            else f"Season {d['season_number']}"
         )
         pd.metadata["episode_number_list"] = list(
             map(lambda ep: ep["episode_number"], d["episodes"])
@@ -460,7 +460,7 @@ class TMDB_TVEpisode(AbstractSite):
         pd.metadata["title"] = (
             pd.metadata["title"]
             if pd.metadata["title"]
-            else f'S{d["season_number"]} E{d["episode_number"]}'
+            else f"S{d['season_number']} E{d['episode_number']}"
         )
 
         if pd.lookup_ids.get(IdType.IMDB):
diff --git a/catalog/tv/models.py b/catalog/tv/models.py
index 0677a7d2..e5f05a96 100644
--- a/catalog/tv/models.py
+++ b/catalog/tv/models.py
@@ -25,15 +25,12 @@ For now, we follow Douban convention, but keep an eye on it in case it breaks it
 
 """
 
-import re
 from functools import cached_property
-from typing import TYPE_CHECKING, overload
+from typing import TYPE_CHECKING
 
-from auditlog.diff import ForeignKey
 from auditlog.models import QuerySet
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from typing_extensions import override
 
 from catalog.common import (
     BaseSchema,
diff --git a/catalog/tv/tests.py b/catalog/tv/tests.py
index a160ee66..940b8843 100644
--- a/catalog/tv/tests.py
+++ b/catalog/tv/tests.py
@@ -128,7 +128,7 @@ class DoubanMovieTVTestCase(TestCase):
         url = "https://movie.douban.com/subject/35597581/"
         item = SiteManager.get_site_by_url(url).get_resource_ready().item
         # disable this test to make douban data less disrupted
-        # self.assertEqual(item.imdb, "tt21599650")
+        self.assertEqual(item.imdb, "tt21599650")
 
 
 class MultiTVSitesTestCase(TestCase):
@@ -186,7 +186,7 @@ class MovieTVModelRecastTestCase(TestCase):
 
     @use_local_response
     def test_recast(self):
-        from catalog.models import Movie, TVShow
+        from catalog.models import Movie
 
         url2 = "https://www.imdb.com/title/tt0436992/"
         p2 = SiteManager.get_site_by_url(url2).get_resource_ready()
@@ -232,10 +232,10 @@ class IMDBTestCase(TestCase):
 
     @use_local_response
     def test_get_episode_list(self):
-        l = IMDB.get_episode_list("tt0436992", 4)
-        self.assertEqual(len(l), 14)
-        l = IMDB.get_episode_list("tt1205438", 4)
-        self.assertEqual(len(l), 14)
+        episodes = IMDB.get_episode_list("tt0436992", 4)
+        self.assertEqual(len(episodes), 14)
+        episodes = IMDB.get_episode_list("tt1205438", 4)
+        self.assertEqual(len(episodes), 14)
 
     @use_local_response
     def test_tvshow(self):
diff --git a/catalog/views.py b/catalog/views.py
index 661fac17..54bb61d7 100644
--- a/catalog/views.py
+++ b/catalog/views.py
@@ -22,12 +22,10 @@ from journal.models import (
     Review,
     ShelfManager,
     ShelfMember,
-    ShelfType,
     q_piece_in_home_feed_of_user,
     q_piece_visible_to_user,
 )
 from takahe.utils import Takahe
-from users.views import announcements
 
 from .forms import *
 from .models import *
diff --git a/common/api.py b/common/api.py
index ed4f75a4..d0a29c3c 100644
--- a/common/api.py
+++ b/common/api.py
@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, Optional, Tuple, Type
+from typing import Any, List
 
 from django.conf import settings
 from django.db.models import QuerySet
@@ -91,7 +91,7 @@ class PageNumberPagination(NinjaPageNumberPagination):
 
 api = NinjaAPI(
     auth=OAuthAccessTokenAuth(),
-    title=f'{settings.SITE_INFO["site_name"]} API',
+    title=f"{settings.SITE_INFO['site_name']} API",
     version="1.0.0",
     description=f"{settings.SITE_INFO['site_name']} API <hr/><a href='{settings.SITE_INFO['site_url']}'>Learn more</a>",
 )
diff --git a/common/forms.py b/common/forms.py
index a9ef67fd..a4fb06e4 100644
--- a/common/forms.py
+++ b/common/forms.py
@@ -1,12 +1,5 @@
-import json
-
-import django.contrib.postgres.forms as postgres
 from django import forms
-from django.core.exceptions import ValidationError
 from django.forms import ModelForm
-from django.utils import formats
-from django.utils.translation import gettext_lazy as _
-from markdownx.fields import MarkdownxFormField
 
 
 class NeoModelForm(ModelForm):
diff --git a/common/management/commands/cron.py b/common/management/commands/cron.py
index f1a38001..2422eae9 100644
--- a/common/management/commands/cron.py
+++ b/common/management/commands/cron.py
@@ -1,10 +1,7 @@
-import random
-from time import sleep
-
 from django.core.management.base import BaseCommand
 from loguru import logger
 
-from common.models import BaseJob, JobManager
+from common.models import JobManager
 
 # @JobManager.register
 # class DummyJob(BaseJob):
diff --git a/common/management/commands/jobs.py b/common/management/commands/jobs.py
index f911eb85..f1ab3a84 100644
--- a/common/management/commands/jobs.py
+++ b/common/management/commands/jobs.py
@@ -1,9 +1,6 @@
-import pprint
-
 import django_rq
 from django.conf import settings
 from django.core.management.base import BaseCommand
-from redis import Redis
 from rq import Queue
 from rq.job import Job
 
diff --git a/common/models/index.py b/common/models/index.py
index 784a6e4c..2ff3d550 100644
--- a/common/models/index.py
+++ b/common/models/index.py
@@ -1,12 +1,11 @@
 import re
 from functools import cached_property
 from time import sleep
-from typing import Iterable, Self, TypeVar
+from typing import Iterable, Self
 
 import typesense
 from django.conf import settings
 from loguru import logger
-from ninja import Query
 from typesense.collection import Collection
 from typesense.exceptions import ObjectNotFound
 
diff --git a/common/models/lang.py b/common/models/lang.py
index a15e1798..1f8de4e1 100644
--- a/common/models/lang.py
+++ b/common/models/lang.py
@@ -1,24 +1,24 @@
 """
-    Language support utilities
+Language support utilities
 
-    get site wide preferences:
-    SITE_DEFAULT_LANGUAGE
-    SITE_PREFERRED_LANGUAGES
-    SITE_PREFERRED_LOCALES
+get site wide preferences:
+SITE_DEFAULT_LANGUAGE
+SITE_PREFERRED_LANGUAGES
+SITE_PREFERRED_LOCALES
 
-    get available choices based on site wide preferences:
-    LANGUAGE_CHOICES
-    LOCALE_CHOICES
-    SCRIPT_CHOICES
+get available choices based on site wide preferences:
+LANGUAGE_CHOICES
+LOCALE_CHOICES
+SCRIPT_CHOICES
 
-    based on user preferences:
-    get_current_locales()
+based on user preferences:
+get_current_locales()
 
-    detect language based on text:
-    detect_language()
+detect language based on text:
+detect_language()
 
-    refereneces:
-    https://en.wikipedia.org/wiki/IETF_language_tag
+refereneces:
+https://en.wikipedia.org/wiki/IETF_language_tag
 """
 
 import re
diff --git a/common/setup.py b/common/setup.py
index 68559f6f..6fbd8e35 100644
--- a/common/setup.py
+++ b/common/setup.py
@@ -9,9 +9,7 @@ from takahe.models import Config as TakaheConfig
 from takahe.models import Domain as TakaheDomain
 from takahe.models import Identity as TakaheIdentity
 from takahe.models import Relay as TakaheRelay
-from takahe.models import User as TakaheUser
 from takahe.utils import Takahe
-from users.models import User
 
 
 class Setup:
diff --git a/common/templates/common_libs.html b/common/templates/common_libs.html
index d0412cc1..44db7091 100644
--- a/common/templates/common_libs.html
+++ b/common/templates/common_libs.html
@@ -24,19 +24,26 @@
 {% if site_color == 'azure' %}
   <link rel="stylesheet"
         href="{{ cdn_url }}/npm/@picocss/pico@2/css/pico.min.css" />
-  <style>
 {% else %}
-<link rel="stylesheet" href="{{ cdn_url }}/npm/@picocss/pico@2/css/pico.{{site_color}}.min.css" />
-<style>
+  <link rel="stylesheet"
+        href="{{ cdn_url }}/npm/@picocss/pico@2/css/pico.{{ site_color }}.min.css" />
 {% endif %}
+<style>
 :where(nav li)::before {
   float: none;
   content: " ";
 }
 </style>
-<link href="{% sass_src 'scss/neodb.scss' %}" rel="stylesheet" type="text/css" />
-<link href="{{ cdn_url }}/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css" rel="stylesheet" type="text/css">
-<link rel="search" type="application/opensearchdescription+xml" title="{{ site_name }}" href="{% static 'opensearch.xml' %}">
+<link href="{% sass_src 'scss/neodb.scss' %}"
+      rel="stylesheet"
+      type="text/css" />
+<link href="{{ cdn_url }}/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css"
+      rel="stylesheet"
+      type="text/css">
+<link rel="search"
+      type="application/opensearchdescription+xml"
+      title="{{ site_name }}"
+      href="{% static 'opensearch.xml' %}">
 <script defer>
 (function(){
   const s = localStorage.getItem("user_style");
@@ -59,8 +66,8 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-title" content="{{ site_name }}">
 {% if request.META.HTTP_HOST == site_domain %}
-<style type="text/css">.hide_unless_alter_domain{display:none;}</style>
+  <style type="text/css">.hide_unless_alter_domain{display:none;}</style>
 {% else %}
-<meta name="robots" content="noindex">
+  <meta name="robots" content="noindex">
 {% endif %}
 {{ site_head|safe }}
diff --git a/common/templatetags/duration.py b/common/templatetags/duration.py
index 3db2d2ed..18c96f21 100644
--- a/common/templatetags/duration.py
+++ b/common/templatetags/duration.py
@@ -1,4 +1,4 @@
-from datetime import date, datetime, timedelta, timezone
+from datetime import datetime
 
 from django import template
 from django.conf import settings
@@ -48,16 +48,16 @@ def naturaldelta(v: datetime | None):
     if d < 60:
         return _("just now")
     if d < 3600:
-        return f"{d//60}m"
+        return f"{d // 60}m"
     if d < 86400:
-        return f"{d//3600}h"
+        return f"{d // 3600}h"
     if d < 86400 * 14:
-        return f"{d//86400}d"
+        return f"{d // 86400}d"
     if d < 86400 * 56:
-        return f"{d//86400//7}w"
+        return f"{d // 86400 // 7}w"
     if d < 86400 * 30 * 18:
-        return f"{d//86400//30}mo"
-    return f"{d//86400//365}yr"
+        return f"{d // 86400 // 30}mo"
+    return f"{d // 86400 // 365}yr"
 
 
 @register.filter(is_safe=True)
diff --git a/common/templatetags/highlight.py b/common/templatetags/highlight.py
index fe0c8709..85121e81 100644
--- a/common/templatetags/highlight.py
+++ b/common/templatetags/highlight.py
@@ -1,5 +1,3 @@
-import re
-
 from django import template
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
@@ -31,7 +29,7 @@ def highlight(text, search):
         m = None
         for w in words:
             if otext[i : i + len(w)] == w:
-                m = f"<mark>{text[i:i+len(w)]}</mark>"
+                m = f"<mark>{text[i : i + len(w)]}</mark>"
                 i += len(w)
                 break
         if not m:
diff --git a/common/utils.py b/common/utils.py
index 619871bf..729c9c5f 100644
--- a/common/utils.py
+++ b/common/utils.py
@@ -5,10 +5,9 @@ from typing import TYPE_CHECKING
 import django_rq
 from discord import SyncWebhook
 from django.conf import settings
-from django.conf.locale import LANG_INFO
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.core.paginator import Paginator
-from django.core.signing import b62_decode, b62_encode
+from django.core.signing import b62_decode
 from django.http import Http404, HttpRequest, HttpResponseRedirect, QueryDict
 from django.utils import timezone
 from django.utils.translation import gettext as _
diff --git a/journal/admin.py b/journal/admin.py
index 8c38f3f3..846f6b40 100644
--- a/journal/admin.py
+++ b/journal/admin.py
@@ -1,3 +1 @@
-from django.contrib import admin
-
 # Register your models here.
diff --git a/journal/api.py b/journal/api.py
index d6a8d340..1b5ad088 100644
--- a/journal/api.py
+++ b/journal/api.py
@@ -14,7 +14,6 @@ from .models import (
     Review,
     ShelfType,
     Tag,
-    TagManager,
     q_item_in_category,
 )
 
diff --git a/journal/apps.py b/journal/apps.py
index 4f5a6268..4e02ed4f 100644
--- a/journal/apps.py
+++ b/journal/apps.py
@@ -9,7 +9,6 @@ class JournalConfig(AppConfig):
         # load key modules in proper order, make sure class inject and signal works as expected
         from catalog.models import Indexer
 
-        from . import api
         from .models import Rating, Tag
 
         Indexer.register_list_model(Tag)
diff --git a/journal/importers/douban.py b/journal/importers/douban.py
index d7975fc9..1157671c 100644
--- a/journal/importers/douban.py
+++ b/journal/importers/douban.py
@@ -35,7 +35,7 @@ def _fetch_remote_image(url):
         # logger.info(f'remote image saved as {local_url}')
         return local_url
     except Exception as e:
-        logger.error(f"unable to fetch image", extra={"url": url, "exception": e})
+        logger.error("unable to fetch image", extra={"url": url, "exception": e})
         return url
 
 
@@ -140,7 +140,7 @@ class DoubanImporter(Task):
                     timestamp
                     - (
                         datetime.strptime(c[1], "%Y-%m-%d %H:%M:%S")
-                        if type(c[1]) == str
+                        if isinstance(c[1], str)
                         else c[1]
                     ).replace(tzinfo=_tz_sh)
                 )
@@ -161,7 +161,7 @@ class DoubanImporter(Task):
             self.import_review_sheet(self.review_data[name], name)
         self.message = f"豆瓣标记和评论导入完成，共处理{self.metadata['total']}篇，已存在{self.metadata['skipped']}篇，新增{self.metadata['imported']}篇。"
         if len(self.metadata["failed_urls"]) > 0:
-            self.message += f'导入时未能处理{len(self.metadata["failed_urls"])}个网址。'
+            self.message += f"导入时未能处理{len(self.metadata['failed_urls'])}个网址。"
         self.save()
 
     def import_mark_sheet(self, worksheet, shelf_type, sheet_name):
@@ -188,7 +188,7 @@ class DoubanImporter(Task):
             comment = cells[7] if len(cells) >= 8 else None
             self.metadata["processed"] += 1
             try:
-                if type(time) == str:
+                if isinstance(time, str):
                     time = datetime.strptime(time, "%Y-%m-%d %H:%M:%S")
                 time = time.replace(tzinfo=_tz_sh)
             except Exception:
@@ -248,7 +248,7 @@ class DoubanImporter(Task):
             content = cells[6]
             self.metadata["processed"] += 1
             if time:
-                if type(time) == str:
+                if isinstance(time, str):
                     time = datetime.strptime(time, "%Y-%m-%d %H:%M:%S")
                 time = time.replace(tzinfo=_tz_sh)
             else:
@@ -271,7 +271,7 @@ class DoubanImporter(Task):
     def get_item_by_url(self, url):
         item = None
         if not url:
-            logger.warning(f"URL empty")
+            logger.warning("URL empty")
             return None
         try:
             site = SiteManager.get_site_by_url(url)
diff --git a/journal/importers/goodreads.py b/journal/importers/goodreads.py
index 7a68b362..49faaa8e 100644
--- a/journal/importers/goodreads.py
+++ b/journal/importers/goodreads.py
@@ -75,7 +75,7 @@ class GoodreadsImporter(Task):
                     collection.append_item(book["book"], note=book["review"])
                     total += 1
                 collection.save()
-            self.message = f'Imported {total} books from Goodreads as a Collection {shelf["title"]}.'
+            self.message = f"Imported {total} books from Goodreads as a Collection {shelf['title']}."
         elif match_profile:
             uid = match_profile[1]
             shelves = {
@@ -103,7 +103,7 @@ class GoodreadsImporter(Task):
                         )
                     ):
                         print(
-                            f'Skip {shelf_type}/{book["book"]} bc it was marked {mark.shelf_type}'
+                            f"Skip {shelf_type}/{book['book']} bc it was marked {mark.shelf_type}"
                         )
                     else:
                         mark.update(
diff --git a/journal/management/commands/collection.py b/journal/management/commands/collection.py
index 652d0570..50bfcc67 100644
--- a/journal/management/commands/collection.py
+++ b/journal/management/commands/collection.py
@@ -28,13 +28,13 @@ class Command(BaseCommand):
         if options["export"]:
             self.process_export(options["export"])
 
-        self.stderr.write(self.style.SUCCESS(f"Done."))
+        self.stderr.write(self.style.SUCCESS("Done."))
 
     def process_export(self, collection_uuid):
         try:
             collection = Collection.objects.get(uid=get_uuid_or_404(collection_uuid))
         except Collection.DoesNotExist:
-            self.stderr.write(self.style.ERROR(f"Collection not found."))
+            self.stderr.write(self.style.ERROR("Collection not found."))
             return
         self.stderr.write(self.style.SUCCESS(f"Exporting {collection}"))
         data = {
diff --git a/journal/management/commands/journal.py b/journal/management/commands/journal.py
index 2cc781ac..76800bda 100644
--- a/journal/management/commands/journal.py
+++ b/journal/management/commands/journal.py
@@ -99,12 +99,12 @@ class Command(BaseCommand):
         )
 
     def integrity(self):
-        self.stdout.write(f"Checking deleted items with remaining journals...")
+        self.stdout.write("Checking deleted items with remaining journals...")
         for i in Item.objects.filter(is_deleted=True):
             if i.journal_exists():
                 self.stdout.write(f"! {i} : {i.absolute_url}?skipcheck=1")
 
-        self.stdout.write(f"Checking merged items with remaining journals...")
+        self.stdout.write("Checking merged items with remaining journals...")
         for i in Item.objects.filter(merged_to_item__isnull=False):
             if i.journal_exists():
                 self.stdout.write(f"! {i} : {i.absolute_url}?skipcheck=1")
@@ -143,14 +143,14 @@ class Command(BaseCommand):
         match action:
             case "integrity":
                 self.integrity()
-                self.stdout.write(self.style.SUCCESS(f"Done."))
+                self.stdout.write(self.style.SUCCESS("Done."))
 
             case "purge":
                 for pcls in [Content, ListMember]:
                     for cls in pcls.__subclasses__():
                         self.stdout.write(f"Cleaning up {cls}...")
                         cls.objects.filter(visibility=99).delete()
-                self.stdout.write(self.style.SUCCESS(f"Done."))
+                self.stdout.write(self.style.SUCCESS("Done."))
 
             case "idx-destroy":
                 if yes or input(_CONFIRM).upper().startswith("Y"):
diff --git a/journal/management/commands/top10.py b/journal/management/commands/top10.py
index 2a07fc4d..185fb722 100644
--- a/journal/management/commands/top10.py
+++ b/journal/management/commands/top10.py
@@ -1,6 +1,6 @@
 from auditlog.context import set_actor
 from django.core.management.base import BaseCommand
-from django.db.models import Count, F, Q
+from django.db.models import Count
 from django.utils.translation import gettext_lazy as t
 
 from catalog.models import *
diff --git a/journal/migrations/0016_piecepost_piece_posts_piecepost_unique_piece_post.py b/journal/migrations/0016_piecepost_piece_posts_piecepost_unique_piece_post.py
index 50ab1043..82a91b65 100644
--- a/journal/migrations/0016_piecepost_piece_posts_piecepost_unique_piece_post.py
+++ b/journal/migrations/0016_piecepost_piece_posts_piecepost_unique_piece_post.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("takahe", "0001_initial"),
         ("journal", "0015_use_identity_support_remote_piece"),
diff --git a/journal/migrations/0017_alter_piece_options_and_more.py b/journal/migrations/0017_alter_piece_options_and_more.py
index b9411324..62a78b43 100644
--- a/journal/migrations/0017_alter_piece_options_and_more.py
+++ b/journal/migrations/0017_alter_piece_options_and_more.py
@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("journal", "0016_piecepost_piece_posts_piecepost_unique_piece_post"),
     ]
diff --git a/journal/migrations/0018_shelflogentrypost_shelflogentry_posts_and_more.py b/journal/migrations/0018_shelflogentrypost_shelflogentry_posts_and_more.py
index d71bddce..4bd21191 100644
--- a/journal/migrations/0018_shelflogentrypost_shelflogentry_posts_and_more.py
+++ b/journal/migrations/0018_shelflogentrypost_shelflogentry_posts_and_more.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("takahe", "0001_initial"),
         ("journal", "0017_alter_piece_options_and_more"),
diff --git a/journal/migrations/0019_alter_collection_edited_time_and_more.py b/journal/migrations/0019_alter_collection_edited_time_and_more.py
index 8d457011..4e0b6b73 100644
--- a/journal/migrations/0019_alter_collection_edited_time_and_more.py
+++ b/journal/migrations/0019_alter_collection_edited_time_and_more.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("journal", "0018_shelflogentrypost_shelflogentry_posts_and_more"),
     ]
diff --git a/journal/migrations/0020_shelflogentry_unique_shelf_log_entry.py b/journal/migrations/0020_shelflogentry_unique_shelf_log_entry.py
index 86256a00..0a2ee08c 100644
--- a/journal/migrations/0020_shelflogentry_unique_shelf_log_entry.py
+++ b/journal/migrations/0020_shelflogentry_unique_shelf_log_entry.py
@@ -12,7 +12,6 @@ WHERE a.ctid < b.ctid
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("journal", "0019_alter_collection_edited_time_and_more"),
     ]
diff --git a/journal/migrations/0022_letterboxdimporter.py b/journal/migrations/0022_letterboxdimporter.py
index 9027671c..6533774e 100644
--- a/journal/migrations/0022_letterboxdimporter.py
+++ b/journal/migrations/0022_letterboxdimporter.py
@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0019_task"),
         ("journal", "0021_pieceinteraction_pieceinteraction_unique_interaction"),
diff --git a/journal/migrations/0024_i18n.py b/journal/migrations/0024_i18n.py
index caabb0e6..6149edb5 100644
--- a/journal/migrations/0024_i18n.py
+++ b/journal/migrations/0024_i18n.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("journal", "0023_debris"),
     ]
diff --git a/journal/migrations/0026_pinned_tag_index.py b/journal/migrations/0026_pinned_tag_index.py
index b9c7231e..2d3811f1 100644
--- a/journal/migrations/0026_pinned_tag_index.py
+++ b/journal/migrations/0026_pinned_tag_index.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("journal", "0025_pin_tags"),
     ]
diff --git a/journal/models/__init__.py b/journal/models/__init__.py
index 914b78eb..1c55698d 100644
--- a/journal/models/__init__.py
+++ b/journal/models/__init__.py
@@ -33,6 +33,7 @@ from .utils import (
 __all__ = [
     "Collection",
     "CollectionMember",
+    "Content",
     "FeaturedCollection",
     "Comment",
     "JournalIndex",
diff --git a/journal/models/collection.py b/journal/models/collection.py
index 1f4c4cdf..32c61bd0 100644
--- a/journal/models/collection.py
+++ b/journal/models/collection.py
@@ -105,8 +105,6 @@ class Collection(List):
         )
 
     def save(self, *args, **kwargs):
-        from takahe.utils import Takahe
-
         if getattr(self, "catalog_item", None) is None:
             self.catalog_item = CatalogCollection()
         if (
diff --git a/journal/models/itemlist.py b/journal/models/itemlist.py
index a29c815e..1f2654dc 100644
--- a/journal/models/itemlist.py
+++ b/journal/models/itemlist.py
@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import TYPE_CHECKING, Self
+from typing import TYPE_CHECKING
 
 import django.dispatch
 from django.db import models
diff --git a/journal/models/like.py b/journal/models/like.py
index 9e669e55..8580868d 100644
--- a/journal/models/like.py
+++ b/journal/models/like.py
@@ -1,7 +1,6 @@
 from django.contrib.contenttypes.models import ContentType
-from django.db import connection, models
+from django.db import models
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
 
 from users.models import APIdentity
 
diff --git a/journal/models/note.py b/journal/models/note.py
index 5cbfd5a2..21dbb2e8 100644
--- a/journal/models/note.py
+++ b/journal/models/note.py
@@ -2,13 +2,10 @@ import re
 from functools import cached_property
 from typing import Any, override
 
-from deepmerge import always_merger
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from loguru import logger
 
 from catalog.models import Item
-from takahe.utils import Takahe
 
 from .common import Content
 from .renderers import render_text
diff --git a/journal/models/rating.py b/journal/models/rating.py
index 6482b037..eefc1ba1 100644
--- a/journal/models/rating.py
+++ b/journal/models/rating.py
@@ -3,8 +3,7 @@ from typing import Any
 
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import Avg, Count, Q
-from django.utils.translation import gettext_lazy as _
+from django.db.models import Avg, Count
 
 from catalog.models import Item
 from takahe.utils import Takahe
diff --git a/journal/models/shelf.py b/journal/models/shelf.py
index a128c0ec..0a4b88e1 100644
--- a/journal/models/shelf.py
+++ b/journal/models/shelf.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, override
+from typing import TYPE_CHECKING, Any
 
 from django.conf import settings
 from django.db import connection, models
diff --git a/journal/models/tag.py b/journal/models/tag.py
index 8d236f48..782e728d 100644
--- a/journal/models/tag.py
+++ b/journal/models/tag.py
@@ -1,15 +1,12 @@
 import re
 from datetime import timedelta
-from functools import cached_property
 from typing import TYPE_CHECKING
 
-from django.core.validators import MaxValueValidator, MinValueValidator, RegexValidator
-from django.db import connection, models
-from django.db.models import Avg, Count, F, Q
+from django.core.validators import RegexValidator
+from django.db import models
+from django.db.models import Count, F
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
 
-from catalog.collection.models import Collection as CatalogCollection
 from catalog.models import Item
 from users.models import APIdentity
 
diff --git a/journal/models/utils.py b/journal/models/utils.py
index 0df7f064..2faf9f24 100644
--- a/journal/models/utils.py
+++ b/journal/models/utils.py
@@ -1,7 +1,6 @@
 from auditlog.context import set_actor
 from django.db import transaction
 from django.db.utils import IntegrityError
-from django.utils.translation import gettext_lazy as _
 from loguru import logger
 
 from catalog.models import Item
diff --git a/journal/templatetags/collection.py b/journal/templatetags/collection.py
index 28fe16df..ca9aa121 100644
--- a/journal/templatetags/collection.py
+++ b/journal/templatetags/collection.py
@@ -1,5 +1,4 @@
 from django import template
-from django.template.defaultfilters import stringfilter
 from django.utils.translation import ngettext
 
 from journal.models import Collection
diff --git a/journal/templatetags/user_actions.py b/journal/templatetags/user_actions.py
index f269efca..ca20aa73 100644
--- a/journal/templatetags/user_actions.py
+++ b/journal/templatetags/user_actions.py
@@ -1,8 +1,6 @@
 from django import template
-from django.urls import reverse
 
 from journal.models.mark import Mark
-from takahe.utils import Takahe
 
 register = template.Library()
 
diff --git a/journal/views/__init__.py b/journal/views/__init__.py
index dead2026..c9afc8de 100644
--- a/journal/views/__init__.py
+++ b/journal/views/__init__.py
@@ -32,3 +32,48 @@ from .review import ReviewFeed, review_edit, review_retrieve, user_review_list
 from .search import search
 from .tag import user_tag_edit, user_tag_list, user_tag_member_list
 from .wrapped import WrappedShareView, WrappedView
+
+
+__all__ = [
+    "add_to_collection",
+    "collection_add_featured",
+    "collection_append_item",
+    "collection_edit",
+    "collection_move_item",
+    "collection_remove_featured",
+    "collection_remove_item",
+    "collection_retrieve",
+    "collection_retrieve_items",
+    "collection_retrieve_redirect",
+    "collection_share",
+    "collection_update_item_note",
+    "collection_update_member_order",
+    "user_collection_list",
+    "user_liked_collection_list",
+    "piece_delete",
+    "comment",
+    "mark",
+    "mark_log",
+    "user_mark_list",
+    "wish",
+    "note_edit",
+    "piece_replies",
+    "post_boost",
+    "post_delete",
+    "post_like",
+    "post_replies",
+    "post_reply",
+    "post_unlike",
+    "profile",
+    "user_calendar_data",
+    "ReviewFeed",
+    "review_edit",
+    "review_retrieve",
+    "user_review_list",
+    "search",
+    "user_tag_edit",
+    "user_tag_list",
+    "user_tag_member_list",
+    "WrappedShareView",
+    "WrappedView",
+]
diff --git a/journal/views/common.py b/journal/views/common.py
index eceadb09..c4bdba11 100644
--- a/journal/views/common.py
+++ b/journal/views/common.py
@@ -2,7 +2,6 @@ import datetime
 
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import BadRequest, PermissionDenied
-from django.core.paginator import Paginator
 from django.db.models import F, Min, OuterRef, Subquery
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
diff --git a/journal/views/mark.py b/journal/views/mark.py
index 931ac447..95b553c6 100644
--- a/journal/views/mark.py
+++ b/journal/views/mark.py
@@ -1,11 +1,10 @@
 from datetime import datetime
 
-from django import forms
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.core.exceptions import BadRequest, ObjectDoesNotExist, PermissionDenied
+from django.core.exceptions import BadRequest, PermissionDenied
 from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import get_object_or_404, render
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
 from django.utils.translation import gettext as _
@@ -15,8 +14,8 @@ from loguru import logger
 from catalog.models import *
 from common.utils import AuthedHttpRequest, get_uuid_or_404
 
-from ..models import Comment, Mark, ShelfManager, ShelfType, TagManager
-from .common import render_list, render_relogin, target_identity_required
+from ..models import Comment, Mark, ShelfManager, ShelfType
+from .common import render_list, render_relogin
 
 PAGE_SIZE = 10
 
diff --git a/journal/views/note.py b/journal/views/note.py
index a634bcbb..1a1c3b05 100644
--- a/journal/views/note.py
+++ b/journal/views/note.py
@@ -1,8 +1,8 @@
 from django import forms
 from django.contrib.auth.decorators import login_required
-from django.core.exceptions import BadRequest, ObjectDoesNotExist, PermissionDenied
-from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render
+from django.core.exceptions import BadRequest
+from django.http import Http404, HttpResponseRedirect
+from django.shortcuts import get_object_or_404, render
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.http import require_http_methods
 
diff --git a/journal/views/post.py b/journal/views/post.py
index 79cc1d95..d31ae889 100644
--- a/journal/views/post.py
+++ b/journal/views/post.py
@@ -1,12 +1,12 @@
 from django.contrib.auth.decorators import login_required
-from django.core.exceptions import BadRequest, ObjectDoesNotExist, PermissionDenied
+from django.core.exceptions import BadRequest, PermissionDenied
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 
-from common.utils import AuthedHttpRequest, get_uuid_or_404, target_identity_required
+from common.utils import AuthedHttpRequest, get_uuid_or_404
 from takahe.utils import Takahe
 
 from ..forms import *
diff --git a/journal/views/tag.py b/journal/views/tag.py
index e026c475..cf05fac7 100644
--- a/journal/views/tag.py
+++ b/journal/views/tag.py
@@ -1,6 +1,6 @@
 from django.contrib.auth.decorators import login_required
-from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render
+from django.http import Http404, HttpResponseRedirect
+from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
diff --git a/legacy/admin.py b/legacy/admin.py
index 8c38f3f3..846f6b40 100644
--- a/legacy/admin.py
+++ b/legacy/admin.py
@@ -1,3 +1 @@
-from django.contrib import admin
-
 # Register your models here.
diff --git a/legacy/models.py b/legacy/models.py
index 2e5ddd09..e3614a44 100644
--- a/legacy/models.py
+++ b/legacy/models.py
@@ -1,5 +1,3 @@
-from os import link
-
 from django.db import models
 
 
diff --git a/legacy/tests.py b/legacy/tests.py
index 7ce503c2..a39b155a 100644
--- a/legacy/tests.py
+++ b/legacy/tests.py
@@ -1,3 +1 @@
-from django.test import TestCase
-
 # Create your tests here.
diff --git a/legacy/urls.py b/legacy/urls.py
index 1635e999..0e57148f 100644
--- a/legacy/urls.py
+++ b/legacy/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, re_path
+from django.urls import path
 
 from .views import *
 
diff --git a/legacy/views.py b/legacy/views.py
index 987a2945..fb93dd96 100644
--- a/legacy/views.py
+++ b/legacy/views.py
@@ -1,8 +1,6 @@
-from django.core.signing import b62_decode, b62_encode
-from django.shortcuts import get_object_or_404, redirect, render
+from django.core.signing import b62_encode
+from django.shortcuts import get_object_or_404, redirect
 
-from catalog.collection.models import Collection
-from catalog.models import Item
 
 from .models import *
 
diff --git a/mastodon/admin.py b/mastodon/admin.py
index 694323fa..e69de29b 100644
--- a/mastodon/admin.py
+++ b/mastodon/admin.py
@@ -1 +0,0 @@
-from django.contrib import admin
diff --git a/mastodon/apps.py b/mastodon/apps.py
index 822f8572..4dcaeed5 100644
--- a/mastodon/apps.py
+++ b/mastodon/apps.py
@@ -6,4 +6,4 @@ class MastodonConfig(AppConfig):
 
     def ready(self):
         # register cron jobs
-        from mastodon.jobs import MastodonSiteCheck  # isort:skip
+        pass  # isort:skip
diff --git a/mastodon/migrations/0003_mastodonapplication_reachable.py b/mastodon/migrations/0003_mastodonapplication_reachable.py
index ce191314..692b8a75 100644
--- a/mastodon/migrations/0003_mastodonapplication_reachable.py
+++ b/mastodon/migrations/0003_mastodonapplication_reachable.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mastodon", "0002_add_api_domain_server_version"),
     ]
diff --git a/mastodon/models/__init__.py b/mastodon/models/__init__.py
index ac57db48..6d970ec4 100644
--- a/mastodon/models/__init__.py
+++ b/mastodon/models/__init__.py
@@ -9,3 +9,19 @@ from .mastodon import (
     verify_client,
 )
 from .threads import Threads, ThreadsAccount
+
+__all__ = [
+    "Bluesky",
+    "BlueskyAccount",
+    "Email",
+    "EmailAccount",
+    "Mastodon",
+    "MastodonAccount",
+    "MastodonApplication",
+    "Platform",
+    "SocialAccount",
+    "Threads",
+    "ThreadsAccount",
+    "detect_server_info",
+    "verify_client",
+]
diff --git a/mastodon/models/common.py b/mastodon/models/common.py
index 30f017d5..fe6799c6 100644
--- a/mastodon/models/common.py
+++ b/mastodon/models/common.py
@@ -7,8 +7,6 @@ from django.utils.translation import gettext_lazy as _
 from loguru import logger
 from typedmodels.models import TypedModel
 
-from catalog.common import jsondata
-
 
 class Platform(models.TextChoices):
     EMAIL = "email", _("Email")
diff --git a/mastodon/models/email.py b/mastodon/models/email.py
index 2401e539..a6e2cda1 100644
--- a/mastodon/models/email.py
+++ b/mastodon/models/email.py
@@ -57,17 +57,17 @@ class Email:
         site = settings.SITE_INFO["site_name"]
         match action:
             case "verify":
-                subject = f'{site} - {_("Verification Code")} - {code}'
+                subject = f"{site} - {_('Verification Code')} - {code}"
                 msg = _(
                     "Use this code to verify your email address {email}\n\n{code}"
                 ).format(email=email, code=code)
             case "login":
-                subject = f'{site} - {_("Verification Code")} - {code}'
+                subject = f"{site} - {_('Verification Code')} - {code}"
                 msg = _("Use this code to login as {email}\n\n{code}").format(
                     email=email, code=code
                 )
             case "register":
-                subject = f'{site} - {_("Register")}'
+                subject = f"{site} - {_('Register')}"
                 msg = _(
                     "There is no account registered with this email address yet: {email}\n\nIf you already have an account with us, just login and add this email to you account.\n\nIf you prefer to register a new account with this email, please use this verification code: {code}"
                 ).format(email=email, code=code)
diff --git a/mastodon/models/mastodon.py b/mastodon/models/mastodon.py
index 2e1d94c5..9be4ebad 100644
--- a/mastodon/models/mastodon.py
+++ b/mastodon/models/mastodon.py
@@ -903,8 +903,6 @@ class MastodonAccount(SocialAccount):
         obj: "Item | Content | None" = None,
         rating: int | None = None,
     ) -> dict:
-        from journal.models.renderers import render_rating
-
         v = get_toot_visibility(visibility, self.user)
         text = (
             content.replace("##rating##", self.rating_to_emoji(rating))
diff --git a/mastodon/models/threads.py b/mastodon/models/threads.py
index 117d0332..100e5f50 100644
--- a/mastodon/models/threads.py
+++ b/mastodon/models/threads.py
@@ -117,7 +117,7 @@ class Threads:
     def get_profile(
         token: str, user_id: str | None = None
     ) -> dict[str, str | int] | None:
-        url = f'https://graph.threads.net/v1.0/{user_id or "me"}?fields=id,username,threads_profile_picture_url,threads_biography&access_token={token}'
+        url = f"https://graph.threads.net/v1.0/{user_id or 'me'}?fields=id,username,threads_profile_picture_url,threads_biography&access_token={token}"
         try:
             response = get(url)
         except Exception as e:
@@ -239,7 +239,7 @@ class ThreadsAccount(SocialAccount):
             return False
         if self.handle != data["username"]:
             if self.handle:
-                logger.info(f'{self} handle changed to {data["username"]}')
+                logger.info(f"{self} handle changed to {data['username']}")
             self.handle = str(data["username"])
         self.account_data = data
         self.last_refresh = timezone.now()
diff --git a/mastodon/views/bluesky.py b/mastodon/views/bluesky.py
index 6e565c1a..7cc040a1 100644
--- a/mastodon/views/bluesky.py
+++ b/mastodon/views/bluesky.py
@@ -1,12 +1,9 @@
 from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest
-from django.shortcuts import redirect
-from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 
 from common.views import render_error
-from mastodon.models import bluesky
 
 from ..models import Bluesky
 from .common import disconnect_identity, process_verified_account
diff --git a/pyproject.toml b/pyproject.toml
index 5115b80d..7815c66c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,13 +60,13 @@ managed = true
 virtual = true
 dev-dependencies = [
     "pre-commit>=4.0.1",
-    "black~=24.4.2",
+    # "black~=24.4.2",
     "django-stubs>=5.1.0",
     "djlint>=1.36.4",
-    "isort~=5.13.2",
+    # "isort~=5.13.2",
     "lxml-stubs>=0.5.1",
     "pyright>=1.1.389",
-    "ruff>=0.7.1",
+    "ruff>=0.9.1",
     "mkdocs-material>=9.5.42",
 ]
 
@@ -115,14 +115,9 @@ exclude = [
     ".venv",
     ".git",
     "playground",
-    "**/tests.py",
     "neodb",
-    "**/migrations",
-    "**/commands",
-    "**/importers",
-    "legacy",
 ]
-lint.ignore = ["F401", "F403", "F405"]
+lint.ignore = ["F403", "F405"]
 
 [tool.setuptools]
 py-modules = []
diff --git a/requirements-dev.lock b/requirements-dev.lock
index 7a3b3bcd..d2edaf4a 100644
--- a/requirements-dev.lock
+++ b/requirements-dev.lock
@@ -259,7 +259,7 @@ rjsmin==1.2.2
     # via django-compressor
 rq==2.1.0
     # via django-rq
-ruff==0.8.5
+ruff==0.9.1
 sentry-sdk==2.19.2
 setproctitle==1.3.4
 six==1.17.0
diff --git a/social/admin.py b/social/admin.py
index 8c38f3f3..846f6b40 100644
--- a/social/admin.py
+++ b/social/admin.py
@@ -1,3 +1 @@
-from django.contrib import admin
-
 # Register your models here.
diff --git a/social/apps.py b/social/apps.py
index b11df7b3..ea754d0c 100644
--- a/social/apps.py
+++ b/social/apps.py
@@ -7,7 +7,4 @@ class SocialConfig(AppConfig):
 
     def ready(self):
         # load key modules in proper order, make sure class inject and signal works as expected
-        from catalog import models as catalog_models
-        from catalog import sites as catalog_sites
-        from journal import models as journal_models
-        from social import models as social_models
+        pass
diff --git a/social/migrations/0001_initial_0_10.py b/social/migrations/0001_initial_0_10.py
index 250633f4..2cd1a486 100644
--- a/social/migrations/0001_initial_0_10.py
+++ b/social/migrations/0001_initial_0_10.py
@@ -2,7 +2,6 @@
 
 import django.db.models.deletion
 import django.utils.timezone
-from django.conf import settings
 from django.db import migrations, models
 
 import journal.models.mixins
diff --git a/social/migrations/0007_alter_localactivity_owner.py b/social/migrations/0007_alter_localactivity_owner.py
index f7e3176b..db95a39d 100644
--- a/social/migrations/0007_alter_localactivity_owner.py
+++ b/social/migrations/0007_alter_localactivity_owner.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0012_apidentity"),
         ("social", "0006_alter_localactivity_template"),
diff --git a/social/models.py b/social/models.py
index 940ca79c..78c7ad50 100644
--- a/social/models.py
+++ b/social/models.py
@@ -6,17 +6,15 @@ ActivityManager generates chronological view for user and, in future, ActivitySt
 
 """
 
-from functools import cached_property
 from typing import Type
 
 from django.conf import settings
 from django.db import models
 from django.db.models import Q
-from django.db.models.signals import post_delete, post_save, pre_delete
+from django.db.models.signals import post_save, pre_delete
 from django.utils import timezone
 from loguru import logger
 
-from catalog.common.models import Item
 from journal.models import (
     Collection,
     Comment,
diff --git a/social/urls.py b/social/urls.py
index 5ad3e733..3737994a 100644
--- a/social/urls.py
+++ b/social/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, re_path
+from django.urls import path
 
 from .views import *
 
diff --git a/takahe/admin.py b/takahe/admin.py
index 8c38f3f3..846f6b40 100644
--- a/takahe/admin.py
+++ b/takahe/admin.py
@@ -1,3 +1 @@
-from django.contrib import admin
-
 # Register your models here.
diff --git a/takahe/ap_handlers.py b/takahe/ap_handlers.py
index 31c12df6..9302dbd5 100644
--- a/takahe/ap_handlers.py
+++ b/takahe/ap_handlers.py
@@ -63,7 +63,7 @@ def _parse_piece_objects(objects) -> list[dict[str, Any]]:
         if obj["type"] in _supported_ap_journal_types.keys():
             pieces.append(obj)
         else:
-            logger.warning(f'Unknown link type {obj["type"]}')
+            logger.warning(f"Unknown link type {obj['type']}")
     return pieces
 
 
@@ -155,7 +155,7 @@ def _post_fetched(pk, local, post_data, create: bool | None = None):
     for p in pieces:
         cls = _supported_ap_journal_types.get(p["type"])
         if not cls:
-            logger.warning(f'Unknown link type {p["type"]}')
+            logger.warning(f"Unknown link type {p['type']}")
             continue
         cls.update_by_ap_object(owner, item, p, post)
 
diff --git a/takahe/apps.py b/takahe/apps.py
index 9857a4e5..8113f17c 100644
--- a/takahe/apps.py
+++ b/takahe/apps.py
@@ -7,4 +7,4 @@ class TakaheConfig(AppConfig):
 
     def ready(self):
         # register cron jobs
-        from .jobs import TakaheStats  # isort:skip
+        pass  # isort:skip
diff --git a/takahe/jobs.py b/takahe/jobs.py
index 4ff7dcc4..a1030089 100644
--- a/takahe/jobs.py
+++ b/takahe/jobs.py
@@ -1,7 +1,6 @@
 from datetime import timedelta
 
 from django.core.cache import cache
-from django.db.models import Count, Q
 from django.utils import timezone
 from loguru import logger
 
diff --git a/takahe/management/commands/takahe.py b/takahe/management/commands/takahe.py
index fc555a28..84d21ddf 100644
--- a/takahe/management/commands/takahe.py
+++ b/takahe/management/commands/takahe.py
@@ -1,13 +1,10 @@
-from django.conf import settings
 from django.core.management.base import BaseCommand
-from django.db.models import Count, F
 from loguru import logger
 from tqdm import tqdm
 
 from catalog.common import *
 from catalog.common.models import *
 from catalog.models import *
-from journal.models import Tag, update_journal_for_merged_item
 from takahe.utils import *
 from users.models import User as NeoUser
 
@@ -24,9 +21,9 @@ class Command(BaseCommand):
         )
 
     def sync(self):
-        logger.info(f"Syncing domain...")
+        logger.info("Syncing domain...")
         Takahe.get_domain()
-        logger.info(f"Syncing users...")
+        logger.info("Syncing users...")
         for u in tqdm(NeoUser.objects.filter(is_active=True, username__isnull=False)):
             Takahe.init_identity_for_local_user(u)
             # Takahe.update_user_following(u)
@@ -39,4 +36,4 @@ class Command(BaseCommand):
         if options["sync"]:
             self.sync()
 
-        self.stdout.write(self.style.SUCCESS(f"Done."))
+        self.stdout.write(self.style.SUCCESS("Done."))
diff --git a/takahe/models.py b/takahe/models.py
index d358e7da..30e20331 100644
--- a/takahe/models.py
+++ b/takahe/models.py
@@ -7,23 +7,21 @@ import ssl
 import time
 from datetime import date, timedelta
 from functools import cached_property, partial
-from typing import TYPE_CHECKING, Literal, Optional
-from urllib.parse import urlparse
+from typing import TYPE_CHECKING, Optional
 
 import httpx
 import urlman
 from cachetools import TTLCache, cached
-from cryptography.hazmat.primitives import hashes, serialization
-from cryptography.hazmat.primitives.asymmetric import padding, rsa
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
 from django.conf import settings
-from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
+from django.contrib.auth.models import AbstractBaseUser
 from django.core.files.storage import FileSystemStorage
 from django.db import models, transaction
 from django.template.defaultfilters import linebreaks_filter
 from django.utils import timezone
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
-from loguru import logger
 from lxml import etree
 
 from .html import ContentRenderer, FediverseHtmlParser
diff --git a/takahe/tests.py b/takahe/tests.py
index 7ce503c2..a39b155a 100644
--- a/takahe/tests.py
+++ b/takahe/tests.py
@@ -1,3 +1 @@
-from django.test import TestCase
-
 # Create your tests here.
diff --git a/takahe/utils.py b/takahe/utils.py
index e02c2b7d..ee8f3979 100644
--- a/takahe/utils.py
+++ b/takahe/utils.py
@@ -9,14 +9,11 @@ from django.core.files.images import ImageFile
 from django.core.signing import b62_encode
 from django.db.models import Count
 from django.utils import timezone
-from django.utils.translation import gettext as _
 from PIL import Image
-
+from loguru import logger
 from .models import *
 
 if TYPE_CHECKING:
-    from journal.models import Collection
-    from users.models import APIdentity
     from users.models import User as NeoUser
 
 
diff --git a/takahe/views.py b/takahe/views.py
index 3fca0789..7d6aee74 100644
--- a/takahe/views.py
+++ b/takahe/views.py
@@ -4,9 +4,8 @@ from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.sessions.backends.signed_cookies import SessionStore
 from django.http import HttpRequest
-from django.shortcuts import redirect, render
+from django.shortcuts import redirect
 from django.utils.http import http_date
-from loguru import logger
 
 from common.utils import user_identity_required
 
diff --git a/users/apps.py b/users/apps.py
index 3e500dd7..23d5d186 100644
--- a/users/apps.py
+++ b/users/apps.py
@@ -5,7 +5,5 @@ class UsersConfig(AppConfig):
     name = "users"
 
     def ready(self):
-        from . import api
-
         # register cron jobs
-        from users.jobs import MastodonUserSync  # isort:skip
+        pass  # isort:skip
diff --git a/users/jobs/__init__.py b/users/jobs/__init__.py
index e88820ee..5b9220c0 100644
--- a/users/jobs/__init__.py
+++ b/users/jobs/__init__.py
@@ -1 +1,3 @@
 from .sync import MastodonUserSync
+
+__all__ = ["MastodonUserSync"]
diff --git a/users/jobs/sync.py b/users/jobs/sync.py
index 37ead4dd..0e25ddbb 100644
--- a/users/jobs/sync.py
+++ b/users/jobs/sync.py
@@ -1,5 +1,4 @@
 from datetime import timedelta
-from enum import IntEnum
 
 from django.db.models import F
 from django.utils import timezone
@@ -20,7 +19,7 @@ class MastodonUserSync(BaseJob):
         if batches < 1:
             batches = 1
         batch = timezone.now().hour // self.interval_hours
-        logger.info(f"User accounts sync job starts batch {batch+1} of {batches}")
+        logger.info(f"User accounts sync job starts batch {batch + 1} of {batches}")
         qs = (
             User.objects.exclude(
                 preference__mastodon_skip_userinfo=True,
diff --git a/users/management/commands/invite.py b/users/management/commands/invite.py
index a61e6b86..ad3a3447 100644
--- a/users/management/commands/invite.py
+++ b/users/management/commands/invite.py
@@ -1,10 +1,6 @@
-from datetime import timedelta
-
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.urls import reverse
-from django.utils import timezone
-from loguru import logger
 
 from takahe.utils import Invite
 
diff --git a/users/management/commands/task.py b/users/management/commands/task.py
index d79c1be4..8384e51d 100644
--- a/users/management/commands/task.py
+++ b/users/management/commands/task.py
@@ -1,8 +1,4 @@
-import pprint
-
-from django.conf import settings
 from django.core.management.base import BaseCommand
-from httpx import delete
 from tqdm import tqdm
 
 from users.models import Task
diff --git a/users/management/commands/user.py b/users/management/commands/user.py
index e4a05623..c7585762 100644
--- a/users/management/commands/user.py
+++ b/users/management/commands/user.py
@@ -1,7 +1,4 @@
-from datetime import timedelta
-
 from django.core.management.base import BaseCommand
-from django.utils import timezone
 from tqdm import tqdm
 
 from users.models import Preference, User
diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py
index 65d1fa0c..f51eeaca 100644
--- a/users/migrations/0001_initial.py
+++ b/users/migrations/0001_initial.py
@@ -4,11 +4,8 @@ import django.contrib.auth.models
 import django.core.serializers.json
 import django.db.models.deletion
 import django.utils.timezone
-from django.conf import settings
 from django.db import migrations, models
 
-import users.models
-
 
 class Migration(migrations.Migration):
     initial = True
diff --git a/users/migrations/0002_preference_auto_bookmark_cats.py b/users/migrations/0002_preference_auto_bookmark_cats.py
index 4b16fd13..2a8b12e8 100644
--- a/users/migrations/0002_preference_auto_bookmark_cats.py
+++ b/users/migrations/0002_preference_auto_bookmark_cats.py
@@ -6,7 +6,6 @@ import users.models.preference
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0001_initial_0_10"),
     ]
diff --git a/users/migrations/0003_remove_preference_no_anonymous_view.py b/users/migrations/0003_remove_preference_no_anonymous_view.py
index a0c10846..9109ccb5 100644
--- a/users/migrations/0003_remove_preference_no_anonymous_view.py
+++ b/users/migrations/0003_remove_preference_no_anonymous_view.py
@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0002_preference_auto_bookmark_cats"),
     ]
diff --git a/users/migrations/0004_remove_user_at_least_one_login_method_and_more.py b/users/migrations/0004_remove_user_at_least_one_login_method_and_more.py
index 52494693..70134c37 100644
--- a/users/migrations/0004_remove_user_at_least_one_login_method_and_more.py
+++ b/users/migrations/0004_remove_user_at_least_one_login_method_and_more.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0003_remove_preference_no_anonymous_view"),
     ]
diff --git a/users/migrations/0005_add_dedicated_username.py b/users/migrations/0005_add_dedicated_username.py
index fe8dad6c..1c485177 100644
--- a/users/migrations/0005_add_dedicated_username.py
+++ b/users/migrations/0005_add_dedicated_username.py
@@ -1,10 +1,8 @@
 # Generated by Django 3.2.19 on 2023-06-30 02:39
 
-import django.contrib.auth.validators
 from django.conf import settings
 from django.db import migrations, models
 
-import users.models
 from users.models.user import UsernameValidator
 
 
diff --git a/users/migrations/0011_preference_hidden_categories.py b/users/migrations/0011_preference_hidden_categories.py
index b64370b8..99452879 100644
--- a/users/migrations/0011_preference_hidden_categories.py
+++ b/users/migrations/0011_preference_hidden_categories.py
@@ -2,8 +2,6 @@
 
 from django.db import migrations, models
 
-import users.models
-
 
 class Migration(migrations.Migration):
     dependencies = [
diff --git a/users/migrations/0013_init_identity.py b/users/migrations/0013_init_identity.py
index 944bd185..29a5cf2d 100644
--- a/users/migrations/0013_init_identity.py
+++ b/users/migrations/0013_init_identity.py
@@ -3,7 +3,7 @@
 from datetime import timedelta
 
 from django.conf import settings
-from django.db import migrations, models, transaction
+from django.db import migrations
 from django.utils import timezone
 from loguru import logger
 from tqdm import tqdm
@@ -76,11 +76,11 @@ def init_identity(apps, schema_editor):
         raise ValueError("existing Takahe identities detected, aborting migration")
     if APIdentity.objects.exists():
         raise ValueError("existing APIdentity data detected, aborting migration")
-    logger.info(f"Creating takahe users/identities")
+    logger.info("Creating takahe users/identities")
     for user in tqdm(User.objects.all()):
         username = user.username
         handler = "@" + username
-        identity = APIdentity.objects.create(
+        APIdentity.objects.create(
             pk=user.pk,
             user=user,
             local=True,
diff --git a/users/migrations/0014_preference_mastodon_skip_relationship_and_more.py b/users/migrations/0014_preference_mastodon_skip_relationship_and_more.py
index 72ae0406..90182054 100644
--- a/users/migrations/0014_preference_mastodon_skip_relationship_and_more.py
+++ b/users/migrations/0014_preference_mastodon_skip_relationship_and_more.py
@@ -14,7 +14,7 @@ def migrate_relationships(apps, schema_editor):
     # from takahe.models import Follow as TakaheFollow
     # from users.models import APIdentity, User
 
-    logger.info(f"Migrate local user relationship")
+    logger.info("Migrate local user relationship")
     for user in tqdm(User.objects.filter(is_active=True)):
         identity = APIdentity.objects.get(user=user)
         for target in user.local_following.all():
@@ -26,10 +26,10 @@ def migrate_relationships(apps, schema_editor):
         for target in user.local_muting.all():
             target_identity = APIdentity.objects.get(user=target)
             identity.mute(target_identity)
-    logger.info(f"Migrate sync user relationship")
+    logger.info("Migrate sync user relationship")
     for user in tqdm(User.objects.filter(is_active=True)):
         user.sync_relationship()
-    logger.info(f"Update relationship states")
+    logger.info("Update relationship states")
     TakaheBlock.objects.all().update(state="sent")
     TakaheFollow.objects.all().update(state="accepted")
 
diff --git a/users/migrations/0015_remove_preference_mastodon_publish_public_and_more.py b/users/migrations/0015_remove_preference_mastodon_publish_public_and_more.py
index b1a5c8b2..8d0e1c3d 100644
--- a/users/migrations/0015_remove_preference_mastodon_publish_public_and_more.py
+++ b/users/migrations/0015_remove_preference_mastodon_publish_public_and_more.py
@@ -10,7 +10,6 @@ def migrate_public_mode(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0014_preference_mastodon_skip_relationship_and_more"),
     ]
diff --git a/users/migrations/0015_user_mastodon_last_reachable.py b/users/migrations/0015_user_mastodon_last_reachable.py
index 7bdb1d39..a62cade6 100644
--- a/users/migrations/0015_user_mastodon_last_reachable.py
+++ b/users/migrations/0015_user_mastodon_last_reachable.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0011_preference_hidden_categories"),
     ]
diff --git a/users/migrations/0016_rename_preference_default_no_share.py b/users/migrations/0016_rename_preference_default_no_share.py
index 112504ad..d8990c56 100644
--- a/users/migrations/0016_rename_preference_default_no_share.py
+++ b/users/migrations/0016_rename_preference_default_no_share.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0015_remove_preference_mastodon_publish_public_and_more"),
     ]
diff --git a/users/migrations/0017_mastodon_site_username_bd2db5_idx.py b/users/migrations/0017_mastodon_site_username_bd2db5_idx.py
index 2eb12b16..e13645af 100644
--- a/users/migrations/0017_mastodon_site_username_bd2db5_idx.py
+++ b/users/migrations/0017_mastodon_site_username_bd2db5_idx.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0016_rename_preference_default_no_share"),
     ]
diff --git a/users/migrations/0020_user_language.py b/users/migrations/0020_user_language.py
index 315423e7..5bf8785c 100644
--- a/users/migrations/0020_user_language.py
+++ b/users/migrations/0020_user_language.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0019_task"),
     ]
diff --git a/users/migrations/0021_alter_user_language.py b/users/migrations/0021_alter_user_language.py
index f2fc65fc..d6c7bd0b 100644
--- a/users/migrations/0021_alter_user_language.py
+++ b/users/migrations/0021_alter_user_language.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0020_user_language"),
     ]
diff --git a/users/models/apidentity.py b/users/models/apidentity.py
index ad5a317c..7f031e23 100644
--- a/users/models/apidentity.py
+++ b/users/models/apidentity.py
@@ -2,7 +2,6 @@ from functools import cached_property
 
 from django.conf import settings
 from django.db import models
-from django.templatetags.static import static
 
 from mastodon.models.mastodon import MastodonAccount
 from takahe.utils import Takahe
diff --git a/users/models/preference.py b/users/models/preference.py
index a0c7a25a..65f4c020 100644
--- a/users/models/preference.py
+++ b/users/models/preference.py
@@ -1,6 +1,5 @@
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
-from django.utils.translation import gettext_lazy as _
 
 from .user import User
 
diff --git a/users/models/user.py b/users/models/user.py
index 683d3b86..c067aa30 100644
--- a/users/models/user.py
+++ b/users/models/user.py
@@ -1,5 +1,4 @@
 import re
-from datetime import timedelta
 from functools import cached_property
 from typing import TYPE_CHECKING, ClassVar
 
@@ -26,7 +25,6 @@ from mastodon.models import (
     ThreadsAccount,
 )
 from takahe.utils import Takahe
-from users.models import preference
 
 if TYPE_CHECKING:
     from .apidentity import APIdentity
@@ -171,7 +169,7 @@ class User(AbstractUser):
         return settings.SITE_INFO["site_url"] + self.url
 
     def __str__(self):
-        return f'{self.pk}:{self.username or "<missing>"}'
+        return f"{self.pk}:{self.username or '<missing>'}"
 
     @property
     def registration_complete(self):