diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8796df8..5e03d58 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-case-conflict - id: check-merge-conflict @@ -15,21 +15,22 @@ repos: - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: "v3.3.0" + rev: "v3.15.0" hooks: - id: pyupgrade - args: [--py310-plus] + args: [--py311-plus] - repo: https://github.com/adamchainz/django-upgrade - rev: "1.13.0" + rev: "1.15.0" hooks: - id: django-upgrade args: [--target-version, "4.2"] - - repo: https://github.com/psf/black - rev: 22.10.0 + - repo: https://github.com/psf/black-pre-commit-mirror + rev: 23.11.0 hooks: - id: black + language_version: python3.11 - repo: https://github.com/pycqa/isort rev: 5.12.0 @@ -38,12 +39,12 @@ repos: args: ["--profile=black"] - repo: https://github.com/pycqa/flake8 - rev: 6.0.0 + rev: 6.1.0 hooks: - id: flake8 - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.991 + rev: v1.6.1 hooks: - id: mypy exclude: "^tests/" @@ -51,8 +52,6 @@ repos: [types-pyopenssl, types-mock, types-cachetools, types-python-dateutil] - repo: https://github.com/rtts/djhtml - rev: v1.5.2 + rev: 3.0.6 hooks: - id: djhtml - - id: djcss - - id: djjs diff --git a/activities/migrations/0002_hashtag.py b/activities/migrations/0002_hashtag.py index c1b4bbd..4cc8680 100644 --- a/activities/migrations/0002_hashtag.py +++ b/activities/migrations/0002_hashtag.py @@ -8,7 +8,6 @@ import stator.models class Migration(migrations.Migration): - dependencies = [ ("activities", "0001_initial"), ] diff --git a/activities/migrations/0003_postattachment_null_thumb.py b/activities/migrations/0003_postattachment_null_thumb.py index f999150..2f04cbd 100644 --- a/activities/migrations/0003_postattachment_null_thumb.py +++ b/activities/migrations/0003_postattachment_null_thumb.py @@ -10,7 +10,6 @@ import core.uploads class Migration(migrations.Migration): - dependencies = [ ("activities", "0002_hashtag"), ] diff --git a/activities/migrations/0004_emoji_post_emojis.py b/activities/migrations/0004_emoji_post_emojis.py index 89bc825..9676564 100644 --- a/activities/migrations/0004_emoji_post_emojis.py +++ b/activities/migrations/0004_emoji_post_emojis.py @@ -11,7 +11,6 @@ import stator.models class Migration(migrations.Migration): - dependencies = [ ("users", "0003_identity_followers_etc"), ("activities", "0003_postattachment_null_thumb"), diff --git a/activities/migrations/0005_post_type_timeline_urls.py b/activities/migrations/0005_post_type_timeline_urls.py index c18b9dd..261d493 100644 --- a/activities/migrations/0005_post_type_timeline_urls.py +++ b/activities/migrations/0005_post_type_timeline_urls.py @@ -14,7 +14,6 @@ def timelineevent_populate_published(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ("activities", "0004_emoji_post_emojis"), ] diff --git a/activities/migrations/0006_fanout_subject_identity_alter_fanout_type.py b/activities/migrations/0006_fanout_subject_identity_alter_fanout_type.py index 641f00b..2588cfc 100644 --- a/activities/migrations/0006_fanout_subject_identity_alter_fanout_type.py +++ b/activities/migrations/0006_fanout_subject_identity_alter_fanout_type.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0005_report"), ("activities", "0005_post_type_timeline_urls"), diff --git a/activities/migrations/0007_post_stats.py b/activities/migrations/0007_post_stats.py index 694e973..bb9726f 100644 --- a/activities/migrations/0007_post_stats.py +++ b/activities/migrations/0007_post_stats.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0006_fanout_subject_identity_alter_fanout_type"), ] diff --git a/activities/migrations/0008_state_and_post_indexes.py b/activities/migrations/0008_state_and_post_indexes.py index d09a79d..9d3bc00 100644 --- a/activities/migrations/0008_state_and_post_indexes.py +++ b/activities/migrations/0008_state_and_post_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0007_post_stats"), ] diff --git a/activities/migrations/0009_alter_timelineevent_index_together.py b/activities/migrations/0009_alter_timelineevent_index_together.py index 2670403..533b0d4 100644 --- a/activities/migrations/0009_alter_timelineevent_index_together.py +++ b/activities/migrations/0009_alter_timelineevent_index_together.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ("users", "0011_announcement"), ("activities", "0008_state_and_post_indexes"), diff --git a/activities/migrations/0010_stator_indexes.py b/activities/migrations/0010_stator_indexes.py index 3e7ad53..45485da 100644 --- a/activities/migrations/0010_stator_indexes.py +++ b/activities/migrations/0010_stator_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ("users", "0013_stator_indexes"), ("activities", "0009_alter_timelineevent_index_together"), diff --git a/activities/migrations/0011_postinteraction_value_alter_postinteraction_type.py b/activities/migrations/0011_postinteraction_value_alter_postinteraction_type.py index 2de059e..7e71814 100644 --- a/activities/migrations/0011_postinteraction_value_alter_postinteraction_type.py +++ b/activities/migrations/0011_postinteraction_value_alter_postinteraction_type.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0010_stator_indexes"), ] diff --git a/activities/migrations/0012_in_reply_to_index.py b/activities/migrations/0012_in_reply_to_index.py index 48519d5..0bcc5d8 100644 --- a/activities/migrations/0012_in_reply_to_index.py +++ b/activities/migrations/0012_in_reply_to_index.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0011_postinteraction_value_alter_postinteraction_type"), ] diff --git a/activities/migrations/0013_postattachment_author.py b/activities/migrations/0013_postattachment_author.py index bbf67a5..60eecf7 100644 --- a/activities/migrations/0013_postattachment_author.py +++ b/activities/migrations/0013_postattachment_author.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0015_bookmark"), ("activities", "0012_in_reply_to_index"), diff --git a/activities/migrations/0014_post_content_vector_gin.py b/activities/migrations/0014_post_content_vector_gin.py index 1473e1e..3262e77 100644 --- a/activities/migrations/0014_post_content_vector_gin.py +++ b/activities/migrations/0014_post_content_vector_gin.py @@ -6,7 +6,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ("activities", "0013_postattachment_author"), ] diff --git a/activities/migrations/0015_alter_postinteraction_type.py b/activities/migrations/0015_alter_postinteraction_type.py index bb1a114..d5fdbce 100644 --- a/activities/migrations/0015_alter_postinteraction_type.py +++ b/activities/migrations/0015_alter_postinteraction_type.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0014_post_content_vector_gin"), ] diff --git a/activities/migrations/0016_index_together_migration.py b/activities/migrations/0016_index_together_migration.py index 6238d85..c16e59c 100644 --- a/activities/migrations/0016_index_together_migration.py +++ b/activities/migrations/0016_index_together_migration.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0015_alter_postinteraction_type"), ] diff --git a/activities/migrations/0018_timelineevent_dismissed.py b/activities/migrations/0018_timelineevent_dismissed.py index ada2a5f..e248121 100644 --- a/activities/migrations/0018_timelineevent_dismissed.py +++ b/activities/migrations/0018_timelineevent_dismissed.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0017_stator_next_change"), ] diff --git a/activities/migrations/0019_alter_postattachment_focal_x_and_more.py b/activities/migrations/0019_alter_postattachment_focal_x_and_more.py index 111df91..1f12b18 100644 --- a/activities/migrations/0019_alter_postattachment_focal_x_and_more.py +++ b/activities/migrations/0019_alter_postattachment_focal_x_and_more.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0018_timelineevent_dismissed"), ] diff --git a/api/migrations/0001_initial.py b/api/migrations/0001_initial.py index e9d37f3..b2fe1bc 100644 --- a/api/migrations/0001_initial.py +++ b/api/migrations/0001_initial.py @@ -6,7 +6,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - initial = True dependencies = [ diff --git a/api/migrations/0002_remove_token_code_token_revoked_alter_token_token_and_more.py b/api/migrations/0002_remove_token_code_token_revoked_alter_token_token_and_more.py index 15d968b..4fa5830 100644 --- a/api/migrations/0002_remove_token_code_token_revoked_alter_token_token_and_more.py +++ b/api/migrations/0002_remove_token_code_token_revoked_alter_token_token_and_more.py @@ -6,7 +6,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0008_follow_boosts"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), diff --git a/api/migrations/0003_token_push_subscription.py b/api/migrations/0003_token_push_subscription.py index 3bae6ec..a255885 100644 --- a/api/migrations/0003_token_push_subscription.py +++ b/api/migrations/0003_token_push_subscription.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("api", "0002_remove_token_code_token_revoked_alter_token_token_and_more"), ] diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 900260f..448118c 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -10,7 +10,6 @@ import core.uploads class Migration(migrations.Migration): - initial = True dependencies = [ diff --git a/core/migrations/0002_domain_config.py b/core/migrations/0002_domain_config.py index e5305a2..ccefdf8 100644 --- a/core/migrations/0002_domain_config.py +++ b/core/migrations/0002_domain_config.py @@ -6,7 +6,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0016_hashtagfollow"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), diff --git a/stator/migrations/0001_initial.py b/stator/migrations/0001_initial.py index 8dcfc07..f18299f 100644 --- a/stator/migrations/0001_initial.py +++ b/stator/migrations/0001_initial.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - initial = True dependencies = [] diff --git a/stator/migrations/0002_stats_delete_statorerror.py b/stator/migrations/0002_stats_delete_statorerror.py index 5d22003..ceb2619 100644 --- a/stator/migrations/0002_stats_delete_statorerror.py +++ b/stator/migrations/0002_stats_delete_statorerror.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("stator", "0001_initial"), ] diff --git a/templates/activities/_post.html b/templates/activities/_post.html index 6834ffb..a12eea9 100644 --- a/templates/activities/_post.html +++ b/templates/activities/_post.html @@ -40,7 +40,7 @@ {% for attachment in post.attachments.all %} {% if attachment.is_image %} + _="on click halt the event then call imageviewer.show(me)"> {{ attachment.name|default:'(no description)' }} {% if attachment.name %}
ALT
diff --git a/templates/activities/debug_json.html b/templates/activities/debug_json.html index 18ded5e..a664870 100644 --- a/templates/activities/debug_json.html +++ b/templates/activities/debug_json.html @@ -39,44 +39,44 @@
Raw Response: + class="copy" + _="on click + writeText(#raw_response.innerText) into the navigator's clipboard + then add .copied + wait 2s + then remove .copied"> Show + toggle .hidden on #raw_response + then + if my.innerText is 'Hide' set my.innerText to 'Show' + else set my.innerText to 'Hide' + ">Show
Canonical: + class="copy" + _="on click + writeText(#canonical_response.innerText) into the navigator's clipboard + then add .copied + wait 2s + then remove .copied"> Show + toggle .hidden on #canonical_response + then + if my.innerText is 'Hide' set my.innerText to 'Show' + else set my.innerText to 'Hide' + ">Show
diff --git a/templates/forms/_json_name_value_list.html b/templates/forms/_json_name_value_list.html index dac8459..0199d12 100644 --- a/templates/forms/_json_name_value_list.html +++ b/templates/forms/_json_name_value_list.html @@ -80,9 +80,9 @@
diff --git a/templates/identity/view.html b/templates/identity/view.html index 0bfa3b3..23c2bbe 100644 --- a/templates/identity/view.html +++ b/templates/identity/view.html @@ -23,8 +23,8 @@ _="on click halt the event then call imageviewer.show(me)" > Profile image for {{ identity.name }} @@ -47,13 +47,13 @@ @{{ identity.handle }} + class="copy" + tabindex="0" + _="on click or keyup[key is 'Enter'] + writeText('@{{ identity.handle }}') into the navigator's clipboard + then add .copied + wait 2s + then remove .copied"> diff --git a/templates/settings/profile.html b/templates/settings/profile.html index b1dea2b..1ceabea 100644 --- a/templates/settings/profile.html +++ b/templates/settings/profile.html @@ -4,7 +4,7 @@ {% block settings_content %}
+ _="on submit metadata.collectMetadataFields()"> {% csrf_token %}
diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index 3dc5249..5bc7cc9 100644 --- a/users/migrations/0001_initial.py +++ b/users/migrations/0001_initial.py @@ -16,7 +16,6 @@ import users.models.password_reset class Migration(migrations.Migration): - initial = True dependencies = [] diff --git a/users/migrations/0002_identity_discoverable.py b/users/migrations/0002_identity_discoverable.py index cbee628..99db94f 100644 --- a/users/migrations/0002_identity_discoverable.py +++ b/users/migrations/0002_identity_discoverable.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0001_initial"), ] diff --git a/users/migrations/0003_identity_followers_etc.py b/users/migrations/0003_identity_followers_etc.py index ffb6272..fcbd883 100644 --- a/users/migrations/0003_identity_followers_etc.py +++ b/users/migrations/0003_identity_followers_etc.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0002_identity_discoverable"), ] diff --git a/users/migrations/0004_identity_admin_notes_identity_restriction_and_more.py b/users/migrations/0004_identity_admin_notes_identity_restriction_and_more.py index 6b7aa0a..1dbd98f 100644 --- a/users/migrations/0004_identity_admin_notes_identity_restriction_and_more.py +++ b/users/migrations/0004_identity_admin_notes_identity_restriction_and_more.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0003_identity_followers_etc"), ] diff --git a/users/migrations/0005_report.py b/users/migrations/0005_report.py index d319128..9496f54 100644 --- a/users/migrations/0005_report.py +++ b/users/migrations/0005_report.py @@ -9,7 +9,6 @@ import users.models.report class Migration(migrations.Migration): - dependencies = [ ("activities", "0004_emoji_post_emojis"), ("users", "0004_identity_admin_notes_identity_restriction_and_more"), diff --git a/users/migrations/0006_identity_actor_type.py b/users/migrations/0006_identity_actor_type.py index 57fc058..1e17bd6 100644 --- a/users/migrations/0006_identity_actor_type.py +++ b/users/migrations/0006_identity_actor_type.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0005_report"), ] diff --git a/users/migrations/0007_remove_invite_email_invite_expires_invite_uses.py b/users/migrations/0007_remove_invite_email_invite_expires_invite_uses.py index 7d98079..88c83c3 100644 --- a/users/migrations/0007_remove_invite_email_invite_expires_invite_uses.py +++ b/users/migrations/0007_remove_invite_email_invite_expires_invite_uses.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0006_identity_actor_type"), ] diff --git a/users/migrations/0008_follow_boosts.py b/users/migrations/0008_follow_boosts.py index 40f8597..683048e 100644 --- a/users/migrations/0008_follow_boosts.py +++ b/users/migrations/0008_follow_boosts.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0007_remove_invite_email_invite_expires_invite_uses"), ] diff --git a/users/migrations/0009_state_and_post_indexes.py b/users/migrations/0009_state_and_post_indexes.py index b845c49..986619e 100644 --- a/users/migrations/0009_state_and_post_indexes.py +++ b/users/migrations/0009_state_and_post_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0008_follow_boosts"), ] diff --git a/users/migrations/0010_domain_state.py b/users/migrations/0010_domain_state.py index 856d18a..e5f56d6 100644 --- a/users/migrations/0010_domain_state.py +++ b/users/migrations/0010_domain_state.py @@ -8,7 +8,6 @@ import users.models.domain class Migration(migrations.Migration): - dependencies = [ ("users", "0009_state_and_post_indexes"), ] diff --git a/users/migrations/0011_announcement.py b/users/migrations/0011_announcement.py index 04b13df..b49c9ab 100644 --- a/users/migrations/0011_announcement.py +++ b/users/migrations/0011_announcement.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0010_domain_state"), ] diff --git a/users/migrations/0012_block_states.py b/users/migrations/0012_block_states.py index ff8ccc0..27ee103 100644 --- a/users/migrations/0012_block_states.py +++ b/users/migrations/0012_block_states.py @@ -8,7 +8,6 @@ import users.models.block class Migration(migrations.Migration): - dependencies = [ ("users", "0011_announcement"), ] diff --git a/users/migrations/0013_stator_indexes.py b/users/migrations/0013_stator_indexes.py index 91ec5e5..dab78d4 100644 --- a/users/migrations/0013_stator_indexes.py +++ b/users/migrations/0013_stator_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ("users", "0012_block_states"), ] diff --git a/users/migrations/0014_domain_notes.py b/users/migrations/0014_domain_notes.py index 0e2a6ce..7eb2742 100644 --- a/users/migrations/0014_domain_notes.py +++ b/users/migrations/0014_domain_notes.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0013_stator_indexes"), ] diff --git a/users/migrations/0015_bookmark.py b/users/migrations/0015_bookmark.py index 2ff3789..e4fcf34 100644 --- a/users/migrations/0015_bookmark.py +++ b/users/migrations/0015_bookmark.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0012_in_reply_to_index"), ("users", "0014_domain_notes"), diff --git a/users/migrations/0016_hashtagfollow.py b/users/migrations/0016_hashtagfollow.py index 475e53b..f78b308 100644 --- a/users/migrations/0016_hashtagfollow.py +++ b/users/migrations/0016_hashtagfollow.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("activities", "0012_in_reply_to_index"), ("users", "0015_bookmark"), diff --git a/users/migrations/0017_identity_featured_collection_uri.py b/users/migrations/0017_identity_featured_collection_uri.py index cd9d43c..4357235 100644 --- a/users/migrations/0017_identity_featured_collection_uri.py +++ b/users/migrations/0017_identity_featured_collection_uri.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0016_hashtagfollow"), ] diff --git a/users/migrations/0018_index_together_migration.py b/users/migrations/0018_index_together_migration.py index cd9c872..35b7330 100644 --- a/users/migrations/0018_index_together_migration.py +++ b/users/migrations/0018_index_together_migration.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0017_identity_featured_collection_uri"), ] diff --git a/users/migrations/0020_alter_identity_local.py b/users/migrations/0020_alter_identity_local.py index 2f163e4..be1e0ad 100644 --- a/users/migrations/0020_alter_identity_local.py +++ b/users/migrations/0020_alter_identity_local.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0019_stator_next_change"), ] diff --git a/users/migrations/0021_identity_aliases.py b/users/migrations/0021_identity_aliases.py index 68d067a..b02a5fd 100644 --- a/users/migrations/0021_identity_aliases.py +++ b/users/migrations/0021_identity_aliases.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("users", "0020_alter_identity_local"), ] diff --git a/users/migrations/0022_follow_request.py b/users/migrations/0022_follow_request.py index f041bef..2caf619 100644 --- a/users/migrations/0022_follow_request.py +++ b/users/migrations/0022_follow_request.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ("users", "0021_identity_aliases"), ] diff --git a/users/schemas.py b/users/schemas.py index 0250d57..bb8f1bb 100644 --- a/users/schemas.py +++ b/users/schemas.py @@ -19,7 +19,6 @@ class NodeInfoUsage(BaseModel): class NodeInfo(BaseModel): - version: Literal["2.0"] software: NodeInfoSoftware protocols: list[str] | None diff --git a/users/views/admin/announcements.py b/users/views/admin/announcements.py index 972654a..7d1fd67 100644 --- a/users/views/admin/announcements.py +++ b/users/views/admin/announcements.py @@ -9,7 +9,6 @@ from users.views.admin.generic import HTMXActionView @method_decorator(admin_required, name="dispatch") class AnnouncementsRoot(ListView): - template_name = "admin/announcements.html" paginate_by = 30 @@ -26,7 +25,6 @@ class AnnouncementsRoot(ListView): @method_decorator(admin_required, name="dispatch") class AnnouncementCreate(CreateView): - model = Announcement template_name = "admin/announcement_create.html" extra_context = {"section": "announcements"} @@ -45,7 +43,6 @@ class AnnouncementCreate(CreateView): @method_decorator(admin_required, name="dispatch") class AnnouncementEdit(UpdateView): - model = Announcement template_name = "admin/announcement_edit.html" extra_context = {"section": "announcements"} @@ -61,7 +58,6 @@ class AnnouncementEdit(UpdateView): @method_decorator(admin_required, name="dispatch") class AnnouncementDelete(DeleteView): - model = Announcement template_name = "admin/announcement_delete.html" success_url = Announcement.urls.admin_root diff --git a/users/views/admin/domains.py b/users/views/admin/domains.py index d2a98ec..e221b08 100644 --- a/users/views/admin/domains.py +++ b/users/views/admin/domains.py @@ -35,7 +35,6 @@ class DomainValidator(RegexValidator): @method_decorator(admin_required, name="dispatch") class Domains(TemplateView): - template_name = "admin/domains.html" def get_context_data(self): @@ -47,7 +46,6 @@ class Domains(TemplateView): @method_decorator(admin_required, name="dispatch") class DomainCreate(FormView): - template_name = "admin/domain_create.html" extra_context = {"section": "domains"} @@ -156,7 +154,6 @@ class DomainCreate(FormView): @method_decorator(admin_required, name="dispatch") class DomainEdit(FormView): - template_name = "admin/domain_edit.html" extra_context = {"section": "domains"} @@ -250,7 +247,6 @@ class DomainEdit(FormView): @method_decorator(admin_required, name="dispatch") class DomainDelete(TemplateView): - template_name = "admin/domain_delete.html" def dispatch(self, request, domain): diff --git a/users/views/admin/emoji.py b/users/views/admin/emoji.py index 9053cee..9acfd04 100644 --- a/users/views/admin/emoji.py +++ b/users/views/admin/emoji.py @@ -13,7 +13,6 @@ from users.views.admin.generic import HTMXActionView @method_decorator(moderator_required, name="dispatch") class EmojiRoot(ListView): - template_name = "admin/emoji.html" paginate_by = 50 @@ -41,7 +40,6 @@ class EmojiRoot(ListView): @method_decorator(moderator_required, name="dispatch") class EmojiCreate(FormView): - template_name = "admin/emoji_create.html" extra_context = {"section": "emoji"} diff --git a/users/views/admin/hashtags.py b/users/views/admin/hashtags.py index d9a9aaa..3090d44 100644 --- a/users/views/admin/hashtags.py +++ b/users/views/admin/hashtags.py @@ -10,7 +10,6 @@ from users.decorators import moderator_required @method_decorator(moderator_required, name="dispatch") class Hashtags(ListView): - template_name = "admin/hashtags.html" paginate_by = 30 @@ -26,7 +25,6 @@ class Hashtags(ListView): @method_decorator(moderator_required, name="dispatch") class HashtagEdit(FormView): - template_name = "admin/hashtag_edit.html" extra_context = {"section": "hashtags"} diff --git a/users/views/admin/identities.py b/users/views/admin/identities.py index 98fca09..b31f638 100644 --- a/users/views/admin/identities.py +++ b/users/views/admin/identities.py @@ -10,7 +10,6 @@ from users.models import Identity, IdentityStates @method_decorator(moderator_required, name="dispatch") class IdentitiesRoot(ListView): - template_name = "admin/identities.html" paginate_by = 30 @@ -51,7 +50,6 @@ class IdentitiesRoot(ListView): @method_decorator(moderator_required, name="dispatch") class IdentityEdit(FormView): - template_name = "admin/identity_edit.html" extra_context = { "section": "identities", diff --git a/users/views/admin/invites.py b/users/views/admin/invites.py index 6baace7..f368142 100644 --- a/users/views/admin/invites.py +++ b/users/views/admin/invites.py @@ -13,7 +13,6 @@ from users.models import Invite @method_decorator(moderator_required, name="dispatch") class InvitesRoot(ListView): - template_name = "admin/invites.html" paginate_by = 30 @@ -29,7 +28,6 @@ class InvitesRoot(ListView): @method_decorator(moderator_required, name="dispatch") class InviteCreate(FormView): - template_name = "admin/invite_create.html" extra_context = { "section": "invites", @@ -65,7 +63,6 @@ class InviteCreate(FormView): @method_decorator(moderator_required, name="dispatch") class InviteView(FormView): - template_name = "admin/invite_view.html" extra_context = { "section": "invites", diff --git a/users/views/admin/reports.py b/users/views/admin/reports.py index 1cc59a3..c6ad9e9 100644 --- a/users/views/admin/reports.py +++ b/users/views/admin/reports.py @@ -10,7 +10,6 @@ from users.models import Identity, Report @method_decorator(moderator_required, name="dispatch") class ReportsRoot(ListView): - template_name = "admin/reports.html" paginate_by = 30 @@ -34,7 +33,6 @@ class ReportsRoot(ListView): @method_decorator(moderator_required, name="dispatch") class ReportView(FormView): - template_name = "admin/report_view.html" extra_context = { "section": "reports", diff --git a/users/views/admin/settings.py b/users/views/admin/settings.py index 4784523..ba00963 100644 --- a/users/views/admin/settings.py +++ b/users/views/admin/settings.py @@ -24,7 +24,6 @@ class AdminSettingsPage(SettingsPage): class BasicSettings(AdminSettingsPage): - section = "basic" options = { @@ -155,7 +154,6 @@ cache_field_defaults = { class TuningSettings(AdminSettingsPage): - section = "tuning" options = { @@ -196,7 +194,6 @@ class TuningSettings(AdminSettingsPage): class PoliciesSettings(AdminSettingsPage): - section = "policies" options = { diff --git a/users/views/admin/stator.py b/users/views/admin/stator.py index c3ce01d..53f1a88 100644 --- a/users/views/admin/stator.py +++ b/users/views/admin/stator.py @@ -7,7 +7,6 @@ from users.decorators import admin_required @method_decorator(admin_required, name="dispatch") class Stator(TemplateView): - template_name = "admin/stator.html" def get_context_data(self): diff --git a/users/views/admin/users.py b/users/views/admin/users.py index 5c67947..24d303a 100644 --- a/users/views/admin/users.py +++ b/users/views/admin/users.py @@ -10,7 +10,6 @@ from users.models import User @method_decorator(admin_required, name="dispatch") class UsersRoot(ListView): - template_name = "admin/users.html" paginate_by = 30 @@ -33,7 +32,6 @@ class UsersRoot(ListView): @method_decorator(admin_required, name="dispatch") class UserEdit(FormView): - template_name = "admin/user_edit.html" extra_context = { "section": "users", diff --git a/users/views/auth.py b/users/views/auth.py index 945bf42..4aba5da 100644 --- a/users/views/auth.py +++ b/users/views/auth.py @@ -29,11 +29,9 @@ class Logout(LogoutView): class Signup(FormView): - template_name = "auth/signup.html" class form_class(forms.Form): - email = forms.EmailField( help_text="We will send a link to this email to create your account.", ) @@ -126,11 +124,9 @@ class Signup(FormView): class TriggerReset(FormView): - template_name = "auth/trigger_reset.html" class form_class(forms.Form): - email = forms.EmailField( help_text="We will send a reset link to this email", ) @@ -155,11 +151,9 @@ class TriggerReset(FormView): class PerformReset(FormView): - template_name = "auth/perform_reset.html" class form_class(forms.Form): - password = forms.CharField( widget=forms.PasswordInput, help_text="Must be at least 8 characters, and contain both letters and numbers.", diff --git a/users/views/settings/delete.py b/users/views/settings/delete.py index 7f3d26c..72c50f2 100644 --- a/users/views/settings/delete.py +++ b/users/views/settings/delete.py @@ -7,7 +7,6 @@ from users.views.base import IdentityViewMixin class DeleteIdentity(IdentityViewMixin, FormView): - template_name = "settings/delete.html" extra_context = {"section": "delete"} diff --git a/users/views/settings/import_export.py b/users/views/settings/import_export.py index 1de487d..159af42 100644 --- a/users/views/settings/import_export.py +++ b/users/views/settings/import_export.py @@ -103,9 +103,9 @@ class CsvView(IdentityViewMixin, View): else: raise ValueError(f"Cannot export attribute {attrname}") # Make it into CSV format - if type(value) == bool: + if isinstance(value, bool): value = "true" if value else "false" - elif type(value) == int: + elif isinstance(value, int): value = str(value) row.append(value) writer.writerow(row) diff --git a/users/views/settings/tokens.py b/users/views/settings/tokens.py index c82c4ff..5f000ec 100644 --- a/users/views/settings/tokens.py +++ b/users/views/settings/tokens.py @@ -61,7 +61,6 @@ class TokenCreate(IdentityViewMixin, FormView): class TokenEdit(IdentityViewMixin, DetailView): - template_name = "settings/token_edit.html" extra_context = {"section": "tokens"}