From fc599f8b9a320cd245893dea8e68a35e1bbdcba1 Mon Sep 17 00:00:00 2001
From: Ritik Ranjan <rritik772@outlook.com>
Date: Sat, 28 Jan 2023 12:10:06 +0530
Subject: [PATCH 01/30] fixed singularisation/pluralisation

edited two files
---
 bookwyrm/templates/import/import.html | 2 +-
 bookwyrm/views/imports/import_data.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index f3062a447..9d278b28d 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -17,7 +17,7 @@
     {% if site.imports_enabled %}
         {% if import_size_limit and import_limit_reset %}
             <div class="notification">
-                <p>{% blocktrans %}Currently you are allowed to import {{ import_size_limit }} books every {{ import_limit_reset }} days.{% endblocktrans %}</p>
+                <p>{% blocktrans %}Currently you are allowed to import {{ import_size_limit }} {{book_noun}} every {{ import_limit_reset }} {{day_noun}}.{% endblocktrans %}</p>
                 <p>{% blocktrans %}You have {{ allowed_imports }} left.{% endblocktrans %}</p>
             </div>
         {% endif %}
diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py
index 01812e1d5..d09e0257f 100644
--- a/bookwyrm/views/imports/import_data.py
+++ b/bookwyrm/views/imports/import_data.py
@@ -64,6 +64,9 @@ class Import(View):
         data["import_limit_reset"] = site_settings.import_limit_reset
         data["allowed_imports"] = site_settings.import_size_limit - imported_books
 
+        data["book_noun"] = "books" if site_settings.import_size_limit > 1 else 'book'
+        data["day_noun"] = "days" if site_settings.import_limit_reset > 1 else 'day'
+
         return TemplateResponse(request, "import/import.html", data)
 
     def post(self, request):

From e5e9e807cabf4e259bd426a08d34624c2d9f36ed Mon Sep 17 00:00:00 2001
From: Ritik Ranjan <rritik772@outlook.com>
Date: Sat, 28 Jan 2023 21:11:20 +0530
Subject: [PATCH 02/30] Splited stirng into two then fixed pluralization error.

---
 bookwyrm/templates/import/import.html | 9 ++++++++-
 bookwyrm/views/imports/import_data.py | 3 ---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index 9d278b28d..06817d302 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -17,7 +17,14 @@
     {% if site.imports_enabled %}
         {% if import_size_limit and import_limit_reset %}
             <div class="notification">
-                <p>{% blocktrans %}Currently you are allowed to import {{ import_size_limit }} {{book_noun}} every {{ import_limit_reset }} {{day_noun}}.{% endblocktrans %}</p>
+                <p>
+                    {% blocktrans count books=import_size_limit%}
+                        Currently you are allowed to import {{ import_size_limit }} {{books}}
+                    {% endblocktrans %}
+                    {% blocktrans count days=import_limit_reset%}
+                         every {{ import_limit_reset }} {{days}}.
+                    {% endblocktrans %}
+                </p>
                 <p>{% blocktrans %}You have {{ allowed_imports }} left.{% endblocktrans %}</p>
             </div>
         {% endif %}
diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py
index d09e0257f..01812e1d5 100644
--- a/bookwyrm/views/imports/import_data.py
+++ b/bookwyrm/views/imports/import_data.py
@@ -64,9 +64,6 @@ class Import(View):
         data["import_limit_reset"] = site_settings.import_limit_reset
         data["allowed_imports"] = site_settings.import_size_limit - imported_books
 
-        data["book_noun"] = "books" if site_settings.import_size_limit > 1 else 'book'
-        data["day_noun"] = "days" if site_settings.import_limit_reset > 1 else 'day'
-
         return TemplateResponse(request, "import/import.html", data)
 
     def post(self, request):

From adcf9310a0850cb646af81fdbbfc53c31f3ac41d Mon Sep 17 00:00:00 2001
From: Ritik Ranjan <rritik772@outlook.com>
Date: Sat, 28 Jan 2023 21:23:08 +0530
Subject: [PATCH 03/30] Fixed Syntax of pluralisation

---
 bookwyrm/templates/import/import.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index 06817d302..9146d0715 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -19,10 +19,14 @@
             <div class="notification">
                 <p>
                     {% blocktrans count books=import_size_limit%}
-                        Currently you are allowed to import {{ import_size_limit }} {{books}}
+                        Currently you are allowed to import {{ import_size_limit }} book
+                    {% plural %}
+                        Currently you are allowed to import {{ import_size_limit }} books
                     {% endblocktrans %}
                     {% blocktrans count days=import_limit_reset%}
-                         every {{ import_limit_reset }} {{days}}.
+                         every {{ import_limit_reset }} day.
+                    {% plural %}
+                         every {{ import_limit_reset }} days.
                     {% endblocktrans %}
                 </p>
                 <p>{% blocktrans %}You have {{ allowed_imports }} left.{% endblocktrans %}</p>

From a94a4732ec726cc09bb9b810e4f5d9313fe84dba Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Mon, 24 Apr 2023 23:29:55 -0500
Subject: [PATCH 04/30] add support for title sort to ignore initial article

---
 bookwyrm/forms/lists.py                       |  2 +-
 .../migrations/0179_populate_sort_title.py    | 41 +++++++++++++++++++
 bookwyrm/models/book.py                       | 12 ++++++
 bookwyrm/settings.py                          |  3 ++
 bookwyrm/templates/shelf/shelf.html           |  2 +-
 5 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/migrations/0179_populate_sort_title.py

diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py
index 647db3bfe..f5008baa3 100644
--- a/bookwyrm/forms/lists.py
+++ b/bookwyrm/forms/lists.py
@@ -24,7 +24,7 @@ class SortListForm(forms.Form):
     sort_by = ChoiceField(
         choices=(
             ("order", _("List Order")),
-            ("title", _("Book Title")),
+            ("sort_title", _("Book Title")),
             ("rating", _("Rating")),
         ),
         label=_("Sort By"),
diff --git a/bookwyrm/migrations/0179_populate_sort_title.py b/bookwyrm/migrations/0179_populate_sort_title.py
new file mode 100644
index 000000000..5c9ae39a3
--- /dev/null
+++ b/bookwyrm/migrations/0179_populate_sort_title.py
@@ -0,0 +1,41 @@
+import re
+from itertools import chain
+
+from django.db import migrations, transaction
+from django.db.models import Q
+
+from bookwyrm.settings import LANGUAGE_ARTICLES
+
+
+@transaction.atomic
+def populate_sort_title(apps, schema_editor):
+    Edition = apps.get_model("bookwyrm", "Edition")
+    db_alias = schema_editor.connection.alias
+    editions_wo_sort_title = Edition.objects.using(db_alias).filter(
+        Q(sort_title__isnull=True) | Q(sort_title__exact="")
+    )
+    for edition in editions_wo_sort_title:
+        articles = chain(
+            *(LANGUAGE_ARTICLES.get(language, ()) for language in edition.languages)
+        )
+        if articles:
+            icase_articles = (
+                f"[{a[0].capitalize()}{a[0].lower()}]{a[1:]}" for a in articles
+            )
+            edition.sort_title = re.sub(
+                f'^{" |^".join(icase_articles)} ', "", edition.title
+            )
+        else:
+            edition.sort_title = edition.title
+        edition.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0178_auto_20230328_2132"),
+    ]
+
+    operations = [
+        migrations.RunPython(populate_sort_title),
+    ]
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 4e7ffcad3..2bad36a50 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -1,4 +1,5 @@
 """ database schema for books and shelves """
+from itertools import chain
 import re
 
 from django.contrib.postgres.search import SearchVectorField
@@ -17,6 +18,7 @@ from bookwyrm.preview_images import generate_edition_preview_image_task
 from bookwyrm.settings import (
     DOMAIN,
     DEFAULT_LANGUAGE,
+    LANGUAGE_ARTICLES,
     ENABLE_PREVIEW_IMAGES,
     ENABLE_THUMBNAIL_GENERATION,
 )
@@ -363,6 +365,16 @@ class Edition(Book):
             for author_id in self.authors.values_list("id", flat=True):
                 cache.delete(f"author-books-{author_id}")
 
+        # Create sort title by removing articles from title
+        if self.sort_title is None:
+            articles = chain(
+                *(LANGUAGE_ARTICLES[language] for language in self.languages)
+            )
+            icase_articles = (
+                f"[{a[0].capitalize()}{a[0].lower()}]{a[1:]}" for a in articles
+            )
+            self.sort_title = re.sub(f'^{" |^".join(icase_articles)} ', "", self.title)
+
         return super().save(*args, **kwargs)
 
     @classmethod
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 8dcf90fcb..f9940bcd5 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -312,6 +312,9 @@ LANGUAGES = [
     ("zh-hant", _("繁體中文 (Traditional Chinese)")),
 ]
 
+LANGUAGE_ARTICLES = {
+    "English": {"The", "A", "An"},
+}
 
 TIME_ZONE = "UTC"
 
diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html
index 79ec241be..7d0035ed3 100644
--- a/bookwyrm/templates/shelf/shelf.html
+++ b/bookwyrm/templates/shelf/shelf.html
@@ -145,7 +145,7 @@
             <thead>
                 <tr>
                     <th>{% trans "Cover"%}</th>
-                    <th>{% trans "Title"  as text %}{% include 'snippets/table-sort-header.html' with field="title" sort=sort text=text %}</th>
+                    <th>{% trans "Title"  as text %}{% include 'snippets/table-sort-header.html' with field="sort_title" sort=sort text=text %}</th>
                     <th>{% trans "Author"  as text %}{% include 'snippets/table-sort-header.html' with field="author" sort=sort text=text %}</th>
                     {% if request.user.is_authenticated %}
                         {% if is_self %}

From 21d9cb5fe56c5f37429610abbbdb894940b4ec87 Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Tue, 25 Apr 2023 00:15:58 -0500
Subject: [PATCH 05/30] updating shelf view

---
 bookwyrm/views/shelf/shelf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/shelf/shelf.py b/bookwyrm/views/shelf/shelf.py
index 0c3074902..dbbcc2d3a 100644
--- a/bookwyrm/views/shelf/shelf.py
+++ b/bookwyrm/views/shelf/shelf.py
@@ -128,7 +128,7 @@ class Shelf(View):
 def sort_books(books, sort):
     """Books in shelf sorting"""
     sort_fields = [
-        "title",
+        "sort_title",
         "author",
         "shelved_date",
         "start_date",

From a3013c6224e91dbc6d836a6b4f660fdbefe6663f Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Tue, 25 Apr 2023 00:20:54 -0500
Subject: [PATCH 06/30] updating list view

---
 bookwyrm/views/list/list.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py
index 30d6f970a..660bd1a62 100644
--- a/bookwyrm/views/list/list.py
+++ b/bookwyrm/views/list/list.py
@@ -129,7 +129,7 @@ def sort_list(request, items):
     """helper to handle the surprisingly involved sorting"""
     # sort_by shall be "order" unless a valid alternative is given
     sort_by = request.GET.get("sort_by", "order")
-    if sort_by not in ("order", "title", "rating"):
+    if sort_by not in ("order", "sort_title", "rating"):
         sort_by = "order"
 
     # direction shall be "ascending" unless a valid alternative is given
@@ -139,7 +139,7 @@ def sort_list(request, items):
 
     directional_sort_by = {
         "order": "order",
-        "title": "book__title",
+        "sort_title": "book__sort_title",
         "rating": "average_rating",
     }[sort_by]
     if direction == "descending":

From 6b39052fcca4aebba6f9d9e4d049e4afd1b0d66d Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Tue, 25 Apr 2023 07:17:23 -0500
Subject: [PATCH 07/30] Adding test for sort_title population

---
 bookwyrm/tests/models/test_book_model.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py
index 33854b3d6..50ff8c7e1 100644
--- a/bookwyrm/tests/models/test_book_model.py
+++ b/bookwyrm/tests/models/test_book_model.py
@@ -132,3 +132,16 @@ class Book(TestCase):
         self.assertIsNotNone(book.cover_bw_book_xlarge_jpg.url)
         self.assertIsNotNone(book.cover_bw_book_xxlarge_webp.url)
         self.assertIsNotNone(book.cover_bw_book_xxlarge_jpg.url)
+
+    def test_populate_sort_title(self):
+        """The sort title should remove the initial article on save"""
+        books = (
+            models.Edition.objects.create(
+                title=f"{article} Test Edition", languages=[langauge]
+            )
+            for langauge, articles in settings.LANGUAGE_ARTICLES.items()
+            for article in article
+        )
+        self.assertEqual(
+            all([book.sort_title == "Test Edition" for book in books])
+        )

From 575e1bac4cd6837639ed849cb19040a53502e6d9 Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Tue, 25 Apr 2023 19:46:38 -0500
Subject: [PATCH 08/30] responding to review comments

---
 bookwyrm/migrations/0179_populate_sort_title.py | 14 ++++----------
 bookwyrm/models/book.py                         | 16 ++++++++--------
 bookwyrm/settings.py                            |  2 +-
 bookwyrm/tests/models/test_book_model.py        |  6 ++----
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/migrations/0179_populate_sort_title.py b/bookwyrm/migrations/0179_populate_sort_title.py
index 5c9ae39a3..7f79fb321 100644
--- a/bookwyrm/migrations/0179_populate_sort_title.py
+++ b/bookwyrm/migrations/0179_populate_sort_title.py
@@ -18,16 +18,10 @@ def populate_sort_title(apps, schema_editor):
         articles = chain(
             *(LANGUAGE_ARTICLES.get(language, ()) for language in edition.languages)
         )
-        if articles:
-            icase_articles = (
-                f"[{a[0].capitalize()}{a[0].lower()}]{a[1:]}" for a in articles
-            )
-            edition.sort_title = re.sub(
-                f'^{" |^".join(icase_articles)} ', "", edition.title
-            )
-        else:
-            edition.sort_title = edition.title
-        edition.save()
+        edition.sort_title = re.sub(
+            f'^{" |^".join(articles)} ', "", str(edition.title).lower()
+        )
+    Edition.objects.bulk_update(editions_wo_sort_title, ["sort_title"])
 
 
 class Migration(migrations.Migration):
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 2bad36a50..3cc89a45d 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -366,14 +366,14 @@ class Edition(Book):
                 cache.delete(f"author-books-{author_id}")
 
         # Create sort title by removing articles from title
-        if self.sort_title is None:
-            articles = chain(
-                *(LANGUAGE_ARTICLES[language] for language in self.languages)
-            )
-            icase_articles = (
-                f"[{a[0].capitalize()}{a[0].lower()}]{a[1:]}" for a in articles
-            )
-            self.sort_title = re.sub(f'^{" |^".join(icase_articles)} ', "", self.title)
+        if self.sort_title in [None, ""]:
+            if self.sort_title in [None, ""]:
+                articles = chain(
+                    *(LANGUAGE_ARTICLES.get(language, ()) for language in self.languages)
+                )
+                self.sort_title = re.sub(
+                    f'^{" |^".join(articles)} ', "", str(self.title).lower()
+                )
 
         return super().save(*args, **kwargs)
 
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index f9940bcd5..23fa3b064 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -313,7 +313,7 @@ LANGUAGES = [
 ]
 
 LANGUAGE_ARTICLES = {
-    "English": {"The", "A", "An"},
+    "English": {"the", "a", "an"},
 }
 
 TIME_ZONE = "UTC"
diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py
index 50ff8c7e1..fda74cb38 100644
--- a/bookwyrm/tests/models/test_book_model.py
+++ b/bookwyrm/tests/models/test_book_model.py
@@ -140,8 +140,6 @@ class Book(TestCase):
                 title=f"{article} Test Edition", languages=[langauge]
             )
             for langauge, articles in settings.LANGUAGE_ARTICLES.items()
-            for article in article
-        )
-        self.assertEqual(
-            all([book.sort_title == "Test Edition" for book in books])
+            for article in articles
         )
+        self.assertTrue(all(book.sort_title == "Test Edition" for book in books))

From f43d7f8c70bc7f5b60a66ff0854e1e13e48ac352 Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Tue, 25 Apr 2023 21:00:16 -0500
Subject: [PATCH 09/30] fixing test and other checks

---
 bookwyrm/models/book.py                  | 5 ++++-
 bookwyrm/tests/models/test_book_model.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 3cc89a45d..c25f8fee2 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -369,7 +369,10 @@ class Edition(Book):
         if self.sort_title in [None, ""]:
             if self.sort_title in [None, ""]:
                 articles = chain(
-                    *(LANGUAGE_ARTICLES.get(language, ()) for language in self.languages)
+                    *(
+                        LANGUAGE_ARTICLES.get(language, ())
+                        for language in tuple(self.languages)
+                    )
                 )
                 self.sort_title = re.sub(
                     f'^{" |^".join(articles)} ', "", str(self.title).lower()
diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py
index fda74cb38..825f42b87 100644
--- a/bookwyrm/tests/models/test_book_model.py
+++ b/bookwyrm/tests/models/test_book_model.py
@@ -142,4 +142,4 @@ class Book(TestCase):
             for langauge, articles in settings.LANGUAGE_ARTICLES.items()
             for article in articles
         )
-        self.assertTrue(all(book.sort_title == "Test Edition" for book in books))
+        self.assertTrue(all(book.sort_title == "test edition" for book in books))

From 858a93e98acdecf80264c6b04174bea5710a3bd6 Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Tue, 25 Apr 2023 21:05:11 -0500
Subject: [PATCH 10/30] fixing migration

---
 bookwyrm/migrations/0179_populate_sort_title.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/migrations/0179_populate_sort_title.py b/bookwyrm/migrations/0179_populate_sort_title.py
index 7f79fb321..a5055c5e1 100644
--- a/bookwyrm/migrations/0179_populate_sort_title.py
+++ b/bookwyrm/migrations/0179_populate_sort_title.py
@@ -16,7 +16,10 @@ def populate_sort_title(apps, schema_editor):
     )
     for edition in editions_wo_sort_title:
         articles = chain(
-            *(LANGUAGE_ARTICLES.get(language, ()) for language in edition.languages)
+            *(
+                LANGUAGE_ARTICLES.get(language, ())
+                for language in tuple(edition.languages)
+            )
         )
         edition.sort_title = re.sub(
             f'^{" |^".join(articles)} ', "", str(edition.title).lower()

From a6e5939ad2e37d64993392149080024eb0ae4add Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Wed, 26 Apr 2023 23:05:03 -0500
Subject: [PATCH 11/30] adding sort title to edit book form

---
 bookwyrm/forms/books.py                          | 4 ++++
 bookwyrm/templates/book/edit/edit_book_form.html | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py
index 623beaa04..3a3979e2c 100644
--- a/bookwyrm/forms/books.py
+++ b/bookwyrm/forms/books.py
@@ -20,6 +20,7 @@ class EditionForm(CustomForm):
         model = models.Edition
         fields = [
             "title",
+            "sort_title",
             "subtitle",
             "description",
             "series",
@@ -45,6 +46,9 @@ class EditionForm(CustomForm):
         ]
         widgets = {
             "title": forms.TextInput(attrs={"aria-describedby": "desc_title"}),
+            "sort_title": forms.TextInput(
+                attrs={"aria-describedby": "desc_sort_title"}
+            ),
             "subtitle": forms.TextInput(attrs={"aria-describedby": "desc_subtitle"}),
             "description": forms.Textarea(
                 attrs={"aria-describedby": "desc_description"}
diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html
index e85164444..72d80e9cf 100644
--- a/bookwyrm/templates/book/edit/edit_book_form.html
+++ b/bookwyrm/templates/book/edit/edit_book_form.html
@@ -28,6 +28,15 @@
                     {% include 'snippets/form_errors.html' with errors_list=form.title.errors id="desc_title" %}
                 </div>
 
+                <div class="field">
+                    <label class="label" for="id_sort_title">
+                        {% trans "Sort Title:" %}
+                    </label>
+                    <input type="text" name="sort_title" value="{{ form.sort_title.value|default:'' }}" maxlength="255" class="input" required="" id="id_sort_title" aria-describedby="desc_sort_title">
+
+                    {% include 'snippets/form_errors.html' with errors_list=form.sort_title.errors id="desc_sort_title" %}
+                </div>
+
                 <div class="field">
                     <label class="label" for="id_subtitle">
                         {% trans "Subtitle:" %}

From a1df116c58c3150f7d66c4a57e99738e49a44ab6 Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Thu, 27 Apr 2023 15:30:52 -0500
Subject: [PATCH 12/30] Adding batch processing to the sort title migration

---
 .../migrations/0179_populate_sort_title.py    | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/migrations/0179_populate_sort_title.py b/bookwyrm/migrations/0179_populate_sort_title.py
index a5055c5e1..02691f615 100644
--- a/bookwyrm/migrations/0179_populate_sort_title.py
+++ b/bookwyrm/migrations/0179_populate_sort_title.py
@@ -7,6 +7,16 @@ from django.db.models import Q
 from bookwyrm.settings import LANGUAGE_ARTICLES
 
 
+def set_sort_title(edition):
+    articles = chain(
+        *(LANGUAGE_ARTICLES.get(language, ()) for language in tuple(edition.languages))
+    )
+    edition.sort_title = re.sub(
+        f'^{" |^".join(articles)} ', "", str(edition.title).lower()
+    )
+    return edition
+
+
 @transaction.atomic
 def populate_sort_title(apps, schema_editor):
     Edition = apps.get_model("bookwyrm", "Edition")
@@ -14,17 +24,16 @@ def populate_sort_title(apps, schema_editor):
     editions_wo_sort_title = Edition.objects.using(db_alias).filter(
         Q(sort_title__isnull=True) | Q(sort_title__exact="")
     )
-    for edition in editions_wo_sort_title:
-        articles = chain(
-            *(
-                LANGUAGE_ARTICLES.get(language, ())
-                for language in tuple(edition.languages)
-            )
+    batch_size = 50000
+    start = 0
+    end = batch_size
+    while editions_wo_sort_title[start:end]:
+        Edition.objects.bulk_update(
+            (set_sort_title(edition) for edition in editions_wo_sort_title[start:end]),
+            ["sort_title"],
         )
-        edition.sort_title = re.sub(
-            f'^{" |^".join(articles)} ', "", str(edition.title).lower()
-        )
-    Edition.objects.bulk_update(editions_wo_sort_title, ["sort_title"])
+        start = end
+        end += batch_size
 
 
 class Migration(migrations.Migration):

From 490064cdf842f132140bbb0631e633cb4daf9bf9 Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Sat, 29 Apr 2023 09:43:55 -0500
Subject: [PATCH 13/30] updating sort title migration

---
 bookwyrm/migrations/0179_populate_sort_title.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/migrations/0179_populate_sort_title.py b/bookwyrm/migrations/0179_populate_sort_title.py
index 02691f615..c5bdcb25c 100644
--- a/bookwyrm/migrations/0179_populate_sort_title.py
+++ b/bookwyrm/migrations/0179_populate_sort_title.py
@@ -24,13 +24,15 @@ def populate_sort_title(apps, schema_editor):
     editions_wo_sort_title = Edition.objects.using(db_alias).filter(
         Q(sort_title__isnull=True) | Q(sort_title__exact="")
     )
-    batch_size = 50000
+    batch_size = 20
     start = 0
     end = batch_size
-    while editions_wo_sort_title[start:end]:
+    while True:
+        batch = editions_wo_sort_title[start:end]
+        if not batch.exists():
+            break
         Edition.objects.bulk_update(
-            (set_sort_title(edition) for edition in editions_wo_sort_title[start:end]),
-            ["sort_title"],
+            (set_sort_title(edition) for edition in batch), ["sort_title"]
         )
         start = end
         end += batch_size

From ad1ddf2bff9c8647775b8624115bf4aba891b2fd Mon Sep 17 00:00:00 2001
From: Zach Flanders <zachflanders@gmail.com>
Date: Sat, 29 Apr 2023 09:48:01 -0500
Subject: [PATCH 14/30] Fixing batch size

---
 bookwyrm/migrations/0179_populate_sort_title.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/migrations/0179_populate_sort_title.py b/bookwyrm/migrations/0179_populate_sort_title.py
index c5bdcb25c..bb1dba437 100644
--- a/bookwyrm/migrations/0179_populate_sort_title.py
+++ b/bookwyrm/migrations/0179_populate_sort_title.py
@@ -24,7 +24,7 @@ def populate_sort_title(apps, schema_editor):
     editions_wo_sort_title = Edition.objects.using(db_alias).filter(
         Q(sort_title__isnull=True) | Q(sort_title__exact="")
     )
-    batch_size = 20
+    batch_size = 50000
     start = 0
     end = batch_size
     while True:

From 11f1a4662e5727faf89115fc2be8cf30c575dc8a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 21 Jun 2023 15:46:50 -0700
Subject: [PATCH 15/30] Don't allow invalid account reactivation

---
 bookwyrm/models/user.py            | 2 ++
 bookwyrm/views/landing/register.py | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index f39468246..bf4f9401b 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -394,6 +394,8 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     def reactivate(self):
         """Now you want to come back, huh?"""
         # pylint: disable=attribute-defined-outside-init
+        if not user.allow_reactivation:
+            return
         self.is_active = True
         self.deactivation_reason = None
         self.allow_reactivation = False
diff --git a/bookwyrm/views/landing/register.py b/bookwyrm/views/landing/register.py
index 2e1a1d321..e5a76a0d6 100644
--- a/bookwyrm/views/landing/register.py
+++ b/bookwyrm/views/landing/register.py
@@ -105,7 +105,9 @@ class ConfirmEmailCode(View):
 
         # look up the user associated with this code
         try:
-            user = models.User.objects.get(confirmation_code=code)
+            user = models.User.objects.get(
+                confirmation_code=code, deactivation_reason="pending"
+            )
         except models.User.DoesNotExist:
             return TemplateResponse(
                 request, "confirm_email/confirm_email.html", {"valid": False}

From 6a949c24e2cfc82917f168c06a460c152b42d081 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 21 Jun 2023 15:52:32 -0700
Subject: [PATCH 16/30] Typo fix

---
 bookwyrm/models/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index bf4f9401b..268a6c2a3 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -394,7 +394,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     def reactivate(self):
         """Now you want to come back, huh?"""
         # pylint: disable=attribute-defined-outside-init
-        if not user.allow_reactivation:
+        if not self.allow_reactivation:
             return
         self.is_active = True
         self.deactivation_reason = None

From e783c9069311221d160c3ff368a79a5c3b2399e9 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 26 Jun 2023 08:27:14 +1000
Subject: [PATCH 17/30] add FEDERATION info

---
 FEDERATION.md | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 223 insertions(+)
 create mode 100644 FEDERATION.md

diff --git a/FEDERATION.md b/FEDERATION.md
new file mode 100644
index 000000000..fcd3d5ce9
--- /dev/null
+++ b/FEDERATION.md
@@ -0,0 +1,223 @@
+# Federation
+
+TODO: extension object and activity examples
+TODO: show how things are translated into `Notes` or `Articles`
+
+BookWyrm uses the [ActivityPub](http://activitypub.rocks/) protocol to send and receive user activity between other BookWyrm instances and other services that implement ActivityPub. To handle book data, BookWyrm has a handful of extended Activity types which are not part of the standard, but are legible to other BookWyrm instances.
+
+## Activities and Objects
+
+### Users and relationships
+User relationship interactions follow the standard ActivityPub spec.
+
+- `Follow`: request to receive statuses from a user, and view their statuses that have followers-only privacy
+- `Accept`: approves a `Follow` and finalizes the relationship
+- `Reject`: denies a `Follow`
+- `Block`: prevent users from seeing one another's statuses, and prevents the blocked user from viewing the actor's profile
+- `Update`: updates a user's profile and settings
+- `Delete`: deactivates a user
+- `Undo`: reverses a `Follow` or `Block`
+
+### Statuses
+
+BookWyrm is focused on book reading activities - it is not a general-purpose messaging application. For this reason, BookWyrm only accepts status `Create` activities if they are:
+
+- Direct messages (i.e., `Note`s with the privacy level `direct`, which mention a local user),
+- Related to a book (of a custom status type that includes the field `inReplyToBook`),
+- Replies to existing statuses saved in the database
+
+All other statuses will be received by the instance inbox, but **will not be delivered to user inboxes or displayed to users**.
+
+#### Non-standard Object types
+
+With the exception of `Note`, the following object types are used in Bookwyrm but are not currently provided with a JSON-LD `@context` extension IRI. This is likely to change in future to make them true deserialisable JSON-LD objects.
+
+##### Note
+
+Within BookWyrm a `Note` is constructed according to [the ActivityStreams vocabulary](https://www.w3.org/TR/activitystreams-vocabulary/#dfn-note), however `Note`s can only be created as direct messages or as replies to other statuses. As mentioned above, this also applies to incoming `Note`s.
+
+##### Review
+
+A `Review` is a status in response to a book (indicated by the `inReplyToBook` field), which has a title, body, and numerical rating between 0 (not rated) and 5.
+
+##### Comment
+
+A `Comment` on a book mentions a book and has a message body.
+
+##### Quotation
+
+A quotation (aka "quote") has a message body, an excerpt from a book, and mentions a book.
+
+Example:
+
+```json
+{
+    "id": "https://example.com/user/mouse/quotation/13",
+    "url": "https://example.com/user/mouse/quotation/13",
+    "inReplyTo": null,
+    "published": "2020-05-10T02:38:31.150343+00:00",
+    "attributedTo": "https://example.com/user/mouse",
+    "to": [
+        "https://www.w3.org/ns/activitystreams#Public"
+        ],
+    "cc": [
+        "https://example.com/user/mouse/followers"
+        ],
+    "sensitive": false,
+    "content": "commentary",
+    "type": "Quotation",
+    "replies": {
+        "id": "https://example.com/user/mouse/quotation/13/replies",
+        "type": "Collection",
+        "first": {
+            "type": "CollectionPage",
+            "next": "https://example.com/user/mouse/quotation/13/replies?only_other_accounts=true&page=true",
+            "partOf": "https://example.com/user/mouse/quotation/13/replies",
+            "items": []
+            }
+        },
+    "inReplyToBook": "https://example.com/book/1",
+    "quote": "quote body"
+}
+```
+
+##### Work
+A particular book, a "work" in the [FRBR](https://en.wikipedia.org/wiki/Functional_Requirements_for_Bibliographic_Records) sense.
+
+Example:
+
+```json
+{
+    "@context": "https://www.w3.org/ns/activitystreams",
+    "id": "https://bookwyrm.social/book/5988",
+    "type": "Work",
+    "authors": [
+        "https://bookwyrm.social/author/417"
+    ],
+    "first_published_date": null,
+    "published_date": null,
+    "title": "Piranesi",
+    "sort_title": null,
+    "subtitle": null,
+    "description": "**From the *New York Times* bestselling author of *Jonathan Strange & Mr. Norrell*, an intoxicating, hypnotic new novel set in a dreamlike alternative reality.",
+    "languages": [],
+    "series": null,
+    "series_number": null,
+    "subjects": [
+        "English literature"
+    ],
+    "subject_places": [],
+    "openlibrary_key": "OL20893680W",
+    "librarything_key": null,
+    "goodreads_key": null,
+    "attachment": [
+        {
+            "url": "https://bookwyrm.social/images/covers/10226290-M.jpg",
+            "type": "Image"
+        }
+    ],
+    "lccn": null,
+    "editions": [
+        "https://bookwyrm.social/book/5989"
+    ]
+}
+```
+
+##### Edition
+A particular _manifestation_ of a Work, in the [FRBR](https://en.wikipedia.org/wiki/Functional_Requirements_for_Bibliographic_Records) sense.
+
+Example:
+
+```json
+{
+    "@context": "https://www.w3.org/ns/activitystreams",
+    "id": "https://bookwyrm.social/book/5989",
+    "lastEditedBy": "https://example.com/users/rat",
+    "type": "Edition",
+    "authors": [
+        "https://bookwyrm.social/author/417"
+    ],
+    "first_published_date": null,
+    "published_date": "2020-09-15T00:00:00+00:00",
+    "title": "Piranesi",
+    "sort_title": null,
+    "subtitle": null,
+    "description": "Piranesi's house is no ordinary building; its rooms are infinite, its corridors endless, its walls are lined with thousands upon thousands of statues, each one different from all the others.",
+    "languages": [
+        "English"
+    ],
+    "series": null,
+    "series_number": null,
+    "subjects": [],
+    "subject_places": [],
+    "openlibrary_key": "OL29486417M",
+    "librarything_key": null,
+    "goodreads_key": null,
+    "isfdb": null,
+    "attachment": [
+        {
+            "url": "https://bookwyrm.social/images/covers/50202953._SX318_.jpg",
+            "type": "Image"
+        }
+    ],
+    "isbn_10": "1526622424",
+    "isbn_13": "9781526622426",
+    "oclc_number": null,
+    "asin": null,
+    "pages": 272,
+    "physical_format": null,
+    "publishers": [
+        "Bloomsbury Publishing Plc"
+    ],
+    "work": "https://bookwyrm.social/book/5988"
+}
+```
+
+#### Activities
+- `Create/Status`: saves a new status in the database.
+- `Delete/Status`: Removes a status
+- `Like/Status`: Creates a favorite on the status
+- `Announce/Status`: Boosts the status into the actor's timeline
+- `Undo/*`,: Reverses a `Like` or `Announce`
+
+### Collections
+User's books and lists are represented by [`OrderedCollection`](https://www.w3.org/TR/activitystreams-vocabulary/#dfn-orderedcollection)
+
+#### Custom Objects
+
+- `Shelf`: A user's book collection. By default, every user has a `to-read`, `reading`, and `read` shelf which are used to track reading progress. Users may create an unlimited number of additional shelves with their own ids.
+- `List`: A collection of books that may have items contributed by users other than the one who created the list.
+
+#### Activities
+
+- `Create`: Adds a shelf or list to the database.
+- `Delete`: Removes a shelf or list.
+- `Add`: Adds a book to a shelf or list.
+- `Remove`: Removes a book from a shelf or list.
+
+## Alternative Serialization
+Because BookWyrm uses custom object types (`Review`, `Comment`, `Quotation`) that aren't listed in [the standard ActivityStreams Vocabulary](https://www.w3.org/TR/activitystreams-vocabulary), statuses are transformed into standard types when sent to or viewed by non-BookWyrm services. `Review`s are converted into `Article`s, and `Comment`s and `Quotation`s are converted into `Note`s, with a link to the book and the cover image attached.
+
+In future this may be done with [JSON-LD type arrays](https://www.w3.org/TR/json-ld/#specifying-the-type) instead.
+
+## Other extensions
+
+### Webfinger
+
+Bookwyrm uses the [Webfinger](https://datatracker.ietf.org/doc/html/rfc7033) standard to identify and disambiguate fediverse actors. The [Webfinger documentation on the Mastodon project](https://docs.joinmastodon.org/spec/webfinger/) provides a good overview of how Webfinger is used.
+
+### HTTP Signatures
+
+Bookwyrm uses and requires HTTP signatures for all `POST` requests. `GET` requests are not signed by default, but if Bookwyrm receives a `403` response to a `GET` it will re-send the request, signed by the default server user. This usually will have a user id of `https://example.net/user/bookwyrm.instance.actor`
+
+#### publicKey id
+
+In older versions of Bookwyrm the `publicKey.id` was incorrectly listed in request headers as `https://example.net/user/username#main-key`. As of v0.6.3 the id is now listed correctly, as `https://example.net/user/username/#main-key`. In most ActivityPub implementations this will make no difference as the URL will usually resolve to the same place.
+
+### NodeInfo
+
+Bookwyrm uses the [NodeInfo](http://nodeinfo.diaspora.software/) standard to provide statistics and version information for each instance.
+
+## Further Documentation
+
+See [docs.joinbookwyrm.com/](https://docs.joinbookwyrm.com/) for more documentation.
\ No newline at end of file

From 1841d196ffd3b96ecad76e44ed1cf64fcb395118 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 26 Jun 2023 12:22:14 +1000
Subject: [PATCH 18/30] Ensure report button triggers modal

Clicking on "report" in any context closed the dropdown menu and required a second click on the dropdown to trigger the modal.
With this change, the modal opens as expected.

Reverses part of #2322
---
 bookwyrm/static/js/bookwyrm.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index ceed12eba..0c6958f33 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -40,9 +40,6 @@ let BookWyrm = new (class {
 
         document.querySelectorAll("details.dropdown").forEach((node) => {
             node.addEventListener("toggle", this.handleDetailsDropdown.bind(this));
-            node.querySelectorAll("[data-modal-open]").forEach((modal_node) =>
-                modal_node.addEventListener("click", () => (node.open = false))
-            );
         });
 
         document

From c875b18e34cc66b8204093baedc1a937941072a2 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 1 Jul 2023 14:23:02 +1000
Subject: [PATCH 19/30] complete FEDERATION.md initial file

---
 FEDERATION.md | 169 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 141 insertions(+), 28 deletions(-)

diff --git a/FEDERATION.md b/FEDERATION.md
index fcd3d5ce9..ecd91273b 100644
--- a/FEDERATION.md
+++ b/FEDERATION.md
@@ -18,6 +18,16 @@ User relationship interactions follow the standard ActivityPub spec.
 - `Delete`: deactivates a user
 - `Undo`: reverses a `Follow` or `Block`
 
+### Activities
+- `Create/Status`: saves a new status in the database.
+- `Delete/Status`: Removes a status
+- `Like/Status`: Creates a favorite on the status
+- `Announce/Status`: Boosts the status into the actor's timeline
+- `Undo/*`,: Reverses a `Like` or `Announce`
+
+### Collections
+User's books and lists are represented by [`OrderedCollection`](https://www.w3.org/TR/activitystreams-vocabulary/#dfn-orderedcollection)
+
 ### Statuses
 
 BookWyrm is focused on book reading activities - it is not a general-purpose messaging application. For this reason, BookWyrm only accepts status `Create` activities if they are:
@@ -26,9 +36,9 @@ BookWyrm is focused on book reading activities - it is not a general-purpose mes
 - Related to a book (of a custom status type that includes the field `inReplyToBook`),
 - Replies to existing statuses saved in the database
 
-All other statuses will be received by the instance inbox, but **will not be delivered to user inboxes or displayed to users**.
+All other statuses will be received by the instance inbox, but by design **will not be delivered to user inboxes or displayed to users**.
 
-#### Non-standard Object types
+### Custom Object types
 
 With the exception of `Note`, the following object types are used in Bookwyrm but are not currently provided with a JSON-LD `@context` extension IRI. This is likely to change in future to make them true deserialisable JSON-LD objects.
 
@@ -40,10 +50,71 @@ Within BookWyrm a `Note` is constructed according to [the ActivityStreams vocabu
 
 A `Review` is a status in response to a book (indicated by the `inReplyToBook` field), which has a title, body, and numerical rating between 0 (not rated) and 5.
 
+Example:
+
+```json
+{
+    "id": "https://example.net/user/library_lurker/review/2",
+    "type": "Review",
+    "published": "2023-06-30T21:43:46.013132+00:00",
+    "attributedTo": "https://example.net/user/library_lurker",
+    "content": "<p>This is an enjoyable book with great characters.</p>",
+    "to": ["https://example.net/user/library_lurker/followers"],
+    "cc": [],
+    "replies": {
+        "id": "https://example.net/user/library_lurker/review/2/replies",
+        "type": "OrderedCollection",
+        "totalItems": 0,
+        "first": "https://example.net/user/library_lurker/review/2/replies?page=1",
+        "last": "https://example.net/user/library_lurker/review/2/replies?page=1",
+        "@context": "https://www.w3.org/ns/activitystreams"
+        },
+        "summary": "Spoilers ahead!",
+        "tag": [],
+        "attachment": [],
+        "sensitive": true,
+    "inReplyToBook": "https://example.net/book/1",
+    "name": "What a cracking read",
+    "rating": 4.5,
+    "@context": "https://www.w3.org/ns/activitystreams"
+}
+```
+
 ##### Comment
 
 A `Comment` on a book mentions a book and has a message body.
 
+Example:
+
+```json
+{
+    "id": "https://example.net/user/library_lurker/comment/9",
+    "type": "Comment",
+    "published": "2023-06-30T21:43:46.013132+00:00",
+    "attributedTo": "https://example.net/user/library_lurker",
+    "content": "<p>This is a very enjoyable book so far.</p>",
+    "to": ["https://example.net/user/library_lurker/followers"],
+    "cc": [],
+    "replies": {
+        "id": "https://example.net/user/library_lurker/comment/9/replies",
+        "type": "OrderedCollection",
+        "totalItems": 0,
+        "first": "https://example.net/user/library_lurker/comment/9/replies?page=1",
+        "last": "https://example.net/user/library_lurker/comment/9/replies?page=1",
+        "@context": "https://www.w3.org/ns/activitystreams"
+        },
+        "summary": "Spoilers ahead!",
+        "tag": [],
+        "attachment": [],
+        "sensitive": true,
+    "inReplyToBook": "https://example.net/book/1",
+    "readingStatus": "reading",
+    "progress": 25,
+    "progressMode": "PG",
+    "@context": "https://www.w3.org/ns/activitystreams"
+}
+```
+
 ##### Quotation
 
 A quotation (aka "quote") has a message body, an excerpt from a book, and mentions a book.
@@ -52,35 +123,40 @@ Example:
 
 ```json
 {
-    "id": "https://example.com/user/mouse/quotation/13",
-    "url": "https://example.com/user/mouse/quotation/13",
+    "id": "https://example.net/user/mouse/quotation/13",
+    "url": "https://example.net/user/mouse/quotation/13",
     "inReplyTo": null,
     "published": "2020-05-10T02:38:31.150343+00:00",
-    "attributedTo": "https://example.com/user/mouse",
+    "attributedTo": "https://example.net/user/mouse",
     "to": [
         "https://www.w3.org/ns/activitystreams#Public"
         ],
     "cc": [
-        "https://example.com/user/mouse/followers"
+        "https://example.net/user/mouse/followers"
         ],
     "sensitive": false,
-    "content": "commentary",
+    "content": "I really like this quote",
     "type": "Quotation",
     "replies": {
-        "id": "https://example.com/user/mouse/quotation/13/replies",
+        "id": "https://example.net/user/mouse/quotation/13/replies",
         "type": "Collection",
         "first": {
             "type": "CollectionPage",
-            "next": "https://example.com/user/mouse/quotation/13/replies?only_other_accounts=true&page=true",
-            "partOf": "https://example.com/user/mouse/quotation/13/replies",
+            "next": "https://example.net/user/mouse/quotation/13/replies?only_other_accounts=true&page=true",
+            "partOf": "https://example.net/user/mouse/quotation/13/replies",
             "items": []
             }
         },
-    "inReplyToBook": "https://example.com/book/1",
-    "quote": "quote body"
+    "inReplyToBook": "https://example.net/book/1",
+    "quote": "To be or not to be, that is the question.",
+    "position": 50,
+    "positionMode": "PCT",
+    "@context": "https://www.w3.org/ns/activitystreams"
 }
 ```
 
+### Custom Objects
+
 ##### Work
 A particular book, a "work" in the [FRBR](https://en.wikipedia.org/wiki/Functional_Requirements_for_Bibliographic_Records) sense.
 
@@ -88,7 +164,6 @@ Example:
 
 ```json
 {
-    "@context": "https://www.w3.org/ns/activitystreams",
     "id": "https://bookwyrm.social/book/5988",
     "type": "Work",
     "authors": [
@@ -119,7 +194,8 @@ Example:
     "lccn": null,
     "editions": [
         "https://bookwyrm.social/book/5989"
-    ]
+    ],
+    "@context": "https://www.w3.org/ns/activitystreams"
 }
 ```
 
@@ -130,9 +206,8 @@ Example:
 
 ```json
 {
-    "@context": "https://www.w3.org/ns/activitystreams",
     "id": "https://bookwyrm.social/book/5989",
-    "lastEditedBy": "https://example.com/users/rat",
+    "lastEditedBy": "https://example.net/users/rat",
     "type": "Edition",
     "authors": [
         "https://bookwyrm.social/author/417"
@@ -169,24 +244,62 @@ Example:
     "publishers": [
         "Bloomsbury Publishing Plc"
     ],
-    "work": "https://bookwyrm.social/book/5988"
+    "work": "https://bookwyrm.social/book/5988",
+    "@context": "https://www.w3.org/ns/activitystreams"
 }
 ```
 
-#### Activities
-- `Create/Status`: saves a new status in the database.
-- `Delete/Status`: Removes a status
-- `Like/Status`: Creates a favorite on the status
-- `Announce/Status`: Boosts the status into the actor's timeline
-- `Undo/*`,: Reverses a `Like` or `Announce`
+#### Shelf
 
-### Collections
-User's books and lists are represented by [`OrderedCollection`](https://www.w3.org/TR/activitystreams-vocabulary/#dfn-orderedcollection)
+A user's book collection. By default, every user has a `to-read`, `reading`, and `read` shelf which are used to track reading progress. Users may create an unlimited number of additional shelves with their own ids.
 
-#### Custom Objects
+Example
 
-- `Shelf`: A user's book collection. By default, every user has a `to-read`, `reading`, and `read` shelf which are used to track reading progress. Users may create an unlimited number of additional shelves with their own ids.
-- `List`: A collection of books that may have items contributed by users other than the one who created the list.
+```json
+{
+    "id": "https://example.net/user/avid_reader/books/extraspecialbooks-5",
+    "type": "Shelf",
+    "totalItems": 0,
+    "first": "https://example.net/user/avid_reader/books/extraspecialbooks-5?page=1",
+    "last": "https://example.net/user/avid_reader/books/extraspecialbooks-5?page=1",
+    "name": "Extra special books",
+    "owner": "https://example.net/user/avid_reader",
+    "to": [
+        "https://www.w3.org/ns/activitystreams#Public"
+    ],
+    "cc": [
+        "https://example.net/user/avid_reader/followers"
+    ],
+    "@context": "https://www.w3.org/ns/activitystreams"
+}
+```
+
+#### List
+
+A collection of books that may have items contributed by users other than the one who created the list.
+
+Example:
+
+```json
+{
+    "id": "https://example.net/list/1",
+    "type": "BookList",
+    "totalItems": 0,
+    "first": "https://example.net/list/1?page=1",
+    "last": "https://example.net/list/1?page=1",
+    "name": "My cool list",
+    "owner": "https://example.net/user/avid_reader",
+    "to": [
+        "https://www.w3.org/ns/activitystreams#Public"
+    ],
+    "cc": [
+        "https://example.net/user/avid_reader/followers"
+    ],
+    "summary": "A list of books I like.",
+    "curation": "curated",
+    "@context": "https://www.w3.org/ns/activitystreams"
+}
+```
 
 #### Activities
 

From fad1eb8952b1c976d3b751a3e0d3dd3be4e3f705 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 3 Jul 2023 08:38:53 +1000
Subject: [PATCH 20/30] clean up and add stopped-reading shelf type

---
 FEDERATION.md | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/FEDERATION.md b/FEDERATION.md
index ecd91273b..dd0c917e2 100644
--- a/FEDERATION.md
+++ b/FEDERATION.md
@@ -1,8 +1,5 @@
 # Federation
 
-TODO: extension object and activity examples
-TODO: show how things are translated into `Notes` or `Articles`
-
 BookWyrm uses the [ActivityPub](http://activitypub.rocks/) protocol to send and receive user activity between other BookWyrm instances and other services that implement ActivityPub. To handle book data, BookWyrm has a handful of extended Activity types which are not part of the standard, but are legible to other BookWyrm instances.
 
 ## Activities and Objects
@@ -40,7 +37,7 @@ All other statuses will be received by the instance inbox, but by design **will
 
 ### Custom Object types
 
-With the exception of `Note`, the following object types are used in Bookwyrm but are not currently provided with a JSON-LD `@context` extension IRI. This is likely to change in future to make them true deserialisable JSON-LD objects.
+With the exception of `Note`, the following object types are used in Bookwyrm but are not currently provided with a custom JSON-LD `@context` extension IRI. This is likely to change in future to make them true deserialisable JSON-LD objects.
 
 ##### Note
 
@@ -82,7 +79,7 @@ Example:
 
 ##### Comment
 
-A `Comment` on a book mentions a book and has a message body.
+A `Comment` on a book mentions a book and has a message body, reading status, and progress indicator.
 
 Example:
 
@@ -117,7 +114,7 @@ Example:
 
 ##### Quotation
 
-A quotation (aka "quote") has a message body, an excerpt from a book, and mentions a book.
+A quotation (aka "quote") has a message body, an excerpt from a book including position as a page number or percentage indicator, and mentions a book.
 
 Example:
 
@@ -251,7 +248,7 @@ Example:
 
 #### Shelf
 
-A user's book collection. By default, every user has a `to-read`, `reading`, and `read` shelf which are used to track reading progress. Users may create an unlimited number of additional shelves with their own ids.
+A user's book collection. By default, every user has a `to-read`, `reading`, `read`, and `stopped-reading` shelf which are used to track reading progress. Users may create an unlimited number of additional shelves with their own ids.
 
 Example
 
@@ -309,7 +306,7 @@ Example:
 - `Remove`: Removes a book from a shelf or list.
 
 ## Alternative Serialization
-Because BookWyrm uses custom object types (`Review`, `Comment`, `Quotation`) that aren't listed in [the standard ActivityStreams Vocabulary](https://www.w3.org/TR/activitystreams-vocabulary), statuses are transformed into standard types when sent to or viewed by non-BookWyrm services. `Review`s are converted into `Article`s, and `Comment`s and `Quotation`s are converted into `Note`s, with a link to the book and the cover image attached.
+Because BookWyrm uses custom object types that aren't listed in [the standard ActivityStreams Vocabulary](https://www.w3.org/TR/activitystreams-vocabulary), some statuses are transformed into standard types when sent to or viewed by non-BookWyrm services. `Review`s are converted into `Article`s, and `Comment`s and `Quotation`s are converted into `Note`s, with a link to the book and the cover image attached.
 
 In future this may be done with [JSON-LD type arrays](https://www.w3.org/TR/json-ld/#specifying-the-type) instead.
 

From 7f3a8f27ab9358b17d1522faee455bca0c407cfd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:27:36 +0000
Subject: [PATCH 21/30] build(deps): bump django from 3.2.19 to 3.2.20

Bumps [django](https://github.com/django/django) from 3.2.19 to 3.2.20.
- [Commits](https://github.com/django/django/compare/3.2.19...3.2.20)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5bfa48d64..141055d90 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ aiohttp==3.8.3
 bleach==5.0.1
 celery==5.2.7
 colorthief==0.2.1
-Django==3.2.19
+Django==3.2.20
 django-celery-beat==2.4.0
 django-compressor==4.3.1
 django-imagekit==4.1.0

From a7e6919b9690e7030a3cc8d437576b060bbe65c9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 16 Jul 2023 05:53:46 -0700
Subject: [PATCH 22/30] Fixes confirm email slow and adds test

---
 bookwyrm/tests/views/landing/test_register.py |  8 ++++++-
 .../views/preferences/test_delete_user.py     | 21 +++++++++++++++++++
 bookwyrm/views/landing/register.py            |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/landing/test_register.py b/bookwyrm/tests/views/landing/test_register.py
index b08b28a61..04f3a25ec 100644
--- a/bookwyrm/tests/views/landing/test_register.py
+++ b/bookwyrm/tests/views/landing/test_register.py
@@ -347,11 +347,17 @@ class RegisterViews(TestCase):
         self.settings.save()
 
         self.local_user.is_active = False
+        self.local_user.allow_reactivation = True
         self.local_user.deactivation_reason = "pending"
         self.local_user.confirmation_code = "12345"
         self.local_user.save(
             broadcast=False,
-            update_fields=["is_active", "deactivation_reason", "confirmation_code"],
+            update_fields=[
+                "is_active",
+                "allow_reactivation",
+                "deactivation_reason",
+                "confirmation_code",
+            ],
         )
         view = views.ConfirmEmailCode.as_view()
         request = self.factory.get("")
diff --git a/bookwyrm/tests/views/preferences/test_delete_user.py b/bookwyrm/tests/views/preferences/test_delete_user.py
index 151b9ab2e..1994a5a4d 100644
--- a/bookwyrm/tests/views/preferences/test_delete_user.py
+++ b/bookwyrm/tests/views/preferences/test_delete_user.py
@@ -141,3 +141,24 @@ class DeleteUserViews(TestCase):
         self.local_user.refresh_from_db()
         self.assertTrue(self.local_user.is_active)
         self.assertIsNone(self.local_user.deactivation_reason)
+
+    def test_reactivate_user_post_disallowed(self, _):
+        """Reactivate action under the wrong circumstances"""
+        self.local_user.is_active = False
+        self.local_user.save(broadcast=False)
+
+        view = views.ReactivateUser.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse"
+        form.data["password"] = "password"
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        middleware = SessionMiddleware()
+        middleware.process_request(request)
+        request.session.save()
+
+        with patch("bookwyrm.views.preferences.delete_user.login"):
+            view(request)
+
+        self.local_user.refresh_from_db()
+        self.assertFalse(self.local_user.is_active)
diff --git a/bookwyrm/views/landing/register.py b/bookwyrm/views/landing/register.py
index e5a76a0d6..26d8e1813 100644
--- a/bookwyrm/views/landing/register.py
+++ b/bookwyrm/views/landing/register.py
@@ -74,6 +74,7 @@ class Register(View):
             password,
             localname=localname,
             local=True,
+            allow_reactivation=settings.require_confirm_email,
             deactivation_reason="pending" if settings.require_confirm_email else None,
             is_active=not settings.require_confirm_email,
             preferred_timezone=preferred_timezone,

From 245ae35a815f207777309eb0ffbc12c795992bb3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 16 Jul 2023 06:57:31 -0700
Subject: [PATCH 23/30] Pin prettier version in github workflow

---
 .github/workflows/prettier.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prettier.yaml b/.github/workflows/prettier.yaml
index a081e1a7a..501516ae1 100644
--- a/.github/workflows/prettier.yaml
+++ b/.github/workflows/prettier.yaml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install modules
-        run: npm install prettier
+        run: npm install prettier@2.5.1
 
       - name: Run Prettier
         run: npx prettier --check bookwyrm/static/js/*.js

From 3bd20e3ff8224d952e0c0db6c0c9f5e0a205331e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 17 Jul 2023 05:42:17 -0700
Subject: [PATCH 24/30] Set batch size to 1,000

Updated as per the comments on the PR so this is ready to merge
---
 bookwyrm/migrations/0179_populate_sort_title.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/migrations/0179_populate_sort_title.py b/bookwyrm/migrations/0179_populate_sort_title.py
index bb1dba437..e238bca1d 100644
--- a/bookwyrm/migrations/0179_populate_sort_title.py
+++ b/bookwyrm/migrations/0179_populate_sort_title.py
@@ -24,7 +24,7 @@ def populate_sort_title(apps, schema_editor):
     editions_wo_sort_title = Edition.objects.using(db_alias).filter(
         Q(sort_title__isnull=True) | Q(sort_title__exact="")
     )
-    batch_size = 50000
+    batch_size = 1000
     start = 0
     end = batch_size
     while True:

From fbb6c410353e07377daec5904b72aa89bace6b72 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 17 Jul 2023 05:49:40 -0700
Subject: [PATCH 25/30] Joins entire sentence in import pluralization string

---
 bookwyrm/templates/import/import.html | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index 9146d0715..a00f3c100 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -18,15 +18,10 @@
         {% if import_size_limit and import_limit_reset %}
             <div class="notification">
                 <p>
-                    {% blocktrans count books=import_size_limit%}
-                        Currently you are allowed to import {{ import_size_limit }} book
-                    {% plural %}
-                        Currently you are allowed to import {{ import_size_limit }} books
-                    {% endblocktrans %}
                     {% blocktrans count days=import_limit_reset%}
-                         every {{ import_limit_reset }} day.
+                        Currently you are allowed to import {{ import_size_limit }} books every {{ import_limit_reset }} day.
                     {% plural %}
-                         every {{ import_limit_reset }} days.
+                        Currently you are allowed to import {{ import_size_limit }} books every {{ import_limit_reset }} days.
                     {% endblocktrans %}
                 </p>
                 <p>{% blocktrans %}You have {{ allowed_imports }} left.{% endblocktrans %}</p>

From 6778046906bc3749bf2850c9527405c9d628d774 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 17 Jul 2023 05:53:23 -0700
Subject: [PATCH 26/30] Formats large numbers

---
 bookwyrm/templates/import/import.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index a00f3c100..394606c53 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -18,13 +18,13 @@
         {% if import_size_limit and import_limit_reset %}
             <div class="notification">
                 <p>
-                    {% blocktrans count days=import_limit_reset%}
-                        Currently you are allowed to import {{ import_size_limit }} books every {{ import_limit_reset }} day.
+                    {% blocktrans count days=import_limit_reset with display_size=import_size_limit|intcomma %}
+                        Currently, you are allowed to import {{ display_size }} books every {{ import_limit_reset }} day.
                     {% plural %}
-                        Currently you are allowed to import {{ import_size_limit }} books every {{ import_limit_reset }} days.
+                        Currently, you are allowed to import {{ import_size_limit }} books every {{ import_limit_reset }} days.
                     {% endblocktrans %}
                 </p>
-                <p>{% blocktrans %}You have {{ allowed_imports }} left.{% endblocktrans %}</p>
+                <p>{% blocktrans with display_left=allowed_imports|intcomma %}You have {{ display_left }} left.{% endblocktrans %}</p>
             </div>
         {% endif %}
         {% if recent_avg_hours or recent_avg_minutes %}

From 7d1f3deacaccbd0ff9b1b14875ee35af61773266 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 15:55:55 +0000
Subject: [PATCH 27/30] build(deps): bump aiohttp from 3.8.3 to 3.8.5

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.8.3 to 3.8.5.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/v3.8.5/CHANGES.rst)
- [Commits](https://github.com/aio-libs/aiohttp/compare/v3.8.3...v3.8.5)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 141055d90..755d3e0ac 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-aiohttp==3.8.3
+aiohttp==3.8.5
 bleach==5.0.1
 celery==5.2.7
 colorthief==0.2.1

From 3e78e398c04117d5f72dbd6eb03f949d85113a23 Mon Sep 17 00:00:00 2001
From: Wesley Aptekar-Cassels <me@wesleyac.com>
Date: Thu, 20 Jul 2023 00:16:38 -0400
Subject: [PATCH 28/30] Switch from priority queues to function-based queues

Fixes: #2907
---
 bookwyrm/activitypub/base_activity.py         |  4 +-
 bookwyrm/activitystreams.py                   | 22 ++---
 bookwyrm/connectors/connector_manager.py      |  6 +-
 bookwyrm/emailing.py                          |  4 +-
 bookwyrm/lists_stream.py                      | 12 +--
 bookwyrm/models/activitypub_mixin.py          |  8 +-
 bookwyrm/models/antispam.py                   |  4 +-
 bookwyrm/models/import_job.py                 |  8 +-
 bookwyrm/models/relationship.py               |  7 +-
 bookwyrm/models/shelf.py                      |  6 +-
 bookwyrm/models/user.py                       |  6 +-
 bookwyrm/preview_images.py                    | 10 +--
 bookwyrm/suggested_users.py                   | 14 ++--
 bookwyrm/tasks.py                             | 14 +++-
 bookwyrm/templates/settings/celery.html       | 82 ++++++++++++++++---
 .../tests/activitystreams/test_signals.py     |  6 +-
 bookwyrm/tests/importers/test_importer.py     |  2 +-
 bookwyrm/views/admin/celery_status.py         | 36 +++++++-
 bookwyrm/views/inbox.py                       | 14 ++--
 contrib/systemd/bookwyrm-worker.service       |  2 +-
 docker-compose.yml                            |  3 +-
 21 files changed, 183 insertions(+), 87 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 9b7897eba..c78b4f195 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -12,7 +12,7 @@ from bookwyrm import models
 from bookwyrm.connectors import ConnectorException, get_data
 from bookwyrm.signatures import make_signature
 from bookwyrm.settings import DOMAIN, INSTANCE_ACTOR_USERNAME
-from bookwyrm.tasks import app, MEDIUM
+from bookwyrm.tasks import app, MISC
 
 logger = logging.getLogger(__name__)
 
@@ -241,7 +241,7 @@ class ActivityObject:
         return data
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=MISC)
 @transaction.atomic
 def set_related_field(
     model_name, origin_model_name, related_field_name, related_remote_id, data
diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 5d581d564..7afa69921 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -8,7 +8,7 @@ from opentelemetry import trace
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore, r
-from bookwyrm.tasks import app, LOW, MEDIUM, HIGH
+from bookwyrm.tasks import app, STREAMS, IMPORT_TRIGGERED
 from bookwyrm.telemetry import open_telemetry
 
 
@@ -343,7 +343,7 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
 
 def add_status_on_create_command(sender, instance, created):
     """runs this code only after the database commit completes"""
-    priority = HIGH
+    priority = STREAMS
     # check if this is an old status, de-prioritize if so
     # (this will happen if federation is very slow, or, more expectedly, on csv import)
     if instance.published_date < timezone.now() - timedelta(
@@ -353,7 +353,7 @@ def add_status_on_create_command(sender, instance, created):
         if instance.user.local:
             return
         # an out of date remote status is a low priority but should be added
-        priority = LOW
+        priority = IMPORT_TRIGGERED
 
     add_status_task.apply_async(
         args=(instance.id,),
@@ -497,7 +497,7 @@ def remove_statuses_on_unshelve(sender, instance, *args, **kwargs):
 # ---- TASKS
 
 
-@app.task(queue=LOW)
+@app.task(queue=STREAMS)
 def add_book_statuses_task(user_id, book_id):
     """add statuses related to a book on shelve"""
     user = models.User.objects.get(id=user_id)
@@ -505,7 +505,7 @@ def add_book_statuses_task(user_id, book_id):
     BooksStream().add_book_statuses(user, book)
 
 
-@app.task(queue=LOW)
+@app.task(queue=STREAMS)
 def remove_book_statuses_task(user_id, book_id):
     """remove statuses about a book from a user's books feed"""
     user = models.User.objects.get(id=user_id)
@@ -513,7 +513,7 @@ def remove_book_statuses_task(user_id, book_id):
     BooksStream().remove_book_statuses(user, book)
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=STREAMS)
 def populate_stream_task(stream, user_id):
     """background task for populating an empty activitystream"""
     user = models.User.objects.get(id=user_id)
@@ -521,7 +521,7 @@ def populate_stream_task(stream, user_id):
     stream.populate_streams(user)
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=STREAMS)
 def remove_status_task(status_ids):
     """remove a status from any stream it might be in"""
     # this can take an id or a list of ids
@@ -536,7 +536,7 @@ def remove_status_task(status_ids):
             )
 
 
-@app.task(queue=HIGH)
+@app.task(queue=STREAMS)
 def add_status_task(status_id, increment_unread=False):
     """add a status to any stream it should be in"""
     status = models.Status.objects.select_subclasses().get(id=status_id)
@@ -548,7 +548,7 @@ def add_status_task(status_id, increment_unread=False):
         stream.add_status(status, increment_unread=increment_unread)
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=STREAMS)
 def remove_user_statuses_task(viewer_id, user_id, stream_list=None):
     """remove all statuses by a user from a viewer's stream"""
     stream_list = [streams[s] for s in stream_list] if stream_list else streams.values()
@@ -558,7 +558,7 @@ def remove_user_statuses_task(viewer_id, user_id, stream_list=None):
         stream.remove_user_statuses(viewer, user)
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=STREAMS)
 def add_user_statuses_task(viewer_id, user_id, stream_list=None):
     """add all statuses by a user to a viewer's stream"""
     stream_list = [streams[s] for s in stream_list] if stream_list else streams.values()
@@ -568,7 +568,7 @@ def add_user_statuses_task(viewer_id, user_id, stream_list=None):
         stream.add_user_statuses(viewer, user)
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=STREAMS)
 def handle_boost_task(boost_id):
     """remove the original post and other, earlier boosts"""
     instance = models.Status.objects.get(id=boost_id)
diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 7e823c0af..e32da7c00 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -13,7 +13,7 @@ from requests import HTTPError
 
 from bookwyrm import book_search, models
 from bookwyrm.settings import SEARCH_TIMEOUT
-from bookwyrm.tasks import app, LOW
+from bookwyrm.tasks import app, CONNECTORS
 
 logger = logging.getLogger(__name__)
 
@@ -109,7 +109,7 @@ def get_or_create_connector(remote_id):
     return load_connector(connector_info)
 
 
-@app.task(queue=LOW)
+@app.task(queue=CONNECTORS)
 def load_more_data(connector_id, book_id):
     """background the work of getting all 10,000 editions of LoTR"""
     connector_info = models.Connector.objects.get(id=connector_id)
@@ -118,7 +118,7 @@ def load_more_data(connector_id, book_id):
     connector.expand_book_data(book)
 
 
-@app.task(queue=LOW)
+@app.task(queue=CONNECTORS)
 def create_edition_task(connector_id, work_id, data):
     """separate task for each of the 10,000 editions of LoTR"""
     connector_info = models.Connector.objects.get(id=connector_id)
diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 2271077b1..5e08ebba1 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -3,7 +3,7 @@ from django.core.mail import EmailMultiAlternatives
 from django.template.loader import get_template
 
 from bookwyrm import models, settings
-from bookwyrm.tasks import app, HIGH
+from bookwyrm.tasks import app, EMAIL
 from bookwyrm.settings import DOMAIN
 
 
@@ -75,7 +75,7 @@ def format_email(email_name, data):
     return (subject, html_content, text_content)
 
 
-@app.task(queue=HIGH)
+@app.task(queue=EMAIL)
 def send_email(recipient, subject, html_content, text_content):
     """use a task to send the email"""
     email = EmailMultiAlternatives(
diff --git a/bookwyrm/lists_stream.py b/bookwyrm/lists_stream.py
index 2b08010b1..148b81a78 100644
--- a/bookwyrm/lists_stream.py
+++ b/bookwyrm/lists_stream.py
@@ -5,7 +5,7 @@ from django.db.models import signals, Count, Q
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore
-from bookwyrm.tasks import app, MEDIUM, HIGH
+from bookwyrm.tasks import app, LISTS
 
 
 class ListsStream(RedisStore):
@@ -217,14 +217,14 @@ def add_list_on_account_create_command(user_id):
 
 
 # ---- TASKS
-@app.task(queue=MEDIUM)
+@app.task(queue=LISTS)
 def populate_lists_task(user_id):
     """background task for populating an empty list stream"""
     user = models.User.objects.get(id=user_id)
     ListsStream().populate_lists(user)
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=LISTS)
 def remove_list_task(list_id, re_add=False):
     """remove a list from any stream it might be in"""
     stores = models.User.objects.filter(local=True, is_active=True).values_list(
@@ -239,14 +239,14 @@ def remove_list_task(list_id, re_add=False):
         add_list_task.delay(list_id)
 
 
-@app.task(queue=HIGH)
+@app.task(queue=LISTS)
 def add_list_task(list_id):
     """add a list to any stream it should be in"""
     book_list = models.List.objects.get(id=list_id)
     ListsStream().add_list(book_list)
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=LISTS)
 def remove_user_lists_task(viewer_id, user_id, exclude_privacy=None):
     """remove all lists by a user from a viewer's stream"""
     viewer = models.User.objects.get(id=viewer_id)
@@ -254,7 +254,7 @@ def remove_user_lists_task(viewer_id, user_id, exclude_privacy=None):
     ListsStream().remove_user_lists(viewer, user, exclude_privacy=exclude_privacy)
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=LISTS)
 def add_user_lists_task(viewer_id, user_id):
     """add all lists by a user to a viewer's stream"""
     viewer = models.User.objects.get(id=viewer_id)
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index d1ca3747a..4b53c6e87 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -21,7 +21,7 @@ from django.utils.http import http_date
 from bookwyrm import activitypub
 from bookwyrm.settings import USER_AGENT, PAGE_LENGTH
 from bookwyrm.signatures import make_signature, make_digest
-from bookwyrm.tasks import app, MEDIUM, BROADCAST
+from bookwyrm.tasks import app, BROADCAST
 from bookwyrm.models.fields import ImageField, ManyToManyField
 
 logger = logging.getLogger(__name__)
@@ -379,7 +379,7 @@ class CollectionItemMixin(ActivitypubMixin):
 
     activity_serializer = activitypub.CollectionItem
 
-    def broadcast(self, activity, sender, software="bookwyrm", queue=MEDIUM):
+    def broadcast(self, activity, sender, software="bookwyrm", queue=BROADCAST):
         """only send book collection updates to other bookwyrm instances"""
         super().broadcast(activity, sender, software=software, queue=queue)
 
@@ -400,7 +400,7 @@ class CollectionItemMixin(ActivitypubMixin):
             return []
         return [collection_field.user]
 
-    def save(self, *args, broadcast=True, priority=MEDIUM, **kwargs):
+    def save(self, *args, broadcast=True, priority=BROADCAST, **kwargs):
         """broadcast updated"""
         # first off, we want to save normally no matter what
         super().save(*args, **kwargs)
@@ -444,7 +444,7 @@ class CollectionItemMixin(ActivitypubMixin):
 class ActivityMixin(ActivitypubMixin):
     """add this mixin for models that are AP serializable"""
 
-    def save(self, *args, broadcast=True, priority=MEDIUM, **kwargs):
+    def save(self, *args, broadcast=True, priority=BROADCAST, **kwargs):
         """broadcast activity"""
         super().save(*args, **kwargs)
         user = self.user if hasattr(self, "user") else self.user_subject
diff --git a/bookwyrm/models/antispam.py b/bookwyrm/models/antispam.py
index 1e20df340..94d978ec4 100644
--- a/bookwyrm/models/antispam.py
+++ b/bookwyrm/models/antispam.py
@@ -8,7 +8,7 @@ from django.db import models, transaction
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
-from bookwyrm.tasks import app, LOW
+from bookwyrm.tasks import app, MISC
 from .base_model import BookWyrmModel
 from .user import User
 
@@ -65,7 +65,7 @@ class AutoMod(AdminModel):
     created_by = models.ForeignKey("User", on_delete=models.PROTECT)
 
 
-@app.task(queue=LOW)
+@app.task(queue=MISC)
 def automod_task():
     """Create reports"""
     if not AutoMod.objects.exists():
diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index a489edb7c..bb5144297 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -19,7 +19,7 @@ from bookwyrm.models import (
     Review,
     ReviewRating,
 )
-from bookwyrm.tasks import app, LOW, IMPORTS
+from bookwyrm.tasks import app, IMPORT_TRIGGERED, IMPORTS
 from .fields import PrivacyLevels
 
 
@@ -399,7 +399,7 @@ def handle_imported_book(item):
         shelved_date = item.date_added or timezone.now()
         ShelfBook(
             book=item.book, shelf=desired_shelf, user=user, shelved_date=shelved_date
-        ).save(priority=LOW)
+        ).save(priority=IMPORT_TRIGGERED)
 
     for read in item.reads:
         # check for an existing readthrough with the same dates
@@ -441,7 +441,7 @@ def handle_imported_book(item):
                     published_date=published_date_guess,
                     privacy=job.privacy,
                 )
-                review.save(software="bookwyrm", priority=LOW)
+                review.save(software="bookwyrm", priority=IMPORT_TRIGGERED)
         else:
             # just a rating
             review = ReviewRating.objects.filter(
@@ -458,7 +458,7 @@ def handle_imported_book(item):
                     published_date=published_date_guess,
                     privacy=job.privacy,
                 )
-                review.save(software="bookwyrm", priority=LOW)
+                review.save(software="bookwyrm", priority=IMPORT_TRIGGERED)
 
         # only broadcast this review to other bookwyrm instances
         item.linked_review = review
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 4754bea36..7af6ad5ab 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -4,7 +4,6 @@ from django.db import models, transaction, IntegrityError
 from django.db.models import Q
 
 from bookwyrm import activitypub
-from bookwyrm.tasks import HIGH
 from .activitypub_mixin import ActivitypubMixin, ActivityMixin
 from .activitypub_mixin import generate_activity
 from .base_model import BookWyrmModel
@@ -142,7 +141,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
 
         # a local user is following a remote user
         if broadcast and self.user_subject.local and not self.user_object.local:
-            self.broadcast(self.to_activity(), self.user_subject, queue=HIGH)
+            self.broadcast(self.to_activity(), self.user_subject)
 
         if self.user_object.local:
             manually_approves = self.user_object.manually_approves_followers
@@ -166,7 +165,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
                 actor=self.user_object.remote_id,
                 object=self.to_activity(),
             ).serialize()
-            self.broadcast(activity, user, queue=HIGH)
+            self.broadcast(activity, user)
         if broadcast_only:
             return
 
@@ -187,7 +186,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
                 actor=self.user_object.remote_id,
                 object=self.to_activity(),
             ).serialize()
-            self.broadcast(activity, self.user_object, queue=HIGH)
+            self.broadcast(activity, self.user_object)
 
         self.delete()
 
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index c52cb6ab8..3d92f8d43 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -7,7 +7,7 @@ from django.utils import timezone
 
 from bookwyrm import activitypub
 from bookwyrm.settings import DOMAIN
-from bookwyrm.tasks import LOW
+from bookwyrm.tasks import BROADCAST
 from .activitypub_mixin import CollectionItemMixin, OrderedCollectionMixin
 from .base_model import BookWyrmModel
 from . import fields
@@ -40,7 +40,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
 
     activity_serializer = activitypub.Shelf
 
-    def save(self, *args, priority=LOW, **kwargs):
+    def save(self, *args, priority=BROADCAST, **kwargs):
         """set the identifier"""
         super().save(*args, priority=priority, **kwargs)
         if not self.identifier:
@@ -100,7 +100,7 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel):
     activity_serializer = activitypub.ShelfItem
     collection_field = "shelf"
 
-    def save(self, *args, priority=LOW, **kwargs):
+    def save(self, *args, priority=BROADCAST, **kwargs):
         if not self.user:
             self.user = self.shelf.user
         if self.id and self.user.local:
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index f39468246..9253aa109 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -20,7 +20,7 @@ from bookwyrm.models.status import Status
 from bookwyrm.preview_images import generate_user_preview_image_task
 from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES, USE_HTTPS, LANGUAGES
 from bookwyrm.signatures import create_key_pair
-from bookwyrm.tasks import app, LOW
+from bookwyrm.tasks import app, MISC
 from bookwyrm.utils import regex
 from .activitypub_mixin import OrderedCollectionPageMixin, ActivitypubMixin
 from .base_model import BookWyrmModel, DeactivationReason, new_access_code
@@ -469,7 +469,7 @@ class KeyPair(ActivitypubMixin, BookWyrmModel):
         return super().save(*args, **kwargs)
 
 
-@app.task(queue=LOW)
+@app.task(queue=MISC)
 def set_remote_server(user_id, allow_external_connections=False):
     """figure out the user's remote server in the background"""
     user = User.objects.get(id=user_id)
@@ -528,7 +528,7 @@ def get_or_create_remote_server(
     return server
 
 
-@app.task(queue=LOW)
+@app.task(queue=MISC)
 def get_remote_reviews(outbox):
     """ingest reviews by a new remote bookwyrm user"""
     outbox_page = outbox + "?page=true&type=Review"
diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py
index 549e12472..aba372abc 100644
--- a/bookwyrm/preview_images.py
+++ b/bookwyrm/preview_images.py
@@ -16,7 +16,7 @@ from django.core.files.storage import default_storage
 from django.db.models import Avg
 
 from bookwyrm import models, settings
-from bookwyrm.tasks import app, LOW
+from bookwyrm.tasks import app, IMAGES
 
 logger = logging.getLogger(__name__)
 
@@ -420,7 +420,7 @@ def save_and_cleanup(image, instance=None):
 
 
 # pylint: disable=invalid-name
-@app.task(queue=LOW)
+@app.task(queue=IMAGES)
 def generate_site_preview_image_task():
     """generate preview_image for the website"""
     if not settings.ENABLE_PREVIEW_IMAGES:
@@ -445,7 +445,7 @@ def generate_site_preview_image_task():
 
 
 # pylint: disable=invalid-name
-@app.task(queue=LOW)
+@app.task(queue=IMAGES)
 def generate_edition_preview_image_task(book_id):
     """generate preview_image for a book"""
     if not settings.ENABLE_PREVIEW_IMAGES:
@@ -470,7 +470,7 @@ def generate_edition_preview_image_task(book_id):
     save_and_cleanup(image, instance=book)
 
 
-@app.task(queue=LOW)
+@app.task(queue=IMAGES)
 def generate_user_preview_image_task(user_id):
     """generate preview_image for a user"""
     if not settings.ENABLE_PREVIEW_IMAGES:
@@ -496,7 +496,7 @@ def generate_user_preview_image_task(user_id):
     save_and_cleanup(image, instance=user)
 
 
-@app.task(queue=LOW)
+@app.task(queue=IMAGES)
 def remove_user_preview_image_task(user_id):
     """remove preview_image for a user"""
     if not settings.ENABLE_PREVIEW_IMAGES:
diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py
index 05e05891c..d897feff7 100644
--- a/bookwyrm/suggested_users.py
+++ b/bookwyrm/suggested_users.py
@@ -8,7 +8,7 @@ from opentelemetry import trace
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore, r
-from bookwyrm.tasks import app, LOW, MEDIUM
+from bookwyrm.tasks import app, SUGGESTED_USERS
 from bookwyrm.telemetry import open_telemetry
 
 
@@ -244,20 +244,20 @@ def domain_level_update(sender, instance, created, update_fields=None, **kwargs)
 # ------------------- TASKS
 
 
-@app.task(queue=LOW)
+@app.task(queue=SUGGESTED_USERS)
 def rerank_suggestions_task(user_id):
     """do the hard work in celery"""
     suggested_users.rerank_user_suggestions(user_id)
 
 
-@app.task(queue=LOW)
+@app.task(queue=SUGGESTED_USERS)
 def rerank_user_task(user_id, update_only=False):
     """do the hard work in celery"""
     user = models.User.objects.get(id=user_id)
     suggested_users.rerank_obj(user, update_only=update_only)
 
 
-@app.task(queue=LOW)
+@app.task(queue=SUGGESTED_USERS)
 def remove_user_task(user_id):
     """do the hard work in celery"""
     user = models.User.objects.get(id=user_id)
@@ -266,14 +266,14 @@ def remove_user_task(user_id):
     )
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=SUGGESTED_USERS)
 def remove_suggestion_task(user_id, suggested_user_id):
     """remove a specific user from a specific user's suggestions"""
     suggested_user = models.User.objects.get(id=suggested_user_id)
     suggested_users.remove_suggestion(user_id, suggested_user)
 
 
-@app.task(queue=LOW)
+@app.task(queue=SUGGESTED_USERS)
 def bulk_remove_instance_task(instance_id):
     """remove a bunch of users from recs"""
     for user in models.User.objects.filter(federated_server__id=instance_id):
@@ -282,7 +282,7 @@ def bulk_remove_instance_task(instance_id):
         )
 
 
-@app.task(queue=LOW)
+@app.task(queue=SUGGESTED_USERS)
 def bulk_add_instance_task(instance_id):
     """remove a bunch of users from recs"""
     for user in models.User.objects.filter(federated_server__id=instance_id):
diff --git a/bookwyrm/tasks.py b/bookwyrm/tasks.py
index 91977afda..79e1b6340 100644
--- a/bookwyrm/tasks.py
+++ b/bookwyrm/tasks.py
@@ -10,11 +10,19 @@ app = Celery(
     "tasks", broker=settings.CELERY_BROKER_URL, backend=settings.CELERY_RESULT_BACKEND
 )
 
-# priorities
+# priorities - for backwards compatibility, will be removed next release
 LOW = "low_priority"
 MEDIUM = "medium_priority"
 HIGH = "high_priority"
-# import items get their own queue because they're such a pain in the ass
+
+STREAMS = "streams"
+IMAGES = "images"
+SUGGESTED_USERS = "suggested_users"
+EMAIL = "email"
+CONNECTORS = "connectors"
+LISTS = "lists"
+INBOX = "inbox"
 IMPORTS = "imports"
-# I keep making more queues?? this one broadcasting out
+IMPORT_TRIGGERED = "import_triggered"
 BROADCAST = "broadcast"
+MISC = "misc"
diff --git a/bookwyrm/templates/settings/celery.html b/bookwyrm/templates/settings/celery.html
index 5f79dfd9d..2f4a36ce9 100644
--- a/bookwyrm/templates/settings/celery.html
+++ b/bookwyrm/templates/settings/celery.html
@@ -21,6 +21,76 @@
 <section class="block content">
     <h2>{% trans "Queues" %}</h2>
     <div class="columns has-text-centered is-multiline">
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Streams" %}</p>
+                <p class="title is-5">{{ queues.streams|intcomma }}</p>
+            </div>
+        </div>
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Broadcasts" %}</p>
+                <p class="title is-5">{{ queues.broadcast|intcomma }}</p>
+            </div>
+        </div>
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Inbox" %}</p>
+                <p class="title is-5">{{ queues.inbox|intcomma }}</p>
+            </div>
+        </div>
+
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Imports" %}</p>
+                <p class="title is-5">{{ queues.imports|intcomma }}</p>
+            </div>
+        </div>
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Import triggered" %}</p>
+                <p class="title is-5">{{ queues.import_triggered|intcomma }}</p>
+            </div>
+        </div>
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Connectors" %}</p>
+                <p class="title is-5">{{ queues.connectors|intcomma }}</p>
+            </div>
+        </div>
+
+        <div class="column is-6">
+            <div class="notification">
+                <p class="header">{% trans "Images" %}</p>
+                <p class="title is-5">{{ queues.images|intcomma }}</p>
+            </div>
+        </div>
+        <div class="column is-6">
+            <div class="notification">
+                <p class="header">{% trans "Suggested Users" %}</p>
+                <p class="title is-5">{{ queues.suggested_users|intcomma }}</p>
+            </div>
+        </div>
+
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Lists" %}</p>
+                <p class="title is-5">{{ queues.lists|intcomma }}</p>
+            </div>
+        </div>
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Email" %}</p>
+                <p class="title is-5">{{ queues.email|intcomma }}</p>
+            </div>
+        </div>
+        <div class="column is-4">
+            <div class="notification">
+                <p class="header">{% trans "Misc" %}</p>
+                <p class="title is-5">{{ queues.misc|intcomma }}</p>
+            </div>
+        </div>
+
         <div class="column is-4">
             <div class="notification">
                 <p class="header">{% trans "Low priority" %}</p>
@@ -39,18 +109,6 @@
                 <p class="title is-5">{{ queues.high_priority|intcomma }}</p>
             </div>
         </div>
-        <div class="column is-6">
-            <div class="notification">
-                <p class="header">{% trans "Imports" %}</p>
-                <p class="title is-5">{{ queues.imports|intcomma }}</p>
-            </div>
-        </div>
-        <div class="column is-6">
-            <div class="notification">
-                <p class="header">{% trans "Broadcasts" %}</p>
-                <p class="title is-5">{{ queues.broadcast|intcomma }}</p>
-            </div>
-        </div>
     </div>
 </section>
 {% else %}
diff --git a/bookwyrm/tests/activitystreams/test_signals.py b/bookwyrm/tests/activitystreams/test_signals.py
index f7c6c20bb..210d4d5df 100644
--- a/bookwyrm/tests/activitystreams/test_signals.py
+++ b/bookwyrm/tests/activitystreams/test_signals.py
@@ -64,7 +64,7 @@ class ActivitystreamsSignals(TestCase):
         self.assertEqual(mock.call_count, 1)
         args = mock.call_args[1]
         self.assertEqual(args["args"][0], status.id)
-        self.assertEqual(args["queue"], "high_priority")
+        self.assertEqual(args["queue"], "streams")
 
     def test_add_status_on_create_created_low_priority(self, *_):
         """a new statuses has entered"""
@@ -82,7 +82,7 @@ class ActivitystreamsSignals(TestCase):
         self.assertEqual(mock.call_count, 1)
         args = mock.call_args[1]
         self.assertEqual(args["args"][0], status.id)
-        self.assertEqual(args["queue"], "low_priority")
+        self.assertEqual(args["queue"], "import_triggered")
 
         # published later than yesterday
         status = models.Status.objects.create(
@@ -97,7 +97,7 @@ class ActivitystreamsSignals(TestCase):
         self.assertEqual(mock.call_count, 1)
         args = mock.call_args[1]
         self.assertEqual(args["args"][0], status.id)
-        self.assertEqual(args["queue"], "low_priority")
+        self.assertEqual(args["queue"], "import_triggered")
 
     def test_populate_streams_on_account_create_command(self, *_):
         """create streams for a user"""
diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py
index 51346f1a1..f48b97993 100644
--- a/bookwyrm/tests/importers/test_importer.py
+++ b/bookwyrm/tests/importers/test_importer.py
@@ -145,7 +145,7 @@ class GenericImporter(TestCase):
             ) as mock:
                 import_item_task(import_item.id)
                 kwargs = mock.call_args.kwargs
-        self.assertEqual(kwargs["queue"], "low_priority")
+        self.assertEqual(kwargs["queue"], "import_triggered")
         import_item.refresh_from_db()
 
     def test_complete_job(self, *_):
diff --git a/bookwyrm/views/admin/celery_status.py b/bookwyrm/views/admin/celery_status.py
index 392d7c471..cd8b85b6d 100644
--- a/bookwyrm/views/admin/celery_status.py
+++ b/bookwyrm/views/admin/celery_status.py
@@ -11,7 +11,23 @@ from django import forms
 import redis
 
 from celerywyrm import settings
-from bookwyrm.tasks import app as celery, LOW, MEDIUM, HIGH, IMPORTS, BROADCAST
+from bookwyrm.tasks import (
+    app as celery,
+    LOW,
+    MEDIUM,
+    HIGH,
+    STREAMS,
+    IMAGES,
+    SUGGESTED_USERS,
+    EMAIL,
+    CONNECTORS,
+    LISTS,
+    INBOX,
+    IMPORTS,
+    IMPORT_TRIGGERED,
+    BROADCAST,
+    MISC,
+)
 
 r = redis.from_url(settings.REDIS_BROKER_URL)
 
@@ -41,8 +57,17 @@ class CeleryStatus(View):
                 LOW: r.llen(LOW),
                 MEDIUM: r.llen(MEDIUM),
                 HIGH: r.llen(HIGH),
+                STREAMS: r.llen(STREAMS),
+                IMAGES: r.llen(IMAGES),
+                SUGGESTED_USERS: r.llen(SUGGESTED_USERS),
+                EMAIL: r.llen(EMAIL),
+                CONNECTORS: r.llen(CONNECTORS),
+                LISTS: r.llen(LISTS),
+                INBOX: r.llen(INBOX),
                 IMPORTS: r.llen(IMPORTS),
+                IMPORT_TRIGGERED: r.llen(IMPORT_TRIGGERED),
                 BROADCAST: r.llen(BROADCAST),
+                MISC: r.llen(MISC),
             }
         # pylint: disable=broad-except
         except Exception as err:
@@ -88,8 +113,17 @@ class ClearCeleryForm(forms.Form):
             (LOW, "Low prioirty"),
             (MEDIUM, "Medium priority"),
             (HIGH, "High priority"),
+            (STREAMS, "Streams"),
+            (IMAGES, "Images"),
+            (SUGGESTED_USERS, "Suggested users"),
+            (EMAIL, "Email"),
+            (CONNECTORS, "Connectors"),
+            (LISTS, "Lists"),
+            (INBOX, "Inbox"),
             (IMPORTS, "Imports"),
+            (IMPORT_TRIGGERED, "Import triggered"),
             (BROADCAST, "Broadcasts"),
+            (MISC, "Misc"),
         ],
         widget=forms.CheckboxSelectMultiple,
     )
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 52d230524..4b95469d9 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -13,7 +13,7 @@ from django.views import View
 from django.views.decorators.csrf import csrf_exempt
 
 from bookwyrm import activitypub, models
-from bookwyrm.tasks import app, MEDIUM, HIGH
+from bookwyrm.tasks import app, INBOX
 from bookwyrm.signatures import Signature
 from bookwyrm.utils import regex
 
@@ -59,11 +59,7 @@ class Inbox(View):
                 return HttpResponse()
             return HttpResponse(status=401)
 
-        # Make activities relating to follow/unfollow a high priority
-        high = ["Follow", "Accept", "Reject", "Block", "Unblock", "Undo"]
-
-        priority = HIGH if activity_json["type"] in high else MEDIUM
-        sometimes_async_activity_task(activity_json, queue=priority)
+        sometimes_async_activity_task(activity_json)
         return HttpResponse()
 
 
@@ -101,7 +97,7 @@ def raise_is_blocked_activity(activity_json):
         raise PermissionDenied()
 
 
-def sometimes_async_activity_task(activity_json, queue=MEDIUM):
+def sometimes_async_activity_task(activity_json):
     """Sometimes we can effectively respond to a request without queuing a new task,
     and whenever that is possible, we should do it."""
     activity = activitypub.parse(activity_json)
@@ -111,10 +107,10 @@ def sometimes_async_activity_task(activity_json, queue=MEDIUM):
         activity.action(allow_external_connections=False)
     except activitypub.ActivitySerializerError:
         # if that doesn't work, run it asynchronously
-        activity_task.apply_async(args=(activity_json,), queue=queue)
+        activity_task.apply_async(args=(activity_json,))
 
 
-@app.task(queue=MEDIUM)
+@app.task(queue=INBOX)
 def activity_task(activity_json):
     """do something with this json we think is legit"""
     # lets see if the activitypub module can make sense of this json
diff --git a/contrib/systemd/bookwyrm-worker.service b/contrib/systemd/bookwyrm-worker.service
index 63be04584..ebba8b6ca 100644
--- a/contrib/systemd/bookwyrm-worker.service
+++ b/contrib/systemd/bookwyrm-worker.service
@@ -6,7 +6,7 @@ After=network.target postgresql.service redis.service
 User=bookwyrm
 Group=bookwyrm
 WorkingDirectory=/opt/bookwyrm/
-ExecStart=/opt/bookwyrm/venv/bin/celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,imports,broadcast
+ExecStart=/opt/bookwyrm/venv/bin/celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc
 StandardOutput=journal
 StandardError=inherit
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 4389c08aa..800690206 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,7 +62,8 @@ services:
     build: .
     networks:
       - main
-    command: celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,imports,broadcast
+    command: celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc
+
     volumes:
       - .:/app
       - static_volume:/app/static

From aae1d10eea0c5280719ebd726a1918da9b02df10 Mon Sep 17 00:00:00 2001
From: Wesley Aptekar-Cassels <me@wesleyac.com>
Date: Thu, 20 Jul 2023 20:00:57 -0400
Subject: [PATCH 29/30] Don't show remote profiles to unauthenticated users

---
 bookwyrm/tests/views/test_user.py | 26 +++++++++++++++++++++++++-
 bookwyrm/views/user.py            |  3 +++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 903f2321b..2b6bc247c 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -4,7 +4,7 @@ from unittest.mock import patch
 from django.contrib.auth.models import AnonymousUser
 from django.http.response import Http404
 from django.template.response import TemplateResponse
-from django.test import TestCase
+from django.test import Client, TestCase
 from django.test.client import RequestFactory
 
 from bookwyrm import models, views
@@ -152,6 +152,30 @@ class UserViews(TestCase):
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
+    def test_user_page_remote_anonymous(self):
+        """when a anonymous user tries to get a remote user"""
+        with patch("bookwyrm.models.user.set_remote_server"):
+            models.User.objects.create_user(
+                "nutria",
+                "",
+                "nutriaword",
+                local=False,
+                remote_id="https://example.com/users/nutria",
+                inbox="https://example.com/users/nutria/inbox",
+                outbox="https://example.com/users/nutria/outbox",
+            )
+
+        view = views.User.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, "nutria@example.com")
+        result.client = Client()
+        self.assertRedirects(
+            result, "https://example.com/users/nutria", fetch_redirect_response=False
+        )
+
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
     @patch("bookwyrm.activitystreams.populate_stream_task.delay")
     def test_followers_page_blocked(self, *_):
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index b027ffa56..e547925a5 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -23,6 +23,9 @@ class User(View):
         """profile page for a user"""
         user = get_user_from_username(request.user, username)
 
+        if not user.local and not request.user.is_authenticated:
+            return redirect(user.remote_id)
+
         if is_api_request(request):
             # we have a json request
             return ActivitypubResponse(user.to_activity())

From 9c5b5d0ac1025e87d7fc5fed9949d34d677c1f7f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 Jul 2023 19:08:47 -0700
Subject: [PATCH 30/30] Updates version

---
 bookwyrm/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index ae5a6a57f..042cd8cf8 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured
 env = Env()
 env.read_env()
 DOMAIN = env("DOMAIN")
-VERSION = "0.6.3"
+VERSION = "0.6.4"
 
 RELEASE_API = env(
     "RELEASE_API",
@@ -22,7 +22,7 @@ RELEASE_API = env(
 PAGE_LENGTH = env.int("PAGE_LENGTH", 15)
 DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English")
 
-JS_CACHE = "d993847c"
+JS_CACHE = "b972a43c"
 
 # email
 EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")