From ff95a709a8bfca6a39df8f4cd6c9d6de45ac7241 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:14:21 +0200
Subject: [PATCH 001/272] Update .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index cf88e987..74eebb96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,6 @@
 
 #nginx
 nginx/default.conf
+
+#macOS
+.DS_Store

From 77e81c4dbbf9180cad5e62aab05b3674e0d782f2 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:14:51 +0200
Subject: [PATCH 002/272] Add django-imagekit to BookWyrm

---
 bookwyrm/settings.py | 1 +
 bw-dev               | 5 ++++-
 requirements.txt     | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index d694e33f..b1deed8f 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -62,6 +62,7 @@ INSTALLED_APPS = [
     "django_rename_app",
     "bookwyrm",
     "celery",
+    "imagekit",
 ]
 
 MIDDLEWARE = [
diff --git a/bw-dev b/bw-dev
index c2b63bc1..1dd4c0ff 100755
--- a/bw-dev
+++ b/bw-dev
@@ -107,7 +107,10 @@ case "$CMD" in
     populate_streams)
         runweb python manage.py populate_streams
         ;;
+    generateimages)
+        runweb python manage.py generateimages
+        ;;
     *)
-        echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds"
+        echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds, generateimages"
         ;;
 esac
diff --git a/requirements.txt b/requirements.txt
index 289d6fe6..7a458094 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 celery==4.4.2
 Django==3.2.0
+django-imagekit==4.0.2
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4

From f60e9d76d264e042bad39cf84025728bf512e919 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:15:08 +0200
Subject: [PATCH 003/272] Generate generators

---
 bookwyrm/imagegenerators.py | 75 +++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 bookwyrm/imagegenerators.py

diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py
new file mode 100644
index 00000000..bad9028e
--- /dev/null
+++ b/bookwyrm/imagegenerators.py
@@ -0,0 +1,75 @@
+from imagekit import ImageSpec, register
+from imagekit.processors import ResizeToFit
+
+class BookXSmallWebp(ImageSpec):
+    processors = [ResizeToFit(80, 80)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookXSmallJpg(ImageSpec):
+    processors = [ResizeToFit(80, 80)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookSmallWebp(ImageSpec):
+    processors = [ResizeToFit(100, 100)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookSmallJpg(ImageSpec):
+    processors = [ResizeToFit(100, 100)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookMediumWebp(ImageSpec):
+    processors = [ResizeToFit(150, 150)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookMediumJpg(ImageSpec):
+    processors = [ResizeToFit(150, 150)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookLargeWebp(ImageSpec):
+    processors = [ResizeToFit(200, 200)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookLargeJpg(ImageSpec):
+    processors = [ResizeToFit(200, 200)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookXLargeWebp(ImageSpec):
+    processors = [ResizeToFit(250, 250)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookXLargeJpg(ImageSpec):
+    processors = [ResizeToFit(250, 250)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookXxLargeWebp(ImageSpec):
+    processors = [ResizeToFit(500, 500)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookXxLargeJpg(ImageSpec):
+    processors = [ResizeToFit(500, 500)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+register.generator('bw:book:xsmall:webp', BookXSmallWebp)
+register.generator('bw:book:xsmall:jpg', BookXSmallJpg)
+register.generator('bw:book:small:webp', BookSmallWebp)
+register.generator('bw:book:small:jpg', BookSmallJpg)
+register.generator('bw:book:medium:webp', BookMediumWebp)
+register.generator('bw:book:medium:jpg', BookMediumJpg)
+register.generator('bw:book:large:webp', BookLargeWebp)
+register.generator('bw:book:large:jpg', BookLargeJpg)
+register.generator('bw:book:xlarge:webp', BookXLargeWebp)
+register.generator('bw:book:xlarge:jpg', BookXLargeJpg)
+register.generator('bw:book:xxlarge:webp', BookXxLargeWebp)
+register.generator('bw:book:xxlarge:jpg', BookXxLargeJpg)

From 4c55f07f2ab17cde6e95fdb699063afcedb0ff50 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:16:09 +0200
Subject: [PATCH 004/272] Update book_cover.html

---
 bookwyrm/templates/snippets/book_cover.html | 153 ++++++++++++++++----
 1 file changed, 128 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 16ab305e..6a15f0fd 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,41 +1,144 @@
 {% spaceless %}
 
 {% load i18n %}
+{% load imagekit %}
 
-<figure
-    class="
-        cover-container
-        {{ cover_class }}
+{% if book.cover %}
+    <picture class="cover-container {{ cover_class }}">
+        {% with external_path|yesno:',/images/' as image_path %}
 
-        {% if not book.cover %}
-            no-cover
+        {% if size_mobile == 'xsmall' %}
+            {% generateimage 'bw:book:xsmall:webp' source=book.cover as th_xsmall_webp %}
+            {% generateimage 'bw:book:xsmall:jpg' source=book.cover as th_xsmall_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_xsmall_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_xsmall_jpg }}"
+            />
+        {% elif size_mobile == 'small' %}
+            {% generateimage 'bw:book:small:webp' source=book.cover as th_small_webp %}
+            {% generateimage 'bw:book:small:jpg' source=book.cover as th_small_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_small_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_small_jpg }}"
+            />
+        {% elif size_mobile == 'medium' %}
+            {% generateimage 'bw:book:medium:webp' source=book.cover as th_medium_webp %}
+            {% generateimage 'bw:book:medium:jpg' source=book.cover as th_medium_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_medium_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_medium_jpg }}"
+            />
+        {% elif size_mobile == 'large' %}
+            {% generateimage 'bw:book:large:webp' source=book.cover as th_large_webp %}
+            {% generateimage 'bw:book:large:jpg' source=book.cover as th_large_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_large_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_large_jpg }}"
+            />
+        {% elif size_mobile == 'xlarge' %}
+            {% generateimage 'bw:book:xlarge:webp' source=book.cover as th_xlarge_webp %}
+            {% generateimage 'bw:book:xlarge:jpg' source=book.cover as th_xlarge_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_xlarge_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_xlarge_jpg }}"
+            />
+        {% elif size_mobile == 'xxlarge' %}
+            {% generateimage 'bw:book:xxlarge:webp' source=book.cover as th_xxlarge_webp %}
+            {% generateimage 'bw:book:xxlarge:jpg' source=book.cover as th_xxlarge_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_xxlarge_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_xxlarge_jpg }}"
+            />
         {% endif %}
-    "
 
-    {% if book.alt_text %}
-        title="{{ book.alt_text }}"
-    {% endif %}
->
-    <img
-        class="book-cover"
+        {% if size == 'xsmall' %}
+            {% generateimage 'bw:book:xsmall:webp' source=book.cover as th_xsmall_webp %}
+            {% generateimage 'bw:book:xsmall:jpg' source=book.cover as th_xsmall_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_xsmall_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_xsmall_jpg }}"/>
+        {% elif size == 'small' %}
+            {% generateimage 'bw:book:small:webp' source=book.cover as th_small_webp %}
+            {% generateimage 'bw:book:small:jpg' source=book.cover as th_small_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_small_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_small_jpg }}"/>
+        {% elif size == 'medium' %}
+            {% generateimage 'bw:book:medium:webp' source=book.cover as th_medium_webp %}
+            {% generateimage 'bw:book:medium:jpg' source=book.cover as th_medium_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_medium_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_medium_jpg }}"/>
+        {% elif size == 'large' %}
+            {% generateimage 'bw:book:large:webp' source=book.cover as th_large_webp %}
+            {% generateimage 'bw:book:large:jpg' source=book.cover as th_large_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_large_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_large_jpg }}"/>
+        {% elif size == 'xlarge' %}
+            {% generateimage 'bw:book:xlarge:webp' source=book.cover as th_xlarge_webp %}
+            {% generateimage 'bw:book:xlarge:jpg' source=book.cover as th_xlarge_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_xlarge_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_xlarge_jpg }}"/>
+        {% elif size == 'xxlarge' %}
+            {% generateimage 'bw:book:xxlarge:webp' source=book.cover as th_xxlarge_webp %}
+            {% generateimage 'bw:book:xxlarge:jpg' source=book.cover as th_xxlarge_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_xxlarge_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_xxlarge_jpg }}"/>
+        {% endif %}
 
-        {% if book.cover %}
-            src="{% if img_path is None %}/images/{% else %}{{ img_path }}{% endif %}{{ book.cover }}"
+        <img
+            class="book-cover"
+            src="{{ image_path }}{{ book.cover }}"
             itemprop="thumbnailUrl"
+            alt="{{ book.alt_text|default:'' }}"
+        >
+        {% endwith %}
+    </picture>
+{% endif %}
 
-            {% if book.alt_text %}
-                alt="{{ book.alt_text }}"
-            {% endif %}
-        {% else %}
+{% if not book.cover and book.alt_text %}
+    <figure class="cover-container no-cover {{ cover_class }}">
+        <img
+            class="book-cover"
             src="/static/images/no_cover.jpg"
             alt="{% trans "No cover" %}"
-        {% endif %}
-    >
-
-    {% if not book.cover and book.alt_text %}
         <figcaption class="cover_caption">
+        >
             <p>{{ book.alt_text }}</p>
         </figcaption>
-    {% endif %}
-</figure>
+    </figure>
+{% endif %}
 {% endspaceless %}

From c1456ce8531d9243ab2d68c430e4a791d374d88a Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:16:33 +0200
Subject: [PATCH 005/272] Update .cover-caption name and styles

---
 bookwyrm/static/css/bookwyrm.css            | 9 +++++++--
 bookwyrm/templates/snippets/book_cover.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 3db25d1f..5a4495c1 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -219,16 +219,21 @@ body {
 /* Cover caption
  * -------------------------------------------------------------------------- */
 
-.no-cover .cover_caption {
+.no-cover .cover-caption {
     position: absolute;
     top: 0;
     right: 0;
     bottom: 0;
     left: 0;
-    padding: 0.25em;
+    padding: 0.5em;
     font-size: 0.75em;
     color: white;
     background-color: #002549;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    white-space: initial;
+    text-align: center;
 }
 
 /** Avatars
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 6a15f0fd..fd1fb438 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -135,8 +135,8 @@
             class="book-cover"
             src="/static/images/no_cover.jpg"
             alt="{% trans "No cover" %}"
-        <figcaption class="cover_caption">
         >
+        <figcaption class="cover-caption">
             <p>{{ book.alt_text }}</p>
         </figcaption>
     </figure>

From dc494323221729d7e06389d1df2f7c6f04ea3325 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:17:39 +0200
Subject: [PATCH 006/272] Change img_path to external_path

---
 bookwyrm/templates/snippets/search_result_text.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index e39d3410..a18b125f 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="columns is-mobile is-gapless">
     <div class="column is-cover">
-        {% include 'snippets/book_cover.html' with book=result cover_class='is-w-xs is-h-xs' img_path=false %}
+        {% include 'snippets/book_cover.html' with book=result cover_class='is-w-xs is-h-xs' external_path=True %}
     </div>
 
     <div class="column is-10 ml-3">

From 36f447210a20e0dde7bb1f86fc27e1f86ec5972e Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:18:05 +0200
Subject: [PATCH 007/272] Specify sizes on all templates

---
 bookwyrm/templates/book/book.html                        | 2 +-
 bookwyrm/templates/book/edit_book.html                   | 2 +-
 bookwyrm/templates/book/editions.html                    | 2 +-
 bookwyrm/templates/discover/large-book.html              | 2 +-
 bookwyrm/templates/discover/small-book.html              | 2 +-
 bookwyrm/templates/get_started/book_preview.html         | 2 +-
 bookwyrm/templates/import_status.html                    | 2 +-
 bookwyrm/templates/lists/curate.html                     | 2 +-
 bookwyrm/templates/lists/list.html                       | 4 ++--
 bookwyrm/templates/lists/list_items.html                 | 2 +-
 bookwyrm/templates/snippets/status/content_status.html   | 2 +-
 bookwyrm/templates/snippets/status/generated_status.html | 2 +-
 bookwyrm/templates/user/shelf/shelf.html                 | 2 +-
 bookwyrm/templates/user/user.html                        | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index df76d8e1..b1b893b7 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -45,7 +45,7 @@
 
     <div class="columns">
         <div class="column is-one-fifth">
-            {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m-mobile' %}
+            {% include 'snippets/book_cover.html' with size='xxlarge' size_mobile='medium' book=book cover_class='is-h-m-mobile' %}
             {% include 'snippets/rate_action.html' with user=request.user book=book %}
 
             <div class="mb-3">
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 8dae1d04..0736eabc 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -183,7 +183,7 @@
             <h2 class="title is-4">{% trans "Cover" %}</h2>
             <div class="columns">
                 <div class="column is-3 is-cover">
-                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xl-mobile is-w-auto-tablet' %}
+                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xl-mobile is-w-auto-tablet' size_mobile='xlarge' size='large' %}
                 </div>
 
                 <div class="column">
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 0d5c1044..d22dd71a 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -15,7 +15,7 @@
     <div class="columns is-gapless mb-6">
         <div class="column is-cover">
             <a href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-w-m is-h-m align to-l-mobile' %}
+                {% include 'snippets/book_cover.html' with size='medium' book=book cover_class='is-w-m is-h-m align to-l-mobile' %}
             </a>
         </div>
 
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 93026991..2f99a75a 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -9,7 +9,7 @@
                 <a
                     class="align to-b to-l"
                     href="{{ book.local_path }}"
-                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' %}</a>
+                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' size='xlarge' %}</a>
 
                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             </div>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 73133de4..82cd4a7e 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -5,7 +5,7 @@
 {% if book %}
     {% with book=book %}
         <a href="{{ book.local_path }}">
-            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-h-l-tablet is-w-auto align to-b to-l' %}
+            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-h-l-tablet is-w-auto align to-b to-l' size='large' %}
         </a>
 
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}
diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html
index d8941ad5..893e7593 100644
--- a/bookwyrm/templates/get_started/book_preview.html
+++ b/bookwyrm/templates/get_started/book_preview.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="column is-cover">
-    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-l is-h-m-mobile' %}
+    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-l is-h-m-mobile' size_mobile='medium' size='large' %}
 
     <div class="select is-small mt-1 mb-3">
         <select name="{{ book.id }}" aria-label="{% blocktrans with book_title=book.title %}Have you read {{ book_title }}?{% endblocktrans %}">
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index b1145611..0a7d3396 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -124,7 +124,7 @@
             <td>
                 {% if item.book %}
                 <a href="{{ item.book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' %}
+                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' size='small' %}
                 </a>
                 {% endif %}
             </td>
diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index 492b399b..661410e8 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -32,7 +32,7 @@
                                 href="{{ book.local_path }}"
                                 aria-hidden="true"
                             >
-                                {% include 'snippets/book_cover.html' with cover_class='is-w-xs-mobile is-w-s is-h-xs-mobile is-h-s' %}
+                                {% include 'snippets/book_cover.html' with cover_class='is-w-xs-mobile is-w-s is-h-xs-mobile is-h-s' size_mobile='xsmall' size='small' %}
                             </a>
 
                             <div class="column ml-3">
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 4dc9660a..a2ae0e64 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -41,7 +41,7 @@
                         >
                             <div class="column is-3-mobile is-2-tablet is-cover align to-t">
                                 <a href="{{ item.book.local_path }}" aria-hidden="true">
-                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m-tablet is-align-items-flex-start' %}
+                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m-tablet is-align-items-flex-start' size='medium' %}
                                 </a>
                             </div>
 
@@ -161,7 +161,7 @@
                         href="{{ book.local_path }}"
                         aria-hidden="true"
                     >
-                        {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto is-h-s-mobile align to-t' %}
+                        {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto is-h-s-mobile align to-t' size='small' %}
                     </a>
 
                     <div class="column ml-3">
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 913a23f4..611975b0 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -14,7 +14,7 @@
                     <div class="card-image columns is-mobile is-gapless is-clipped">
                         {% for book in list_books %}
                             <a class="column is-cover" href="{{ book.book.local_path }}">
-                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' aria='show' %}
+                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' size='small' aria='show' %}
                             </a>
                         {% endfor %}
                     </div>
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 39ef9173..66dfaae5 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -18,7 +18,7 @@
                     <div class="column is-cover">
                         <div class="columns is-mobile is-gapless">
                             <div class="column is-cover">
-                                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-mobile is-h-l-tablet' %}</a>
+                                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-mobile is-h-l-tablet' size_mobile='medium' size='large' %}</a>
 
                                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index 71ce2d99..e73b9c32 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -8,7 +8,7 @@
     {% with book=status.book|default:status.mention_books.first %}
         <div class="columns is-mobile is-gapless">
             <a class="column is-cover is-narrow" href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xs is-h-s-tablet' %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xs is-h-s-tablet' size='small' size_mobile='xsmall' %}
             </a>
 
             <div class="column ml-3">
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 2163db8c..dcc2df39 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -94,7 +94,7 @@
                 {% spaceless %}
                 <tr class="book-preview">
                     <td class="book-preview-top-row">
-                        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-tablet is-h-s' %}</a>
+                        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-tablet is-h-s' size='small' %}</a>
                     </td>
                     <td data-title="{% trans "Title" %}">
                         <a href="{{ book.local_path }}">{{ book.title }}</a>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index d2e9be3e..b8a5b7bc 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -35,7 +35,7 @@
             {% for book in shelf.books %}
             <div class="control">
                 <a href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m is-h-s-mobile' %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m is-h-s-mobile' size_mobile='small' size='medium' %}
                 </a>
             </div>
             {% endfor %}

From ef4961e4e9d1ae00c88403f7e76a6b13a622b387 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:33:40 +0200
Subject: [PATCH 008/272] Apply linter suggestions

---
 bookwyrm/imagegenerators.py | 72 ++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py
index bad9028e..fd1eb498 100644
--- a/bookwyrm/imagegenerators.py
+++ b/bookwyrm/imagegenerators.py
@@ -3,73 +3,73 @@ from imagekit.processors import ResizeToFit
 
 class BookXSmallWebp(ImageSpec):
     processors = [ResizeToFit(80, 80)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookXSmallJpg(ImageSpec):
     processors = [ResizeToFit(80, 80)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookSmallWebp(ImageSpec):
     processors = [ResizeToFit(100, 100)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookSmallJpg(ImageSpec):
     processors = [ResizeToFit(100, 100)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookMediumWebp(ImageSpec):
     processors = [ResizeToFit(150, 150)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookMediumJpg(ImageSpec):
     processors = [ResizeToFit(150, 150)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookLargeWebp(ImageSpec):
     processors = [ResizeToFit(200, 200)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookLargeJpg(ImageSpec):
     processors = [ResizeToFit(200, 200)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookXLargeWebp(ImageSpec):
     processors = [ResizeToFit(250, 250)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookXLargeJpg(ImageSpec):
     processors = [ResizeToFit(250, 250)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookXxLargeWebp(ImageSpec):
     processors = [ResizeToFit(500, 500)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookXxLargeJpg(ImageSpec):
     processors = [ResizeToFit(500, 500)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
-register.generator('bw:book:xsmall:webp', BookXSmallWebp)
-register.generator('bw:book:xsmall:jpg', BookXSmallJpg)
-register.generator('bw:book:small:webp', BookSmallWebp)
-register.generator('bw:book:small:jpg', BookSmallJpg)
-register.generator('bw:book:medium:webp', BookMediumWebp)
-register.generator('bw:book:medium:jpg', BookMediumJpg)
-register.generator('bw:book:large:webp', BookLargeWebp)
-register.generator('bw:book:large:jpg', BookLargeJpg)
-register.generator('bw:book:xlarge:webp', BookXLargeWebp)
-register.generator('bw:book:xlarge:jpg', BookXLargeJpg)
-register.generator('bw:book:xxlarge:webp', BookXxLargeWebp)
-register.generator('bw:book:xxlarge:jpg', BookXxLargeJpg)
+register.generator("bw:book:xsmall:webp", BookXSmallWebp)
+register.generator("bw:book:xsmall:jpg", BookXSmallJpg)
+register.generator("bw:book:small:webp", BookSmallWebp)
+register.generator("bw:book:small:jpg", BookSmallJpg)
+register.generator("bw:book:medium:webp", BookMediumWebp)
+register.generator("bw:book:medium:jpg", BookMediumJpg)
+register.generator("bw:book:large:webp", BookLargeWebp)
+register.generator("bw:book:large:jpg", BookLargeJpg)
+register.generator("bw:book:xlarge:webp", BookXLargeWebp)
+register.generator("bw:book:xlarge:jpg", BookXLargeJpg)
+register.generator("bw:book:xxlarge:webp", BookXxLargeWebp)
+register.generator("bw:book:xxlarge:jpg", BookXxLargeJpg)

From 8b4cb4aeede8ebfc927fbb510a69c3d50bb53a20 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:40:25 +0200
Subject: [PATCH 009/272] Thanks, `./bw-dev black`

---
 bookwyrm/imagegenerators.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py
index fd1eb498..31438f74 100644
--- a/bookwyrm/imagegenerators.py
+++ b/bookwyrm/imagegenerators.py
@@ -1,66 +1,79 @@
 from imagekit import ImageSpec, register
 from imagekit.processors import ResizeToFit
 
+
 class BookXSmallWebp(ImageSpec):
     processors = [ResizeToFit(80, 80)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookXSmallJpg(ImageSpec):
     processors = [ResizeToFit(80, 80)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookSmallWebp(ImageSpec):
     processors = [ResizeToFit(100, 100)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookSmallJpg(ImageSpec):
     processors = [ResizeToFit(100, 100)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookMediumWebp(ImageSpec):
     processors = [ResizeToFit(150, 150)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookMediumJpg(ImageSpec):
     processors = [ResizeToFit(150, 150)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookLargeWebp(ImageSpec):
     processors = [ResizeToFit(200, 200)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookLargeJpg(ImageSpec):
     processors = [ResizeToFit(200, 200)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookXLargeWebp(ImageSpec):
     processors = [ResizeToFit(250, 250)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookXLargeJpg(ImageSpec):
     processors = [ResizeToFit(250, 250)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookXxLargeWebp(ImageSpec):
     processors = [ResizeToFit(500, 500)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookXxLargeJpg(ImageSpec):
     processors = [ResizeToFit(500, 500)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 register.generator("bw:book:xsmall:webp", BookXSmallWebp)
 register.generator("bw:book:xsmall:jpg", BookXSmallJpg)
 register.generator("bw:book:small:webp", BookSmallWebp)

From 1f2c296cfd2c4e0e34f0015f65c558f22b6f07ab Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 6 Jun 2021 21:12:21 +0200
Subject: [PATCH 010/272] This should now work

---
 bookwyrm/models/book.py                     |  52 +++++
 bookwyrm/settings.py                        |   3 +
 bookwyrm/templates/snippets/book_cover.html | 221 +++++++++-----------
 requirements.txt                            |   2 +-
 4 files changed, 158 insertions(+), 120 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 869ff04d..cdac631d 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -3,6 +3,7 @@ import re
 
 from django.db import models
 from model_utils.managers import InheritanceManager
+from imagekit.models import ImageSpecField
 
 from bookwyrm import activitypub
 from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE
@@ -87,6 +88,57 @@ class Book(BookDataModel):
 
     objects = InheritanceManager()
 
+    cover_bw_book_xsmall_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:xsmall:webp'
+    )
+    cover_bw_book_xsmall_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:xsmall:jpg'
+    )
+    cover_bw_book_small_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:small:webp'
+    )
+    cover_bw_book_small_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:small:jpg'
+    )
+    cover_bw_book_medium_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:medium:webp'
+    )
+    cover_bw_book_medium_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:medium:jpg'
+    )
+    cover_bw_book_large_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:large:webp'
+    )
+    cover_bw_book_large_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:large:jpg'
+    )
+    cover_bw_book_xlarge_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:xlarge:webp'
+    )
+    cover_bw_book_xlarge_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:xlarge:jpg'
+    )
+    cover_bw_book_xxlarge_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:xxlarge:webp'
+    )
+    cover_bw_book_xxlarge_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:xxlarge:jpg'
+    )
+
+
+
     @property
     def author_text(self):
         """format a list of authors"""
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 332b0c2c..58f1d2f7 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -185,3 +185,6 @@ USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % (
     VERSION,
     DOMAIN,
 )
+
+# Imagekit generated thumbnails
+IMAGEKIT_CACHEFILE_DIR = "thumbnails"
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index fd1fb438..cf133e59 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -5,127 +5,110 @@
 
 {% if book.cover %}
     <picture class="cover-container {{ cover_class }}">
-        {% with external_path|yesno:',/images/' as image_path %}
+        {% if external_path %}
+            <img
+                class="book-cover"
+                src="{{ book.cover }}"
+                itemprop="thumbnailUrl"
+                alt="{{ book.alt_text|default:'' }}"
+            >
+        {% else %}
 
-        {% if size_mobile == 'xsmall' %}
-            {% generateimage 'bw:book:xsmall:webp' source=book.cover as th_xsmall_webp %}
-            {% generateimage 'bw:book:xsmall:jpg' source=book.cover as th_xsmall_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_xsmall_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_xsmall_jpg }}"
-            />
-        {% elif size_mobile == 'small' %}
-            {% generateimage 'bw:book:small:webp' source=book.cover as th_small_webp %}
-            {% generateimage 'bw:book:small:jpg' source=book.cover as th_small_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_small_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_small_jpg }}"
-            />
-        {% elif size_mobile == 'medium' %}
-            {% generateimage 'bw:book:medium:webp' source=book.cover as th_medium_webp %}
-            {% generateimage 'bw:book:medium:jpg' source=book.cover as th_medium_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_medium_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_medium_jpg }}"
-            />
-        {% elif size_mobile == 'large' %}
-            {% generateimage 'bw:book:large:webp' source=book.cover as th_large_webp %}
-            {% generateimage 'bw:book:large:jpg' source=book.cover as th_large_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_large_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_large_jpg }}"
-            />
-        {% elif size_mobile == 'xlarge' %}
-            {% generateimage 'bw:book:xlarge:webp' source=book.cover as th_xlarge_webp %}
-            {% generateimage 'bw:book:xlarge:jpg' source=book.cover as th_xlarge_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_xlarge_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_xlarge_jpg }}"
-            />
-        {% elif size_mobile == 'xxlarge' %}
-            {% generateimage 'bw:book:xxlarge:webp' source=book.cover as th_xxlarge_webp %}
-            {% generateimage 'bw:book:xxlarge:jpg' source=book.cover as th_xxlarge_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_xxlarge_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_xxlarge_jpg }}"
-            />
+            {% if size_mobile == 'xsmall' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_xsmall_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"
+                />
+            {% elif size_mobile == 'small' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_small_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_small_jpg.url }}"
+                />
+            {% elif size_mobile == 'medium' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_medium_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_medium_jpg.url }}"
+                />
+            {% elif size_mobile == 'large' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_large_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_large_jpg.url }}"
+                />
+            {% elif size_mobile == 'xlarge' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_xlarge_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"
+                />
+            {% elif size_mobile == 'xxlarge' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"
+                />
+            {% endif %}
+
+            {% if size == 'xsmall' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_xsmall_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"/>
+            {% elif size == 'small' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_small_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_small_jpg.url }}"/>
+            {% elif size == 'medium' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_medium_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_medium_jpg.url }}"/>
+            {% elif size == 'large' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_large_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_large_jpg.url }}"/>
+            {% elif size == 'xlarge' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_xlarge_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"/>
+            {% elif size == 'xxlarge' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"/>
+            {% endif %}
+
+            <img
+                class="book-cover"
+                src="/images/{{ book.cover }}"
+                itemprop="thumbnailUrl"
+                alt="{{ book.alt_text|default:'' }}"
+            >
         {% endif %}
-
-        {% if size == 'xsmall' %}
-            {% generateimage 'bw:book:xsmall:webp' source=book.cover as th_xsmall_webp %}
-            {% generateimage 'bw:book:xsmall:jpg' source=book.cover as th_xsmall_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_xsmall_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_xsmall_jpg }}"/>
-        {% elif size == 'small' %}
-            {% generateimage 'bw:book:small:webp' source=book.cover as th_small_webp %}
-            {% generateimage 'bw:book:small:jpg' source=book.cover as th_small_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_small_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_small_jpg }}"/>
-        {% elif size == 'medium' %}
-            {% generateimage 'bw:book:medium:webp' source=book.cover as th_medium_webp %}
-            {% generateimage 'bw:book:medium:jpg' source=book.cover as th_medium_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_medium_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_medium_jpg }}"/>
-        {% elif size == 'large' %}
-            {% generateimage 'bw:book:large:webp' source=book.cover as th_large_webp %}
-            {% generateimage 'bw:book:large:jpg' source=book.cover as th_large_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_large_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_large_jpg }}"/>
-        {% elif size == 'xlarge' %}
-            {% generateimage 'bw:book:xlarge:webp' source=book.cover as th_xlarge_webp %}
-            {% generateimage 'bw:book:xlarge:jpg' source=book.cover as th_xlarge_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_xlarge_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_xlarge_jpg }}"/>
-        {% elif size == 'xxlarge' %}
-            {% generateimage 'bw:book:xxlarge:webp' source=book.cover as th_xxlarge_webp %}
-            {% generateimage 'bw:book:xxlarge:jpg' source=book.cover as th_xxlarge_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_xxlarge_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_xxlarge_jpg }}"/>
-        {% endif %}
-
-        <img
-            class="book-cover"
-            src="{{ image_path }}{{ book.cover }}"
-            itemprop="thumbnailUrl"
-            alt="{{ book.alt_text|default:'' }}"
-        >
-        {% endwith %}
     </picture>
 {% endif %}
 
diff --git a/requirements.txt b/requirements.txt
index 3762f47b..5f391be7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4
 Markdown==3.3.3
-Pillow>=7.1.0
+Pillow>=8.2.0
 psycopg2==2.8.4
 pycryptodome==3.9.4
 python-dateutil==2.8.1

From 7ed2ed116a157b6d7deb9f94790376e753012403 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 6 Jun 2021 21:13:16 +0200
Subject: [PATCH 011/272] :sparkles: lint :sparkles:

---
 bookwyrm/models/book.py | 60 +++++++++--------------------------------
 1 file changed, 12 insertions(+), 48 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index cdac631d..4437d628 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -88,56 +88,20 @@ class Book(BookDataModel):
 
     objects = InheritanceManager()
 
-    cover_bw_book_xsmall_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:xsmall:webp'
-    )
-    cover_bw_book_xsmall_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:xsmall:jpg'
-    )
-    cover_bw_book_small_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:small:webp'
-    )
-    cover_bw_book_small_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:small:jpg'
-    )
-    cover_bw_book_medium_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:medium:webp'
-    )
-    cover_bw_book_medium_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:medium:jpg'
-    )
-    cover_bw_book_large_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:large:webp'
-    )
-    cover_bw_book_large_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:large:jpg'
-    )
-    cover_bw_book_xlarge_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:xlarge:webp'
-    )
-    cover_bw_book_xlarge_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:xlarge:jpg'
-    )
+    cover_bw_book_xsmall_webp = ImageSpecField(source="cover", id="bw:book:xsmall:webp")
+    cover_bw_book_xsmall_jpg = ImageSpecField(source="cover", id="bw:book:xsmall:jpg")
+    cover_bw_book_small_webp = ImageSpecField(source="cover", id="bw:book:small:webp")
+    cover_bw_book_small_jpg = ImageSpecField(source="cover", id="bw:book:small:jpg")
+    cover_bw_book_medium_webp = ImageSpecField(source="cover", id="bw:book:medium:webp")
+    cover_bw_book_medium_jpg = ImageSpecField(source="cover", id="bw:book:medium:jpg")
+    cover_bw_book_large_webp = ImageSpecField(source="cover", id="bw:book:large:webp")
+    cover_bw_book_large_jpg = ImageSpecField(source="cover", id="bw:book:large:jpg")
+    cover_bw_book_xlarge_webp = ImageSpecField(source="cover", id="bw:book:xlarge:webp")
+    cover_bw_book_xlarge_jpg = ImageSpecField(source="cover", id="bw:book:xlarge:jpg")
     cover_bw_book_xxlarge_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:xxlarge:webp'
+        source="cover", id="bw:book:xxlarge:webp"
     )
-    cover_bw_book_xxlarge_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:xxlarge:jpg'
-    )
-
-
+    cover_bw_book_xxlarge_jpg = ImageSpecField(source="cover", id="bw:book:xxlarge:jpg")
 
     @property
     def author_text(self):

From 2731ea9aa9183e75d2ed05c131e1e87ed0483e66 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 7 Jun 2021 19:52:25 +0200
Subject: [PATCH 012/272] Add env var to enable/disable thumbnail generation

---
 .env.dev.example                            |   3 +
 .env.prod.example                           |   3 +
 bookwyrm/context_processors.py              |   3 +-
 bookwyrm/models/book.py                     |  31 ++--
 bookwyrm/settings.py                        |   1 +
 bookwyrm/templates/snippets/book_cover.html | 179 ++++++++++----------
 6 files changed, 117 insertions(+), 103 deletions(-)

diff --git a/.env.dev.example b/.env.dev.example
index 2f24378c..e2f0999a 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -50,5 +50,8 @@ EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
 EMAIL_USE_SSL=false
 
+# Thumbnails Generation
+ENABLE_THUMBNAIL_GENERATION=false
+
 # Set this to true when initializing certbot for domain, false when not
 CERTBOT_INIT=false
diff --git a/.env.prod.example b/.env.prod.example
index a82499a3..8aa1b514 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -50,5 +50,8 @@ EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
 EMAIL_USE_SSL=false
 
+# Thumbnails Generation
+ENABLE_THUMBNAIL_GENERATION=false
+
 # Set this to true when initializing certbot for domain, false when not
 CERTBOT_INIT=false
diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index b77c62b0..b95e1c23 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -1,5 +1,5 @@
 """ customize the info available in context for rendering templates """
-from bookwyrm import models
+from bookwyrm import models, settings
 
 
 def site_settings(request):  # pylint: disable=unused-argument
@@ -7,4 +7,5 @@ def site_settings(request):  # pylint: disable=unused-argument
     return {
         "site": models.SiteSettings.objects.get(),
         "active_announcements": models.Announcement.active_announcements(),
+        "enable_thumbnail_generation": settings.ENABLE_THUMBNAIL_GENERATION,
     }
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 4437d628..83884f33 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -6,7 +6,7 @@ from model_utils.managers import InheritanceManager
 from imagekit.models import ImageSpecField
 
 from bookwyrm import activitypub
-from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE
+from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE, ENABLE_THUMBNAIL_GENERATION
 
 from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin
 from .base_model import BookWyrmModel
@@ -88,20 +88,21 @@ class Book(BookDataModel):
 
     objects = InheritanceManager()
 
-    cover_bw_book_xsmall_webp = ImageSpecField(source="cover", id="bw:book:xsmall:webp")
-    cover_bw_book_xsmall_jpg = ImageSpecField(source="cover", id="bw:book:xsmall:jpg")
-    cover_bw_book_small_webp = ImageSpecField(source="cover", id="bw:book:small:webp")
-    cover_bw_book_small_jpg = ImageSpecField(source="cover", id="bw:book:small:jpg")
-    cover_bw_book_medium_webp = ImageSpecField(source="cover", id="bw:book:medium:webp")
-    cover_bw_book_medium_jpg = ImageSpecField(source="cover", id="bw:book:medium:jpg")
-    cover_bw_book_large_webp = ImageSpecField(source="cover", id="bw:book:large:webp")
-    cover_bw_book_large_jpg = ImageSpecField(source="cover", id="bw:book:large:jpg")
-    cover_bw_book_xlarge_webp = ImageSpecField(source="cover", id="bw:book:xlarge:webp")
-    cover_bw_book_xlarge_jpg = ImageSpecField(source="cover", id="bw:book:xlarge:jpg")
-    cover_bw_book_xxlarge_webp = ImageSpecField(
-        source="cover", id="bw:book:xxlarge:webp"
-    )
-    cover_bw_book_xxlarge_jpg = ImageSpecField(source="cover", id="bw:book:xxlarge:jpg")
+    if ENABLE_THUMBNAIL_GENERATION:
+        cover_bw_book_xsmall_webp = ImageSpecField(source="cover", id="bw:book:xsmall:webp")
+        cover_bw_book_xsmall_jpg = ImageSpecField(source="cover", id="bw:book:xsmall:jpg")
+        cover_bw_book_small_webp = ImageSpecField(source="cover", id="bw:book:small:webp")
+        cover_bw_book_small_jpg = ImageSpecField(source="cover", id="bw:book:small:jpg")
+        cover_bw_book_medium_webp = ImageSpecField(source="cover", id="bw:book:medium:webp")
+        cover_bw_book_medium_jpg = ImageSpecField(source="cover", id="bw:book:medium:jpg")
+        cover_bw_book_large_webp = ImageSpecField(source="cover", id="bw:book:large:webp")
+        cover_bw_book_large_jpg = ImageSpecField(source="cover", id="bw:book:large:jpg")
+        cover_bw_book_xlarge_webp = ImageSpecField(source="cover", id="bw:book:xlarge:webp")
+        cover_bw_book_xlarge_jpg = ImageSpecField(source="cover", id="bw:book:xlarge:jpg")
+        cover_bw_book_xxlarge_webp = ImageSpecField(
+            source="cover", id="bw:book:xxlarge:webp"
+        )
+        cover_bw_book_xxlarge_jpg = ImageSpecField(source="cover", id="bw:book:xxlarge:jpg")
 
     @property
     def author_text(self):
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 58f1d2f7..76fb079f 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -187,4 +187,5 @@ USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % (
 )
 
 # Imagekit generated thumbnails
+ENABLE_THUMBNAIL_GENERATION = env.bool("ENABLE_THUMBNAIL_GENERATION", False)
 IMAGEKIT_CACHEFILE_DIR = "thumbnails"
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index cf133e59..1e279580 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,6 +1,7 @@
 {% spaceless %}
 
 {% load i18n %}
+{% load static %}
 {% load imagekit %}
 
 {% if book.cover %}
@@ -14,97 +15,101 @@
             >
         {% else %}
 
-            {% if size_mobile == 'xsmall' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_xsmall_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"
-                />
-            {% elif size_mobile == 'small' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_small_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_small_jpg.url }}"
-                />
-            {% elif size_mobile == 'medium' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_medium_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_medium_jpg.url }}"
-                />
-            {% elif size_mobile == 'large' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_large_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_large_jpg.url }}"
-                />
-            {% elif size_mobile == 'xlarge' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_xlarge_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"
-                />
-            {% elif size_mobile == 'xxlarge' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"
-                />
-            {% endif %}
+            {% if enable_thumbnail_generation %}
+
+                {% if size_mobile == 'xsmall' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_xsmall_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"
+                    />
+                {% elif size_mobile == 'small' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_small_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_small_jpg.url }}"
+                    />
+                {% elif size_mobile == 'medium' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_medium_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_medium_jpg.url }}"
+                    />
+                {% elif size_mobile == 'large' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_large_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_large_jpg.url }}"
+                    />
+                {% elif size_mobile == 'xlarge' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_xlarge_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"
+                    />
+                {% elif size_mobile == 'xxlarge' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"
+                    />
+                {% endif %}
+
+                {% if size == 'xsmall' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_xsmall_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"/>
+                {% elif size == 'small' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_small_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_small_jpg.url }}"/>
+                {% elif size == 'medium' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_medium_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_medium_jpg.url }}"/>
+                {% elif size == 'large' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_large_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_large_jpg.url }}"/>
+                {% elif size == 'xlarge' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_xlarge_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"/>
+                {% elif size == 'xxlarge' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"/>
+                {% endif %}
 
-            {% if size == 'xsmall' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_xsmall_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"/>
-            {% elif size == 'small' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_small_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_small_jpg.url }}"/>
-            {% elif size == 'medium' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_medium_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_medium_jpg.url }}"/>
-            {% elif size == 'large' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_large_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_large_jpg.url }}"/>
-            {% elif size == 'xlarge' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_xlarge_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"/>
-            {% elif size == 'xxlarge' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"/>
             {% endif %}
 
             <img
                 class="book-cover"
-                src="/images/{{ book.cover }}"
+                src="{% get_media_prefix %}{{ book.cover }}"
                 itemprop="thumbnailUrl"
                 alt="{{ book.alt_text|default:'' }}"
             >
@@ -116,7 +121,7 @@
     <figure class="cover-container no-cover {{ cover_class }}">
         <img
             class="book-cover"
-            src="/static/images/no_cover.jpg"
+            src="{% static "images/no_cover.jpg" %}"
             alt="{% trans "No cover" %}"
         >
         <figcaption class="cover-caption">

From 4359505124dcce51689ad2134bf667ce771898d2 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 7 Jun 2021 19:54:16 +0200
Subject: [PATCH 013/272] Update book.py

---
 bookwyrm/models/book.py | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 83884f33..b0d5d476 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -89,20 +89,38 @@ class Book(BookDataModel):
     objects = InheritanceManager()
 
     if ENABLE_THUMBNAIL_GENERATION:
-        cover_bw_book_xsmall_webp = ImageSpecField(source="cover", id="bw:book:xsmall:webp")
-        cover_bw_book_xsmall_jpg = ImageSpecField(source="cover", id="bw:book:xsmall:jpg")
-        cover_bw_book_small_webp = ImageSpecField(source="cover", id="bw:book:small:webp")
+        cover_bw_book_xsmall_webp = ImageSpecField(
+            source="cover", id="bw:book:xsmall:webp"
+        )
+        cover_bw_book_xsmall_jpg = ImageSpecField(
+            source="cover", id="bw:book:xsmall:jpg"
+        )
+        cover_bw_book_small_webp = ImageSpecField(
+            source="cover", id="bw:book:small:webp"
+        )
         cover_bw_book_small_jpg = ImageSpecField(source="cover", id="bw:book:small:jpg")
-        cover_bw_book_medium_webp = ImageSpecField(source="cover", id="bw:book:medium:webp")
-        cover_bw_book_medium_jpg = ImageSpecField(source="cover", id="bw:book:medium:jpg")
-        cover_bw_book_large_webp = ImageSpecField(source="cover", id="bw:book:large:webp")
+        cover_bw_book_medium_webp = ImageSpecField(
+            source="cover", id="bw:book:medium:webp"
+        )
+        cover_bw_book_medium_jpg = ImageSpecField(
+            source="cover", id="bw:book:medium:jpg"
+        )
+        cover_bw_book_large_webp = ImageSpecField(
+            source="cover", id="bw:book:large:webp"
+        )
         cover_bw_book_large_jpg = ImageSpecField(source="cover", id="bw:book:large:jpg")
-        cover_bw_book_xlarge_webp = ImageSpecField(source="cover", id="bw:book:xlarge:webp")
-        cover_bw_book_xlarge_jpg = ImageSpecField(source="cover", id="bw:book:xlarge:jpg")
+        cover_bw_book_xlarge_webp = ImageSpecField(
+            source="cover", id="bw:book:xlarge:webp"
+        )
+        cover_bw_book_xlarge_jpg = ImageSpecField(
+            source="cover", id="bw:book:xlarge:jpg"
+        )
         cover_bw_book_xxlarge_webp = ImageSpecField(
             source="cover", id="bw:book:xxlarge:webp"
         )
-        cover_bw_book_xxlarge_jpg = ImageSpecField(source="cover", id="bw:book:xxlarge:jpg")
+        cover_bw_book_xxlarge_jpg = ImageSpecField(
+            source="cover", id="bw:book:xxlarge:jpg"
+        )
 
     @property
     def author_text(self):

From 0c83882a118e31c34045d1946ec48e642199b324 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sat, 19 Jun 2021 19:44:14 +0200
Subject: [PATCH 014/272] Fix lint

---
 bookwyrm/imagegenerators.py | 25 +++++++++++++++++++++++++
 bookwyrm/models/book.py     |  7 ++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py
index 31438f74..1d065192 100644
--- a/bookwyrm/imagegenerators.py
+++ b/bookwyrm/imagegenerators.py
@@ -1,74 +1,99 @@
+"""Generators for all the different thumbnail sizes"""
 from imagekit import ImageSpec, register
 from imagekit.processors import ResizeToFit
 
 
 class BookXSmallWebp(ImageSpec):
+    """Handles XSmall size in Webp format"""
+
     processors = [ResizeToFit(80, 80)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookXSmallJpg(ImageSpec):
+    """Handles XSmall size in Jpeg format"""
+
     processors = [ResizeToFit(80, 80)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookSmallWebp(ImageSpec):
+    """Handles Small size in Webp format"""
+
     processors = [ResizeToFit(100, 100)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookSmallJpg(ImageSpec):
+    """Handles Small size in Jpeg format"""
+
     processors = [ResizeToFit(100, 100)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookMediumWebp(ImageSpec):
+    """Handles Medium size in Webp format"""
+
     processors = [ResizeToFit(150, 150)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookMediumJpg(ImageSpec):
+    """Handles Medium size in Jpeg format"""
+
     processors = [ResizeToFit(150, 150)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookLargeWebp(ImageSpec):
+    """Handles Large size in Webp format"""
+
     processors = [ResizeToFit(200, 200)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookLargeJpg(ImageSpec):
+    """Handles Large size in Jpeg format"""
+
     processors = [ResizeToFit(200, 200)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookXLargeWebp(ImageSpec):
+    """Handles XLarge size in Webp format"""
+
     processors = [ResizeToFit(250, 250)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookXLargeJpg(ImageSpec):
+    """Handles XLarge size in Jpeg format"""
+
     processors = [ResizeToFit(250, 250)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookXxLargeWebp(ImageSpec):
+    """Handles XxLarge size in Webp format"""
+
     processors = [ResizeToFit(500, 500)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookXxLargeJpg(ImageSpec):
+    """Handles XxLarge size in Jpeg format"""
+
     processors = [ResizeToFit(500, 500)]
     format = "JPEG"
     options = {"quality": 95}
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 03ff572f..189cbb89 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -9,7 +9,12 @@ from imagekit.models import ImageSpecField
 
 from bookwyrm import activitypub
 from bookwyrm.preview_images import generate_edition_preview_image_task
-from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE, ENABLE_PREVIEW_IMAGES, ENABLE_THUMBNAIL_GENERATION
+from bookwyrm.settings import (
+    DOMAIN,
+    DEFAULT_LANGUAGE,
+    ENABLE_PREVIEW_IMAGES,
+    ENABLE_THUMBNAIL_GENERATION,
+)
 
 from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin
 from .base_model import BookWyrmModel

From ad3dc16005a046855798be4e7a595ad8e94082e3 Mon Sep 17 00:00:00 2001
From: root <root@instance-1.us-central1-a.c.quiet-being-317604.internal>
Date: Tue, 22 Jun 2021 13:18:23 +0000
Subject: [PATCH 015/272] Removrd Bio from Your books

---
 bookwyrm/templates/user/layout.html           |  0
 .../templates/user/layout_without_bio.html    | 58 +++++++++++++++++++
 bookwyrm/templates/user/lists.html            |  0
 bookwyrm/templates/user/shelf/shelf.html      |  2 +-
 bookwyrm/templates/user/user.html             |  0
 bookwyrm/templates/user/user_preview.html     |  0
 6 files changed, 59 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 bookwyrm/templates/user/layout.html
 create mode 100755 bookwyrm/templates/user/layout_without_bio.html
 mode change 100644 => 100755 bookwyrm/templates/user/lists.html
 mode change 100644 => 100755 bookwyrm/templates/user/user.html
 mode change 100644 => 100755 bookwyrm/templates/user/user_preview.html

diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
old mode 100644
new mode 100755
diff --git a/bookwyrm/templates/user/layout_without_bio.html b/bookwyrm/templates/user/layout_without_bio.html
new file mode 100755
index 00000000..d76cdc7c
--- /dev/null
+++ b/bookwyrm/templates/user/layout_without_bio.html
@@ -0,0 +1,58 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+{% load humanize %}
+{% load utilities %}
+{% load markdown %}
+{% load layout %}
+
+{% block title %}{{ user.display_name }}{% endblock %}
+
+{% block opengraph_images %}
+    {% include 'snippets/opengraph_images.html' with image=user.preview_image %}
+{% endblock %}
+
+{% block content %}
+<header class="block">
+    {% block header %}
+    <h1 class="title">
+        {% trans "User Profile" %}
+    </h1>
+    {% endblock %}
+</header>
+
+
+{% block tabs %}
+{% with user|username as username %}
+<nav class="tabs">
+    <ul>
+        {% url 'user-feed' user|username as url %}
+        <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Activity" %}</a>
+        </li>
+        {% if is_self or user.goal.exists %}
+        {% now 'Y' as year %}
+        {% url 'user-goal' user|username year as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Reading Goal" %}</a>
+        </li>
+        {% endif %}
+        {% if is_self or user.list_set.exists %}
+        {% url 'user-lists' user|username as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Lists" %}</a>
+        </li>
+        {% endif %}
+        {% if user.shelf_set.exists %}
+        {% url 'user-shelves' user|username as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Books" %}</a>
+        </li>
+        {% endif %}
+    </ul>
+</nav>
+{% endwith %}
+{% endblock %}
+
+{% block panel %}{% endblock %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
old mode 100644
new mode 100755
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 2163db8c..6f0babd4 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -1,4 +1,4 @@
-{% extends 'user/layout.html' %}
+{% extends 'user/layout_without_bio.html' %}
 {% load bookwyrm_tags %}
 {% load utilities %}
 {% load humanize %}
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
old mode 100644
new mode 100755
diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html
old mode 100644
new mode 100755

From 9b97fbc0aea8569c65e0cc6b569938a448fb8e12 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 2 Aug 2021 12:56:11 -0700
Subject: [PATCH 016/272] Fixes error in merge

---
 bookwyrm/templates/snippets/book_cover.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 3837d3ec..67bc4837 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -115,6 +115,7 @@
                 {% else %}
                 src="{% static "images/no_cover.jpg" %}"
                 alt="{% trans "No cover" %}"
+                {% endif %}
             >
 
         {% endif %}

From 7754b490fa598daab93bd8b8da4f6931e7452dc7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 2 Aug 2021 22:40:19 +0200
Subject: [PATCH 017/272] Bring consistency to management commands

---
 bw-dev | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bw-dev b/bw-dev
index 834fd316..88cf99d9 100755
--- a/bw-dev
+++ b/bw-dev
@@ -123,7 +123,7 @@ case "$CMD" in
     populate_streams)
         runweb python manage.py populate_streams
         ;;
-    generateimages)
+    generate_thumbnails)
         runweb python manage.py generateimages
         ;;
     generate_preview_images)
@@ -171,7 +171,7 @@ case "$CMD" in
         echo "    black"
         echo "    populate_streams"
         echo "    generate_preview_images [--all]"
-        echo "    generateimages"
+        echo "    generate_thumbnails"
         echo "    copy_media_to_s3"
         echo "    set_cors_to_s3 [cors file]"
         echo "    runweb [command]"

From 2370f6043628c20b331d2512df3b9b34dcffd5d2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 2 Aug 2021 14:46:56 -0600
Subject: [PATCH 018/272] Update bookwyrm/templates/snippets/book_cover.html

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 bookwyrm/templates/snippets/book_cover.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 67bc4837..8068051d 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -110,12 +110,7 @@
             <img
                 class="book-cover"
                 itemprop="thumbnailUrl"
-                {% if book.cover %}
                 src="{% if img_path is None %}{% get_media_prefix %}{% else %}{{ img_path }}{% endif %}{{ book.cover }}"
-                {% else %}
-                src="{% static "images/no_cover.jpg" %}"
-                alt="{% trans "No cover" %}"
-                {% endif %}
             >
 
         {% endif %}

From ce4553b367beb905fcf81d2efab9e7d265c52402 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Tue, 3 Aug 2021 17:45:52 +0200
Subject: [PATCH 019/272] Add simple tag to provide fallback if original image
 doesn't exist

---
 bookwyrm/templates/snippets/book_cover.html | 86 +++++++++++++++------
 bookwyrm/templatetags/utilities.py          | 11 +++
 2 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 8068051d..84303015 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -3,6 +3,7 @@
 {% load i18n %}
 {% load static %}
 {% load imagekit %}
+{% load utilities %}
 
 {% if book.cover %}
     <picture class="cover-container {{ cover_class }}">
@@ -21,93 +22,130 @@
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_xsmall_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'small' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_small_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_small_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'medium' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_medium_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_medium_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'large' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_large_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_large_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'xlarge' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_xlarge_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'xxlarge' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='jpg' %}"
                     />
                 {% endif %}
 
                 {% if size == 'xsmall' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_xsmall_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='jpg' %}"
+                    />
                 {% elif size == 'small' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_small_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_small_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='jpg' %}"
+                    />
                 {% elif size == 'medium' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_medium_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_medium_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='jpg' %}"
+                    />
                 {% elif size == 'large' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_large_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_large_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='jpg' %}"
+                    />
                 {% elif size == 'xlarge' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_xlarge_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='jpg' %}"
+                    />
                 {% elif size == 'xxlarge' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='jpg' %}"
+                    />
                 {% endif %}
 
             {% endif %}
 
             <img
+                alt="{{ book.alt_text|default:'' }}"
                 class="book-cover"
                 itemprop="thumbnailUrl"
                 src="{% if img_path is None %}{% get_media_prefix %}{% else %}{{ img_path }}{% endif %}{{ book.cover }}"
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index 23b6685d..1be66049 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -3,6 +3,7 @@ import os
 from uuid import uuid4
 from django import template
 from django.utils.translation import gettext_lazy as _
+from django.templatetags.static import static
 
 
 register = template.Library()
@@ -50,3 +51,13 @@ def truncatepath(value, arg):
     except ValueError:  # invalid literal for int()
         return path_list[-1]  # Fail silently.
     return "%s/…%s" % (path_list[0], path_list[-1][-length:])
+
+
+@register.simple_tag(takes_context=False)
+def get_book_cover_thumbnail(book, size, ext):
+    """Returns a book thumbnail at the specified size and extension, with fallback if needed"""
+    try:
+        cover_thumbnail = getattr(book, "cover_bw_book_%s_%s" % (size, ext))
+        return cover_thumbnail.url
+    except OSError:
+        return static("images/no_cover.jpg")

From 14bf7fca2e973ebd30ff3f95bd77f3d3fbc287db Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Tue, 3 Aug 2021 18:03:34 +0200
Subject: [PATCH 020/272] Update book_cover.html

---
 bookwyrm/templates/snippets/book_cover.html | 124 ++------------------
 1 file changed, 11 insertions(+), 113 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 84303015..0d618072 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -18,129 +18,27 @@
 
             {% if enable_thumbnail_generation %}
 
-                {% if size_mobile == 'xsmall' %}
+                {% if size_mobile %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='webp' %}"
+                        srcset="{% get_book_cover_thumbnail book=book size=size_mobile ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'small' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'medium' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'large' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'xlarge' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'xxlarge' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='jpg' %}"
+                        srcset="{% get_book_cover_thumbnail book=book size=size_mobile ext='jpg' %}"
                     />
                 {% endif %}
 
-                {% if size == 'xsmall' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='jpg' %}"
-                    />
-                {% elif size == 'small' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='jpg' %}"
-                    />
-                {% elif size == 'medium' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='jpg' %}"
-                    />
-                {% elif size == 'large' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='jpg' %}"
-                    />
-                {% elif size == 'xlarge' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='jpg' %}"
-                    />
-                {% elif size == 'xxlarge' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='jpg' %}"
-                    />
-                {% endif %}
+                <source
+                    type="image/webp"
+                    srcset="{% get_book_cover_thumbnail book=book size=size ext='webp' %}"
+                />
+                <source
+                    type="image/jpg"
+                    srcset="{% get_book_cover_thumbnail book=book size=size ext='jpg' %}"
+                />
 
             {% endif %}
 

From f3274098b5b9ed617e4a0047a8c19895b32788f4 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Tue, 3 Aug 2021 18:10:06 +0200
Subject: [PATCH 021/272] Update bw-dev

---
 bw-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bw-dev b/bw-dev
index 88cf99d9..f607acfd 100755
--- a/bw-dev
+++ b/bw-dev
@@ -170,8 +170,8 @@ case "$CMD" in
         echo "    clean"
         echo "    black"
         echo "    populate_streams"
-        echo "    generate_preview_images [--all]"
         echo "    generate_thumbnails"
+        echo "    generate_preview_images [--all]"
         echo "    copy_media_to_s3"
         echo "    set_cors_to_s3 [cors file]"
         echo "    runweb [command]"

From 14c606301c5dc2da6063e14aba20c56415636c2f Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 4 Aug 2021 10:28:59 +0200
Subject: [PATCH 022/272] Fixes "I/O Operation on Closed File error"

https://github.com/matthewwithanm/django-imagekit/issues/391#issuecomment-766708283
---
 bookwyrm/storage_backends.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py
index e10dfb84..237d164b 100644
--- a/bookwyrm/storage_backends.py
+++ b/bookwyrm/storage_backends.py
@@ -1,4 +1,6 @@
 """Handles backends for storages"""
+import os
+from tempfile import SpooledTemporaryFile
 from storages.backends.s3boto3 import S3Boto3Storage
 
 
@@ -15,3 +17,33 @@ class ImagesStorage(S3Boto3Storage):  # pylint: disable=abstract-method
     location = "images"
     default_acl = "public-read"
     file_overwrite = False
+
+    """
+    This is our custom version of S3Boto3Storage that fixes a bug in
+    boto3 where the passed in file is closed upon upload.
+    From:
+    https://github.com/matthewwithanm/django-imagekit/issues/391#issuecomment-275367006
+    https://github.com/boto/boto3/issues/929
+    https://github.com/matthewwithanm/django-imagekit/issues/391
+    """
+
+    def _save(self, name, content):
+        """
+        We create a clone of the content file as when this is passed to
+        boto3 it wrongly closes the file upon upload where as the storage
+        backend expects it to still be open
+        """
+        # Seek our content back to the start
+        content.seek(0, os.SEEK_SET)
+
+        # Create a temporary file that will write to disk after a specified
+        # size. This file will be automatically deleted when closed by
+        # boto3 or after exiting the `with` statement if the boto3 is fixed
+        with SpooledTemporaryFile() as content_autoclose:
+
+            # Write our original content into our copy that will be closed by boto3
+            content_autoclose.write(content.read())
+
+            # Upload the object which will auto close the
+            # content_autoclose instance
+            return super(ImagesStorage, self)._save(name, content_autoclose)
\ No newline at end of file

From 73fd0980683d7927fc5028b5f4de17b44d715c67 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 4 Aug 2021 11:42:18 +0200
Subject: [PATCH 023/272] Better naming of context variable

---
 bookwyrm/context_processors.py              | 2 +-
 bookwyrm/templates/snippets/book_cover.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index afda6b26..0610a8b9 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -11,7 +11,7 @@ def site_settings(request):  # pylint: disable=unused-argument
     return {
         "site": models.SiteSettings.objects.get(),
         "active_announcements": models.Announcement.active_announcements(),
-        "enable_thumbnail_generation": settings.ENABLE_THUMBNAIL_GENERATION,
+        "thumbnail_generation_enabled": settings.ENABLE_THUMBNAIL_GENERATION,
         "media_full_url": settings.MEDIA_FULL_URL,
         "preview_images_enabled": settings.ENABLE_PREVIEW_IMAGES,
         "request_protocol": request_protocol,
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 0d618072..0f684482 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -16,7 +16,7 @@
             >
         {% else %}
 
-            {% if enable_thumbnail_generation %}
+            {% if thumbnail_generation_enabled %}
 
                 {% if size_mobile %}
                     <source

From bf3175f8d5a873d0f248ee8d8f8fab3726df59c7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 4 Aug 2021 11:51:41 +0200
Subject: [PATCH 024/272] lint

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

diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py
index 237d164b..6e821444 100644
--- a/bookwyrm/storage_backends.py
+++ b/bookwyrm/storage_backends.py
@@ -46,4 +46,4 @@ class ImagesStorage(S3Boto3Storage):  # pylint: disable=abstract-method
 
             # Upload the object which will auto close the
             # content_autoclose instance
-            return super(ImagesStorage, self)._save(name, content_autoclose)
\ No newline at end of file
+            return super(ImagesStorage, self)._save(name, content_autoclose)

From cd1a1b2e673fdc220a52cc579c94899f70c7e700 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 4 Aug 2021 11:58:53 +0200
Subject: [PATCH 025/272] Fix R1725: Consider using Python 3 style super()
 without arguments

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

diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py
index 6e821444..4fb0feff 100644
--- a/bookwyrm/storage_backends.py
+++ b/bookwyrm/storage_backends.py
@@ -46,4 +46,4 @@ class ImagesStorage(S3Boto3Storage):  # pylint: disable=abstract-method
 
             # Upload the object which will auto close the
             # content_autoclose instance
-            return super(ImagesStorage, self)._save(name, content_autoclose)
+            return super()._save(name, content_autoclose)

From a8d6dbd8a69b06d53c89c8707f88d411ffc60120 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 16:56:08 -0700
Subject: [PATCH 026/272] Adds books stream audience

---
 bookwyrm/activitystreams.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index a49a7ce4..cdfebfd0 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -173,6 +173,34 @@ class FederatedStream(ActivityStream):
             privacy_levels=["public"],
         )
 
+class BooksStream(ActivityStream):
+    """books on your shelves"""
+
+    key = "books"
+
+    def get_audience(self, status):
+        """anyone with the mentioned book on their shelves"""
+        # only show public statuses on the books feed,
+        # and only statuses that mention books
+        if status.privacy != "public" or not (status.mention_books.exists() or hasattr(status, "book")):
+            return []
+
+        work = status.book.parent_work if hasattr(status, "book") else status.mention_books.first().parent_work
+
+        audience = super().get_audience(status)
+        if not audience:
+            return []
+        return audience.filter(
+            shelfbook__book__parent_work=work
+        ).distinct()
+
+    def get_statuses_for_user(self, user):
+        """any public status that mentions their books"""
+        return privacy_filter(
+            user,
+            models.Status.objects.select_subclasses().filter(,
+            privacy_levels=["public"],
+        )
 
 streams = {
     "home": HomeStream(),

From 5a9dbc50da23f0c1a08eb1f4d7500996d30fa3d1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 17:25:31 -0700
Subject: [PATCH 027/272] Adds books stream

---
 bookwyrm/activitystreams.py                   | 29 +++++++++++++++----
 .../0080_alter_shelfbook_options.py           | 17 +++++++++++
 bookwyrm/settings.py                          |  2 +-
 bookwyrm/urls.py                              |  4 ++-
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 bookwyrm/migrations/0080_alter_shelfbook_options.py

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index cdfebfd0..4e464b3c 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -173,6 +173,7 @@ class FederatedStream(ActivityStream):
             privacy_levels=["public"],
         )
 
+
 class BooksStream(ActivityStream):
     """books on your shelves"""
 
@@ -182,30 +183,46 @@ class BooksStream(ActivityStream):
         """anyone with the mentioned book on their shelves"""
         # only show public statuses on the books feed,
         # and only statuses that mention books
-        if status.privacy != "public" or not (status.mention_books.exists() or hasattr(status, "book")):
+        if status.privacy != "public" or not (
+            status.mention_books.exists() or hasattr(status, "book")
+        ):
             return []
 
-        work = status.book.parent_work if hasattr(status, "book") else status.mention_books.first().parent_work
+        work = (
+            status.book.parent_work
+            if hasattr(status, "book")
+            else status.mention_books.first().parent_work
+        )
 
         audience = super().get_audience(status)
         if not audience:
             return []
-        return audience.filter(
-            shelfbook__book__parent_work=work
-        ).distinct()
+        return audience.filter(shelfbook__book__parent_work=work).distinct()
 
     def get_statuses_for_user(self, user):
         """any public status that mentions their books"""
+        books = user.shelfbook_set.values_list(
+            "book__parent_work__id", flat=True
+        ).distinct()
         return privacy_filter(
             user,
-            models.Status.objects.select_subclasses().filter(,
+            models.Status.objects.select_subclasses()
+            .filter(
+                Q(comment__book__parent_work__id__in=books)
+                | Q(quotation__book__parent_work__id__in=books)
+                | Q(review__book__parent_work__id__in=books)
+                | Q(mention_books__parent_work__id__in=books)
+            )
+            .distinct(),
             privacy_levels=["public"],
         )
 
+
 streams = {
     "home": HomeStream(),
     "local": LocalStream(),
     "federated": FederatedStream(),
+    "books": BooksStream(),
 }
 
 
diff --git a/bookwyrm/migrations/0080_alter_shelfbook_options.py b/bookwyrm/migrations/0080_alter_shelfbook_options.py
new file mode 100644
index 00000000..b5ee7e67
--- /dev/null
+++ b/bookwyrm/migrations/0080_alter_shelfbook_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.4 on 2021-08-05 00:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0079_merge_20210804_1746"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="shelfbook",
+            options={"ordering": ("-shelved_date", "-created_date", "-updated_date")},
+        ),
+    ]
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 17fcfabe..a10f128d 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -118,7 +118,7 @@ REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 REDIS_ACTIVITY_PASSWORD = env("REDIS_ACTIVITY_PASSWORD", None)
 
 MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
-STREAMS = ["home", "local", "federated"]
+STREAMS = ["home", "books"]
 
 # Database
 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 7eccfd65..3d39b9d5 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -23,6 +23,8 @@ STATUS_PATH = r"%s/(%s)/(?P<status_id>\d+)" % (USER_PATH, "|".join(status_types)
 
 BOOK_PATH = r"^book/(?P<book_id>\d+)"
 
+STREAMS = "|".join(settings.STREAMS)
+
 urlpatterns = [
     path("admin/", admin.site.urls),
     path(
@@ -177,7 +179,7 @@ urlpatterns = [
         name="get-started-users",
     ),
     # feeds
-    re_path(r"^(?P<tab>home|local|federated)/?$", views.Feed.as_view()),
+    re_path(r"^(?P<tab>{:s})/?$".format(STREAMS), views.Feed.as_view()),
     re_path(
         r"^direct-messages/?$", views.DirectMessage.as_view(), name="direct-messages"
     ),

From 9d75bc39827d94319d50519e57890c03a677cb11 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 17:53:44 -0700
Subject: [PATCH 028/272] Display books timeline

---
 bookwyrm/activitystreams.py       |  8 ++++----
 bookwyrm/settings.py              |  6 +++++-
 bookwyrm/templates/feed/feed.html | 24 +++++++-----------------
 bookwyrm/urls.py                  |  2 +-
 bookwyrm/views/feed.py            |  9 +++++----
 5 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 4e464b3c..2f155538 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -4,9 +4,9 @@ from django.db.models import signals, Q
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore, r
+from bookwyrm.settings import STREAMS
 from bookwyrm.views.helpers import privacy_filter
 
-
 class ActivityStream(RedisStore):
     """a category of activity stream (like home, local, federated)"""
 
@@ -218,13 +218,13 @@ class BooksStream(ActivityStream):
         )
 
 
-streams = {
+available_streams = [s["key"] for s in STREAMS]
+streams = {k:v for (k, v) in {
     "home": HomeStream(),
     "local": LocalStream(),
     "federated": FederatedStream(),
     "books": BooksStream(),
-}
-
+}.items() if k in available_streams}
 
 @receiver(signals.post_save)
 # pylint: disable=unused-argument
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index a10f128d..180191d9 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -118,7 +118,11 @@ REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 REDIS_ACTIVITY_PASSWORD = env("REDIS_ACTIVITY_PASSWORD", None)
 
 MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
-STREAMS = ["home", "books"]
+
+STREAMS = [
+    {"key": "home", "name": _("Home Timeline"), "shortname": _("Home")},
+    {"key": "books", "name": _("Books Timeline"), "shortname": _("Books")},
+]
 
 # Database
 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 65cf97e1..780f1d17 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -4,35 +4,25 @@
 {% block panel %}
 
 <h1 class="title">
-    {% if tab == 'home' %}
-    {% trans "Home Timeline" %}
-    {% elif tab == 'local' %}
-    {% trans "Local Timeline" %}
-    {% else %}
-    {% trans "Federated Timeline" %}
-    {% endif %}
+    {{ tab.name }}
 </h1>
 <div class="tabs">
     <ul>
-        <li class="{% if tab == 'home' %}is-active{% endif %}"{% if tab == 'home' %} aria-current="page"{% endif %}>
-            <a href="/#feed">{% trans "Home" %}</a>
-        </li>
-        <li class="{% if tab == 'local' %}is-active{% endif %}"{% if tab == 'local' %} aria-current="page"{% endif %}>
-            <a href="/local#feed">{% trans "Local" %}</a>
-        </li>
-        <li class="{% if tab == 'federated' %}is-active{% endif %}"{% if tab == 'federated' %} aria-current="page"{% endif %}>
-            <a href="/federated#feed">{% trans "Federated" %}</a>
+        {% for stream in streams %}
+        <li class="{% if tab.key == stream.key %}is-active{% endif %}"{% if tab.key == stream.key %} aria-current="page"{% endif %}>
+            <a href="/{{ stream.key }}#feed">{{ stream.shortname }}</a>
         </li>
+        {% endfor %}
     </ul>
 </div>
 
 {# announcements and system messages #}
 {% if not activities.number > 1 %}
 <a href="{{ request.path }}" class="transition-y is-hidden notification is-primary is-block" data-poll-wrapper>
-    {% blocktrans %}load <span data-poll="stream/{{ tab }}">0</span> unread status(es){% endblocktrans %}
+    {% blocktrans %}load <span data-poll="stream/{{ tab.key }}">0</span> unread status(es){% endblocktrans %}
 </a>
 
-{% if request.user.show_goal and not goal and tab == 'home' %}
+{% if request.user.show_goal and not goal and tab.key == streams.first.key %}
 {% now 'Y' as year %}
 <section class="block">
     {% include 'snippets/goal_card.html' with year=year %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3d39b9d5..d3e2dad1 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -23,7 +23,7 @@ STATUS_PATH = r"%s/(%s)/(?P<status_id>\d+)" % (USER_PATH, "|".join(status_types)
 
 BOOK_PATH = r"^book/(?P<book_id>\d+)"
 
-STREAMS = "|".join(settings.STREAMS)
+STREAMS = "|".join(s["key"] for s in settings.STREAMS)
 
 urlpatterns = [
     path("admin/", admin.site.urls),
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 3001c86e..d28166a3 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -23,10 +23,10 @@ class Feed(View):
 
     def get(self, request, tab):
         """user's homepage with activity feed"""
-        if not tab in STREAMS:
-            tab = "home"
+        tab = [s for s in STREAMS if s["key"] == tab]
+        tab = tab[0] or STREAMS[0]
 
-        activities = activitystreams.streams[tab].get_activity_stream(request.user)
+        activities = activitystreams.streams[tab["key"]].get_activity_stream(request.user)
         paginated = Paginator(activities, PAGE_LENGTH)
 
         suggestions = suggested_users.get_suggestions(request.user)
@@ -38,8 +38,9 @@ class Feed(View):
                 "activities": paginated.get_page(request.GET.get("page")),
                 "suggested_users": suggestions,
                 "tab": tab,
+                "streams": STREAMS,
                 "goal_form": forms.GoalForm(),
-                "path": "/%s" % tab,
+                "path": "/%s" % tab["key"],
             },
         }
         return TemplateResponse(request, "feed/feed.html", data)

From 9d19092205bb2b0db2e120455e11edb563db9d80 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 18:22:06 -0700
Subject: [PATCH 029/272] Updates tests

---
 bookwyrm/activitystreams.py                    | 18 ++++++++++++------
 .../tests/management/test_populate_streams.py  |  2 +-
 bookwyrm/tests/views/test_feed.py              |  2 +-
 bookwyrm/views/feed.py                         |  6 ++++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 2f155538..0a966971 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -7,6 +7,7 @@ from bookwyrm.redis_store import RedisStore, r
 from bookwyrm.settings import STREAMS
 from bookwyrm.views.helpers import privacy_filter
 
+
 class ActivityStream(RedisStore):
     """a category of activity stream (like home, local, federated)"""
 
@@ -219,12 +220,17 @@ class BooksStream(ActivityStream):
 
 
 available_streams = [s["key"] for s in STREAMS]
-streams = {k:v for (k, v) in {
-    "home": HomeStream(),
-    "local": LocalStream(),
-    "federated": FederatedStream(),
-    "books": BooksStream(),
-}.items() if k in available_streams}
+streams = {
+    k: v
+    for (k, v) in {
+        "home": HomeStream(),
+        "local": LocalStream(),
+        "federated": FederatedStream(),
+        "books": BooksStream(),
+    }.items()
+    if k in available_streams
+}
+
 
 @receiver(signals.post_save)
 # pylint: disable=unused-argument
diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
index ee7a96d7..c080e3fe 100644
--- a/bookwyrm/tests/management/test_populate_streams.py
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -46,4 +46,4 @@ class Activitystreams(TestCase):
             "bookwyrm.activitystreams.ActivityStream.populate_store"
         ) as redis_mock:
             populate_streams()
-        self.assertEqual(redis_mock.call_count, 6)  # 2 users x 3 streams
+        self.assertEqual(redis_mock.call_count, 4)  # 2 users x 2 streams
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index 8a38b808..666c3e02 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -45,7 +45,7 @@ class FeedViews(TestCase):
         view = views.Feed.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        result = view(request, "local")
+        result = view(request, "home")
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index d28166a3..7a46ca57 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -24,9 +24,11 @@ class Feed(View):
     def get(self, request, tab):
         """user's homepage with activity feed"""
         tab = [s for s in STREAMS if s["key"] == tab]
-        tab = tab[0] or STREAMS[0]
+        tab = tab[0] if tab else STREAMS[0]
 
-        activities = activitystreams.streams[tab["key"]].get_activity_stream(request.user)
+        activities = activitystreams.streams[tab["key"]].get_activity_stream(
+            request.user
+        )
         paginated = Paginator(activities, PAGE_LENGTH)
 
         suggestions = suggested_users.get_suggestions(request.user)

From 3b46ce85011b049f5ad8117ba98820b6250f5a31 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 18:57:05 -0700
Subject: [PATCH 030/272] Locale updates

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 24293 -> 24142 bytes
 locale/de_DE/LC_MESSAGES/django.po   | 103 ++++++++++++++-------------
 locale/en_US/LC_MESSAGES/django.po   |  90 ++++++++++++-----------
 locale/es/LC_MESSAGES/django.mo      | Bin 43107 -> 42719 bytes
 locale/es/LC_MESSAGES/django.po      | 101 ++++++++++++++------------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 45939 -> 45471 bytes
 locale/fr_FR/LC_MESSAGES/django.po   | 101 ++++++++++++++------------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 42356 -> 41974 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 100 ++++++++++++++------------
 locale/zh_Hant/LC_MESSAGES/django.mo | Bin 41166 -> 40752 bytes
 locale/zh_Hant/LC_MESSAGES/django.po | 100 ++++++++++++++------------
 11 files changed, 321 insertions(+), 274 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index fb15184108c67c333088d8b27062a76939709a84..543d5355901e12d226dbe40f6d72ce8e7cf616f3 100644
GIT binary patch
delta 7260
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

delta 7413
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

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 5edf43d6..b047f031 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-04 20:40+0000\n"
+"POT-Creation-Date: 2021-08-05 01:33+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -101,27 +101,49 @@ msgstr "Username"
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:123
+msgid "Home Timeline"
+msgstr ""
+
+#: bookwyrm/settings.py:123
+msgid "Home"
+msgstr ""
+
+#: bookwyrm/settings.py:124
+#, fuzzy
+#| msgid "Title"
+msgid "Books Timeline"
+msgstr "Titel"
+
+#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:81
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Buch"
+
+#: bookwyrm/settings.py:170
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:171
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:172
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:173
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:174
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:175
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -972,39 +994,12 @@ msgstr "Alle Nachrichten"
 msgid "You have no messages right now."
 msgstr "Du hast momentan keine Nachrichten."
 
-#: bookwyrm/templates/feed/feed.html:8
-msgid "Home Timeline"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:10
-msgid "Local Timeline"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:12
-#, fuzzy
-#| msgid "Federated Servers"
-msgid "Federated Timeline"
-msgstr "Föderierende Server"
-
-#: bookwyrm/templates/feed/feed.html:18
-msgid "Home"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:21
-msgid "Local"
-msgstr "Lokal"
-
-#: bookwyrm/templates/feed/feed.html:24
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "Föderiert"
-
-#: bookwyrm/templates/feed/feed.html:32
+#: bookwyrm/templates/feed/feed.html:22
 #, python-format
-msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
 
@@ -2020,14 +2015,6 @@ msgstr "Suche nach Buch oder Benutzer*in"
 msgid "Search type"
 msgstr "Suche"
 
-#: bookwyrm/templates/search/layout.html:21
-#: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:81
-#, fuzzy
-#| msgid "Book"
-msgid "Books"
-msgstr "Buch"
-
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
 #: bookwyrm/templates/settings/admin_layout.html:26
@@ -2242,6 +2229,10 @@ msgstr "Instanzname"
 msgid "Status:"
 msgstr "Importstatus"
 
+#: bookwyrm/templates/settings/edit_server.html:40
+msgid "Federated"
+msgstr "Föderiert"
+
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
 #, fuzzy
@@ -2573,15 +2564,23 @@ msgstr "Registrierungen geschlossen text"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
+#: bookwyrm/templates/snippets/authors.html:22
+#, python-format
+msgid "and %(remainder_count_display)s other"
+msgid_plural "and %(remainder_count_display)s others"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/book_cover.html:32
 #, fuzzy
 #| msgid "Add cover"
 msgid "No cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/snippets/book_titleby.html:4
-#, python-format
-msgid "<a href=\"%(path)s\">%(title)s</a> by "
+#: bookwyrm/templates/snippets/book_titleby.html:6
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s\">%(title)s</a> by"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von "
 
 #: bookwyrm/templates/snippets/boost_button.html:20
@@ -3313,6 +3312,14 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Federated Servers"
+#~ msgid "Federated Timeline"
+#~ msgstr "Föderierende Server"
+
+#~ msgid "Local"
+#~ msgstr "Lokal"
+
 #, fuzzy
 #~| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 #~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index ce06013f..153d8b9a 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-04 20:40+0000\n"
+"POT-Creation-Date: 2021-08-05 01:33+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -91,27 +91,45 @@ msgstr ""
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:166
-msgid "English"
+#: bookwyrm/settings.py:123
+msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:167
-msgid "German"
+#: bookwyrm/settings.py:123
+msgid "Home"
 msgstr ""
 
-#: bookwyrm/settings.py:168
-msgid "Spanish"
+#: bookwyrm/settings.py:124
+msgid "Books Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:169
-msgid "French"
+#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:81
+msgid "Books"
 msgstr ""
 
 #: bookwyrm/settings.py:170
-msgid "Simplified Chinese"
+msgid "English"
 msgstr ""
 
 #: bookwyrm/settings.py:171
+msgid "German"
+msgstr ""
+
+#: bookwyrm/settings.py:172
+msgid "Spanish"
+msgstr ""
+
+#: bookwyrm/settings.py:173
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:174
+msgid "Simplified Chinese"
+msgstr ""
+
+#: bookwyrm/settings.py:175
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -896,37 +914,12 @@ msgstr ""
 msgid "You have no messages right now."
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:8
-msgid "Home Timeline"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:10
-msgid "Local Timeline"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:12
-msgid "Federated Timeline"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:18
-msgid "Home"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:21
-msgid "Local"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:24
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:32
+#: bookwyrm/templates/feed/feed.html:22
 #, python-format
-msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
@@ -1864,12 +1857,6 @@ msgstr ""
 msgid "Search type"
 msgstr ""
 
-#: bookwyrm/templates/search/layout.html:21
-#: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:81
-msgid "Books"
-msgstr ""
-
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
 #: bookwyrm/templates/settings/admin_layout.html:26
@@ -2045,6 +2032,10 @@ msgstr ""
 msgid "Status:"
 msgstr ""
 
+#: bookwyrm/templates/settings/edit_server.html:40
+msgid "Federated"
+msgstr ""
+
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
@@ -2333,13 +2324,20 @@ msgstr ""
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
+#: bookwyrm/templates/snippets/authors.html:22
+#, python-format
+msgid "and %(remainder_count_display)s other"
+msgid_plural "and %(remainder_count_display)s others"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr ""
 
-#: bookwyrm/templates/snippets/book_titleby.html:4
+#: bookwyrm/templates/snippets/book_titleby.html:6
 #, python-format
-msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s\">%(title)s</a> by"
 msgstr ""
 
 #: bookwyrm/templates/snippets/boost_button.html:20
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 69c734d46688d85bc60fa4b8f060ab0c9fbd8109..23869cf45428ccb9c4d7e0d8a06dc96b209e7775 100644
GIT binary patch
delta 13188
zcmYk>2YgNU|Htto5@cA3h{Q-@6M`g05PK7&MyM63U88C%uGpoBJ!%B47Ok4qnk`CI
zjZz&-Db=F%XOGhQzuxzJ{2$Ka@yYYM&Uc;fx%XDDobtJN+{g24u<t^LE6vAo3Sqer
z$ElpvacY)SspI5{cbuV^7pLG9%!Ppoj#CyRFcceN0CvWL*c<cXM682Lu{EB<iWpPb
zadJD3$LT^MjDi6eg_E%bzK@0RF1EuwRUAii>V+zQ2lL?uEQ<Rv8ZTog`c`$EaEw64
zbP`bG^ustz$H9#6Z1*M{r+78T8AQbbY>QbF9cK)tU>!V-`7xwAJA`F13RAHRrlTgf
z5&iHqhTu<_4R2x&yoWjQ8D?jEC!mJgAQ-cg54U`@<x8V(tcW}rClP}%$;z9dKl!%E
zmO5Q6KhPYBdSvMsh#6Q3m!n5BJ3%53o<+_457YoRQ8zw8O&~{2cLI4)1BRjoj6}7s
zfa<s=YKsS1`D)aPH=+95gIdV3n(V)x*+~j?!yRi_JjvaOIMhJZQ4?)|!Pp#iUpLf_
zO)#gUFZm4Agcf1}T!WhEZq!7Mq1yeN#Qtkbex*Pwzk%xTwl#c=nsK&T?hT=+or*x6
z_89DhRZ#6RFauYi`m0!*H%IlTd=u2fT3WudhlEzv12x0Gs2PqzHJpmNaXzZuQdGN4
z)I>I;Cj2Gp5gkSC*lE;+&RhLosEOP&{pz@f))PiTTUr;@Q9IOtT~Gt2p-yo>)WpW2
zc5EhUf{RfdzlSRS6jgozb>B(kpgUJE7K_y7ykIgip2rzTLLCf8ZRs>r2lFhy3N`Qs
z%YTMi*+KI(YT(~c?QWqa{uI@(Pd)c@A|I;XGN^V{Fih`%0}?tUU9cbyM@?id>W1a0
zomr3CnJuVCuoL;HaE_q1+^O#xfNGx))vgd~z;b4FD{q3njPG<Lp--%?s2LAMt!N5r
z0&`IVtTaC~w_5!k)P#>({(IEGzghVmj3ECEHQ}%Z?m}9lM_bu}gbq_L)FB#y8qkAU
z$=l{!b1CY+)u@l)%~t*uYKM-a`Z<H@=RE2x{DHps4{Bl08?gU+RzVHjkJ1oS#|fwo
z>Z2ys0=+wgYCjaU!ZD~Fn_>Cor~yAh_4BFazq0&ER6oC>7IwcO`>zh4QJ?{{Hgabg
zges3hZEY#kGmJxZTn7tdE7X7kQ7amWTH$0=`?pd3E;cjKkNkRUf}eOuWFzqy_3iZB
z@?nkL@*=1mD1jQF3aaD!sFk-tot4)tKNz($=@^c4Q4`o`ZnyfqsGaZ}C!r3npjLJV
z)v>0h2EnKalt!&I5!J3fYM@szJEmbY_Qz8A4(e=dNA1W_)Ho+F2cAdn_c&Kcbf(||
zYJfIP-7W8oT3K(@KyPA8oQV1W`3}7kM(>21xdR2G?hCVgF$^GI8r41?HIaJgr}w`#
z37yUks2TUiqUb?&v<CHvHenImfm-qRsAqW|)$X$8|3>w5ANgtF_&0YSU0u{fTcSQ^
zQZbj_|FI;rB{R(h<_gqD^Ey<ApJO3BfjSF+nUB$*yk84<Lb*{Z3`K2yG1S1NQT<g%
z?L;zqw4yE~%Hvz8iL6K6uoczuA<LgIFJU0%cQFe8LrpL;+5JtJfLdX9RR3?G`dNl*
z_a15oKTl@=wS`|&pe;UvIq?Jr;dxZU>!=RypeFbfW6`&zyW)7%N)u5Z<+V^}CIxkP
z`=IU{g&HRv)!+1%?0-%Y^C-}YGf`(@t2I1~>hL&ffIm<Z`^$Wcape74xht!Nns72|
z!1kC6yJ2n|h$V0ws@+<TB{rgN*oK<O9@Gp^pl19N>e*ey;&>Oe#bK@8j^i<ae0|i8
zwnW|64%KgG)B<|qJnU!no@XR9ldNsrnFgX7Mxa(2iQ1uZmamRlQDe-F9jv@J>H}ve
zs{Jg~1l~nG^EIf6?X>c}SWNH#A!~3AE70Iy%!}n;aVJ(AwSvZ|Z?V=`246>gKrKY=
z)JD|Ac9@4yA4q3V3w(g;=U>#}&DK^E<oO4am`y=AmctKGH=H#upmyXchTsj<%Kk$Q
z=-19Y<@rz(k4No9L(6wZ?c@;Dz~fPmY6gbr{a<Jm>rn&kKpm1@r~xjaCiFj4M~^To
z`nKmlVGh*FMwlK{`{|emGf?-fM(xxl^E32lpaUf2HPnr{I=F`|Kk8YQK~1D8YM@4_
zj#^<U?1V9xj=KM2tKWf|z<$)uoU;1MsQzwrVE=W9o=^~p{weO(ltFD(0%`(vP#w2K
z@1a9Ig5DU015x!;P!pVms$Ybf=n5<U07J=dHV>z;|GM!!1sdpg)D3r013g1+T~J52
z<8ajP{i3M$V^J%afoiuD^W!?y0`{UNbQH_tX)KTbB3}<qjECNo7=f|)B{sm@7>1Q!
zbzh%k3?`q3`VJV5{O)w-S^Zhmp}K*3%^sk3;3;Z>K77UMYz3eul-u+aAfXjUqZ-Db
zRvwQ!?e$SNq@dcRTE0K3-B8rZCs}z0s-LB(9a@c=*e90Xg=+t`tH(J@LLFa54Rq7;
z4^S(4j#`Od7x%CQq1q*wNvOls2=ypBqMmUd)C9(%c5WtWK`T-1w_*;x|A$DFq~JJe
zX7^Dm$kNq)kNr^{7DIKIh?;O?)DE;kK17`!SQ)os3%rKiurhz*Z~^L&AHgyBC&n<o
zlh)n+Cz08xf%c<1K8t!Suc8JBOm)vn7t~5Vz;d`7HSuext$tuSJ^0l`J`mYNXFRI@
z9BLs~(W6s(kAwz(j_N2h&E4{%SeASl)T3yJ+L>1|8Pl*OZnpe$)Jl_I<G|qrRDY9D
z3&=2k!&c<udb0lsBqsKBpXpB24PRhsJZ|L=Q4@WReE2zmy<Ag~Phn>VRzv^Z?z66k
zQRLgBCO!gnX2zlxFvZGe_4c?coo@xptYIed<~Zvu@7u?1mlMM&&xffPi`j7wYJkO9
zEsNu1;!yHG_ht2%+|NCn-(d{-OQ;<W^7MC~Nl`39L3zxFEwC>3z&5xRlkfrRG{?X0
z{xE5T+NtiSM=>3v@JHlB)p?ACvDE;#-9U^WzX*$?XA6m<B!0jG_ykK~@Id}!1FNGt
z7=rOQ2X&|pB2AqtgY?g6Oc3=bLdc|JALK=HuA{yK8oj~CIHq6?T!Ku%<9tt|5(Q6C
z&njk!d%7!OcJd8TTbqn|umfhpK2|@->PJ|)$I7RoUeno@UxK<n6LaDg%%%5#KM8I5
z32y=aC4{-j-$gxZAC{|pA=LX_4%KlQ=EVW1iI2yUI2m){M%2W2S^YuO1dd`MJcq%I
z?>r)rhyk1!*#Ncj@u&`_qHdgn8aNZ<a0AxI3#bW34|DIUgaPCeF$f!AB(}jQ9D?e9
z9(t5mMnYS<2Gwvq7Q>^cQ+f-v(yYVXFOg8pM?L~I!3wB}Rl^Xhhx+pBfZCZssIxT;
zHQp@L+qG~w`>&2}Q;>mvBixBB!eH_%P#teZ?Z7Tn2ggtYpFs_H9<}ASQSF|i7L;eC
z+dd4{E)q3fJZguUjAZ`<NwlRv19eAjWk1W0M(xNX%#UkPr*{{Y!H1~(qDHwBDvMfi
zJnE1oqIRw^YMf41-U~I+p&qN4Y!w-(39Q6gxCvwN7Di#A(e6r<P%CPI8Xy(b;hR=J
z3ANIBmj3_?kpC3b?xg9tL_!1JL2YRkzM4WYz>GrOPzBYlF-Bnu>WqxS(zqP8!mm&(
z{|?pPMbsm^hMMSYOhlizypO=+)N~V0W7G|=pa$%W;Wz*_^Qow3ybASfH(?m=u=3;R
zJquWn^4qA>A2imTSU4(Q0yV)n^uGUfte_QYpswBuzBEuBO+n3gHR@3Qg8Ib#+sr%8
z9UuWUKpoVIlTl}(y_I)H?Lc2Fgk#YA@BfQQsNpKq4!n=*XcKCMyHSVi3~FaCpxXV7
zn#dz7j~MT^i$U!~Wh{bCQ9ITb)!$&$LZ+cd&w3dNy$+jE&v-X#z+<SHo<;4%UDUw(
zR|^?tMxh>68Pv+_qZZH{HIa^}i4Q>aHx4zSWggyt4Y-;D?Z6h)BiM-=;FS5Z)nCTu
zlwU&)lrX{l7ORPB-^1*Wn$S>G|Fcl9?+R4;cGOuqF@cUENL-*m6^}6rgVWs|h(~pt
zgjzu(RJ#;&2<kPPiQ1t|RDXL=JNqMQXK$efd~EgEC%QXS)I*{q6&0`|c0hGB4YfsU
zQCqkHwWa$|9Ua4dcn-A_4fvIziMBvJ+x8fVeX$Kr$7no<n(#AJzn;94-5X1wwkj4i
za4pnnZHPrM1$8DySp5W4N7GP;YB`p`?WmnPhwASyjKim>iN{WH%af42$4MsPM@1LZ
z;Yh<;=s^vz&pd<L+H0r*vrcs_h?-cunS?q+jZu#v6-(d<)O)|&+<<|M?|eo=TX+by
zb>E^oyol=PI_mKFOmlw;g<}o!Rk0}!MSb$^MYTVQ+JVbh9PeQi7MSktKqA&A-vq-M
z-<eLL8Lq+dcng!T;M?wuJE0C;AJi76qaS8qHe6)oD^M%^2(#lZt3QA`gh#OoesA@G
zGuUM{3?ZSzQ4saal2AL5j9OVL`r`o9Asm4^8<S8gU5MK1b*TRKpmyRA>b?u8NB1YH
zozF~nA_Zo$|JvGC6sV)#m;*<mp78`!M@z6eZb1!j6SeaDsP<1$XUF#)cfe>=c?@bH
z38*vB7}ahdYTOy`u>S!hR#V`MAECB(3#x;is1<yHEAboD7WbRwPGlr%MIO|B3sF1x
zE^0v=%{{0E9Y-DNtC$o2(T$NLa?ExoQW~|gc+||Rqb87ynotUAC8?+tOvOsL0`)$h
zM76tuy6-0H^W-6x#o#&aSxQ1J+>=5=GfOkaU<~<rsE+oTM^MlF6zUON#wB<I%j2XB
zxBV7#7pmPsRR70N3%g?Z8(50*9iO@GR+L3On`)?m+M`y`$MQok5BW)`l`lZ;&_>ii
z`%s7YFy_T;r~&`6e3p6cVGh9_lt*H2z5nSXa#1iBHDD&HqYd5$d>){l)p-oU8(0h<
zVJsG$?{?e_gUNS5t+*d*!s)1;oQLZFUDQI~$3(sV2S^0sGt7-S7P!x{0P3)mLv>IW
zH9#{gid|6?oq)P;4QjxxsEHm#-FFIg-_NKWxrutK?xFYn4_fGMVLnuYLZ}H9Lv>sM
z^#N2Hwe_7)TmA-W=SHChnueM{25JJUt$Y)9B)`+@^DJ^7QS>7AU(YI@0&Q7C)Qw$H
zuTy_4gKwY?*)pt$Ut?ViT<jj!WNboyG#17Km>(~hkIY=0*p`%+KrLw4682v!oK1mN
zv=X(Fb*N|ciTOEdM-HOS!b!_tK;3^GL-7elVeX}Fc}3KHbx{4cKz$OnLp_qg9uivd
zL{vv}P+Pjn@|!Rp`F*IJI)j?vRjdEo%Kt-km}i+=UktT?a;P1wV)<0FKWc|O!$@d=
znHY|ls1@!)4fr*x<8!DL-a<_v>$~m;Q4nf{ab_*lBWQ*ipf74+9@K>9pvGH@?e+d|
zB2kk9-{tN<m(|7L<TJ4<=3n7{a<#-&<VRy1hVyw`8C#$xIuS!~0qU%Lh<)(~Y=*VD
zSreLp@wgiO_5PnFp^w6g<_#P{{sDH!0hw<7x2To;h+4^?7>0LHkI;X$`}X9=81jWJ
z-xSrpHMYiAQ4`vT`u|VPLlRn1!!_=|>yJWh=~!%o)3G_8L!I7|Yu)z4Q5}DXTEJGU
zfO}Do=oaeHJ;W6Be~<sV!XC)hJKNDyjYPov?z63r#mIL;bubP!k*TNw=Aq8U3iQK`
zs0nOAz4yCOJN7N={&MTw9jT0}uZh~(WK{j3b@u)rryvUj9{sUvDrt^@_c~?1AlBL~
zw1U$w-IvdY-;d;VHguJ?x&(ZW_>r>rv4OW-`_EN?%p78foAv$|ZC}!VP<DhUXXSyU
zb#)~4j3-)tJnH?{^{R_AkFq~W>yhbd!o>c-MZ}&L{dg$cO+f(aI!wha%uha&(1FvX
z=eC}@AMHkMb4g+&dA&|$tb8o#4=qj7Sxfp=VkYTrgfHoItVZ7@(4zyUt0M6;QI!U|
z8qnY}mcbWS2NI2_e;vnQTSC=caR(7jrXTt8Scv$5bREn|-3ijaV=dG*f%GN4|GIuA
zqpK4(CT5fVgjh(r6&>hmO?npb(9Js2NVgz#c@HiALcT2RN8)Yr!-+Iv33(krUG0cB
z?LP1LKaq*If^1Y4p@YqquTHu@WyQ%~#8l$NRhzOl*6u3`n-ZU>9pS@$y6RcI(szio
zm-1CeZ_$a5pklLHa7`xvj+^xUtwjDmQoJBeTRJ_9e^bWCz4y}VTa@TRRHIziuY?cj
z_Cyl*>?2=?I6^ch{~F#U_~3Q-{}l>Hk<nF`^lfg`2S*Fix~>sph%H2A8zcqwF6$~x
zyGgj7sBHJ-vUaLZCY?$QC2kR)Qx-wHfGmukPC+P{Z%|hQ;xO@@<(pcES+N6U2Z{D-
z$n}A>i80Tb@wENHZQ|5_QAU2Qm7Sq%1L-b4rRbE#e_4glC*45ZL=>g2B=P6`=$H@>
zA8SrDr9)BIT4IA*a)n|$;y&px96*d9{vz~sG?~atPgRM+lszZ^h|sl@=tG&VQq;F0
zbls$EzMFK8>sehTlZDDT_z#s`h<`~x#>K=v(#x<pF`u|g)U(cdQFnz{Lgb_@i8@`|
z%z~8FB05@r4Rs@lE98?fC=2guB^nGOQ_>ps!!L*s%0IQTQ0k8osgxa~>;~y4Sl#MN
zP|lAC?^S@mal~R`m(_bK_%nsPA8q|ew<5js#kWI6GG{1!W;ZmWQ4iw9^#kP}lgW=O
z@iCEXl_8Y*({>V0psYSIob&~pLh$3ldzGcE8F8QZ(#kxYEm0STQK4%u@gHgZc1k4P
zAR>t%2AOMZ>f%$%bbUdLBEOtiWc4l0an#+h^mWpG2wkIzt$O}{lgLMd7AocXhiF99
zBzhC`2we@W6Qv6iJ;@hiLg(;*L>TD^%tEA4ze5eVDpH<-tx;DKLcb{5lTYyB`RmF~
zCYT#95U-MsBYcT6)GZ*!QND^;t+uG^BjQ8iHS)={y<z3wQx-&&rc752E049j$|9|-
z?~CXEIt96Dkb_7erm7X!8`kidn{__6ys}?gSq5e0i38;GT76OTEy~uB&P`0WvU-$N
zV2s*m>*q9+nNEaTBa+_h7t<dr5yiRjIc;iURr2><YM;~EZlbIQ>FSp6Y;8Uz|DBcn
z<of^Pd$SGc^cszOlKUPf;woYfalkqmNcyRzf5ZO7TSN`YcVi}@s})g>^k5>5ey`(p
z%6=!h5{)SHuD=)+CrQ?)pa*GPQMiWaMm(~zXzvZ~|0(<*ZQdgi)R^lOZ4TiqqKUO{
zOS&NG?v^L({b{j){7Pah@lelyAMq=Z%?2p$ZOJbO@{LJ9pl&bm6%j?gIgyJvPX1d$
z*LfH3->g>l4Y`w~za~1<S1zI%Wr6rD)<Ez6cOwx;qZvdY;skM%2GPWJ(l1|pxp=Q#
z{5@xBk%xAl6Rk-PCc4w-)tBx~Bwd84LR}pz@0G>-JAso(<BurxrSipfUSChiUsAfC
zxNNuh<2#l<P1BjA3%$4nqv+|yRe`$I)^-?$v*$<0g?Nrq5<;#U@wU~D#u7wLBA6c9
zSug*RuR{8ub=j5lcuOC{yo7cz8|{V=FRmFRGA;8i<*yL=$!~h;g>ycmFbC0)iaa)8
zS<(eaHzt-+w}RM8_z@eai?MbCNVg>Y8J5FK)Q6ESLg*Sqz7+9*bfVq!HtGHPS=pNk
zUB3~rL{svCIE~PCXj}XES-#t{SL>E@+o*;+{kAn|-ZNr;t=_TQ!g}|~F+Y2?0^9Zs
h%9>}}`SFq2w}nlu5IKMLy4d;q*92}m{Qe4`{{zY~Hmv{v

delta 13514
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index fd76f60d..5bae4d7e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-04 20:40+0000\n"
+"POT-Creation-Date: 2021-08-05 01:33+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,27 +91,47 @@ msgstr "nombre de usuario"
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:123
+msgid "Home Timeline"
+msgstr "Línea temporal de hogar"
+
+#: bookwyrm/settings.py:123
+msgid "Home"
+msgstr "Hogar"
+
+#: bookwyrm/settings.py:124
+#, fuzzy
+#| msgid "Book Title"
+msgid "Books Timeline"
+msgstr "Título"
+
+#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:81
+msgid "Books"
+msgstr "Libros"
+
+#: bookwyrm/settings.py:170
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:171
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:172
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:173
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:174
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:175
 #, fuzzy
 #| msgid "Additional info:"
 msgid "Traditional Chinese"
@@ -904,37 +924,13 @@ msgstr "Todos los mensajes"
 msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
-#: bookwyrm/templates/feed/feed.html:8
-msgid "Home Timeline"
-msgstr "Línea temporal de hogar"
-
-#: bookwyrm/templates/feed/feed.html:10
-msgid "Local Timeline"
-msgstr "Línea temporal local"
-
-#: bookwyrm/templates/feed/feed.html:12
-msgid "Federated Timeline"
-msgstr "Línea temporal federalizado"
-
-#: bookwyrm/templates/feed/feed.html:18
-msgid "Home"
-msgstr "Hogar"
-
-#: bookwyrm/templates/feed/feed.html:21
-msgid "Local"
-msgstr "Local"
-
-#: bookwyrm/templates/feed/feed.html:24
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "Federalizado"
-
-#: bookwyrm/templates/feed/feed.html:32
-#, python-format
-msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+#: bookwyrm/templates/feed/feed.html:22
+#, fuzzy, python-format
+#| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
 msgstr "cargar <span data-poll=\"stream/%(tab)s\">0</span> status(es) no leídos"
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "¡No hay actividad ahora mismo! Sigue a otro usuario para empezar"
 
@@ -1885,12 +1881,6 @@ msgstr "Búsqueda"
 msgid "Search type"
 msgstr "Tipo de búsqueda"
 
-#: bookwyrm/templates/search/layout.html:21
-#: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:81
-msgid "Books"
-msgstr "Libros"
-
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
 #: bookwyrm/templates/settings/admin_layout.html:26
@@ -2072,6 +2062,10 @@ msgstr "Instancia:"
 msgid "Status:"
 msgstr "Status:"
 
+#: bookwyrm/templates/settings/edit_server.html:40
+msgid "Federated"
+msgstr "Federalizado"
+
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
@@ -2366,13 +2360,21 @@ msgstr "Texto de registración cerrada:"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Publicado por <a href=\"%(user_path)s\">%(username)s</a>"
 
+#: bookwyrm/templates/snippets/authors.html:22
+#, python-format
+msgid "and %(remainder_count_display)s other"
+msgid_plural "and %(remainder_count_display)s others"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr "Sin portada"
 
-#: bookwyrm/templates/snippets/book_titleby.html:4
-#, python-format
-msgid "<a href=\"%(path)s\">%(title)s</a> by "
+#: bookwyrm/templates/snippets/book_titleby.html:6
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s\">%(title)s</a> by"
 msgstr "<a href=\"%(path)s\">%(title)s</a> por "
 
 #: bookwyrm/templates/snippets/boost_button.html:20
@@ -3047,6 +3049,15 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
+#~ msgid "Local Timeline"
+#~ msgstr "Línea temporal local"
+
+#~ msgid "Federated Timeline"
+#~ msgstr "Línea temporal federalizado"
+
+#~ msgid "Local"
+#~ msgstr "Local"
+
 #~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 #~ msgstr "Eliminar <a href=\"%(path)s\">%(name)s</a>"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 3d622ac662185de82e67b3026ad6d339fb8dab0a..f8ade2a391ba574da54afa6f45e1bf1ad55f9372 100644
GIT binary patch
delta 13530
zcmYk>2V7Ux|HttwB7zeYR6rCE2Z*Q$2=0;K!kvjI?!6`Vxb9Kn*36X}sU@0<D@z+%
zmZ>eXUupWYOf6@bnPvKay}#%1|8*Z7p67G!xo3Rtz27g`{cB#Y{OILgD($`6;TY%T
zI2ACrjN_yhbex9O)ap3h;~ggp({Uc2!4lXd!EvIo9|mGJ7Qt6B1b1UuJcUj13U<VZ
zM8~O(Sy<9>TqlQ0IU4q37@o#<c-ywuuje?S#GSD#j=`$<p>4l~0mMa;7#u5MI5x*X
z9DqSM1zEeZ3d`Xq7{~n16)K}?2uL>0#Zkn+V;AgSpNsJjHpRFGW@lN*rkocr4Bx{j
zyn<R_(T0vw2;-2XI!V@c=tJBGeVN}GOr<!E!NNGhc9?JDY#Xn(@doszUk-AooLyK9
z_uBSj=tq1KNwM>Vjjvd5qWV8TSNGDZ5v#>gSO-H<E9`*&*bTLl!Ke#IqOO~QTF4^Q
zLRO$AUW1x=Gphd{)VN164)3CFO+;hzUz$o%W7DxMDihsN6AVHPJRWsVC!+>fkLq_8
zm9dMciLas-eg`$~1JrfCO&q5@Mx*+-u(oYN{=I4FLW5S+9kt?7s0*f|cCrdJVGgSQ
zK2*jIp)zwEHSi~>eqW$Aa2eJA4l0xPQE!QNQ{E^n=~7Y0p|}hup$7D8#_hn8s5l(8
zuxd7rNA0veYJtsA6L&)O>y5f@1ghUSRKLlng)BlX*j-0O_i!sJg*#CTI$%4TKrQ67
z^%6!A-$SK1xVagqCThY2)PxOCPknRL!n&a{HUPE2G03>CGu@t8YEP_3UAO~z<D7Re
z79V0ItlGj%n1WhZdsIsMpavdp<4LHA=h%2TYGWI$JF%$V|07h?@gvmA&!Gmsfcjv$
zjT+eN8Pl&M>H{Pc^^7E72)0KpWEiUdcvOmKqcZaX>J}_RK60GR=*Rrdx2oWes0(hR
zIzB)xtWZm18B}{XdSe~bLz{?Na643rGf@i|h8lOGb(Zx-dww;#TJcufunRT85mfsr
z492ffE53(?Fe=5QvKH!LYK(e@I-n-(j@n2+>oDs$)Ge5T%Iu;P@~@7YXwbmhPy^+n
z20DOx7T&dfh1&Ub)U$94wbNp$=GFya7;zYCqGqV^I-(Yuj>_0D^ud{_<X<~pK!Z~F
z5-NTjwSc!!10A>Vmo~nL8t5h##saO(fPSb6{ZR`Kvh6id8I4EX(k7^J(_AW{RC=N&
zoPyfXT+~jNqb^v3zL;a(h054L<Ui*ferQL9TAPQn7%Gmm)<9(-4mExY)VOX(D%yD_
z>fsq<<7uc&EWse$guZy#`o2AX3YCfPPy^mW?d%C^+~RG_`AVn-B%u1Gpr79Vu2ghE
zCThZwsFY5}aGZzLa69Uu`3#krtEho~MlI|i>UyWG<79w8GJ!J!i{Jz-inCDtva!A1
z|BX~U4-;x3#oC#bhoB~^iA6CE^%gX??GsT0PeWa|0JWess9TeRdIsJ=E&Lcp;8&>e
z{y-n*cf8UZry}~Hc3vGdKy6gVL>o6p4b%$xrN`-o#c(w$)mu>?MEg+-`W%&+%hns#
zUr`_3f1#@Zi?=tw`$eDzY+`MPN?|%`LH)5f4n<{VB5LAkr~#K?3EYC(&>pObpP?4=
z530XU2QzN@4&+}A5j4nn)Q(dy3_GJ1n1#`}5VgZR)C8ZQ7I+8M?@v?)i+3~&4n(~L
zA*h8%pf*?=)vr-U@~;6}(x4S~z*y{#+VKL^PP0*;^((L>?nHll8+F}j)I?vS#=D4`
z@EU4kzoVW7pH8M<FlxMTmx?B+kDk<9+hH8->8PD8My+@YYQopC1nxsE=zXk$U!eLu
zv_3`kFWlKI#2>Z52-Jez7%HWy)Wt|lL8W*&YTyN^r~D;UMz*3Z+<_YSP1FVs;|e^A
zI^VI2S;%v!h4x1E8-?0v7Lp;?nQ0rApgOKcP5g#!KZ5!II*Cf@6?^_JYNDq$_UURe
zRTj0-8mRMiuremu^F6T^@mMUS_kRl&r7RD%qqkAtdM7XnFQY!;{GK(btAtu;lr;(U
zL6wRcXDDi%v8ac63Th$qaS3K)3|8nyf4%>$Rl!cE6s2Ps%tT!{4mIIq)Kk9@OW}4@
zX5O;#SE$tfgqrv_)UA7h8qe=J(;kYNCkkCXG_h1PL08m5`lALKjs<ZNj>KuGo&93H
zkLv#z{n5L-xh@br51BOvHBX|oC+fP{-N}DxDlgEWd%F>}ke#TBj-UoQj@9rC*1!j-
z0mAtmTIZus3#g0A%rmI--B9CYqMoUdSP7@2GP5zA{3}&EXwU-oqb~dab-^jrE%*-0
z;T3!S5o&=2dYJP?Pzx!AY7fCcjI`EAjoT45Pj^)RK`s?dGzOLOnWzD>kvW_-s0;3)
zcJc((uQ*?EWic4FfjX$`8lgTZQ?MqE#Wwhg^%smKPUuON&>cWUJ9`}i@O{)RIgb_a
zXXH0;$ETM$-x`&=Ow?;O6qTXTs2xr~JzO(T3z}nHjN0*PRKHh{jl0fvDtbB(p)U9o
z)$yE-FQGDY9kug^w%t3^3{)JIp+MBaD%&^~)xV*&HEP^$sCoK$V($M?D%wdFYA2Ji
z8qP#@++p2|dbp0DZpCTTJ-&ciz_0fFQ&a{^^)?xcL~Sq`b$uFY+}>E#r80zyR=O0G
znhh9)Ij9Map(Z$o+QAQ~jNC%LSDeR~fN6cqznsiL*5G`OaagObdFuP&6yn*ax9A^q
zYg38pXC~@_o`(_jzRpBVunqMPJw)xKd4KZ>)(y4rIjGbxv#!T+#M_YP%?TP{&W}fJ
zWG3pNT{3|CuN|(VK?ChU-GZYSjVDmI<}NBT4=@e?!S>j8po!O^c6tN7Fl3M!uOey#
zHLTOH1MwM*$I!v9xfh)Wn+r0qIwyvp?$L78O4lJ@1I{+<-`It?;}G*ZVGin^e~;SX
zJq*Jqs0~yaYR0RAg^6QP?TIcGA1V!PLksjJZjHR^PG=kMLiIa{dNz(?AN&S2VA3#i
zT~lmZfa`G<?W>17&RQ%t!hBxrLB0PcQLnxG2bCgJN{lq$`$1TqI02R7_Na$xBi6yk
zsAnX0l=+ryj8%!#Q5l+vy8dgdf_Jbp28=d;=nTdP;(5pinCtAIqNnj)jK!N6g27|V
zFC>YWM4W*-zY6Q(ah!w?@p&9G*7y_hedP4u30#Q#upKtYG7tGeY)!lg>oUJ{gGzN8
zDlm!`(h_wG#$qr|K`m&tZQqN<h>xHi-jk?X^S$*d>XzI@-Q)YH3_n6Y^d4`{m%z%*
z@06wDkM&UxQCrl#$+YnV)Mx!748YB(kLCkd2EW93yoP#MLnfGoS3@nJIab0}SOSM&
zNt}qTR=&VCEJ01Y3H3>J5bNQ`n263qb5HA`GSdsS(@Cg|%|u<d$j0k2iZ};T@GJ&m
zAoop~s4<EBYb6OZXk{%?4^3Cpg;P+O$wBS(04kNApcZ}(!|(zsbC0nimYi%h5{qh2
zK`k^LwSc}ho;aEO>x4^#CR$)StVN}6w~hCs7I+HvHhhcfpTy_sT5OG4&=07E{*21V
zKd1%xOf{biL8$qvVL7bjQqcvesMKYk1{#U#_&jQ&X{dXjjk?EMQJLFq<723aPN7o!
zJyyl*7>XsPnOhlyk;DVgv++e#l+xv>i8r7Y^eQS<hfoVRgId5P8{fBjPdDv>sOzG!
zAvVTZI2G&SPSnCKqc-|8k^$HGn@U+4%FHk+jz;Yy*~aZq6KB|X3~D0R#w$?+Z$&*j
zxfp_9qEdVZ)n9*VSHxh{2T(Fr(EHz$q6zgZD5Z;0_ih6!)vuv4uosi@1Js0%?RlS>
zCY7a8I}1kjkHO;D2sLh7)VLWKjsq}&F`W5Sw6gW6dv*jh&=u=_Yau?+wa{{?j78hH
z8CD?fYTL)6GO!SvVGinHzJ?n27V6eML03Brm~B=VhI%M!qn?Q*)KlLA%VTF$iig|t
z%h8*718STtsLbp_&$EMC=o!?)uVQU{h#If@9P+P}G@E0-@7tj6)p%6<BGkQKf#J9v
zHPI)id;2wNN4HTEJhkUb&ovWNL~WoRs(*@Y&qQr-;#~5t70;$YDO!x0Xay=0`%x3T
zgQ0j9HPJ1M$ET=!9Y4=3yd~<obkxrKq82>KIv2IEWjF+1cB$wBulXirMNqF{7^-76
z)Wo$>nQ4zf*w404LoIL}24k*mKZ#X{e?pB@bb*;C0JX3RsAt5jOGOV)2ULni*b{TH
z67go#y?PI|fNxRXez#E*{)M_OaG}|0O?-wp8SCH-)Hr)knf@G=!S9gkUFS9x?a+4-
zyTYodd$S0Yx>cx&H>2K?{n!b=!bq(0g1H54P!C-Os{dHjxbv_PzKY&>1(mUD7^3(8
zPb$7N1iWZcABx&hBv!|U7=r^*57P=%2DV@#?nb@eKcOE!Ks^&rQRDhAHVX;D9>n!f
z8Caoq=67DB5{<`EJGg^NnRm7sAQJUKQWMp$0V?%_Q1^HiYQpWPogYR`a2gBaWz;Ra
zj#`lZ6+*Eedj9^8prQ*~VGQ=fBwU0_)d%+cIV?(i1NHFyj#`NSQj?h)sEpM|ZKOZe
z$H}O-YCqP*^QdvWmyv%xjsD9_Lp4+i>tb<iWNnN7#ObIV4YQ6z4KxMy(9K8f@KbyK
z9M&Mdh+44ka`Sl-iJB*QIr&$m1r7d~hGCeA+JTE&;A$*{xu}8mp%!u$m4Wl99sY_5
zSZ0NJO<SY-^~Yj39F_V>sJCvpOGPQ!jXrqM`Xg#*zhFuH!|Jor^ec;6a41&BSkyu~
zqaNOos0rtxGP1(P>utOPwIO#e6<z@65bE`4zRF}I6}6*I=!IFRTQUJl;at?h)}S)9
z4Yi=7sD+=!diWhG!=+c7>nfl!5{vYAokS{SXh=nM%s{PpAnM+YLZxgS*2X;40<NNV
z_y=m@f@{q8dH~iTu7}FRP*lHJHeO=ghMwR5k5SRYzo906j4@c~B@@TtYs3vu-~U%o
z1BR?M*HuUDI1cq}G)9fn1IuB5)WWBt7M_dxAUlSo_5OcPMHk$&9UkcfanYB}LsSvV
z5+|W1>VV2j2I`(Kz#_O6192B>L&tGEo<U`(#X56+S1du?2VH&8jHVKROHubG2eqJF
z?1TqU6Bb@??s;9*1T9dvF3s8(b=`PWhGw8L`64FZVbpbZPz(5TJ@-F|O5qLWbqGfd
z&={40RMgIUpcXI|b>T*PJ{Ps{cToeMLuKF+>TUWRL-21@hRSU;?GdPrMr|bjN=+Ra
zG(dCIj@qFH?ql1>+t{`7DjRP?y%l+=9lwt~@hnDQjZNlDsy%AlEYyM)pvHgIrJ|J`
zMy2XF>XYmqw#0;2%%9Iwu`cmhOhd2D=H7S2M#RHW6TXgmZBJtc-of(NW{a^u>b;+a
z+ORvDic+x{_5QCyE$C&`EyzK==Z8=`IBC6r;ly`Qx1`io^KgZsu8+ZrSPv^;H`F*;
zsEp0QV7>p#sc3*))C6y%?%ijo1)R6%e@0#SC+aowdDSeuJQgJmLuD`qHBmZhheJ{Q
zvrs9Yhq?vpJnh{7gH$xp$EXEdKs`ivQ5O`-F$)YvO%#PqFab5uc+^Dmuo5msUH2wx
z+!OZvH>eF<!Pa;eyD-0#%%{tA%*M%Bbes9;oQE}ukK#vo)5iO@n?J4oi($0;?=WAx
zbx_Yj4;+DOF%1j7Zr-9Um`FSfi{TdZ{Qv*mRCLeYLOy$(6F3Wdy<yrfqu!EVP&@b=
zxp$7=P7_C>4{;pEVX}=!U=iXhd=6(|7d&r`&ei9?PUM>Z(Qp8Z62FB5@k8v3HFg=Z
z@fqT~=!@~YP3jwAEO9ETeFExMx~S_{qF&1f*3NG_PE+DH-z5L)c#j6{%zKadx8KsJ
z*Q7oc!=|W#(`?)g_15&a4o59K3p3G0y>^#S*FD52boTOZ{}7FSILD=;r!yN1VE$3d
zR*HG$xBSol&{4Y?%ekSHAj&A>GPM6eiJ{IN^c-dF^<NM@;M^Uoje0P3becl2j1o`z
zlZIK?oboee1o0l!p;ha+L#&K!rleD%ncxN{pdRM+E63I<r;6toOzSh0YefH{q}kCr
zQ6EWNAO1S-8=PSJ>S#gfVe4h-ca^f*bH+UKTd4m)Nuf;OTsO)kN*3ji7Sf7~lQ{Vy
z4LZ8m!G=>0r%jKg4!x)ih<kV<eh;%QMqao7Kc1t{>y%@({6^skb`pqn+_I`Zka@a!
z5<$?*o*0CYoY15G3dNWDVA|fN=&8|h$o736Gb!KEHqvv({0OCOJXIgNkzc5vv*+~>
zzEKn%=P9#Yf^^%U##Yn|*b7&wf#U#ex3G?FS6c;JugSR?#GNV6(l&s&fjV&9rM}Qq
zJ-^m;C)Uy4;4DYCnQi>tI)%n2l<mYx3>Ztj9Ysfb;!3vPYv^wm@jmC?BR=8jWj-2*
zb1vHU4W&Jc(vi42?MtYCP5D+|JkL|n5nwyFqTY^rB4wcG5q*aiz2eDS+JLf#GmC8R
zT-v{-t`9XG1*yM6nMY|%-*yxopAhS)X>cNlr&1qe&*$0m^=;e&M^XxU@rd|vl8+r{
z3;I#srhH0?qg<kWDe5z0Di*f`?4v%EHXV;CYdtl-B52nq?@*kGXDR2Y>qw@A*y~4A
zUr+h39?^SrNF~TW#t=`-5Aah;6^b|Qk=UF;o}-*2{*jV@T%}Tj_O5o4HpFM``5Wj@
ze4Ua^y)u2uQ~uE-I*#&)62Zy7Se$Z`!iS|(0cTM3g?5{gLHYOb7v~mIUZmt7<*0Y2
zbfWxZ8@Ex9vkR+1y){LLdxpvoQ+KM-VI}bi%1KHS%J-b}rReKn1n2u>Cbr?+=hXeE
ze?UF|_?UV@f?(U$0Y4_*ZR1h&?@0V#;!_34e;FFmDe*K0(%7HEuN<C3UvhPcXHuS_
z)TZBFoKO3ksAH71q6wXYc!jpQ^vyp8Q7KJZ9otv!o2if0{ePL@4T3Q^L1#EZ44$9S
z{4B)zPzKDi?R}{iq3tu`Sp1HnV-}?!=N=Q6_q6akEfytiN&6;TN6}H4qJM>T_R~<3
zlW$QUPJIsLUCKYiI=WJCO3^p7j@AaJ6xVqED7A50;<u^ar*HnDZ)Y#sThR8FZLdz-
z5ZdmdJAy|2n)f@!pL&q()Q32PdN$<&bq9NM(J9qA+7r(;Rc8rx9bG9OcxwOqQH*n6
z5>B>#Ml(i7%2&j{>Ha_BWMP7LDC4N#qpYEPMcG8DNBM}dl9GS?P2bD;0d`}+F%%u)
z24^eIqr5?RLjN7MeHgw*Sxp=J=V9_x_^MZIj|c|4VB1SrV`!^I{S1AMQmRo765qrH
zc$~6}`dmz*Z$m6ViKV_4GblQy;b~j{L-&6LK_H##Q~#X0FJ&yHDsdayb@Zduqiqpp
zQu@=b&yG}_L)@6MfzpKdH0pTP;Q85<pQUU(*t!?pUl}C-2;<_v34Wk$CO*Y-v<;-*
z$M&m4+=!y%Ddjrtt%;|5TFj5C_WWOj*|z-{{XV3A&5kpG`bORVaNGG48Y)nJp~EUl
zjO`fD`Tex(c$K!2co-K`8reP?q7J2^9jm)_xjp}-^)^1F-%D7Ml2m~Fe?eskWh+HT
z02jA3Rp)!!yzO9JXzOF^Mbw9LQCON%g?b@8NuOSnhSYU<Q_4|xa6Xq(mwHds@gk+N
z?qMY5M^BUae@4@ZpAe_mju){naVZ<yuFktuW>dUqPr%N0(t0?IwqI%chLUQpJ3_rM
z=bB-C+M1(#fFC-V+KYSP1>zobs7R?w$v+lQ*+5*2KEo*esMo~fv{%88hzH=a*xO!I
zjrzZj-o&5TwwLt&?Ib8cj~W!efA_TY?KqA>pR;iy^@&{bH6@LD4(*qzx5W(Ne;?y%
z*YPJ#!hMv+wr!(M=>310hILfG!Jq6&&pCb^A?{!YT|qpFxCC)^wG&sOETiNQ_oV$j
z>N;MaEcMi=bFM7)F4&AdY1DU7FHb3|r$3C!L&`;a!4>R8`)Jzu%DEK3!F#3uxWK&q
z$>)pbZA`7`llOVr&ft}$hQ_YkxTkR5uR|XB=J}6%R4OlV?uWj4!Px~W=MCOdtl<9v
DvSMj)

delta 13937
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index c4ca623c..399e4056 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-04 20:40+0000\n"
+"POT-Creation-Date: 2021-08-05 01:33+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -91,27 +91,47 @@ msgstr "nom du compte :"
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:123
+msgid "Home Timeline"
+msgstr "Mon fil d’actualité"
+
+#: bookwyrm/settings.py:123
+msgid "Home"
+msgstr "Accueil"
+
+#: bookwyrm/settings.py:124
+#, fuzzy
+#| msgid "Book Title"
+msgid "Books Timeline"
+msgstr "Titre du livre"
+
+#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:81
+msgid "Books"
+msgstr "Livres"
+
+#: bookwyrm/settings.py:170
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:171
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:172
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:173
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:174
 msgid "Simplified Chinese"
 msgstr "简化字"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:175
 #, fuzzy
 #| msgid "Additional info:"
 msgid "Traditional Chinese"
@@ -900,37 +920,13 @@ msgstr "Tous les messages"
 msgid "You have no messages right now."
 msgstr "Vous n’avez aucun message pour l’instant."
 
-#: bookwyrm/templates/feed/feed.html:8
-msgid "Home Timeline"
-msgstr "Mon fil d’actualité"
-
-#: bookwyrm/templates/feed/feed.html:10
-msgid "Local Timeline"
-msgstr "Fil d’actualité local"
-
-#: bookwyrm/templates/feed/feed.html:12
-msgid "Federated Timeline"
-msgstr "Fil d’actualité des instances fédérées"
-
-#: bookwyrm/templates/feed/feed.html:18
-msgid "Home"
-msgstr "Accueil"
-
-#: bookwyrm/templates/feed/feed.html:21
-msgid "Local"
-msgstr "Local"
-
-#: bookwyrm/templates/feed/feed.html:24
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "Fédéré"
-
-#: bookwyrm/templates/feed/feed.html:32
-#, python-format
-msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+#: bookwyrm/templates/feed/feed.html:22
+#, fuzzy, python-format
+#| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
 msgstr "charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
@@ -1879,12 +1875,6 @@ msgstr "Requête"
 msgid "Search type"
 msgstr "Type de recherche"
 
-#: bookwyrm/templates/search/layout.html:21
-#: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:81
-msgid "Books"
-msgstr "Livres"
-
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
 #: bookwyrm/templates/settings/admin_layout.html:26
@@ -2060,6 +2050,10 @@ msgstr "Instance :"
 msgid "Status:"
 msgstr "Statut :"
 
+#: bookwyrm/templates/settings/edit_server.html:40
+msgid "Federated"
+msgstr "Fédéré"
+
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
@@ -2348,13 +2342,21 @@ msgstr "Texte affiché lorsque les inscriptions sont closes :"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Publiée par <a href=\"%(user_path)s\">%(username)s</a>"
 
+#: bookwyrm/templates/snippets/authors.html:22
+#, python-format
+msgid "and %(remainder_count_display)s other"
+msgid_plural "and %(remainder_count_display)s others"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr "Pas de couverture"
 
-#: bookwyrm/templates/snippets/book_titleby.html:4
-#, python-format
-msgid "<a href=\"%(path)s\">%(title)s</a> by "
+#: bookwyrm/templates/snippets/book_titleby.html:6
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s\">%(title)s</a> by"
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
 #: bookwyrm/templates/snippets/boost_button.html:20
@@ -3026,6 +3028,15 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
+#~ msgid "Local Timeline"
+#~ msgstr "Fil d’actualité local"
+
+#~ msgid "Federated Timeline"
+#~ msgstr "Fil d’actualité des instances fédérées"
+
+#~ msgid "Local"
+#~ msgstr "Local"
+
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 3450c353ac4b48e9636805a6a77931a74b68dd92..6645033399a2ca839b8ebe71c829b209d23bfd31 100644
GIT binary patch
delta 13776
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
F{{zVGYR~`x

delta 14090
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
M+MvvN>xTOL571!SLjV8(

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index f74dfd4a..d9921655 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-04 20:40+0000\n"
+"POT-Creation-Date: 2021-08-05 01:33+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -91,27 +91,47 @@ msgstr "用户名"
 msgid "A user with that username already exists."
 msgstr "已经存在使用该用户名的用户。"
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:123
+msgid "Home Timeline"
+msgstr "主页时间线"
+
+#: bookwyrm/settings.py:123
+msgid "Home"
+msgstr "主页"
+
+#: bookwyrm/settings.py:124
+#, fuzzy
+#| msgid "Book Title"
+msgid "Books Timeline"
+msgstr "书名"
+
+#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:81
+msgid "Books"
+msgstr "书目"
+
+#: bookwyrm/settings.py:170
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:171
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:172
 msgid "Spanish"
 msgstr "Español（西班牙语）"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:173
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:174
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:175
 msgid "Traditional Chinese"
 msgstr "繁體中文（繁体中文）"
 
@@ -895,37 +915,13 @@ msgstr "所有消息"
 msgid "You have no messages right now."
 msgstr "你现在没有消息。"
 
-#: bookwyrm/templates/feed/feed.html:8
-msgid "Home Timeline"
-msgstr "主页时间线"
-
-#: bookwyrm/templates/feed/feed.html:10
-msgid "Local Timeline"
-msgstr "本地时间线"
-
-#: bookwyrm/templates/feed/feed.html:12
-msgid "Federated Timeline"
-msgstr "跨站时间线"
-
-#: bookwyrm/templates/feed/feed.html:18
-msgid "Home"
-msgstr "主页"
-
-#: bookwyrm/templates/feed/feed.html:21
-msgid "Local"
-msgstr "本站"
-
-#: bookwyrm/templates/feed/feed.html:24
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "跨站"
-
-#: bookwyrm/templates/feed/feed.html:32
-#, python-format
-msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+#: bookwyrm/templates/feed/feed.html:22
+#, fuzzy, python-format
+#| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
 msgstr "加载 <span data-poll=\"stream/%(tab)s\">0</span> 条未读状态"
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "现在还没有任何活动！尝试从关注一个用户开始吧"
 
@@ -1865,12 +1861,6 @@ msgstr "搜索请求"
 msgid "Search type"
 msgstr "搜索类型"
 
-#: bookwyrm/templates/search/layout.html:21
-#: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:81
-msgid "Books"
-msgstr "书目"
-
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
 #: bookwyrm/templates/settings/admin_layout.html:26
@@ -2046,6 +2036,10 @@ msgstr "实例:"
 msgid "Status:"
 msgstr "状态:"
 
+#: bookwyrm/templates/settings/edit_server.html:40
+msgid "Federated"
+msgstr "跨站"
+
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
@@ -2334,13 +2328,20 @@ msgstr "注册关闭文字:"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 发布"
 
+#: bookwyrm/templates/snippets/authors.html:22
+#, python-format
+msgid "and %(remainder_count_display)s other"
+msgid_plural "and %(remainder_count_display)s others"
+msgstr[0] ""
+
 #: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr "没有封面"
 
-#: bookwyrm/templates/snippets/book_titleby.html:4
-#, python-format
-msgid "<a href=\"%(path)s\">%(title)s</a> by "
+#: bookwyrm/templates/snippets/book_titleby.html:6
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s\">%(title)s</a> by"
 msgstr "<a href=\"%(path)s\">%(title)s</a> 来自"
 
 #: bookwyrm/templates/snippets/boost_button.html:20
@@ -3003,3 +3004,12 @@ msgstr "没有找到使用该邮箱的用户。"
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "密码重置连接已发送给 %s"
+
+#~ msgid "Local Timeline"
+#~ msgstr "本地时间线"
+
+#~ msgid "Federated Timeline"
+#~ msgstr "跨站时间线"
+
+#~ msgid "Local"
+#~ msgstr "本站"
diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo
index 8c8b5af887a30a2430d7a568e4e987d971a822fb..552fea2a6ea9d89a28105fe6338f09b8053c81ce 100644
GIT binary patch
delta 13344
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

delta 13699
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

diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index b7736822..5ce42251 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-04 20:40+0000\n"
+"POT-Creation-Date: 2021-08-05 01:33+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,27 +91,47 @@ msgstr "使用者名稱"
 msgid "A user with that username already exists."
 msgstr "已經存在使用該名稱的使用者。"
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:123
+msgid "Home Timeline"
+msgstr "主頁時間線"
+
+#: bookwyrm/settings.py:123
+msgid "Home"
+msgstr "主頁"
+
+#: bookwyrm/settings.py:124
+#, fuzzy
+#| msgid "Book Title"
+msgid "Books Timeline"
+msgstr "書名"
+
+#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:81
+msgid "Books"
+msgstr "書目"
+
+#: bookwyrm/settings.py:170
 msgid "English"
 msgstr "English（英語）"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:171
 msgid "German"
 msgstr "Deutsch（德語）"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:172
 msgid "Spanish"
 msgstr "Español（西班牙語）"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:173
 msgid "French"
 msgstr "Français（法語）"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:174
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:175
 #, fuzzy
 #| msgid "Tranditional Chinese"
 msgid "Traditional Chinese"
@@ -901,37 +921,13 @@ msgstr "所有訊息"
 msgid "You have no messages right now."
 msgstr "你現在沒有訊息。"
 
-#: bookwyrm/templates/feed/feed.html:8
-msgid "Home Timeline"
-msgstr "主頁時間線"
-
-#: bookwyrm/templates/feed/feed.html:10
-msgid "Local Timeline"
-msgstr "本地時間線"
-
-#: bookwyrm/templates/feed/feed.html:12
-msgid "Federated Timeline"
-msgstr "跨站時間線"
-
-#: bookwyrm/templates/feed/feed.html:18
-msgid "Home"
-msgstr "主頁"
-
-#: bookwyrm/templates/feed/feed.html:21
-msgid "Local"
-msgstr "本站"
-
-#: bookwyrm/templates/feed/feed.html:24
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "跨站"
-
-#: bookwyrm/templates/feed/feed.html:32
-#, python-format
-msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+#: bookwyrm/templates/feed/feed.html:22
+#, fuzzy, python-format
+#| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
 msgstr "載入 <span data-poll=\"stream/%(tab)s\">0</span> 條未讀狀態"
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "現在還沒有任何活動！嘗試著從關注一個使用者開始吧"
 
@@ -1880,12 +1876,6 @@ msgstr "搜尋請求"
 msgid "Search type"
 msgstr "搜尋類別"
 
-#: bookwyrm/templates/search/layout.html:21
-#: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:81
-msgid "Books"
-msgstr "書目"
-
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
 #: bookwyrm/templates/settings/admin_layout.html:26
@@ -2061,6 +2051,10 @@ msgstr "實例:"
 msgid "Status:"
 msgstr "狀態:"
 
+#: bookwyrm/templates/settings/edit_server.html:40
+msgid "Federated"
+msgstr "跨站"
+
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
@@ -2353,13 +2347,20 @@ msgstr "註冊關閉文字:"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 釋出"
 
+#: bookwyrm/templates/snippets/authors.html:22
+#, python-format
+msgid "and %(remainder_count_display)s other"
+msgid_plural "and %(remainder_count_display)s others"
+msgstr[0] ""
+
 #: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr "沒有封面"
 
-#: bookwyrm/templates/snippets/book_titleby.html:4
-#, python-format
-msgid "<a href=\"%(path)s\">%(title)s</a> by "
+#: bookwyrm/templates/snippets/book_titleby.html:6
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s\">%(title)s</a> by"
 msgstr "<a href=\"%(path)s\">%(title)s</a> 來自"
 
 #: bookwyrm/templates/snippets/boost_button.html:20
@@ -3023,5 +3024,14 @@ msgstr "沒有找到使用該郵箱的使用者。"
 msgid "A password reset link sent to %s"
 msgstr "密碼重置連結已傳送給 %s"
 
+#~ msgid "Local Timeline"
+#~ msgstr "本地時間線"
+
+#~ msgid "Federated Timeline"
+#~ msgstr "跨站時間線"
+
+#~ msgid "Local"
+#~ msgstr "本站"
+
 #~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 #~ msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"

From 75f586c10983e70169df495b835d4ffa58757454 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 19:09:00 -0700
Subject: [PATCH 031/272] Removes unused stream code

---
 bookwyrm/activitystreams.py | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 0a966971..b4926285 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -156,25 +156,6 @@ class LocalStream(ActivityStream):
         )
 
 
-class FederatedStream(ActivityStream):
-    """users you follow"""
-
-    key = "federated"
-
-    def get_audience(self, status):
-        # this stream wants no part in non-public statuses
-        if status.privacy != "public":
-            return []
-        return super().get_audience(status)
-
-    def get_statuses_for_user(self, user):
-        return privacy_filter(
-            user,
-            models.Status.objects.select_subclasses(),
-            privacy_levels=["public"],
-        )
-
-
 class BooksStream(ActivityStream):
     """books on your shelves"""
 
@@ -201,7 +182,7 @@ class BooksStream(ActivityStream):
         return audience.filter(shelfbook__book__parent_work=work).distinct()
 
     def get_statuses_for_user(self, user):
-        """any public status that mentions their books"""
+        """any public status that mentions the user's books"""
         books = user.shelfbook_set.values_list(
             "book__parent_work__id", flat=True
         ).distinct()
@@ -219,13 +200,13 @@ class BooksStream(ActivityStream):
         )
 
 
+# determine which streams are enabled in settings.py
 available_streams = [s["key"] for s in STREAMS]
 streams = {
     k: v
     for (k, v) in {
         "home": HomeStream(),
         "local": LocalStream(),
-        "federated": FederatedStream(),
         "books": BooksStream(),
     }.items()
     if k in available_streams

From 1c0472efc2835d15072d5346df1e39dda555846a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 19:19:24 -0700
Subject: [PATCH 032/272] Fixes references to public streams

---
 bookwyrm/activitystreams.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index b4926285..7c15fd90 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -9,7 +9,7 @@ from bookwyrm.views.helpers import privacy_filter
 
 
 class ActivityStream(RedisStore):
-    """a category of activity stream (like home, local, federated)"""
+    """a category of activity stream (like home, local, books)"""
 
     def stream_id(self, user):
         """the redis key for this user's instance of this stream"""
@@ -229,7 +229,6 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
     if not created:
         return
 
-    # iterates through Home, Local, Federated
     for stream in streams.values():
         stream.add_status(instance)
 
@@ -296,7 +295,7 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs):
 # pylint: disable=unused-argument
 def add_statuses_on_unblock(sender, instance, *args, **kwargs):
     """remove statuses from all feeds on block"""
-    public_streams = [LocalStream(), FederatedStream()]
+    public_streams = [v for (k, v) in streams.items() if k != 'home']
     # add statuses back to streams with statuses from anyone
     if instance.user_subject.local:
         for stream in public_streams:

From c8250ac94cf342567207b473eb06cb56426b9c59 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 19:25:44 -0700
Subject: [PATCH 033/272] Python formatting

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

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 7c15fd90..01ca3f77 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -295,7 +295,7 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs):
 # pylint: disable=unused-argument
 def add_statuses_on_unblock(sender, instance, *args, **kwargs):
     """remove statuses from all feeds on block"""
-    public_streams = [v for (k, v) in streams.items() if k != 'home']
+    public_streams = [v for (k, v) in streams.items() if k != "home"]
     # add statuses back to streams with statuses from anyone
     if instance.user_subject.local:
         for stream in public_streams:

From 1fbca70820af0434f46be4b33ea324f6ce4b7524 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 19:54:47 -0700
Subject: [PATCH 034/272] Move activitystreams updates to tasks

---
 bookwyrm/activitystreams.py | 116 +++++++++++++++++++++++++++---------
 celerywyrm/celery.py        |   1 +
 2 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index a49a7ce4..543a8a7e 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -1,9 +1,11 @@
 """ access the activity streams stored in redis """
 from django.dispatch import receiver
+from django.db import transaction
 from django.db.models import signals, Q
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore, r
+from bookwyrm.tasks import app
 from bookwyrm.views.helpers import privacy_filter
 
 
@@ -190,16 +192,20 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
         return
 
     if instance.deleted:
-        for stream in streams.values():
-            stream.remove_object_from_related_stores(instance)
+        remove_status_task.delay(instance.id)
         return
 
     if not created:
         return
+    # when creating new things, gotta wait on the transaction
+    transaction.on_commit(lambda: add_status_on_create_command(sender, instance))
+
+
+def add_status_on_create_command(sender, instance):
+    """runs this code only after the database commit completes"""
 
     # iterates through Home, Local, Federated
-    for stream in streams.values():
-        stream.add_status(instance)
+    add_status_task.delay(instance.id)
 
     if sender != models.Boost:
         return
@@ -208,23 +214,19 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
     old_versions = models.Boost.objects.filter(
         boosted_status__id=boosted.id,
         created_date__lt=instance.created_date,
-    )
-    for stream in streams.values():
-        stream.remove_object_from_related_stores(boosted)
-        for status in old_versions:
-            stream.remove_object_from_related_stores(status)
+    ).values_list("id", flat=True)
+    remove_status_task.delay(boosted.id)
+    remove_status_task.delay(old_versions)
 
 
 @receiver(signals.post_delete, sender=models.Boost)
 # pylint: disable=unused-argument
 def remove_boost_on_delete(sender, instance, *args, **kwargs):
     """boosts are deleted"""
-    # we're only interested in new statuses
-    for stream in streams.values():
-        # remove the boost
-        stream.remove_object_from_related_stores(instance)
-        # re-add the original status
-        stream.add_status(instance.boosted_status)
+    # remove the boost
+    remove_status_task.delay(instance.id)
+    # re-add the original status
+    add_status_task.delay(instance.boosted_status.id)
 
 
 @receiver(signals.post_save, sender=models.UserFollows)
@@ -233,7 +235,9 @@ def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
     """add a newly followed user's statuses to feeds"""
     if not created or not instance.user_subject.local:
         return
-    HomeStream().add_user_statuses(instance.user_subject, instance.user_object)
+    add_user_statuses_task.delay(
+        instance.user_subject.id, instance.user_object.id, stream_list=["home"]
+    )
 
 
 @receiver(signals.post_delete, sender=models.UserFollows)
@@ -242,7 +246,9 @@ def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
     """remove statuses from a feed on unfollow"""
     if not instance.user_subject.local:
         return
-    HomeStream().remove_user_statuses(instance.user_subject, instance.user_object)
+    remove_user_statuses_task.delay(
+        instance.user_subject.id, instance.user_object.id, stream_list=["home"]
+    )
 
 
 @receiver(signals.post_save, sender=models.UserBlocks)
@@ -251,29 +257,36 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs):
     """remove statuses from all feeds on block"""
     # blocks apply ot all feeds
     if instance.user_subject.local:
-        for stream in streams.values():
-            stream.remove_user_statuses(instance.user_subject, instance.user_object)
+        remove_user_statuses_task.delay(
+            instance.user_subject.id, instance.user_object.id
+        )
 
     # and in both directions
     if instance.user_object.local:
-        for stream in streams.values():
-            stream.remove_user_statuses(instance.user_object, instance.user_subject)
+        remove_user_statuses_task.delay(
+            instance.user_object.id, instance.user_subject.id
+        )
 
 
 @receiver(signals.post_delete, sender=models.UserBlocks)
 # pylint: disable=unused-argument
 def add_statuses_on_unblock(sender, instance, *args, **kwargs):
     """remove statuses from all feeds on block"""
-    public_streams = [LocalStream(), FederatedStream()]
     # add statuses back to streams with statuses from anyone
     if instance.user_subject.local:
-        for stream in public_streams:
-            stream.add_user_statuses(instance.user_subject, instance.user_object)
+        add_user_statuses_task.delay(
+            instance.user_subject.id,
+            instance.user_object.id,
+            stream_list=["local", "federated"],
+        )
 
     # add statuses back to streams with statuses from anyone
     if instance.user_object.local:
-        for stream in public_streams:
-            stream.add_user_statuses(instance.user_object, instance.user_subject)
+        add_user_statuses_task.delay(
+            instance.user_object.id,
+            instance.user_subject.id,
+            stream_list=["local", "federated"],
+        )
 
 
 @receiver(signals.post_save, sender=models.User)
@@ -283,5 +296,54 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
     if not created or not instance.local:
         return
 
+    populate_streams_task.delay(instance.id)
+
+
+# ---- TASKS
+
+@app.task
+def populate_streams_task(user_id):
+    """create a user's streams"""
+    user = models.User.objects.get(id=user_id)
     for stream in streams.values():
-        stream.populate_streams(instance)
+        stream.populate_streams(user)
+
+@app.task
+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
+    if not isinstance(status_ids, list):
+        status_ids = [status_ids]
+    statuses = models.Status.objects.filter(id__in=status_ids)
+
+    for stream in streams.values():
+        for status in statuses:
+            stream.remove_object_from_related_stores(status)
+
+
+@app.task
+def add_status_task(status_id):
+    """remove a status from any stream it might be in"""
+    status = models.Status.objects.get(id=status_id)
+    for stream in streams.values():
+        stream.add_status(status)
+
+
+@app.task
+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()
+    viewer = models.User.objects.get(id=viewer_id)
+    user = models.User.objects.get(id=user_id)
+    for stream in stream_list:
+        stream.remove_user_statuses(viewer, user)
+
+
+@app.task
+def add_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()
+    viewer = models.User.objects.get(id=viewer_id)
+    user = models.User.objects.get(id=user_id)
+    for stream in stream_list:
+        stream.add_user_statuses(viewer, user)
diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py
index 3ab33862..de5e5630 100644
--- a/celerywyrm/celery.py
+++ b/celerywyrm/celery.py
@@ -20,6 +20,7 @@ app.config_from_object("django.conf:settings", namespace="CELERY")
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()
 app.autodiscover_tasks(["bookwyrm"], related_name="activitypub.base_activity")
+app.autodiscover_tasks(["bookwyrm"], related_name="activitystreams")
 app.autodiscover_tasks(["bookwyrm"], related_name="broadcast")
 app.autodiscover_tasks(["bookwyrm"], related_name="connectors.abstract_connector")
 app.autodiscover_tasks(["bookwyrm"], related_name="emailing")

From 6841a66e76c3acd45acc3e56bf310f1bad6763db Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 19:57:39 -0700
Subject: [PATCH 035/272] Python formatting

---
 bookwyrm/activitystreams.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 543a8a7e..4e48a044 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -301,6 +301,7 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
 
 # ---- TASKS
 
+
 @app.task
 def populate_streams_task(user_id):
     """create a user's streams"""
@@ -308,6 +309,7 @@ def populate_streams_task(user_id):
     for stream in streams.values():
         stream.populate_streams(user)
 
+
 @app.task
 def remove_status_task(status_ids):
     """remove a status from any stream it might be in"""

From 142d0da3b73a5a5f679c187771c58392b0169ce1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 20:01:44 -0700
Subject: [PATCH 036/272] Removes outdated tests

---
 bookwyrm/tests/test_activitystreams.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index f4747971..22445892 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -190,20 +190,3 @@ class Activitystreams(TestCase):
         )
         users = activitystreams.LocalStream().get_audience(status)
         self.assertEqual(users, [])
-
-    def test_federatedstream_get_audience(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.remote_user, content="hi", privacy="public"
-        )
-        users = activitystreams.FederatedStream().get_audience(status)
-        self.assertTrue(self.local_user in users)
-        self.assertTrue(self.another_user in users)
-
-    def test_federatedstream_get_audience_unlisted(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.remote_user, content="hi", privacy="unlisted"
-        )
-        users = activitystreams.FederatedStream().get_audience(status)
-        self.assertEqual(users, [])

From f3a757951cdb40364546b843577c29ca5a3c0b3a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 14:22:54 -0700
Subject: [PATCH 037/272] Tests for books stream

---
 bookwyrm/tests/test_activitystreams.py | 97 +++++++++++++++++++++++++-
 1 file changed, 96 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index 22445892..ba495089 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -6,6 +6,7 @@ from bookwyrm import activitystreams, models
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 class Activitystreams(TestCase):
     """using redis to build activity streams"""
 
@@ -32,7 +33,8 @@ class Activitystreams(TestCase):
                 inbox="https://example.com/users/rat/inbox",
                 outbox="https://example.com/users/rat/outbox",
             )
-        self.book = models.Edition.objects.create(title="test book")
+        work = models.Work.objects.create(title="test work")
+        self.book = models.Edition.objects.create(title="test book", parent_work=work)
 
         class TestStream(activitystreams.ActivityStream):
             """test stream, don't have to do anything here"""
@@ -190,3 +192,96 @@ class Activitystreams(TestCase):
         )
         users = activitystreams.LocalStream().get_audience(status)
         self.assertEqual(users, [])
+
+    def test_localstream_get_audience_books_no_book(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="public"
+        )
+        audience = activitystreams.BooksStream().get_audience(status)
+        # no books, no audience
+        self.assertEqual(audience, [])
+
+    def test_localstream_get_audience_books_mention_books(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="public"
+        )
+        status.mention_books.add(self.book)
+        status.save(broadcast=False)
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        audience = activitystreams.BooksStream().get_audience(status)
+        self.assertTrue(self.local_user in audience)
+
+    def test_localstream_get_audience_books_book_field(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Comment.objects.create(
+            user=self.local_user, content="hi", privacy="public", book=self.book
+        )
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        audience = activitystreams.BooksStream().get_audience(status)
+        self.assertTrue(self.local_user in audience)
+
+    def test_localstream_get_audience_books_alternate_edition(self, *_):
+        """get a list of users that should see a status"""
+        alt_book = models.Edition.objects.create(
+            title="hi", parent_work=self.book.parent_work
+        )
+        status = models.Comment.objects.create(
+            user=self.remote_user, content="hi", privacy="public", book=alt_book
+        )
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        audience = activitystreams.BooksStream().get_audience(status)
+        self.assertTrue(self.local_user in audience)
+
+    def test_localstream_get_audience_books_non_public(self, *_):
+        """get a list of users that should see a status"""
+        alt_book = models.Edition.objects.create(
+            title="hi", parent_work=self.book.parent_work
+        )
+        status = models.Comment.objects.create(
+            user=self.remote_user, content="hi", privacy="unlisted", book=alt_book
+        )
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        audience = activitystreams.BooksStream().get_audience(status)
+        self.assertEqual(audience, [])
+
+    def test_get_statuses_for_user_books(self, *_):
+        """create a stream for a user"""
+        alt_book = models.Edition.objects.create(
+            title="hi", parent_work=self.book.parent_work
+        )
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="public"
+        )
+        status = models.Comment.objects.create(
+            user=self.remote_user, content="hi", privacy="public", book=alt_book
+        )
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        result = activitystreams.BooksStream().get_statuses_for_user(self.local_user)
+        self.assertEqual(list(result), [status])

From 30288c6ebb362feb5e05e51d1cd09787dd13fbd7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 16:39:09 -0700
Subject: [PATCH 038/272] Update books feed on shelve

---
 bookwyrm/activitystreams.py | 64 +++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 01ca3f77..6b75a65f 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -199,6 +199,40 @@ class BooksStream(ActivityStream):
             privacy_levels=["public"],
         )
 
+    def add_book_statuses(self, user, book):
+        """add statuses about a book to a user's feed"""
+        work = book.parent_work
+        statuses = privacy_filter(
+            user,
+            models.Status.objects.select_subclasses()
+            .filter(
+                Q(comment__book__parent_work=work)
+                | Q(quotation__book__parent_work=work)
+                | Q(review__book__parent_work=work)
+                | Q(mention_books__parent_work=work)
+            )
+            .distinct(),
+            privacy_levels=["public"],
+        )
+        self.bulk_add_objects_to_store(statuses, self.stream_id(user))
+
+    def remove_book_statuses(self, user, book):
+        """add statuses about a book to a user's feed"""
+        work = book.parent_work
+        statuses = privacy_filter(
+            user,
+            models.Status.objects.select_subclasses()
+            .filter(
+                Q(comment__book__parent_work=work)
+                | Q(quotation__book__parent_work=work)
+                | Q(review__book__parent_work=work)
+                | Q(mention_books__parent_work=work)
+            )
+            .distinct(),
+            privacy_levels=["public"],
+        )
+        self.bulk_remove_objects_from_store(statuses, self.stream_id(user))
+
 
 # determine which streams are enabled in settings.py
 available_streams = [s["key"] for s in STREAMS]
@@ -316,3 +350,33 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
 
     for stream in streams.values():
         stream.populate_streams(instance)
+
+
+@receiver(signals.pre_save, sender=models.ShelfBook)
+# pylint: disable=unused-argument
+def add_statuses_on_shelve(sender, instance, created, *args, **kwargs):
+    """update books stream when user shelves a book"""
+    if not created or not instance.user.local:
+        return
+    # check if the book is already on the user's shelves
+    if models.ShelfBook.objects.filter(
+        user=instance.user, book__in=instance.book.parent_work.editions.all()
+    ).exists():
+        return
+
+    BooksStream().add_book_statuses(instance.user, instance.book)
+
+
+@receiver(signals.post_delete, sender=models.ShelfBook)
+# pylint: disable=unused-argument
+def remove_statuses_on_shelve(sender, instance, *args, **kwargs):
+    """update books stream when user unshelves a book"""
+    if not instance.user.local:
+        return
+    # check if the book is actually unshelved, not just moved
+    if models.ShelfBook.objects.filter(
+        user=instance.user, book__in=instance.book.parent_work.editions.all()
+    ).exists():
+        return
+
+    BooksStream().remove_book_statuses(instance.user, instance.book)

From 70f4ecf870dd269da4b123e1682385466a904d9e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 17:13:47 -0700
Subject: [PATCH 039/272] Removes invalid argument

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

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 6b75a65f..bad7c59f 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -354,9 +354,9 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
 
 @receiver(signals.pre_save, sender=models.ShelfBook)
 # pylint: disable=unused-argument
-def add_statuses_on_shelve(sender, instance, created, *args, **kwargs):
+def add_statuses_on_shelve(sender, instance, *args, **kwargs):
     """update books stream when user shelves a book"""
-    if not created or not instance.user.local:
+    if not instance.user.local:
         return
     # check if the book is already on the user's shelves
     if models.ShelfBook.objects.filter(

From 70a535adb7c36395a6f63587817b1730762297cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 17:19:39 -0700
Subject: [PATCH 040/272] Adds books stream mock

---
 bookwyrm/tests/test_activitystreams.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index ba495089..ac57d8b3 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -6,6 +6,7 @@ from bookwyrm import activitystreams, models
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.BooksStream.add_book_statuses")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 class Activitystreams(TestCase):
     """using redis to build activity streams"""

From d390b395e69e515fe13f36ec4a6081570c4f1865 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 17:47:28 -0700
Subject: [PATCH 041/272] fixes book mock in user view tests

---
 bookwyrm/tests/views/test_edit_user.py | 4 +++-
 bookwyrm/tests/views/test_user.py      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
index ccfb4c90..df89d5b0 100644
--- a/bookwyrm/tests/views/test_edit_user.py
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -34,7 +34,9 @@ class EditUserViews(TestCase):
                 "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
             )
 
-            self.book = models.Edition.objects.create(title="test")
+            self.book = models.Edition.objects.create(
+                title="test", parent_work=models.Work.objects.create(title="test work")
+            )
             with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
                 models.ShelfBook.objects.create(
                     book=self.book,
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 0efdf16a..740f0d29 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -28,7 +28,9 @@ class UserViews(TestCase):
             self.rat = models.User.objects.create_user(
                 "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
             )
-        self.book = models.Edition.objects.create(title="test")
+        self.book = models.Edition.objects.create(
+            title="test", parent_work=models.Work.objects.create(title="test work")
+        )
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
                 models.ShelfBook.objects.create(

From d0114d2e8353025c1288cd34d0ac2f3ef5add3da Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 18:05:57 -0700
Subject: [PATCH 042/272] Adds test for book add description view

---
 bookwyrm/tests/views/test_book.py | 12 ++++++++++++
 bookwyrm/views/books.py           |  9 +++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 6f6116b2..51f8b5d5 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -299,3 +299,15 @@ class BookViews(TestCase):
 
         self.book.refresh_from_db()
         self.assertTrue(self.book.cover)
+
+    def test_add_description(self):
+        """add a book description"""
+        self.local_user.groups.add(self.group)
+        request = self.factory.post("", {"description": "new description hi"})
+        request.user = self.local_user
+
+        views.add_description(request, self.book.id)
+
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.description, "new description hi")
+        self.assertEqual(self.book.last_edited_by, self.local_user)
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 492d0cac..d56e2f22 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -339,18 +339,15 @@ def set_cover_from_url(url):
 @permission_required("bookwyrm.edit_book", raise_exception=True)
 def add_description(request, book_id):
     """upload a new cover"""
-    if not request.method == "POST":
-        return redirect("/")
-
     book = get_object_or_404(models.Edition, id=book_id)
 
     description = request.POST.get("description")
 
     book.description = description
     book.last_edited_by = request.user
-    book.save()
+    book.save(update_fields=["description", "last_edited_by"])
 
-    return redirect("/book/%s" % book.id)
+    return redirect("book", book.id)
 
 
 @require_POST
@@ -360,7 +357,7 @@ def resolve_book(request):
     connector = connector_manager.get_or_create_connector(remote_id)
     book = connector.get_or_create_book(remote_id)
 
-    return redirect("/book/%d" % book.id)
+    return redirect("book", book.id)
 
 
 @login_required

From 41742d6698074e29ba4077fb04a296cd4841ce74 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 18:16:23 -0700
Subject: [PATCH 043/272] Adds inventaire get connector test

---
 .../tests/connectors/test_inventaire_connector.py    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
index c66f0400..38101772 100644
--- a/bookwyrm/tests/connectors/test_inventaire_connector.py
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -171,3 +171,15 @@ class Inventaire(TestCase):
         }
         self.assertEqual(get_language_code(options), "there")
         self.assertIsNone(get_language_code({}))
+
+    @responses.activate
+    def test_get_description(self):
+        """extract a wikipedia excerpt"""
+        responses.add(
+            responses.GET,
+            "https://inventaire.io/api/data?action=wp-extract&lang=en&title=test_path",
+            json={"extract": "hi hi"},
+        )
+
+        extract = self.connector.get_description({"enwiki": "test_path"})
+        self.assertEqual(extract, "hi hi")

From 48175023bcad05526479c5830ed4cd25c30a53de Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 18:58:32 -0700
Subject: [PATCH 044/272] Mocks broadcast

---
 bookwyrm/tests/views/test_book.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 51f8b5d5..3b674852 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -306,7 +306,8 @@ class BookViews(TestCase):
         request = self.factory.post("", {"description": "new description hi"})
         request.user = self.local_user
 
-        views.add_description(request, self.book.id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.add_description(request, self.book.id)
 
         self.book.refresh_from_db()
         self.assertEqual(self.book.description, "new description hi")

From 120938bee98725cf4c490b9d607147d04e246152 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 19:28:05 -0700
Subject: [PATCH 045/272] Update books feed on shelve

---
 bookwyrm/activitystreams.py | 64 +++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 961b9797..4137c6bf 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -201,6 +201,40 @@ class BooksStream(ActivityStream):
             privacy_levels=["public"],
         )
 
+    def add_book_statuses(self, user, book):
+        """add statuses about a book to a user's feed"""
+        work = book.parent_work
+        statuses = privacy_filter(
+            user,
+            models.Status.objects.select_subclasses()
+            .filter(
+                Q(comment__book__parent_work=work)
+                | Q(quotation__book__parent_work=work)
+                | Q(review__book__parent_work=work)
+                | Q(mention_books__parent_work=work)
+            )
+            .distinct(),
+            privacy_levels=["public"],
+        )
+        self.bulk_add_objects_to_store(statuses, self.stream_id(user))
+
+    def remove_book_statuses(self, user, book):
+        """add statuses about a book to a user's feed"""
+        work = book.parent_work
+        statuses = privacy_filter(
+            user,
+            models.Status.objects.select_subclasses()
+            .filter(
+                Q(comment__book__parent_work=work)
+                | Q(quotation__book__parent_work=work)
+                | Q(review__book__parent_work=work)
+                | Q(mention_books__parent_work=work)
+            )
+            .distinct(),
+            privacy_levels=["public"],
+        )
+        self.bulk_remove_objects_from_store(statuses, self.stream_id(user))
+
 
 # determine which streams are enabled in settings.py
 available_streams = [s["key"] for s in STREAMS]
@@ -331,6 +365,36 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
     populate_streams_task.delay(instance.id)
 
 
+@receiver(signals.pre_save, sender=models.ShelfBook)
+# pylint: disable=unused-argument
+def add_statuses_on_shelve(sender, instance, created, *args, **kwargs):
+    """update books stream when user shelves a book"""
+    if not created or not instance.user.local:
+        return
+    # check if the book is already on the user's shelves
+    if models.ShelfBook.objects.filter(
+        user=instance.user, book__in=instance.book.parent_work.editions.all()
+    ).exists():
+        return
+
+    BooksStream().add_book_statuses(instance.user, instance.book)
+
+
+@receiver(signals.post_delete, sender=models.ShelfBook)
+# pylint: disable=unused-argument
+def remove_statuses_on_shelve(sender, instance, *args, **kwargs):
+    """update books stream when user unshelves a book"""
+    if not instance.user.local:
+        return
+    # check if the book is actually unshelved, not just moved
+    if models.ShelfBook.objects.filter(
+        user=instance.user, book__in=instance.book.parent_work.editions.all()
+    ).exists():
+        return
+
+    BooksStream().remove_book_statuses(instance.user, instance.book)
+
+
 # ---- TASKS
 
 

From 061deaefda40ca3016514a6d514373a0f0b19b71 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 17:13:47 -0700
Subject: [PATCH 046/272] Removes invalid argument

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

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 4137c6bf..ebe2cbd9 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -367,9 +367,9 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
 
 @receiver(signals.pre_save, sender=models.ShelfBook)
 # pylint: disable=unused-argument
-def add_statuses_on_shelve(sender, instance, created, *args, **kwargs):
+def add_statuses_on_shelve(sender, instance, *args, **kwargs):
     """update books stream when user shelves a book"""
-    if not created or not instance.user.local:
+    if not instance.user.local:
         return
     # check if the book is already on the user's shelves
     if models.ShelfBook.objects.filter(

From 6b7e3f2061d38c131a4098575e0edd6bf4595c21 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 17:19:39 -0700
Subject: [PATCH 047/272] Adds books stream mock

---
 bookwyrm/tests/test_activitystreams.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index ba495089..ac57d8b3 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -6,6 +6,7 @@ from bookwyrm import activitystreams, models
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.BooksStream.add_book_statuses")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 class Activitystreams(TestCase):
     """using redis to build activity streams"""

From b3fa8de65aaf547edadaec224e9f39a01298b79c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 17:47:28 -0700
Subject: [PATCH 048/272] fixes book mock in user view tests

---
 bookwyrm/tests/views/test_edit_user.py | 4 +++-
 bookwyrm/tests/views/test_user.py      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
index ccfb4c90..df89d5b0 100644
--- a/bookwyrm/tests/views/test_edit_user.py
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -34,7 +34,9 @@ class EditUserViews(TestCase):
                 "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
             )
 
-            self.book = models.Edition.objects.create(title="test")
+            self.book = models.Edition.objects.create(
+                title="test", parent_work=models.Work.objects.create(title="test work")
+            )
             with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
                 models.ShelfBook.objects.create(
                     book=self.book,
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 0efdf16a..740f0d29 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -28,7 +28,9 @@ class UserViews(TestCase):
             self.rat = models.User.objects.create_user(
                 "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
             )
-        self.book = models.Edition.objects.create(title="test")
+        self.book = models.Edition.objects.create(
+            title="test", parent_work=models.Work.objects.create(title="test work")
+        )
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
                 models.ShelfBook.objects.create(

From 2e7dd9d4ef0018dcaba5e8ecbf158e813eb5051e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 5 Aug 2021 19:51:31 -0700
Subject: [PATCH 049/272] Fixes over-reporting user last active date

---
 .../0081_alter_user_last_active_date.py       | 19 +++++++++++++++++++
 bookwyrm/models/user.py                       |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/migrations/0081_alter_user_last_active_date.py

diff --git a/bookwyrm/migrations/0081_alter_user_last_active_date.py b/bookwyrm/migrations/0081_alter_user_last_active_date.py
new file mode 100644
index 00000000..dc6b640f
--- /dev/null
+++ b/bookwyrm/migrations/0081_alter_user_last_active_date.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.4 on 2021-08-06 02:51
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0080_alter_shelfbook_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="last_active_date",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 21b6bbaa..cb6941c9 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -111,7 +111,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     remote_id = fields.RemoteIdField(null=True, unique=True, activitypub_field="id")
     created_date = models.DateTimeField(auto_now_add=True)
     updated_date = models.DateTimeField(auto_now=True)
-    last_active_date = models.DateTimeField(auto_now=True)
+    last_active_date = models.DateTimeField(default=timezone.now)
     manually_approves_followers = fields.BooleanField(default=False)
     show_goal = models.BooleanField(default=True)
     discoverable = fields.BooleanField(default=False)

From d126d7ba91caa8c0ec52dee20b0b22bedae81711 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 08:43:05 -0700
Subject: [PATCH 050/272] Disable comically inefficient book count comparisons

Oops! Hopefully I can restore these in a way that doesn't break at even
a moderate scale
---
 bookwyrm/suggested_users.py            | 54 +++++++++++++-------------
 bookwyrm/tests/test_suggested_users.py |  6 +--
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py
index 3a95ef7f..de04b7e3 100644
--- a/bookwyrm/suggested_users.py
+++ b/bookwyrm/suggested_users.py
@@ -19,7 +19,7 @@ class SuggestedUsers(RedisStore):
 
     def get_rank(self, obj):
         """get computed rank"""
-        return obj.mutuals + (1.0 - (1.0 / (obj.shared_books + 1)))
+        return obj.mutuals  # + (1.0 - (1.0 / (obj.shared_books + 1)))
 
     def store_id(self, user):  # pylint: disable=no-self-use
         """the key used to store this user's recs"""
@@ -31,7 +31,7 @@ class SuggestedUsers(RedisStore):
         """calculate mutuals count and shared books count from rank"""
         return {
             "mutuals": math.floor(rank),
-            "shared_books": int(1 / (-1 * (rank % 1 - 1))) - 1,
+            # "shared_books": int(1 / (-1 * (rank % 1 - 1))) - 1,
         }
 
     def get_objects_for_store(self, store):
@@ -95,7 +95,7 @@ class SuggestedUsers(RedisStore):
                 logger.exception(err)
                 continue
             user.mutuals = counts["mutuals"]
-            user.shared_books = counts["shared_books"]
+            # user.shared_books = counts["shared_books"]
             results.append(user)
         return results
 
@@ -103,7 +103,9 @@ class SuggestedUsers(RedisStore):
 def get_annotated_users(viewer, *args, **kwargs):
     """Users, annotated with things they have in common"""
     return (
-        models.User.objects.filter(discoverable=True, is_active=True, *args, **kwargs)
+        models.User.objects.filter(
+            discoverable=True, is_active=True, bookwyrm_user=True, *args, **kwargs
+        )
         .exclude(Q(id__in=viewer.blocks.all()) | Q(blocks=viewer))
         .annotate(
             mutuals=Count(
@@ -115,16 +117,16 @@ def get_annotated_users(viewer, *args, **kwargs):
                 ),
                 distinct=True,
             ),
-            shared_books=Count(
-                "shelfbook",
-                filter=Q(
-                    ~Q(id=viewer.id),
-                    shelfbook__book__parent_work__in=[
-                        s.book.parent_work for s in viewer.shelfbook_set.all()
-                    ],
-                ),
-                distinct=True,
-            ),
+            #             shared_books=Count(
+            #                 "shelfbook",
+            #                 filter=Q(
+            #                     ~Q(id=viewer.id),
+            #                     shelfbook__book__parent_work__in=[
+            #                         s.book.parent_work for s in viewer.shelfbook_set.all()
+            #                     ],
+            #                 ),
+            #                 distinct=True,
+            #             ),
         )
     )
 
@@ -162,18 +164,18 @@ def update_suggestions_on_unfollow(sender, instance, **kwargs):
         rerank_user_task.delay(instance.user_object.id, update_only=False)
 
 
-@receiver(signals.post_save, sender=models.ShelfBook)
-@receiver(signals.post_delete, sender=models.ShelfBook)
-# pylint: disable=unused-argument
-def update_rank_on_shelving(sender, instance, *args, **kwargs):
-    """when a user shelves or unshelves a book, re-compute their rank"""
-    # if it's a local user, re-calculate who is rec'ed to them
-    if instance.user.local:
-        rerank_suggestions_task.delay(instance.user.id)
-
-    # if the user is discoverable, update their rankings
-    if instance.user.discoverable:
-        rerank_user_task.delay(instance.user.id)
+# @receiver(signals.post_save, sender=models.ShelfBook)
+# @receiver(signals.post_delete, sender=models.ShelfBook)
+# # pylint: disable=unused-argument
+# def update_rank_on_shelving(sender, instance, *args, **kwargs):
+#     """when a user shelves or unshelves a book, re-compute their rank"""
+#     # if it's a local user, re-calculate who is rec'ed to them
+#     if instance.user.local:
+#         rerank_suggestions_task.delay(instance.user.id)
+#
+#     # if the user is discoverable, update their rankings
+#     if instance.user.discoverable:
+#         rerank_user_task.delay(instance.user.id)
 
 
 @receiver(signals.post_save, sender=models.User)
diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py
index 41e8911e..7e4a9d00 100644
--- a/bookwyrm/tests/test_suggested_users.py
+++ b/bookwyrm/tests/test_suggested_users.py
@@ -29,7 +29,7 @@ class SuggestedUsers(TestCase):
         Mock = namedtuple("AnnotatedUserMock", ("mutuals", "shared_books"))
         annotated_user_mock = Mock(3, 27)
         rank = suggested_users.get_rank(annotated_user_mock)
-        self.assertEqual(rank, 3.9642857142857144)
+        self.assertEqual(rank, 3)  # 3.9642857142857144)
 
     def test_store_id(self, *_):
         """redis key generation"""
@@ -42,7 +42,7 @@ class SuggestedUsers(TestCase):
         """reverse the rank computation to get the mutuals and shared books counts"""
         counts = suggested_users.get_counts_from_rank(3.9642857142857144)
         self.assertEqual(counts["mutuals"], 3)
-        self.assertEqual(counts["shared_books"], 27)
+        # self.assertEqual(counts["shared_books"], 27)
 
     def test_get_objects_for_store(self, *_):
         """list of people to follow for a given user"""
@@ -126,7 +126,7 @@ class SuggestedUsers(TestCase):
 
         user_1_annotated = result.get(id=user_1.id)
         self.assertEqual(user_1_annotated.mutuals, 1)
-        self.assertEqual(user_1_annotated.shared_books, 1)
+        # self.assertEqual(user_1_annotated.shared_books, 1)
 
     def test_get_annotated_users_counts(self, *_):
         """correct counting for multiple shared attributed"""

From 9030f0d08b5aabd729d5b13bfe5c0e54b9ee8e93 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 09:14:07 -0700
Subject: [PATCH 051/272] Bookwyrm user was already set

---
 bookwyrm/suggested_users.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py
index de04b7e3..9c42d79d 100644
--- a/bookwyrm/suggested_users.py
+++ b/bookwyrm/suggested_users.py
@@ -103,9 +103,7 @@ class SuggestedUsers(RedisStore):
 def get_annotated_users(viewer, *args, **kwargs):
     """Users, annotated with things they have in common"""
     return (
-        models.User.objects.filter(
-            discoverable=True, is_active=True, bookwyrm_user=True, *args, **kwargs
-        )
+        models.User.objects.filter(discoverable=True, is_active=True, *args, **kwargs)
         .exclude(Q(id__in=viewer.blocks.all()) | Q(blocks=viewer))
         .annotate(
             mutuals=Count(

From 134db20c57f4d8787aa9c237b311665a19e420aa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 09:40:01 -0700
Subject: [PATCH 052/272] Fixes directory view

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

diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index 8a2e78dc..8d893047 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -28,7 +28,7 @@ class Directory(View):
         if sort == "recent":
             users = users.order_by("-last_active_date")
         else:
-            users = users.order_by("-mutuals", "-shared_books", "-last_active_date")
+            users = users.order_by("-mutuals", "-last_active_date")
 
         paginated = Paginator(users, 12)
 

From 9804d4cf514585b66d286cc8d1d55a6b13f1eb3b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 10:19:38 -0700
Subject: [PATCH 053/272] Adds more book view tests

---
 bookwyrm/tests/views/test_book.py | 78 +++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 3b674852..6280f54f 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -12,6 +12,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.utils import timezone
 
 from bookwyrm import forms, models, views
 from bookwyrm.activitypub import ActivitypubResponse
@@ -52,6 +53,11 @@ class BookViews(TestCase):
     def test_book_page(self):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Book.as_view()
+        models.ReadThrough.objects.create(
+            user=self.local_user,
+            book=self.book,
+            start_date=timezone.now(),
+        )
         request = self.factory.get("")
         request.user = self.local_user
         with patch("bookwyrm.views.books.is_api_request") as is_api:
@@ -67,6 +73,78 @@ class BookViews(TestCase):
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
+    @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+    def test_book_page_statuses(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Book.as_view()
+
+        review = models.Review.objects.create(
+            user=self.local_user,
+            book=self.book,
+            content="hi",
+        )
+
+        comment = models.Comment.objects.create(
+            user=self.local_user,
+            book=self.book,
+            content="hi",
+        )
+
+        quote = models.Quotation.objects.create(
+            user=self.local_user,
+            book=self.book,
+            content="hi",
+            quote="wow",
+        )
+
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.book.id, user_statuses="review")
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(result.context_data["statuses"].object_list[0], review)
+
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.book.id, user_statuses="comment")
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(result.context_data["statuses"].object_list[0], comment)
+
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.book.id, user_statuses="quotation")
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(result.context_data["statuses"].object_list[0], quote)
+
+    def test_book_page_invalid_id(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Book.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, 0)
+        self.assertEqual(result.status_code, 404)
+
+    def test_book_page_work_id(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Book.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.work.id)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(result.context_data["book"], self.book)
+
     def test_edit_book_page(self):
         """there are so many views, this just makes sure it LOADS"""
         view = views.EditBook.as_view()

From 3abceb8563e3229e8d1ef5d34f89b8667ed917dc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 10:33:14 -0700
Subject: [PATCH 054/272] Templatetag test

---
 bookwyrm/tests/test_templatetags.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 3c5d8b25..d75d368c 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -175,3 +175,10 @@ class TemplateTags(TestCase):
 
         result = bookwyrm_tags.related_status(notification)
         self.assertIsInstance(result, models.Status)
+
+    def test_get_next_shelf(self, *_):
+        """self progress helper"""
+        self.assertEqual(bookwyrm_tags.get_next_shelf("to-read"), "reading")
+        self.assertEqual(bookwyrm_tags.get_next_shelf("reading"), "read")
+        self.assertEqual(bookwyrm_tags.get_next_shelf("read"), "read")
+        self.assertEqual(bookwyrm_tags.get_next_shelf("blooooga"), "to-read")

From 0d2622e4ffbb0436d94dbc81adf22bd6e4cb8d5a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 11:23:38 -0700
Subject: [PATCH 055/272] Tests login view

---
 bookwyrm/tests/views/test_authentication.py | 64 ++++++++++++++++++++-
 bookwyrm/views/authentication.py            |  3 +-
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index 10531f51..e2d67fbe 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -8,7 +8,7 @@ from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models, views
+from bookwyrm import forms, models, views
 from bookwyrm.settings import DOMAIN
 
 
@@ -22,7 +22,7 @@ class AuthenticationViews(TestCase):
         self.factory = RequestFactory()
         with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
             self.local_user = models.User.objects.create_user(
-                "mouse@local.com",
+                "mouse@your.domain.here",
                 "mouse@mouse.com",
                 "password",
                 local=True,
@@ -49,6 +49,66 @@ class AuthenticationViews(TestCase):
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
 
+    def test_login_post_localname(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Login.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse@mouse.com"
+        form.data["password"] = "password"
+        request = self.factory.post("", form.data)
+        request.user = self.anonymous_user
+
+        with patch("bookwyrm.views.authentication.login"):
+            result = view(request)
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)
+
+    def test_login_post_username(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Login.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse@your.domain.here"
+        form.data["password"] = "password"
+        request = self.factory.post("", form.data)
+        request.user = self.anonymous_user
+
+        with patch("bookwyrm.views.authentication.login"):
+            result = view(request)
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)
+
+    def test_login_post_email(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Login.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse"
+        form.data["password"] = "password"
+        request = self.factory.post("", form.data)
+        request.user = self.anonymous_user
+
+        with patch("bookwyrm.views.authentication.login"):
+            result = view(request)
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)
+
+    def test_login_post_invalid_credentials(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Login.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse"
+        form.data["password"] = "passsword1"
+        request = self.factory.post("", form.data)
+        request.user = self.anonymous_user
+
+        with patch("bookwyrm.views.authentication.login"):
+            result = view(request)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(
+            result.context_data["login_form"].non_field_errors,
+            "Username or password are incorrect",
+        )
+
     def test_register(self, _):
         """create a user"""
         view = views.Register.as_view()
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index 003e94b0..6598aef2 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -6,6 +6,7 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views import View
 
@@ -54,7 +55,7 @@ class Login(View):
             return redirect(request.GET.get("next", "/"))
 
         # login errors
-        login_form.non_field_errors = "Username or password are incorrect"
+        login_form.non_field_errors = _("Username or password are incorrect")
         register_form = forms.RegisterForm()
         data = {"login_form": login_form, "register_form": register_form}
         return TemplateResponse(request, "login.html", data)

From 568e30230a58d5d1263af36633b304c9dcf5a72b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 11:43:55 -0700
Subject: [PATCH 056/272] Adds start import view test

---
 bookwyrm/tests/views/test_import.py  | 26 ++++++++++++++++++++++++--
 locale/de_DE/LC_MESSAGES/django.po   |  6 +++++-
 locale/en_US/LC_MESSAGES/django.po   |  6 +++++-
 locale/es/LC_MESSAGES/django.po      |  6 +++++-
 locale/fr_FR/LC_MESSAGES/django.po   |  6 +++++-
 locale/zh_Hans/LC_MESSAGES/django.po |  6 +++++-
 locale/zh_Hant/LC_MESSAGES/django.po |  6 +++++-
 7 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py
index 13c0ef5d..d9d67d56 100644
--- a/bookwyrm/tests/views/test_import.py
+++ b/bookwyrm/tests/views/test_import.py
@@ -1,11 +1,12 @@
 """ test for app action functionality """
+import pathlib
 from unittest.mock import patch
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models
-from bookwyrm import views
+from bookwyrm import forms, models, views
 
 
 class ImportViews(TestCase):
@@ -47,6 +48,27 @@ class ImportViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_start_import(self):
+        """retry failed items"""
+        view = views.Import.as_view()
+        form = forms.ImportForm()
+        form.data["source"] = "LibraryThing"
+        form.data["privacy"] = "public"
+        form.data["include_reviews"] = False
+        csv_file = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
+        form.data["csv_file"] = SimpleUploadedFile(
+            csv_file, open(csv_file, "rb").read(), content_type="text/csv"
+        )
+
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        with patch("bookwyrm.importers.Importer.start_import"):
+            view(request)
+        job = models.ImportJob.objects.get()
+        self.assertFalse(job.include_reviews)
+        self.assertEqual(job.privacy, "public")
+
     def test_retry_import(self):
         """retry failed items"""
         view = views.ImportStatus.as_view()
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index b047f031..140f91dc 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 01:33+0000\n"
+"POT-Creation-Date: 2021-08-06 18:34+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -3295,6 +3295,10 @@ msgstr ""
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
+#: bookwyrm/views/authentication.py:58
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 #, fuzzy
 #| msgid "Email address:"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 153d8b9a..ab56046e 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 01:33+0000\n"
+"POT-Creation-Date: 2021-08-06 18:34+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -2991,6 +2991,10 @@ msgstr ""
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
+#: bookwyrm/views/authentication.py:58
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 5bae4d7e..dbf7540c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 01:33+0000\n"
+"POT-Creation-Date: 2021-08-06 18:34+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3036,6 +3036,10 @@ msgstr ""
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
+#: bookwyrm/views/authentication.py:58
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "No un archivo csv válido"
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 399e4056..b4405df5 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 01:33+0000\n"
+"POT-Creation-Date: 2021-08-06 18:34+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -3015,6 +3015,10 @@ msgstr "Ce fichier dépasse la taille limite : 10 Mo"
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s (%(subtitle)s)"
 
+#: bookwyrm/views/authentication.py:58
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "Fichier CSV non valide"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index d9921655..471de85d 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 01:33+0000\n"
+"POT-Creation-Date: 2021-08-06 18:34+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -2992,6 +2992,10 @@ msgstr "文件超过了最大大小: 10MB"
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s：%(subtitle)s"
 
+#: bookwyrm/views/authentication.py:58
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "不是有效的 csv 文件"
diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index 5ce42251..40b12995 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 01:33+0000\n"
+"POT-Creation-Date: 2021-08-06 18:34+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3011,6 +3011,10 @@ msgstr "檔案超過了最大大小: 10MB"
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
+#: bookwyrm/views/authentication.py:58
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "不是有效的 csv 檔案"

From 3082c4ce5c7d7dafa5016cef1a463e1e94412aaa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 11:55:20 -0700
Subject: [PATCH 057/272] Tests invite create view

---
 bookwyrm/tests/views/test_invite.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py
index 1eaf57c0..6ad46420 100644
--- a/bookwyrm/tests/views/test_invite.py
+++ b/bookwyrm/tests/views/test_invite.py
@@ -52,6 +52,26 @@ class InviteViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_manage_invites_post(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.ManageInvites.as_view()
+        form = forms.CreateInviteForm()
+        form.data["use_limit"] = 3
+        form.data["expiry"] = ""
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        invite = models.SiteInvite.objects.get()
+        self.assertEqual(invite.use_limit, 3)
+        self.assertIsNone(invite.expiry)
+
     def test_invite_request(self):
         """request to join a server"""
         form = forms.InviteRequestForm()

From 3e2f1806e9a3d490599665afb442a10ebd8acc5d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 14:42:18 -0700
Subject: [PATCH 058/272] Adds email confirmation code field

---
 .../migrations/0082_auto_20210806_2141.py     | 51 +++++++++++++++++++
 bookwyrm/models/base_model.py                 |  8 +++
 bookwyrm/models/site.py                       |  9 +---
 bookwyrm/models/user.py                       |  3 +-
 4 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 bookwyrm/migrations/0082_auto_20210806_2141.py

diff --git a/bookwyrm/migrations/0082_auto_20210806_2141.py b/bookwyrm/migrations/0082_auto_20210806_2141.py
new file mode 100644
index 00000000..76c8c962
--- /dev/null
+++ b/bookwyrm/migrations/0082_auto_20210806_2141.py
@@ -0,0 +1,51 @@
+# Generated by Django 3.2.4 on 2021-08-06 21:41
+
+import bookwyrm.models.base_model
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0081_alter_user_last_active_date"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="confirmation_code",
+            field=models.CharField(
+                default=bookwyrm.models.base_model.new_access_code, max_length=32
+            ),
+        ),
+        migrations.AlterField(
+            model_name="connector",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("pending", "Pending"),
+                    ("self_deletion", "Self Deletion"),
+                    ("moderator_deletion", "Moderator Deletion"),
+                    ("domain_block", "Domain Block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("pending", "Pending"),
+                    ("self_deletion", "Self Deletion"),
+                    ("moderator_deletion", "Moderator Deletion"),
+                    ("domain_block", "Domain Block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 2cb7c036..5b55ea50 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -1,4 +1,6 @@
 """ base model with default fields """
+import base64
+from Crypto import Random
 from django.db import models
 from django.dispatch import receiver
 
@@ -9,6 +11,7 @@ from .fields import RemoteIdField
 DeactivationReason = models.TextChoices(
     "DeactivationReason",
     [
+        "pending",
         "self_deletion",
         "moderator_deletion",
         "domain_block",
@@ -16,6 +19,11 @@ DeactivationReason = models.TextChoices(
 )
 
 
+def new_access_code():
+    """the identifier for a user invite"""
+    return base64.b32encode(Random.get_random_bytes(5)).decode("ascii")
+
+
 class BookWyrmModel(models.Model):
     """shared fields"""
 
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index 872f6b45..fdc06866 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -1,8 +1,6 @@
 """ the particulars for this instance of BookWyrm """
-import base64
 import datetime
 
-from Crypto import Random
 from django.db import models, IntegrityError
 from django.dispatch import receiver
 from django.utils import timezone
@@ -10,7 +8,7 @@ from model_utils import FieldTracker
 
 from bookwyrm.preview_images import generate_site_preview_image_task
 from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES
-from .base_model import BookWyrmModel
+from .base_model import BookWyrmModel, new_access_code
 from .user import User
 
 
@@ -61,11 +59,6 @@ class SiteSettings(models.Model):
             return default_settings
 
 
-def new_access_code():
-    """the identifier for a user invite"""
-    return base64.b32encode(Random.get_random_bytes(5)).decode("ascii")
-
-
 class SiteInvite(models.Model):
     """gives someone access to create an account on the instance"""
 
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index cb6941c9..08bd87b3 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -22,7 +22,7 @@ from bookwyrm.signatures import create_key_pair
 from bookwyrm.tasks import app
 from bookwyrm.utils import regex
 from .activitypub_mixin import OrderedCollectionPageMixin, ActivitypubMixin
-from .base_model import BookWyrmModel, DeactivationReason
+from .base_model import BookWyrmModel, DeactivationReason, new_access_code
 from .federated_server import FederatedServer
 from . import fields, Review
 
@@ -123,6 +123,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     deactivation_reason = models.CharField(
         max_length=255, choices=DeactivationReason.choices, null=True, blank=True
     )
+    confirmation_code = models.CharField(max_length=32, default=new_access_code)
 
     name_field = "username"
     property_fields = [("following_link", "following")]

From 247a7f74896e91ba09c6ae3e9467bb332fa8eee9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 15:38:37 -0700
Subject: [PATCH 059/272] Email confirmation email

---
 .env.dev.example                                 |  3 +++
 .env.prod.example                                |  3 +++
 bookwyrm/emailing.py                             |  7 +++++++
 bookwyrm/models/user.py                          | 16 +++++++++++++---
 bookwyrm/settings.py                             |  3 +++
 .../templates/email/confirm/html_content.html    | 14 ++++++++++++++
 bookwyrm/templates/email/confirm/subject.html    |  4 ++++
 .../templates/email/confirm/text_content.html    | 11 +++++++++++
 bookwyrm/views/authentication.py                 | 15 ++++++++++++---
 bookwyrm/views/site.py                           |  2 ++
 10 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/templates/email/confirm/html_content.html
 create mode 100644 bookwyrm/templates/email/confirm/subject.html
 create mode 100644 bookwyrm/templates/email/confirm/text_content.html

diff --git a/.env.dev.example b/.env.dev.example
index f42aaaae..a74e7bb3 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -36,6 +36,9 @@ FLOWER_PORT=8888
 #FLOWER_USER=mouse
 #FLOWER_PASSWORD=changeme
 
+# make users confirm their email addresses after registration
+CONFIRM_EMAIL=false
+
 EMAIL_HOST="smtp.mailgun.org"
 EMAIL_PORT=587
 EMAIL_HOST_USER=mail@your.domain.here
diff --git a/.env.prod.example b/.env.prod.example
index 5115469c..c5edb55e 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -36,6 +36,9 @@ FLOWER_PORT=8888
 FLOWER_USER=mouse
 FLOWER_PASSWORD=changeme
 
+# make users confirm their email addresses after registration
+CONFIRM_EMAIL=true
+
 EMAIL_HOST="smtp.mailgun.org"
 EMAIL_PORT=587
 EMAIL_HOST_USER=mail@your.domain.here
diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 657310b0..516d64c9 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -23,6 +23,13 @@ def email_data():
     }
 
 
+def email_confirmation_email(user):
+    """newly registered users confirm email address"""
+    data = email_data()
+    data["confirmation_code"] = user.confirmation_code
+    data["confirmation_link"] = user.confirmation_link
+    send_email.delay(user.email, *format_email("confirm_email", data))
+
 def invite_email(invite_request):
     """send out an invite code"""
     data = email_data()
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 08bd87b3..94b7b41e 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -17,7 +17,7 @@ from bookwyrm.connectors import get_data, ConnectorException
 from bookwyrm.models.shelf import Shelf
 from bookwyrm.models.status import Status, Review
 from bookwyrm.preview_images import generate_user_preview_image_task
-from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES
+from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES, USE_HTTPS
 from bookwyrm.signatures import create_key_pair
 from bookwyrm.tasks import app
 from bookwyrm.utils import regex
@@ -26,6 +26,10 @@ from .base_model import BookWyrmModel, DeactivationReason, new_access_code
 from .federated_server import FederatedServer
 from . import fields, Review
 
+def site_link():
+    """helper for generating links to the site"""
+    protocol = "https" if USE_HTTPS else "http"
+    return f"{protocol}://{DOMAIN}"
 
 class User(OrderedCollectionPageMixin, AbstractUser):
     """a user who wants to read books"""
@@ -129,6 +133,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     property_fields = [("following_link", "following")]
     field_tracker = FieldTracker(fields=["name", "avatar"])
 
+    @property
+    def confirmation_link(self):
+        """helper for generating confirmation links"""
+        link = site_link()
+        return f"{link}/confirm-email/{self.confirmation_code}"
+
     @property
     def following_link(self):
         """just how to find out the following info"""
@@ -260,9 +270,9 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             return
 
         # populate fields for local users
-        self.remote_id = "https://%s/user/%s" % (DOMAIN, self.localname)
+        self.remote_id = "%s/user/%s" % (site_link(), self.localname)
         self.inbox = "%s/inbox" % self.remote_id
-        self.shared_inbox = "https://%s/inbox" % DOMAIN
+        self.shared_inbox = "%s/inbox" % site_link()
         self.outbox = "%s/outbox" % self.remote_id
 
         # an id needs to be set before we can proceed with related models
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 180191d9..130889ac 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -24,6 +24,9 @@ CELERY_ACCEPT_CONTENT = ["application/json"]
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
 
+# make users confirm their email addresses after registration
+CONFIRM_EMAIL = env("CONFIRM_EMAIL", True)
+
 # email
 EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")
 EMAIL_HOST = env("EMAIL_HOST")
diff --git a/bookwyrm/templates/email/confirm/html_content.html b/bookwyrm/templates/email/confirm/html_content.html
new file mode 100644
index 00000000..b47642af
--- /dev/null
+++ b/bookwyrm/templates/email/confirm/html_content.html
@@ -0,0 +1,14 @@
+{% extends 'email/html_layout.html' %}
+{% load i18n %}
+
+{% block content %}
+<p>
+{% blocktrans trimmed %}
+One last step before you join {{ site_name }}! Please confirm your email address by clicking the link below:
+{% endblocktrans %}
+</p>
+
+{% trans "Confirm Email" as text %}
+{% include 'email/snippets/action.html' with path=confirmation_link text=text %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/email/confirm/subject.html b/bookwyrm/templates/email/confirm/subject.html
new file mode 100644
index 00000000..b81a5a83
--- /dev/null
+++ b/bookwyrm/templates/email/confirm/subject.html
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% blocktrans trimmed %}
+Please confirm your email
+{% endblocktrans %}
diff --git a/bookwyrm/templates/email/confirm/text_content.html b/bookwyrm/templates/email/confirm/text_content.html
new file mode 100644
index 00000000..e3d73938
--- /dev/null
+++ b/bookwyrm/templates/email/confirm/text_content.html
@@ -0,0 +1,11 @@
+{% extends 'email/text_layout.html' %}
+{% load i18n %}
+{% block content %}
+{% blocktrans trimmed %}
+One last step before you join {{ site_name }}! Please confirm your email address by clicking the link below:
+{% endblocktrans %}
+
+{{ confirmation_link }}
+
+
+{% endblock %}
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index 003e94b0..43b4bb37 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -9,8 +9,8 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views import View
 
-from bookwyrm import forms, models
-from bookwyrm.settings import DOMAIN
+from bookwyrm import emailing, forms, models
+from bookwyrm.settings import DOMAIN, CONFIRM_EMAIL
 
 
 # pylint: disable= no-self-use
@@ -104,13 +104,22 @@ class Register(View):
 
         username = "%s@%s" % (localname, DOMAIN)
         user = models.User.objects.create_user(
-            username, email, password, localname=localname, local=True
+            username,
+            email,
+            password,
+            localname=localname,
+            local=True,
+            is_active=not CONFIRM_EMAIL,
         )
         if invite:
             invite.times_used += 1
             invite.invitees.add(user)
             invite.save()
 
+        if CONFIRM_EMAIL:
+            emailing.email_confirmation_email(user)
+            return redirect("confirm-email")
+
         login(request, user)
         return redirect("get-started-profile")
 
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index 46bdf722..42e8a6dd 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -46,4 +46,6 @@ def email_preview(request):
     data["text_content_path"] = "email/{}/text_content.html".format(template)
     data["reset_link"] = "https://example.com/link"
     data["invite_link"] = "https://example.com/link"
+    data["confirmation_link"] = "https://example.com/link"
+    data["confirmation_code"] = "AKJHKDGKJSDFG"
     return TemplateResponse(request, "email/preview.html", data)

From 5926224d7e5784be753da402822ff8e5a9a879f0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 16:24:57 -0700
Subject: [PATCH 060/272] Confirm email views

---
 .env.dev.example                              |  3 -
 .env.prod.example                             |  3 -
 bookwyrm/emailing.py                          |  1 +
 ...806_2141.py => 0082_auto_20210806_2324.py} |  7 +-
 bookwyrm/models/site.py                       |  1 +
 bookwyrm/models/user.py                       |  6 +-
 bookwyrm/settings.py                          |  3 -
 bookwyrm/templates/confirm_email.html         |  1 +
 bookwyrm/urls.py                              |  7 ++
 bookwyrm/views/__init__.py                    |  1 +
 bookwyrm/views/authentication.py              | 73 +++++++++++++++----
 11 files changed, 78 insertions(+), 28 deletions(-)
 rename bookwyrm/migrations/{0082_auto_20210806_2141.py => 0082_auto_20210806_2324.py} (87%)
 create mode 100644 bookwyrm/templates/confirm_email.html

diff --git a/.env.dev.example b/.env.dev.example
index a74e7bb3..f42aaaae 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -36,9 +36,6 @@ FLOWER_PORT=8888
 #FLOWER_USER=mouse
 #FLOWER_PASSWORD=changeme
 
-# make users confirm their email addresses after registration
-CONFIRM_EMAIL=false
-
 EMAIL_HOST="smtp.mailgun.org"
 EMAIL_PORT=587
 EMAIL_HOST_USER=mail@your.domain.here
diff --git a/.env.prod.example b/.env.prod.example
index c5edb55e..5115469c 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -36,9 +36,6 @@ FLOWER_PORT=8888
 FLOWER_USER=mouse
 FLOWER_PASSWORD=changeme
 
-# make users confirm their email addresses after registration
-CONFIRM_EMAIL=true
-
 EMAIL_HOST="smtp.mailgun.org"
 EMAIL_PORT=587
 EMAIL_HOST_USER=mail@your.domain.here
diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 516d64c9..cf46baf3 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -30,6 +30,7 @@ def email_confirmation_email(user):
     data["confirmation_link"] = user.confirmation_link
     send_email.delay(user.email, *format_email("confirm_email", data))
 
+
 def invite_email(invite_request):
     """send out an invite code"""
     data = email_data()
diff --git a/bookwyrm/migrations/0082_auto_20210806_2141.py b/bookwyrm/migrations/0082_auto_20210806_2324.py
similarity index 87%
rename from bookwyrm/migrations/0082_auto_20210806_2141.py
rename to bookwyrm/migrations/0082_auto_20210806_2324.py
index 76c8c962..ab0aa158 100644
--- a/bookwyrm/migrations/0082_auto_20210806_2141.py
+++ b/bookwyrm/migrations/0082_auto_20210806_2324.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.4 on 2021-08-06 21:41
+# Generated by Django 3.2.4 on 2021-08-06 23:24
 
 import bookwyrm.models.base_model
 from django.db import migrations, models
@@ -11,6 +11,11 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AddField(
+            model_name="sitesettings",
+            name="require_confirm_email",
+            field=models.BooleanField(default=True),
+        ),
         migrations.AddField(
             model_name="user",
             name="confirmation_code",
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index fdc06866..ef3f7c3c 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -31,6 +31,7 @@ class SiteSettings(models.Model):
     # registration
     allow_registration = models.BooleanField(default=True)
     allow_invite_requests = models.BooleanField(default=True)
+    require_confirm_email = models.BooleanField(default=True)
 
     # images
     logo = models.ImageField(upload_to="logos/", null=True, blank=True)
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 94b7b41e..e10bcd29 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -26,11 +26,13 @@ from .base_model import BookWyrmModel, DeactivationReason, new_access_code
 from .federated_server import FederatedServer
 from . import fields, Review
 
+
 def site_link():
     """helper for generating links to the site"""
     protocol = "https" if USE_HTTPS else "http"
     return f"{protocol}://{DOMAIN}"
 
+
 class User(OrderedCollectionPageMixin, AbstractUser):
     """a user who wants to read books"""
 
@@ -218,7 +220,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             self.following.order_by("-updated_date").all(),
             remote_id=remote_id,
             id_only=True,
-            **kwargs
+            **kwargs,
         )
 
     def to_followers_activity(self, **kwargs):
@@ -228,7 +230,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             self.followers.order_by("-updated_date").all(),
             remote_id=remote_id,
             id_only=True,
-            **kwargs
+            **kwargs,
         )
 
     def to_activity(self, **kwargs):
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 130889ac..180191d9 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -24,9 +24,6 @@ CELERY_ACCEPT_CONTENT = ["application/json"]
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
 
-# make users confirm their email addresses after registration
-CONFIRM_EMAIL = env("CONFIRM_EMAIL", True)
-
 # email
 EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")
 EMAIL_HOST = env("EMAIL_HOST")
diff --git a/bookwyrm/templates/confirm_email.html b/bookwyrm/templates/confirm_email.html
new file mode 100644
index 00000000..ac5b9282
--- /dev/null
+++ b/bookwyrm/templates/confirm_email.html
@@ -0,0 +1 @@
+{% extends "layout.html" %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index d3e2dad1..e7036feb 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -46,7 +46,14 @@ urlpatterns = [
     re_path("^api/updates/stream/(?P<stream>[a-z]+)/?$", views.get_unread_status_count),
     # authentication
     re_path(r"^login/?$", views.Login.as_view(), name="login"),
+    re_path(r"^login/(?P<confirmed>confirmed)?$", views.Login.as_view(), name="login"),
     re_path(r"^register/?$", views.Register.as_view()),
+    re_path(r"confirm-email/?$", views.ConfirmEmail.as_view(), name="confirm-email"),
+    re_path(
+        r"confirm-email/(?P<code>[A-Za-z0-9]+)/?$",
+        views.ConfirmEmailCode.as_view(),
+        name="confirm-email-code",
+    ),
     re_path(r"^logout/?$", views.Logout.as_view(), name="logout"),
     re_path(
         r"^password-reset/?$",
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 41bb64e5..112271a7 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -1,6 +1,7 @@
 """ make sure all our nice views are available """
 from .announcements import Announcements, Announcement, delete_announcement
 from .authentication import Login, Register, Logout
+from .authentication import ConfirmEmail, ConfirmEmailCode
 from .author import Author, EditAuthor
 from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index 43b4bb37..edf960cc 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -10,20 +10,21 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views import View
 
 from bookwyrm import emailing, forms, models
-from bookwyrm.settings import DOMAIN, CONFIRM_EMAIL
+from bookwyrm.settings import DOMAIN
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 @method_decorator(csrf_exempt, name="dispatch")
 class Login(View):
     """authenticate an existing user"""
 
-    def get(self, request):
+    def get(self, request, confirmed=None):
         """login page"""
         if request.user.is_authenticated:
             return redirect("/")
-        # sene user to the login page
+        # send user to the login page
         data = {
+            "show_confirmed_email": confirmed,
             "login_form": forms.LoginForm(),
             "register_form": forms.RegisterForm(),
         }
@@ -37,14 +38,15 @@ class Login(View):
 
         localname = login_form.data["localname"]
         if "@" in localname:  # looks like an email address to me
-            email = localname
             try:
-                username = models.User.objects.get(email=email)
+                username = models.User.objects.get(email=localname).username
             except models.User.DoesNotExist:  # maybe it's a full username?
                 username = localname
         else:
             username = "%s@%s" % (localname, DOMAIN)
         password = login_form.data["password"]
+
+        # perform authentication
         user = authenticate(request, username=username, password=password)
         if user is not None:
             # successful login
@@ -53,6 +55,12 @@ class Login(View):
             user.save(broadcast=False, update_fields=["last_active_date"])
             return redirect(request.GET.get("next", "/"))
 
+        # maybe the user is pending email confirmation
+        if models.User.objects.filter(
+            username=username, is_active=False, deactivation_reason="pending"
+        ).exists():
+            return redirect("confirm-email")
+
         # login errors
         login_form.non_field_errors = "Username or password are incorrect"
         register_form = forms.RegisterForm()
@@ -60,12 +68,23 @@ class Login(View):
         return TemplateResponse(request, "login.html", data)
 
 
+@method_decorator(login_required, name="dispatch")
+class Logout(View):
+    """log out"""
+
+    def get(self, request):
+        """done with this place! outa here!"""
+        logout(request)
+        return redirect("/")
+
+
 class Register(View):
     """register a user"""
 
     def post(self, request):
         """join the server"""
-        if not models.SiteSettings.get().allow_registration:
+        settings = models.SiteSettings.get()
+        if not settings.allow_registration:
             invite_code = request.POST.get("invite_code")
 
             if not invite_code:
@@ -109,14 +128,15 @@ class Register(View):
             password,
             localname=localname,
             local=True,
-            is_active=not CONFIRM_EMAIL,
+            deactivation_reason="pending" if settings.require_confirm_email else None,
+            is_active=not settings.require_confirm_email,
         )
         if invite:
             invite.times_used += 1
             invite.invitees.add(user)
             invite.save()
 
-        if CONFIRM_EMAIL:
+        if settings.require_confirm_email:
             emailing.email_confirmation_email(user)
             return redirect("confirm-email")
 
@@ -124,11 +144,32 @@ class Register(View):
         return redirect("get-started-profile")
 
 
-@method_decorator(login_required, name="dispatch")
-class Logout(View):
-    """log out"""
+class ConfirmEmail(View):
+    """enter code to confirm email address"""
 
-    def get(self, request):
-        """done with this place! outa here!"""
-        logout(request)
-        return redirect("/")
+    def get(self, request):  # pylint: disable=unused-argument
+        """you need a code! keep looking"""
+        settings = models.SiteSettings.get()
+        if request.user.is_authenticated or not settings.require_confirm_email:
+            return redirect("/")
+
+        return TemplateResponse(request, "confirm_email.html")
+
+
+class ConfirmEmailCode(View):
+    """confirm email address"""
+
+    def get(self, request, code):  # pylint: disable=unused-argument
+        """you got the code! good work"""
+        settings = models.SiteSettings.get()
+        if request.user.is_authenticated or not settings.require_confirm_email:
+            return redirect("/")
+
+        # look up the user associated with this code
+        user = get_object_or_404(models.User, confirmation_code=code)
+        # update the user
+        user.is_active = True
+        user.deactivation_reason = None
+        user.save(broadcast=False, update_fields=["is_active", "deactivation_reason"])
+        # direct the user to log in
+        return redirect("login", confirmed="confirmed")

From 1ad057d89d5e99fc4eff546cb1abe93289f53b9a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 17:23:44 -0700
Subject: [PATCH 061/272] Confirmation templates

---
 bookwyrm/emailing.py                          |  2 +-
 bookwyrm/templates/confirm_email.html         |  1 -
 .../confirm_email/confirm_email.html          | 44 +++++++++++++++++++
 .../templates/confirm_email/resend_form.html  | 19 ++++++++
 bookwyrm/templates/settings/site.html         |  7 +++
 bookwyrm/views/authentication.py              | 34 ++++++++------
 6 files changed, 92 insertions(+), 15 deletions(-)
 delete mode 100644 bookwyrm/templates/confirm_email.html
 create mode 100644 bookwyrm/templates/confirm_email/confirm_email.html
 create mode 100644 bookwyrm/templates/confirm_email/resend_form.html

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index cf46baf3..fff3985e 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -28,7 +28,7 @@ def email_confirmation_email(user):
     data = email_data()
     data["confirmation_code"] = user.confirmation_code
     data["confirmation_link"] = user.confirmation_link
-    send_email.delay(user.email, *format_email("confirm_email", data))
+    send_email.delay(user.email, *format_email("confirm", data))
 
 
 def invite_email(invite_request):
diff --git a/bookwyrm/templates/confirm_email.html b/bookwyrm/templates/confirm_email.html
deleted file mode 100644
index ac5b9282..00000000
--- a/bookwyrm/templates/confirm_email.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "layout.html" %}
diff --git a/bookwyrm/templates/confirm_email/confirm_email.html b/bookwyrm/templates/confirm_email/confirm_email.html
new file mode 100644
index 00000000..85ca2bb1
--- /dev/null
+++ b/bookwyrm/templates/confirm_email/confirm_email.html
@@ -0,0 +1,44 @@
+{% extends "layout.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Confirm email" %}{% endblock %}
+
+{% block content %}
+<h1 class="title">{% trans "Confirm your email address" %}</h1>
+
+<div class="columns">
+    <div class="column">
+        <div class="block content">
+            <section class="block">
+                <p>{% trans "A confirmation code has been sent to the email address you used to register your account." %}</p>
+                {% if not valid %}
+                <p class="notification is-warning">{% trans "Sorry! We couldn't find that code." %}</p>
+                {% endif %}
+                <form name="confirm" method="post" action="{% url 'confirm-email' %}">
+                    {% csrf_token %}
+                    <label class="label" for="confirmation_code">{% trans "Confirmation code:" %}</label>
+                    <div class="field has-addons">
+                        <div class="control">
+                            <input class="input" type="text" id="confirmation_code" required>
+                        </div>
+                        <div class="control">
+                            <button class="button is-link" type="submit">{% trans "Submit" %}</button>
+                        </div>
+                    </div>
+                </form>
+            </section>
+
+            <section class="block">
+                {% trans "Can't find your code?" as button_text %}
+                {% include "snippets/toggle/open_button.html" with text=button_text controls_text="resend-form" focus="resend-form-header" %}
+                {% include "confirm_email/resend_form.html" with controls_text="resend-form" %}
+            </section>
+        </div>
+    </div>
+    <div class="column">
+        <div class="box">
+            {% include 'snippets/about.html' %}
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/confirm_email/resend_form.html b/bookwyrm/templates/confirm_email/resend_form.html
new file mode 100644
index 00000000..00a89403
--- /dev/null
+++ b/bookwyrm/templates/confirm_email/resend_form.html
@@ -0,0 +1,19 @@
+{% extends "components/inline_form.html" %}
+{% load i18n %}
+{% block header %}
+{% trans "Resend confirmation link" %}
+{% endblock %}
+
+{% block form %}
+<form name="resend" method="post" action="{#% url 'resend-link' %#}">
+    <div class="field">
+        <label class="label" for="email">{% trans "Email address:" %}</label>
+        <div class="control">
+            <input type="text" class="input" required id="email">
+        </div>
+    </div>
+    <div class="control">
+        <button class="button is-link">{% trans "Resend link" %}</button>
+    </div>
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index d36371a4..f64b529a 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -91,6 +91,13 @@
                 {% trans "Allow invite requests" %}
             </label>
         </div>
+        <div class="field">
+            <label class="label mb-0" for="id_allow_invite_requests">
+                {{ site_form.require_confirm_email }}
+                {% trans "Require users to confirm email address" %}
+            </label>
+            <p class="help">{% trans "(Recommended if registration is open)" %}</p>
+        </div>
         <div class="field">
             <label class="label" for="id_registration_closed_text">{% trans "Registration closed text:" %}</label>
             {{ site_form.registration_closed_text }}
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index edf960cc..dedcf408 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -144,18 +144,6 @@ class Register(View):
         return redirect("get-started-profile")
 
 
-class ConfirmEmail(View):
-    """enter code to confirm email address"""
-
-    def get(self, request):  # pylint: disable=unused-argument
-        """you need a code! keep looking"""
-        settings = models.SiteSettings.get()
-        if request.user.is_authenticated or not settings.require_confirm_email:
-            return redirect("/")
-
-        return TemplateResponse(request, "confirm_email.html")
-
-
 class ConfirmEmailCode(View):
     """confirm email address"""
 
@@ -166,10 +154,30 @@ class ConfirmEmailCode(View):
             return redirect("/")
 
         # look up the user associated with this code
-        user = get_object_or_404(models.User, confirmation_code=code)
+        try:
+            user = models.User.objects.get(confirmation_code=code)
+        except models.User.DoesNotExist:
+            return TemplateResponse(request, "confirm_email/confirm_email.html", {"valid": False})
         # update the user
         user.is_active = True
         user.deactivation_reason = None
         user.save(broadcast=False, update_fields=["is_active", "deactivation_reason"])
         # direct the user to log in
         return redirect("login", confirmed="confirmed")
+
+
+class ConfirmEmail(View):
+    """enter code to confirm email address"""
+
+    def get(self, request):  # pylint: disable=unused-argument
+        """you need a code! keep looking"""
+        settings = models.SiteSettings.get()
+        if request.user.is_authenticated or not settings.require_confirm_email:
+            return redirect("/")
+
+        return TemplateResponse(request, "confirm_email/confirm_email.html", {"valid": True})
+
+    def post(self, request):
+        """same as clicking the link"""
+        code = request.POST.get("code")
+        return ConfirmEmailCode().get(request, code)

From 9077516fa14c9d64c06d1a81e0c2185d63d74229 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 17:39:22 -0700
Subject: [PATCH 062/272] Resend links

---
 .../confirm_email/confirm_email.html          |  2 +-
 .../templates/confirm_email/resend_form.html  |  5 +++--
 bookwyrm/templates/login.html                 |  5 +++++
 bookwyrm/urls.py                              |  1 +
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/authentication.py              | 22 +++++++++++++++++--
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/confirm_email/confirm_email.html b/bookwyrm/templates/confirm_email/confirm_email.html
index 85ca2bb1..6c9eda5e 100644
--- a/bookwyrm/templates/confirm_email/confirm_email.html
+++ b/bookwyrm/templates/confirm_email/confirm_email.html
@@ -19,7 +19,7 @@
                     <label class="label" for="confirmation_code">{% trans "Confirmation code:" %}</label>
                     <div class="field has-addons">
                         <div class="control">
-                            <input class="input" type="text" id="confirmation_code" required>
+                            <input class="input" type="text" name="code" id="confirmation_code" required>
                         </div>
                         <div class="control">
                             <button class="button is-link" type="submit">{% trans "Submit" %}</button>
diff --git a/bookwyrm/templates/confirm_email/resend_form.html b/bookwyrm/templates/confirm_email/resend_form.html
index 00a89403..7c0c1098 100644
--- a/bookwyrm/templates/confirm_email/resend_form.html
+++ b/bookwyrm/templates/confirm_email/resend_form.html
@@ -5,11 +5,12 @@
 {% endblock %}
 
 {% block form %}
-<form name="resend" method="post" action="{#% url 'resend-link' %#}">
+<form name="resend" method="post" action="{% url 'resend-link' %}">
+    {% csrf_token %}
     <div class="field">
         <label class="label" for="email">{% trans "Email address:" %}</label>
         <div class="control">
-            <input type="text" class="input" required id="email">
+            <input type="text" name="email" class="input" required id="email">
         </div>
     </div>
     <div class="control">
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index e3d0133c..19c103ea 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -11,8 +11,13 @@
             {% if login_form.non_field_errors %}
             <p class="notification is-danger">{{ login_form.non_field_errors }}</p>
             {% endif %}
+
+            {% if show_confirmed_email %}
+            <p class="notification is-success">{% trans "Success! Email address confirmed." %}</p>
+            {% endif %}
             <form name="login" method="post" action="/login">
                 {% csrf_token %}
+                {% if show_confirmed_email %}<input type="hidden" name="first_login" value="true">{% endif %}
                 <div class="field">
                     <label class="label" for="id_localname">{% trans "Username:" %}</label>
                     <div class="control">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index e7036feb..eb8491a9 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -54,6 +54,7 @@ urlpatterns = [
         views.ConfirmEmailCode.as_view(),
         name="confirm-email-code",
     ),
+    re_path(r"resend-link", views.resend_link, name="resend-link"),
     re_path(r"^logout/?$", views.Logout.as_view(), name="logout"),
     re_path(
         r"^password-reset/?$",
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 112271a7..eccb7f5e 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -1,7 +1,7 @@
 """ make sure all our nice views are available """
 from .announcements import Announcements, Announcement, delete_announcement
 from .authentication import Login, Register, Logout
-from .authentication import ConfirmEmail, ConfirmEmailCode
+from .authentication import ConfirmEmail, ConfirmEmailCode, resend_link
 from .author import Author, EditAuthor
 from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index dedcf408..f81be8d1 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -7,6 +7,7 @@ from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.http import require_POST
 from django.views import View
 
 from bookwyrm import emailing, forms, models
@@ -53,6 +54,8 @@ class Login(View):
             login(request, user)
             user.last_active_date = timezone.now()
             user.save(broadcast=False, update_fields=["last_active_date"])
+            if request.POST.get("first_login"):
+                return redirect("get-started-profile")
             return redirect(request.GET.get("next", "/"))
 
         # maybe the user is pending email confirmation
@@ -157,7 +160,9 @@ class ConfirmEmailCode(View):
         try:
             user = models.User.objects.get(confirmation_code=code)
         except models.User.DoesNotExist:
-            return TemplateResponse(request, "confirm_email/confirm_email.html", {"valid": False})
+            return TemplateResponse(
+                request, "confirm_email/confirm_email.html", {"valid": False}
+            )
         # update the user
         user.is_active = True
         user.deactivation_reason = None
@@ -175,9 +180,22 @@ class ConfirmEmail(View):
         if request.user.is_authenticated or not settings.require_confirm_email:
             return redirect("/")
 
-        return TemplateResponse(request, "confirm_email/confirm_email.html", {"valid": True})
+        return TemplateResponse(
+            request, "confirm_email/confirm_email.html", {"valid": True}
+        )
 
     def post(self, request):
         """same as clicking the link"""
         code = request.POST.get("code")
         return ConfirmEmailCode().get(request, code)
+
+
+@require_POST
+def resend_link(request):
+    """resend confirmation link"""
+    email = request.POST.get("email")
+    user = get_object_or_404(models.User, email=email)
+    emailing.email_confirmation_email(user)
+    return TemplateResponse(
+        request, "confirm_email/confirm_email.html", {"valid": True}
+    )

From cec69430692ee29075fab8d45ced4ae9e497abc4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 17:43:50 -0700
Subject: [PATCH 063/272] Adds missing mock

---
 bookwyrm/tests/views/test_book.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 6280f54f..c5d86a12 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -74,7 +74,8 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    def test_book_page_statuses(self, _):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_book_page_statuses(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Book.as_view()
 

From 98a98f8e691f533edaef220877e145207a7661b2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 18:13:51 -0700
Subject: [PATCH 064/272] Updates test env

---
 .github/workflows/django-tests.yml          | 1 +
 bookwyrm/tests/views/test_authentication.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml
index 03147744..03875193 100644
--- a/.github/workflows/django-tests.yml
+++ b/.github/workflows/django-tests.yml
@@ -36,6 +36,7 @@ jobs:
       env:
         SECRET_KEY: beepbeep
         DEBUG: false
+        USE_HTTPS: true
         DOMAIN: your.domain.here
         BOOKWYRM_DATABASE_BACKEND: postgres
         MEDIA_ROOT: images/
diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index e2d67fbe..bbafe7bd 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -31,7 +31,9 @@ class AuthenticationViews(TestCase):
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
 
-        self.settings = models.SiteSettings.objects.create(id=1)
+        self.settings = models.SiteSettings.objects.create(
+            id=1, require_email_confirmation=False
+        )
 
     def test_login_get(self, _):
         """there are so many views, this just makes sure it LOADS"""

From a3d5a0347770e6eb6621aed5a362a5d6abd0fe28 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 18:47:25 -0700
Subject: [PATCH 065/272] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.po   | 121 +++++++++++++++++++-------
 locale/en_US/LC_MESSAGES/django.po   | 108 +++++++++++++++++------
 locale/es/LC_MESSAGES/django.po      | 121 ++++++++++++++++++++------
 locale/fr_FR/LC_MESSAGES/django.po   | 123 ++++++++++++++++++++-------
 locale/zh_Hans/LC_MESSAGES/django.po | 118 +++++++++++++++++++------
 locale/zh_Hant/LC_MESSAGES/django.po | 118 +++++++++++++++++++------
 6 files changed, 552 insertions(+), 157 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 140f91dc..4906082a 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 18:34+0000\n"
+"POT-Creation-Date: 2021-08-07 01:35+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -306,7 +306,7 @@ msgstr ""
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:101
+#: bookwyrm/templates/settings/site.html:108
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
@@ -739,6 +739,58 @@ msgstr "Schließen"
 msgid "Compose status"
 msgstr "Status teilen"
 
+#: bookwyrm/templates/confirm_email/confirm_email.html:4
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm email"
+msgstr "Bestätigen"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:7
+#, fuzzy
+#| msgid "Email address:"
+msgid "Confirm your email address"
+msgstr "E-Mail Adresse"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:13
+msgid "A confirmation code has been sent to the email address you used to register your account."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:15
+msgid "Sorry! We couldn't find that code."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:19
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Confirmation code:"
+msgstr "Passwort bestätigen:"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:25
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:33
+msgid "Submit"
+msgstr "Absenden"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:32
+msgid "Can't find your code?"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:4
+msgid "Resend confirmation link"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:11
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "E-Mail Adresse"
+
+#: bookwyrm/templates/confirm_email/resend_form.html:17
+msgid "Resend link"
+msgstr ""
+
 #: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
@@ -882,7 +934,7 @@ msgid "Join %(name)s"
 msgstr "Tritt %(name)s bei"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/login.html:56
 msgid "This instance is closed"
 msgstr "Diese Instanz ist geschlossen"
 
@@ -894,22 +946,26 @@ msgstr ""
 msgid "Request an Invitation"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:64
-#: bookwyrm/templates/password_reset_request.html:18
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "E-Mail Adresse"
-
-#: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:33
-msgid "Submit"
-msgstr "Absenden"
-
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "Dein Account"
 
+#: bookwyrm/templates/email/confirm/html_content.html:6
+#: bookwyrm/templates/email/confirm/text_content.html:4
+#, python-format
+msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
+msgstr ""
+
+#: bookwyrm/templates/email/confirm/html_content.html:11
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm Email"
+msgstr "Bestätigen"
+
+#: bookwyrm/templates/email/confirm/subject.html:2
+msgid "Please confirm your email"
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -1342,7 +1398,7 @@ msgid "Imported"
 msgstr "Importiert"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/login.html:51
 msgid "Create an Account"
 msgstr "Erstelle einen Account"
 
@@ -1412,7 +1468,7 @@ msgid "Notifications"
 msgstr "Benachrichtigungen"
 
 #: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
-#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
@@ -1421,12 +1477,12 @@ msgstr ""
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
 #: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:33
+#: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "Anmelden"
 
@@ -1619,16 +1675,20 @@ msgstr "Deine Listen"
 msgid "Login"
 msgstr ""
 
-#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:16
+msgid "Success! Email address confirmed."
+msgstr ""
+
+#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "Passwort:"
 
-#: bookwyrm/templates/login.html:52
+#: bookwyrm/templates/login.html:57
 msgid "Contact an administrator to get an invite"
 msgstr "Kontaktiere für eine Einladung eine*n Admin"
 
-#: bookwyrm/templates/login.html:63
+#: bookwyrm/templates/login.html:68
 msgid "More about this site"
 msgstr "Mehr über diese Seite"
 
@@ -2554,7 +2614,15 @@ msgstr "Registrierungen erlauben"
 msgid "Allow invite requests"
 msgstr "Folgeanfragen"
 
-#: bookwyrm/templates/settings/site.html:95
+#: bookwyrm/templates/settings/site.html:97
+msgid "Require users to confirm email address"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:99
+msgid "(Recommended if registration is open)"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
@@ -3295,7 +3363,7 @@ msgstr ""
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
-#: bookwyrm/views/authentication.py:58
+#: bookwyrm/views/authentication.py:69
 msgid "Username or password are incorrect"
 msgstr ""
 
@@ -3375,11 +3443,6 @@ msgstr ""
 #~ msgid "Enter a valid integer."
 #~ msgstr "E-Mail Adresse"
 
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid email address."
-#~ msgstr "E-Mail Adresse"
-
 #, fuzzy
 #~| msgid "Email address:"
 #~ msgid "Enter a valid IPv4 address."
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index ab56046e..e8e3b0b3 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 18:34+0000\n"
+"POT-Creation-Date: 2021-08-07 01:35+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -282,7 +282,7 @@ msgstr ""
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:101
+#: bookwyrm/templates/settings/site.html:108
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
@@ -680,6 +680,52 @@ msgstr ""
 msgid "Compose status"
 msgstr ""
 
+#: bookwyrm/templates/confirm_email/confirm_email.html:4
+msgid "Confirm email"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:7
+msgid "Confirm your email address"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:13
+msgid "A confirmation code has been sent to the email address you used to register your account."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:15
+msgid "Sorry! We couldn't find that code."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:19
+msgid "Confirmation code:"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:25
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:33
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:32
+msgid "Can't find your code?"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:4
+msgid "Resend confirmation link"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:11
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:17
+msgid "Resend link"
+msgstr ""
+
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
 msgstr ""
@@ -806,7 +852,7 @@ msgid "Join %(name)s"
 msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/login.html:56
 msgid "This instance is closed"
 msgstr ""
 
@@ -818,22 +864,24 @@ msgstr ""
 msgid "Request an Invitation"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:64
-#: bookwyrm/templates/password_reset_request.html:18
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:33
-msgid "Submit"
-msgstr ""
-
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr ""
 
+#: bookwyrm/templates/email/confirm/html_content.html:6
+#: bookwyrm/templates/email/confirm/text_content.html:4
+#, python-format
+msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
+msgstr ""
+
+#: bookwyrm/templates/email/confirm/html_content.html:11
+msgid "Confirm Email"
+msgstr ""
+
+#: bookwyrm/templates/email/confirm/subject.html:2
+msgid "Please confirm your email"
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -1235,7 +1283,7 @@ msgid "Imported"
 msgstr ""
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/login.html:51
 msgid "Create an Account"
 msgstr ""
 
@@ -1303,7 +1351,7 @@ msgid "Notifications"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
-#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
@@ -1312,12 +1360,12 @@ msgstr ""
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:33
+#: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr ""
 
@@ -1493,16 +1541,20 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:16
+msgid "Success! Email address confirmed."
+msgstr ""
+
+#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr ""
 
-#: bookwyrm/templates/login.html:52
+#: bookwyrm/templates/login.html:57
 msgid "Contact an administrator to get an invite"
 msgstr ""
 
-#: bookwyrm/templates/login.html:63
+#: bookwyrm/templates/login.html:68
 msgid "More about this site"
 msgstr ""
 
@@ -2315,7 +2367,15 @@ msgstr ""
 msgid "Allow invite requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:95
+#: bookwyrm/templates/settings/site.html:97
+msgid "Require users to confirm email address"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:99
+msgid "(Recommended if registration is open)"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"
 msgstr ""
 
@@ -2991,7 +3051,7 @@ msgstr ""
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
-#: bookwyrm/views/authentication.py:58
+#: bookwyrm/views/authentication.py:69
 msgid "Username or password are incorrect"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index dbf7540c..9fc28535 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 18:34+0000\n"
+"POT-Creation-Date: 2021-08-07 01:35+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -288,7 +288,7 @@ msgstr "Clave Goodreads:"
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:101
+#: bookwyrm/templates/settings/site.html:108
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
@@ -688,6 +688,60 @@ msgstr "Cerrar"
 msgid "Compose status"
 msgstr "Componer status"
 
+#: bookwyrm/templates/confirm_email/confirm_email.html:4
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm email"
+msgstr "Confirmar"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:7
+#, fuzzy
+#| msgid "Enter a valid email address."
+msgid "Confirm your email address"
+msgstr "Ingrese una dirección de correo electrónico válida."
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:13
+msgid "A confirmation code has been sent to the email address you used to register your account."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:15
+msgid "Sorry! We couldn't find that code."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:19
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Confirmation code:"
+msgstr "Confirmar contraseña:"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:25
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:33
+msgid "Submit"
+msgstr "Enviar"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:32
+msgid "Can't find your code?"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:4
+msgid "Resend confirmation link"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:11
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "Dirección de correo electrónico:"
+
+#: bookwyrm/templates/confirm_email/resend_form.html:17
+#, fuzzy
+#| msgid "Re-send invite"
+msgid "Resend link"
+msgstr "Re-enviar invitación"
+
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
 msgstr "Comunidad"
@@ -816,7 +870,7 @@ msgid "Join %(name)s"
 msgstr "Unirse con %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/login.html:56
 msgid "This instance is closed"
 msgstr "Esta instancia está cerrada."
 
@@ -828,22 +882,26 @@ msgstr "¡Gracias! Tu solicitud ha sido recibido."
 msgid "Request an Invitation"
 msgstr "Solicitar una invitación"
 
-#: bookwyrm/templates/discover/landing_layout.html:64
-#: bookwyrm/templates/password_reset_request.html:18
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "Dirección de correo electrónico:"
-
-#: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:33
-msgid "Submit"
-msgstr "Enviar"
-
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "Tu cuenta"
 
+#: bookwyrm/templates/email/confirm/html_content.html:6
+#: bookwyrm/templates/email/confirm/text_content.html:4
+#, python-format
+msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
+msgstr ""
+
+#: bookwyrm/templates/email/confirm/html_content.html:11
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm Email"
+msgstr "Confirmar"
+
+#: bookwyrm/templates/email/confirm/subject.html:2
+msgid "Please confirm your email"
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -1250,7 +1308,7 @@ msgid "Imported"
 msgstr "Importado"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/login.html:51
 msgid "Create an Account"
 msgstr "Crear una cuenta"
 
@@ -1318,7 +1376,7 @@ msgid "Notifications"
 msgstr "Notificaciones"
 
 #: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
-#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
@@ -1327,12 +1385,12 @@ msgstr "Nombre de usuario:"
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
 #: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:33
+#: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "Iniciar sesión"
 
@@ -1510,16 +1568,20 @@ msgstr "Tus listas"
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:16
+msgid "Success! Email address confirmed."
+msgstr ""
+
+#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: bookwyrm/templates/login.html:52
+#: bookwyrm/templates/login.html:57
 msgid "Contact an administrator to get an invite"
 msgstr "Contactar a unx administradorx para recibir una invitación"
 
-#: bookwyrm/templates/login.html:63
+#: bookwyrm/templates/login.html:68
 msgid "More about this site"
 msgstr "Más sobre este sitio"
 
@@ -2351,7 +2413,15 @@ msgstr "Permitir registración:"
 msgid "Allow invite requests"
 msgstr "Permitir solicitudes de invitación:"
 
-#: bookwyrm/templates/settings/site.html:95
+#: bookwyrm/templates/settings/site.html:97
+msgid "Require users to confirm email address"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:99
+msgid "(Recommended if registration is open)"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
@@ -3036,7 +3106,7 @@ msgstr ""
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
-#: bookwyrm/views/authentication.py:58
+#: bookwyrm/views/authentication.py:69
 msgid "Username or password are incorrect"
 msgstr ""
 
@@ -3117,9 +3187,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Enter a valid integer."
 #~ msgstr "Ingrese un entero válido."
 
-#~ msgid "Enter a valid email address."
-#~ msgstr "Ingrese una dirección de correo electrónico válida."
-
 #~ msgid "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 #~ msgstr "Ingrese un “slug” válido que consiste de letras, numeros, guiones bajos, o guiones"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index b4405df5..f0a559f9 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 18:34+0000\n"
+"POT-Creation-Date: 2021-08-07 01:35+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -286,7 +286,7 @@ msgstr "Clé Goodreads :"
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:101
+#: bookwyrm/templates/settings/site.html:108
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
@@ -684,6 +684,60 @@ msgstr "Fermer"
 msgid "Compose status"
 msgstr "Rédiger un statut"
 
+#: bookwyrm/templates/confirm_email/confirm_email.html:4
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm email"
+msgstr "Confirmer"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:7
+#, fuzzy
+#| msgid "Email address:"
+msgid "Confirm your email address"
+msgstr "Adresse email :"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:13
+msgid "A confirmation code has been sent to the email address you used to register your account."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:15
+msgid "Sorry! We couldn't find that code."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:19
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Confirmation code:"
+msgstr "Confirmez le mot de passe :"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:25
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:33
+msgid "Submit"
+msgstr "Valider"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:32
+msgid "Can't find your code?"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:4
+msgid "Resend confirmation link"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:11
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "Adresse email :"
+
+#: bookwyrm/templates/confirm_email/resend_form.html:17
+#, fuzzy
+#| msgid "Re-send invite"
+msgid "Resend link"
+msgstr "Envoyer l’invitation de nouveau"
+
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
 msgstr "Communauté"
@@ -812,7 +866,7 @@ msgid "Join %(name)s"
 msgstr "Rejoignez %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/login.html:56
 msgid "This instance is closed"
 msgstr "Cette instance est fermée"
 
@@ -824,22 +878,26 @@ msgstr "Merci ! Votre demande a bien été reçue."
 msgid "Request an Invitation"
 msgstr "Demander une invitation"
 
-#: bookwyrm/templates/discover/landing_layout.html:64
-#: bookwyrm/templates/password_reset_request.html:18
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "Adresse email :"
-
-#: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:33
-msgid "Submit"
-msgstr "Valider"
-
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "Votre compte"
 
+#: bookwyrm/templates/email/confirm/html_content.html:6
+#: bookwyrm/templates/email/confirm/text_content.html:4
+#, python-format
+msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
+msgstr ""
+
+#: bookwyrm/templates/email/confirm/html_content.html:11
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm Email"
+msgstr "Confirmer"
+
+#: bookwyrm/templates/email/confirm/subject.html:2
+msgid "Please confirm your email"
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -1246,7 +1304,7 @@ msgid "Imported"
 msgstr "Importé"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/login.html:51
 msgid "Create an Account"
 msgstr "Créer un compte"
 
@@ -1314,7 +1372,7 @@ msgid "Notifications"
 msgstr "Notifications"
 
 #: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
-#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
@@ -1323,12 +1381,12 @@ msgstr "Nom du compte :"
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
 #: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:33
+#: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "Se connecter"
 
@@ -1504,16 +1562,20 @@ msgstr "Vos listes"
 msgid "Login"
 msgstr "Connexion"
 
-#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:16
+msgid "Success! Email address confirmed."
+msgstr ""
+
+#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: bookwyrm/templates/login.html:52
+#: bookwyrm/templates/login.html:57
 msgid "Contact an administrator to get an invite"
 msgstr "Contacter un administrateur pour obtenir une invitation"
 
-#: bookwyrm/templates/login.html:63
+#: bookwyrm/templates/login.html:68
 msgid "More about this site"
 msgstr "En savoir plus sur ce site"
 
@@ -2333,7 +2395,15 @@ msgstr "Autoriser les inscriptions"
 msgid "Allow invite requests"
 msgstr "Autoriser les demandes d’invitation"
 
-#: bookwyrm/templates/settings/site.html:95
+#: bookwyrm/templates/settings/site.html:97
+msgid "Require users to confirm email address"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:99
+msgid "(Recommended if registration is open)"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les inscriptions sont closes :"
 
@@ -3015,7 +3085,7 @@ msgstr "Ce fichier dépasse la taille limite : 10 Mo"
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s (%(subtitle)s)"
 
-#: bookwyrm/views/authentication.py:58
+#: bookwyrm/views/authentication.py:69
 msgid "Username or password are incorrect"
 msgstr ""
 
@@ -3066,11 +3136,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Enter a valid integer."
 #~ msgstr "Adresse email :"
 
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid email address."
-#~ msgstr "Adresse email :"
-
 #, fuzzy
 #~| msgid "Email address:"
 #~ msgid "Enter a valid IPv4 address."
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 471de85d..adb0d36c 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 18:34+0000\n"
+"POT-Creation-Date: 2021-08-07 01:35+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -284,7 +284,7 @@ msgstr "Goodreads key:"
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:101
+#: bookwyrm/templates/settings/site.html:108
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
@@ -681,6 +681,60 @@ msgstr "关闭"
 msgid "Compose status"
 msgstr "撰写状态"
 
+#: bookwyrm/templates/confirm_email/confirm_email.html:4
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm email"
+msgstr "确认"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:7
+#, fuzzy
+#| msgid "Email address:"
+msgid "Confirm your email address"
+msgstr "邮箱地址:"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:13
+msgid "A confirmation code has been sent to the email address you used to register your account."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:15
+msgid "Sorry! We couldn't find that code."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:19
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Confirmation code:"
+msgstr "确认密码:"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:25
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:33
+msgid "Submit"
+msgstr "提交"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:32
+msgid "Can't find your code?"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:4
+msgid "Resend confirmation link"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:11
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "邮箱地址:"
+
+#: bookwyrm/templates/confirm_email/resend_form.html:17
+#, fuzzy
+#| msgid "Re-send invite"
+msgid "Resend link"
+msgstr "重新发送请求"
+
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
 msgstr "社区"
@@ -807,7 +861,7 @@ msgid "Join %(name)s"
 msgstr "加入 %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/login.html:56
 msgid "This instance is closed"
 msgstr "本实例不开放。"
 
@@ -819,22 +873,26 @@ msgstr "谢谢你！我们已经收到了你的请求。"
 msgid "Request an Invitation"
 msgstr "请求邀请"
 
-#: bookwyrm/templates/discover/landing_layout.html:64
-#: bookwyrm/templates/password_reset_request.html:18
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "邮箱地址:"
-
-#: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:33
-msgid "Submit"
-msgstr "提交"
-
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "你的帐号"
 
+#: bookwyrm/templates/email/confirm/html_content.html:6
+#: bookwyrm/templates/email/confirm/text_content.html:4
+#, python-format
+msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
+msgstr ""
+
+#: bookwyrm/templates/email/confirm/html_content.html:11
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm Email"
+msgstr "确认"
+
+#: bookwyrm/templates/email/confirm/subject.html:2
+msgid "Please confirm your email"
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -1237,7 +1295,7 @@ msgid "Imported"
 msgstr "已导入"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/login.html:51
 msgid "Create an Account"
 msgstr "创建帐号"
 
@@ -1305,7 +1363,7 @@ msgid "Notifications"
 msgstr "通知"
 
 #: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
-#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户名:"
@@ -1314,12 +1372,12 @@ msgstr "用户名:"
 msgid "password"
 msgstr "密码"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "忘记了密码？"
 
 #: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:33
+#: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "登录"
 
@@ -1495,16 +1553,20 @@ msgstr "你的列表"
 msgid "Login"
 msgstr "登录"
 
-#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:16
+msgid "Success! Email address confirmed."
+msgstr ""
+
+#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "密码:"
 
-#: bookwyrm/templates/login.html:52
+#: bookwyrm/templates/login.html:57
 msgid "Contact an administrator to get an invite"
 msgstr "联系管理员以取得邀请"
 
-#: bookwyrm/templates/login.html:63
+#: bookwyrm/templates/login.html:68
 msgid "More about this site"
 msgstr "更多关于本站点的信息"
 
@@ -2319,7 +2381,15 @@ msgstr "允许注册"
 msgid "Allow invite requests"
 msgstr "允许请求邀请"
 
-#: bookwyrm/templates/settings/site.html:95
+#: bookwyrm/templates/settings/site.html:97
+msgid "Require users to confirm email address"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:99
+msgid "(Recommended if registration is open)"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
@@ -2992,7 +3062,7 @@ msgstr "文件超过了最大大小: 10MB"
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s：%(subtitle)s"
 
-#: bookwyrm/views/authentication.py:58
+#: bookwyrm/views/authentication.py:69
 msgid "Username or password are incorrect"
 msgstr ""
 
diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index 40b12995..c496bb92 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 18:34+0000\n"
+"POT-Creation-Date: 2021-08-07 01:35+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -288,7 +288,7 @@ msgstr "Goodreads key:"
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:101
+#: bookwyrm/templates/settings/site.html:108
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
@@ -687,6 +687,60 @@ msgstr "關閉"
 msgid "Compose status"
 msgstr "撰寫狀態"
 
+#: bookwyrm/templates/confirm_email/confirm_email.html:4
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm email"
+msgstr "確認"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:7
+#, fuzzy
+#| msgid "Email address:"
+msgid "Confirm your email address"
+msgstr "郵箱地址:"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:13
+msgid "A confirmation code has been sent to the email address you used to register your account."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:15
+msgid "Sorry! We couldn't find that code."
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:19
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Confirmation code:"
+msgstr "確認密碼:"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:25
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:33
+msgid "Submit"
+msgstr "提交"
+
+#: bookwyrm/templates/confirm_email/confirm_email.html:32
+msgid "Can't find your code?"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:4
+msgid "Resend confirmation link"
+msgstr ""
+
+#: bookwyrm/templates/confirm_email/resend_form.html:11
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "郵箱地址:"
+
+#: bookwyrm/templates/confirm_email/resend_form.html:17
+#, fuzzy
+#| msgid "Re-send invite"
+msgid "Resend link"
+msgstr "重新發送請求"
+
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
 msgstr "社群"
@@ -813,7 +867,7 @@ msgid "Join %(name)s"
 msgstr "加入 %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/login.html:56
 msgid "This instance is closed"
 msgstr "本實例不開放。"
 
@@ -825,22 +879,26 @@ msgstr "謝謝你！我們已經受到了你的請求。"
 msgid "Request an Invitation"
 msgstr "請求邀請"
 
-#: bookwyrm/templates/discover/landing_layout.html:64
-#: bookwyrm/templates/password_reset_request.html:18
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "郵箱地址:"
-
-#: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:33
-msgid "Submit"
-msgstr "提交"
-
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "你的帳號"
 
+#: bookwyrm/templates/email/confirm/html_content.html:6
+#: bookwyrm/templates/email/confirm/text_content.html:4
+#, python-format
+msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
+msgstr ""
+
+#: bookwyrm/templates/email/confirm/html_content.html:11
+#, fuzzy
+#| msgid "Confirm"
+msgid "Confirm Email"
+msgstr "確認"
+
+#: bookwyrm/templates/email/confirm/subject.html:2
+msgid "Please confirm your email"
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -1247,7 +1305,7 @@ msgid "Imported"
 msgstr "已匯入"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/login.html:51
 msgid "Create an Account"
 msgstr "建立帳號"
 
@@ -1315,7 +1373,7 @@ msgid "Notifications"
 msgstr "通知"
 
 #: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
-#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "使用者名稱:"
@@ -1324,12 +1382,12 @@ msgstr "使用者名稱:"
 msgid "password"
 msgstr "密碼"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "忘記了密碼？"
 
 #: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:33
+#: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "登入"
 
@@ -1505,16 +1563,20 @@ msgstr "你的列表"
 msgid "Login"
 msgstr "登入"
 
-#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:16
+msgid "Success! Email address confirmed."
+msgstr ""
+
+#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "密碼:"
 
-#: bookwyrm/templates/login.html:52
+#: bookwyrm/templates/login.html:57
 msgid "Contact an administrator to get an invite"
 msgstr "聯絡管理員以取得邀請"
 
-#: bookwyrm/templates/login.html:63
+#: bookwyrm/templates/login.html:68
 msgid "More about this site"
 msgstr "關於本網站的更多"
 
@@ -2338,7 +2400,15 @@ msgstr "允許註冊:"
 msgid "Allow invite requests"
 msgstr "允許請求邀請:"
 
-#: bookwyrm/templates/settings/site.html:95
+#: bookwyrm/templates/settings/site.html:97
+msgid "Require users to confirm email address"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:99
+msgid "(Recommended if registration is open)"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"
 msgstr "註冊關閉文字:"
 
@@ -3011,7 +3081,7 @@ msgstr "檔案超過了最大大小: 10MB"
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
-#: bookwyrm/views/authentication.py:58
+#: bookwyrm/views/authentication.py:69
 msgid "Username or password are incorrect"
 msgstr ""
 

From e198e663d1b821a596a56b12986a00441c86b815 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 18:48:16 -0700
Subject: [PATCH 066/272] Fixes names of site settings field in tests

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

diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index bbafe7bd..bd4b3b02 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -32,7 +32,7 @@ class AuthenticationViews(TestCase):
         self.anonymous_user.is_authenticated = False
 
         self.settings = models.SiteSettings.objects.create(
-            id=1, require_email_confirmation=False
+            id=1, require_confirm_email=False
         )
 
     def test_login_get(self, _):

From aad5de3b618b20d2c24cfe456f1f7a2e0324243d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 6 Aug 2021 19:03:15 -0700
Subject: [PATCH 067/272] Improves cross-edition display for lists

---
 bookwyrm/templatetags/bookwyrm_tags.py |  2 +-
 bookwyrm/views/books.py                | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 5cba5455..4811f4fd 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -12,7 +12,7 @@ register = template.Library()
 def get_rating(book, user):
     """get the overall rating of a book"""
     queryset = views.helpers.privacy_filter(
-        user, models.Review.objects.filter(book=book)
+        user, models.Review.objects.filter(book__in=book.parent_work.editions.all())
     )
     return queryset.aggregate(Avg("rating"))["rating__avg"]
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index d56e2f22..6cd0427c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -65,6 +65,13 @@ class Book(View):
         queryset = queryset.select_related("user")
         paginated = Paginator(queryset, PAGE_LENGTH)
 
+        lists = privacy_filter(
+            request.user,
+            models.List.objects.filter(
+                listitem__approved=True,
+                listitem__book__in=book.parent_work.editions.all(),
+            ),
+        )
         data = {
             "book": book,
             "statuses": paginated.get_page(request.GET.get("page")),
@@ -75,9 +82,7 @@ class Book(View):
             if not user_statuses
             else None,
             "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
-            "lists": privacy_filter(
-                request.user, book.list_set.filter(listitem__approved=True)
-            ),
+            "lists": lists,
         }
 
         if request.user.is_authenticated:

From 0fa9fd7331e71dd981b8effa6faeb4aba61fada6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 07:28:24 -0700
Subject: [PATCH 068/272] Registration with confirm email tests

---
 bookwyrm/tests/views/test_authentication.py | 97 +++++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index bd4b3b02..dc9f5dd5 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -132,6 +132,32 @@ class AuthenticationViews(TestCase):
         self.assertEqual(nutria.localname, "nutria-user.user_nutria")
         self.assertEqual(nutria.local, True)
 
+    def test_register_email_confirm(self, _):
+        """create a user"""
+        self.settings.require_confirm_email = True
+        self.settings.save()
+
+        view = views.Register.as_view()
+        self.assertEqual(models.User.objects.count(), 1)
+        request = self.factory.post(
+            "register/",
+            {
+                "localname": "nutria",
+                "password": "mouseword",
+                "email": "aa@bb.cccc",
+            },
+        )
+        with patch("bookwyrm.views.authentication.login"):
+            response = view(request)
+        self.assertEqual(response.status_code, 302)
+        nutria = models.User.objects.get(localname="nutria")
+        self.assertEqual(nutria.username, "nutria@%s" % DOMAIN)
+        self.assertEqual(nutria.local, True)
+
+        self.assertFalse(nutria.is_active)
+        self.assertEqual(nutria.deactivation_reason, "pending")
+        self.assertIsNotNone(nutria.confirmation_code)
+
     def test_register_trailing_space(self, _):
         """django handles this so weirdly"""
         view = views.Register.as_view()
@@ -251,3 +277,74 @@ class AuthenticationViews(TestCase):
         with self.assertRaises(Http404):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
+
+    def test_confirm_email_code_get(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        self.settings.require_confirm_email = True
+        self.settings.save()
+
+        self.local_user.is_active = False
+        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"],
+        )
+        view = views.ConfirmEmailCode.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = view(request, "12345")
+        self.assertEqual(result.url, "/login/confirmed")
+        self.assertEqual(result.status_code, 302)
+
+        self.local_user.refresh_from_db()
+        self.assertTrue(self.local_user.is_active)
+        self.assertIsNone(self.local_user.deactivation_reason)
+
+        request.user = self.local_user
+        result = view(request, "12345")
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)
+
+    def test_confirm_email_code_get_invalid_code(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        self.settings.require_confirm_email = True
+        self.settings.save()
+
+        self.local_user.is_active = False
+        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"],
+        )
+        view = views.ConfirmEmailCode.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = view(request, "abcde")
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertFalse(self.local_user.is_active)
+        self.assertEqual(self.local_user.deactivation_reason, "pending")
+
+    def test_confirm_email_get(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        self.settings.require_confirm_email = True
+        self.settings.save()
+
+        login = views.ConfirmEmail.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = login(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        request.user = self.local_user
+        result = login(request)
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)

From 226c325099e1bd5ff723dd2c0df6549999067dc6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 07:37:18 -0700
Subject: [PATCH 069/272] Adds plaintext code to emails

---
 bookwyrm/templates/email/confirm/html_content.html | 6 ++++++
 bookwyrm/templates/email/confirm/text_content.html | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/bookwyrm/templates/email/confirm/html_content.html b/bookwyrm/templates/email/confirm/html_content.html
index b47642af..231b0388 100644
--- a/bookwyrm/templates/email/confirm/html_content.html
+++ b/bookwyrm/templates/email/confirm/html_content.html
@@ -11,4 +11,10 @@ One last step before you join {{ site_name }}! Please confirm your email address
 {% trans "Confirm Email" as text %}
 {% include 'email/snippets/action.html' with path=confirmation_link text=text %}
 
+<p>
+{% blocktrans trimmed %}
+Or enter the code "<code>{{ confirmation_code }}</code>" at login.
+{% endblocktrans %}
+</p>
+
 {% endblock %}
diff --git a/bookwyrm/templates/email/confirm/text_content.html b/bookwyrm/templates/email/confirm/text_content.html
index e3d73938..847009e5 100644
--- a/bookwyrm/templates/email/confirm/text_content.html
+++ b/bookwyrm/templates/email/confirm/text_content.html
@@ -7,5 +7,8 @@ One last step before you join {{ site_name }}! Please confirm your email address
 
 {{ confirmation_link }}
 
+{% blocktrans trimmed %}
+Or enter the code "{{ confirmation_code }}" at login.
+{% endblocktrans %}
 
 {% endblock %}

From 68e4462486d03573b278ef5da42b73ce5fd7bf5d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 07:43:30 -0700
Subject: [PATCH 070/272] Make email a required html field in register form

---
 bookwyrm/templates/snippets/register_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/register_form.html b/bookwyrm/templates/snippets/register_form.html
index cd7ea806..9e610bd1 100644
--- a/bookwyrm/templates/snippets/register_form.html
+++ b/bookwyrm/templates/snippets/register_form.html
@@ -12,7 +12,7 @@
 <div class="field">
     <label class="label" for="id_email_register">{% trans "Email address:" %}</label>
     <div class="control">
-        <input type="email" name="email" maxlength="254" class="input" id="id_email_register" value="{% if register_form.email.value %}{{ register_form.email.value }}{% endif %}">
+        <input type="email" name="email" maxlength="254" class="input" id="id_email_register" value="{% if register_form.email.value %}{{ register_form.email.value }}{% endif %}" required>
     {% for error in register_form.email.errors %}
     <p class="help is-danger">{{ error | escape }}</p>
     {% endfor %}

From 38f614a526209e78b469e477261a8efef5d0ebda Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 07:56:30 -0700
Subject: [PATCH 071/272] Include generated notes in books stream

---
 bookwyrm/activitystreams.py | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index bad7c59f..66dcad84 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -358,25 +358,39 @@ def add_statuses_on_shelve(sender, instance, *args, **kwargs):
     """update books stream when user shelves a book"""
     if not instance.user.local:
         return
-    # check if the book is already on the user's shelves
-    if models.ShelfBook.objects.filter(
-        user=instance.user, book__in=instance.book.parent_work.editions.all()
-    ).exists():
+    book = None
+    if hasattr(instance, "book"):
+        book = instance.book
+    elif instance.mention_books.exists():
+        book = instance.mention_books.first()
+    if not book:
         return
 
-    BooksStream().add_book_statuses(instance.user, instance.book)
+    # check if the book is already on the user's shelves
+    editions = book.parent_work.editions.all()
+    if models.ShelfBook.objects.filter(user=instance.user, book__in=editions).exists():
+        return
+
+    BooksStream().add_book_statuses(instance.user, book)
 
 
 @receiver(signals.post_delete, sender=models.ShelfBook)
 # pylint: disable=unused-argument
-def remove_statuses_on_shelve(sender, instance, *args, **kwargs):
+def remove_statuses_on_unshelve(sender, instance, *args, **kwargs):
     """update books stream when user unshelves a book"""
     if not instance.user.local:
         return
+
+    book = None
+    if hasattr(instance, "book"):
+        book = instance.book
+    elif instance.mention_books.exists():
+        book = instance.mention_books.first()
+    if not book:
+        return
     # check if the book is actually unshelved, not just moved
-    if models.ShelfBook.objects.filter(
-        user=instance.user, book__in=instance.book.parent_work.editions.all()
-    ).exists():
+    editions = book.parent_work.editions.all()
+    if models.ShelfBook.objects.filter(user=instance.user, book__in=editions).exists():
         return
 
     BooksStream().remove_book_statuses(instance.user, instance.book)

From 026c6ac025f2725f0e2805da4e7040e212a4d4a5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 08:01:14 -0700
Subject: [PATCH 072/272] Mocks emailer in registration test

---
 bookwyrm/tests/views/test_authentication.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index dc9f5dd5..22008e10 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -132,7 +132,8 @@ class AuthenticationViews(TestCase):
         self.assertEqual(nutria.localname, "nutria-user.user_nutria")
         self.assertEqual(nutria.local, True)
 
-    def test_register_email_confirm(self, _):
+    @patch("bookwyrm.emailing.send_email.delay")
+    def test_register_email_confirm(self, *_):
         """create a user"""
         self.settings.require_confirm_email = True
         self.settings.save()

From 468f1f135c42b819f6f2f884dbe39fbf9101dd04 Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Sat, 7 Aug 2021 11:35:07 -0500
Subject: [PATCH 073/272] update spanish translations

---
 locale/es/LC_MESSAGES/django.mo | Bin 42719 -> 44832 bytes
 locale/es/LC_MESSAGES/django.po | 135 ++++++++++----------------------
 2 files changed, 41 insertions(+), 94 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 23869cf45428ccb9c4d7e0d8a06dc96b209e7775..c73db384d7792b0008f0fef891c4d286b5a253f7 100644
GIT binary patch
delta 15136
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

delta 13429
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
PYrxwLJY3t}8RzkT`Olaf

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 9fc28535..31ccd53c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 01:35+0000\n"
+"POT-Creation-Date: 2021-08-07 16:23+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -100,10 +100,8 @@ msgid "Home"
 msgstr "Hogar"
 
 #: bookwyrm/settings.py:124
-#, fuzzy
-#| msgid "Book Title"
 msgid "Books Timeline"
-msgstr "Título"
+msgstr "Línea temporal de libros"
 
 #: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
@@ -132,10 +130,8 @@ msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
 #: bookwyrm/settings.py:175
-#, fuzzy
-#| msgid "Additional info:"
 msgid "Traditional Chinese"
-msgstr "Más informacion:"
+msgstr "Chino tradicional"
 
 #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
 msgid "Not Found"
@@ -190,10 +186,8 @@ msgid "View on Inventaire"
 msgstr "Ver en Inventaire"
 
 #: bookwyrm/templates/author/author.html:85
-#, fuzzy
-#| msgid "View on OpenLibrary"
 msgid "View on LibraryThing"
-msgstr "Ver en OpenLibrary"
+msgstr "Ver en LibraryThing"
 
 #: bookwyrm/templates/author/author.html:93
 msgid "View on Goodreads"
@@ -534,16 +528,12 @@ msgid "Authors"
 msgstr "Autores"
 
 #: bookwyrm/templates/book/edit_book.html:202
-#, fuzzy, python-format
-#| msgid "Remove from %(name)s"
 msgid "Remove %(name)s"
-msgstr "Quitar de %(name)s"
+msgstr "Quitar %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:205
-#, fuzzy, python-format
-#| msgid "Remove from %(name)s"
 msgid "Author page for %(name)s"
-msgstr "Quitar de %(name)s"
+msgstr "Página de autor por %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:212
 msgid "Add Authors:"
@@ -689,16 +679,12 @@ msgid "Compose status"
 msgstr "Componer status"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
-#, fuzzy
-#| msgid "Confirm"
 msgid "Confirm email"
-msgstr "Confirmar"
+msgstr "Confirmar correo electrónico"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:7
-#, fuzzy
-#| msgid "Enter a valid email address."
 msgid "Confirm your email address"
-msgstr "Ingrese una dirección de correo electrónico válida."
+msgstr "Confirmar tu dirección de correo electrónico"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:13
 msgid "A confirmation code has been sent to the email address you used to register your account."
@@ -709,10 +695,8 @@ msgid "Sorry! We couldn't find that code."
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
-#, fuzzy
-#| msgid "Confirm password:"
 msgid "Confirmation code:"
-msgstr "Confirmar contraseña:"
+msgstr "Código de confirmación:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
 #: bookwyrm/templates/discover/landing_layout.html:70
@@ -737,10 +721,8 @@ msgid "Email address:"
 msgstr "Dirección de correo electrónico:"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:17
-#, fuzzy
-#| msgid "Re-send invite"
 msgid "Resend link"
-msgstr "Re-enviar invitación"
+msgstr "Re-enviar enlace"
 
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
@@ -791,10 +773,8 @@ msgstr "Activ@ recientemente"
 #: bookwyrm/templates/directory/user_card.html:18
 #: bookwyrm/templates/user/user_preview.html:16
 #: bookwyrm/templates/user/user_preview.html:17
-#, fuzzy
-#| msgid "Your Account"
 msgid "Locked account"
-msgstr "Tu cuenta"
+msgstr "Cuenta bloqueada"
 
 #: bookwyrm/templates/directory/user_card.html:40
 msgid "follower you follow"
@@ -893,15 +873,23 @@ msgid "One last step before you join %(site_name)s! Please confirm your email ad
 msgstr ""
 
 #: bookwyrm/templates/email/confirm/html_content.html:11
-#, fuzzy
-#| msgid "Confirm"
 msgid "Confirm Email"
-msgstr "Confirmar"
+msgstr "Confirmar correo electrónico"
+
+#: bookwyrm/templates/email/confirm/html_content.html:15
+#, python-format
+msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
+msgstr ""
 
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
 msgstr ""
 
+#: bookwyrm/templates/email/confirm/text_content.html:10
+#, python-format
+msgid "Or enter the code \"%(confirmation_code)s\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -983,10 +971,8 @@ msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
 #: bookwyrm/templates/feed/feed.html:22
-#, fuzzy, python-format
-#| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
-msgstr "cargar <span data-poll=\"stream/%(tab)s\">0</span> status(es) no leídos"
+msgstr "cargar <span data-poll=\"stream/%(tab.key)s\">0</span> status(es) no leído(s)"
 
 #: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
@@ -1229,10 +1215,8 @@ msgid "Import Status"
 msgstr "Status de importación"
 
 #: bookwyrm/templates/import_status.html:11
-#, fuzzy
-#| msgid "Back to reports"
 msgid "Back to imports"
-msgstr "Volver a los informes"
+msgstr "Volver a las importaciones"
 
 #: bookwyrm/templates/import_status.html:15
 msgid "Import started:"
@@ -1281,10 +1265,8 @@ msgid "Successfully imported"
 msgstr "Importado exitosamente"
 
 #: bookwyrm/templates/import_status.html:114
-#, fuzzy
-#| msgid "Import still in progress."
 msgid "Import Progress"
-msgstr "Importación todavia en progreso"
+msgstr "Progreso de importación"
 
 #: bookwyrm/templates/import_status.html:119
 msgid "Book"
@@ -1399,10 +1381,8 @@ msgid "Join"
 msgstr "Unirse"
 
 #: bookwyrm/templates/layout.html:213
-#, fuzzy
-#| msgid "About this server"
 msgid "About this instance"
-msgstr "Sobre este servidor"
+msgstr "Sobre esta instancia"
 
 #: bookwyrm/templates/layout.html:217
 msgid "Contact site admin"
@@ -1836,10 +1816,8 @@ msgstr "Nueva contraseña:"
 #: bookwyrm/templates/preferences/delete_user.html:7
 #: bookwyrm/templates/preferences/delete_user.html:26
 #: bookwyrm/templates/preferences/layout.html:23
-#, fuzzy
-#| msgid "Create an Account"
 msgid "Delete Account"
-msgstr "Crear una cuenta"
+msgstr "Quitar cuenta"
 
 #: bookwyrm/templates/preferences/delete_user.html:12
 msgid "Permanently delete account"
@@ -1859,10 +1837,8 @@ msgid "Show set reading goal prompt in feed:"
 msgstr "Mostrar meta de lectura en el feed:"
 
 #: bookwyrm/templates/preferences/edit_user.html:58
-#, fuzzy
-#| msgid "Post privacy"
 msgid "Default post privacy:"
-msgstr "Privacidad de publicación"
+msgstr "Privacidad de publicación por defecto:"
 
 #: bookwyrm/templates/preferences/edit_user.html:70
 #, python-format
@@ -1886,22 +1862,16 @@ msgid "Relationships"
 msgstr "Relaciones"
 
 #: bookwyrm/templates/reading_progress/finish.html:5
-#, fuzzy, python-format
-#| msgid "Finish \"<em>%(book_title)s</em>\""
 msgid "Finish \"%(book_title)s\""
-msgstr "Terminar \"<em>%(book_title)s</em>\""
+msgstr "Terminar \"%(book_title)s\""
 
 #: bookwyrm/templates/reading_progress/start.html:5
-#, fuzzy, python-format
-#| msgid "Edit \"%(book_title)s\""
 msgid "Start \"%(book_title)s\""
-msgstr "Editar \"%(book_title)s\""
+msgstr "Empezar \"%(book_title)s\""
 
 #: bookwyrm/templates/reading_progress/want.html:5
-#, fuzzy, python-format
-#| msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"%(book_title)s\""
-msgstr "Quiero leer \"<em>%(book_title)s</em>\""
+msgstr "Quiero leer \"%(book_title)s\""
 
 #: bookwyrm/templates/rss/title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:36
@@ -1967,10 +1937,8 @@ msgstr "Administrar usuarios"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-#, fuzzy
-#| msgid "Federated Servers"
 msgid "Federated Instances"
-msgstr "Servidores federalizados"
+msgstr "Instancias federalizadas"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"
@@ -2097,17 +2065,13 @@ msgstr "inactivo"
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-#, fuzzy
-#| msgid "View instance"
 msgid "Add instance"
-msgstr "Ver instancia"
+msgstr "Agregar instancia"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-#, fuzzy
-#| msgid "Back to server list"
 msgid "Back to instance list"
-msgstr "Volver a la lista de servidores"
+msgstr "Volver a la lista de instancias"
 
 #: bookwyrm/templates/settings/edit_server.html:16
 #: bookwyrm/templates/settings/server_blocklist.html:16
@@ -2217,10 +2181,8 @@ msgstr "Todos los usuarios en esta instancia serán re-activados."
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-#, fuzzy
-#| msgid "Instance Name:"
 msgid "Instance name"
-msgstr "Nombre de instancia:"
+msgstr "Nombre de instancia"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
@@ -2402,16 +2364,12 @@ msgid "Additional info:"
 msgstr "Más informacion:"
 
 #: bookwyrm/templates/settings/site.html:85
-#, fuzzy
-#| msgid "Allow registration:"
 msgid "Allow registration"
-msgstr "Permitir registración:"
+msgstr "Permitir registración"
 
 #: bookwyrm/templates/settings/site.html:91
-#, fuzzy
-#| msgid "Allow invite requests:"
 msgid "Allow invite requests"
-msgstr "Permitir solicitudes de invitación:"
+msgstr "Permitir solicitudes de invitación"
 
 #: bookwyrm/templates/settings/site.html:97
 msgid "Require users to confirm email address"
@@ -2442,10 +2400,8 @@ msgid "No cover"
 msgstr "Sin portada"
 
 #: bookwyrm/templates/snippets/book_titleby.html:6
-#, fuzzy, python-format
-#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s\">%(title)s</a> by"
-msgstr "<a href=\"%(path)s\">%(title)s</a> por "
+msgstr "<a href=\"%(path)s\">%(title)s</a> por"
 
 #: bookwyrm/templates/snippets/boost_button.html:20
 #: bookwyrm/templates/snippets/boost_button.html:21
@@ -2673,8 +2629,6 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
-#, fuzzy, python-format
-#| msgid "page %(page)s"
 msgid "page %(page)s"
 msgstr "página %(pages)s"
 
@@ -2862,10 +2816,8 @@ msgstr[1] "%(shared_books)s libros en tus estantes"
 
 #: bookwyrm/templates/snippets/suggested_users.html:31
 #: bookwyrm/templates/user/user_preview.html:36
-#, fuzzy
-#| msgid "followed you"
 msgid "Follows you"
-msgstr "te siguió"
+msgstr "Te sigue"
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
@@ -3018,11 +2970,8 @@ msgstr[0] "%(mutuals_display)s seguidor que sigues"
 msgstr[1] "%(mutuals_display)s seguidores que sigues"
 
 #: bookwyrm/templates/user/user_preview.html:38
-#, fuzzy
-#| msgid "follower you follow"
-#| msgid_plural "followers you follow"
 msgid "No followers you follow"
-msgstr "seguidor que tu sigues"
+msgstr "Ningún seguidor que tu sigues"
 
 #: bookwyrm/templates/user_admin/user.html:9
 msgid "Back to users"
@@ -3047,10 +2996,8 @@ msgid "Last Active"
 msgstr "Actividad reciente"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-#, fuzzy
-#| msgid "View instance"
 msgid "Remote instance"
-msgstr "Ver instancia"
+msgstr "Instancia remota"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"

From a0d2f3897016dbeb37cf214102d2cc56f5c81ee4 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 7 Aug 2021 19:35:43 +0200
Subject: [PATCH 074/272] [french] Translate strings about email confirmation.

---
 locale/fr_FR/LC_MESSAGES/django.po | 38 +++++++++++-------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index f0a559f9..badfcdca 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -685,30 +685,24 @@ msgid "Compose status"
 msgstr "Rédiger un statut"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
-#, fuzzy
-#| msgid "Confirm"
 msgid "Confirm email"
-msgstr "Confirmer"
+msgstr "Confirmation de l’email"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:7
-#, fuzzy
-#| msgid "Email address:"
 msgid "Confirm your email address"
-msgstr "Adresse email :"
+msgstr "Veuillez confirmer votre adresse email"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:13
 msgid "A confirmation code has been sent to the email address you used to register your account."
-msgstr ""
+msgstr "Un code de confirmation a été envoyé à l’adresse email rattachée à votre compte."
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:15
 msgid "Sorry! We couldn't find that code."
-msgstr ""
+msgstr "Pardon ! Nous ne reconnaissons pas ce code."
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
-#, fuzzy
-#| msgid "Confirm password:"
 msgid "Confirmation code:"
-msgstr "Confirmez le mot de passe :"
+msgstr "Code de confirmation :"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
 #: bookwyrm/templates/discover/landing_layout.html:70
@@ -718,11 +712,11 @@ msgstr "Valider"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:32
 msgid "Can't find your code?"
-msgstr ""
+msgstr "Vous ne trouvez pas votre code ?"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:4
 msgid "Resend confirmation link"
-msgstr ""
+msgstr "Envoyer le lien de confirmation de nouveau"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
 #: bookwyrm/templates/discover/landing_layout.html:64
@@ -733,10 +727,8 @@ msgid "Email address:"
 msgstr "Adresse email :"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:17
-#, fuzzy
-#| msgid "Re-send invite"
 msgid "Resend link"
-msgstr "Envoyer l’invitation de nouveau"
+msgstr "Envoyer le lien de nouveau"
 
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
@@ -886,17 +878,15 @@ msgstr "Votre compte"
 #: bookwyrm/templates/email/confirm/text_content.html:4
 #, python-format
 msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
-msgstr ""
+msgstr "Une dernière petite étape avant de rejoindre %(site_name)s ! Veuillez confirmer votre adresse email en cliquant le lien ci‑dessous :"
 
 #: bookwyrm/templates/email/confirm/html_content.html:11
-#, fuzzy
-#| msgid "Confirm"
 msgid "Confirm Email"
-msgstr "Confirmer"
+msgstr "Confirmation de l’email"
 
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
-msgstr ""
+msgstr "Veuillez confirmer votre adresse email"
 
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
@@ -1564,7 +1554,7 @@ msgstr "Connexion"
 
 #: bookwyrm/templates/login.html:16
 msgid "Success! Email address confirmed."
-msgstr ""
+msgstr "Bravo ! L’adresse email a été confirmée."
 
 #: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
@@ -2397,11 +2387,11 @@ msgstr "Autoriser les demandes d’invitation"
 
 #: bookwyrm/templates/settings/site.html:97
 msgid "Require users to confirm email address"
-msgstr ""
+msgstr "Demander aux utilisateurs et utilisatrices de confirmer leur adresse email"
 
 #: bookwyrm/templates/settings/site.html:99
 msgid "(Recommended if registration is open)"
-msgstr ""
+msgstr "(Recommandé si les inscriptions sont ouvertes)"
 
 #: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"

From cce7d9a6484af4c203105e4c49fafe9de5ba0591 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 10:59:55 -0700
Subject: [PATCH 075/272] Don't skip updates statuses when adding to streams

Generated note books are added post-initial save
---
 bookwyrm/activitystreams.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 66dcad84..754b4b15 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -260,9 +260,6 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
             stream.remove_object_from_related_stores(instance)
         return
 
-    if not created:
-        return
-
     for stream in streams.values():
         stream.add_status(instance)
 

From 040758c833ea4670aa955f676091ae5564a396da Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 11:15:02 -0700
Subject: [PATCH 076/272] Renames "discover"

---
 .../{discover => landing}/about.html          |  2 +-
 .../discover.html => landing/landing.html}    | 14 +++++------
 .../{discover => landing}/landing_layout.html |  0
 .../{discover => landing}/large-book.html     |  0
 .../{discover => landing}/small-book.html     |  1 -
 bookwyrm/tests/views/test_landing.py          |  4 ++--
 bookwyrm/views/__init__.py                    |  3 ++-
 bookwyrm/views/discover.py                    | 23 +++++++++++++++++++
 bookwyrm/views/helpers.py                     |  4 ++--
 bookwyrm/views/landing.py                     | 14 +++++------
 10 files changed, 44 insertions(+), 21 deletions(-)
 rename bookwyrm/templates/{discover => landing}/about.html (95%)
 rename bookwyrm/templates/{discover/discover.html => landing/landing.html} (72%)
 rename bookwyrm/templates/{discover => landing}/landing_layout.html (100%)
 rename bookwyrm/templates/{discover => landing}/large-book.html (100%)
 rename bookwyrm/templates/{discover => landing}/small-book.html (99%)
 create mode 100644 bookwyrm/views/discover.py

diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/landing/about.html
similarity index 95%
rename from bookwyrm/templates/discover/about.html
rename to bookwyrm/templates/landing/about.html
index a6f3a026..dd7036c4 100644
--- a/bookwyrm/templates/discover/about.html
+++ b/bookwyrm/templates/landing/about.html
@@ -1,4 +1,4 @@
-{% extends 'discover/landing_layout.html' %}
+{% extends 'landing/landing_layout.html' %}
 {% load i18n %}
 
 {% block panel %}
diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/landing/landing.html
similarity index 72%
rename from bookwyrm/templates/discover/discover.html
rename to bookwyrm/templates/landing/landing.html
index d553c368..38180c3b 100644
--- a/bookwyrm/templates/discover/discover.html
+++ b/bookwyrm/templates/landing/landing.html
@@ -1,4 +1,4 @@
-{% extends 'discover/landing_layout.html' %}
+{% extends 'landing/landing_layout.html' %}
 {% load i18n %}
 {% block panel %}
 
@@ -10,18 +10,18 @@
     <div class="tile is-vertical">
         <div class="tile is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'discover/large-book.html' with book=books.0 %}
+                {% include 'landing/large-book.html' with book=books.0 %}
             </div>
         </div>
         <div class="tile">
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'discover/small-book.html' with book=books.1 %}
+                    {% include 'landing/small-book.html' with book=books.1 %}
                 </div>
             </div>
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'discover/small-book.html' with book=books.2 %}
+                    {% include 'landing/small-book.html' with book=books.2 %}
                 </div>
             </div>
         </div>
@@ -30,18 +30,18 @@
         <div class="tile">
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'discover/small-book.html' with book=books.3 %}
+                    {% include 'landing/small-book.html' with book=books.3 %}
                 </div>
             </div>
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'discover/small-book.html' with book=books.4 %}
+                    {% include 'landing/small-book.html' with book=books.4 %}
                 </div>
             </div>
         </div>
         <div class="tile is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'discover/large-book.html' with book=books.5 %}
+                {% include 'landing/large-book.html' with book=books.5 %}
             </div>
         </div>
     </div>
diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/landing/landing_layout.html
similarity index 100%
rename from bookwyrm/templates/discover/landing_layout.html
rename to bookwyrm/templates/landing/landing_layout.html
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/landing/large-book.html
similarity index 100%
rename from bookwyrm/templates/discover/large-book.html
rename to bookwyrm/templates/landing/large-book.html
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/landing/small-book.html
similarity index 99%
rename from bookwyrm/templates/discover/small-book.html
rename to bookwyrm/templates/landing/small-book.html
index 73133de4..3f7cbecc 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/landing/small-book.html
@@ -1,4 +1,3 @@
-
 {% load bookwyrm_tags %}
 {% load i18n %}
 
diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py
index 4d1531e4..476da74b 100644
--- a/bookwyrm/tests/views/test_landing.py
+++ b/bookwyrm/tests/views/test_landing.py
@@ -54,9 +54,9 @@ class LandingViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-    def test_discover(self):
+    def test_landing(self):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.Discover.as_view()
+        view = views.Landing.as_view()
         request = self.factory.get("")
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index eccb7f5e..15b55acc 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -7,6 +7,7 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
+from .discover import Discover
 from .edit_user import EditUser, DeleteUser
 from .federation import Federation, FederatedServer
 from .federation import AddFederatedServer, ImportServerBlocklist
@@ -22,7 +23,7 @@ from .interaction import Favorite, Unfavorite, Boost, Unboost
 from .invite import ManageInvites, Invite, InviteRequest
 from .invite import ManageInviteRequests, ignore_invite_request
 from .isbn import Isbn
-from .landing import About, Home, Discover
+from .landing import About, Home, Landing
 from .list import Lists, List, Curate, UserLists
 from .notifications import Notifications
 from .outbox import Outbox
diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py
new file mode 100644
index 00000000..9bef6974
--- /dev/null
+++ b/bookwyrm/views/discover.py
@@ -0,0 +1,23 @@
+""" What's up locally """
+from django.contrib.auth.decorators import login_required
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import forms
+from . import helpers
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+class Discover(View):
+    """preview of recently reviewed books"""
+
+    def get(self, request):
+        """tiled book activity page"""
+        data = {
+            "register_form": forms.RegisterForm(),
+            "request_form": forms.InviteRequestForm(),
+            "books": helpers.get_landing_books(),
+        }
+        return TemplateResponse(request, "landing/landing.html", data)
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 42aa48f0..f757cec9 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -162,8 +162,8 @@ def is_blocked(viewer, user):
     return False
 
 
-def get_discover_books():
-    """list of books for the discover page"""
+def get_landing_books():
+    """list of books for the landing page"""
     return list(
         set(
             models.Edition.objects.filter(
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 1361935e..6f480b70 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -13,22 +13,22 @@ class About(View):
 
     def get(self, request):
         """more information about the instance"""
-        return TemplateResponse(request, "discover/about.html")
+        return TemplateResponse(request, "landing/about.html")
 
 
 class Home(View):
-    """discover page or home feed depending on auth"""
+    """landing page or home feed depending on auth"""
 
     def get(self, request):
         """this is the same as the feed on the home tab"""
         if request.user.is_authenticated:
             feed_view = Feed.as_view()
             return feed_view(request, "home")
-        discover_view = Discover.as_view()
-        return discover_view(request)
+        landing_view = Landing.as_view()
+        return landing_view(request)
 
 
-class Discover(View):
+class Landing(View):
     """preview of recently reviewed books"""
 
     def get(self, request):
@@ -36,6 +36,6 @@ class Discover(View):
         data = {
             "register_form": forms.RegisterForm(),
             "request_form": forms.InviteRequestForm(),
-            "books": helpers.get_discover_books(),
+            "books": helpers.get_landing_books(),
         }
-        return TemplateResponse(request, "discover/discover.html", data)
+        return TemplateResponse(request, "landing/landing.html", data)

From b5153f3df12a96010fc35c852a47a0a6f0956876 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 12:33:45 -0700
Subject: [PATCH 077/272] WIP

---
 bookwyrm/templates/discover/discover.html   | 54 +++++++++++++++++++++
 bookwyrm/templates/discover/large-book.html | 38 +++++++++++++++
 bookwyrm/templates/discover/small-book.html | 41 ++++++++++++++++
 bookwyrm/templates/landing/large-book.html  |  2 +-
 bookwyrm/templates/landing/small-book.html  |  2 +-
 bookwyrm/views/discover.py                  | 25 +++++++---
 6 files changed, 154 insertions(+), 8 deletions(-)
 create mode 100644 bookwyrm/templates/discover/discover.html
 create mode 100644 bookwyrm/templates/discover/large-book.html
 create mode 100644 bookwyrm/templates/discover/small-book.html

diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/discover/discover.html
new file mode 100644
index 00000000..0a419e51
--- /dev/null
+++ b/bookwyrm/templates/discover/discover.html
@@ -0,0 +1,54 @@
+{% extends "layout.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Discover" %}{% endblock %}
+
+{% block content %}
+
+<header class="block">
+    <h1 class="title has-text-centered">{% trans "Discover" %}</h1>
+</header>
+
+<section class="tile is-ancestor">
+    <div class="tile is-vertical">
+        <div class="tile is-parent">
+            <div class="tile is-child box has-background-white-ter">
+                {% include 'discover/large-book.html' with status=large.0 %}
+            </div>
+        </div>
+        <div class="tile">
+            <div class="tile is-parent is-6">
+                <div class="tile is-child box has-background-white-ter">
+                    {% include 'discover/small-book.html' with status=small.0 %}
+                </div>
+            </div>
+            <div class="tile is-parent is-6">
+                <div class="tile is-child box has-background-white-ter">
+                    {% include 'discover/small-book.html' with status=small.1 %}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="tile is-vertical">
+        <div class="tile">
+            <div class="tile is-parent is-6">
+                <div class="tile is-child box has-background-white-ter">
+                    {% include 'discover/small-book.html' with status=small.2 %}
+                </div>
+            </div>
+            <div class="tile is-parent is-6">
+                <div class="tile is-child box has-background-white-ter">
+                    {% include 'discover/small-book.html' with status=small.3 %}
+                </div>
+            </div>
+        </div>
+        <div class="tile is-parent">
+            <div class="tile is-child box has-background-white-ter">
+                {% include 'discover/large-book.html' with status=large.1 %}
+            </div>
+        </div>
+    </div>
+</section>
+
+
+{% endblock %}
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
new file mode 100644
index 00000000..b273d431
--- /dev/null
+++ b/bookwyrm/templates/discover/large-book.html
@@ -0,0 +1,38 @@
+{% load bookwyrm_tags %}
+{% load markdown %}
+{% load i18n %}
+
+{% if book %}
+    {% with book=book %}
+        <div class="columns is-gapless">
+            <div class="column is-5-tablet is-cover">
+                <a
+                    class="align to-b to-l"
+                    href="{{ book.local_path }}"
+                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' %}</a>
+
+                {% include 'snippets/stars.html' with rating=book|rating:request.user %}
+            </div>
+
+
+            <div class="column mt-3-mobile ml-3-tablet">
+                <h3 class="title is-5">
+                    <a href="{{ book.local_path }}">{{ book.title }}</a>
+                </h3>
+
+                {% if book.authors %}
+                    <p class="subtitle is-5">
+                        {% trans "by" %}
+                        {% include 'snippets/authors.html' with limit=3 %}
+                    </p>
+                {% endif %}
+
+                {% if book|book_description %}
+                    <blockquote class="content">
+                        {{ book|book_description|to_markdown|safe|truncatewords_html:50 }}
+                    </blockquote>
+                {% endif %}
+            </div>
+        </div>
+    {% endwith %}
+{% endif %}
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
new file mode 100644
index 00000000..052a540c
--- /dev/null
+++ b/bookwyrm/templates/discover/small-book.html
@@ -0,0 +1,41 @@
+{% load bookwyrm_tags %}
+{% load utilities %}
+{% load i18n %}
+
+{% if status %}
+    {% with book=status.book %}
+        <a href="{{ book.local_path }}">
+            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-h-l-tablet is-w-auto align to-b to-l' %}
+        </a>
+
+        {% include 'snippets/stars.html' with rating=book|rating:request.user %}
+
+        <h3 class="title is-6">
+            <a href="{{ book.local_path }}">{{ book.title }}</a>
+        </h3>
+
+        {% if book.authors %}
+            <p class="subtitle is-6">
+                {% trans "by" %}
+                {% include 'snippets/authors.html' with limit=3 %}
+            </p>
+        {% endif %}
+
+        <div class="media">
+            <figure class="media-left" aria-hidden="true">
+                <a class="image is-48x48" href="{{ status.user.local_path }}">
+                    {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
+                </a>
+            </figure>
+
+            <div class="media-content">
+                <h3 class="has-text-weight-bold">
+                    <a href="{{ status.user.local_path }}">
+                        <span>{{ status.user.display_name }}</span>
+                    </a>
+                </h3>
+            </div>
+        </div>
+
+    {% endwith %}
+{% endif %}
diff --git a/bookwyrm/templates/landing/large-book.html b/bookwyrm/templates/landing/large-book.html
index 93026991..b273d431 100644
--- a/bookwyrm/templates/landing/large-book.html
+++ b/bookwyrm/templates/landing/large-book.html
@@ -23,7 +23,7 @@
                 {% if book.authors %}
                     <p class="subtitle is-5">
                         {% trans "by" %}
-                        {% include 'snippets/authors.html' %}
+                        {% include 'snippets/authors.html' with limit=3 %}
                     </p>
                 {% endif %}
 
diff --git a/bookwyrm/templates/landing/small-book.html b/bookwyrm/templates/landing/small-book.html
index 3f7cbecc..2ca505d9 100644
--- a/bookwyrm/templates/landing/small-book.html
+++ b/bookwyrm/templates/landing/small-book.html
@@ -16,7 +16,7 @@
         {% if book.authors %}
             <p class="subtitle is-6">
                 {% trans "by" %}
-                {% include 'snippets/authors.html' %}
+                {% include 'snippets/authors.html' with limit=3 %}
             </p>
         {% endif %}
     {% endwith %}
diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py
index 9bef6974..685a4ded 100644
--- a/bookwyrm/views/discover.py
+++ b/bookwyrm/views/discover.py
@@ -1,11 +1,14 @@
 """ What's up locally """
 from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator
+from django.db.models import Q
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms
-from . import helpers
+from bookwyrm import models
+from bookwyrm.settings import PAGE_LENGTH
+from .helpers import privacy_filter
 
 
 # pylint: disable= no-self-use
@@ -15,9 +18,19 @@ class Discover(View):
 
     def get(self, request):
         """tiled book activity page"""
+        activities = privacy_filter(
+            request.user,
+            models.Status.objects.select_subclasses().filter(
+                Q(comment__isnull=False)
+                | Q(review__isnull=False)
+                | Q(quotation__isnull=False),
+                user__local=True
+            ),
+            #privacy_levels=["public"]
+        )
+        #paginated = Paginator(activities, PAGE_LENGTH)
         data = {
-            "register_form": forms.RegisterForm(),
-            "request_form": forms.InviteRequestForm(),
-            "books": helpers.get_landing_books(),
+            "large": activities.filter(~Q(review__isnull=True, review__content=None))[:2],
+            "small": activities.filter(~Q(content=None))[:4],
         }
-        return TemplateResponse(request, "landing/landing.html", data)
+        return TemplateResponse(request, "discover/discover.html", data)

From 06c5ae06a6aec5422d830a43dd85db0e1734ec52 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 7 Aug 2021 21:47:30 +0200
Subject: [PATCH 078/272] [french] Compile French locale.

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 45471 -> 46960 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index f8ade2a391ba574da54afa6f45e1bf1ad55f9372..98bc29095737fda2d84bcd909167dd90097fb8e7 100644
GIT binary patch
delta 14975
zcma*t34Bf0qQ~)_NQfbZn1kd5ksyhAo{4#iDaNWJIXFZT$q8cU(Na@U1T9r`P_(Fu
z(pIl3x78|b(YZQB^=jR!_EiTpyx;$<l~(WjywB(E&t1N2p7&0;-FhMT>Xl&s=Mf?6
z9i9cjj#C?JS8<#XB`{vOj+5QWadL46-j5ftJWgxvIE`=)R>kdD1`lH`d>yM{5q8Dj
zF$LSVah#_309J4uzw<JY>SUZk7k-TcFtn}7ABuHIPsQQ56dT}YHb11D<1lBZF4o01
z7=vR_6Pt%MaV@sQ-Kg=t!dS+4ekanLjOg}`lZ8XA$1sz0^A3(P3?IWecnwEmc1N?a
zlc<%J?c_LYj#C$1I0_qLK5D{GU?`r%%J{BieCKN-CGj^5!`m2+VVxbP6jno(N7;0&
zO()uPOH{j#$jLc9u^jfb`Kef%^xepoJ6@a4N52Xd5>bPdsI%RKWpNia!{<>G_!m~h
zE2x#+Mzss=V%kNZCK7|1NF!ALNvMI_qU!fS^*f>q`>(BELWa)jC5*s#ZN&?yow$mc
z*ez7Y;a$xcS3<RKfvPtNwPQZi!1GWOUySN^CF*W$!y0(3tKT&ElngbzfFXDpHKD7h
z8JFy48dOHDBmp&GM^ycOs2v-O+L^Ja{@kc~Uep3+q3SP2?c@V~B6@8$qb}7BRK=j~
zj<XsoqB?vGE2-S3Uqnsp6`MYVn($fFiZ7ui`U7eLw^8-Odzk(rQT6;TBB~gNno%3n
z%=@6uG6l7jqfrw}v*kIc3C%$bu)?~@=I_Kv@?S!2{rlJuFWGcNa$p?46H7!ZOhnD7
z1?u%^kLq|3YHP=#RxkxMaGuRyV)F}7?Y1Fru5$pB@CS^>sGeqFol)(3VHv&uqll>E
zv_J;$HEQ6wHoXkB@^#iHP!rmZs&@o6@l&Xd&!Ij@7g7CQN7XCU%Y1mMqAp(|)?$38
z7ZKfoiKqtCQAaQbL-9V;5iLbNdd|bBBROOJ6jlEss^0gg0dHE%_BQ!7F@*evsJoJc
ze$6<Uh*p$}n!rTV09n?2>q1+;5;fsXHoYA+@P3<r40ZOWQ4_v|T1ZSEvy*YCyVkl7
z`>#vZn+y$@f~9bbb)t1D>IiaBTYIm~-+=0P3x?s7sDAdK?!qDKTd0+Pfw~J{qZS&{
zm;EnEq*7n=&8~qOs2zr3AJj~Tptfuxs{U-$iv6e^e9)#J!_uUmL-ljmrcc`Rd#HXc
zpceYOI#7o}{mg)2sF_zn<;P+fOhBD!8&t<Vu?`N$(wKu<(LB^jm!ayfLM>#obvtUu
z_9C0$_zw`#KsQl87DM`*bZu)r)DAR44bTDAaUaymQ?V>gv1uP_XBJ~k+<=<EKI@CN
z{1~zme&;L^b$AK2vR_aghYm1XRUI{fL{z=bs1*-D)lWqY=s|619>(B&jKi&{J97fH
zGv`tLe1&0p|9>E&4t~S27&g!hkd9?YXJT2*N7cI@2jO}QTqe{+Ldev_E29RAMYU^$
zdJ9_H{47+zJ}l4pj-N<4u0oy7X4D;c95wTUSQp<yb$A7JWY;kYg9e+GyHM@pQT38+
zx;?6&uE;M}&Il}rD>3l?Zz58QjNMos-$0$&ht@Bx-=e<dKcPAdO)<YSMxr`wV@*aK
z(Gb*x#-bMJM(s=%YNvcD?7uo(Ooj&Dh+5H3OvDqYiCjZ9xP|Jt;t-RLv?icd+!<Zi
z4>iGQ*a#P(7WfRR{}ZTwz8S*)tKwBMba_IDni+?qwzx8C=8>os#-r-BLUqsyHNoCE
z6;m(?52IH89csl_QQ!P)SOLoqGnYEbPedIwK@Hdz)o~Zpz<se2j>O97Mb(>+dc78*
zI^KdB=n!h6FI(Tl=A=JBEwuD-vw$enxc&x2wDnC;GwY18I0&^;pLHIp!6MXzR-z`l
z6*Zw<7=in+J|0JH`6X1pAtTJKuY%f{XrvuK|B0yM1k?&z;aY5ODmbT66L}9c(etQ!
zmr*OdirT50HeEK=)T@CSI1U4s6SZT>sQTjr<(z*85v^ceAcNnAu?pz|)J%8U^1WD(
z^z*j-V{AhD3Tj89Mw*E>MJ=c;>Zf2gY>4BqDlSIt+-7W`_x~v(I>XbbTl@`br9WAN
zMwu^KMbu6-M-9*(Rlf&n0fTWBreXqKMAeVr7fTt5+PS(|8RO8eh8>7#!0xEmV+d+R
z*;o_rv+2#Kt=x+m_%P~Ab^_JmS)2b2YM`G`cj;GD|8>Tgi6o%<X*q`TFF~Xm8Pl;R
zYGsAimr*l+4J+blRKw3vTX@-e4K>hhYb@V!wd;?%l*3SGJ_$7uA8MS1W7&Uow1SK{
z+<=Yo2<nsj9jc@7ai(5X)I_3DJJb|a-W}C(Kh&igjnU{u?a(sRj;%vYWE-m8UOy2v
zIEXrm*ReXDwiPa-X8OG?{{=PSn>N4HUG{FEE?0AFAJhQjF|cw}J0EJidr&*+UqwU%
zJc1mP^CYUlE!2w2jW-o*VKvh6sFid<wd;@i#16+q^kYBVWBm=2NcXs#R}XVg3p|9p
zWq#)!B08h5u{QpS{AI<dGQqrtBT-wJfqEThp>}FMYK4nXmu&@VLTjv>P%C}{Rc{Y!
z<<Fxo>uVVJ`TsEyRV)f*IL^OO6|bSTDAa8_jzD!(3$;V_P!nrr(;ZRu`&mb#`b|eo
zEYqfEp%!v4mh=-@LL?4Xp(-A<zJj`BZ=jCi6Vw@hi<-b~TOK~q>|iwN!_^$M!rrL%
zV^RH1#|AhPHPJ`WuN6H_q$ci14R8uIKoM#MS5Z519r+3Dlu0xH(lHhXkY0lvv-3GN
z$4=?y_GjZ9(yLK#RauYux1Tnsai(}Ue|3Bh8L_wuHNXMXB?_HnR+54Vq|;F|UxV8E
zE!JI_L;3*n#yWA6P5DC9LRO(J?Pk=#J5l`{nauu|B=Qy+jqogn;!P}tC8jveKrD-c
zaI{VDM6L7}4913D(_sQ?0qv~IaWLsmu_ZR1YK~$8Y64zAk$56AZNXO5On2gNJYX$7
z&HN+Ocx+4levH7&s1@Eq7naK~3rNH;(k)O6>1gwlQ48*8)BYhuRB<Ho^>ilK^kG!R
zf1>WjTQ~tPqB`s~-LxBo{ex(a_mclaCVxT2*evtCID$!}-$%XoA=&0=YGW<E|8YcW
zP|yRl#p6(y=^1Q>WoDSm*AXL055NXE8MQ;JQ0*_E?$8Y!igmdVbubU>Vgc#{b`Trm
zX-r~#=XWB^#EH)}zqur%w%CiB`Qz9G&tMA-^6~dSY=!*K*=wzr$1ae57?<Kz9EJHa
z&0BI7b@`%a@oOEn!WMe}{X}#J3Q;pVk2;btM$w8Zp(dDs%I|~aa0sfy@u;KnS?8jT
z=swhCUXEpOHI~LlZ25Nd*CS&Ok&1W*Bd`do<29QO&o^7=!YbsqL4B$RU}f}TOPr5o
zaX)I}M^F>^7^CqEERVOb0+ye{{%ht@b4*4oYT#B_2?t^uyc=8NL#Q);8zb>&)JiMN
zH9J!s)y`$p&9Ncr4%iDls2$sl+KFRx*?-OC6d9V?dDH-xQ4K52Gdt4(wbB8ot(<_G
z_%w834r=ELFbbbSE#x(u{~2ncS5XuA&8Exy=bM6Rs3V9%RcM0Rx}G-OA2mTY>g~uz
z)qe*c#xGG5%D=}<bOGwFtV2!gQPg*0AL?y5f|`*3D<Ycdx2P2cu_M~Ts;Ca*P!*F<
z1GYxpf!?UI9*5e&DK<SDHQ*xD7C(dy@G-23Z&-`4j^6(pwnF3r^B#9Yo%tB7k84pA
zIE32zS5Ol>iJI^k)Q(+5P4ExY1k3R?QaZ-k9F^Y#)ov7a)cc=7MDO=5Y=Ix6W*&Z@
z*@^0?9cqZxup8<qMxj<Z*{0{923Tg(TTlb-vFTS){l1I3W1nE)-~XJ2W`NqL1}!lP
z`(Rz1jJ0t&YQP<+Eq@7h#wSrnaSpZOFR&e6MGe?!ktuJ9+R3h{BkqHKH5fxgmtz{L
z<9t-d%P<DlqE>bQHL*8QXL<?MQHA@BG1eBSiS|V8*eILMLM`Mzo4@sb_P-Vx2g&G$
zXE7A3EH)iRqRut}wZiVG2@XQ7WIXClOhO&W46K0*Fcvr3@>ei~^hs1d@1S<()5V;B
z;PQ~6nf`&AdBhU)n@TLI!&KCcWMLzmjXJ6)Z2lqC4jo19*!!q~ens7#5=+g3YN7g1
zM3r~-6VU(zP%H4D8u)Df3e*a>qh`DhwL>qV20DtRun2V&-yyG+a|1O{<TCSVPDCB`
zMAXD{QSJOoh-l>xqGt4zbw7rYK7v#51gb&P<z~m)VoB12Q1wQj1|E+ZU>@pyUv2ZB
zMosVy)TjFslkaz~5z$#ye!z6p4mD7B)WrIs?uZ+8dFG>bXp_y~kI|&xM(yMk)C5Yc
zFh3=0p$3dcwd;XpaV#e5{hv&v85z4#9es|a@fK<e!&aIOYN1xx8Ykj#EQ5zo9Uems
z{5I+>DZ(Kbw90(QhM|sNHtNnT!@&Rlx0Q%GF2qiF26bC2JZQG83Tg)$ptia@YU}%>
zRx}jjaVjQY0hY(3SPtL8)_5K(VCB_jf%P!({wESq$DL6V>5XI1gW7?kHvb$pBK;$3
z1+~|h9czwiKNQ1pEUKOtwe{;zNBk^S#P?A<_01agUjtkxLuVeo)|_EgREJ46-3HY`
z3aa5u)Jm6QTReo7@Tx5jE-*(@4YhN1Q4{Hm+L_U)9h*{M-~Tmav?pT+>a{AuL=0JH
zI%<x(jGb+I1nQ2sQ7fKi%}1?p32H$PTeqR^$WG*1IR`KqyZP6fl`cj#cn}-oL#UY_
z$13;*YQUeZw@?FxZ7{!p)WoW!+oL9$g8EKO#s)YY)!#bQIQvjL;(vjNR(uXy;WgBI
z+xQ_<u_x*h4Me?OV^FVQE^3EXqb}nS>uac$o<d!=kF1w$`ERI+-^O~3?^Jx)%%mk&
zr(iH@z{#jP;IrxZHoY9RvI6AO;cP^`E%i5=9cqYLPzwyk5vU^?g}Nh?P!pSt)%5-^
zC88N^Ma_I4w!xP%u;r+Rw@_PGag(WE11pnmh^p5KHR0Z<BTT^>I1iiRdQ?BJqZarP
zR%CqVA`$(Z{{@?2%}2~m^hZ@p!+w~JdaVv)Bz}Y1v7pVyn%IJLGt`7Us0n3Z0?xMS
z?YN!vUi7ykGW=09&?;2JM^HPl9c$rpsE$sf2K)fEqAREsMQ<@*yk;0dIt5if4OO0D
z^Y6i$q}O0Id}a&#uYrz{p)GqGwX*A22CHs0x7vl8SZmC~uBanBh-!ZV^<JODXe>g#
zHNo4=kyS@cC>n=gJZii-+x+G-JVk~EIEXsaqt^FO4KJaN;z!h0-a@@CjUO{_fg9ES
zLDWPxqE@;SYvVCgKVP7B=n`rN{_qpgOd=jP4LhSM3`DJ90;=OY)cfs6y>9DKN3$8V
zQ!m*3<ETq|6178TQSC2a6Z{^vz&cNu{{78}s6sEBkz&&xo6bVLK8sL0uolPRR;-IR
zus%jVX*y0uO>7iu0Y20Om!WoU9VX+e*i-L+Nv`5hG6tY-?^Ya$=TLVc<|*@2u_J20
zIT(YF;#hnI^_tb%VQh(^qz9rFHVjMQT^NEM)P$yD1min-MD#&eirSiot-DbJ9YvjK
z5$dx2i0a@bMq$`abH;I~ev(l;HXOBpiKzDTQT?yLlDG{c7~k1pE4+ki_$KPL`4CIt
zw-^{0wS_lP12x)ZR@fd@KN+><si-5EX7iVz?$k!q1a_nD(oyuQ!3RV%!^^0Fu45N0
z`Lr3R7nUZSiqSX$)ouZ*<Mp<DCu#xvu`eFQVOZuFR*&N`AJ3z{u&KM*|3o6IcJo=p
zmr?13d(3Tp4qc?b!gvhcYwkj0%pmQ>f%pOHb*lfY`Aw$-mLr{mWzcV3j{LZA*5kdH
zw2%E)g?;<X>v9;wNuNTU-6uAE4RvNEo-_aMR|b{tgleCRBXKZl#XGEjU~A>?H~-<%
zV$=>VM-OiB6LAx{VI5y+UXP;~Mt<l4v-RaMiF6HAes8RdDX8}8sMqp!YrW_BN|IiH
zs`n~tVeexcUO>Gi{;~(nR#ifE9A(pSsLR*V+7UJLWE_tvsMqdURJ%8@A)die_y_9F
z3_oNp=XeYv-H5P;h>rUoL7e|0<??X!&i90KO7QF^U+?!_!GWZ6H?$#s)+7UePUO%3
zq24sY7sRvi9_mEkGJ+m`hQn<i+ic$JIEMUZ_5SNALxu0i+-xh{GTF`xq&wNh9A)6Y
z57agewe?mK|B6tDI;rH%AUt5pv@7=#z9HzDV*8nB%avErZ!=Gj$&ouhVKrOfSNxj1
zW;VT8EqIoYz7MBhJfRh#CjC4@-gCsO5&t*#wtXKYeu1FJgG=##d<^|1Y^73UG$Evu
znMR&Im3rooHvtEe_agG91)e->3)F?0X8WmceVleNgh`Yo5MChY`H0YpFr6|Uf8gJI
z6`M(zP2&|5TqV9onLO>u%Oo#}FoyU?=*90S<41(^3hCOUw-FEg!UtE#3nov`tHg^R
zU0^+3D4R=ug<yOB`a0=(+u-!3&`rD~mLt4Ed@HUZ=$T+USNs?K!E+B~<?-Kv6hGFf
zGlX!2{BH=e$k)${<HYr5c_=$$#}72=5%`n8fKuUmf}XFj8*U7w_<E6!CEk*7ns`e(
zIfmf`J@;ZJk{$TP<6-=npyvZa;Lp!&+^?_KY8s6sd}}l7+0F)FD4{MvpVQ_x|79G>
z2ztNQ5bh@4iM;j1U&LDkH(?K<h|r7jMAY*Dp*bOyP%@bFpG)Bi5|vTUSbUAjFPmiG
z&sg%h5YvYz$>z_r9o{DWBcU#J%G*9(vSm->DawY~w3<Fhe7H@o)W3EPrxCx%27bT{
zq@b#5@wC08QM~QA68U^#oi>#9CGVmt@>C|BPx>9=Rf$IvuVLF{*?#mH*3;dl6+i4J
zagOj6VJ)GnZKT5Kgb2bU^6w)QKf8!bC7p{0ZDtkHO>Nu##77Z-13x3^$snCc_y_Sm
zxX<Rt3?w6q3_WuQO(~d9dMEKjY+EoSuCjkSxt|a&soEV+MdFW=|2yFfp(8DhlQ)gP
zFNV%bgyn>ugakVZQKud8kFhLm?tG4t7))4gGq+--eo7QS9f<Iw(n+O*dUtd<)W+-B
zif3)dEy%xK+!!m^coO;5sq-(=Gl(y=`CZAIO1urBlI`<t-4Z=BZAN$N4^&=CXkdz+
z0;?EHelFoHLh*Bv_+=7hFqZHEVH2SvLC+?_CE_&*9}-TJ9*@}?|1Cm&5~T^x5UvyE
zFp-}4K4n|*Aq+-6CGc705o%E{#O5!e?0w=-5Ta~eE6U#^e-J*24e%c9haY0%4rNk#
z5*d0vwGBPQOWQo<M-uKT2#T-n&n9;rwdxS=QjvX<Nw=nKA>Jf!FY1XS?*wikTu_F6
z^o#6t%Bm3btTQ-0Y`Pxl=Lwq$y=-6CbYsd<p&}X0DCkPaAxt3Mkg$aK5kf8EPobW^
z#G~<k!as>Wh}{Xp3G+zz!5plDKVtE7g-8aWD&v*JcLN2S*hVVlE5lZvOgxVG{5u-w
z(kO?pAkgTqKZa1}4U&n3hLjgS?T9oX-5Y07=W}dEx*ze5#OK+%3Hq+oC1V&t&r_r)
zQrMdK2;%y^;|B4*D&(m^UL(SC!d1e0!Yt}6Ko?;!p(p9;rn-|(dM9CqO?M&QkoYr%
z7=nK)mG#u5AjZani2p&J55FahA(SAUNBMcoCtdu^Ch`mE(Rhf^o_JI2VCyue%{W37
z;UxL3$&V)VCq7<3SM&^{up41jAZ7me2_7fpQMr%ptQYAY2ocnsi$e&V2?I&rO`S$K
zlC+);q~Ejcp2Rn8TxDLu4$}Sg#TY>13lc6Grw|4azilgrQr4EB=QqMG@`vId_zvN+
ztv8Om4zz8Lkr+x?OFWI>r;ZCN*}9Kl0pVBj4yo|4DiNv?{`2WiNBzhwg?gG0y3yuS
zyn)3}x-EZ`j17bqw(LAkwq>eYo%lZV+Va5uKTSp_!fOOQlkezQ>6WBN;qQbIbdW;&
zpTuk9&x91>%LsasDIaYI45RFMLK<N-q4)`-d=%*e#Xm7VCNZ1PgK(5^lJGy&o<bN$
z{5L{l;`0bMi6`SRLJ%E|z)uKzUL`E1{7XEA_3=w|2sJ>DkMNlCc&-I*0+D}_QD`$4
z*x5HG?IvDCd0Cs++1AOhb|&9v%hcfj8xO&D)G4oeE_ZsmC%vFqMytYgEeD3wk00tu
z%bGsjlS!`2JIR&fne5H=<+y#`tW1|T*Ois+$t-v^JHD_~yTstsw5-fY-kj;CG%YLL
z<C@~mbxrhmGF`czOrOh_<?>DOxIEL{-VBYD<H^l+<!9x&@^a~(Qq#RBN0~V;cUoFj
zUZ$_GX@~HV5ph1(ByVQADN)~D3fgtsGqk7ra(bA7P0xR(vfa74v$As1+y9vp==N{J
z7Z?3C=fW%9GRjx;xH8<iK3A^Klg$DqW#xD@a>1I3RXV#;GCb~FkISys%;;~Ox+dnk
z(lWeh)4Z9J11rw(W=^A<jI3Gh3r42ARpbBbpwKm>Y)Ic3d0vKNPjYg#DaGUbZ3t(m
zhb>JnE;Q5EFvSIm7sijcQ6efQKgKmu)6L6B&n(_X-xRlxtaMLd^yqRykuk2oM*evy
zc1%xtQenL@+p1Nt_rRT*etefJ*IRIPUG=c6yqTUHpC`BQ)$IAf6#~c2iQAS1w{vSI
zWE3sf=nkB6@u72beD1U<$9H*L$G5p=X8Bks7cAT7DQuT}rBvP2th`)TrpM*WQSWnH
z9O0j}(mh2Bp6yc5VD1kIX1R=}5d!=2_jA0nq#%4=bca+=o;M?d4vQC-W4ry^^yq|^
ze=Q;~Okv!-yQ|b6!KBhXIho$$JDGB}$LIC2gk3&&w#Vh3>E?2$dkW_6tUbW>-woyB
zo#2Yh$Wzk{7UETgw`jqdbY2Q}fwi_Tynl6KP=o)j!@}p*d=}zQW;1wKd3W+=yYhVA
z3~#R6=gH$Dd3=ASbG&Ju+&h*@^$hB8_<AAjQ8_&`XJ+LGip=ExV_VcdQ-|cv`>Sdt
zyO6)i3RiA$hbE@DbJDXiSyGH^kUilXJ}jA;ZZC_?%nh7#nyx~+C#mrJM<xU%<+x{N
b1sV+aKbOd@jprWPv*a=*750C0c$NPJKYma?

delta 13595
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
Wyz)FY_Ai{bY+FB%yh=M#{QnP}G=i!C


From e3cbf306847b55cdc04875b335f11271f6857143 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 14:38:19 -0700
Subject: [PATCH 079/272] Local discovery view

---
 bookwyrm/templates/discover/discover.html     | 87 +++++++++++++------
 bookwyrm/templates/discover/large-book.html   | 66 ++++++++++----
 bookwyrm/templates/discover/small-book.html   | 43 +++++----
 .../templates/snippets/follow_button.html     | 20 ++++-
 bookwyrm/views/discover.py                    | 18 ++--
 5 files changed, 166 insertions(+), 68 deletions(-)

diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/discover/discover.html
index 0a419e51..01ef2186 100644
--- a/bookwyrm/templates/discover/discover.html
+++ b/bookwyrm/templates/discover/discover.html
@@ -5,50 +5,85 @@
 
 {% block content %}
 
-<header class="block">
-    <h1 class="title has-text-centered">{% trans "Discover" %}</h1>
-</header>
+<section class="block">
+    <header class="block content has-text-centered">
+        <h1 class="title">{% trans "Discover" %}</h1>
+        <p class="subtitle">
+            {% blocktrans trimmed with site_name=site.name %}
+            See what's new in the local {{ site_name }} community
+            {% endblocktrans %}
+        </p>
+    </header>
 
-<section class="tile is-ancestor">
-    <div class="tile is-vertical">
-        <div class="tile is-parent">
+    <div class="tile is-ancestor">
+        <div class="tile is-6 is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'discover/large-book.html' with status=large.0 %}
+                {% include 'discover/large-book.html' with status=large_activities.0 %}
             </div>
         </div>
-        <div class="tile">
-            <div class="tile is-parent is-6">
+        <div class="tile is-6 is-parent">
+            <div class="tile is-child box has-background-white-ter">
+                {% include 'discover/large-book.html' with status=large_activities.1 %}
+            </div>
+        </div>
+    </div>
+
+    <div class="tile is-ancestor">
+        <div class="tile is-vertical is-6">
+            <div class="tile is-parent">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'discover/small-book.html' with status=small.0 %}
+                    {% include 'discover/large-book.html' with status=large_activities.2 %}
                 </div>
             </div>
-            <div class="tile is-parent is-6">
+            <div class="tile">
+                <div class="tile is-parent is-6">
+                    <div class="tile is-child box has-background-white-ter">
+                        {% include 'discover/small-book.html' with status=small_activities.0 %}
+                    </div>
+                </div>
+                <div class="tile is-parent is-6">
+                    <div class="tile is-child box has-background-white-ter">
+                        {% include 'discover/small-book.html' with status=small_activities.1 %}
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="tile is-vertical is-6">
+            <div class="tile">
+                <div class="tile is-parent is-6">
+                    <div class="tile is-child box has-background-white-ter">
+                        {% include 'discover/small-book.html' with status=small_activities.2 %}
+                    </div>
+                </div>
+                <div class="tile is-parent is-6">
+                    <div class="tile is-child box has-background-white-ter">
+                        {% include 'discover/small-book.html' with status=small_activities.3 %}
+                    </div>
+                </div>
+            </div>
+            <div class="tile is-parent">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'discover/small-book.html' with status=small.1 %}
+                    {% include 'discover/large-book.html' with status=large_activities.3 %}
                 </div>
             </div>
         </div>
     </div>
-    <div class="tile is-vertical">
-        <div class="tile">
-            <div class="tile is-parent is-6">
-                <div class="tile is-child box has-background-white-ter">
-                    {% include 'discover/small-book.html' with status=small.2 %}
-                </div>
-            </div>
-            <div class="tile is-parent is-6">
-                <div class="tile is-child box has-background-white-ter">
-                    {% include 'discover/small-book.html' with status=small.3 %}
-                </div>
+
+    <div class="tile is-ancestor">
+        <div class="tile is-6 is-parent">
+            <div class="tile is-child box has-background-white-ter">
+                {% include 'discover/large-book.html' with status=large_activities.4 %}
             </div>
         </div>
-        <div class="tile is-parent">
+        <div class="tile is-6 is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'discover/large-book.html' with status=large.1 %}
+                {% include 'discover/large-book.html' with status=large_activities.5 %}
             </div>
         </div>
     </div>
 </section>
 
-
+<div class="block">
+    {% include 'snippets/pagination.html' with page=large_activities %}
+</div>
 {% endblock %}
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index b273d431..81620be1 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -1,37 +1,67 @@
 {% load bookwyrm_tags %}
-{% load markdown %}
 {% load i18n %}
 
-{% if book %}
-    {% with book=book %}
+{% if status %}
+    {% with book=status.book %}
         <div class="columns is-gapless">
-            <div class="column is-5-tablet is-cover">
+            <div class="column is-6-tablet is-cover">
                 <a
                     class="align to-b to-l"
                     href="{{ book.local_path }}"
                 >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' %}</a>
 
                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
-            </div>
-
-
-            <div class="column mt-3-mobile ml-3-tablet">
-                <h3 class="title is-5">
+                <h3 class="title is-6">
                     <a href="{{ book.local_path }}">{{ book.title }}</a>
                 </h3>
 
                 {% if book.authors %}
-                    <p class="subtitle is-5">
-                        {% trans "by" %}
-                        {% include 'snippets/authors.html' with limit=3 %}
-                    </p>
+                <p class="subtitle is-6 mb-2">
+                    {% trans "by" %}
+                    {% include 'snippets/authors.html' with limit=3 %}
+                </p>
                 {% endif %}
 
-                {% if book|book_description %}
-                    <blockquote class="content">
-                        {{ book|book_description|to_markdown|safe|truncatewords_html:50 }}
-                    </blockquote>
-                {% endif %}
+                {% include 'snippets/shelve_button/shelve_button.html' %}
+            </div>
+
+            <div class="column mt-3-mobile ml-3-tablet">
+                <div class="media block mb-2">
+                    <figure class="media-left" aria-hidden="true">
+                        <a class="image is-48x48" href="{{ status.user.local_path }}">
+                            {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
+                        </a>
+                    </figure>
+                    <div class="media-content">
+                        <h3 class="title is-6">
+                            <a href="{{ status.user.local_path }}">
+                                <span>{{ status.user.display_name }}</span>
+                            </a>
+
+                            {% if status.status_type == 'GeneratedNote' %}
+                                {{ status.content|safe }}
+                            {% elif status.status_type == 'Rating' %}
+                                {% trans "rated" %}
+                            {% elif status.status_type == 'Review' %}
+                                {% trans "reviewed" %}
+                            {% elif status.status_type == 'Comment' %}
+                                {% trans "commented on" %}
+                            {% elif status.status_type == 'Quotation' %}
+                                {% trans "quoted" %}
+                            {% endif %}
+
+                            <a href="{{ book.local_path }}">{{ book.title }}</a>
+                        </h3>
+                    </div>
+                </div>
+
+                <div class="block">
+                    {% include 'snippets/follow_button.html' with user=status.user show_username=True minimal=True %}
+                </div>
+
+                <div class="notification has-background-white p-2">
+                    {% include "snippets/status/content_status.html" with hide_book=True %}
+                </div>
             </div>
         </div>
     {% endwith %}
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 052a540c..1318c8bd 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -5,23 +5,14 @@
 {% if status %}
     {% with book=status.book %}
         <a href="{{ book.local_path }}">
-            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-h-l-tablet is-w-auto align to-b to-l' %}
+            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' %}
         </a>
 
-        {% include 'snippets/stars.html' with rating=book|rating:request.user %}
+        <div class="block mt-2">
+            {% include 'snippets/shelve_button/shelve_button.html' %}
+        </div>
 
-        <h3 class="title is-6">
-            <a href="{{ book.local_path }}">{{ book.title }}</a>
-        </h3>
-
-        {% if book.authors %}
-            <p class="subtitle is-6">
-                {% trans "by" %}
-                {% include 'snippets/authors.html' with limit=3 %}
-            </p>
-        {% endif %}
-
-        <div class="media">
+        <div class="media block mb-2">
             <figure class="media-left" aria-hidden="true">
                 <a class="image is-48x48" href="{{ status.user.local_path }}">
                     {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
@@ -29,13 +20,35 @@
             </figure>
 
             <div class="media-content">
-                <h3 class="has-text-weight-bold">
+                <h3 class="title is-6">
                     <a href="{{ status.user.local_path }}">
                         <span>{{ status.user.display_name }}</span>
                     </a>
+
+                    {% if status.status_type == 'GeneratedNote' %}
+                        {{ status.content|safe }}
+                    {% elif status.status_type == 'Rating' %}
+                        {% trans "rated" %}
+                    {% elif status.status_type == 'Review' %}
+                        {% trans "reviewed" %}
+                    {% elif status.status_type == 'Comment' %}
+                        {% trans "commented on" %}
+                    {% elif status.status_type == 'Quotation' %}
+                        {% trans "quoted" %}
+                    {% endif %}
+
+                    <a href="{{ book.local_path }}">{{ book.title }}</a>
                 </h3>
+                {% if status.rating %}
+                <p class="subtitle is-6">
+                    {% include 'snippets/stars.html' with rating=status.rating %}
+                </p>
+                {% endif %}
             </div>
         </div>
+        <div class="block">
+            {% include 'snippets/follow_button.html' with user=status.user show_username=True minimal=True %}
+        </div>
 
     {% endwith %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index 0cbe6b8c..8cafad7f 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -9,15 +9,29 @@
         <form action="{% url 'follow' %}" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
-            <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">{% trans "Follow" %}</button>
+            <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">
+                {% if show_username %}
+                {% blocktrans with username=user.localname %}Follow @{{ username }}{% endblocktrans %}
+                {% else %}
+                {% trans "Follow" %}
+                {% endif %}
+            </button>
         </form>
         <form action="{% url 'unfollow' %}" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
             {% if user.manually_approves_followers and request.user not in user.followers.all %}
-            <button class="button is-small is-danger is-light" type="submit">{% trans "Undo follow request" %}</button>
+            <button class="button is-small is-danger is-light" type="submit">
+                {% trans "Undo follow request" %}
+            </button>
             {% else %}
-            <button class="button is-small is-danger is-light" type="submit">{% trans "Unfollow" %}</button>
+            <button class="button is-small is-danger is-light" type="submit">
+                {% if show_username %}
+                {% blocktrans with username=user.localname %}Unfollow @{{ username }}{% endblocktrans %}
+                {% else %}
+                {% trans "Unfollow" %}
+                {% endif %}
+            </button>
             {% endif %}
         </form>
     </div>
diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py
index 685a4ded..0b1fae2b 100644
--- a/bookwyrm/views/discover.py
+++ b/bookwyrm/views/discover.py
@@ -7,7 +7,6 @@ from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import models
-from bookwyrm.settings import PAGE_LENGTH
 from .helpers import privacy_filter
 
 
@@ -24,13 +23,20 @@ class Discover(View):
                 Q(comment__isnull=False)
                 | Q(review__isnull=False)
                 | Q(quotation__isnull=False),
-                user__local=True
+                user__local=True,
             ),
-            #privacy_levels=["public"]
+            privacy_levels=["public"],
         )
-        #paginated = Paginator(activities, PAGE_LENGTH)
+        large_activities = Paginator(
+            activities.filter(~Q(content=None), ~Q(content="")), 6
+        )
+        small_activities = Paginator(
+            activities.filter(Q(content=None) | Q(content="")), 4
+        )
+
+        page = request.GET.get("page")
         data = {
-            "large": activities.filter(~Q(review__isnull=True, review__content=None))[:2],
-            "small": activities.filter(~Q(content=None))[:4],
+            "large_activities": large_activities.get_page(page),
+            "small_activities": small_activities.get_page(page),
         }
         return TemplateResponse(request, "discover/discover.html", data)

From 2eb37663b6a032aac0b2bf227c4e3f8230cf71f6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 14:46:33 -0700
Subject: [PATCH 080/272] Adds mock to inbox test

---
 bookwyrm/tests/views/inbox/test_inbox_create.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index f93354bf..6e891723 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -47,7 +47,8 @@ class InboxCreate(TestCase):
         }
         models.SiteSettings.objects.create()
 
-    def test_create_status(self, _):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_create_status(self, *_):
         """the "it justs works" mode"""
         datafile = pathlib.Path(__file__).parent.joinpath(
             "../../data/ap_quotation.json"

From 760bd5a63fb51671f945bcb2f614eca41240d574 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 15:10:09 -0700
Subject: [PATCH 081/272] Fixes reference to landing page books

---
 bookwyrm/management/commands/populate_streams.py | 2 +-
 bookwyrm/views/invite.py                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/management/commands/populate_streams.py b/bookwyrm/management/commands/populate_streams.py
index f8aa21a5..37559f08 100644
--- a/bookwyrm/management/commands/populate_streams.py
+++ b/bookwyrm/management/commands/populate_streams.py
@@ -8,7 +8,7 @@ def populate_streams():
     users = models.User.objects.filter(
         local=True,
         is_active=True,
-    )
+    ).order_by("last_active_date")
     for user in users:
         for stream in activitystreams.streams.values():
             stream.populate_streams(user)
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 3b9fd17c..005d57cf 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -170,9 +170,9 @@ class InviteRequest(View):
         data = {
             "request_form": form,
             "request_received": received,
-            "books": helpers.get_discover_books(),
+            "books": helpers.get_landing_books(),
         }
-        return TemplateResponse(request, "discover/discover.html", data)
+        return TemplateResponse(request, "landing/landing.html", data)
 
 
 @require_POST

From 1006096cd06cc861c1ad5e0283f699f75f9869df Mon Sep 17 00:00:00 2001
From: Justin Abrahms <justin@abrah.ms>
Date: Sat, 7 Aug 2021 15:40:50 -0700
Subject: [PATCH 082/272] Close the span tag for an author.

---
 bookwyrm/templates/snippets/authors.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/authors.html b/bookwyrm/templates/snippets/authors.html
index 5584417d..81aaa138 100644
--- a/bookwyrm/templates/snippets/authors.html
+++ b/bookwyrm/templates/snippets/authors.html
@@ -19,7 +19,7 @@
         itemtype="https://schema.org/Thing"
     ><span
         itemprop="name"
-        >{{ author.name }}<span></a>{% if not forloop.last %}, {% elif remainder_count > 0 %}, {% blocktrans trimmed count counter=remainder_count %}
+        >{{ author.name }}</span></a>{% if not forloop.last %}, {% elif remainder_count > 0 %}, {% blocktrans trimmed count counter=remainder_count %}
 and {{ remainder_count_display }} other
 {% plural %}
 and {{ remainder_count_display }} others

From 650a6037a29abb2c47e0084fc91c29594fe61f7b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 15:51:53 -0700
Subject: [PATCH 083/272] Trims status text

---
 bookwyrm/templates/discover/large-book.html   | 9 +++++++--
 bookwyrm/templates/snippets/trimmed_text.html | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 81620be1..fdea582d 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -1,5 +1,6 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
+{% load status_display %}
 
 {% if status %}
     {% with book=status.book %}
@@ -59,9 +60,13 @@
                     {% include 'snippets/follow_button.html' with user=status.user show_username=True minimal=True %}
                 </div>
 
-                <div class="notification has-background-white p-2">
-                    {% include "snippets/status/content_status.html" with hide_book=True %}
+                <div class="notification has-background-white p-2 mb-2">
+                    {% include "snippets/status/content_status.html" with hide_book=True trim_length=100 hide_more=True %}
                 </div>
+                <a href="{{ status.remote_id }}">
+                    <span>{% trans "View status" %}</span>
+                    <span class="icon icon-arrow-right" aria-hidden="true"></span>
+                </a>
             </div>
         </div>
     {% endwith %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index cfffe055..f6174a19 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -3,20 +3,24 @@
 {% load i18n %}
 
 {% with 0|uuid as uuid %}
+{% firstof trim_length 150 as trim_length %}
     {% if full %}
         {% with full|to_markdown|safe as full %}
-            {% with full|to_markdown|safe|truncatewords_html:150 as trimmed %}
+            {% with full|to_markdown|safe|truncatewords_html:trim_length as trimmed %}
                 {% if not no_trim and trimmed != full %}
                     <div id="hide-full-{{ uuid }}">
                         <div class="content" id="trimmed-{{ uuid }}">
                             <div dir="auto">{{ trimmed }}</div>
 
                             <div>
+                            {% if not hide_more %}
                                 {% trans "Show more" as button_text %}
                                 {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
+                            {% endif %}
                             </div>
                         </div>
                     </div>
+                    {% if not hide_more %}
                     <div id="full-{{ uuid }}" class="is-hidden">
                         <div class="content">
                             <div
@@ -32,6 +36,7 @@
                             </div>
                         </div>
                     </div>
+                    {% endif %}
                 {% else %}
                     <div class="content">
                         <div

From 33c88495526e45964319ce1f938cd2868468080a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 16:18:15 -0700
Subject: [PATCH 084/272] Trim sooner

---
 bookwyrm/templates/discover/large-book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index fdea582d..bcf98cc2 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -61,7 +61,7 @@
                 </div>
 
                 <div class="notification has-background-white p-2 mb-2">
-                    {% include "snippets/status/content_status.html" with hide_book=True trim_length=100 hide_more=True %}
+                    {% include "snippets/status/content_status.html" with hide_book=True trim_length=70 hide_more=True %}
                 </div>
                 <a href="{{ status.remote_id }}">
                     <span>{% trans "View status" %}</span>

From 4d8bd3ad93925d2ca9578b0fcc94826fbeb00f06 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 16:37:51 -0700
Subject: [PATCH 085/272] Cleans up landing page, since we're here

---
 bookwyrm/templates/landing/landing.html    | 16 ++++++-------
 bookwyrm/templates/landing/large-book.html |  2 +-
 bookwyrm/templates/landing/small-book.html |  2 +-
 bookwyrm/views/helpers.py                  | 27 +++++++++++++---------
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html
index 38180c3b..3879e987 100644
--- a/bookwyrm/templates/landing/landing.html
+++ b/bookwyrm/templates/landing/landing.html
@@ -7,41 +7,41 @@
 </div>
 
 <section class="tile is-ancestor">
-    <div class="tile is-vertical">
+    <div class="tile is-vertical is-6">
         <div class="tile is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'landing/large-book.html' with book=books.0 %}
+                {% include 'landing/large-book.html' with book=books.has_description.0 %}
             </div>
         </div>
         <div class="tile">
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'landing/small-book.html' with book=books.1 %}
+                    {% include 'landing/small-book.html' with book=books.no_description.0 %}
                 </div>
             </div>
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'landing/small-book.html' with book=books.2 %}
+                    {% include 'landing/small-book.html' with book=books.no_description.1 %}
                 </div>
             </div>
         </div>
     </div>
-    <div class="tile is-vertical">
+    <div class="tile is-vertical is-6">
         <div class="tile">
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'landing/small-book.html' with book=books.3 %}
+                    {% include 'landing/small-book.html' with book=books.no_description.2 %}
                 </div>
             </div>
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'landing/small-book.html' with book=books.4 %}
+                    {% include 'landing/small-book.html' with book=books.no_description.3 %}
                 </div>
             </div>
         </div>
         <div class="tile is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'landing/large-book.html' with book=books.5 %}
+                {% include 'landing/large-book.html' with book=books.has_description.1 %}
             </div>
         </div>
     </div>
diff --git a/bookwyrm/templates/landing/large-book.html b/bookwyrm/templates/landing/large-book.html
index b273d431..467785c5 100644
--- a/bookwyrm/templates/landing/large-book.html
+++ b/bookwyrm/templates/landing/large-book.html
@@ -5,7 +5,7 @@
 {% if book %}
     {% with book=book %}
         <div class="columns is-gapless">
-            <div class="column is-5-tablet is-cover">
+            <div class="column is-7-tablet is-cover">
                 <a
                     class="align to-b to-l"
                     href="{{ book.local_path }}"
diff --git a/bookwyrm/templates/landing/small-book.html b/bookwyrm/templates/landing/small-book.html
index 2ca505d9..6538f5f5 100644
--- a/bookwyrm/templates/landing/small-book.html
+++ b/bookwyrm/templates/landing/small-book.html
@@ -4,7 +4,7 @@
 {% if book %}
     {% with book=book %}
         <a href="{{ book.local_path }}">
-            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-h-l-tablet is-w-auto align to-b to-l' %}
+            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' %}
         </a>
 
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index f757cec9..0add1469 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -164,16 +164,21 @@ def is_blocked(viewer, user):
 
 def get_landing_books():
     """list of books for the landing page"""
-    return list(
-        set(
-            models.Edition.objects.filter(
-                review__published_date__isnull=False,
-                review__deleted=False,
-                review__user__local=True,
-                review__privacy__in=["public", "unlisted"],
-            )
-            .exclude(cover__exact="")
-            .annotate(Max("review__published_date"))
-            .order_by("-review__published_date__max")[:6]
+
+    options = (
+        models.Edition.objects.filter(
+            review__published_date__isnull=False,
+            review__deleted=False,
+            review__user__local=True,
+            review__privacy__in=["public", "unlisted"],
         )
+        .exclude(cover__exact="")
+        .annotate(Max("review__published_date"))
+        .order_by("-review__published_date__max")
     )
+
+    has_description = options.exclude(description=None).exclude(description="")
+    return {
+        "has_description": has_description[:2],
+        "no_description": options.exclude(id__in=has_description)[:4],
+    }

From b116df723ff355ab501181eb5c9625d9796afd09 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 16:48:53 -0700
Subject: [PATCH 086/272] prevent large text from janking up view

---
 bookwyrm/static/css/bookwyrm.css            | 5 +++++
 bookwyrm/templates/discover/large-book.html | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index d10fb9b7..8fbdcfc6 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -29,6 +29,11 @@ body {
     min-width: 75% !important;
 }
 
+.clip-text {
+    max-height: 35em;
+    overflow: hidden;
+}
+
 /** Utilities not covered by Bulma
  ******************************************************************************/
 
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index bcf98cc2..ce341376 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -60,7 +60,7 @@
                     {% include 'snippets/follow_button.html' with user=status.user show_username=True minimal=True %}
                 </div>
 
-                <div class="notification has-background-white p-2 mb-2">
+                <div class="notification has-background-white p-2 mb-2 clip-text">
                     {% include "snippets/status/content_status.html" with hide_book=True trim_length=70 hide_more=True %}
                 </div>
                 <a href="{{ status.remote_id }}">

From c28d077cb4b5d62b6abd8d50d0304e9ae5fc953d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 17:12:09 -0700
Subject: [PATCH 087/272] Simplifies query for landing page books

---
 bookwyrm/templates/landing/landing.html | 12 +++++------
 bookwyrm/views/helpers.py               | 28 +++++++++++--------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html
index 3879e987..7a30f161 100644
--- a/bookwyrm/templates/landing/landing.html
+++ b/bookwyrm/templates/landing/landing.html
@@ -10,18 +10,18 @@
     <div class="tile is-vertical is-6">
         <div class="tile is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'landing/large-book.html' with book=books.has_description.0 %}
+                {% include 'landing/large-book.html' with book=books.0 %}
             </div>
         </div>
         <div class="tile">
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'landing/small-book.html' with book=books.no_description.0 %}
+                    {% include 'landing/small-book.html' with book=books.1 %}
                 </div>
             </div>
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'landing/small-book.html' with book=books.no_description.1 %}
+                    {% include 'landing/small-book.html' with book=books.2 %}
                 </div>
             </div>
         </div>
@@ -30,18 +30,18 @@
         <div class="tile">
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'landing/small-book.html' with book=books.no_description.2 %}
+                    {% include 'landing/small-book.html' with book=books.3 %}
                 </div>
             </div>
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'landing/small-book.html' with book=books.no_description.3 %}
+                    {% include 'landing/small-book.html' with book=books.4 %}
                 </div>
             </div>
         </div>
         <div class="tile is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'landing/large-book.html' with book=books.has_description.1 %}
+                {% include 'landing/large-book.html' with book=books.5 %}
             </div>
         </div>
     </div>
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 0add1469..b1e5f68c 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -2,7 +2,7 @@
 import re
 from requests import HTTPError
 from django.core.exceptions import FieldError
-from django.db.models import Max, Q
+from django.db.models import Q
 from django.http import Http404
 
 from bookwyrm import activitypub, models
@@ -165,20 +165,16 @@ def is_blocked(viewer, user):
 def get_landing_books():
     """list of books for the landing page"""
 
-    options = (
-        models.Edition.objects.filter(
-            review__published_date__isnull=False,
-            review__deleted=False,
-            review__user__local=True,
-            review__privacy__in=["public", "unlisted"],
+    return list(
+        set(
+            models.Edition.objects.filter(
+                review__published_date__isnull=False,
+                review__deleted=False,
+                review__user__local=True,
+                review__privacy__in=["public", "unlisted"],
+            )
+            .exclude(cover__exact="")
+            .distinct()
+            .order_by("-review__published_date")[:6]
         )
-        .exclude(cover__exact="")
-        .annotate(Max("review__published_date"))
-        .order_by("-review__published_date__max")
     )
-
-    has_description = options.exclude(description=None).exclude(description="")
-    return {
-        "has_description": has_description[:2],
-        "no_description": options.exclude(id__in=has_description)[:4],
-    }

From 48a8b014bad6bc2df53e20258e75f7521f2e62c7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 17:18:20 -0700
Subject: [PATCH 088/272] Populate local stream for discover view

---
 bookwyrm/activitystreams.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index bad7c59f..88a68a5a 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -4,7 +4,6 @@ from django.db.models import signals, Q
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore, r
-from bookwyrm.settings import STREAMS
 from bookwyrm.views.helpers import privacy_filter
 
 
@@ -235,15 +234,10 @@ class BooksStream(ActivityStream):
 
 
 # determine which streams are enabled in settings.py
-available_streams = [s["key"] for s in STREAMS]
 streams = {
-    k: v
-    for (k, v) in {
-        "home": HomeStream(),
-        "local": LocalStream(),
-        "books": BooksStream(),
-    }.items()
-    if k in available_streams
+    "home": HomeStream(),
+    "local": LocalStream(),
+    "books": BooksStream(),
 }
 
 

From 590338138ca3b7da48634fe2b845ae4ce0cd2682 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 17:38:07 -0700
Subject: [PATCH 089/272] Populate streams tasks

---
 bookwyrm/activitystreams.py                   |  9 ++++++++
 .../management/commands/populate_streams.py   | 23 +++++++++++++++----
 bw-dev                                        |  4 ++--
 celerywyrm/celery.py                          |  1 +
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 88a68a5a..35c8757b 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -4,6 +4,7 @@ from django.db.models import signals, Q
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore, r
+from bookwyrm.tasks import app
 from bookwyrm.views.helpers import privacy_filter
 
 
@@ -374,3 +375,11 @@ def remove_statuses_on_shelve(sender, instance, *args, **kwargs):
         return
 
     BooksStream().remove_book_statuses(instance.user, instance.book)
+
+
+@app.task
+def populate_stream_task(stream, user_id):
+    """background task for populating an empty activitystream"""
+    user = models.User.objects.get(id=user_id)
+    stream = streams[stream]
+    stream.populate_streams(user)
diff --git a/bookwyrm/management/commands/populate_streams.py b/bookwyrm/management/commands/populate_streams.py
index 37559f08..a04d7f5a 100644
--- a/bookwyrm/management/commands/populate_streams.py
+++ b/bookwyrm/management/commands/populate_streams.py
@@ -3,22 +3,35 @@ from django.core.management.base import BaseCommand
 from bookwyrm import activitystreams, models
 
 
-def populate_streams():
+def populate_streams(stream=None):
     """build all the streams for all the users"""
+    streams = [stream] if stream else activitystreams.streams.keys()
+    print("Populations streams", streams)
     users = models.User.objects.filter(
         local=True,
         is_active=True,
-    ).order_by("last_active_date")
+    ).order_by("-last_active_date")
+    print("This may take a long time! Please be patient.")
     for user in users:
-        for stream in activitystreams.streams.values():
-            stream.populate_streams(user)
+        for stream_key in streams:
+            print(".", end="")
+            activitystreams.populate_stream_task.delay(stream_key, user.id)
 
 
 class Command(BaseCommand):
     """start all over with user streams"""
 
     help = "Populate streams for all users"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--stream",
+            default=None,
+            help="Specifies which time of stream to populate",
+        )
+
     # pylint: disable=no-self-use,unused-argument
     def handle(self, *args, **options):
         """run feed builder"""
-        populate_streams()
+        stream = options.get("stream")
+        populate_streams(stream=stream)
diff --git a/bw-dev b/bw-dev
index e5e46e5f..a2f04bfb 100755
--- a/bw-dev
+++ b/bw-dev
@@ -121,7 +121,7 @@ case "$CMD" in
         makeitblack
         ;;
     populate_streams)
-        runweb python manage.py populate_streams
+        runweb python manage.py populate_streams $@
         ;;
     populate_suggestions)
         runweb python manage.py populate_suggestions
@@ -169,7 +169,7 @@ case "$CMD" in
         echo "    build"
         echo "    clean"
         echo "    black"
-        echo "    populate_streams"
+        echo "    populate_streams [--stream=<stream name>]"
         echo "    populate_suggestions"
         echo "    generate_preview_images [--all]"
         echo "    copy_media_to_s3"
diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py
index 3ab33862..de5e5630 100644
--- a/celerywyrm/celery.py
+++ b/celerywyrm/celery.py
@@ -20,6 +20,7 @@ app.config_from_object("django.conf:settings", namespace="CELERY")
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()
 app.autodiscover_tasks(["bookwyrm"], related_name="activitypub.base_activity")
+app.autodiscover_tasks(["bookwyrm"], related_name="activitystreams")
 app.autodiscover_tasks(["bookwyrm"], related_name="broadcast")
 app.autodiscover_tasks(["bookwyrm"], related_name="connectors.abstract_connector")
 app.autodiscover_tasks(["bookwyrm"], related_name="emailing")

From c14bcf19cced34b1c93f61266aeb3c8afa34c1cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 7 Aug 2021 18:54:00 -0700
Subject: [PATCH 090/272] Use activitystreams to populate discovery view

---
 bookwyrm/activitystreams.py                 |   8 +-
 bookwyrm/templates/discover/large-book.html | 128 ++++++++++----------
 bookwyrm/templates/discover/small-book.html |  91 +++++++-------
 bookwyrm/templatetags/status_display.py     |   6 +
 bookwyrm/views/discover.py                  |  28 +++--
 5 files changed, 142 insertions(+), 119 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 35c8757b..0abf1584 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -56,7 +56,13 @@ class ActivityStream(RedisStore):
         return (
             models.Status.objects.select_subclasses()
             .filter(id__in=statuses)
-            .select_related("user", "reply_parent")
+            .select_related(
+                "user",
+                "reply_parent",
+                "comment__book",
+                "review__book",
+                "quotation__book",
+            )
             .prefetch_related("mention_books", "mention_users")
             .order_by("-published_date")
         )
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index ce341376..81654d57 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -1,73 +1,73 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
+{% load utilities %}
 {% load status_display %}
 
-{% if status %}
-    {% with book=status.book %}
-        <div class="columns is-gapless">
-            <div class="column is-6-tablet is-cover">
-                <a
-                    class="align to-b to-l"
-                    href="{{ book.local_path }}"
-                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' %}</a>
+{% if status.book or status.mention_books.exists %}
+    {% load_book status as book %}
+    <div class="columns is-gapless">
+        <div class="column is-6-tablet is-cover">
+            <a
+                class="align to-b to-l"
+                href="{{ book.local_path }}"
+            >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' %}</a>
 
-                {% include 'snippets/stars.html' with rating=book|rating:request.user %}
-                <h3 class="title is-6">
-                    <a href="{{ book.local_path }}">{{ book.title }}</a>
-                </h3>
+            {% include 'snippets/stars.html' with rating=book|rating:request.user %}
+            <h3 class="title is-6">
+                <a href="{{ book.local_path }}">{{ book|book_title }}</a>
+            </h3>
 
-                {% if book.authors %}
-                <p class="subtitle is-6 mb-2">
-                    {% trans "by" %}
-                    {% include 'snippets/authors.html' with limit=3 %}
-                </p>
-                {% endif %}
+            {% if book.authors %}
+            <p class="subtitle is-6 mb-2">
+                {% trans "by" %}
+                {% include 'snippets/authors.html' with limit=3 %}
+            </p>
+            {% endif %}
 
-                {% include 'snippets/shelve_button/shelve_button.html' %}
-            </div>
-
-            <div class="column mt-3-mobile ml-3-tablet">
-                <div class="media block mb-2">
-                    <figure class="media-left" aria-hidden="true">
-                        <a class="image is-48x48" href="{{ status.user.local_path }}">
-                            {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
-                        </a>
-                    </figure>
-                    <div class="media-content">
-                        <h3 class="title is-6">
-                            <a href="{{ status.user.local_path }}">
-                                <span>{{ status.user.display_name }}</span>
-                            </a>
-
-                            {% if status.status_type == 'GeneratedNote' %}
-                                {{ status.content|safe }}
-                            {% elif status.status_type == 'Rating' %}
-                                {% trans "rated" %}
-                            {% elif status.status_type == 'Review' %}
-                                {% trans "reviewed" %}
-                            {% elif status.status_type == 'Comment' %}
-                                {% trans "commented on" %}
-                            {% elif status.status_type == 'Quotation' %}
-                                {% trans "quoted" %}
-                            {% endif %}
-
-                            <a href="{{ book.local_path }}">{{ book.title }}</a>
-                        </h3>
-                    </div>
-                </div>
-
-                <div class="block">
-                    {% include 'snippets/follow_button.html' with user=status.user show_username=True minimal=True %}
-                </div>
-
-                <div class="notification has-background-white p-2 mb-2 clip-text">
-                    {% include "snippets/status/content_status.html" with hide_book=True trim_length=70 hide_more=True %}
-                </div>
-                <a href="{{ status.remote_id }}">
-                    <span>{% trans "View status" %}</span>
-                    <span class="icon icon-arrow-right" aria-hidden="true"></span>
-                </a>
-            </div>
+            {% include 'snippets/shelve_button/shelve_button.html' %}
         </div>
-    {% endwith %}
+
+        <div class="column mt-3-mobile ml-3-tablet">
+            <div class="media block mb-2">
+                <figure class="media-left" aria-hidden="true">
+                    <a class="image is-48x48" href="{{ status.user.local_path }}">
+                        {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
+                    </a>
+                </figure>
+                <div class="media-content">
+                    <h3 class="title is-6">
+                        <a href="{{ status.user.local_path }}">
+                            <span>{{ status.user.display_name }}</span>
+                        </a>
+
+                        {% if status.status_type == 'GeneratedNote' %}
+                            {{ status.content|safe }}
+                        {% elif status.status_type == 'Rating' %}
+                            {% trans "rated" %}
+                        {% elif status.status_type == 'Review' %}
+                            {% trans "reviewed" %}
+                        {% elif status.status_type == 'Comment' %}
+                            {% trans "commented on" %}
+                        {% elif status.status_type == 'Quotation' %}
+                            {% trans "quoted" %}
+                        {% endif %}
+
+                        <a href="{{ book.local_path }}">{{ book.title }}</a>
+                    </h3>
+                </div>
+            </div>
+
+            <div class="block">
+                {% include 'snippets/follow_button.html' with user=status.user show_username=True minimal=True %}
+            </div>
+
+            <div class="notification has-background-white p-2 mb-2 clip-text">
+                {% include "snippets/status/content_status.html" with hide_book=True trim_length=70 hide_more=True %}
+            </div>
+            <a href="{{ status.remote_id }}">
+                <span>{% trans "View status" %}</span>
+                <span class="icon icon-arrow-right" aria-hidden="true"></span>
+            </a>
+        </div>
+    </div>
 {% endif %}
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 1318c8bd..79fbd77c 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -1,54 +1,59 @@
 {% load bookwyrm_tags %}
 {% load utilities %}
 {% load i18n %}
+{% load status_display %}
 
-{% if status %}
-    {% with book=status.book %}
-        <a href="{{ book.local_path }}">
-            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' %}
-        </a>
+{% if status.book or status.mention_books.exists %}
+    {% load_book status as book %}
+    <a href="{{ book.local_path }}">
+        {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' %}
+    </a>
 
-        <div class="block mt-2">
-            {% include 'snippets/shelve_button/shelve_button.html' %}
-        </div>
+    <div class="block mt-2">
+        {% include 'snippets/shelve_button/shelve_button.html' %}
+    </div>
 
-        <div class="media block mb-2">
-            <figure class="media-left" aria-hidden="true">
-                <a class="image is-48x48" href="{{ status.user.local_path }}">
-                    {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
+    <div class="media block mb-2">
+        <figure class="media-left" aria-hidden="true">
+            <a class="image is-48x48" href="{{ status.user.local_path }}">
+                {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
+            </a>
+        </figure>
+
+        <div class="media-content">
+            <h3 class="title is-6">
+                <a href="{{ status.user.local_path }}">
+                    <span>{{ status.user.display_name }}</span>
                 </a>
-            </figure>
 
-            <div class="media-content">
-                <h3 class="title is-6">
-                    <a href="{{ status.user.local_path }}">
-                        <span>{{ status.user.display_name }}</span>
-                    </a>
-
-                    {% if status.status_type == 'GeneratedNote' %}
-                        {{ status.content|safe }}
-                    {% elif status.status_type == 'Rating' %}
-                        {% trans "rated" %}
-                    {% elif status.status_type == 'Review' %}
-                        {% trans "reviewed" %}
-                    {% elif status.status_type == 'Comment' %}
-                        {% trans "commented on" %}
-                    {% elif status.status_type == 'Quotation' %}
-                        {% trans "quoted" %}
-                    {% endif %}
-
-                    <a href="{{ book.local_path }}">{{ book.title }}</a>
-                </h3>
-                {% if status.rating %}
-                <p class="subtitle is-6">
-                    {% include 'snippets/stars.html' with rating=status.rating %}
-                </p>
+                {% if status.status_type == 'GeneratedNote' %}
+                    {{ status.content|safe }}
+                {% elif status.status_type == 'Rating' %}
+                    {% trans "rated" %}
+                {% elif status.status_type == 'Review' %}
+                    {% trans "reviewed" %}
+                {% elif status.status_type == 'Comment' %}
+                    {% trans "commented on" %}
+                {% elif status.status_type == 'Quotation' %}
+                    {% trans "quoted" %}
                 {% endif %}
-            </div>
-        </div>
-        <div class="block">
-            {% include 'snippets/follow_button.html' with user=status.user show_username=True minimal=True %}
-        </div>
 
-    {% endwith %}
+                <a href="{{ book.local_path }}">{{ book.title }}</a>
+            </h3>
+            {% if status.rating %}
+            <p class="subtitle is-6">
+                {% include 'snippets/stars.html' with rating=status.rating %}
+            </p>
+            {% endif %}
+        </div>
+    </div>
+    <div class="block">
+        <a href="{{ status.remote_id }}">
+            <span>{% trans "View status" %}</span>
+            <span class="icon icon-arrow-right" aria-hidden="true"></span>
+        </a>
+    </div>
+    <div class="block">
+        {% include 'snippets/follow_button.html' with user=status.user show_username=True minimal=True %}
+    </div>
 {% endif %}
diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
index 69c0c2a5..3339a8be 100644
--- a/bookwyrm/templatetags/status_display.py
+++ b/bookwyrm/templatetags/status_display.py
@@ -62,3 +62,9 @@ def get_published_date(date):
     if delta.days:
         return naturalday(date, "M j")
     return naturaltime(date)
+
+
+@register.simple_tag(takes_context=False)
+def load_book(status):
+    """how many users that you follow, follow them"""
+    return status.book if hasattr(status, "book") else status.mention_books.first()
diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py
index 0b1fae2b..059365f9 100644
--- a/bookwyrm/views/discover.py
+++ b/bookwyrm/views/discover.py
@@ -6,8 +6,7 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import models
-from .helpers import privacy_filter
+from bookwyrm import activitystreams
 
 
 # pylint: disable= no-self-use
@@ -17,21 +16,28 @@ class Discover(View):
 
     def get(self, request):
         """tiled book activity page"""
-        activities = privacy_filter(
-            request.user,
-            models.Status.objects.select_subclasses().filter(
+        activities = (
+            activitystreams.streams["local"]
+            .get_activity_stream(request.user)
+            .filter(
                 Q(comment__isnull=False)
                 | Q(review__isnull=False)
-                | Q(quotation__isnull=False),
-                user__local=True,
-            ),
-            privacy_levels=["public"],
+                | Q(quotation__isnull=False)
+                | Q(mention_books__isnull=False)
+            )
         )
+
         large_activities = Paginator(
-            activities.filter(~Q(content=None), ~Q(content="")), 6
+            activities.filter(mention_books__isnull=True)
+            .exclude(content=None, quotation__quote=None)
+            .exclude(content=""),
+            6,
         )
         small_activities = Paginator(
-            activities.filter(Q(content=None) | Q(content="")), 4
+            activities.filter(
+                Q(mention_books__isnull=False) | Q(content=None) | Q(content="")
+            ),
+            4,
         )
 
         page = request.GET.get("page")

From 3ce59d13d33cc730909786b204647b5a7b8ab866 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 07:32:23 -0700
Subject: [PATCH 091/272] Mocks populate streams task

---
 bookwyrm/tests/management/test_populate_streams.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
index c080e3fe..17247fd0 100644
--- a/bookwyrm/tests/management/test_populate_streams.py
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -42,8 +42,6 @@ class Activitystreams(TestCase):
                 user=self.local_user, content="hi", book=self.book
             )
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.populate_store"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.populate_stream_task.delay") as redis_mock:
             populate_streams()
         self.assertEqual(redis_mock.call_count, 4)  # 2 users x 2 streams

From 2222c2830569d8c299b17e2ba9966ced76e21e3d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 08:03:04 -0700
Subject: [PATCH 092/272] Adds discover view tests

---
 bookwyrm/tests/views/test_discover.py | 78 +++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 bookwyrm/tests/views/test_discover.py

diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py
new file mode 100644
index 00000000..810851df
--- /dev/null
+++ b/bookwyrm/tests/views/test_discover.py
@@ -0,0 +1,78 @@
+""" test for app action functionality """
+from unittest.mock import patch
+from django.contrib.auth.models import AnonymousUser
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models
+from bookwyrm import views
+
+
+class DiscoverViews(TestCase):
+    """pages you land on without really trying"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+            self.local_user = models.User.objects.create_user(
+                "mouse@local.com",
+                "mouse@mouse.mouse",
+                "password",
+                local=True,
+                localname="mouse",
+            )
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+        models.SiteSettings.objects.create()
+
+    def test_discover_page_empty(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Home.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.get_activity_stream"
+        ) as mock:
+            result = view(request)
+        self.assertEqual(mock.call_count, 1)
+        self.assertEqual(result.status_code, 200)
+        result.render()
+
+    @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+    def test_discover_page(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Home.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        book = models.Edition.objects.create(
+            title="hi", parent_work=models.Work.objects.create(title="work")
+        )
+
+        models.Comment.objects.create(
+            book=book,
+            user=self.local_user,
+            content="hello",
+        )
+        models.Status.objects.create(user=self.local_user, content="beep")
+
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.get_activity_stream"
+        ) as mock:
+            mock.return_value = models.Status.objects.all()
+            result = view(request)
+        self.assertEqual(mock.call_count, 1)
+        self.assertEqual(result.status_code, 200)
+        result.render()
+
+    def test_discover_page_logged_out(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Home.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        self.assertEqual(result.status_code, 200)
+        result.render()

From 65fa2813c6fae968db911d727ecaf5c56f81f64b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 08:07:20 -0700
Subject: [PATCH 093/272] Show link to discover view

---
 bookwyrm/templates/layout.html | 9 +++++++--
 bookwyrm/urls.py               | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index c215648f..6d050097 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -67,8 +67,8 @@
                 <a href="{% url 'lists' %}" class="navbar-item">
                     {% trans "Lists" %}
                 </a>
-                <a href="{% url 'directory' %}" class="navbar-item">
-                    {% trans "Directory" %}
+                <a href="{% url 'discover' %}" class="navbar-item">
+                    {% trans "Discover" %}
                 </a>
                 {% endif %}
             </div>
@@ -89,6 +89,11 @@
                         <span class="ml-2">{{ request.user.display_name }}</span>
                     </a>
                     <ul class="navbar-dropdown" id="navbar-dropdown">
+                        <li>
+                            <a href="{% url 'directory' %}" class="navbar-item">
+                                {% trans "Directory" %}
+                            </a>
+                        </li>
                         <li>
                             <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
                                 {% trans 'Your Books' %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index eb8491a9..4c85954b 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -162,7 +162,7 @@ urlpatterns = [
     # landing pages
     re_path(r"^about/?$", views.About.as_view(), name="about"),
     path("", views.Home.as_view(), name="landing"),
-    re_path(r"^discover/?$", views.Discover.as_view()),
+    re_path(r"^discover/?$", views.Discover.as_view(), name="discover"),
     re_path(r"^notifications/?$", views.Notifications.as_view(), name="notifications"),
     re_path(
         r"^notifications/(?P<notification_type>mentions)/?$",

From e2f3c4602d214b269dcbbb2f0b1d1a48deb65c15 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 08:37:07 -0700
Subject: [PATCH 094/272] test the correct view

---
 bookwyrm/tests/views/test_discover.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py
index 810851df..c01e3afd 100644
--- a/bookwyrm/tests/views/test_discover.py
+++ b/bookwyrm/tests/views/test_discover.py
@@ -29,7 +29,7 @@ class DiscoverViews(TestCase):
 
     def test_discover_page_empty(self):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.Home.as_view()
+        view = views.Directory.as_view()
         request = self.factory.get("")
         request.user = self.local_user
         with patch(
@@ -41,9 +41,10 @@ class DiscoverViews(TestCase):
         result.render()
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    def test_discover_page(self, _):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_discover_page(self, *_):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.Home.as_view()
+        view = views.Directory.as_view()
         request = self.factory.get("")
         request.user = self.local_user
 
@@ -69,7 +70,7 @@ class DiscoverViews(TestCase):
 
     def test_discover_page_logged_out(self):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.Home.as_view()
+        view = views.Directory.as_view()
         request = self.factory.get("")
         request.user = self.anonymous_user
         result = view(request)

From b7b780e45ca963b88f3d878bcfd79ca63bdaed66 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 14:17:02 -0700
Subject: [PATCH 095/272] Discover not directory wth???

---
 bookwyrm/tests/management/test_populate_streams.py | 2 +-
 bookwyrm/tests/views/test_discover.py              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
index 17247fd0..50192a71 100644
--- a/bookwyrm/tests/management/test_populate_streams.py
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -44,4 +44,4 @@ class Activitystreams(TestCase):
 
         with patch("bookwyrm.activitystreams.populate_stream_task.delay") as redis_mock:
             populate_streams()
-        self.assertEqual(redis_mock.call_count, 4)  # 2 users x 2 streams
+        self.assertEqual(redis_mock.call_count, 6)  # 2 users x 3 streams
diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py
index c01e3afd..1b0c99cd 100644
--- a/bookwyrm/tests/views/test_discover.py
+++ b/bookwyrm/tests/views/test_discover.py
@@ -29,7 +29,7 @@ class DiscoverViews(TestCase):
 
     def test_discover_page_empty(self):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.Directory.as_view()
+        view = views.Discover.as_view()
         request = self.factory.get("")
         request.user = self.local_user
         with patch(
@@ -44,7 +44,7 @@ class DiscoverViews(TestCase):
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_discover_page(self, *_):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.Directory.as_view()
+        view = views.Discover.as_view()
         request = self.factory.get("")
         request.user = self.local_user
 
@@ -70,7 +70,7 @@ class DiscoverViews(TestCase):
 
     def test_discover_page_logged_out(self):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.Directory.as_view()
+        view = views.Discover.as_view()
         request = self.factory.get("")
         request.user = self.anonymous_user
         result = view(request)

From c8e7e95c17a98093f0ee21104e6214afc2a9a6dd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 14:43:17 -0700
Subject: [PATCH 096/272] fixes logged out view test

---
 bookwyrm/tests/views/test_discover.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py
index 1b0c99cd..eff62cb6 100644
--- a/bookwyrm/tests/views/test_discover.py
+++ b/bookwyrm/tests/views/test_discover.py
@@ -74,6 +74,4 @@ class DiscoverViews(TestCase):
         request = self.factory.get("")
         request.user = self.anonymous_user
         result = view(request)
-        self.assertIsInstance(result, TemplateResponse)
-        self.assertEqual(result.status_code, 200)
-        result.render()
+        self.assertEqual(result.status_code, 302)

From 55d84d50ee5513ad955a24d9e6d2db7068e9a1ba Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 15:55:49 -0700
Subject: [PATCH 097/272] Fixes loading editions from inventaire

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

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 116aa5c1..842d0997 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -71,7 +71,7 @@ class Connector(AbstractConnector):
         # flatten the data so that images, uri, and claims are on the same level
         return {
             **data.get("claims", {}),
-            **{k: data.get(k) for k in ["uri", "image", "labels", "sitelinks"]},
+            **{k: data.get(k) for k in ["uri", "image", "labels", "sitelinks", "type"]},
         }
 
     def search(self, query, min_confidence=None):  # pylint: disable=arguments-differ

From 65e982e35b0bcbb308e23706c98e9bdbec716cef Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 18:13:02 -0700
Subject: [PATCH 098/272] Uses more general requests exception

---
 bookwyrm/models/activitypub_mixin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 729d9cba..4e313723 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -7,7 +7,7 @@ import operator
 import logging
 from uuid import uuid4
 import requests
-from requests.exceptions import HTTPError, SSLError
+from requests.exceptions import RequestException
 
 from Crypto.PublicKey import RSA
 from Crypto.Signature import pkcs1_15
@@ -43,7 +43,7 @@ class ActivitypubMixin:
     reverse_unfurl = False
 
     def __init__(self, *args, **kwargs):
-        """collect some info on model fields"""
+        """collect some info on model fields for later use"""
         self.image_fields = []
         self.many_to_many_fields = []
         self.simple_fields = []  # "simple"
@@ -503,7 +503,7 @@ def broadcast_task(sender_id, activity, recipients):
     for recipient in recipients:
         try:
             sign_and_send(sender, activity, recipient)
-        except (HTTPError, SSLError, requests.exceptions.ConnectionError):
+        except RequestException:
             pass
 
 

From 21a954c7dfe4355b4a8352ada7ced811e9733638 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 8 Aug 2021 18:40:47 -0700
Subject: [PATCH 099/272] Always use underscores in html ids

Plus some other shifting around
---
 bookwyrm/activitypub/base_activity.py         |   2 +-
 bookwyrm/static/js/bookwyrm.js                |   4 +-
 bookwyrm/templates/book/book.html             |  20 +--
 bookwyrm/templates/book/readthrough.html      |  16 +--
 bookwyrm/templates/components/dropdown.html   |   8 +-
 .../templates/components/inline_form.html     |   2 +-
 bookwyrm/templates/components/modal.html      |   8 +-
 bookwyrm/templates/compose.html               |   2 +-
 .../confirm_email/confirm_email.html          |   4 +-
 bookwyrm/templates/directory/directory.html   |   4 +-
 bookwyrm/templates/feed/direct_messages.html  |   2 +-
 bookwyrm/templates/feed/layout.html           |   8 +-
 bookwyrm/templates/get_started/layout.html    |   4 +-
 bookwyrm/templates/goal.html                  |   8 +-
 bookwyrm/templates/import_status.html         |   4 +-
 bookwyrm/templates/layout.html                |   6 +-
 bookwyrm/templates/lists/list.html            |   2 +-
 bookwyrm/templates/lists/list_layout.html     |   6 +-
 bookwyrm/templates/lists/lists.html           |   4 +-
 .../templates/reading_progress/finish.html    |   2 +-
 .../templates/reading_progress/start.html     |   2 +-
 bookwyrm/templates/reading_progress/want.html |   2 +-
 bookwyrm/templates/rss/title.html             |  17 +--
 bookwyrm/templates/search/book.html           |   6 +-
 bookwyrm/templates/settings/announcement.html |   4 +-
 .../templates/settings/announcements.html     |   4 +-
 .../templates/settings/federated_server.html  |   8 +-
 bookwyrm/templates/settings/site.html         |   2 +-
 bookwyrm/templates/snippets/announcement.html |   6 +-
 bookwyrm/templates/snippets/boost_button.html |   8 +-
 .../templates/snippets/create_status.html     |  24 ++--
 .../snippets/create_status/comment.html       |  49 +++++++
 .../snippets/create_status/content_field.html |  19 +++
 .../content_warning_field.html                |   6 +-
 .../create_status/content_warning_toggle.html |   8 ++
 .../snippets/create_status/direct.html        |   7 +
 .../snippets/create_status/layout.html        |  57 ++++++++
 .../create_status/post_options_block.html     |  22 +++
 .../snippets/create_status/quotation.html     |  34 +++++
 .../snippets/create_status/reply.html         |  10 ++
 .../snippets/create_status/review.html        |  35 +++++
 .../snippets/create_status/status.html        |   2 +
 .../snippets/create_status_form.html          | 131 ------------------
 .../snippets/delete_readthrough_modal.html    |   2 +-
 bookwyrm/templates/snippets/fav_button.html   |   4 +-
 .../templates/snippets/follow_button.html     |   4 +-
 .../templates/snippets/form_rate_stars.html   |   8 +-
 .../snippets/generated_status/goal.html       |   7 +-
 .../snippets/generated_status/rating.html     |   8 +-
 bookwyrm/templates/snippets/goal_form.html    |   2 +-
 .../templates/snippets/privacy_select.html    |   4 +-
 .../templates/snippets/readthrough_form.html  |  12 +-
 .../templates/snippets/report_button.html     |   2 +-
 .../snippets/shelve_button/shelve_button.html |   8 +-
 .../shelve_button/shelve_button_options.html  |   8 +-
 bookwyrm/templates/snippets/stars.html        |   2 +-
 .../status/{status_body.html => body.html}    |   2 +-
 .../snippets/status/content_status.html       |   8 +-
 .../templates/snippets/status/header.html     |  48 +++++++
 .../snippets/status/header_content.html       |   4 +
 .../snippets/status/headers/comment.html      |   2 +
 .../snippets/status/headers/goal.html         |   5 +
 .../snippets/status/headers/note.html         |  22 +++
 .../snippets/status/headers/quotation.html    |   2 +
 .../snippets/status/headers/rating.html       |  25 ++++
 .../snippets/status/headers/read.html         |   7 +
 .../snippets/status/headers/reading.html      |   9 ++
 .../snippets/status/headers/review.html       |   3 +
 .../snippets/status/headers/to_read.html      |   8 ++
 .../templates/snippets/status/layout.html     |  13 +-
 .../templates/snippets/status/status.html     |   4 +-
 .../snippets/status/status_header.html        | 109 ---------------
 .../snippets/toggle/toggle_button.html        |   6 +-
 bookwyrm/templates/snippets/trimmed_text.html |   6 +-
 bookwyrm/templates/user/lists.html            |   6 +-
 bookwyrm/templates/user/shelf/shelf.html      |  10 +-
 bookwyrm/templates/user/user.html             |   2 +-
 bookwyrm/templatetags/status_display.py       |  13 +-
 78 files changed, 555 insertions(+), 409 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/create_status/comment.html
 create mode 100644 bookwyrm/templates/snippets/create_status/content_field.html
 rename bookwyrm/templates/snippets/{ => create_status}/content_warning_field.html (69%)
 create mode 100644 bookwyrm/templates/snippets/create_status/content_warning_toggle.html
 create mode 100644 bookwyrm/templates/snippets/create_status/direct.html
 create mode 100644 bookwyrm/templates/snippets/create_status/layout.html
 create mode 100644 bookwyrm/templates/snippets/create_status/post_options_block.html
 create mode 100644 bookwyrm/templates/snippets/create_status/quotation.html
 create mode 100644 bookwyrm/templates/snippets/create_status/reply.html
 create mode 100644 bookwyrm/templates/snippets/create_status/review.html
 create mode 100644 bookwyrm/templates/snippets/create_status/status.html
 delete mode 100644 bookwyrm/templates/snippets/create_status_form.html
 rename bookwyrm/templates/snippets/status/{status_body.html => body.html} (93%)
 create mode 100644 bookwyrm/templates/snippets/status/header.html
 create mode 100644 bookwyrm/templates/snippets/status/header_content.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/comment.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/goal.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/note.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/quotation.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/rating.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/read.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/reading.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/review.html
 create mode 100644 bookwyrm/templates/snippets/status/headers/to_read.html
 delete mode 100644 bookwyrm/templates/snippets/status/status_header.html

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index da32fbaf..ddd45426 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -48,7 +48,7 @@ class Signature:
 
 
 def naive_parse(activity_objects, activity_json, serializer=None):
-    """this navigates circular import issues"""
+    """this navigates circular import issues by looking up models' serializers"""
     if not serializer:
         if activity_json.get("publicKeyPem"):
             # ugh
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index e43ed134..a4002c2d 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -164,7 +164,7 @@ let BookWyrm = new class {
         }
 
         // Show/hide container.
-        let container = document.getElementById('hide-' + targetId);
+        let container = document.getElementById('hide_' + targetId);
 
         if (container) {
             this.toggleContainer(container, pressed);
@@ -219,7 +219,7 @@ let BookWyrm = new class {
     /**
      * Check or uncheck a checbox.
      *
-     * @param  {object}  checkbox - DOM node
+     * @param  {string}  checkbox - id of the checkbox
      * @param  {boolean} pressed  - Is the trigger pressed?
      * @return {undefined}
      */
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index c5dab109..2e8ff0d0 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -72,8 +72,8 @@
             {% if user_authenticated and not book.cover %}
             <div class="block">
                 {% trans "Add cover" as button_text %}
-                {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="add-cover" controls_uid=book.id focus="modal-title-add-cover" class="is-small" %}
-                {% include 'book/cover_modal.html' with book=book controls_text="add-cover" controls_uid=book.id %}
+                {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="add_cover" controls_uid=book.id focus="modal_title_add_cover" class="is-small" %}
+                {% include 'book/cover_modal.html' with book=book controls_text="add_cover" controls_uid=book.id %}
                 {% if request.GET.cover_error %}
                 <p class="help is-danger">{% trans "Failed to load cover" %}</p>
                 {% endif %}
@@ -128,19 +128,19 @@
 
                 {% if user_authenticated and can_edit_book and not book|book_description %}
                 {% trans 'Add Description' as button_text %}
-                {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="add-description" controls_uid=book.id focus="id_description" hide_active=True id="hide-description" %}
+                {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="add_description" controls_uid=book.id focus="id_description" hide_active=True id="hide_description" %}
 
-                <div class="box is-hidden" id="add-description-{{ book.id }}">
+                <div class="box is-hidden" id="add_description_{{ book.id }}">
                     <form name="add-description" method="POST" action="/add-description/{{ book.id }}">
                         {% csrf_token %}
                         <p class="fields is-grouped">
-                            <label class="label"for="id_description">{% trans "Description:" %}</label>
-                            <textarea name="description" cols="None" rows="None" class="textarea" id="id_description"></textarea>
+                            <label class="label"for="id_description_{{ book.id }}">{% trans "Description:" %}</label>
+                            <textarea name="description" cols="None" rows="None" class="textarea" id="id_description_{{ book.id }}"></textarea>
                         </p>
                         <div class="field">
                             <button class="button is-primary" type="submit">{% trans "Save" %}</button>
                             {% trans "Cancel" as button_text %}
-                            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="add-description" controls_uid=book.id hide_inactive=True %}
+                            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="add_description" controls_uid=book.id hide_inactive=True %}
                         </div>
                     </form>
                 </div>
@@ -177,10 +177,10 @@
                     </div>
                     <div class="column is-narrow">
                         {% trans "Add read dates" as button_text %}
-                        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" class="is-small" controls_text="add-readthrough" focus="add-readthrough-focus" %}
+                        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" class="is-small" controls_text="add_readthrough" focus="add_readthrough_focus_" %}
                     </div>
                 </header>
-                <section class="is-hidden box" id="add-readthrough">
+                <section class="is-hidden box" id="add_readthrough">
                     <form name="add-readthrough" action="/create-readthrough" method="post">
                         {% include 'snippets/readthrough_form.html' with readthrough=None %}
                         <div class="field is-grouped">
@@ -189,7 +189,7 @@
                             </div>
                             <div class="control">
                                 {% trans "Cancel" as button_text %}
-                                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="add-readthrough" %}
+                                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="add_readthrough" %}
                             </div>
                         </div>
                     </form>
diff --git a/bookwyrm/templates/book/readthrough.html b/bookwyrm/templates/book/readthrough.html
index 75140746..05ed3c63 100644
--- a/bookwyrm/templates/book/readthrough.html
+++ b/bookwyrm/templates/book/readthrough.html
@@ -2,7 +2,7 @@
 {% load humanize %}
 {% load tz %}
 <div class="content">
-    <div id="hide-edit-readthrough-{{ readthrough.id }}" class="box is-shadowless has-background-white-bis">
+    <div id="hide_edit_readthrough_{{ readthrough.id }}" class="box is-shadowless has-background-white-bis">
         <div class="columns">
             <div class="column">
                 {% trans "Progress Updates:" %}
@@ -24,7 +24,7 @@
                         {% if readthrough.progress %}
                         {% trans "Show all updates" as button_text %}
                         {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="updates" controls_uid=readthrough.id class="is-small" %}
-                        <ul id="updates-{{ readthrough.id }}" class="is-hidden">
+                        <ul id="updates_{{ readthrough.id }}" class="is-hidden">
                             {% for progress_update in readthrough.progress_updates %}
                             <li>
                                 <form name="delete-update" action="/delete-progressupdate" method="POST">
@@ -36,7 +36,7 @@
                                     {{ progress_update.progress }}%
                                     {% endif %}
                                     <input type="hidden" name="id" value="{{ progress_update.id }}"/>
-                                    <button type="submit" class="button is-small" for="delete-progressupdate-{{ progress_update.id }}" role="button" tabindex="0">
+                                    <button type="submit" class="button is-small" for="delete_progressupdate_{{ progress_update.id }}" role="button" tabindex="0">
                                         <span class="icon icon-x" title="Delete this progress update">
                                             <span class="is-sr-only">{% trans "Delete this progress update" %}</span>
                                         </span>
@@ -57,11 +57,11 @@
                 <div class="field has-addons">
                     <div class="control">
                         {% trans "Edit read dates" as button_text %}
-                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text=button_text icon="pencil" controls_text="edit-readthrough" controls_uid=readthrough.id focus="edit-readthrough" %}
+                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text=button_text icon="pencil" controls_text="edit_readthrough" controls_uid=readthrough.id focus="edit_readthrough" %}
                     </div>
                     <div class="control">
                         {% trans "Delete these read dates" as button_text %}
-                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text=button_text icon="x" controls_text="delete-readthrough" controls_uid=readthrough.id focus="modal-title-delete-readthrough" %}
+                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text=button_text icon="x" controls_text="delete_readthrough" controls_uid=readthrough.id focus="modal_title_delete_readthrough" %}
                     </div>
                 </div>
             </div>
@@ -69,15 +69,15 @@
     </div>
 </div>
 
-<div class="box is-hidden" id="edit-readthrough-{{ readthrough.id }}" tabindex="0">
+<div class="box is-hidden" id="edit_readthrough_{{ readthrough.id }}" tabindex="0">
     <h3 class="title is-5">{% trans "Edit read dates" %}</h3>
     <form name="edit-readthrough" action="/edit-readthrough" method="post">
         {% include 'snippets/readthrough_form.html' with readthrough=readthrough %}
         <div class="field is-grouped">
             <button class="button is-primary" type="submit">{% trans "Save" %}</button>
             {% trans "Cancel" as button_text %}
-            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="edit-readthrough" controls_uid=readthrough.id %}
+            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="edit_readthrough" controls_uid=readthrough.id %}
         </div>
     </form>
 </div>
-{% include 'snippets/delete_readthrough_modal.html' with controls_text="delete-readthrough" controls_uid=readthrough.id no_body=True %}
+{% include 'snippets/delete_readthrough_modal.html' with controls_text="delete_readthrough" controls_uid=readthrough.id no_body=True %}
diff --git a/bookwyrm/templates/components/dropdown.html b/bookwyrm/templates/components/dropdown.html
index 35caa55b..98291bc9 100644
--- a/bookwyrm/templates/components/dropdown.html
+++ b/bookwyrm/templates/components/dropdown.html
@@ -3,7 +3,7 @@
 
 {% with 0|uuid as uuid %}
 <div
-    id="menu-{{ uuid }}"
+    id="menu_{{ uuid }}"
     class="
         dropdown control
         {% if right %}is-right{% endif %}
@@ -14,15 +14,15 @@
         type="button"
         aria-expanded="false"
         aria-haspopup="true"
-        aria-controls="menu-options-{{ uuid }}"
-        data-controls="menu-{{ uuid }}"
+        aria-controls="menu_options_{{ uuid }}"
+        data-controls="menu_{{ uuid }}"
     >
         {% block dropdown-trigger %}{% endblock %}
     </button>
 
     <div class="dropdown-menu">
         <ul
-            id="menu-options-{{ uuid }}"
+            id="menu_options_{{ uuid }}"
             class="dropdown-content p-0 is-clipped"
             role="menu"
         >
diff --git a/bookwyrm/templates/components/inline_form.html b/bookwyrm/templates/components/inline_form.html
index 0b2c1300..a8924ef2 100644
--- a/bookwyrm/templates/components/inline_form.html
+++ b/bookwyrm/templates/components/inline_form.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <section class="card is-hidden {{ class }}" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
     <header class="card-header has-background-white-ter">
-        <h2 class="card-header-title" tabindex="0" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}-header">
+        <h2 class="card-header-title" tabindex="0" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}_header">
             {% block header %}{% endblock %}
         </h2>
         <span class="card-header-icon">
diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index b29ff8d9..d8c1a468 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -2,16 +2,16 @@
 <div
     role="dialog"
     class="modal {% if active %}is-active{% else %}is-hidden{% endif %}"
-    id="{{ controls_text }}-{{ controls_uid }}"
-    aria-labelledby="modal-card-title-{{ controls_text }}-{{ controls_uid }}"
+    id="{{ controls_text }}_{{ controls_uid }}"
+    aria-labelledby="modal_card_title_{{ controls_text }}_{{ controls_uid }}"
     aria-modal="true"
 >
     {# @todo Implement focus traps to prevent tabbing out of the modal. #}
     <div class="modal-background"></div>
     {% trans "Close" as label %}
     <div class="modal-card">
-        <header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">
-            <h2 class="modal-card-title is-flex-shrink-1" id="modal-card-title-{{ controls_text }}-{{ controls_uid }}">
+        <header class="modal-card-head" tabindex="0" id="modal_title_{{ controls_text }}_{{ controls_uid }}">
+            <h2 class="modal-card-title is-flex-shrink-1" id="modal_card_title_{{ controls_text }}_{{ controls_uid }}">
                 {% block modal-title %}{% endblock %}
             </h2>
             {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %}
diff --git a/bookwyrm/templates/compose.html b/bookwyrm/templates/compose.html
index 1b6aa735..e37ec170 100644
--- a/bookwyrm/templates/compose.html
+++ b/bookwyrm/templates/compose.html
@@ -27,7 +27,7 @@
         {% if not draft %}
         {% include 'snippets/create_status.html' %}
         {% else %}
-        {% include 'snippets/create_status_form.html' %}
+        {% include 'snippets/create_status/status.html' %}
         {% endif %}
     </div>
 </div>
diff --git a/bookwyrm/templates/confirm_email/confirm_email.html b/bookwyrm/templates/confirm_email/confirm_email.html
index 6c9eda5e..8c8adcdd 100644
--- a/bookwyrm/templates/confirm_email/confirm_email.html
+++ b/bookwyrm/templates/confirm_email/confirm_email.html
@@ -30,8 +30,8 @@
 
             <section class="block">
                 {% trans "Can't find your code?" as button_text %}
-                {% include "snippets/toggle/open_button.html" with text=button_text controls_text="resend-form" focus="resend-form-header" %}
-                {% include "confirm_email/resend_form.html" with controls_text="resend-form" %}
+                {% include "snippets/toggle/open_button.html" with text=button_text controls_text="resend_form" focus="resend_form_header" %}
+                {% include "confirm_email/resend_form.html" with controls_text="resend_form" %}
             </section>
         </div>
     </div>
diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html
index b900cb18..9753c4c0 100644
--- a/bookwyrm/templates/directory/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -11,7 +11,7 @@
 </header>
 
 {% if not request.user.discoverable %}
-<div class="box has-text-centered content" data-hide="hide-join-directory"><div class="columns">
+<div class="box has-text-centered content" data-hide="hide_join_directory"><div class="columns">
     <div class="column">
     <p>
         {% trans "Make your profile discoverable to other BookWyrm users." %}
@@ -27,7 +27,7 @@
     </div>
     <div class="column is-narrow">
         {% trans "Dismiss message" as button_text %}
-        <button type="button" class="delete set-display" data-id="hide-join-directory" data-value="true">
+        <button type="button" class="delete set-display" data-id="hide_join_directory" data-value="true">
             <span>Dismiss message</span>
         </button>
     </div>
diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 30a50cd0..115e1e6f 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -14,7 +14,7 @@
 </header>
 
 <div class="box">
-    {% include 'snippets/create_status_form.html' with type="direct" uuid=1 mention=partner %}
+    {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=partner %}
 </div>
 
 <section class="block">
diff --git a/bookwyrm/templates/feed/layout.html b/bookwyrm/templates/feed/layout.html
index ad7d39f0..746f4fd0 100644
--- a/bookwyrm/templates/feed/layout.html
+++ b/bookwyrm/templates/feed/layout.html
@@ -33,11 +33,11 @@
                                     <li class="{% if active_book == book.id|stringformat:'d' %}is-active{% elif not active_book and shelf_counter == 1 and forloop.first %}is-active{% endif %}">
                                         <a
                                             href="{{ request.path }}?book={{ book.id }}"
-                                            id="tab-book-{{ book.id }}"
+                                            id="tab_book_{{ book.id }}"
                                             role="tab"
                                             aria-label="{{ book.title }}"
                                             aria-selected="{% if active_book == book.id|stringformat:'d' %}true{% elif shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}"
-                                            aria-controls="book-{{ book.id }}">
+                                            aria-controls="book_{{ book.id }}">
                                             {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m' %}
                                         </a>
                                     </li>
@@ -56,9 +56,9 @@
                 <div
                     class="suggested-tabs card"
                     role="tabpanel"
-                    id="book-{{ book.id }}"
+                    id="book_{{ book.id }}"
                     {% if active_book and active_book == book.id|stringformat:'d' %}{% elif not active_book and shelf_counter == 1 and forloop.first %}{% else %} hidden{% endif %}
-                    aria-labelledby="tab-book-{{ book.id }}">
+                    aria-labelledby="tab_book_{{ book.id }}">
 
                     <div class="card-header">
                         <div class="card-header-title">
diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index 08a2e7c5..eef5a9e2 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -6,12 +6,12 @@
 
 {% block content %}
 {% with site_name=site.name %}
-<div class="modal is-active" role="dialog" aria-modal="true" aria-labelledby="get-started-header">
+<div class="modal is-active" role="dialog" aria-modal="true" aria-labelledby="get_started_header">
     <div class="modal-background"></div>
     <div class="modal-card is-fullwidth">
         <header class="modal-card-head">
             <img class="image logo mr-2" src="{% if site.logo_small %}{% get_media_prefix %}{{ site.logo_small }}{% else %}{% static "images/logo-small.png" %}{% endif %}" aria-hidden="true">
-            <h1 class="modal-card-title" id="get-started-header">
+            <h1 class="modal-card-title" id="get_started_header">
                 {% blocktrans %}Welcome to {{ site_name }}!{% endblocktrans %}
                 <span class="subtitle is-block">
                     {% trans "These are some first steps to get you started." %}
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index b285eec4..8c014cb3 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -9,7 +9,7 @@
     {% if is_self and goal %}
     <div class="column is-narrow">
         {% trans "Edit Goal" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="show-edit-goal" focus="edit-form-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="show_edit_goal" focus="edit_form_header" %}
     </div>
     {% endif %}
 </div>
@@ -18,11 +18,11 @@
 {% block panel %}
 <section class="block">
     {% now 'Y' as current_year %}
-    {% if user == request.user and year == current_year %}
+    {% if user == request.user and year|add:0 == current_year|add:0 %}
     <div class="block">
-        <section class="card {% if goal %}is-hidden{% endif %}" id="show-edit-goal">
+        <section class="card {% if goal %}is-hidden{% endif %}" id="show_edit_goal">
             <header class="card-header">
-                <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit-form-header">
+                <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit_form_header">
                     <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
                 </h2>
             </header>
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index e0ed8ab2..776c1ce5 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -53,11 +53,11 @@
             {% endif %}
         {% endwith %}
 
-        <fieldset id="failed-imports">
+        <fieldset id="failed_imports">
             <ul>
             {% for item in failed_items %}
                 <li class="mb-2 is-flex is-align-items-start">
-                    <input class="checkbox mt-1" type="checkbox" name="import_item" value="{{ item.id }}" id="import-item-{{ item.id }}">
+                    <input class="checkbox mt-1" type="checkbox" name="import_item" value="{{ item.id }}" id="import_item_{{ item.id }}">
                     <label class="ml-1" for="import-item-{{ item.id }}">
                         {% blocktrans with index=item.index title=item.data.Title author=item.data.Author %}Line {{ index }}: <strong>{{ title }}</strong> by {{ author }}{% endblocktrans %}
                         <br/>
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 6d050097..8dd61e25 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -37,7 +37,7 @@
             <form class="navbar-item column" action="/search/">
                 <div class="field has-addons">
                     <div class="control">
-                        <input aria-label="{% trans 'Search for a book or user' %}" id="search-input" class="input" type="text" name="q" placeholder="{% trans 'Search for a book or user' %}" value="{{ query }}">
+                        <input aria-label="{% trans 'Search for a book or user' %}" id="search_input" class="input" type="text" name="q" placeholder="{% trans 'Search for a book or user' %}" value="{{ query }}">
                     </div>
                     <div class="control">
                         <button class="button" type="submit">
@@ -58,7 +58,7 @@
             </div>
         </div>
 
-        <div class="navbar-menu" id="main-nav">
+        <div class="navbar-menu" id="main_nav">
             <div class="navbar-start">
                 {% if request.user.is_authenticated %}
                 <a href="/#feed" class="navbar-item">
@@ -88,7 +88,7 @@
                         {% include 'snippets/avatar.html' with user=request.user %}
                         <span class="ml-2">{{ request.user.display_name }}</span>
                     </a>
-                    <ul class="navbar-dropdown" id="navbar-dropdown">
+                    <ul class="navbar-dropdown" id="navbar_dropdown">
                         <li>
                             <a href="{% url 'directory' %}" class="navbar-item">
                                 {% trans "Directory" %}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index a9048b67..64005ee1 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -75,7 +75,7 @@
                                     </div>
                                     {% csrf_token %}
                                     <div class="control">
-                                        <input id="input-list-position" class="input is-small" type="number" min="1" name="position" value="{{ item.order }}">
+                                        <input id="input_list_position" class="input is-small" type="number" min="1" name="position" value="{{ item.order }}">
                                     </div>
                                     <div class="control">
                                         <button type="submit" class="button is-info is-small is-tablet">{% trans "Set" %}</button>
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index 1bbc98b4..b24ce9e3 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -14,17 +14,17 @@
     {% if request.user == list.user %}
     <div class="column is-narrow">
         {% trans "Edit List" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit-list" focus="edit-list-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_list" focus="edit_list_header" %}
     </div>
     {% endif %}
 </header>
 
 <div class="block content">
-    {% include 'snippets/trimmed_text.html' with full=list.description %}    
+    {% include 'snippets/trimmed_text.html' with full=list.description %}
 </div>
 
 <div class="block">
-    {% include 'lists/edit_form.html' with controls_text="edit-list" %}
+    {% include 'lists/edit_form.html' with controls_text="edit_list" %}
 </div>
 
 {% block panel %}{% endblock %}
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index e39d5fde..21f6ada4 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -18,13 +18,13 @@
     {% if request.user.is_authenticated %}
     <div class="column is-narrow">
         {% trans "Create List" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon_with_text="plus" text=button_text focus="create-list-header" %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create_list" icon_with_text="plus" text=button_text focus="create_list_header" %}
     </div>
     {% endif %}
 </header>
 
 <div class="block">
-    {% include 'lists/create_form.html' with controls_text="create-list" %}
+    {% include 'lists/create_form.html' with controls_text="create_list" %}
 </div>
 
 {% if lists %}
diff --git a/bookwyrm/templates/reading_progress/finish.html b/bookwyrm/templates/reading_progress/finish.html
index a9f60f04..ca69128e 100644
--- a/bookwyrm/templates/reading_progress/finish.html
+++ b/bookwyrm/templates/reading_progress/finish.html
@@ -9,6 +9,6 @@ Finish "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/shelve_button/finish_reading_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/start.html b/bookwyrm/templates/reading_progress/start.html
index 9c457947..e24a0e05 100644
--- a/bookwyrm/templates/reading_progress/start.html
+++ b/bookwyrm/templates/reading_progress/start.html
@@ -9,6 +9,6 @@ Start "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/shelve_button/start_reading_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/want.html b/bookwyrm/templates/reading_progress/want.html
index 8e75d470..6122ade3 100644
--- a/bookwyrm/templates/reading_progress/want.html
+++ b/bookwyrm/templates/reading_progress/want.html
@@ -9,6 +9,6 @@ Want to Read "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/shelve_button/want_to_read_modal.html" with book=book active=True no_body=True %}
+{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/rss/title.html b/bookwyrm/templates/rss/title.html
index 5ad0b757..c9fd56af 100644
--- a/bookwyrm/templates/rss/title.html
+++ b/bookwyrm/templates/rss/title.html
@@ -1,16 +1 @@
-{% load i18n %}
-{{ obj.user.display_name }}{% if obj.status_type == 'GeneratedNote' %}
-    {{ obj.content | safe }}
-{% elif obj.status_type == 'Review' and not obj.name and not obj.content%}
-    {% trans "rated" %}
-{% elif obj.status_type == 'Review' %}
-    {% trans "reviewed" %}
-{% elif obj.status_type == 'Comment' %}
-    {% trans "commented on" %}
-{% elif obj.status_type == 'Quotation' %}
-    {% trans "quoted" %}
-{% endif %}
-{% if obj.book %}{{ obj.book.title | safe}}
-{% elif obj.mention_books %}
-{{ obj.mention_books.first.title }}
-{% endif %}
+{{ user.display_name }} {{ item_title|striptags }}
diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
index ce907219..39f83732 100644
--- a/bookwyrm/templates/search/book.html
+++ b/bookwyrm/templates/search/book.html
@@ -28,14 +28,14 @@
             </div>
             <div class="column is-narrow">
                 {% trans "Open" as button_text %}
-                {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-down" pressed=forloop.first %}
+                {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="more_results_panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-down" pressed=forloop.first %}
                 {% trans "Close" as button_text %}
-                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-up" pressed=forloop.first %}
+                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="more_results_panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-up" pressed=forloop.first %}
             </div>
         </header>
         {% endif %}
 
-        <div class="box has-background-white is-shadowless{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
+        <div class="box has-background-white is-shadowless{% if not forloop.first %} is-hidden{% endif %}" id="more_results_panel_{{ result_set.connector.identifier }}">
             <div class="is-flex is-flex-direction-row-reverse">
                 <div>
                 </div>
diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html
index 627c360c..c0e5dec8 100644
--- a/bookwyrm/templates/settings/announcement.html
+++ b/bookwyrm/templates/settings/announcement.html
@@ -11,7 +11,7 @@
 {% trans "Edit Announcement" as button_text %}
 <div class="field has-addons">
     <div class="control">
-        {% include 'snippets/toggle/open_button.html' with controls_text="edit-announcement" icon_with_text="pencil" text=button_text focus="edit-announcement-header" %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="edit_announcement" icon_with_text="pencil" text=button_text focus="edit_announcement_header" %}
     </div>
     <form class="control" action="{% url 'settings-announcements-delete' announcement.id %}" method="post">
         {% csrf_token %}
@@ -26,7 +26,7 @@
 {% block panel %}
 
 <form name="edit-announcement" method="post" action="{% url 'settings-announcements' announcement.id %}" class="block">
-    {% include 'settings/announcement_form.html' with controls_text="edit-announcement" %}
+    {% include 'settings/announcement_form.html' with controls_text="edit_announcement" %}
 </form>
 
 <div class="block content">
diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html
index 52ede3da..a0b363e6 100644
--- a/bookwyrm/templates/settings/announcements.html
+++ b/bookwyrm/templates/settings/announcements.html
@@ -6,13 +6,13 @@
 
 {% block edit-button %}
 {% trans "Create Announcement" as button_text %}
-{% include 'snippets/toggle/open_button.html' with controls_text="create-announcement" icon_with_text="plus" text=button_text focus="create-announcement-header" %}
+{% include 'snippets/toggle/open_button.html' with controls_text="create_announcement" icon_with_text="plus" text=button_text focus="create_announcement_header" %}
 </a>
 {% endblock %}
 
 {% block panel %}
 <form name="create-announcement" method="post" action="{% url 'settings-announcements' %}" class="block">
-    {% include 'settings/announcement_form.html' with controls_text="create-announcement" %}
+    {% include 'settings/announcement_form.html' with controls_text="create_announcement" %}
 </form>
 
 <table class="table is-striped">
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index b10f8501..c47dd285 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -83,13 +83,13 @@
         </div>
         <div class="column is-narrow">
             {% trans "Edit" as button_text %}
-            {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit-notes" %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_notes" %}
         </div>
     </header>
     {% if server.notes %}
-    <div class="box" id="hide-edit-notes">{{ server.notes|to_markdown|safe }}</div>
+    <div class="box" id="hide_edit_notes">{{ server.notes|to_markdown|safe }}</div>
     {% endif %}
-    <form class="box is-hidden" method="POST" action="{% url 'settings-federated-server' server.id %}" id="edit-notes">
+    <form class="box is-hidden" method="POST" action="{% url 'settings-federated-server' server.id %}" id="edit_notes">
         {% csrf_token %}
         <p>
             <label class="is-sr-only" for="id_notes">Notes:</label>
@@ -97,7 +97,7 @@
         </p>
         <button type="submit" class="button is-primary">{% trans "Save" %}</button>
         {% trans "Cancel" as button_text %}
-        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="edit-notes" %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="edit_notes" %}
     </form>
 </section>
 
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index f64b529a..05b504a9 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -9,7 +9,7 @@
 
 <form action="{% url 'settings-site' %}" method="POST" class="content" enctype="multipart/form-data">
     {% csrf_token %}
-    <section class="block" id="instance-info">
+    <section class="block" id="instance_info">
         <h2 class="title is-4">{% trans "Instance Info" %}</h2>
         <div class="field">
             <label class="label" for="id_name">{% trans "Instance Name:" %}</label>
diff --git a/bookwyrm/templates/snippets/announcement.html b/bookwyrm/templates/snippets/announcement.html
index 74dfdb54..8b856319 100644
--- a/bookwyrm/templates/snippets/announcement.html
+++ b/bookwyrm/templates/snippets/announcement.html
@@ -2,7 +2,7 @@
 {% with announcement.id|uuid as uuid %}
 <aside
     class="notification mb-1 p-3{% if not admin_mode %} is-hidden{% endif %} transition-y"
-    {% if not admin_mode %}data-hide="hide-announcement-{{ announcement.id }}"{% endif %}
+    {% if not admin_mode %}data-hide="hide_announcement_{{ announcement.id }}"{% endif %}
 >
     <div class="columns mb-0 is-mobile">
         <div class="column pb-0">
@@ -21,7 +21,7 @@
         {% endif %}
     </div>
     {% if announcement.content %}
-    <div class="mb-2 mt-2 {% if not pressed %}is-hidden{% endif %}" id="announcement-{{ uuid }}">
+    <div class="mb-2 mt-2 {% if not pressed %}is-hidden{% endif %}" id="announcement_{{ uuid }}">
         <div class="box is-shadowless mb-0">
             {{ announcement.content|safe }}
         </div>
@@ -31,7 +31,7 @@
         <p>{% blocktrans with user_path=announcement.user.local_path username=announcement.user.display_name %}Posted by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
         {% if not admin_mode %}
         <span class="mr-2 ml-2" aria-hidden="true">&middot;</span>
-        <a class="set-display" data-id="hide-announcement-{{ announcement.id }}" data-value="true">{% trans "Dismiss message" %}</a>
+        <a class="set-display" data-id="hide_announcement_{{ announcement.id }}" data-value="true">{% trans "Dismiss message" %}</a>
         {% endif %}
     </div>
 </aside>
diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index 0f927406..574c4477 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -8,8 +8,8 @@
     name="boost"
     action="/boost/{{ status.id }}"
     method="post"
-    class="interaction boost-{{ status.id }}-{{ uuid }} {% if boosted %}is-hidden{% endif %}"
-    data-id="boost-{{ status.id }}-{{ uuid }}"
+    class="interaction boost_{{ status.id }}_{{ uuid }}{% if boosted %} is-hidden{% endif %}"
+    data-id="boost_{{ status.id }}_{{ uuid }}"
 >
     {% csrf_token %}
     <button
@@ -25,8 +25,8 @@
     name="unboost"
     action="/unboost/{{ status.id }}"
     method="post"
-    class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not boosted %}is-hidden{% endif %}"
-    data-id="boost-{{ status.id }}-{{ uuid }}"
+    class="interaction boost_{{ status.id }}_{{ uuid }} active {% if not boosted %}is-hidden{% endif %}"
+    data-id="boost_{{ status.id }}_{{ uuid }}"
 >
     {% csrf_token %}
     <button class="button is-small is-light is-transparent" type="submit">
diff --git a/bookwyrm/templates/snippets/create_status.html b/bookwyrm/templates/snippets/create_status.html
index b1a8e846..bb7adc0b 100644
--- a/bookwyrm/templates/snippets/create_status.html
+++ b/bookwyrm/templates/snippets/create_status.html
@@ -9,10 +9,10 @@
             <li class="{% if status_type == 'review' or not status_type %}is-active{% endif %}">
                 <a
                     href="{{ request.path }}?status_type=review&book={{ book.id }}"
-                    id="tab-review-{{ book.id }}"
+                    id="tab_review_{{ book.id }}"
                     role="tab"
                     aria-selected="{% if status_type == 'review' or not status_type %}true{% else %}false{% endif %}"
-                    aria-controls="review-{{ book.id }}"
+                    aria-controls="review_{{ book.id }}"
                     data-category="tab-option-{{ book.id }}">
                     {% trans "Review" %}
                 </a>
@@ -20,10 +20,10 @@
             <li class="{% if status_type == 'comment' %}is-active{% endif %}">
                 <a
                     href="{{ request.path }}?status_type=comment&book={{ book.id}}"
-                    id="tab-comment-{{ book.id }}"
+                    id="tab_comment_{{ book.id }}"
                     role="tab"
                     aria-selected="{% if status_type == 'comment' %}true{% else %}false{% endif %}"
-                    aria-controls="comment-{{ book.id}}"
+                    aria-controls="comment_{{ book.id}}"
                     data-category="tab-option-{{ book.id }}">
                     {% trans "Comment" %}
                 </a>
@@ -31,10 +31,10 @@
             <li class="{% if status_type == 'quote' %}is-active{% endif %}">
                 <a
                     href="{{ request.path }}?status_type=quote&book={{ book.id }}"
-                    id="tab-quote-{{ book.id }}"
+                    id="tab_quote_{{ book.id }}"
                     role="tab"
                     aria-selected="{% if status_type == 'quote' %}true{% else %}false{% endif %}"
-                    aria-controls="quote-{{ book.id }}"
+                    aria-controls="quote_{{ book.id }}"
                     data-category="tab-option-{{ book.id }}">
                     {% trans "Quote" %}
                 </a>
@@ -42,21 +42,21 @@
         </ul>
     </div>
 
-    <div class="tab-option-{{ book.id }}" id="review-{{ book.id }}" role="tabpanel" aria-labelledby="tab-review-{{ book.id }}" {% if status_type and status_type != "review" %}hidden{% endif %}>
+    <div class="tab-option-{{ book.id }}" id="review_{{ book.id }}" role="tabpanel" aria-labelledby="tab_review_{{ book.id }}" {% if status_type and status_type != "review" %}hidden{% endif %}>
         {% with 0|uuid as uuid %}
-        {% include 'snippets/create_status_form.html' with type='review' %}
+        {% include 'snippets/create_status/status.html' with type="review" %}
         {% endwith %}
     </div>
 
-    <div class="tab-option-{{ book.id }}" id="comment-{{ book.id }}" role="tabpanel" aria-labelledby="tab-comment-{{ book.id }}" {% if status_type != "comment" %}hidden{% endif %}>
+    <div class="tab-option-{{ book.id }}" id="comment_{{ book.id }}" role="tabpanel" aria-labelledby="tab_comment_{{ book.id }}" {% if status_type != "comment" %}hidden{% endif %}>
         {% with 0|uuid as uuid %}
-        {% include 'snippets/create_status_form.html' with type="comment" placeholder="Some thoughts on '"|add:book.title|add:"'" %}
+        {% include 'snippets/create_status/status.html' with type="comment" %}
         {% endwith %}
     </div>
 
-    <div class="tab-option-{{ book.id }}" id="quote-{{ book.id }}" role="tabpanel" aria-labelledby="tab-quote-{{ book.id }}" {% if status_type != "quote" %}hidden{% endif %}>
+    <div class="tab-option-{{ book.id }}" id="quote_{{ book.id }}" role="tabpanel" aria-labelledby="tab_quote_{{ book.id }}" {% if status_type != "quote" %}hidden{% endif %}>
         {% with 0|uuid as uuid %}
-        {% include 'snippets/create_status_form.html' with type="quotation" placeholder="An excerpt from '"|add:book.title|add:"'" %}
+        {% include 'snippets/create_status/status.html' with type="quotation" %}
         {% endwith %}
     </div>
 </div>
diff --git a/bookwyrm/templates/snippets/create_status/comment.html b/bookwyrm/templates/snippets/create_status/comment.html
new file mode 100644
index 00000000..d830ddcb
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/comment.html
@@ -0,0 +1,49 @@
+{% extends "snippets/create_status/layout.html" %}
+{% load bookwyrm_tags %}
+{% load i18n %}
+{% load utilities %}
+{% load status_display %}
+
+{% comment %}
+----- Variables
+book: the Edition object this status is related to. Required unless the status is a reply
+draft: the content of an existing Status object to be edited (used in delete and redraft)
+uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
+{% endcomment %}
+
+{% with type="comment" %}
+{% trans "Some thoughts on the book" as placeholder %}
+
+{% block post_content_additions %}
+    {# Supplemental fields #}
+    <div>
+        {% active_shelf book as active_shelf %}
+        {% if active_shelf.shelf.identifier == 'reading' and book.latest_readthrough %}
+
+        {% with readthrough=book.latest_readthrough %}
+        <div class="field">
+            <input type="hidden" name="id" value="{{ readthrough.id }}"/>
+            <label class="label" for="progress_{{ uuid }}">{% trans "Progress:" %}</label>
+            <div class="field has-addons mb-0">
+                <div class="control">
+                    <input aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{% firstof draft.progress readthrough.progress '' %}" id="progress_{{ uuid }}">
+                </div>
+                <div class="control">
+                    <div class="select">
+                        <select name="progress_mode" aria-label="Progress mode">
+                            <option value="PG" {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
+                            <option value="PCT" {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            {% if readthrough.progress_mode == 'PG' and book.pages %}
+            <p class="help">{% blocktrans with pages=book.pages %}of {{ pages }} pages{% endblocktrans %}</p>
+            {% endif %}
+        </div>
+        {% endwith %}
+        {% endif %}
+    </div>
+{% endblock %}
+
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html
new file mode 100644
index 00000000..583a73d6
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/content_field.html
@@ -0,0 +1,19 @@
+{% load i18n %}
+{% load status_display %}
+{% load utilities %}
+{% comment %}
+type: used to differentiate html id fields when multiple types of posting are available for a book (options: comment, quotation, review, direct, reply)
+book: the Edition object related to the status
+reply_parent: if applicable, the Status object that this post is in reply to
+mention: a user who is @ mentioned by default in the post
+draft: an existing Status object that is providing default values for input fields
+{% endcomment %}
+<textarea
+    name="content"
+    class="textarea"
+    id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
+    placeholder="{{ placeholder }}"
+    aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"
+    required
+>{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
+
diff --git a/bookwyrm/templates/snippets/content_warning_field.html b/bookwyrm/templates/snippets/create_status/content_warning_field.html
similarity index 69%
rename from bookwyrm/templates/snippets/content_warning_field.html
rename to bookwyrm/templates/snippets/create_status/content_warning_field.html
index 51c2649b..de637bcc 100644
--- a/bookwyrm/templates/snippets/content_warning_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_warning_field.html
@@ -1,12 +1,12 @@
 {% load i18n %}
-<div class="control{% if not parent_status.content_warning and not draft.content_warning %} is-hidden{% endif %}" id="spoilers-{{ uuid }}">
-    <label class="is-sr-only" for="id_content_warning-{{ uuid }}">{% trans "Spoiler alert:" %}</label>
+<div class="control{% if not parent_status.content_warning and not draft.content_warning %} is-hidden{% endif %}" id="spoilers_{{ uuid }}">
+    <label class="is-sr-only" for="id_content_warning_{{ uuid }}">{% trans "Spoiler alert:" %}</label>
     <input
         type="text"
         name="content_warning"
         maxlength="255"
         class="input"
-        id="id_content_warning-{{ uuid }}"
+        id="id_content_warning_{{ uuid }}"
         placeholder="{% trans 'Spoilers ahead!' %}"
         value="{% firstof draft.content_warning parent_status.content_warning '' %}">
 </div>
diff --git a/bookwyrm/templates/snippets/create_status/content_warning_toggle.html b/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
new file mode 100644
index 00000000..40668a42
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+
+<div class="control">
+    <input type="checkbox" class="is-hidden" name="sensitive" id="id_show_spoilers_{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
+    {% trans "Include spoiler alert" as button_text %}
+    {% firstof draft.content_warning status.content_warning as pressed %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=pressed %}
+</div>
diff --git a/bookwyrm/templates/snippets/create_status/direct.html b/bookwyrm/templates/snippets/create_status/direct.html
new file mode 100644
index 00000000..af6def0e
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/direct.html
@@ -0,0 +1,7 @@
+{% extends "snippets/create_status/layout.html" %}
+{# ----- Variables -----
+type: the format of the status. options are "comment" "quotation" "review" "direct" "reply"
+mention: the User object of a user who will show up at @ mentioned by default
+draft: the content of an existing Status object to be edited (used in delete and redraft)
+uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
+#}
diff --git a/bookwyrm/templates/snippets/create_status/layout.html b/bookwyrm/templates/snippets/create_status/layout.html
new file mode 100644
index 00000000..5b435f27
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/layout.html
@@ -0,0 +1,57 @@
+{% load bookwyrm_tags %}
+{% load i18n %}
+{% load utilities %}
+{% load status_display %}
+
+{% comment %}
+----- Variables
+book: the Edition object this status is related to. Required unless the status is a reply
+draft: the content of an existing Status object to be edited (used in delete and redraft)
+uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
+type: used for uniquely identifying the html elements when mutliple types of posts are available for a book, and usually the endpoint name that the form posts to
+reply_parent: the Status object this post will be in reply to, if applicable
+{% endcomment %}
+
+{% block form_open %}
+{# default form tag syntax, can be overriddden #}
+<form class="is-flex-grow-1" name="{{ type }}" action="/post/{{ type }}" method="post" id="tab_{{ type }}_{{ book.id }}{{ reply_parent.id }}">
+{% endblock %}
+
+    {% csrf_token %}
+
+    {% block initial_fields %}
+    <input type="hidden" name="book" value="{{ book.id }}">
+    <input type="hidden" name="user" value="{{ request.user.id }}">
+    <input type="hidden" name="reply_parent" value="{% firstof draft.reply_parent.id reply_parent.id %}">
+    {% endblock %}
+
+    <div class="field">
+        <div class="control">
+            {% include "snippets/create_status/content_warning_field.html" %}
+        </div>
+
+        {# fields that go between the content warnings and the content field (ie, quote) #}
+        {% block pre_content_additions %}{% endblock %}
+
+        <label class="label" for="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}">
+            {% block content_label %}
+                {% trans "Comment:" %}
+            {% endblock %}
+        </label>
+
+        <div class="control">
+            {% include "snippets/create_status/content_field.html" with placeholder=placeholder %}
+        </div>
+    </div>
+
+    {# additional fields that go after the content block (ie, progress) #}
+    {% block post_content_additions %}{% endblock %}
+
+    {% block options_block %}
+    {# cw, post privacy, and submit button #}
+    {% include "snippets/create_status/post_options_block.html" %}
+    {% endblock %}
+
+{% block form_close %}
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/create_status/post_options_block.html b/bookwyrm/templates/snippets/create_status/post_options_block.html
new file mode 100644
index 00000000..6cfb0c5c
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/post_options_block.html
@@ -0,0 +1,22 @@
+{% load i18n %}
+<div class="columns mt-1">
+    <div class="field has-addons column">
+        {% include "snippets/create_status/content_warning_toggle.html" %}
+        <div class="control">
+        {% if type == 'direct' %}
+            <input type="hidden" name="privacy" value="direct">
+            <button type="button" class="button" aria-label="Privacy" disabled>{% trans "Private" %}</button>
+        {% else %}
+            {% if draft %}
+            {% include 'snippets/privacy_select.html' with current=draft.privacy %}
+            {% else %}
+            {% include 'snippets/privacy_select.html' with current=reply_parent.privacy %}
+            {% endif %}
+        {% endif %}
+        </div>
+    </div>
+    <div class="column is-narrow">
+        <button class="button is-link" type="submit">{% trans "Post" %}</button>
+    </div>
+</div>
+
diff --git a/bookwyrm/templates/snippets/create_status/quotation.html b/bookwyrm/templates/snippets/create_status/quotation.html
new file mode 100644
index 00000000..03e9c25b
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/quotation.html
@@ -0,0 +1,34 @@
+{% extends "snippets/create_status/layout.html" %}
+{% load bookwyrm_tags %}
+{% load utilities %}
+{% load status_display %}
+{% load i18n %}
+
+{% comment %}
+----- Variables
+book: the Edition object this status is related to. Required unless the status is a reply
+draft: the content of an existing Status object to be edited (used in delete and redraft)
+uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
+{% endcomment %}
+
+{% with type="quotation" %}
+
+{% block pre_content_additions %}
+    <div class="field">
+        <label class="label" for="id_quote_{{ book.id }}_{{ type }}">
+            {% trans "Quote:" %}
+        </label>
+
+        <div class="control">
+            <textarea
+                name="quote"
+                class="textarea"
+                id="id_quote_{{ book.id }}_{{ type }}"
+                placeholder="{% blocktrans with book_title=book.title %}An excerpt from '{{ book_title }}'{% endblocktrans %}"
+                required
+            >{{ draft.quote|default:'' }}</textarea>
+        </div>
+    </div>
+{% endblock %}
+
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/create_status/reply.html b/bookwyrm/templates/snippets/create_status/reply.html
new file mode 100644
index 00000000..deb17887
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/reply.html
@@ -0,0 +1,10 @@
+{% extends "snippets/create_status/layout.html" %}
+{# ----- Variables -----
+reply_parent: the parent status, if the status is a reply
+type: the format of the status. options are "comment" "quotation" "review" "direct" "reply"
+mention: the User object of a user who will show up at @ mentioned by default
+draft: the content of an existing Status object to be edited (used in delete and redraft)
+uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
+#}
+
+{% block content_label %}{% endblock %}
diff --git a/bookwyrm/templates/snippets/create_status/review.html b/bookwyrm/templates/snippets/create_status/review.html
new file mode 100644
index 00000000..be17b7f2
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/review.html
@@ -0,0 +1,35 @@
+{% extends "snippets/create_status/layout.html" %}
+{% load bookwyrm_tags %}
+{% load utilities %}
+{% load status_display %}
+{% load i18n %}
+
+{% comment %}
+----- Variables
+book: the Edition object this status is related to. Required unless the status is a reply
+draft: the content of an existing Status object to be edited (used in delete and redraft)
+uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
+{% endcomment %}
+
+{% with type="review" %}
+
+{% block pre_content_additions %}
+    <div class="field">
+        <label class="label" for="id_name_{{ book.id }}">{% trans "Title:" %}</label>
+        <div class="control">
+            <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}" placeholder="{% blocktrans with book_title=book.title %}Your review of '{{ book_title }}'{% endblocktrans %}" value="{% firstof draft.name ''%}">
+        </div>
+    </div>
+
+    <fieldset class="mb-1">
+        <legend class="is-sr-only">{% trans "Rating" %}</legend>
+
+        {% include 'snippets/form_rate_stars.html' with book=book type=type|default:'summary' default_rating=draft.rating %}
+    </fieldset>
+{% endblock %}
+
+{% block content_label %}
+    {% trans "Review:" %}
+{% endblock %}
+
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/create_status/status.html b/bookwyrm/templates/snippets/create_status/status.html
new file mode 100644
index 00000000..5228e20c
--- /dev/null
+++ b/bookwyrm/templates/snippets/create_status/status.html
@@ -0,0 +1,2 @@
+{# allows the "type" variable to inherit properly to the layout #}
+{% include 'snippets/create_status/'|add:type|add:'.html' %}
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
deleted file mode 100644
index c4e5045e..00000000
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ /dev/null
@@ -1,131 +0,0 @@
-{% load bookwyrm_tags %}
-{% load utilities %}
-{% load status_display %}
-
-{% load i18n %}
-<form class="is-flex-grow-1" name="{{ type }}" action="/post/{% if type == 'direct' %}status{% else %}{{ type }}{% endif %}" method="post" id="tab-{{ type }}-{{ book.id }}{{ reply_parent.id }}">
-    {% csrf_token %}
-    <input type="hidden" name="book" value="{{ book.id }}">
-    <input type="hidden" name="user" value="{{ request.user.id }}">
-    <input type="hidden" name="reply_parent" value="{% firstof draft.reply_parent.id reply_parent.id %}">
-    {% if type == 'review' %}
-    <div class="field">
-        <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title" %}:</label>
-        <div class="control">
-            <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'" value="{% firstof draft.name ''%}">
-        </div>
-    </div>
-    {% endif %}
-    <div class="field">
-        {% if type != 'reply' and type != 'direct'  %}
-        <label class="label{% if type == 'review' %} mb-0{% endif %}" for="id_{% if type == 'quotation' %}quote{% else %}content{% endif %}_{{ book.id }}_{{ type }}">
-            {% if type == 'comment' %}
-            {% trans "Comment:" %}
-            {% elif type == 'quotation' %}
-            {% trans "Quote:" %}
-            {% elif type == 'review' %}
-            {% trans "Review:" %}
-            {% endif %}
-        </label>
-        {% endif %}
-
-        {% if type == 'review' %}
-        <fieldset class="mb-1">
-            <legend class="is-sr-only">{% trans "Rating" %}</legend>
-
-            {% include 'snippets/form_rate_stars.html' with book=book type=type|default:'summary' default_rating=draft.rating %}
-        </fieldset>
-        {% endif %}
-
-        <div class="control">
-            {% if type == 'quotation' %}
-            <textarea
-                name="quote"
-                class="textarea"
-                id="id_quote_{{ book.id }}_{{ type }}"
-                placeholder="{{ placeholder }}"
-                required
-            >{{ draft.quote|default:'' }}</textarea>
-            {% else %}
-            {% include 'snippets/content_warning_field.html' with parent_status=status %}
-            <textarea
-                name="content"
-                class="textarea"
-                id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}"
-                placeholder="{{ placeholder }}"
-                aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans "Content" %}{% endif %}"
-                required
-            >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
-            {% endif %}
-        </div>
-    </div>
-
-    {# Supplemental fields #}
-    {% if type == 'quotation' %}
-    <div class="field">
-        <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment" %}:</label>
-        {% include 'snippets/content_warning_field.html' with parent_status=status %}
-        <div class="control">
-            <textarea name="content" class="textarea" rows="3" id="id_content_quote-{{ book.id }}">{{ draft.content|default:'' }}</textarea>
-        </div>
-    </div>
-    {% elif type == 'comment' %}
-    <div>
-        {% active_shelf book as active_shelf %}
-        {% if active_shelf.shelf.identifier == 'reading' and book.latest_readthrough %}
-
-        {% with readthrough=book.latest_readthrough %}
-        <div class="field">
-            <input type="hidden" name="id" value="{{ readthrough.id }}"/>
-            <label class="label" for="progress-{{ uuid }}">{% trans "Progress:" %}</label>
-            <div class="field has-addons mb-0">
-                <div class="control">
-                    <input aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{% firstof draft.progress readthrough.progress '' %}" id="progress-{{ uuid }}">
-                </div>
-                <div class="control">
-                    <div class="select">
-                        <select name="progress_mode" aria-label="Progress mode">
-                            <option value="PG" {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
-                            <option value="PCT" {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-            {% if readthrough.progress_mode == 'PG' and book.pages %}
-            <p class="help">{% blocktrans with pages=book.pages %}of {{ pages }} pages{% endblocktrans %}</p>
-            {% endif %}
-        </div>
-        {% endwith %}
-        {% endif %}
-    </div>
-    {% endif %}
-
-
-    {# bottom bar #}
-    <input type="checkbox" class="is-hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
-
-    <div class="columns mt-1">
-        <div class="field has-addons column">
-            <div class="control">
-                {% trans "Include spoiler alert" as button_text %}
-                {% firstof draft.content_warning status.content_warning as pressed %}
-                {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=pressed %}
-            </div>
-            <div class="control">
-            {% if type == 'direct' %}
-                <input type="hidden" name="privacy" value="direct">
-                <button type="button" class="button" aria-label="Privacy" disabled>{% trans "Private" %}</button>
-            {% else %}
-                {% if draft %}
-                {% include 'snippets/privacy_select.html' with current=draft.privacy %}
-                {% else %}
-                {% include 'snippets/privacy_select.html' with current=reply_parent.privacy %}
-                {% endif %}
-            {% endif %}
-            </div>
-        </div>
-        <div class="column is-narrow">
-            <button class="button is-link" type="submit">{% trans "Post" %}</button>
-        </div>
-    </div>
-</form>
diff --git a/bookwyrm/templates/snippets/delete_readthrough_modal.html b/bookwyrm/templates/snippets/delete_readthrough_modal.html
index e1560f93..24d0ff98 100644
--- a/bookwyrm/templates/snippets/delete_readthrough_modal.html
+++ b/bookwyrm/templates/snippets/delete_readthrough_modal.html
@@ -15,6 +15,6 @@
         {% trans "Delete" %}
     </button>
     {% trans "Cancel" as button_text %}
-    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete-readthrough" controls_uid=readthrough.id %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete_readthrough" controls_uid=readthrough.id %}
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index 6c4cfe9a..0670b4c5 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -4,7 +4,7 @@
 
 {% with status.id|uuid as uuid %}
 {% with request.user|liked:status as liked %}
-<form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if liked %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
+<form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav_{{ status.id }}_{{ uuid }} {% if liked %}is-hidden{% endif %}" data-id="fav_{{ status.id }}_{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small is-light is-transparent" type="submit">
         <span class="icon icon-heart m-0-mobile" title="{% trans 'Like' %}">
@@ -12,7 +12,7 @@
         <span class="is-sr-only-mobile">{% trans "Like" %}</span>
     </button>
 </form>
-<form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not liked %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
+<form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav_{{ status.id }}_{{ uuid }} active {% if not liked %}is-hidden{% endif %}" data-id="fav_{{ status.id }}_{{ uuid }}">
     {% csrf_token %}
     <button class="button is-light is-transparent is-small" type="submit">
         <span class="icon icon-heart has-text-primary m-0-mobile" title="{% trans 'Un-like' %}"></span>
diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index 8cafad7f..530322b9 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -6,7 +6,7 @@
 
 <div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
     <div class="control">
-        <form action="{% url 'follow' %}" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow-{{ user.id }}">
+        <form action="{% url 'follow' %}" method="POST" class="interaction follow_{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow_{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
             <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">
@@ -17,7 +17,7 @@
                 {% endif %}
             </button>
         </form>
-        <form action="{% url 'unfollow' %}" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow-{{ user.id }}">
+        <form action="{% url 'unfollow' %}" method="POST" class="interaction follow_{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow_{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
             {% if user.manually_approves_followers and request.user not in user.followers.all %}
diff --git a/bookwyrm/templates/snippets/form_rate_stars.html b/bookwyrm/templates/snippets/form_rate_stars.html
index e1e36477..fe2a2f03 100644
--- a/bookwyrm/templates/snippets/form_rate_stars.html
+++ b/bookwyrm/templates/snippets/form_rate_stars.html
@@ -7,7 +7,7 @@
     {% if classes %}{{classes}}{% endif%}
 ">
     <input
-        id="{{ type|slugify }}-{{ book.id }}-no-rating"
+        id="{{ type|slugify }}_{{ book.id }}_no_rating"
         class="is-sr-only"
         type="radio"
         name="rating"
@@ -15,13 +15,13 @@
         {% if default_rating == 0 or not default_rating %}checked{% endif %}
     >
 
-    <label class="is-sr-only" for="{{ type|slugify }}-{{ book.id }}-no-rating">
+    <label class="is-sr-only" for="{{ type|slugify }}_{{ book.id }}_no_rating">
         {% trans "No rating" %}
     </label>
 
     {% for i in '12345'|make_list %}
         <input
-            id="{{ type|slugify }}-book{{ book.id }}-star-{{ forloop.counter }}"
+            id="{{ type|slugify }}_book{{ book.id }}_star_{{ forloop.counter }}"
             class="is-sr-only"
             type="radio"
             name="rating"
@@ -38,7 +38,7 @@
                 icon-star-empty
                 {% endif %}
             "
-            for="{{ type|slugify }}-book{{ book.id }}-star-{{ forloop.counter }}"
+            for="{{ type|slugify }}_book{{ book.id }}_star_{{ forloop.counter }}"
         >
             <span class="is-sr-only">
                 {% blocktranslate trimmed count rating=forloop.counter %}
diff --git a/bookwyrm/templates/snippets/generated_status/goal.html b/bookwyrm/templates/snippets/generated_status/goal.html
index 46572265..2209435c 100644
--- a/bookwyrm/templates/snippets/generated_status/goal.html
+++ b/bookwyrm/templates/snippets/generated_status/goal.html
@@ -1 +1,6 @@
-{% load i18n %}{% load humanize %}{% blocktrans count counter=goal.goal with counter=goal.goal year=goal.year %}set a goal to read {{ counter }} book in {{ year }}{% plural %}set a goal to read {{ counter }} books in {{ year }}{% endblocktrans %}
+{% load i18n %}{% load humanize %}
+{% blocktranslate trimmed count counter=goal.goal with counter=goal.goal year=goal.year %}
+set a goal to read {{ counter }} book in {{ year }}
+{% plural %}
+set a goal to read {{ counter }} books in {{ year }}
+{% endblocktranslate %}
diff --git a/bookwyrm/templates/snippets/generated_status/rating.html b/bookwyrm/templates/snippets/generated_status/rating.html
index b70171cd..2e9fb601 100644
--- a/bookwyrm/templates/snippets/generated_status/rating.html
+++ b/bookwyrm/templates/snippets/generated_status/rating.html
@@ -1,3 +1,7 @@
-{% load i18n %}{% load humanize %}
+{% load i18n %}{% load humanize %}{% load utilities %}
 
-{% blocktrans with title=book.title path=book.remote_id display_rating=rating|floatformat:"0" count counter=rating %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ display_rating }} star{% plural %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ display_rating }} stars{% endblocktrans %}
+{% blocktrans trimmed with title=book|book_title path=book.remote_id display_rating=rating|floatformat:"0" count counter=rating|add:0 %}
+rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ display_rating }} star
+{% plural %}
+rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ display_rating }} stars
+{% endblocktrans %}
diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
index 30ea1839..09f052a7 100644
--- a/bookwyrm/templates/snippets/goal_form.html
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -30,7 +30,7 @@
         <button type="submit" class="button is-link">{% trans "Set goal" %}</button>
         {% if goal %}
         {% trans "Cancel" as button_text %}
-        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="show-edit-goal" %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="show_edit_goal" %}
         {% endif %}
     </p>
 </form>
diff --git a/bookwyrm/templates/snippets/privacy_select.html b/bookwyrm/templates/snippets/privacy_select.html
index d1215cc0..d7184e13 100644
--- a/bookwyrm/templates/snippets/privacy_select.html
+++ b/bookwyrm/templates/snippets/privacy_select.html
@@ -3,10 +3,10 @@
 <div class="select {{ class }}">
     {% with 0|uuid as uuid %}
     {% if not no_label %}
-    <label class="is-sr-only" for="privacy-{{ uuid }}">{% trans "Post privacy" %}</label>
+    <label class="is-sr-only" for="privacy_{{ uuid }}">{% trans "Post privacy" %}</label>
     {% endif %}
     {% firstof current user.default_post_privacy "public" as privacy %}
-    <select name="privacy" id="privacy-{{ uuid }}">
+    <select name="privacy" id="privacy_{{ uuid }}">
         <option value="public" {% if privacy == 'public' %}selected{% endif %}>
             {% trans "Public" %}
         </option>
diff --git a/bookwyrm/templates/snippets/readthrough_form.html b/bookwyrm/templates/snippets/readthrough_form.html
index df602cf7..132472d2 100644
--- a/bookwyrm/templates/snippets/readthrough_form.html
+++ b/bookwyrm/templates/snippets/readthrough_form.html
@@ -3,19 +3,19 @@
 <input type="hidden" name="id" value="{{ readthrough.id }}">
 <input type="hidden" name="book" value="{{ book.id }}">
 <div class="field">
-    <label class="label" tabindex="0" id="add-readthrough-focus" for="id_start_date-{{ readthrough.id }}">
+    <label class="label" tabindex="0" id="add_readthrough_focus_{{ readthrough.id }}" for="id_start_date_{{ readthrough.id }}">
         {% trans "Started reading" %}
     </label>
-    <input type="date" name="start_date" class="input" id="id_start_date-{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
+    <input type="date" name="start_date" class="input" id="id_start_date_{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
 </div>
 {# Only show progress for editing existing readthroughs #}
 {% if readthrough.id and not readthrough.finish_date %}
-<label class="label" for="id_progress-{{ readthrough.id }}">
+<label class="label" for="id_progress_{{ readthrough.id }}">
     {% trans "Progress" %}
 </label>
 <div class="field has-addons">
     <div class="control">
-        <input type="number" name="progress" class="input" id="id_progress-{{ readthrough.id }}" value="{{ readthrough.progress }}">
+        <input type="number" name="progress" class="input" id="id_progress_{{ readthrough.id }}" value="{{ readthrough.progress }}">
     </div>
     <div class="control select">
         <select name="progress_mode" aria-label="Progress mode">
@@ -26,8 +26,8 @@
 </div>
 {% endif %}
 <div class="field">
-    <label class="label" for="id_finish_date-{{ readthrough.id }}">
+    <label class="label" for="id_finish_date_{{ readthrough.id }}">
         {% trans "Finished reading" %}
     </label>
-    <input type="date" name="finish_date" class="input" id="id_finish_date-{{ readthrough.id }}" value="{{ readthrough.finish_date | date:"Y-m-d" }}">
+    <input type="date" name="finish_date" class="input" id="id_finish_date_{{ readthrough.id }}" value="{{ readthrough.finish_date | date:"Y-m-d" }}">
 </div>
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 19414c16..55001aca 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -4,7 +4,7 @@
 {% with 0|uuid as report_uuid %}
 
 {% trans "Report" as button_text %}
-{% include 'snippets/toggle/toggle_button.html' with class="is-danger is-light is-small is-fullwidth" text=button_text controls_text="report" controls_uid=report_uuid focus="modal-title-report" disabled=is_current %}
+{% include 'snippets/toggle/toggle_button.html' with class="is-danger is-light is-small is-fullwidth" text=button_text controls_text="report" controls_uid=report_uuid focus="modal_title_report" disabled=is_current %}
 
 {% include 'moderation/report_modal.html' with user=user reporter=request.user controls_text="report" controls_uid=report_uuid %}
 
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index f7077b26..40a9f6e7 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -19,13 +19,13 @@
     {% endif %}
 </div>
 
-{% include 'snippets/shelve_button/want_to_read_modal.html' with book=active_shelf.book controls_text="want-to-read" controls_uid=uuid no_body=True %}
+{% include 'snippets/shelve_button/want_to_read_modal.html' with book=active_shelf.book controls_text="want_to_read" controls_uid=uuid %}
 
-{% include 'snippets/shelve_button/start_reading_modal.html' with book=active_shelf.book controls_text="start-reading" controls_uid=uuid %}
+{% include 'snippets/shelve_button/start_reading_modal.html' with book=active_shelf.book controls_text="start_reading" controls_uid=uuid %}
 
-{% include 'snippets/shelve_button/finish_reading_modal.html' with book=active_shelf.book controls_text="finish-reading" controls_uid=uuid readthrough=readthrough %}
+{% include 'snippets/shelve_button/finish_reading_modal.html' with book=active_shelf.book controls_text="finish_reading" controls_uid=uuid readthrough=readthrough %}
 
-{% include 'snippets/shelve_button/progress_update_modal.html' with book=active_shelf_book.book controls_text="progress-update" controls_uid=uuid readthrough=readthrough %}
+{% include 'snippets/shelve_button/progress_update_modal.html' with book=active_shelf_book.book controls_text="progress_update" controls_uid=uuid readthrough=readthrough %}
 
 {% endwith %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 69665a82..41e0c9ba 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -10,7 +10,7 @@
 
         {% trans "Start reading" as button_text %}
         {% url 'reading-status' 'start' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current fallback_url=fallback_url %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
     <button type="button" class="button {{ class }}" disabled><span>{% trans "Read" %}</span>
@@ -18,13 +18,13 @@
 
         {% trans "Finish reading" as button_text %}
         {% url 'reading-status' 'finish' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current fallback_url=fallback_url %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
 
         {% trans "Want to read" as button_text %}
         {% url 'reading-status' 'want' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current fallback_url=fallback_url %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.editable %}
         <form name="shelve" action="/shelve/" method="post">
@@ -43,7 +43,7 @@
 {% if readthrough and active_shelf.shelf.identifier != 'read' %}
 <li role="menuitem" class="dropdown-item p-0">
     {% trans "Update progress" as button_text %}
-    {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress-update" controls_uid=button_uuid focus="modal-title-progress-update" %}
+    {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
 </li>
 {% endif %}
 
diff --git a/bookwyrm/templates/snippets/stars.html b/bookwyrm/templates/snippets/stars.html
index ac049f25..ffe4835f 100644
--- a/bookwyrm/templates/snippets/stars.html
+++ b/bookwyrm/templates/snippets/stars.html
@@ -4,7 +4,7 @@
 <span class="stars">
     <span class="is-sr-only">
         {% if rating %}
-            {% blocktranslate trimmed with rating=rating|floatformat count counter=rating|length %}
+            {% blocktranslate trimmed with rating=rating|floatformat:0 count counter=rating|floatformat:0|add:0 %}
                 {{ rating }} star
             {% plural %}
                 {{ rating }} stars
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/body.html
similarity index 93%
rename from bookwyrm/templates/snippets/status/status_body.html
rename to bookwyrm/templates/snippets/status/body.html
index 2c8a0e04..d205f423 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/body.html
@@ -3,7 +3,7 @@
 {% block card-content %}
 {% with status_type=status.status_type %}
 
-{% if status_type == 'GeneratedNote' or status_type == 'Rating' %}
+{% if status_type == 'GeneratedNote' or status_type == 'Rating' or not status.content %}
     {% include 'snippets/status/generated_status.html' with status=status %}
 {% else %}
     {% include 'snippets/status/content_status.html' with status=status %}
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index c33b3452..ec959d59 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -71,7 +71,7 @@
 
                     {% trans "Show more" as button_text %}
 
-                    {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                    {% with text=button_text class="is-small" controls_text="show_status_cw" controls_uid=status.id %}
                         {% include 'snippets/toggle/open_button.html' %}
                     {% endwith %}
                 </div>
@@ -79,21 +79,21 @@
 
             <div
                 {% if status.content_warning %}
-                    id="show-status-cw-{{ status.id }}"
+                    id="show_status_cw_{{ status.id }}"
                     class="is-hidden"
                 {% endif %}
             >
                 {% if status.content_warning %}
                     {% trans "Show less" as button_text %}
 
-                    {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                    {% with text=button_text class="is-small" controls_text="show_status_cw" controls_uid=status.id %}
                         {% include 'snippets/toggle/close_button.html' %}
                     {% endwith %}
                 {% endif %}
 
                 {% if status.quote %}
                     <div class="quote block">
-                        <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
+                        <blockquote dir="auto" class="content mb-2">{{ status.quote|safe }}</blockquote>
 
                         <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
                     </div>
diff --git a/bookwyrm/templates/snippets/status/header.html b/bookwyrm/templates/snippets/status/header.html
new file mode 100644
index 00000000..6135ecaa
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/header.html
@@ -0,0 +1,48 @@
+{% load utilities %}
+{% load status_display %}
+{% load i18n %}
+{% load humanize %}
+
+<div class="media">
+    <figure class="media-left" aria-hidden="true">
+        <a class="image is-48x48" href="{{ status.user.local_path }}">
+            {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
+        </a>
+    </figure>
+
+    <div class="media-content">
+        <h3 class="has-text-weight-bold">
+            <span
+                itemprop="author"
+                itemscope
+                itemtype="https://schema.org/Person"
+            >
+                {% if status.user.avatar %}
+                    <meta itemprop="image" content="/images/{{ status.user.avatar }}">
+                {% endif %}
+
+                <a
+                    href="{{ status.user.local_path }}"
+                    itemprop="url"
+                >
+                    <span itemprop="name">{{ status.user.display_name }}</span>
+                </a>
+            </span>
+
+            {% include "snippets/status/header_content.html" %}
+        </h3>
+        <p class="is-size-7 is-flex is-align-items-center">
+            <a href="{{ status.remote_id }}">{{ status.published_date|published_date }}</a>
+            {% if status.progress %}
+            <span class="ml-1">
+            {% if status.progress_mode == 'PG' %}
+                ({% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %})
+            {% else %}
+                ({{ status.progress }}%)
+            {% endif %}
+            </span>
+            {% endif %}
+            {% include 'snippets/privacy-icons.html' with item=status %}
+        </p>
+    </div>
+</div>
diff --git a/bookwyrm/templates/snippets/status/header_content.html b/bookwyrm/templates/snippets/status/header_content.html
new file mode 100644
index 00000000..f3b52f18
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/header_content.html
@@ -0,0 +1,4 @@
+{% spaceless %}
+{% load status_display %}
+{% get_header_template status %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/headers/comment.html b/bookwyrm/templates/snippets/status/headers/comment.html
new file mode 100644
index 00000000..6886cfed
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/comment.html
@@ -0,0 +1,2 @@
+{% load i18n %}{% load utilities %}
+{% blocktrans with book_path=book.local_path book=status.book|book_title %}commented on <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
diff --git a/bookwyrm/templates/snippets/status/headers/goal.html b/bookwyrm/templates/snippets/status/headers/goal.html
new file mode 100644
index 00000000..e31dec2a
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/goal.html
@@ -0,0 +1,5 @@
+{% spaceless %}
+{% load i18n %}{% load humanize %}
+
+{{ status.content }}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/headers/note.html b/bookwyrm/templates/snippets/status/headers/note.html
new file mode 100644
index 00000000..58c76f64
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/note.html
@@ -0,0 +1,22 @@
+{% spaceless %}
+{% load i18n %}
+{% load status_display %}
+{% load utilities %}
+
+{% if status.status_type == 'GeneratedNote' %}
+{% with book=status.mention_books.first %}
+{{ status.content|safe }} <a href="{{ book.local_path }}">{{ book|book_title }}</a>
+{% endwith %}
+
+{% else %}
+
+{% with parent_status=status|parent %}
+{% if parent_status %}
+{% blocktrans trimmed with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}
+replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>
+{% endblocktrans %}
+{% endif %}
+{% endwith %}
+
+{% endif %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/headers/quotation.html b/bookwyrm/templates/snippets/status/headers/quotation.html
new file mode 100644
index 00000000..a0cbd71b
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/quotation.html
@@ -0,0 +1,2 @@
+{% load i18n %}{% load utilities %}
+{% blocktrans with book_path=status.book.local_path book=status.book|book_title %}quoted <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
diff --git a/bookwyrm/templates/snippets/status/headers/rating.html b/bookwyrm/templates/snippets/status/headers/rating.html
new file mode 100644
index 00000000..bc40c04c
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/rating.html
@@ -0,0 +1,25 @@
+{% load i18n %}{% load utilities %}
+
+{% blocktrans with book_path=status.book.local_path book=status.book|book_title %}rated <a href="{{ book_path }}">{{ book }}</a>:{% endblocktrans %} {% include 'snippets/stars.html' with rating=status.rating %}
+<span
+    itemprop="reviewRating"
+    itemscope
+    itemtype="https://schema.org/Rating"
+>
+    <span class="is-hidden" {{ rating_type }}>
+        <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+        <span
+            itemprop="reviewRating"
+            itemscope
+            itemtype="https://schema.org/Rating"
+        >
+            <span class="is-hidden" {{ rating_type }}>
+                <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                {# @todo Is it possible to not hard-code the value? #}
+                <meta itemprop="bestRating" content="5">
+            </span>
+        </span>
+    </span>
+</span>
diff --git a/bookwyrm/templates/snippets/status/headers/read.html b/bookwyrm/templates/snippets/status/headers/read.html
new file mode 100644
index 00000000..f942c0f0
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/read.html
@@ -0,0 +1,7 @@
+{% spaceless %}
+{% load i18n %}{% load utilities %}
+
+{% with book=status.mention_books.first %}
+{% blocktrans with book_path=book.remote_id book=book|book_title %}finished reading <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% endwith %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/headers/reading.html b/bookwyrm/templates/snippets/status/headers/reading.html
new file mode 100644
index 00000000..460c4cae
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/reading.html
@@ -0,0 +1,9 @@
+{% spaceless %}
+{% load i18n %}
+{% load utilities %}
+
+{% with book=status.mention_books.first %}
+{% blocktrans with book_path=book.remote_id book=book|book_title %}started reading <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% endwith %}
+
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/headers/review.html b/bookwyrm/templates/snippets/status/headers/review.html
new file mode 100644
index 00000000..6be356be
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/review.html
@@ -0,0 +1,3 @@
+{% load i18n %}{% load utilities %}
+
+{% blocktrans with book_path=status.book.local_path book=status.book|book_title %}reviewed <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
diff --git a/bookwyrm/templates/snippets/status/headers/to_read.html b/bookwyrm/templates/snippets/status/headers/to_read.html
new file mode 100644
index 00000000..7b89a775
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/headers/to_read.html
@@ -0,0 +1,8 @@
+{% spaceless %}
+{% load i18n %}
+{% load utilities %}
+
+{% with book=status.mention_books.first %}
+{% blocktrans with book_path=book.remote_id book=book|book_title %}<a href="{{ user_path }}">{{ username }}</a> wants to read <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% endwith %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index b1d361fe..6ffdd0f7 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -4,7 +4,7 @@
 
 {% block card-header %}
 <div class="card-header-title has-background-white-ter is-block">
-    {% include 'snippets/status/status_header.html' with status=status %}
+    {% include 'snippets/status/header.html' with status=status %}
 </div>
 {% endblock %}
 
@@ -12,8 +12,8 @@
 
 {% block card-footer %}
 {% if moderation_mode and perms.bookwyrm.moderate_post %}
-<div class="card-footer-item">
 
+<div class="card-footer-item">
     {# moderation options #}
     <form name="delete-{{ status.id }}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
@@ -22,12 +22,14 @@
         </button>
     </form>
 </div>
+
 {% elif no_interact %}
 {# nothing here #}
 {% elif request.user.is_authenticated %}
+
 <div class="card-footer-item">
     {% trans "Reply" as button_text %}
-    {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon_with_text="comment" class="is-small is-light is-transparent toggle-button" focus="id_content_reply" %}
+    {% include 'snippets/toggle/toggle_button.html' with controls_text="show_comment" controls_uid=status.id text=button_text icon_with_text="comment" class="is-small is-light is-transparent toggle-button" focus="id_content_reply" %}
 </div>
 <div class="card-footer-item">
     {% include 'snippets/boost_button.html' with status=status %}
@@ -57,16 +59,17 @@
         </span>
     </a>
 </div>
+
 {% endif %}
 {% endblock %}
 
 {% block card-bonus %}
 {% if request.user.is_authenticated and not moderation_mode %}
 {% with status.id|uuid as uuid %}
-<section class="is-hidden" id="show-comment-{{ status.id }}">
+<section class="is-hidden" id="show_comment_{{ status.id }}">
     <div class="card-footer">
         <div class="card-footer-item">
-            {% include 'snippets/create_status_form.html' with reply_parent=status type="reply" %}
+            {% include 'snippets/create_status/status.html' with type="reply" reply_parent=status book=None %}
         </div>
     </div>
 </section>
diff --git a/bookwyrm/templates/snippets/status/status.html b/bookwyrm/templates/snippets/status/status.html
index b0de886c..eb0c409e 100644
--- a/bookwyrm/templates/snippets/status/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -8,8 +8,8 @@
             {{ status.user.display_name }}
         </a>
         {% trans "boosted" %}
-        {% include 'snippets/status/status_body.html' with status=status|boosted_status %}
+        {% include 'snippets/status/body.html' with status=status|boosted_status %}
     {% else %}
-        {% include 'snippets/status/status_body.html' with status=status %}
+        {% include 'snippets/status/body.html' with status=status %}
     {% endif %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
deleted file mode 100644
index 2ea9379b..00000000
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ /dev/null
@@ -1,109 +0,0 @@
-{% load utilities %}
-{% load status_display %}
-{% load i18n %}
-{% load humanize %}
-{% load static %}
-
-<div class="media">
-    <figure class="media-left" aria-hidden="true">
-        <a class="image is-48x48" href="{{ status.user.local_path }}">
-            {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
-        </a>
-    </figure>
-
-    <div class="media-content">
-        <h3 class="has-text-weight-bold">
-            <span
-                itemprop="author"
-                itemscope
-                itemtype="https://schema.org/Person"
-            >
-                {% if status.user.avatar %}
-                    <meta itemprop="image" content="{% get_media_prefix %}{{ status.user.avatar }}">
-                {% endif %}
-
-                <a
-                    href="{{ status.user.local_path }}"
-                    itemprop="url"
-                >
-                    <span itemprop="name">{{ status.user.display_name }}</span>
-                </a>
-            </span>
-
-            {% if status.status_type == 'GeneratedNote' %}
-                {{ status.content|safe }}
-            {% elif status.status_type == 'Rating' %}
-                {% trans "rated" %}
-            {% elif status.status_type == 'Review' %}
-                {% trans "reviewed" %}
-            {% elif status.status_type == 'Comment' %}
-                {% trans "commented on" %}
-            {% elif status.status_type == 'Quotation' %}
-                {% trans "quoted" %}
-            {% elif status.reply_parent %}
-                {% with parent_status=status|parent %}
-
-                {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
-                {% endwith %}
-            {% endif %}
-
-            {% if status.book %}
-                {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                    <a href="{{ status.book.local_path }}">{{ status.book|book_title }}</a>{% if status.status_type == 'Rating' %}: {% include 'snippets/stars.html' with rating=status.rating %}
-                    <span
-                        itemprop="reviewRating"
-                        itemscope
-                        itemtype="https://schema.org/Rating"
-                    >
-                    <span class="is-hidden" {{ rating_type }}>
-                        <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                        {% if status.book %}
-                            {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                                <a href="{{ status.book.local_path }}">{{ status.book|book_title }}</a>{% if status.status_type == 'Rating' %}:
-                                <span
-                                    itemprop="reviewRating"
-                                    itemscope
-                                    itemtype="https://schema.org/Rating"
-                                >
-                                <span class="is-hidden" {{ rating_type }}>
-                                    <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                                        {# @todo Is it possible to not hard-code the value? #}
-                                        <meta itemprop="bestRating" content="5">
-                                </span>
-
-                                {% endif %}
-                            {% else %}
-                                {% include 'snippets/book_titleby.html' with book=status.book %}
-                            {% endif %}
-                        {% elif status.mention_books %}
-                            <a href="{{ status.mention_books.first.local_path }}">
-                                {{ status.mention_books.first|book_title }}
-                            </a>
-                        {% endif %}
-                    {% include 'snippets/stars.html' with rating=status.rating %}
-                    {% endif %}
-                {% else %}
-                    {% include 'snippets/book_titleby.html' with book=status.book %}
-                {% endif %}
-            {% elif status.mention_books %}
-                <a href="{{ status.mention_books.first.local_path }}">{{ status.mention_books.first|book_title }}</a>
-            {% endif %}
-
-        </h3>
-        <p class="is-size-7 is-flex is-align-items-center">
-            <a href="{{ status.remote_id }}">{{ status.published_date|published_date }}</a>
-            {% if status.progress %}
-            <span class="ml-1">
-            {% if status.progress_mode == 'PG' %}
-                ({% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %})
-            {% else %}
-                ({{ status.progress }}%)
-            {% endif %}
-            </span>
-            {% endif %}
-            {% include 'snippets/privacy-icons.html' with item=status %}
-        </p>
-    </div>
-</div>
diff --git a/bookwyrm/templates/snippets/toggle/toggle_button.html b/bookwyrm/templates/snippets/toggle/toggle_button.html
index 7a80f342..49740db1 100644
--- a/bookwyrm/templates/snippets/toggle/toggle_button.html
+++ b/bookwyrm/templates/snippets/toggle/toggle_button.html
@@ -8,9 +8,9 @@
         type="submit"
     {% endif %}
     class="{% if not nonbutton %}button {% endif %}{{ class }}{% if button_type %} {{ button_type }}{% endif %}"
-    data-controls="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}"
-    {% if focus %}data-focus-target="{{ focus }}{% if controls_uid %}-{{ controls_uid }}{% endif %}"{% endif %}
-    {% if checkbox %}data-controls-checkbox="{{ checkbox }}{% if controls_uid %}-{{ controls_uid }}{% endif %}"{% endif %}
+    data-controls="{{ controls_text }}{% if controls_uid %}_{{ controls_uid }}{% endif %}"
+    {% if focus %}data-focus-target="{{ focus }}{% if controls_uid %}_{{ controls_uid }}{% endif %}"{% endif %}
+    {% if checkbox %}data-controls-checkbox="{{ checkbox }}{% if controls_uid %}_{{ controls_uid }}{% endif %}"{% endif %}
     {% if label %}aria-label="{{ label }}"{% endif %}
     aria-pressed="{% if pressed %}true{% else %}false{% endif %}"
     {% if disabled %}disabled{% endif %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index f6174a19..d2e8bc30 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -8,8 +8,8 @@
         {% with full|to_markdown|safe as full %}
             {% with full|to_markdown|safe|truncatewords_html:trim_length as trimmed %}
                 {% if not no_trim and trimmed != full %}
-                    <div id="hide-full-{{ uuid }}">
-                        <div class="content" id="trimmed-{{ uuid }}">
+                    <div id="hide_full_{{ uuid }}">
+                        <div class="content" id="trimmed_{{ uuid }}">
                             <div dir="auto">{{ trimmed }}</div>
 
                             <div>
@@ -21,7 +21,7 @@
                         </div>
                     </div>
                     {% if not hide_more %}
-                    <div id="full-{{ uuid }}" class="is-hidden">
+                    <div id="full_{{ uuid }}" class="is-hidden">
                         <div class="content">
                             <div
                                 dir="auto"
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index b2dcb8bb..aecd644a 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -15,7 +15,7 @@
     {% if is_self %}
     <div class="column is-narrow">
         {% trans "Create list" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon_with_text="plus" text=button_text %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create_list" icon_with_text="plus" text=button_text %}
     </div>
     {% endif %}
 </div>
@@ -24,11 +24,11 @@
 
 {% block panel %}
 <section class="block">
-    <form name="create-list" method="post" action="{% url 'lists' %}" class="box is-hidden" id="create-list">
+    <form name="create-list" method="post" action="{% url 'lists' %}" class="box is-hidden" id="create_list">
         <header class="columns">
             <h3 class="title column">{% trans "Create list" %}</h3>
             <div class="column is-narrow">
-                {% include 'snippets/toggle/toggle_button.html' with controls_text="create-list" label="close" class="delete" nonbutton=True %}
+                {% include 'snippets/toggle/toggle_button.html' with controls_text="create_list" label="close" class="delete" nonbutton=True %}
             </div>
         </header>
         {% include 'lists/form.html' %}
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 01a7eee9..32cad25d 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -36,7 +36,7 @@
     {% if is_self %}
     <div class="column is-narrow">
         {% trans "Create shelf" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" controls_text="create_shelf_form" focus="create_shelf_form_header" %}
         <a class="button" href="{% url 'import' %}">{% trans "Import Books" %}</a>
     </div>
     {% endif %}
@@ -45,7 +45,7 @@
 
 {% block panel %}
 <div class="block">
-    {% include 'user/shelf/create_shelf_form.html' with controls_text='create-shelf-form' %}
+    {% include 'user/shelf/create_shelf_form.html' with controls_text='create_shelf_form' %}
 </div>
 
 <div class="block columns is-mobile">
@@ -60,13 +60,13 @@
     {% if is_self and shelf.id %}
     <div class="column is-narrow">
         {% trans "Edit shelf" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit-shelf-form" focus="edit-shelf-form-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_shelf_form" focus="edit_shelf_form_header" %}
     </div>
     {% endif %}
 </div>
 
 <div class="block">
-    {% include 'user/shelf/edit_shelf_form.html' with controls_text="edit-shelf-form" %}
+    {% include 'user/shelf/edit_shelf_form.html' with controls_text="edit_shelf_form" %}
 </div>
 
 <div class="block">
@@ -131,7 +131,7 @@
                     {% endif %}
                 </tr>
                 {% endspaceless %}
-                {% endfor %} 
+                {% endfor %}
             </tbody>
         </table>
         {% else %}
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 2c9d7277..ee924977 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -65,7 +65,7 @@
         </div>
     </div>
     {% for activity in activities %}
-    <div class="block" id="feed-{{ activity.id }}">
+    <div class="block" id="feed_{{ activity.id }}">
         {% include 'snippets/status/status.html' with status=activity %}
     </div>
     {% endfor %}
diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
index 3339a8be..0d013775 100644
--- a/bookwyrm/templatetags/status_display.py
+++ b/bookwyrm/templatetags/status_display.py
@@ -2,6 +2,7 @@
 from dateutil.relativedelta import relativedelta
 from django import template
 from django.contrib.humanize.templatetags.humanize import naturaltime, naturalday
+from django.template.loader import select_template
 from django.utils import timezone
 from bookwyrm import models
 from bookwyrm.templatetags.utilities import get_user_identifier
@@ -35,7 +36,7 @@ def get_parent(status):
     return (
         models.Status.objects.filter(id=status.reply_parent_id)
         .select_subclasses()
-        .get()
+        .first()
     )
 
 
@@ -64,6 +65,16 @@ def get_published_date(date):
     return naturaltime(date)
 
 
+@register.simple_tag()
+def get_header_template(status):
+    """get the path for the status template"""
+    if isinstance(status, models.Boost):
+        status = status.boosted_status
+    filename = "snippets/status/headers/{:s}.html".format(status.status_type.lower())
+    header_template = select_template([filename, "snippets/status/headers/note.html"])
+    return header_template.render({"status": status})
+
+
 @register.simple_tag(takes_context=False)
 def load_book(status):
     """how many users that you follow, follow them"""

From 820eeeb69a6200fb09bc8ecc21054afab0a1c56f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 9 Aug 2021 07:29:08 -0700
Subject: [PATCH 100/272] Lowercase "rate"

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

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index f8113549..22b95922 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -326,7 +326,7 @@ class Status(TestCase):
         self.assertEqual(activity["type"], "Note")
         self.assertEqual(
             activity["content"],
-            'Rated <em><a href="%s">%s</a></em>: 3 stars'
+            'rated <em><a href="%s">%s</a></em>: 3 stars'
             % (self.book.remote_id, self.book.title),
         )
         self.assertEqual(activity["attachment"][0].type, "Document")

From fd56379518f93aa56dcb2e1a64f51fc2a400cc47 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 9 Aug 2021 07:38:43 -0700
Subject: [PATCH 101/272] Updates rss feed view

---
 bookwyrm/tests/views/test_rss_feed.py | 65 ++++++++++++---------------
 bookwyrm/views/rss_feed.py            | 15 ++++++-
 2 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index 3608b043..715add3f 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -1,5 +1,4 @@
 """ testing import """
-
 from unittest.mock import patch
 from django.test import RequestFactory, TestCase
 
@@ -7,57 +6,51 @@ from bookwyrm import models
 from bookwyrm.views import rss_feed
 
 
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class RssFeedView(TestCase):
     """rss feed behaves as expected"""
 
-    def setUp(self):
-        """test data"""
-        self.site = models.SiteSettings.objects.create()
+    def test_rss_feed(self, *_):
+        """load an rss feed"""
+        models.SiteSettings.objects.create()
 
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
-            self.user = models.User.objects.create_user(
-                "rss_user", "rss@test.rss", "password", local=True
-            )
+        user = models.User.objects.create_user(
+            "rss_user", "rss@test.rss", "password", local=True
+        )
 
         work = models.Work.objects.create(title="Test Work")
-        self.book = models.Edition.objects.create(
+        book = models.Edition.objects.create(
             title="Example Edition",
             remote_id="https://example.com/book/1",
             parent_work=work,
         )
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-                self.review = models.Review.objects.create(
-                    name="Review name",
-                    content="test content",
-                    rating=3,
-                    user=self.user,
-                    book=self.book,
-                )
+        models.Review.objects.create(
+            name="Review name",
+            content="test content",
+            rating=3,
+            user=user,
+            book=book,
+        )
 
-                self.quote = models.Quotation.objects.create(
-                    quote="a sickening sense",
-                    content="test content",
-                    user=self.user,
-                    book=self.book,
-                )
+        models.Quotation.objects.create(
+            quote="a sickening sense",
+            content="test content",
+            user=user,
+            book=book,
+        )
 
-                self.generatednote = models.GeneratedNote.objects.create(
-                    content="test content", user=self.user
-                )
+        models.ReadStatus.objects.create(content="test content", user=user)
 
-        self.factory = RequestFactory()
+        factory = RequestFactory()
 
-    @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
-    def test_rss_feed(self, _):
-        """load an rss feed"""
         view = rss_feed.RssFeed()
-        request = self.factory.get("/user/rss_user/rss")
-        request.user = self.user
-        with patch("bookwyrm.models.SiteSettings.objects.get") as site:
-            site.return_value = self.site
-            result = view(request, username=self.user.username)
+        request = factory.get("/user/rss_user/rss")
+        request.user = user
+
+        result = view(request, username=user.username)
         self.assertEqual(result.status_code, 200)
 
         self.assertIn(b"Status updates from rss_user", result.content)
diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py
index 0d3a8902..5faa1624 100644
--- a/bookwyrm/views/rss_feed.py
+++ b/bookwyrm/views/rss_feed.py
@@ -1,6 +1,9 @@
 """ serialize user's posts in rss feed """
 
 from django.contrib.syndication.views import Feed
+from django.template.loader import get_template
+from django.utils.translation import gettext_lazy as _
+
 from .helpers import get_user_from_username, privacy_filter
 
 # pylint: disable=no-self-use, unused-argument
@@ -8,7 +11,15 @@ class RssFeed(Feed):
     """serialize user's posts in rss feed"""
 
     description_template = "rss/content.html"
-    title_template = "rss/title.html"
+
+    def item_title(self, item):
+        """render the item title"""
+        if hasattr(item, "pure_name") and item.pure_name:
+            return item.pure_name
+        title_template = get_template("snippets/status/header_content.html")
+        title = title_template.render({"status": item})
+        template = get_template("rss/title.html")
+        return template.render({"user": item.user, "item_title": title}).strip()
 
     def get_object(self, request, username):  # pylint: disable=arguments-differ
         """the user who's posts get serialized"""
@@ -20,7 +31,7 @@ class RssFeed(Feed):
 
     def title(self, obj):
         """title of the rss feed entry"""
-        return f"Status updates from {obj.display_name}"
+        return _(f"Status updates from {obj.display_name}")
 
     def items(self, obj):
         """the user's activity feed"""

From 1d4a507ea989c4b50a649b03ee622690c1657a87 Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Mon, 9 Aug 2021 22:19:54 -0500
Subject: [PATCH 102/272] spanish translations

---
 locale/es/LC_MESSAGES/django.mo | Bin 44832 -> 48721 bytes
 locale/es/LC_MESSAGES/django.po | 425 ++++++++++++++++++--------------
 2 files changed, 245 insertions(+), 180 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index c73db384d7792b0008f0fef891c4d286b5a253f7..b513f8bea03848f7868f11b1077010abf926a98a 100644
GIT binary patch
delta 17431
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
F{{XnrN)iA7

delta 14215
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 31ccd53c..6051b159 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 16:23+0000\n"
+"POT-Creation-Date: 2021-08-10 02:58+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,8 @@ msgstr "Orden de la lista"
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:309 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:309
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
@@ -83,7 +84,7 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159
+#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "nombre de usuario"
 
@@ -191,7 +192,7 @@ msgstr "Ver en LibraryThing"
 
 #: bookwyrm/templates/author/author.html:93
 msgid "View on Goodreads"
-msgstr ""
+msgstr "Ver en Goodreads"
 
 #: bookwyrm/templates/author/author.html:108
 #, python-format
@@ -307,8 +308,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: bookwyrm/templates/book/book.html:48
-#: bookwyrm/templates/discover/large-book.html:25
-#: bookwyrm/templates/discover/small-book.html:19
+#: bookwyrm/templates/discover/large-book.html:22
+#: bookwyrm/templates/landing/large-book.html:25
+#: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "por"
 
@@ -492,6 +494,7 @@ msgid "Back"
 msgstr "Volver"
 
 #: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "Título:"
 
@@ -528,10 +531,12 @@ msgid "Authors"
 msgstr "Autores"
 
 #: bookwyrm/templates/book/edit_book.html:202
+#, python-format
 msgid "Remove %(name)s"
 msgstr "Quitar %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:205
+#, python-format
 msgid "Author page for %(name)s"
 msgstr "Página de autor por %(name)s"
 
@@ -688,32 +693,32 @@ msgstr "Confirmar tu dirección de correo electrónico"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:13
 msgid "A confirmation code has been sent to the email address you used to register your account."
-msgstr ""
+msgstr "Un código de confirmación ha sido enviado a la dirección de correo electrónico que usaste para registrar tu cuenta."
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:15
 msgid "Sorry! We couldn't find that code."
-msgstr ""
+msgstr "Sentimos que no pudimos encontrar ese código"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
 msgid "Confirmation code:"
 msgstr "Código de confirmación:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/landing/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "Enviar"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:32
 msgid "Can't find your code?"
-msgstr ""
+msgstr "¿No puedes encontrar tu código?"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:4
 msgid "Resend confirmation link"
-msgstr ""
+msgstr "Reenviar enlace de confirmación"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/landing/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -738,7 +743,7 @@ msgstr "Comunidad federalizada"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:94
 msgid "Directory"
 msgstr "Directorio"
 
@@ -808,69 +813,47 @@ msgstr "Usuarios de BookWyrm"
 msgid "All known users"
 msgstr "Todos los usuarios conocidos"
 
-#: bookwyrm/templates/discover/about.html:7
+#: bookwyrm/templates/discover/discover.html:4
+#: bookwyrm/templates/discover/discover.html:10
+#: bookwyrm/templates/layout.html:71
+msgid "Discover"
+msgstr "Descubrir"
+
+#: bookwyrm/templates/discover/discover.html:12
 #, python-format
-msgid "About %(site_name)s"
-msgstr "Sobre %(site_name)s"
+msgid "See what's new in the local %(site_name)s community"
+msgstr "Ver que es nuevo en la comunidad local de %(site_name)s"
 
-#: bookwyrm/templates/discover/about.html:10
-#: bookwyrm/templates/discover/about.html:20
-msgid "Code of Conduct"
-msgstr "Código de conducta"
+#: bookwyrm/templates/discover/large-book.html:46
+#: bookwyrm/templates/discover/small-book.html:32
+msgid "rated"
+msgstr "calificó"
 
-#: bookwyrm/templates/discover/about.html:13
-#: bookwyrm/templates/discover/about.html:29
-msgid "Privacy Policy"
-msgstr "Política de privacidad"
+#: bookwyrm/templates/discover/large-book.html:48
+#: bookwyrm/templates/discover/small-book.html:34
+msgid "reviewed"
+msgstr "reseñó"
 
-#: bookwyrm/templates/discover/discover.html:6
-msgid "Recent Books"
-msgstr "Libros recientes"
+#: bookwyrm/templates/discover/large-book.html:50
+#: bookwyrm/templates/discover/small-book.html:36
+msgid "commented on"
+msgstr "comentó en"
 
-#: bookwyrm/templates/discover/landing_layout.html:5
-#: bookwyrm/templates/get_started/layout.html:5
-msgid "Welcome"
-msgstr "Bienvenidos"
+#: bookwyrm/templates/discover/large-book.html:52
+#: bookwyrm/templates/discover/small-book.html:38
+msgid "quoted"
+msgstr "citó"
 
-#: bookwyrm/templates/discover/landing_layout.html:17
-msgid "Decentralized"
-msgstr "Descentralizado"
-
-#: bookwyrm/templates/discover/landing_layout.html:23
-msgid "Friendly"
-msgstr "Amigable"
-
-#: bookwyrm/templates/discover/landing_layout.html:29
-msgid "Anti-Corporate"
-msgstr "Anti-corporativo"
-
-#: bookwyrm/templates/discover/landing_layout.html:44
-#, python-format
-msgid "Join %(name)s"
-msgstr "Unirse con %(name)s"
-
-#: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "Esta instancia está cerrada."
-
-#: bookwyrm/templates/discover/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr "¡Gracias! Tu solicitud ha sido recibido."
-
-#: bookwyrm/templates/discover/landing_layout.html:60
-msgid "Request an Invitation"
-msgstr "Solicitar una invitación"
-
-#: bookwyrm/templates/discover/landing_layout.html:79
-msgid "Your Account"
-msgstr "Tu cuenta"
+#: bookwyrm/templates/discover/large-book.html:68
+#: bookwyrm/templates/discover/small-book.html:52
+msgid "View status"
+msgstr "Ver status"
 
 #: bookwyrm/templates/email/confirm/html_content.html:6
 #: bookwyrm/templates/email/confirm/text_content.html:4
 #, python-format
 msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
-msgstr ""
+msgstr "¡Un paso final antes de unirte a %(site_name)s! Por favor, confirma tu dirección de correo electrónico por hacer clic en el enlace de abajo:"
 
 #: bookwyrm/templates/email/confirm/html_content.html:11
 msgid "Confirm Email"
@@ -879,16 +862,16 @@ msgstr "Confirmar correo electrónico"
 #: bookwyrm/templates/email/confirm/html_content.html:15
 #, python-format
 msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
-msgstr ""
+msgstr "O ingrese el código \"<code>%(confirmation_code)s</code>\" al iniciar sesión."
 
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
-msgstr ""
+msgstr "Por favor, confirma tu correo electrónico"
 
 #: bookwyrm/templates/email/confirm/text_content.html:10
 #, python-format
 msgid "Or enter the code \"%(confirmation_code)s\" at login."
-msgstr ""
+msgstr "O ingrese el código \"%(confirmation_code)s\" al iniciar sesión."
 
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
@@ -958,7 +941,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Direct Messages"
 msgstr "Mensajes directos"
 
@@ -971,6 +954,7 @@ msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
 #: bookwyrm/templates/feed/feed.html:22
+#, python-format
 msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
 msgstr "cargar <span data-poll=\"stream/%(tab.key)s\">0</span> status(es) no leído(s)"
 
@@ -1073,6 +1057,11 @@ msgstr "No se encontró ningún libro"
 msgid "Save &amp; continue"
 msgstr "Guardar &amp; continuar"
 
+#: bookwyrm/templates/get_started/layout.html:5
+#: bookwyrm/templates/landing/landing_layout.html:5
+msgid "Welcome"
+msgstr "Bienvenidos"
+
 #: bookwyrm/templates/get_started/layout.html:15
 #, python-format
 msgid "Welcome to %(site_name)s!"
@@ -1250,7 +1239,7 @@ msgstr "Saltar al final de la lista para seleccionar los %(failed_count)s artíc
 #: bookwyrm/templates/import_status.html:62
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
-msgstr ""
+msgstr "Renglón %(index)s: <strong>%(title)s</strong> por %(author)s"
 
 #: bookwyrm/templates/import_status.html:82
 msgid "Select all"
@@ -1273,7 +1262,6 @@ msgid "Book"
 msgstr "Libro"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/snippets/create_status_form.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:79
 #: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
@@ -1315,6 +1303,59 @@ msgstr "Resultados de búsqueda por \"%(query)s\""
 msgid "Matching Books"
 msgstr "Libros correspondientes"
 
+#: bookwyrm/templates/landing/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr "Sobre %(site_name)s"
+
+#: bookwyrm/templates/landing/about.html:10
+#: bookwyrm/templates/landing/about.html:20
+msgid "Code of Conduct"
+msgstr "Código de conducta"
+
+#: bookwyrm/templates/landing/about.html:13
+#: bookwyrm/templates/landing/about.html:29
+msgid "Privacy Policy"
+msgstr "Política de privacidad"
+
+#: bookwyrm/templates/landing/landing.html:6
+msgid "Recent Books"
+msgstr "Libros recientes"
+
+#: bookwyrm/templates/landing/landing_layout.html:17
+msgid "Decentralized"
+msgstr "Descentralizado"
+
+#: bookwyrm/templates/landing/landing_layout.html:23
+msgid "Friendly"
+msgstr "Amigable"
+
+#: bookwyrm/templates/landing/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr "Anti-corporativo"
+
+#: bookwyrm/templates/landing/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr "Unirse con %(name)s"
+
+#: bookwyrm/templates/landing/landing_layout.html:51
+#: bookwyrm/templates/login.html:56
+msgid "This instance is closed"
+msgstr "Esta instancia está cerrada."
+
+#: bookwyrm/templates/landing/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr "¡Gracias! Tu solicitud ha sido recibido."
+
+#: bookwyrm/templates/landing/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr "Solicitar una invitación"
+
+#: bookwyrm/templates/landing/landing_layout.html:79
+msgid "Your Account"
+msgstr "Tu cuenta"
+
 #: bookwyrm/templates/layout.html:40
 msgid "Search for a book or user"
 msgstr "Buscar un libro o un usuario"
@@ -1327,15 +1368,15 @@ msgstr "Menú de navigación central"
 msgid "Feed"
 msgstr "Actividad"
 
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Your Books"
 msgstr "Tus libros"
 
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Settings"
 msgstr "Configuración"
 
-#: bookwyrm/templates/layout.html:113
+#: bookwyrm/templates/layout.html:118
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1343,61 +1384,61 @@ msgstr "Configuración"
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: bookwyrm/templates/layout.html:120
+#: bookwyrm/templates/layout.html:125
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:127
+#: bookwyrm/templates/layout.html:132
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136
+#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
 #: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:163
+#: bookwyrm/templates/layout.html:168
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:175
+#: bookwyrm/templates/layout.html:180
 msgid "Join"
 msgstr "Unirse"
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:218
 msgid "About this instance"
 msgstr "Sobre esta instancia"
 
-#: bookwyrm/templates/layout.html:217
+#: bookwyrm/templates/layout.html:222
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
-#: bookwyrm/templates/layout.html:221
+#: bookwyrm/templates/layout.html:226
 msgid "Documentation"
 msgstr "Documentación de Django"
 
-#: bookwyrm/templates/layout.html:228
+#: bookwyrm/templates/layout.html:233
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:232
+#: bookwyrm/templates/layout.html:237
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1550,7 +1591,7 @@ msgstr "Iniciar sesión"
 
 #: bookwyrm/templates/login.html:16
 msgid "Success! Email address confirmed."
-msgstr ""
+msgstr "¡Éxito! Dirección de correo electrónico confirmada."
 
 #: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
@@ -1582,7 +1623,6 @@ msgstr "Comentarios de moderador"
 
 #: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "Comentario"
 
@@ -1821,11 +1861,11 @@ msgstr "Quitar cuenta"
 
 #: bookwyrm/templates/preferences/delete_user.html:12
 msgid "Permanently delete account"
-msgstr ""
+msgstr "Eliminar cuenta permanentemente"
 
 #: bookwyrm/templates/preferences/delete_user.html:14
 msgid "Deleting your account cannot be undone. The username will not be available to register in the future."
-msgstr ""
+msgstr "Eliminar tu cuenta no puede ser deshecho. El nombre de usuario no será disponible para registrar en el futuro."
 
 #: bookwyrm/templates/preferences/edit_user.html:4
 #: bookwyrm/templates/preferences/edit_user.html:7
@@ -1862,37 +1902,20 @@ msgid "Relationships"
 msgstr "Relaciones"
 
 #: bookwyrm/templates/reading_progress/finish.html:5
+#, python-format
 msgid "Finish \"%(book_title)s\""
 msgstr "Terminar \"%(book_title)s\""
 
 #: bookwyrm/templates/reading_progress/start.html:5
+#, python-format
 msgid "Start \"%(book_title)s\""
 msgstr "Empezar \"%(book_title)s\""
 
 #: bookwyrm/templates/reading_progress/want.html:5
+#, python-format
 msgid "Want to Read \"%(book_title)s\""
 msgstr "Quiero leer \"%(book_title)s\""
 
-#: bookwyrm/templates/rss/title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:36
-msgid "rated"
-msgstr "calificó"
-
-#: bookwyrm/templates/rss/title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:38
-msgid "reviewed"
-msgstr "reseñó"
-
-#: bookwyrm/templates/rss/title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:40
-msgid "commented on"
-msgstr "comentó en"
-
-#: bookwyrm/templates/rss/title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:42
-msgid "quoted"
-msgstr "citó"
-
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
 msgstr "Cargar resultados de otros catálogos"
@@ -2373,11 +2396,11 @@ msgstr "Permitir solicitudes de invitación"
 
 #: bookwyrm/templates/settings/site.html:97
 msgid "Require users to confirm email address"
-msgstr ""
+msgstr "Requerir a usuarios a confirmar dirección de correo electrónico"
 
 #: bookwyrm/templates/settings/site.html:99
 msgid "(Recommended if registration is open)"
-msgstr ""
+msgstr "(Recomendado si la registración es abierta)"
 
 #: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"
@@ -2400,6 +2423,7 @@ msgid "No cover"
 msgstr "Sin portada"
 
 #: bookwyrm/templates/snippets/book_titleby.html:6
+#, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by"
 msgstr "<a href=\"%(path)s\">%(title)s</a> por"
 
@@ -2413,14 +2437,6 @@ msgstr "Respaldar"
 msgid "Un-boost"
 msgstr "Des-respaldar"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "Alerta de spoiler:"
-
-#: bookwyrm/templates/snippets/content_warning_field.html:10
-msgid "Spoilers ahead!"
-msgstr "¡Advertencia, ya vienen spoilers!"
-
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "Reseña"
@@ -2429,67 +2445,87 @@ msgstr "Reseña"
 msgid "Quote"
 msgstr "Cita"
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
-msgid "Comment:"
-msgstr "Comentario:"
+#: bookwyrm/templates/snippets/create_status/comment.html:15
+msgid "Some thoughts on the book"
+msgstr "Algunos pensamientos sobre el libro"
 
-#: bookwyrm/templates/snippets/create_status_form.html:25
-msgid "Quote:"
-msgstr "Cita:"
-
-#: bookwyrm/templates/snippets/create_status_form.html:27
-msgid "Review:"
-msgstr "Reseña:"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-#: bookwyrm/templates/snippets/status/layout.html:29
-#: bookwyrm/templates/snippets/status/layout.html:47
-#: bookwyrm/templates/snippets/status/layout.html:48
-msgid "Reply"
-msgstr "Respuesta"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-msgid "Content"
-msgstr "Contenido"
-
-#: bookwyrm/templates/snippets/create_status_form.html:80
+#: bookwyrm/templates/snippets/create_status/comment.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progreso:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/create_status/comment.html:34
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status/comment.html:35
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "por ciento"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status/comment.html:41
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:110
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/status/layout.html:31
+#: bookwyrm/templates/snippets/status/layout.html:49
+#: bookwyrm/templates/snippets/status/layout.html:50
+msgid "Reply"
+msgstr "Respuesta"
+
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+msgid "Content"
+msgstr "Contenido"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr "Alerta de spoiler:"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+msgid "Spoilers ahead!"
+msgstr "¡Advertencia, ya vienen spoilers!"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:117
+#: bookwyrm/templates/snippets/create_status/layout.html:38
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:20
 msgid "Private"
 msgstr "Privada"
 
-#: bookwyrm/templates/snippets/create_status_form.html:128
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
 msgid "Post"
 msgstr "Compartir"
 
+#: bookwyrm/templates/snippets/create_status/quotation.html:19
+msgid "Quote:"
+msgstr "Cita:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:27
+msgid "An excerpt from '%(book_title)s'"
+msgstr "Un extracto de '%(book_title)s'"
+
+#: bookwyrm/templates/snippets/create_status/review.html:20
+msgid "Your review of '%(book_title)s'"
+msgstr "Tu reseña de '%(book_title)s'"
+
+#: bookwyrm/templates/snippets/create_status/review.html:32
+msgid "Review:"
+msgstr "Reseña:"
+
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
 msgstr "¿Eliminar estas fechas de lectura?"
@@ -2525,15 +2561,23 @@ msgstr "Aplicar filtros"
 msgid "Clear filters"
 msgstr "Borrar filtros"
 
-#: bookwyrm/templates/snippets/follow_button.html:12
+#: bookwyrm/templates/snippets/follow_button.html:14
+msgid "Follow @%(username)s"
+msgstr "Seguir @%(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:16
 msgid "Follow"
 msgstr "Seguir"
 
-#: bookwyrm/templates/snippets/follow_button.html:18
+#: bookwyrm/templates/snippets/follow_button.html:25
 msgid "Undo follow request"
 msgstr "Des-enviar solicitud de seguidor"
 
-#: bookwyrm/templates/snippets/follow_button.html:20
+#: bookwyrm/templates/snippets/follow_button.html:30
+msgid "Unfollow @%(username)s"
+msgstr "Dejar de seguir @%(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:32
 msgid "Unfollow"
 msgstr "Dejar de seguir"
 
@@ -2554,7 +2598,7 @@ msgid_plural "%(rating)s stars"
 msgstr[0] "%(rating)s estrella"
 msgstr[1] "%(rating)s estrellas"
 
-#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#: bookwyrm/templates/snippets/generated_status/goal.html:2
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
@@ -2562,11 +2606,10 @@ msgstr[0] "estableció una meta de leer %(counter)s libro en %(year)s"
 msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrella"
-msgstr[1] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrellas"
+msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgstr[0] "reseñó <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrella"
+msgstr[1] "reseñó <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrellas"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
@@ -2748,12 +2791,12 @@ msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "Quiero leer \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:15
+#: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "Mostrar más"
 
 #: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:30
+#: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "Mostrar menos"
 
@@ -2761,18 +2804,51 @@ msgstr "Mostrar menos"
 msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
+#: bookwyrm/templates/snippets/status/headers/comment.html:2
+msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "comentó en <a href=\"%(book_path)s\">\"%(book)s\"</a>"
+
+#: bookwyrm/templates/snippets/status/headers/note.html:15
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "respondió al <a href=\"%(status_path)s\">status</a> de <a href=\"%(user_path)s\">%(username)s</a> "
+
+#: bookwyrm/templates/snippets/status/headers/quotation.html:2
+msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "citó a <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/rating.html:3
+msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
+msgstr "calificó <a href=\"%(book_path)s\">%(book)s</a>:"
+
+#: bookwyrm/templates/snippets/status/headers/read.html:5
+msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "terminó de leer <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/reading.html:6
+msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "empezó a leer <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/review.html:3
+msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "reseñó a <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "Eliminar status"
 
-#: bookwyrm/templates/snippets/status/layout.html:51
-#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+#: bookwyrm/templates/snippets/status/layout.html:54
 msgid "Boost status"
 msgstr "Respaldar status"
 
-#: bookwyrm/templates/snippets/status/layout.html:55
-#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+#: bookwyrm/templates/snippets/status/layout.html:58
 msgid "Like status"
 msgstr "Me gusta status"
 
@@ -2780,11 +2856,6 @@ msgstr "Me gusta status"
 msgid "boosted"
 msgstr "respaldó"
 
-#: bookwyrm/templates/snippets/status/status_header.html:46
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "respondió al <a href=\"%(status_path)s\">status</a> de <a href=\"%(user_path)s\">%(username)s</a> "
-
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -3030,7 +3101,7 @@ msgstr "Ver instancia"
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:5
 msgid "Permanently deleted"
-msgstr ""
+msgstr "Eliminado permanentemente"
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:17
 msgid "Suspend user"
@@ -3046,16 +3117,16 @@ msgstr "Nivel de acceso:"
 
 #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
 msgid "File exceeds maximum size: 10MB"
-msgstr ""
+msgstr "Archivo excede el tamaño máximo: 10MB"
 
 #: bookwyrm/templatetags/utilities.py:30
 #, python-format
 msgid "%(title)s: %(subtitle)s"
-msgstr ""
+msgstr "%(title)s: %(subtitle)s"
 
 #: bookwyrm/views/authentication.py:69
 msgid "Username or password are incorrect"
-msgstr ""
+msgstr "Nombre de usuario o contraseña es incorrecta"
 
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
@@ -3079,9 +3150,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Local"
 #~ msgstr "Local"
 
-#~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
-#~ msgstr "Eliminar <a href=\"%(path)s\">%(name)s</a>"
-
 #~ msgid "Federated Servers"
 #~ msgstr "Servidores federalizados"
 
@@ -3976,9 +4044,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 #~ msgstr "respondió al <a href=\"%(status_path)s\">comentario</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
-#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-#~ msgstr "respondió a la <a href=\"%(status_path)s\">cita</a> de <a href=\"%(user_path)s\">%(username)s</a> "
-
 #~ msgid "Remove tag"
 #~ msgstr "Eliminar etiqueta"
 

From 1b4db4903507cfeacc98fe71317b24654353dabb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 10 Aug 2021 14:30:28 -0700
Subject: [PATCH 103/272] Fixing bug preventing csv imports to match via
 title/author

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

diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index f2993846..05aada16 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -80,7 +80,7 @@ class ImportItem(models.Model):
         else:
             # don't fall back on title/author search is isbn is present.
             # you're too likely to mismatch
-            self.get_book_from_title_author()
+            self.book = self.get_book_from_title_author()
 
     def get_book_from_isbn(self):
         """search by isbn"""

From 6a84309fac8fbe064aba82f5d8517ab265f4f073 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 10 Aug 2021 18:28:14 -0700
Subject: [PATCH 104/272] Fixes template links in reading progress fallback
 paths

---
 bookwyrm/templates/reading_progress/finish.html | 2 +-
 bookwyrm/templates/reading_progress/start.html  | 2 +-
 bookwyrm/templates/reading_progress/want.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/reading_progress/finish.html b/bookwyrm/templates/reading_progress/finish.html
index ca69128e..a9f60f04 100644
--- a/bookwyrm/templates/reading_progress/finish.html
+++ b/bookwyrm/templates/reading_progress/finish.html
@@ -9,6 +9,6 @@ Finish "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True %}
+{% include "snippets/shelve_button/finish_reading_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/start.html b/bookwyrm/templates/reading_progress/start.html
index e24a0e05..9c457947 100644
--- a/bookwyrm/templates/reading_progress/start.html
+++ b/bookwyrm/templates/reading_progress/start.html
@@ -9,6 +9,6 @@ Start "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True %}
+{% include "snippets/shelve_button/start_reading_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/want.html b/bookwyrm/templates/reading_progress/want.html
index 6122ade3..e0353193 100644
--- a/bookwyrm/templates/reading_progress/want.html
+++ b/bookwyrm/templates/reading_progress/want.html
@@ -9,6 +9,6 @@ Want to Read "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True %}
+{% include "snippets/shelve_button/want_to_read_modal.html" with book=book active=True %}
 
 {% endblock %}

From c6e328706b7ec01585be013ac5041c34c84d8492 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 11 Aug 2021 09:03:38 -0700
Subject: [PATCH 105/272] Fixes required attr on content fields for composing
 quotes

---
 bookwyrm/templates/snippets/create_status/content_field.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html
index 583a73d6..0a42a832 100644
--- a/bookwyrm/templates/snippets/create_status/content_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_field.html
@@ -14,6 +14,6 @@ draft: an existing Status object that is providing default values for input fiel
     id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
     placeholder="{{ placeholder }}"
     aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"
-    required
+    {% if type != "quotation" %}required{% endif %}
 >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
 

From 26ff55ebeedd82a8d490b24a908a9e3e6c93f8bd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 11 Aug 2021 09:19:25 -0700
Subject: [PATCH 106/272] Fixes polling variable name

---
 bookwyrm/templates/feed/feed.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 780f1d17..39eebb26 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -19,7 +19,7 @@
 {# announcements and system messages #}
 {% if not activities.number > 1 %}
 <a href="{{ request.path }}" class="transition-y is-hidden notification is-primary is-block" data-poll-wrapper>
-    {% blocktrans %}load <span data-poll="stream/{{ tab.key }}">0</span> unread status(es){% endblocktrans %}
+    {% blocktrans with tab_key=tab.key %}load <span data-poll="stream/{{ tab_key }}">0</span> unread status(es){% endblocktrans %}
 </a>
 
 {% if request.user.show_goal and not goal and tab.key == streams.first.key %}

From 1be125fc1d9f0aa9193c80eac57603bf5a3dd9fe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 11 Aug 2021 11:19:06 -0700
Subject: [PATCH 107/272] Adds database constraint for readthrough dates

---
 .../migrations/0083_auto_20210811_1817.py     | 27 +++++++++++++++++++
 bookwyrm/models/readthrough.py                | 15 +++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/migrations/0083_auto_20210811_1817.py

diff --git a/bookwyrm/migrations/0083_auto_20210811_1817.py b/bookwyrm/migrations/0083_auto_20210811_1817.py
new file mode 100644
index 00000000..2abc88b0
--- /dev/null
+++ b/bookwyrm/migrations/0083_auto_20210811_1817.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.2.4 on 2021-08-11 18:17
+
+from django.db import migrations, models
+import django.db.models.expressions
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0082_auto_20210806_2324"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="readthrough",
+            options={"ordering": ("-start_date",)},
+        ),
+        migrations.AddConstraint(
+            model_name="readthrough",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    ("finish_date__gte", django.db.models.expressions.F("start_date"))
+                ),
+                name="chronology",
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py
index df341c8b..343d3c11 100644
--- a/bookwyrm/models/readthrough.py
+++ b/bookwyrm/models/readthrough.py
@@ -1,7 +1,8 @@
 """ progress in a book """
-from django.db import models
-from django.utils import timezone
 from django.core import validators
+from django.db import models
+from django.db.models import F, Q
+from django.utils import timezone
 
 from .base_model import BookWyrmModel
 
@@ -41,6 +42,16 @@ class ReadThrough(BookWyrmModel):
             )
         return None
 
+    class Meta:
+        """Don't let readthroughs end before they start"""
+
+        constraints = [
+            models.CheckConstraint(
+                check=Q(finish_date__gte=F("start_date")), name="chronology"
+            )
+        ]
+        ordering = ("-start_date",)
+
 
 class ProgressUpdate(BookWyrmModel):
     """Store progress through a book in the database."""

From 6880657deb14b17a8518ae010f9f92f77cc73ef4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 12 Aug 2021 06:42:21 -0700
Subject: [PATCH 108/272] Fixes quote display

---
 bookwyrm/templates/snippets/status/body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/body.html b/bookwyrm/templates/snippets/status/body.html
index d205f423..2c8a0e04 100644
--- a/bookwyrm/templates/snippets/status/body.html
+++ b/bookwyrm/templates/snippets/status/body.html
@@ -3,7 +3,7 @@
 {% block card-content %}
 {% with status_type=status.status_type %}
 
-{% if status_type == 'GeneratedNote' or status_type == 'Rating' or not status.content %}
+{% if status_type == 'GeneratedNote' or status_type == 'Rating' %}
     {% include 'snippets/status/generated_status.html' with status=status %}
 {% else %}
     {% include 'snippets/status/content_status.html' with status=status %}

From 26b7f2ec70d869b28dd4ebb93bd1b2ce843468a0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 12 Aug 2021 14:43:42 -0700
Subject: [PATCH 109/272] Fixes main nav menu

---
 bookwyrm/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 8dd61e25..2b8364ec 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -49,7 +49,7 @@
                 </div>
             </form>
 
-            <div role="button" tabindex="0" class="navbar-burger pulldown-menu" data-controls="main-nav" aria-expanded="false">
+            <div role="button" tabindex="0" class="navbar-burger pulldown-menu" data-controls="main_nav" aria-expanded="false">
                 <div class="navbar-item mt-3">
                     <div class="icon icon-dots-three-vertical" title="{% trans 'Main navigation menu' %}">
                         <span class="is-sr-only">{% trans "Main navigation menu" %}</span>

From 80e70fcf0bb9e51cbd8cd0c08b4edf89613f12b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Aug 2021 00:55:08 +0000
Subject: [PATCH 110/272] Bump path-parse from 1.0.6 to 1.0.7

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7686fd11..af20d142 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1520,9 +1520,9 @@ path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^4.0.0:
   version "4.0.0"

From 9af435bbeb53eb67fb0e26c3768909ef35d38bc3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 12 Aug 2021 19:18:37 -0700
Subject: [PATCH 111/272] Space getting removes in reply header

---
 bookwyrm/templates/snippets/status/headers/note.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/headers/note.html b/bookwyrm/templates/snippets/status/headers/note.html
index 58c76f64..b07b9109 100644
--- a/bookwyrm/templates/snippets/status/headers/note.html
+++ b/bookwyrm/templates/snippets/status/headers/note.html
@@ -13,7 +13,7 @@
 {% with parent_status=status|parent %}
 {% if parent_status %}
 {% blocktrans trimmed with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}
-replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>
+replied to <a href="{{ user_path }}">{{ username}}</a>'s <a href="{{ status_path }}">status</a>
 {% endblocktrans %}
 {% endif %}
 {% endwith %}

From a2710059c9dc321584dd09fe476b5588b0616024 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 12 Aug 2021 19:29:10 -0700
Subject: [PATCH 112/272] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.po   | 431 ++++++++++++++++-----------
 locale/en_US/LC_MESSAGES/django.po   | 378 ++++++++++++++---------
 locale/es/LC_MESSAGES/django.mo      | Bin 48721 -> 48511 bytes
 locale/es/LC_MESSAGES/django.po      |  23 +-
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 46960 -> 46658 bytes
 locale/fr_FR/LC_MESSAGES/django.po   | 414 +++++++++++++++----------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 41974 -> 41731 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 411 +++++++++++++++----------
 locale/zh_Hant/LC_MESSAGES/django.mo | Bin 40752 -> 40493 bytes
 locale/zh_Hant/LC_MESSAGES/django.po | 414 +++++++++++++++----------
 10 files changed, 1283 insertions(+), 788 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 4906082a..6d658884 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 01:35+0000\n"
+"POT-Creation-Date: 2021-08-13 02:21+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -61,7 +61,8 @@ msgstr ""
 msgid "Book Title"
 msgstr "Titel"
 
-#: bookwyrm/forms.py:309 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:309
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
@@ -93,7 +94,7 @@ msgstr "%(value)s ist keine gültige remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159
+#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "Username"
 
@@ -331,8 +332,9 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #: bookwyrm/templates/book/book.html:48
-#: bookwyrm/templates/discover/large-book.html:25
-#: bookwyrm/templates/discover/small-book.html:19
+#: bookwyrm/templates/discover/large-book.html:22
+#: bookwyrm/templates/landing/large-book.html:25
+#: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "von"
 
@@ -537,6 +539,7 @@ msgid "Back"
 msgstr "Zurück"
 
 #: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "Titel:"
 
@@ -766,7 +769,7 @@ msgid "Confirmation code:"
 msgstr "Passwort bestätigen:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/landing/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "Absenden"
@@ -780,7 +783,7 @@ msgid "Resend confirmation link"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/landing/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -811,7 +814,7 @@ msgstr "Föderiert"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:94
 msgid "Directory"
 msgstr ""
 
@@ -892,63 +895,45 @@ msgstr ""
 msgid "All known users"
 msgstr ""
 
-#: bookwyrm/templates/discover/about.html:7
+#: bookwyrm/templates/discover/discover.html:4
+#: bookwyrm/templates/discover/discover.html:10
+#: bookwyrm/templates/layout.html:71
+#, fuzzy
+#| msgid "Discard"
+msgid "Discover"
+msgstr "Ablehnen"
+
+#: bookwyrm/templates/discover/discover.html:12
 #, python-format
-msgid "About %(site_name)s"
-msgstr "Über %(site_name)s"
-
-#: bookwyrm/templates/discover/about.html:10
-#: bookwyrm/templates/discover/about.html:20
-msgid "Code of Conduct"
+msgid "See what's new in the local %(site_name)s community"
 msgstr ""
 
-#: bookwyrm/templates/discover/about.html:13
-#: bookwyrm/templates/discover/about.html:29
-msgid "Privacy Policy"
-msgstr "Datenschutzerklärung"
-
-#: bookwyrm/templates/discover/discover.html:6
-msgid "Recent Books"
-msgstr "Aktive Bücher"
-
-#: bookwyrm/templates/discover/landing_layout.html:5
-#: bookwyrm/templates/get_started/layout.html:5
-msgid "Welcome"
-msgstr "Willkommen"
-
-#: bookwyrm/templates/discover/landing_layout.html:17
-msgid "Decentralized"
-msgstr "Dezentral"
-
-#: bookwyrm/templates/discover/landing_layout.html:23
-msgid "Friendly"
-msgstr "Freundlich"
-
-#: bookwyrm/templates/discover/landing_layout.html:29
-msgid "Anti-Corporate"
+#: bookwyrm/templates/discover/large-book.html:46
+#: bookwyrm/templates/discover/small-book.html:32
+msgid "rated"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:44
-#, python-format
-msgid "Join %(name)s"
-msgstr "Tritt %(name)s bei"
+#: bookwyrm/templates/discover/large-book.html:48
+#: bookwyrm/templates/discover/small-book.html:34
+msgid "reviewed"
+msgstr "bewertete"
 
-#: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "Diese Instanz ist geschlossen"
+#: bookwyrm/templates/discover/large-book.html:50
+#: bookwyrm/templates/discover/small-book.html:36
+msgid "commented on"
+msgstr "kommentierte"
 
-#: bookwyrm/templates/discover/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr ""
+#: bookwyrm/templates/discover/large-book.html:52
+#: bookwyrm/templates/discover/small-book.html:38
+msgid "quoted"
+msgstr "zitierte"
 
-#: bookwyrm/templates/discover/landing_layout.html:60
-msgid "Request an Invitation"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:79
-msgid "Your Account"
-msgstr "Dein Account"
+#: bookwyrm/templates/discover/large-book.html:68
+#: bookwyrm/templates/discover/small-book.html:52
+#, fuzzy
+#| msgid "Like status"
+msgid "View status"
+msgstr "Status favorisieren"
 
 #: bookwyrm/templates/email/confirm/html_content.html:6
 #: bookwyrm/templates/email/confirm/text_content.html:4
@@ -962,10 +947,20 @@ msgstr ""
 msgid "Confirm Email"
 msgstr "Bestätigen"
 
+#: bookwyrm/templates/email/confirm/html_content.html:15
+#, python-format
+msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
 msgstr ""
 
+#: bookwyrm/templates/email/confirm/text_content.html:10
+#, python-format
+msgid "Or enter the code \"%(confirmation_code)s\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -1038,7 +1033,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Direct Messages"
 msgstr "Direktnachrichten"
 
@@ -1052,7 +1047,7 @@ msgstr "Du hast momentan keine Nachrichten."
 
 #: bookwyrm/templates/feed/feed.html:22
 #, python-format
-msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:38
@@ -1164,6 +1159,11 @@ msgstr "Keine Bücher gefunden"
 msgid "Save &amp; continue"
 msgstr ""
 
+#: bookwyrm/templates/get_started/layout.html:5
+#: bookwyrm/templates/landing/landing_layout.html:5
+msgid "Welcome"
+msgstr "Willkommen"
+
 #: bookwyrm/templates/get_started/layout.html:15
 #, fuzzy, python-format
 #| msgid "About %(site_name)s"
@@ -1381,7 +1381,6 @@ msgid "Book"
 msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/snippets/create_status_form.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:79
 #: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
@@ -1423,6 +1422,59 @@ msgstr "Suchergebnisse für \"%(query)s\""
 msgid "Matching Books"
 msgstr "Passende Bücher"
 
+#: bookwyrm/templates/landing/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr "Über %(site_name)s"
+
+#: bookwyrm/templates/landing/about.html:10
+#: bookwyrm/templates/landing/about.html:20
+msgid "Code of Conduct"
+msgstr ""
+
+#: bookwyrm/templates/landing/about.html:13
+#: bookwyrm/templates/landing/about.html:29
+msgid "Privacy Policy"
+msgstr "Datenschutzerklärung"
+
+#: bookwyrm/templates/landing/landing.html:6
+msgid "Recent Books"
+msgstr "Aktive Bücher"
+
+#: bookwyrm/templates/landing/landing_layout.html:17
+msgid "Decentralized"
+msgstr "Dezentral"
+
+#: bookwyrm/templates/landing/landing_layout.html:23
+msgid "Friendly"
+msgstr "Freundlich"
+
+#: bookwyrm/templates/landing/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr "Tritt %(name)s bei"
+
+#: bookwyrm/templates/landing/landing_layout.html:51
+#: bookwyrm/templates/login.html:56
+msgid "This instance is closed"
+msgstr "Diese Instanz ist geschlossen"
+
+#: bookwyrm/templates/landing/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:79
+msgid "Your Account"
+msgstr "Dein Account"
+
 #: bookwyrm/templates/layout.html:40
 msgid "Search for a book or user"
 msgstr "Suche nach Buch oder Benutzer*in"
@@ -1435,17 +1487,17 @@ msgstr "Navigationshauptmenü"
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 #, fuzzy
 #| msgid "Your books"
 msgid "Your Books"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: bookwyrm/templates/layout.html:113
+#: bookwyrm/templates/layout.html:118
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1453,65 +1505,65 @@ msgstr "Einstellungen"
 msgid "Invites"
 msgstr "Einladungen"
 
-#: bookwyrm/templates/layout.html:120
+#: bookwyrm/templates/layout.html:125
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:127
+#: bookwyrm/templates/layout.html:132
 msgid "Log out"
 msgstr "Abmelden"
 
-#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136
+#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
 #: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:163
+#: bookwyrm/templates/layout.html:168
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:175
+#: bookwyrm/templates/layout.html:180
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:218
 #, fuzzy
 #| msgid "About this server"
 msgid "About this instance"
 msgstr "Über diesen Server"
 
-#: bookwyrm/templates/layout.html:217
+#: bookwyrm/templates/layout.html:222
 msgid "Contact site admin"
 msgstr "Admin kontaktieren"
 
-#: bookwyrm/templates/layout.html:221
+#: bookwyrm/templates/layout.html:226
 #, fuzzy
 #| msgid "List curation:"
 msgid "Documentation"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/layout.html:228
+#: bookwyrm/templates/layout.html:233
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> unterstützen"
 
-#: bookwyrm/templates/layout.html:232
+#: bookwyrm/templates/layout.html:237
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
@@ -1709,7 +1761,6 @@ msgstr "Moderator:innenkommentare"
 
 #: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "Kommentieren"
 
@@ -2029,26 +2080,6 @@ msgstr "Editionen von  %(book_title)s"
 msgid "Want to Read \"%(book_title)s\""
 msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 
-#: bookwyrm/templates/rss/title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:36
-msgid "rated"
-msgstr ""
-
-#: bookwyrm/templates/rss/title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:38
-msgid "reviewed"
-msgstr "bewertete"
-
-#: bookwyrm/templates/rss/title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:40
-msgid "commented on"
-msgstr "kommentierte"
-
-#: bookwyrm/templates/rss/title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:42
-msgid "quoted"
-msgstr "zitierte"
-
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -2665,14 +2696,6 @@ msgstr "teilt"
 msgid "Un-boost"
 msgstr "Teilen zurücknehmen"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "Spoileralarm:"
-
-#: bookwyrm/templates/snippets/content_warning_field.html:10
-msgid "Spoilers ahead!"
-msgstr "Spoileralarm!"
-
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "Bewerten"
@@ -2681,75 +2704,99 @@ msgstr "Bewerten"
 msgid "Quote"
 msgstr "Zitieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Kommentieren"
+#: bookwyrm/templates/snippets/create_status/comment.html:15
+msgid "Some thoughts on the book"
+msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:25
-#, fuzzy
-#| msgid "Quote"
-msgid "Quote:"
-msgstr "Zitieren"
-
-#: bookwyrm/templates/snippets/create_status_form.html:27
-#, fuzzy
-#| msgid "Review"
-msgid "Review:"
-msgstr "Bewerten"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-#: bookwyrm/templates/snippets/status/layout.html:29
-#: bookwyrm/templates/snippets/status/layout.html:47
-#: bookwyrm/templates/snippets/status/layout.html:48
-msgid "Reply"
-msgstr "Antwort"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-#, fuzzy
-#| msgid "Footer Content"
-msgid "Content"
-msgstr "Inhalt des Footers"
-
-#: bookwyrm/templates/snippets/create_status_form.html:80
+#: bookwyrm/templates/snippets/create_status/comment.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Fortschritt:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/create_status/comment.html:34
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "Seiten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status/comment.html:35
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "Prozent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status/comment.html:41
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "von %(pages)s Seiten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:110
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/status/layout.html:31
+#: bookwyrm/templates/snippets/status/layout.html:49
+#: bookwyrm/templates/snippets/status/layout.html:50
+msgid "Reply"
+msgstr "Antwort"
+
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#, fuzzy
+#| msgid "Footer Content"
+msgid "Content"
+msgstr "Inhalt des Footers"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr "Spoileralarm:"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+msgid "Spoilers ahead!"
+msgstr "Spoileralarm!"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
 msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:117
+#: bookwyrm/templates/snippets/create_status/layout.html:38
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Kommentieren"
+
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:20
 msgid "Private"
 msgstr "Privat"
 
-#: bookwyrm/templates/snippets/create_status_form.html:128
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
 msgid "Post"
 msgstr "Absenden"
 
+#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#, fuzzy
+#| msgid "Quote"
+msgid "Quote:"
+msgstr "Zitieren"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#, fuzzy, python-format
+#| msgid "Editions of %(book_title)s"
+msgid "An excerpt from '%(book_title)s'"
+msgstr "Editionen von  %(book_title)s"
+
+#: bookwyrm/templates/snippets/create_status/review.html:20
+#, fuzzy, python-format
+#| msgid "Editions of %(book_title)s"
+msgid "Your review of '%(book_title)s'"
+msgstr "Editionen von  %(book_title)s"
+
+#: bookwyrm/templates/snippets/create_status/review.html:32
+#, fuzzy
+#| msgid "Review"
+msgid "Review:"
+msgstr "Bewerten"
+
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
 msgstr "Diese Lesedaten löschen?"
@@ -2791,17 +2838,29 @@ msgstr ""
 msgid "Clear filters"
 msgstr "Suche leeren"
 
-#: bookwyrm/templates/snippets/follow_button.html:12
+#: bookwyrm/templates/snippets/follow_button.html:14
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Follow @%(username)s"
+msgstr "Listen: %(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:16
 msgid "Follow"
 msgstr "Folgen"
 
-#: bookwyrm/templates/snippets/follow_button.html:18
+#: bookwyrm/templates/snippets/follow_button.html:25
 #, fuzzy
 #| msgid "Send follow request"
 msgid "Undo follow request"
 msgstr "Folgeanfrage senden"
 
-#: bookwyrm/templates/snippets/follow_button.html:20
+#: bookwyrm/templates/snippets/follow_button.html:30
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Unfollow @%(username)s"
+msgstr "Listen: %(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:32
 msgid "Unfollow"
 msgstr "Entfolgen"
 
@@ -2822,7 +2881,7 @@ msgid_plural "%(rating)s stars"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#: bookwyrm/templates/snippets/generated_status/goal.html:2
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
@@ -2832,8 +2891,8 @@ msgstr[1] "Setze das Ziel, %(year)s %(counter)s Bücher zu lesen"
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "<a href=\"%(path)s\">%(title)s</a> von "
 msgstr[1] "<a href=\"%(path)s\">%(title)s</a> von "
 
@@ -3027,12 +3086,12 @@ msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:15
+#: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
 #: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:30
+#: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "Weniger anzeigen"
 
@@ -3040,18 +3099,66 @@ msgstr "Weniger anzeigen"
 msgid "Open image in new window"
 msgstr "Bild in neuem Fenster öffnen"
 
+#: bookwyrm/templates/snippets/status/headers/comment.html:2
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+
+#: bookwyrm/templates/snippets/status/headers/note.html:15
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
+
+#: bookwyrm/templates/snippets/status/headers/quotation.html:2
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/rating.html:3
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/read.html:5
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+
+#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/review.html:3
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
+
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "Post löschen"
 
-#: bookwyrm/templates/snippets/status/layout.html:51
-#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+#: bookwyrm/templates/snippets/status/layout.html:54
 msgid "Boost status"
 msgstr "Status teilen"
 
-#: bookwyrm/templates/snippets/status/layout.html:55
-#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+#: bookwyrm/templates/snippets/status/layout.html:58
 msgid "Like status"
 msgstr "Status favorisieren"
 
@@ -3059,12 +3166,6 @@ msgstr "Status favorisieren"
 msgid "boosted"
 msgstr "teilt"
 
-#: bookwyrm/templates/snippets/status/status_header.html:46
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
-
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -3392,11 +3493,6 @@ msgstr ""
 #~ msgid "Local"
 #~ msgstr "Lokal"
 
-#, fuzzy
-#~| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
-#~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
-#~ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
-
 #, fuzzy
 #~| msgid "Lists: %(username)s"
 #~ msgid "Reports: <small>%(server_name)s</small>"
@@ -3723,11 +3819,6 @@ msgstr ""
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 #~ msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> geantwortet</a>"
 
-#, fuzzy
-#~| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-#~ msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
-
 #~ msgid "Remove tag"
 #~ msgstr "Tag entfernen"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index e8e3b0b3..ba475e53 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 01:35+0000\n"
+"POT-Creation-Date: 2021-08-13 02:21+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -55,7 +55,8 @@ msgstr ""
 msgid "Book Title"
 msgstr ""
 
-#: bookwyrm/forms.py:309 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:309
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
@@ -83,7 +84,7 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159
+#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr ""
 
@@ -307,8 +308,9 @@ msgid "Cancel"
 msgstr ""
 
 #: bookwyrm/templates/book/book.html:48
-#: bookwyrm/templates/discover/large-book.html:25
-#: bookwyrm/templates/discover/small-book.html:19
+#: bookwyrm/templates/discover/large-book.html:22
+#: bookwyrm/templates/landing/large-book.html:25
+#: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr ""
 
@@ -492,6 +494,7 @@ msgid "Back"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr ""
 
@@ -701,7 +704,7 @@ msgid "Confirmation code:"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/landing/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr ""
@@ -715,7 +718,7 @@ msgid "Resend confirmation link"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/landing/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -740,7 +743,7 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:94
 msgid "Directory"
 msgstr ""
 
@@ -810,62 +813,40 @@ msgstr ""
 msgid "All known users"
 msgstr ""
 
-#: bookwyrm/templates/discover/about.html:7
+#: bookwyrm/templates/discover/discover.html:4
+#: bookwyrm/templates/discover/discover.html:10
+#: bookwyrm/templates/layout.html:71
+msgid "Discover"
+msgstr ""
+
+#: bookwyrm/templates/discover/discover.html:12
 #, python-format
-msgid "About %(site_name)s"
+msgid "See what's new in the local %(site_name)s community"
 msgstr ""
 
-#: bookwyrm/templates/discover/about.html:10
-#: bookwyrm/templates/discover/about.html:20
-msgid "Code of Conduct"
+#: bookwyrm/templates/discover/large-book.html:46
+#: bookwyrm/templates/discover/small-book.html:32
+msgid "rated"
 msgstr ""
 
-#: bookwyrm/templates/discover/about.html:13
-#: bookwyrm/templates/discover/about.html:29
-msgid "Privacy Policy"
+#: bookwyrm/templates/discover/large-book.html:48
+#: bookwyrm/templates/discover/small-book.html:34
+msgid "reviewed"
 msgstr ""
 
-#: bookwyrm/templates/discover/discover.html:6
-msgid "Recent Books"
+#: bookwyrm/templates/discover/large-book.html:50
+#: bookwyrm/templates/discover/small-book.html:36
+msgid "commented on"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:5
-#: bookwyrm/templates/get_started/layout.html:5
-msgid "Welcome"
+#: bookwyrm/templates/discover/large-book.html:52
+#: bookwyrm/templates/discover/small-book.html:38
+msgid "quoted"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:17
-msgid "Decentralized"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:23
-msgid "Friendly"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:29
-msgid "Anti-Corporate"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:44
-#, python-format
-msgid "Join %(name)s"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:60
-msgid "Request an Invitation"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:79
-msgid "Your Account"
+#: bookwyrm/templates/discover/large-book.html:68
+#: bookwyrm/templates/discover/small-book.html:52
+msgid "View status"
 msgstr ""
 
 #: bookwyrm/templates/email/confirm/html_content.html:6
@@ -878,10 +859,20 @@ msgstr ""
 msgid "Confirm Email"
 msgstr ""
 
+#: bookwyrm/templates/email/confirm/html_content.html:15
+#, python-format
+msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
 msgstr ""
 
+#: bookwyrm/templates/email/confirm/text_content.html:10
+#, python-format
+msgid "Or enter the code \"%(confirmation_code)s\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -950,7 +941,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Direct Messages"
 msgstr ""
 
@@ -964,7 +955,7 @@ msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:22
 #, python-format
-msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:38
@@ -1066,6 +1057,11 @@ msgstr ""
 msgid "Save &amp; continue"
 msgstr ""
 
+#: bookwyrm/templates/get_started/layout.html:5
+#: bookwyrm/templates/landing/landing_layout.html:5
+msgid "Welcome"
+msgstr ""
+
 #: bookwyrm/templates/get_started/layout.html:15
 #, python-format
 msgid "Welcome to %(site_name)s!"
@@ -1266,7 +1262,6 @@ msgid "Book"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/snippets/create_status_form.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:79
 #: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
@@ -1308,6 +1303,59 @@ msgstr ""
 msgid "Matching Books"
 msgstr ""
 
+#: bookwyrm/templates/landing/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr ""
+
+#: bookwyrm/templates/landing/about.html:10
+#: bookwyrm/templates/landing/about.html:20
+msgid "Code of Conduct"
+msgstr ""
+
+#: bookwyrm/templates/landing/about.html:13
+#: bookwyrm/templates/landing/about.html:29
+msgid "Privacy Policy"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing.html:6
+msgid "Recent Books"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:17
+msgid "Decentralized"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:23
+msgid "Friendly"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:51
+#: bookwyrm/templates/login.html:56
+msgid "This instance is closed"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr ""
+
+#: bookwyrm/templates/landing/landing_layout.html:79
+msgid "Your Account"
+msgstr ""
+
 #: bookwyrm/templates/layout.html:40
 msgid "Search for a book or user"
 msgstr ""
@@ -1320,15 +1368,15 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Your Books"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Settings"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:113
+#: bookwyrm/templates/layout.html:118
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1336,61 +1384,61 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:120
+#: bookwyrm/templates/layout.html:125
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:127
+#: bookwyrm/templates/layout.html:132
 msgid "Log out"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136
+#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
 #: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:163
+#: bookwyrm/templates/layout.html:168
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:175
+#: bookwyrm/templates/layout.html:180
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:218
 msgid "About this instance"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:217
+#: bookwyrm/templates/layout.html:222
 msgid "Contact site admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:221
+#: bookwyrm/templates/layout.html:226
 msgid "Documentation"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:228
+#: bookwyrm/templates/layout.html:233
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:232
+#: bookwyrm/templates/layout.html:237
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
@@ -1575,7 +1623,6 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr ""
 
@@ -1869,26 +1916,6 @@ msgstr ""
 msgid "Want to Read \"%(book_title)s\""
 msgstr ""
 
-#: bookwyrm/templates/rss/title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:36
-msgid "rated"
-msgstr ""
-
-#: bookwyrm/templates/rss/title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:38
-msgid "reviewed"
-msgstr ""
-
-#: bookwyrm/templates/rss/title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:40
-msgid "commented on"
-msgstr ""
-
-#: bookwyrm/templates/rss/title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:42
-msgid "quoted"
-msgstr ""
-
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
 msgstr ""
@@ -2410,14 +2437,6 @@ msgstr ""
 msgid "Un-boost"
 msgstr ""
 
-#: bookwyrm/templates/snippets/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/content_warning_field.html:10
-msgid "Spoilers ahead!"
-msgstr ""
-
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr ""
@@ -2426,67 +2445,89 @@ msgstr ""
 msgid "Quote"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
-msgid "Comment:"
+#: bookwyrm/templates/snippets/create_status/comment.html:15
+msgid "Some thoughts on the book"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:25
-msgid "Quote:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:27
-msgid "Review:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-#: bookwyrm/templates/snippets/status/layout.html:29
-#: bookwyrm/templates/snippets/status/layout.html:47
-#: bookwyrm/templates/snippets/status/layout.html:48
-msgid "Reply"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-msgid "Content"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:80
+#: bookwyrm/templates/snippets/create_status/comment.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/create_status/comment.html:34
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status/comment.html:35
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status/comment.html:41
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:110
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/status/layout.html:31
+#: bookwyrm/templates/snippets/status/layout.html:49
+#: bookwyrm/templates/snippets/status/layout.html:50
+msgid "Reply"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+msgid "Content"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+msgid "Spoilers ahead!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
 msgid "Include spoiler alert"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:117
+#: bookwyrm/templates/snippets/create_status/layout.html:38
+msgid "Comment:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:20
 msgid "Private"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:128
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
 msgid "Post"
 msgstr ""
 
+#: bookwyrm/templates/snippets/create_status/quotation.html:19
+msgid "Quote:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#, python-format
+msgid "An excerpt from '%(book_title)s'"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/review.html:20
+#, python-format
+msgid "Your review of '%(book_title)s'"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/review.html:32
+msgid "Review:"
+msgstr ""
+
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
 msgstr ""
@@ -2522,15 +2563,25 @@ msgstr ""
 msgid "Clear filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:12
+#: bookwyrm/templates/snippets/follow_button.html:14
+#, python-format
+msgid "Follow @%(username)s"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:16
 msgid "Follow"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:18
+#: bookwyrm/templates/snippets/follow_button.html:25
 msgid "Undo follow request"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:20
+#: bookwyrm/templates/snippets/follow_button.html:30
+#, python-format
+msgid "Unfollow @%(username)s"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:32
 msgid "Unfollow"
 msgstr ""
 
@@ -2551,7 +2602,7 @@ msgid_plural "%(rating)s stars"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#: bookwyrm/templates/snippets/generated_status/goal.html:2
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
@@ -2560,8 +2611,8 @@ msgstr[1] ""
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2746,12 +2797,12 @@ msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:15
+#: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:30
+#: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr ""
 
@@ -2759,18 +2810,58 @@ msgstr ""
 msgid "Open image in new window"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/headers/comment.html:2
+#, python-format
+msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/headers/note.html:15
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/headers/quotation.html:2
+#, python-format
+msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/headers/rating.html:3
+#, python-format
+msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/headers/read.html:5
+#, python-format
+msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#, python-format
+msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/headers/review.html:3
+#, python-format
+msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#, python-format
+msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
+
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/layout.html:51
-#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+#: bookwyrm/templates/snippets/status/layout.html:54
 msgid "Boost status"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/layout.html:55
-#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+#: bookwyrm/templates/snippets/status/layout.html:58
 msgid "Like status"
 msgstr ""
 
@@ -2778,11 +2869,6 @@ msgstr ""
 msgid "boosted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_header.html:46
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr ""
-
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index b513f8bea03848f7868f11b1077010abf926a98a..a7b3e18120821a785b3e99b14f41b1656528ffb5 100644
GIT binary patch
delta 11194
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

delta 11382
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
SoXp&+F0YKrIrDel^!h)nsbIAL

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 6051b159..d073a36c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-10 02:58+0000\n"
+"POT-Creation-Date: 2021-08-13 02:21+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -954,8 +954,9 @@ msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
 #: bookwyrm/templates/feed/feed.html:22
-#, python-format
-msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
+#, fuzzy, python-format
+#| msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
 msgstr "cargar <span data-poll=\"stream/%(tab.key)s\">0</span> status(es) no leído(s)"
 
 #: bookwyrm/templates/feed/feed.html:38
@@ -2515,10 +2516,12 @@ msgid "Quote:"
 msgstr "Cita:"
 
 #: bookwyrm/templates/snippets/create_status/quotation.html:27
+#, python-format
 msgid "An excerpt from '%(book_title)s'"
 msgstr "Un extracto de '%(book_title)s'"
 
 #: bookwyrm/templates/snippets/create_status/review.html:20
+#, python-format
 msgid "Your review of '%(book_title)s'"
 msgstr "Tu reseña de '%(book_title)s'"
 
@@ -2562,6 +2565,7 @@ msgid "Clear filters"
 msgstr "Borrar filtros"
 
 #: bookwyrm/templates/snippets/follow_button.html:14
+#, python-format
 msgid "Follow @%(username)s"
 msgstr "Seguir @%(username)s"
 
@@ -2574,6 +2578,7 @@ msgid "Undo follow request"
 msgstr "Des-enviar solicitud de seguidor"
 
 #: bookwyrm/templates/snippets/follow_button.html:30
+#, python-format
 msgid "Unfollow @%(username)s"
 msgstr "Dejar de seguir @%(username)s"
 
@@ -2606,6 +2611,7 @@ msgstr[0] "estableció una meta de leer %(counter)s libro en %(year)s"
 msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
+#, python-format
 msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "reseñó <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrella"
@@ -2672,6 +2678,8 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
+#, fuzzy, python-format
+#| msgid "page %(page)s"
 msgid "page %(page)s"
 msgstr "página %(pages)s"
 
@@ -2805,35 +2813,42 @@ msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
+#, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "comentó en <a href=\"%(book_path)s\">\"%(book)s\"</a>"
 
 #: bookwyrm/templates/snippets/status/headers/note.html:15
 #, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
 msgstr "respondió al <a href=\"%(status_path)s\">status</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #: bookwyrm/templates/snippets/status/headers/quotation.html:2
+#, python-format
 msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "citó a <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/rating.html:3
+#, python-format
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
 msgstr "calificó <a href=\"%(book_path)s\">%(book)s</a>:"
 
 #: bookwyrm/templates/snippets/status/headers/read.html:5
+#, python-format
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "terminó de leer <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/reading.html:6
+#, python-format
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "empezó a leer <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/review.html:3
+#, python-format
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "reseñó a <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 98bc29095737fda2d84bcd909167dd90097fb8e7..75ac69ebf3b80ff1bbba48c262ed1cbafa631bf5 100644
GIT binary patch
delta 12605
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
J>#yuy=l{_*VzU4M

delta 12750
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index badfcdca..1ab9157b 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 01:35+0000\n"
+"POT-Creation-Date: 2021-08-13 02:21+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -55,7 +55,8 @@ msgstr "Ordre de la liste"
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: bookwyrm/forms.py:309 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:309
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
@@ -83,7 +84,7 @@ msgstr "%(value)s n’est pas une remote_id valide."
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159
+#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "nom du compte :"
 
@@ -311,8 +312,9 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #: bookwyrm/templates/book/book.html:48
-#: bookwyrm/templates/discover/large-book.html:25
-#: bookwyrm/templates/discover/small-book.html:19
+#: bookwyrm/templates/discover/large-book.html:22
+#: bookwyrm/templates/landing/large-book.html:25
+#: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "par"
 
@@ -496,6 +498,7 @@ msgid "Back"
 msgstr "Retour"
 
 #: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "Titre :"
 
@@ -705,7 +708,7 @@ msgid "Confirmation code:"
 msgstr "Code de confirmation :"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/landing/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "Valider"
@@ -719,7 +722,7 @@ msgid "Resend confirmation link"
 msgstr "Envoyer le lien de confirmation de nouveau"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/landing/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -744,7 +747,7 @@ msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:94
 msgid "Directory"
 msgstr "Répertoire"
 
@@ -816,63 +819,45 @@ msgstr "Comptes BookWyrm"
 msgid "All known users"
 msgstr "Tous les comptes connus"
 
-#: bookwyrm/templates/discover/about.html:7
+#: bookwyrm/templates/discover/discover.html:4
+#: bookwyrm/templates/discover/discover.html:10
+#: bookwyrm/templates/layout.html:71
+#, fuzzy
+#| msgid "Discard"
+msgid "Discover"
+msgstr "Rejeter"
+
+#: bookwyrm/templates/discover/discover.html:12
 #, python-format
-msgid "About %(site_name)s"
-msgstr "À propos de %(site_name)s"
+msgid "See what's new in the local %(site_name)s community"
+msgstr ""
 
-#: bookwyrm/templates/discover/about.html:10
-#: bookwyrm/templates/discover/about.html:20
-msgid "Code of Conduct"
-msgstr "Code de conduite"
+#: bookwyrm/templates/discover/large-book.html:46
+#: bookwyrm/templates/discover/small-book.html:32
+msgid "rated"
+msgstr "a noté"
 
-#: bookwyrm/templates/discover/about.html:13
-#: bookwyrm/templates/discover/about.html:29
-msgid "Privacy Policy"
-msgstr "Politique de vie privée"
+#: bookwyrm/templates/discover/large-book.html:48
+#: bookwyrm/templates/discover/small-book.html:34
+msgid "reviewed"
+msgstr "a écrit une critique de"
 
-#: bookwyrm/templates/discover/discover.html:6
-msgid "Recent Books"
-msgstr "Livres récents"
+#: bookwyrm/templates/discover/large-book.html:50
+#: bookwyrm/templates/discover/small-book.html:36
+msgid "commented on"
+msgstr "a commenté"
 
-#: bookwyrm/templates/discover/landing_layout.html:5
-#: bookwyrm/templates/get_started/layout.html:5
-msgid "Welcome"
-msgstr "Bienvenue"
+#: bookwyrm/templates/discover/large-book.html:52
+#: bookwyrm/templates/discover/small-book.html:38
+msgid "quoted"
+msgstr "a cité"
 
-#: bookwyrm/templates/discover/landing_layout.html:17
-msgid "Decentralized"
-msgstr "Décentralisé"
-
-#: bookwyrm/templates/discover/landing_layout.html:23
-msgid "Friendly"
-msgstr "Sympa"
-
-#: bookwyrm/templates/discover/landing_layout.html:29
-msgid "Anti-Corporate"
-msgstr "Anti‑commercial"
-
-#: bookwyrm/templates/discover/landing_layout.html:44
-#, python-format
-msgid "Join %(name)s"
-msgstr "Rejoignez %(name)s"
-
-#: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "Cette instance est fermée"
-
-#: bookwyrm/templates/discover/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr "Merci ! Votre demande a bien été reçue."
-
-#: bookwyrm/templates/discover/landing_layout.html:60
-msgid "Request an Invitation"
-msgstr "Demander une invitation"
-
-#: bookwyrm/templates/discover/landing_layout.html:79
-msgid "Your Account"
-msgstr "Votre compte"
+#: bookwyrm/templates/discover/large-book.html:68
+#: bookwyrm/templates/discover/small-book.html:52
+#, fuzzy
+#| msgid "Like status"
+msgid "View status"
+msgstr "Ajouter le statut aux favoris"
 
 #: bookwyrm/templates/email/confirm/html_content.html:6
 #: bookwyrm/templates/email/confirm/text_content.html:4
@@ -884,10 +869,20 @@ msgstr "Une dernière petite étape avant de rejoindre %(site_name)s ! Veuille
 msgid "Confirm Email"
 msgstr "Confirmation de l’email"
 
+#: bookwyrm/templates/email/confirm/html_content.html:15
+#, python-format
+msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
 msgstr "Veuillez confirmer votre adresse email"
 
+#: bookwyrm/templates/email/confirm/text_content.html:10
+#, python-format
+msgid "Or enter the code \"%(confirmation_code)s\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -956,7 +951,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -971,7 +966,7 @@ msgstr "Vous n’avez aucun message pour l’instant."
 #: bookwyrm/templates/feed/feed.html:22
 #, fuzzy, python-format
 #| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
 msgstr "charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
 #: bookwyrm/templates/feed/feed.html:38
@@ -1073,6 +1068,11 @@ msgstr "Aucun livre trouvé"
 msgid "Save &amp; continue"
 msgstr "Enregistrer &amp; continuer"
 
+#: bookwyrm/templates/get_started/layout.html:5
+#: bookwyrm/templates/landing/landing_layout.html:5
+msgid "Welcome"
+msgstr "Bienvenue"
+
 #: bookwyrm/templates/get_started/layout.html:15
 #, python-format
 msgid "Welcome to %(site_name)s!"
@@ -1277,7 +1277,6 @@ msgid "Book"
 msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/snippets/create_status_form.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:79
 #: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
@@ -1319,6 +1318,59 @@ msgstr "Résultats de recherche pour « %(query)s »"
 msgid "Matching Books"
 msgstr "Livres correspondants"
 
+#: bookwyrm/templates/landing/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr "À propos de %(site_name)s"
+
+#: bookwyrm/templates/landing/about.html:10
+#: bookwyrm/templates/landing/about.html:20
+msgid "Code of Conduct"
+msgstr "Code de conduite"
+
+#: bookwyrm/templates/landing/about.html:13
+#: bookwyrm/templates/landing/about.html:29
+msgid "Privacy Policy"
+msgstr "Politique de vie privée"
+
+#: bookwyrm/templates/landing/landing.html:6
+msgid "Recent Books"
+msgstr "Livres récents"
+
+#: bookwyrm/templates/landing/landing_layout.html:17
+msgid "Decentralized"
+msgstr "Décentralisé"
+
+#: bookwyrm/templates/landing/landing_layout.html:23
+msgid "Friendly"
+msgstr "Sympa"
+
+#: bookwyrm/templates/landing/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr "Anti‑commercial"
+
+#: bookwyrm/templates/landing/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr "Rejoignez %(name)s"
+
+#: bookwyrm/templates/landing/landing_layout.html:51
+#: bookwyrm/templates/login.html:56
+msgid "This instance is closed"
+msgstr "Cette instance est fermée"
+
+#: bookwyrm/templates/landing/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr "Merci ! Votre demande a bien été reçue."
+
+#: bookwyrm/templates/landing/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr "Demander une invitation"
+
+#: bookwyrm/templates/landing/landing_layout.html:79
+msgid "Your Account"
+msgstr "Votre compte"
+
 #: bookwyrm/templates/layout.html:40
 msgid "Search for a book or user"
 msgstr "Chercher un livre ou un compte"
@@ -1331,15 +1383,15 @@ msgstr "Menu de navigation principal "
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Your Books"
 msgstr "Vos Livres"
 
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Settings"
 msgstr "Paramètres"
 
-#: bookwyrm/templates/layout.html:113
+#: bookwyrm/templates/layout.html:118
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1347,61 +1399,61 @@ msgstr "Paramètres"
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:120
+#: bookwyrm/templates/layout.html:125
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:127
+#: bookwyrm/templates/layout.html:132
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136
+#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
 #: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:163
+#: bookwyrm/templates/layout.html:168
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:175
+#: bookwyrm/templates/layout.html:180
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:218
 msgid "About this instance"
 msgstr "À propos de cette instance"
 
-#: bookwyrm/templates/layout.html:217
+#: bookwyrm/templates/layout.html:222
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:221
+#: bookwyrm/templates/layout.html:226
 msgid "Documentation"
 msgstr "Documentation"
 
-#: bookwyrm/templates/layout.html:228
+#: bookwyrm/templates/layout.html:233
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:232
+#: bookwyrm/templates/layout.html:237
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1586,7 +1638,6 @@ msgstr "Commentaires de l’équipe de modération"
 
 #: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -1887,26 +1938,6 @@ msgstr "Modifier « %(book_title)s »"
 msgid "Want to Read \"%(book_title)s\""
 msgstr "Ajouter « <em>%(book_title)s</em> » aux envies de lecture"
 
-#: bookwyrm/templates/rss/title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:36
-msgid "rated"
-msgstr "a noté"
-
-#: bookwyrm/templates/rss/title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:38
-msgid "reviewed"
-msgstr "a écrit une critique de"
-
-#: bookwyrm/templates/rss/title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:40
-msgid "commented on"
-msgstr "a commenté"
-
-#: bookwyrm/templates/rss/title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:42
-msgid "quoted"
-msgstr "a cité"
-
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
 msgstr "Charger les résultats d’autres catalogues"
@@ -2429,14 +2460,6 @@ msgstr "Partager"
 msgid "Un-boost"
 msgstr "Annuler le partage"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "Alerte Spoiler :"
-
-#: bookwyrm/templates/snippets/content_warning_field.html:10
-msgid "Spoilers ahead!"
-msgstr "Attention spoilers !"
-
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "Critique"
@@ -2445,67 +2468,91 @@ msgstr "Critique"
 msgid "Quote"
 msgstr "Citation"
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
-msgid "Comment:"
-msgstr "Commentaire :"
+#: bookwyrm/templates/snippets/create_status/comment.html:15
+msgid "Some thoughts on the book"
+msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:25
-msgid "Quote:"
-msgstr "Citation :"
-
-#: bookwyrm/templates/snippets/create_status_form.html:27
-msgid "Review:"
-msgstr "Critique :"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-#: bookwyrm/templates/snippets/status/layout.html:29
-#: bookwyrm/templates/snippets/status/layout.html:47
-#: bookwyrm/templates/snippets/status/layout.html:48
-msgid "Reply"
-msgstr "Répondre"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-msgid "Content"
-msgstr "Contenu"
-
-#: bookwyrm/templates/snippets/create_status_form.html:80
+#: bookwyrm/templates/snippets/create_status/comment.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/create_status/comment.html:34
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status/comment.html:35
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "pourcent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status/comment.html:41
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "sur %(pages)s pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:110
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/status/layout.html:31
+#: bookwyrm/templates/snippets/status/layout.html:49
+#: bookwyrm/templates/snippets/status/layout.html:50
+msgid "Reply"
+msgstr "Répondre"
+
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+msgid "Content"
+msgstr "Contenu"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr "Alerte Spoiler :"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+msgid "Spoilers ahead!"
+msgstr "Attention spoilers !"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:117
+#: bookwyrm/templates/snippets/create_status/layout.html:38
+msgid "Comment:"
+msgstr "Commentaire :"
+
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:20
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status_form.html:128
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
 msgid "Post"
 msgstr "Publier"
 
+#: bookwyrm/templates/snippets/create_status/quotation.html:19
+msgid "Quote:"
+msgstr "Citation :"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#, fuzzy, python-format
+#| msgid "Edit \"%(book_title)s\""
+msgid "An excerpt from '%(book_title)s'"
+msgstr "Modifier « %(book_title)s »"
+
+#: bookwyrm/templates/snippets/create_status/review.html:20
+#, fuzzy, python-format
+#| msgid "Editions of %(book_title)s"
+msgid "Your review of '%(book_title)s'"
+msgstr "Éditions de %(book_title)s"
+
+#: bookwyrm/templates/snippets/create_status/review.html:32
+msgid "Review:"
+msgstr "Critique :"
+
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
 msgstr "Supprimer ces dates de lecture ?"
@@ -2541,15 +2588,27 @@ msgstr "Appliquer les filtres"
 msgid "Clear filters"
 msgstr "Annuler les filtres"
 
-#: bookwyrm/templates/snippets/follow_button.html:12
+#: bookwyrm/templates/snippets/follow_button.html:14
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Follow @%(username)s"
+msgstr "Signaler @%(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:16
 msgid "Follow"
 msgstr "S’abonner"
 
-#: bookwyrm/templates/snippets/follow_button.html:18
+#: bookwyrm/templates/snippets/follow_button.html:25
 msgid "Undo follow request"
 msgstr "Annuler la demande d’abonnement"
 
-#: bookwyrm/templates/snippets/follow_button.html:20
+#: bookwyrm/templates/snippets/follow_button.html:30
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Unfollow @%(username)s"
+msgstr "Signaler @%(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:32
 msgid "Unfollow"
 msgstr "Se désabonner"
 
@@ -2570,7 +2629,7 @@ msgid_plural "%(rating)s stars"
 msgstr[0] "%(rating)s étoile"
 msgstr[1] "%(rating)s étoiles"
 
-#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#: bookwyrm/templates/snippets/generated_status/goal.html:2
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
@@ -2578,9 +2637,11 @@ msgstr[0] "souhaite lire %(counter)s livre en %(year)s"
 msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+#, fuzzy, python-format
+#| msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+#| msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
 msgstr[1] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
 
@@ -2765,12 +2826,12 @@ msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "Ajouter « <em>%(book_title)s</em> » aux envies de lecture"
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:15
+#: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "Déplier"
 
 #: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:30
+#: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "Replier"
 
@@ -2778,18 +2839,65 @@ msgstr "Replier"
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
+#: bookwyrm/templates/snippets/status/headers/comment.html:2
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
+
+#: bookwyrm/templates/snippets/status/headers/note.html:15
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/quotation.html:2
+#, fuzzy, python-format
+#| msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
+msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Signalé par <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/rating.html:3
+#, fuzzy, python-format
+#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
+msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/read.html:5
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
+
+#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#, fuzzy, python-format
+#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/review.html:3
+#, fuzzy, python-format
+#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "Supprimer le statut"
 
-#: bookwyrm/templates/snippets/status/layout.html:51
-#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+#: bookwyrm/templates/snippets/status/layout.html:54
 msgid "Boost status"
 msgstr "Partager le statut"
 
-#: bookwyrm/templates/snippets/status/layout.html:55
-#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+#: bookwyrm/templates/snippets/status/layout.html:58
 msgid "Like status"
 msgstr "Ajouter le statut aux favoris"
 
@@ -2797,11 +2905,6 @@ msgstr "Ajouter le statut aux favoris"
 msgid "boosted"
 msgstr "a partagé"
 
-#: bookwyrm/templates/snippets/status/status_header.html:46
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
-
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -3392,9 +3495,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 #~ msgstr "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
-#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-#~ msgstr "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href=\"%(user_path)s\">%(username)s</a>"
-
 #~ msgid "Remove tag"
 #~ msgstr "Supprimer le tag"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 6645033399a2ca839b8ebe71c829b209d23bfd31..13ee2ab0340057533d0fb8890c6759f3701f6fc7 100644
GIT binary patch
delta 12459
zcmYk@3v|!*AII_UHq0<K8)H9gBX*x%EcY;Xxontg$|bjKRPLAjLdqrAuS;?%q7tRd
zr6NTx72Q-)p?@eLDWOvMKVSR4ozwT6Pmj<0bN_t4m*47~t{)1VaWK$-s$z+y4%g&B
z$Ek)_BOE6`$Z?LutJHB~vmIwN#^Fp{isjLFx8o#X5>~=|EQ2G^hvTp^F2?4#5p(eZ
zreov!j#I&L{7wOxC<>-vEH1&0xZTPF8#qpN;%MxS4X_T*v+`{iNqiJ*;yH}NG7Y_j
zrC?R!9IS`;q2^nJnauBOBr}SF6K2Oojx&;YH+IA1#*Q-y{n#9Dpmx@{iQ{k>PFIY@
zS(u0$Q49P6OX3aWP#veKXC#&)Ou*92@6;s|iVZLr+gO9n7Ux^s&*BHMH0=tIJLQbU
zayZe-pTrR21;`OQD=gk<7NOd|gMQu1kI0n8Z!iOYM6EFD9>)p88mOJrMRm+Z^~*sm
zBoDQaKB$TBM@>8o)qVnM+?kk(J5kTfg?l*vie#K-Uc(5~NyMTiNJ9<W6m?HqpavL(
zYPSq^V(U>8Z$>SA2Ws4RQ2jo`DtHCezHD>Ph~|FBDM5jc0<Aa}wX$^7%G;nic0<({
zpeCMz>Nf{<atlx=v=TMJT2#A@sEzDIwLgeD(Zi^><%FM1Z!+gl4O_HuoQ0T+8t?}U
z$8#3{jat}ki_7JBJFbXYU{%z_iKuq<QRB2iolFN*yFAoF`~%2n#gC%y<s{Tm&Oj|_
zp4G2HEo8m90~3iqKppiJ)Ho$udJ~4CCX7Hm{n4m}rJ+u&39>-H(~gV=&bNx8UWGFn
z)$wuUO>~xE8h(l~cndXQjaFX&I;bOUfZBOWi*r#E_qBL9YGY%H<^IngqZKViHC%&Q
z`DWC@iclR6pguHTq9!<xYJVN|K`GJNdseEUzJS>{81qmI+llJ854G@5u_W_5Uz5>2
zIf;C{oJ*)%P^XP&I;uk>RJ$D1#9ht)Rz4C-P(Bs)5YIquU<GP}n@|hbi5h=D`jz>_
z3XWTY)2J0+w)h5W;^4Mkc@#zy*F-J2DVD@>sFRw4dbsAIo~c!+c{X4$ZZUVZ<^HSS
zT?*9k5bB7JS%ZtHf&V}a^fzjtz;@oVQO=A-?Yti9*=UH`X>TlrLr}M<5MyyBYQ7iS
zasH*rY^Ojg-h(>2Pf;CzMD6?+)KUIxaryS%LTaD}O0c-T#Vt_d<YF)mL5(*OOXFD7
z!#&k+6^l_vz5;b`*P{mBiq&y1hT!*D{P3Z6d>z&PAJo7h9Xu<dPR@s{*@;6f;33pW
zJYunbwq+KgPGC7|f|pS{-;SE#0O|z3Ks`)9TKqezUC_PW&uj#0A*trwsQPB86X}8)
zZ!oe!zcZSQ2A*yWmY^2$3aa5Q48adkC-Mbqz|*Lsy@GLg1LLt;NADSGg*u_$sB!K`
zEvx|5e=PQ8erF~bP4EMj!HZZHucI0Uc5<A~SP}Jb4L~hq8fxJSQ4_60^?M2RRuozJ
zFQ{>UNA>#`L$NG_7Qg>h$>?E-K|TFhSQFc!1{{I9cjK`JPDSl}HR>L3K(*Us@lMn@
z?_hmAisi6O7jMB)s1H;k7XSXYCZnV2ZuT>WpuX*+Py<fKYPcLV;5KtF>I6SQE$BFE
zho?{{^9$;ven*WLl<S>D<y_8RJE~1VDz-u`<WW?I$*6(nS-jlbh}!WkjKxE!1^$dl
zcoVh5ggo!WTA{`nglboaI>G6A+<&cj4h1^mg{YM;N9}NfHQb6C;BC|b_hTA<jOza{
zYNvr+z2AUftUw%#VVI8U*8(+92h@0ZelnV{FY1#z9Q7<bf#LX!#jl_`?m_)QasV~q
zDbzyGn7?5r@lDiD)4O>)ZH-z$CoGRWPz&@ACR3ZtSk#fMG+#h<*o0chHq?p_q89QQ
zR>ZIIF1&y`@(SI(fs;{BePh%KwL$gkh#I#WvH`zypH&P%EnpaGg%5iT96xG@PoPd}
zk;TuU+HFSdWS5m6#;U}}QSGl-y_4@PAPm($3M2LY$CJ?tn^=P!tVP_uxB(9f)+L^f
zI*F~Qh3-e~<Ou54eT9km8&<;T9^Q$iqZZo8Y>)b2^}=B0cP5e1K+{oA^<30ZEyww|
z22(J#r#EpQb0F#&cnBkK6sq40)P!?TZ`TUc!rw%l%tscVMZb>rIvGtI)XTeP6;K04
zqsr4z6E#9TE6q?73`U*A7}PjZFbHR3A<jc>>>slPf9a}yDC(`K)SL5H$2t_~;mR_b
zq9$r<7NR=3sE2MP>fXMFTF7qHM2Au1e2MXR3X`!^AFqEVs=g6w0j>IQ{yLg`YcLcw
z;3(8XG8HT1e2l>jsHge>>SR7cE#w4hffrEyuApv3U|;X&HUw24hgxVNsy@?CMk{J)
z6)jN@Pe*egs^bLIM31A|&qq!44C(}5Mh(0j*|f6<)xOGo-iGR++GV3Ql!MxUzc(3m
z9E|#Oj>J@4fgSLWS+Sq@#p{QyD1REG@N<mB^Qc>M3#(!H{Y-*ssQO1xC-)@kZCiw#
zfZth8Mmt=Cdgxw6J#25I7WS_B0cz);quPImI)O8&et)3a2S4Do3q!@xsCKnbCy-_3
z%`sT-e|s`Isyx&RAF%i#REG)XOw<AvqXu4O@dnh6wxI6mc8tf}sCH+~OQ>h<I_eoK
z-Je_SClf_R3rIyZXpB0_PN<{nkJ{l_RQ+t!z$>vjuE#pK54GU)s1v%5Rq+<;nW{3t
zn<ovmktXQZ(X=7MFQ(H2v+*VDh$oR#b&>{pKPs~^hIltl!V{?1tLGqoXmAE<qHU;g
zKSI66-=fBM9`v56Jk*9(J;?c|ka?W~t^6eF7F;l|;iJU*_b47{XEdt*Q`Culi+YNG
zMooMbHBOl!-mQqjB;p!a65FFrrVDn$o<lhQ&SW-N!Bxy8&Kb(Pi(^p(PC)Horg;pz
z5XTSm{-e@()GgVJYQG&5a37Y&i>QTO#qQ_~_ssW`=|=ntHo#k`dtd({Z-*T)mbe#c
z2NO{P`Y{-1S@}XNMZC=7)u?taAm1Wqv&F$9ymn!zXTu*wrazes)PRdo9iPSe0Sth;
z*WVTJ6O26yy?gf^Rw2HO8mRP0@7B~r#i^)=w=KrweOMQtz<Rh1L-qcjC*z~wPb`lS
zqr8SSQ4@4UeNaXqx7V44weeT1g^>??U$h3OxC_?A(Wqx)nYkG?&OW>gzsD@S|0N#r
z{tIUVbF&%Clc#&N1SjBmY=#3zdkb5K^@(?39R7hxSZR#6<L0PaHVh+iBv!x~s9WV?
z2=hD7lHn+v^;WUfe9L^#JcPPMpICg%Jc;Um7WMF5F>jmY#(L#d%{pcl`t`6iC!>{h
z!z>(xWpFua;B^>+uVWa#joQIs)Pjy${4Ht$KcL3_)#8A0-uIzA-c5NkRQ<SdoWDBE
zrl9!gHCLl1TyODfm`c1IwZJo|1xJnd`o)`RW;SY}O;ER{6Y5zSW%aXA3tupv^Vh`7
zDbPaJpjNiY;ytL2hb=y9{*D^p7V3mb@qlQYNYui8s0G%>2+X$n_Ew&2aeqG<y`Mv^
zVjn(6eAF7`PV}DQo~Q{5Q41Y|TEH|bpKav}Q4_DW_*JWa8?~^#R(=?@aQ|^@@Dpml
zOBP>4P4utDA$$aMGGVBWwXg<eU?t2&EpUigXpTXRGufPFF7@;~>#Sglx!e2@tI+Wn
z*2l}3hVhfV_q+#c!b#>d)WT+&%gptt1#GqWU5h_1mizy$Rh+YmYp8((r+7OHK@AXN
zrkD-QHmHSmL!C$g>O|&ZcU+4a?>g#)Z(3ZE`&|6@e>pO05Q*BM&*Bbdp4khvkOxpZ
zEkF%8$;zjr##w+-xXj95Gk2l-ePHo1EdKldj1~Nby2m#y4x8%5)y;I&0$QREbFm>7
zpeBA1HNmT>cDu|Eto$p~+i(We{?Dnr|JuPVYgmfgp#?;sK0tLa2s2PWO4+E6_n;<d
zZFaTt2T<?3e%4h#%gUFcPGl9v;x?=Q%5Ry|sMqE)Y6rJb6NNtR4HSu5d7PPzdY#&%
zChBJPHw#f4nS|QlJk&F>6gBQ9RQ*;z84Y{@HPAPx1^k5iHN1-YH4B>N)z?8SGz&FQ
zON%?8PN<JL2=(JrfI0Xms{MA<!@ApI|5uhdfm+cS)IzSCLDRiB3{_v<;&jwPo0|7p
zeQ(ss6rd&?hZ^rOtDj@>YEQrOiWTfc4Y=RpqvrRhBm4!6PsGZDW_S~XVIAtDFct4X
zwJWgt$*2>Xj#|iK)QLZb_v-h*h>Rw<Z3gpajv7`#{fJb<o|uaI!(*n^Z^CfmH&HwN
z$jU#*9O6?}9yik)F9Ef|Y_lcmfp_xAL}D+jjD@Jz>j~6Co<~jaD#qb9i;tNnQ3Ibv
zZR84S$2YJkmU+?}ryc4R=A-5rhQ)vX`>kRDmZD-E>K<-H4OE0R@O|?%YGDCSd6qYQ
zs0AdTUf*;qg^f`Y=a~8Cu%|fxnp8}tAOY8)20mmBzO?w9#aGSXSzfznRKIxCQ=N<P
zI2?6Si%{bip*D03qw#+h|8wU9QF6Ao@^YvZN1{6TEUs;Fip6(h7WGZ7{1GdkjJkEx
zQ75+s^$fj++St1oj7Q8b{bY1BC(O&Jj)8N$4i(K9)WT9wJIJ!Qv(@LLJ}?7O3!8wN
zcr&WsJLZ1WLJp&z8UJxITJcZTAaJhNAOzL1GOA&9)XI~sJPY+2HNv~FGwKsN8r6O-
zmcbRMan_^yZ!(L#a=)|78tg-@>_gOv9JBKCR{k4m;F}hgecC&zDyV)5sEM*s3u|I=
zF6u;kT0GR^kr<)(f2vh1HdkORIy_(8fDaPtXZbj4VZrmfiK0<Eio>dyhzZyd%V7bA
z;6#gOm<v%Swp#Ui|Mw|_N36jy)K1P|JG_7?m^I&<us^DPm^liy<8c<xK`mer>ejBY
z_-)iPa>(M7Sp55c!3zFF4P0V@H$Yjl3TlD1F&^t;DE361z+kL^g{c0IVOM+twUDo^
z{H(<nQ78G=0?xkznX(JLhCVX^Gbqo-+Bg(7@I0$uVy;E?f6eOmpcZrhwa|~vYp8`(
zU*wr&)?dW=tD+SJdad$MJ1am9JPGww&%sz+hid;ms@-Q6pE56^`u&AkaOuU~PAi}m
zRufg8WM=ru=rw78I^ve70XmueP#p?U6OTc)n`ZTMt$ZbFf|v0=d>ysGP}kFk>Ys=e
z@otO#?a63@9+-~(P)9c(_3-UL{hHmzRLohzpI!Jc>S5Y}`t%+_J#0T(9I({;x8-P5
zyFRFmJ&c;~ab&@M=P4^#fclYHhC#R;wc@wTgXS0J|4=)*WID^d_7SKPiZzq0yq?(t
zb>f||l-~c|WOP*h&5@{yr=TX7ZSg8|BWi*jsDa)??dUM-792%=2fnp9Xt_6DS=4u;
z3ToU;EdK9*t*t>{jHF_iD)2FkLKiFJCe%^yLrwG@R>w0~2Lqn*CQ3jpC>vGZ1T|hC
z)Wi>?HaG+Q5o8vU>4xi3f6xDgy)bhH|H_PWQTP5Itb&QpdgVEoM7-5JiK;KX(!1Aj
zs4r;-cEEh>i_fDr^zTZ}Uk_cxDsM%t%slgc97g>J%*QXSJZZJpzP{NCwX-~nA4HwN
zBUV1a;<>0>w-~$Qs@2?oWq!AUHfuOG;+3cYK1X#pj(K<*)xO?yUOXGs{yS8=@aMgS
z`A|omfEwo>)RDJFoorWglixBW)_O<Z4<l)?9K&!kCgMA&fzFw~q9(j%@okGst@Fym
z%xKh+--UYp9!HI{5Pg`soJ?afMW_KUn}1^fv7Y4lWcJ}s_fovC;WeV(M7;v}2UkB*
zCizc_Bkvyr;1}8rBb^{W3MaZP5+a(GvR-!@zekNuWRn#HQGb@Q6(n8%csN^$8@P)S
zY6V2O+Y@SK46<?hTRSxiv9i6CZLxllR{xtDl9=2nf)-1u*+gj=`JXVydc98mgtZ=M
z&cKzl|JUM@m`WN%+5PUc#E5_n?$X4V@F6xv4f8qoKw@2gIMHa*9C}=$$3~K_49Z4O
zmO{$69uML<>RzVoEmCD-UMJ^o^16P;e=NTXAFzI9y=tcs@kGi?Tlr+Z8>5rrLRV2X
z*ZTE!*Cy2(UYiyjNpDj6Khju6s7`u^ygn=asr%SQ6)i0PHTCC6x=vy<<VT_ST1u=p
zJ(F~Zd>Uiyc2kp^1<Z2`lj~;epsXupdcyeo&FMqFF=Y$L7vZ0z2S_iGz9Y48KTeLS
zdYjxhT0TjuLh`zL5Wnl*OwJ0eMlP77Yn$6N#TWiGZMs@Jm3DE5r}&zVwKg@)aB5yB
zWz(`1WvA7YE1Y-?@nP~2<g1de=<ZFa6~3M5W74;z1*FFAwUoyGB<gi-rlcGBeR$^@
zN<5tO76mQw6|1|K_#t9l6G&;4mnD9Id^~1Zo$Bvg>uB>O>Bl<-p6-^^kdP~sA12jz
z_on(n>-?v8J@<TSv&1|~s{g07(|__B<_LXtrMh`(QLPiGtwhOLN(#tNE3V_~McHuj
z`qGuL5k9b<k67H)Jnz1mR;%FwtJMJClm8h@V=dBWq~)YWBwb5Lr^#0)eeQ<Tjq(3s
zH7!*_?MmbiD({0Nh&Pg!kSZ~6AnKY<`jq_hq-s`Hm-^2rZ;yPuomiZLt?>(7N4kr)
z1Bi8f6~K>rD8YjSf$kf1<4cYpTI8Or8&xTt+%y{Bpzf$m@T?n>?yEG6n(`!F{1sh%
z-QzY)_m%vWb|u~3>B-?S)VC$7LG5bX<1S5)Nxf*}sLMst2+}Fa^p!qB(zT3uJbvW<
zknXEJl5q-2Qz?nVD{8{kg;x79nN-V-%ZLe0rnViWjVKxKcFKs#e}SkUrS&N3Mt&0c
zzsa{H=?bMRfi#PBfwY+PC~c-<4N@mkbK)qkdGS9txNl|nLI+biK{d4Sxj$q?gq|VS
zixfnwhuwh8sDR6E)l6Sv3axsQs*ny+SC2N;N$tt^rc767Y~uFIO!k)}H<6Mqq$Z?x
z#QkV}7v>Y|a*017=~|2LTVApLeppZ3o}@oQj$<@^?<I94{})MDNz&cLIet~~Mapya
zpAW8*`H=J@DUnWn)DRnBB;IlpvwWe?P`i+HmC`rdysVgzHq^Bva@>ho^}~-*H;|G$
zSGK!1E4g(AE6Jp`2UTlHxs-J#evf=KULtiSf9GmOeRu0uin=XsM!ksk0hIJ0dX1#(
z3mivkL3*3CpY$8$LrHze|4vFIKZ$gmd=Bm*-EimC^MxFwMAtX&8}%Xvtg+~Ruh98{
z_*E;@|2Lp3k@!CH-;*z4WlgNjaI+!hqpVJS+FJf*QSIz5F-5`o<14$lJxT<|k9Iq~
R;46A=#KG92?N7Ie`aejmD9iu=

delta 12601
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
HZW;AIe?whH

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index adb0d36c..9ece3e74 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 01:35+0000\n"
+"POT-Creation-Date: 2021-08-13 02:21+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -55,7 +55,8 @@ msgstr "列表顺序"
 msgid "Book Title"
 msgstr "书名"
 
-#: bookwyrm/forms.py:309 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:309
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
@@ -83,7 +84,7 @@ msgstr "%(value)s 不是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s 不是有效的用户名"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159
+#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "用户名"
 
@@ -309,8 +310,9 @@ msgid "Cancel"
 msgstr "取消"
 
 #: bookwyrm/templates/book/book.html:48
-#: bookwyrm/templates/discover/large-book.html:25
-#: bookwyrm/templates/discover/small-book.html:19
+#: bookwyrm/templates/discover/large-book.html:22
+#: bookwyrm/templates/landing/large-book.html:25
+#: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "作者"
 
@@ -493,6 +495,7 @@ msgid "Back"
 msgstr "返回"
 
 #: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "标题:"
 
@@ -708,7 +711,7 @@ msgid "Confirmation code:"
 msgstr "确认密码:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/landing/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "提交"
@@ -722,7 +725,7 @@ msgid "Resend confirmation link"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/landing/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -749,7 +752,7 @@ msgstr "跨站社区"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:94
 msgid "Directory"
 msgstr "目录"
 
@@ -819,63 +822,45 @@ msgstr "BookWyrm 用户"
 msgid "All known users"
 msgstr "所有已知用户"
 
-#: bookwyrm/templates/discover/about.html:7
+#: bookwyrm/templates/discover/discover.html:4
+#: bookwyrm/templates/discover/discover.html:10
+#: bookwyrm/templates/layout.html:71
+#, fuzzy
+#| msgid "Discard"
+msgid "Discover"
+msgstr "削除"
+
+#: bookwyrm/templates/discover/discover.html:12
 #, python-format
-msgid "About %(site_name)s"
-msgstr "关于 %(site_name)s"
+msgid "See what's new in the local %(site_name)s community"
+msgstr ""
 
-#: bookwyrm/templates/discover/about.html:10
-#: bookwyrm/templates/discover/about.html:20
-msgid "Code of Conduct"
-msgstr "行为准则"
+#: bookwyrm/templates/discover/large-book.html:46
+#: bookwyrm/templates/discover/small-book.html:32
+msgid "rated"
+msgstr "评价了"
 
-#: bookwyrm/templates/discover/about.html:13
-#: bookwyrm/templates/discover/about.html:29
-msgid "Privacy Policy"
-msgstr "隐私政策"
+#: bookwyrm/templates/discover/large-book.html:48
+#: bookwyrm/templates/discover/small-book.html:34
+msgid "reviewed"
+msgstr "写了书评给"
 
-#: bookwyrm/templates/discover/discover.html:6
-msgid "Recent Books"
-msgstr "最近书目"
+#: bookwyrm/templates/discover/large-book.html:50
+#: bookwyrm/templates/discover/small-book.html:36
+msgid "commented on"
+msgstr "评论了"
 
-#: bookwyrm/templates/discover/landing_layout.html:5
-#: bookwyrm/templates/get_started/layout.html:5
-msgid "Welcome"
-msgstr "欢迎"
+#: bookwyrm/templates/discover/large-book.html:52
+#: bookwyrm/templates/discover/small-book.html:38
+msgid "quoted"
+msgstr "引用了"
 
-#: bookwyrm/templates/discover/landing_layout.html:17
-msgid "Decentralized"
-msgstr "去中心化"
-
-#: bookwyrm/templates/discover/landing_layout.html:23
-msgid "Friendly"
-msgstr "友好"
-
-#: bookwyrm/templates/discover/landing_layout.html:29
-msgid "Anti-Corporate"
-msgstr "反企业"
-
-#: bookwyrm/templates/discover/landing_layout.html:44
-#, python-format
-msgid "Join %(name)s"
-msgstr "加入 %(name)s"
-
-#: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "本实例不开放。"
-
-#: bookwyrm/templates/discover/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr "谢谢你！我们已经收到了你的请求。"
-
-#: bookwyrm/templates/discover/landing_layout.html:60
-msgid "Request an Invitation"
-msgstr "请求邀请"
-
-#: bookwyrm/templates/discover/landing_layout.html:79
-msgid "Your Account"
-msgstr "你的帐号"
+#: bookwyrm/templates/discover/large-book.html:68
+#: bookwyrm/templates/discover/small-book.html:52
+#, fuzzy
+#| msgid "Like status"
+msgid "View status"
+msgstr "喜欢状态"
 
 #: bookwyrm/templates/email/confirm/html_content.html:6
 #: bookwyrm/templates/email/confirm/text_content.html:4
@@ -889,10 +874,20 @@ msgstr ""
 msgid "Confirm Email"
 msgstr "确认"
 
+#: bookwyrm/templates/email/confirm/html_content.html:15
+#, python-format
+msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
 msgstr ""
 
+#: bookwyrm/templates/email/confirm/text_content.html:10
+#, python-format
+msgid "Or enter the code \"%(confirmation_code)s\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -961,7 +956,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "与 <a href=\"%(path)s\">%(username)s</a> 私信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Direct Messages"
 msgstr "私信"
 
@@ -976,7 +971,7 @@ msgstr "你现在没有消息。"
 #: bookwyrm/templates/feed/feed.html:22
 #, fuzzy, python-format
 #| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
 msgstr "加载 <span data-poll=\"stream/%(tab)s\">0</span> 条未读状态"
 
 #: bookwyrm/templates/feed/feed.html:38
@@ -1078,6 +1073,11 @@ msgstr "没有找到书目"
 msgid "Save &amp; continue"
 msgstr "保存 &amp; 继续"
 
+#: bookwyrm/templates/get_started/layout.html:5
+#: bookwyrm/templates/landing/landing_layout.html:5
+msgid "Welcome"
+msgstr "欢迎"
+
 #: bookwyrm/templates/get_started/layout.html:15
 #, python-format
 msgid "Welcome to %(site_name)s!"
@@ -1278,7 +1278,6 @@ msgid "Book"
 msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/snippets/create_status_form.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:79
 #: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
@@ -1320,6 +1319,59 @@ msgstr "\"%(query)s\" 的搜索结果"
 msgid "Matching Books"
 msgstr "匹配的书目"
 
+#: bookwyrm/templates/landing/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr "关于 %(site_name)s"
+
+#: bookwyrm/templates/landing/about.html:10
+#: bookwyrm/templates/landing/about.html:20
+msgid "Code of Conduct"
+msgstr "行为准则"
+
+#: bookwyrm/templates/landing/about.html:13
+#: bookwyrm/templates/landing/about.html:29
+msgid "Privacy Policy"
+msgstr "隐私政策"
+
+#: bookwyrm/templates/landing/landing.html:6
+msgid "Recent Books"
+msgstr "最近书目"
+
+#: bookwyrm/templates/landing/landing_layout.html:17
+msgid "Decentralized"
+msgstr "去中心化"
+
+#: bookwyrm/templates/landing/landing_layout.html:23
+msgid "Friendly"
+msgstr "友好"
+
+#: bookwyrm/templates/landing/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr "反企业"
+
+#: bookwyrm/templates/landing/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr "加入 %(name)s"
+
+#: bookwyrm/templates/landing/landing_layout.html:51
+#: bookwyrm/templates/login.html:56
+msgid "This instance is closed"
+msgstr "本实例不开放。"
+
+#: bookwyrm/templates/landing/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr "谢谢你！我们已经收到了你的请求。"
+
+#: bookwyrm/templates/landing/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr "请求邀请"
+
+#: bookwyrm/templates/landing/landing_layout.html:79
+msgid "Your Account"
+msgstr "你的帐号"
+
 #: bookwyrm/templates/layout.html:40
 msgid "Search for a book or user"
 msgstr "搜索书目或用户"
@@ -1332,15 +1384,15 @@ msgstr "主导航菜单"
 msgid "Feed"
 msgstr "动态"
 
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Your Books"
 msgstr "你的书目"
 
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:113
+#: bookwyrm/templates/layout.html:118
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1348,61 +1400,61 @@ msgstr "设置"
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:120
+#: bookwyrm/templates/layout.html:125
 msgid "Admin"
 msgstr "管理员"
 
-#: bookwyrm/templates/layout.html:127
+#: bookwyrm/templates/layout.html:132
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136
+#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
 #: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户名:"
 
-#: bookwyrm/templates/layout.html:163
+#: bookwyrm/templates/layout.html:168
 msgid "password"
 msgstr "密码"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "忘记了密码？"
 
-#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:175
+#: bookwyrm/templates/layout.html:180
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:218
 msgid "About this instance"
 msgstr "关于本实例"
 
-#: bookwyrm/templates/layout.html:217
+#: bookwyrm/templates/layout.html:222
 msgid "Contact site admin"
 msgstr "联系站点管理员"
 
-#: bookwyrm/templates/layout.html:221
+#: bookwyrm/templates/layout.html:226
 msgid "Documentation"
 msgstr "文档:"
 
-#: bookwyrm/templates/layout.html:228
+#: bookwyrm/templates/layout.html:233
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支持 %(site_name)s"
 
-#: bookwyrm/templates/layout.html:232
+#: bookwyrm/templates/layout.html:237
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是开源软件。你可以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
@@ -1587,7 +1639,6 @@ msgstr "监察员评论"
 
 #: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "评论"
 
@@ -1883,26 +1934,6 @@ msgstr "开始 \"%(book_title)s\""
 msgid "Want to Read \"%(book_title)s\""
 msgstr "想要阅读 \"%(book_title)s\""
 
-#: bookwyrm/templates/rss/title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:36
-msgid "rated"
-msgstr "评价了"
-
-#: bookwyrm/templates/rss/title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:38
-msgid "reviewed"
-msgstr "写了书评给"
-
-#: bookwyrm/templates/rss/title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:40
-msgid "commented on"
-msgstr "评论了"
-
-#: bookwyrm/templates/rss/title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:42
-msgid "quoted"
-msgstr "引用了"
-
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
 msgstr "从其它分类加载结果"
@@ -2424,14 +2455,6 @@ msgstr "转发"
 msgid "Un-boost"
 msgstr "取消转发"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "剧透警告:"
-
-#: bookwyrm/templates/snippets/content_warning_field.html:10
-msgid "Spoilers ahead!"
-msgstr "前有剧透！"
-
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "书评"
@@ -2440,67 +2463,91 @@ msgstr "书评"
 msgid "Quote"
 msgstr "引用"
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
-msgid "Comment:"
-msgstr "评论:"
+#: bookwyrm/templates/snippets/create_status/comment.html:15
+msgid "Some thoughts on the book"
+msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:25
-msgid "Quote:"
-msgstr "引用:"
-
-#: bookwyrm/templates/snippets/create_status_form.html:27
-msgid "Review:"
-msgstr "书评:"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-#: bookwyrm/templates/snippets/status/layout.html:29
-#: bookwyrm/templates/snippets/status/layout.html:47
-#: bookwyrm/templates/snippets/status/layout.html:48
-msgid "Reply"
-msgstr "回复"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-msgid "Content"
-msgstr "内容"
-
-#: bookwyrm/templates/snippets/create_status_form.html:80
+#: bookwyrm/templates/snippets/create_status/comment.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "进度:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/create_status/comment.html:34
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "页数"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status/comment.html:35
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status/comment.html:41
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全书 %(pages)s 页"
 
-#: bookwyrm/templates/snippets/create_status_form.html:110
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/status/layout.html:31
+#: bookwyrm/templates/snippets/status/layout.html:49
+#: bookwyrm/templates/snippets/status/layout.html:50
+msgid "Reply"
+msgstr "回复"
+
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+msgid "Content"
+msgstr "内容"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr "剧透警告:"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+msgid "Spoilers ahead!"
+msgstr "前有剧透！"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
 msgid "Include spoiler alert"
 msgstr "加入剧透警告"
 
-#: bookwyrm/templates/snippets/create_status_form.html:117
+#: bookwyrm/templates/snippets/create_status/layout.html:38
+msgid "Comment:"
+msgstr "评论:"
+
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:20
 msgid "Private"
 msgstr "私密"
 
-#: bookwyrm/templates/snippets/create_status_form.html:128
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
 msgid "Post"
 msgstr "发布"
 
+#: bookwyrm/templates/snippets/create_status/quotation.html:19
+msgid "Quote:"
+msgstr "引用:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#, fuzzy, python-format
+#| msgid "Start \"%(book_title)s\""
+msgid "An excerpt from '%(book_title)s'"
+msgstr "开始 \"%(book_title)s\""
+
+#: bookwyrm/templates/snippets/create_status/review.html:20
+#, fuzzy, python-format
+#| msgid "Editions of %(book_title)s"
+msgid "Your review of '%(book_title)s'"
+msgstr "%(book_title)s 的各版本"
+
+#: bookwyrm/templates/snippets/create_status/review.html:32
+msgid "Review:"
+msgstr "书评:"
+
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
 msgstr "删除这些阅读日期吗？"
@@ -2536,15 +2583,27 @@ msgstr "应用过滤器"
 msgid "Clear filters"
 msgstr "清除过滤器"
 
-#: bookwyrm/templates/snippets/follow_button.html:12
+#: bookwyrm/templates/snippets/follow_button.html:14
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Follow @%(username)s"
+msgstr "报告 %(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:16
 msgid "Follow"
 msgstr "关注"
 
-#: bookwyrm/templates/snippets/follow_button.html:18
+#: bookwyrm/templates/snippets/follow_button.html:25
 msgid "Undo follow request"
 msgstr "撤回关注请求"
 
-#: bookwyrm/templates/snippets/follow_button.html:20
+#: bookwyrm/templates/snippets/follow_button.html:30
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Unfollow @%(username)s"
+msgstr "报告 %(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:32
 msgid "Unfollow"
 msgstr "取消关注"
 
@@ -2564,16 +2623,18 @@ msgid "%(rating)s star"
 msgid_plural "%(rating)s stars"
 msgstr[0] "%(rating)s 星"
 
-#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#: bookwyrm/templates/snippets/generated_status/goal.html:2
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "设定了在 %(year)s 内要读 %(counter)s 本书的目标"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+#, fuzzy, python-format
+#| msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+#| msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_rating)s 星"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
@@ -2756,12 +2817,12 @@ msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "想要阅读 \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:15
+#: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "显示更多"
 
 #: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:30
+#: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "显示更少"
 
@@ -2769,18 +2830,65 @@ msgstr "显示更少"
 msgid "Open image in new window"
 msgstr "在新窗口中打开图像"
 
+#: bookwyrm/templates/snippets/status/headers/comment.html:2
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
+
+#: bookwyrm/templates/snippets/status/headers/note.html:15
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgstr "回复了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状态</a>"
+
+#: bookwyrm/templates/snippets/status/headers/quotation.html:2
+#, fuzzy, python-format
+#| msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
+msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 报告"
+
+#: bookwyrm/templates/snippets/status/headers/rating.html:3
+#, fuzzy, python-format
+#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建"
+
+#: bookwyrm/templates/snippets/status/headers/read.html:5
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
+
+#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#, fuzzy, python-format
+#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建"
+
+#: bookwyrm/templates/snippets/status/headers/review.html:3
+#, fuzzy, python-format
+#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建"
+
+#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "回复了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状态</a>"
+
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "删除发文"
 
-#: bookwyrm/templates/snippets/status/layout.html:51
-#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+#: bookwyrm/templates/snippets/status/layout.html:54
 msgid "Boost status"
 msgstr "转发状态"
 
-#: bookwyrm/templates/snippets/status/layout.html:55
-#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+#: bookwyrm/templates/snippets/status/layout.html:58
 msgid "Like status"
 msgstr "喜欢状态"
 
@@ -2788,11 +2896,6 @@ msgstr "喜欢状态"
 msgid "boosted"
 msgstr "转发了"
 
-#: bookwyrm/templates/snippets/status/status_header.html:46
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "回复了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状态</a>"
-
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo
index 552fea2a6ea9d89a28105fe6338f09b8053c81ce..a1075ef48305939c29071de898e0eb30fd353541 100644
GIT binary patch
delta 13317
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
E54BAiSpWb4

delta 13529
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
HGvWUOjK^gd

diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index c496bb92..70caf596 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 01:35+0000\n"
+"POT-Creation-Date: 2021-08-13 02:21+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,8 @@ msgstr "列表順序"
 msgid "Book Title"
 msgstr "書名"
 
-#: bookwyrm/forms.py:309 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:309
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
@@ -83,7 +84,7 @@ msgstr "%(value)s 不是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s 不是有效的使用者名稱"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159
+#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "使用者名稱"
 
@@ -313,8 +314,9 @@ msgid "Cancel"
 msgstr "取消"
 
 #: bookwyrm/templates/book/book.html:48
-#: bookwyrm/templates/discover/large-book.html:25
-#: bookwyrm/templates/discover/small-book.html:19
+#: bookwyrm/templates/discover/large-book.html:22
+#: bookwyrm/templates/landing/large-book.html:25
+#: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "作者"
 
@@ -497,6 +499,7 @@ msgid "Back"
 msgstr "返回"
 
 #: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "標題:"
 
@@ -714,7 +717,7 @@ msgid "Confirmation code:"
 msgstr "確認密碼:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/landing/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "提交"
@@ -728,7 +731,7 @@ msgid "Resend confirmation link"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/landing/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -755,7 +758,7 @@ msgstr "跨站社群"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:94
 msgid "Directory"
 msgstr "目錄"
 
@@ -825,63 +828,45 @@ msgstr "BookWyrm 使用者"
 msgid "All known users"
 msgstr "所有已知使用者"
 
-#: bookwyrm/templates/discover/about.html:7
+#: bookwyrm/templates/discover/discover.html:4
+#: bookwyrm/templates/discover/discover.html:10
+#: bookwyrm/templates/layout.html:71
+#, fuzzy
+#| msgid "Discard"
+msgid "Discover"
+msgstr "放棄"
+
+#: bookwyrm/templates/discover/discover.html:12
 #, python-format
-msgid "About %(site_name)s"
-msgstr "關於 %(site_name)s"
+msgid "See what's new in the local %(site_name)s community"
+msgstr ""
 
-#: bookwyrm/templates/discover/about.html:10
-#: bookwyrm/templates/discover/about.html:20
-msgid "Code of Conduct"
-msgstr "行為準則"
+#: bookwyrm/templates/discover/large-book.html:46
+#: bookwyrm/templates/discover/small-book.html:32
+msgid "rated"
+msgstr "評價了"
 
-#: bookwyrm/templates/discover/about.html:13
-#: bookwyrm/templates/discover/about.html:29
-msgid "Privacy Policy"
-msgstr "隱私政策"
+#: bookwyrm/templates/discover/large-book.html:48
+#: bookwyrm/templates/discover/small-book.html:34
+msgid "reviewed"
+msgstr "寫了書評給"
 
-#: bookwyrm/templates/discover/discover.html:6
-msgid "Recent Books"
-msgstr "最近書目"
+#: bookwyrm/templates/discover/large-book.html:50
+#: bookwyrm/templates/discover/small-book.html:36
+msgid "commented on"
+msgstr "評論了"
 
-#: bookwyrm/templates/discover/landing_layout.html:5
-#: bookwyrm/templates/get_started/layout.html:5
-msgid "Welcome"
-msgstr "歡迎"
+#: bookwyrm/templates/discover/large-book.html:52
+#: bookwyrm/templates/discover/small-book.html:38
+msgid "quoted"
+msgstr "引用了"
 
-#: bookwyrm/templates/discover/landing_layout.html:17
-msgid "Decentralized"
-msgstr "去中心化"
-
-#: bookwyrm/templates/discover/landing_layout.html:23
-msgid "Friendly"
-msgstr "友好"
-
-#: bookwyrm/templates/discover/landing_layout.html:29
-msgid "Anti-Corporate"
-msgstr "反企業"
-
-#: bookwyrm/templates/discover/landing_layout.html:44
-#, python-format
-msgid "Join %(name)s"
-msgstr "加入 %(name)s"
-
-#: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "本實例不開放。"
-
-#: bookwyrm/templates/discover/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr "謝謝你！我們已經受到了你的請求。"
-
-#: bookwyrm/templates/discover/landing_layout.html:60
-msgid "Request an Invitation"
-msgstr "請求邀請"
-
-#: bookwyrm/templates/discover/landing_layout.html:79
-msgid "Your Account"
-msgstr "你的帳號"
+#: bookwyrm/templates/discover/large-book.html:68
+#: bookwyrm/templates/discover/small-book.html:52
+#, fuzzy
+#| msgid "Like status"
+msgid "View status"
+msgstr "喜歡狀態"
 
 #: bookwyrm/templates/email/confirm/html_content.html:6
 #: bookwyrm/templates/email/confirm/text_content.html:4
@@ -895,10 +880,20 @@ msgstr ""
 msgid "Confirm Email"
 msgstr "確認"
 
+#: bookwyrm/templates/email/confirm/html_content.html:15
+#, python-format
+msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
 msgstr ""
 
+#: bookwyrm/templates/email/confirm/text_content.html:10
+#, python-format
+msgid "Or enter the code \"%(confirmation_code)s\" at login."
+msgstr ""
+
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -967,7 +962,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "與 <a href=\"%(path)s\">%(username)s</a> 私信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Direct Messages"
 msgstr "私信"
 
@@ -982,7 +977,7 @@ msgstr "你現在沒有訊息。"
 #: bookwyrm/templates/feed/feed.html:22
 #, fuzzy, python-format
 #| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
+msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
 msgstr "載入 <span data-poll=\"stream/%(tab)s\">0</span> 條未讀狀態"
 
 #: bookwyrm/templates/feed/feed.html:38
@@ -1084,6 +1079,11 @@ msgstr "沒有找到書目"
 msgid "Save &amp; continue"
 msgstr "儲存 &amp; 繼續"
 
+#: bookwyrm/templates/get_started/layout.html:5
+#: bookwyrm/templates/landing/landing_layout.html:5
+msgid "Welcome"
+msgstr "歡迎"
+
 #: bookwyrm/templates/get_started/layout.html:15
 #, python-format
 msgid "Welcome to %(site_name)s!"
@@ -1288,7 +1288,6 @@ msgid "Book"
 msgstr "書目"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/snippets/create_status_form.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:79
 #: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
@@ -1330,6 +1329,59 @@ msgstr "\"%(query)s\" 的搜尋結果"
 msgid "Matching Books"
 msgstr "匹配的書目"
 
+#: bookwyrm/templates/landing/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr "關於 %(site_name)s"
+
+#: bookwyrm/templates/landing/about.html:10
+#: bookwyrm/templates/landing/about.html:20
+msgid "Code of Conduct"
+msgstr "行為準則"
+
+#: bookwyrm/templates/landing/about.html:13
+#: bookwyrm/templates/landing/about.html:29
+msgid "Privacy Policy"
+msgstr "隱私政策"
+
+#: bookwyrm/templates/landing/landing.html:6
+msgid "Recent Books"
+msgstr "最近書目"
+
+#: bookwyrm/templates/landing/landing_layout.html:17
+msgid "Decentralized"
+msgstr "去中心化"
+
+#: bookwyrm/templates/landing/landing_layout.html:23
+msgid "Friendly"
+msgstr "友好"
+
+#: bookwyrm/templates/landing/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr "反企業"
+
+#: bookwyrm/templates/landing/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr "加入 %(name)s"
+
+#: bookwyrm/templates/landing/landing_layout.html:51
+#: bookwyrm/templates/login.html:56
+msgid "This instance is closed"
+msgstr "本實例不開放。"
+
+#: bookwyrm/templates/landing/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr "謝謝你！我們已經受到了你的請求。"
+
+#: bookwyrm/templates/landing/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr "請求邀請"
+
+#: bookwyrm/templates/landing/landing_layout.html:79
+msgid "Your Account"
+msgstr "你的帳號"
+
 #: bookwyrm/templates/layout.html:40
 msgid "Search for a book or user"
 msgstr "搜尋書目或使用者"
@@ -1342,15 +1394,15 @@ msgstr "主導航選單"
 msgid "Feed"
 msgstr "動態"
 
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Your Books"
 msgstr "你的書目"
 
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Settings"
 msgstr "設定"
 
-#: bookwyrm/templates/layout.html:113
+#: bookwyrm/templates/layout.html:118
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1358,61 +1410,61 @@ msgstr "設定"
 msgid "Invites"
 msgstr "邀請"
 
-#: bookwyrm/templates/layout.html:120
+#: bookwyrm/templates/layout.html:125
 msgid "Admin"
 msgstr "管理員"
 
-#: bookwyrm/templates/layout.html:127
+#: bookwyrm/templates/layout.html:132
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136
+#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
 #: bookwyrm/templates/login.html:22
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: bookwyrm/templates/layout.html:163
+#: bookwyrm/templates/layout.html:168
 msgid "password"
 msgstr "密碼"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
 msgid "Forgot your password?"
 msgstr "忘記了密碼？"
 
-#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:38
 msgid "Log in"
 msgstr "登入"
 
-#: bookwyrm/templates/layout.html:175
+#: bookwyrm/templates/layout.html:180
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:218
 msgid "About this instance"
 msgstr "關於本實例"
 
-#: bookwyrm/templates/layout.html:217
+#: bookwyrm/templates/layout.html:222
 msgid "Contact site admin"
 msgstr "聯絡網站管理員"
 
-#: bookwyrm/templates/layout.html:221
+#: bookwyrm/templates/layout.html:226
 msgid "Documentation"
 msgstr "文件:"
 
-#: bookwyrm/templates/layout.html:228
+#: bookwyrm/templates/layout.html:233
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支援 %(site_name)s"
 
-#: bookwyrm/templates/layout.html:232
+#: bookwyrm/templates/layout.html:237
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是開源軟體。你可以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 貢獻或報告問題。"
 
@@ -1597,7 +1649,6 @@ msgstr "監察員評論"
 
 #: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "評論"
 
@@ -1898,26 +1949,6 @@ msgstr "編輯 \"%(book_title)s\""
 msgid "Want to Read \"%(book_title)s\""
 msgstr "想要閱讀 \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/rss/title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:36
-msgid "rated"
-msgstr "評價了"
-
-#: bookwyrm/templates/rss/title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:38
-msgid "reviewed"
-msgstr "寫了書評給"
-
-#: bookwyrm/templates/rss/title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:40
-msgid "commented on"
-msgstr "評論了"
-
-#: bookwyrm/templates/rss/title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:42
-msgid "quoted"
-msgstr "引用了"
-
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
 msgstr "從其它分類載入結果"
@@ -2443,14 +2474,6 @@ msgstr "轉發"
 msgid "Un-boost"
 msgstr "取消轉發"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "劇透警告:"
-
-#: bookwyrm/templates/snippets/content_warning_field.html:10
-msgid "Spoilers ahead!"
-msgstr "前有劇透！"
-
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "書評"
@@ -2459,67 +2482,91 @@ msgstr "書評"
 msgid "Quote"
 msgstr "引用"
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
-msgid "Comment:"
-msgstr "評論:"
+#: bookwyrm/templates/snippets/create_status/comment.html:15
+msgid "Some thoughts on the book"
+msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:25
-msgid "Quote:"
-msgstr "引用:"
-
-#: bookwyrm/templates/snippets/create_status_form.html:27
-msgid "Review:"
-msgstr "書評:"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-#: bookwyrm/templates/snippets/status/layout.html:29
-#: bookwyrm/templates/snippets/status/layout.html:47
-#: bookwyrm/templates/snippets/status/layout.html:48
-msgid "Reply"
-msgstr "回覆"
-
-#: bookwyrm/templates/snippets/create_status_form.html:56
-msgid "Content"
-msgstr "內容"
-
-#: bookwyrm/templates/snippets/create_status_form.html:80
+#: bookwyrm/templates/snippets/create_status/comment.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "進度:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/create_status/comment.html:34
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "頁數"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status/comment.html:35
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status/comment.html:41
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全書 %(pages)s 頁"
 
-#: bookwyrm/templates/snippets/create_status_form.html:110
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/status/layout.html:31
+#: bookwyrm/templates/snippets/status/layout.html:49
+#: bookwyrm/templates/snippets/status/layout.html:50
+msgid "Reply"
+msgstr "回覆"
+
+#: bookwyrm/templates/snippets/create_status/content_field.html:16
+msgid "Content"
+msgstr "內容"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr "劇透警告:"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+msgid "Spoilers ahead!"
+msgstr "前有劇透！"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
 msgid "Include spoiler alert"
 msgstr "加入劇透警告"
 
-#: bookwyrm/templates/snippets/create_status_form.html:117
+#: bookwyrm/templates/snippets/create_status/layout.html:38
+msgid "Comment:"
+msgstr "評論:"
+
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:20
 msgid "Private"
 msgstr "私密"
 
-#: bookwyrm/templates/snippets/create_status_form.html:128
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
 msgid "Post"
 msgstr "釋出"
 
+#: bookwyrm/templates/snippets/create_status/quotation.html:19
+msgid "Quote:"
+msgstr "引用:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#, fuzzy, python-format
+#| msgid "Edit \"%(book_title)s\""
+msgid "An excerpt from '%(book_title)s'"
+msgstr "編輯 \"%(book_title)s\""
+
+#: bookwyrm/templates/snippets/create_status/review.html:20
+#, fuzzy, python-format
+#| msgid "Editions of %(book_title)s"
+msgid "Your review of '%(book_title)s'"
+msgstr "%(book_title)s 的各版本"
+
+#: bookwyrm/templates/snippets/create_status/review.html:32
+msgid "Review:"
+msgstr "書評:"
+
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
 msgstr "刪除這些閱讀日期嗎？"
@@ -2555,15 +2602,27 @@ msgstr "使用過濾器"
 msgid "Clear filters"
 msgstr "清除過濾器"
 
-#: bookwyrm/templates/snippets/follow_button.html:12
+#: bookwyrm/templates/snippets/follow_button.html:14
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Follow @%(username)s"
+msgstr "舉報 %(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:16
 msgid "Follow"
 msgstr "關注"
 
-#: bookwyrm/templates/snippets/follow_button.html:18
+#: bookwyrm/templates/snippets/follow_button.html:25
 msgid "Undo follow request"
 msgstr "撤回關注請求"
 
-#: bookwyrm/templates/snippets/follow_button.html:20
+#: bookwyrm/templates/snippets/follow_button.html:30
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Unfollow @%(username)s"
+msgstr "舉報 %(username)s"
+
+#: bookwyrm/templates/snippets/follow_button.html:32
 msgid "Unfollow"
 msgstr "取消關注"
 
@@ -2583,16 +2642,18 @@ msgid "%(rating)s star"
 msgid_plural "%(rating)s stars"
 msgstr[0] "%(rating)s 星"
 
-#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#: bookwyrm/templates/snippets/generated_status/goal.html:2
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "設定了在 %(year)s 內要讀 %(counter)s 本書的目標"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+#, fuzzy, python-format
+#| msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+#| msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "為 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_rating)s 星"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
@@ -2775,12 +2836,12 @@ msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "想要閱讀 \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:15
+#: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "顯示更多"
 
 #: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:30
+#: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "顯示更少"
 
@@ -2788,18 +2849,65 @@ msgstr "顯示更少"
 msgid "Open image in new window"
 msgstr "在新視窗中開啟圖片"
 
+#: bookwyrm/templates/snippets/status/headers/comment.html:2
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
+
+#: bookwyrm/templates/snippets/status/headers/note.html:15
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+
+#: bookwyrm/templates/snippets/status/headers/quotation.html:2
+#, fuzzy, python-format
+#| msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/rating.html:3
+#, fuzzy, python-format
+#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 建立"
+
+#: bookwyrm/templates/snippets/status/headers/read.html:5
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
+
+#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#, fuzzy, python-format
+#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 建立"
+
+#: bookwyrm/templates/snippets/status/headers/review.html:3
+#, fuzzy, python-format
+#| msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
+
+#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "刪除狀態"
 
-#: bookwyrm/templates/snippets/status/layout.html:51
-#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+#: bookwyrm/templates/snippets/status/layout.html:54
 msgid "Boost status"
 msgstr "轉發狀態"
 
-#: bookwyrm/templates/snippets/status/layout.html:55
-#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+#: bookwyrm/templates/snippets/status/layout.html:58
 msgid "Like status"
 msgstr "喜歡狀態"
 
@@ -2807,11 +2915,6 @@ msgstr "喜歡狀態"
 msgid "boosted"
 msgstr "轉發了"
 
-#: bookwyrm/templates/snippets/status/status_header.html:46
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
-
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -3106,6 +3209,3 @@ msgstr "密碼重置連結已傳送給 %s"
 
 #~ msgid "Local"
 #~ msgstr "本站"
-
-#~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
-#~ msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"

From dd54473a30023f4c6dc477f0f299530b3e7f46be Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Sun, 15 Aug 2021 22:58:36 +0800
Subject: [PATCH 113/272] Updated Simplified Chinese translation; fixed a few
 typos and unified several punctuation styles.

---
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 41731 -> 45867 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 183 +++++++++++----------------
 2 files changed, 72 insertions(+), 111 deletions(-)

diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 13ee2ab0340057533d0fb8890c6759f3701f6fc7..dbe69686f8f0510405b134346451d40a2258abcc 100644
GIT binary patch
delta 17864
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

delta 14392
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

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 9ece3e74..54712649 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -101,10 +101,8 @@ msgid "Home"
 msgstr "主页"
 
 #: bookwyrm/settings.py:124
-#, fuzzy
-#| msgid "Book Title"
 msgid "Books Timeline"
-msgstr "书名"
+msgstr "书目时间线"
 
 #: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
@@ -446,7 +444,7 @@ msgstr "从网址加载封面:"
 #: bookwyrm/templates/book/edit_book.html:11
 #, python-format
 msgid "Edit \"%(book_title)s\""
-msgstr "编辑 \"%(book_title)s\""
+msgstr "编辑《%(book_title)s》"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:13
@@ -460,7 +458,7 @@ msgstr "确认书目信息"
 #: bookwyrm/templates/book/edit_book.html:62
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
-msgstr "\"%(name)s\" 是已存在的作者吗？"
+msgstr "“%(name)s” 是已存在的作者吗？"
 
 #: bookwyrm/templates/book/edit_book.html:71
 #, python-format
@@ -474,7 +472,7 @@ msgstr "这是一位新的作者"
 #: bookwyrm/templates/book/edit_book.html:82
 #, python-format
 msgid "Creating a new author: %(name)s"
-msgstr "正在创建新的作者:  %(name)s"
+msgstr "正在创建新的作者: %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:89
 msgid "Is this an edition of an existing work?"
@@ -591,7 +589,7 @@ msgstr "%(book_title)s 的各版本"
 #: bookwyrm/templates/book/editions.html:8
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
+msgstr "<a href=\"%(work_path)s\">《%(work_title)s》</a> 的各版本"
 
 #: bookwyrm/templates/book/format_filter.html:8
 #: bookwyrm/templates/book/language_filter.html:8
@@ -685,30 +683,24 @@ msgid "Compose status"
 msgstr "撰写状态"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
-#, fuzzy
-#| msgid "Confirm"
 msgid "Confirm email"
-msgstr "确认"
+msgstr "确认邮箱"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:7
-#, fuzzy
-#| msgid "Email address:"
 msgid "Confirm your email address"
-msgstr "邮箱地址:"
+msgstr "确认你的邮箱地址:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:13
 msgid "A confirmation code has been sent to the email address you used to register your account."
-msgstr ""
+msgstr "确认码已经被发送到了你注册时所使用的邮箱地址。"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:15
 msgid "Sorry! We couldn't find that code."
-msgstr ""
+msgstr "抱歉！我们无法找到该代码。"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
-#, fuzzy
-#| msgid "Confirm password:"
 msgid "Confirmation code:"
-msgstr "确认密码:"
+msgstr "确认代码:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
 #: bookwyrm/templates/landing/landing_layout.html:70
@@ -718,11 +710,11 @@ msgstr "提交"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:32
 msgid "Can't find your code?"
-msgstr ""
+msgstr "找不到你的代码？"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:4
 msgid "Resend confirmation link"
-msgstr ""
+msgstr "重新发送确认链接"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
 #: bookwyrm/templates/landing/landing_layout.html:64
@@ -733,10 +725,8 @@ msgid "Email address:"
 msgstr "邮箱地址:"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:17
-#, fuzzy
-#| msgid "Re-send invite"
 msgid "Resend link"
-msgstr "重新发送请求"
+msgstr "重新发送链接"
 
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
@@ -787,10 +777,8 @@ msgstr "最近活跃"
 #: bookwyrm/templates/directory/user_card.html:18
 #: bookwyrm/templates/user/user_preview.html:16
 #: bookwyrm/templates/user/user_preview.html:17
-#, fuzzy
-#| msgid "Your Account"
 msgid "Locked account"
-msgstr "你的帐号"
+msgstr "帐号已上锁"
 
 #: bookwyrm/templates/directory/user_card.html:40
 msgid "follower you follow"
@@ -825,15 +813,13 @@ msgstr "所有已知用户"
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
 #: bookwyrm/templates/layout.html:71
-#, fuzzy
-#| msgid "Discard"
 msgid "Discover"
-msgstr "削除"
+msgstr "发现"
 
 #: bookwyrm/templates/discover/discover.html:12
 #, python-format
 msgid "See what's new in the local %(site_name)s community"
-msgstr ""
+msgstr "看看本地 %(site_name)s 社区的新消息"
 
 #: bookwyrm/templates/discover/large-book.html:46
 #: bookwyrm/templates/discover/small-book.html:32
@@ -857,36 +843,32 @@ msgstr "引用了"
 
 #: bookwyrm/templates/discover/large-book.html:68
 #: bookwyrm/templates/discover/small-book.html:52
-#, fuzzy
-#| msgid "Like status"
 msgid "View status"
-msgstr "喜欢状态"
+msgstr "浏览状态"
 
 #: bookwyrm/templates/email/confirm/html_content.html:6
 #: bookwyrm/templates/email/confirm/text_content.html:4
 #, python-format
 msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
-msgstr ""
+msgstr "在加入 %(site_name)s 前的最后一步！请点击以下链接以确认你的邮箱:"
 
 #: bookwyrm/templates/email/confirm/html_content.html:11
-#, fuzzy
-#| msgid "Confirm"
 msgid "Confirm Email"
-msgstr "确认"
+msgstr "确认邮箱"
 
 #: bookwyrm/templates/email/confirm/html_content.html:15
 #, python-format
 msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
-msgstr ""
+msgstr "或者在登录时输入代码 “<code>%(confirmation_code)s</code>”。"
 
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
-msgstr ""
+msgstr "请确认你的邮箱"
 
 #: bookwyrm/templates/email/confirm/text_content.html:10
 #, python-format
 msgid "Or enter the code \"%(confirmation_code)s\" at login."
-msgstr ""
+msgstr "或者在登录时输入代码 “%(confirmation_code)s”。"
 
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
@@ -969,10 +951,9 @@ msgid "You have no messages right now."
 msgstr "你现在没有消息。"
 
 #: bookwyrm/templates/feed/feed.html:22
-#, fuzzy, python-format
-#| msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+#, python-format
 msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
-msgstr "加载 <span data-poll=\"stream/%(tab)s\">0</span> 条未读状态"
+msgstr "加载 <span data-poll=\"stream/%(tab_key)s\">0</span> 条未读状态"
 
 #: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
@@ -1447,7 +1428,7 @@ msgstr "联系站点管理员"
 
 #: bookwyrm/templates/layout.html:226
 msgid "Documentation"
-msgstr "文档:"
+msgstr "文档"
 
 #: bookwyrm/templates/layout.html:233
 #, python-format
@@ -1591,7 +1572,7 @@ msgstr "清除搜索"
 #: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
-msgstr "没有符合 \"%(query)s\" 请求的书目"
+msgstr "没有符合 “%(query)s” 请求的书目"
 
 #: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
@@ -1607,7 +1588,7 @@ msgstr "登录"
 
 #: bookwyrm/templates/login.html:16
 msgid "Success! Email address confirmed."
-msgstr ""
+msgstr "成功！邮箱地址已确认。"
 
 #: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
@@ -1811,13 +1792,13 @@ msgstr "转发了你的 <a href=\"%(related_path)s\">状态</a>"
 
 #: bookwyrm/templates/notifications.html:121
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list “<a href=\"%(list_path)s\">%(list_name)s</a>”"
+msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 “<a href=\"%(list_path)s\">%(list_name)s</a>”"
 
 #: bookwyrm/templates/notifications.html:123
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr " 推荐添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr " 推荐添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 “<a href=\"%(list_path)s/curate\">%(list_name)s</a>”"
 
 #: bookwyrm/templates/notifications.html:128
 #, python-format
@@ -1893,10 +1874,8 @@ msgid "Show set reading goal prompt in feed:"
 msgstr "在消息流中显示设置阅读目标的提示:"
 
 #: bookwyrm/templates/preferences/edit_user.html:58
-#, fuzzy
-#| msgid "Post privacy"
 msgid "Default post privacy:"
-msgstr "发文隐私"
+msgstr "默认发文隐私:"
 
 #: bookwyrm/templates/preferences/edit_user.html:70
 #, python-format
@@ -1922,17 +1901,17 @@ msgstr "关系"
 #: bookwyrm/templates/reading_progress/finish.html:5
 #, python-format
 msgid "Finish \"%(book_title)s\""
-msgstr "完成 \"%(book_title)s\""
+msgstr "完成《%(book_title)s》"
 
 #: bookwyrm/templates/reading_progress/start.html:5
 #, python-format
 msgid "Start \"%(book_title)s\""
-msgstr "开始 \"%(book_title)s\""
+msgstr "开始《%(book_title)s》"
 
 #: bookwyrm/templates/reading_progress/want.html:5
 #, python-format
 msgid "Want to Read \"%(book_title)s\""
-msgstr "想要阅读 \"%(book_title)s\""
+msgstr "想要阅读《%(book_title)s》"
 
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
@@ -1944,7 +1923,7 @@ msgstr "手动添加书目"
 
 #: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
-msgstr "登陆以导入或添加书目。"
+msgstr "登录以导入或添加书目。"
 
 #: bookwyrm/templates/search/layout.html:16
 msgid "Search query"
@@ -1965,7 +1944,7 @@ msgstr "用户"
 #: bookwyrm/templates/search/layout.html:58
 #, python-format
 msgid "No results found for \"%(query)s\""
-msgstr "没有找到 \"%(query)s\" 的搜索结果"
+msgstr "没有找到 “%(query)s” 的搜索结果"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
 msgid "Administration"
@@ -2414,11 +2393,11 @@ msgstr "允许请求邀请"
 
 #: bookwyrm/templates/settings/site.html:97
 msgid "Require users to confirm email address"
-msgstr ""
+msgstr "要求用户确认邮箱地址"
 
 #: bookwyrm/templates/settings/site.html:99
 msgid "(Recommended if registration is open)"
-msgstr ""
+msgstr "（当开放注册时推荐）"
 
 #: bookwyrm/templates/settings/site.html:102
 msgid "Registration closed text:"
@@ -2433,15 +2412,14 @@ msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 发布"
 #, python-format
 msgid "and %(remainder_count_display)s other"
 msgid_plural "and %(remainder_count_display)s others"
-msgstr[0] ""
+msgstr[0] "与其它 %(remainder_count_display)s 位"
 
 #: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr "没有封面"
 
 #: bookwyrm/templates/snippets/book_titleby.html:6
-#, fuzzy, python-format
-#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+#, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by"
 msgstr "<a href=\"%(path)s\">%(title)s</a> 来自"
 
@@ -2465,7 +2443,7 @@ msgstr "引用"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:15
 msgid "Some thoughts on the book"
-msgstr ""
+msgstr "对书的一些看法"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
@@ -2533,16 +2511,14 @@ msgid "Quote:"
 msgstr "引用:"
 
 #: bookwyrm/templates/snippets/create_status/quotation.html:27
-#, fuzzy, python-format
-#| msgid "Start \"%(book_title)s\""
+#, python-format
 msgid "An excerpt from '%(book_title)s'"
-msgstr "开始 \"%(book_title)s\""
+msgstr "摘自《%(book_title)s》的节录"
 
 #: bookwyrm/templates/snippets/create_status/review.html:20
-#, fuzzy, python-format
-#| msgid "Editions of %(book_title)s"
+#, python-format
 msgid "Your review of '%(book_title)s'"
-msgstr "%(book_title)s 的各版本"
+msgstr "你对《%(book_title)s》的书评"
 
 #: bookwyrm/templates/snippets/create_status/review.html:32
 msgid "Review:"
@@ -2584,10 +2560,9 @@ msgid "Clear filters"
 msgstr "清除过滤器"
 
 #: bookwyrm/templates/snippets/follow_button.html:14
-#, fuzzy, python-format
-#| msgid "Report @%(username)s"
+#, python-format
 msgid "Follow @%(username)s"
-msgstr "报告 %(username)s"
+msgstr "关注 @%(username)s"
 
 #: bookwyrm/templates/snippets/follow_button.html:16
 msgid "Follow"
@@ -2598,10 +2573,9 @@ msgid "Undo follow request"
 msgstr "撤回关注请求"
 
 #: bookwyrm/templates/snippets/follow_button.html:30
-#, fuzzy, python-format
-#| msgid "Report @%(username)s"
+#, python-format
 msgid "Unfollow @%(username)s"
-msgstr "报告 %(username)s"
+msgstr "取消关注 @%(username)s"
 
 #: bookwyrm/templates/snippets/follow_button.html:32
 msgid "Unfollow"
@@ -2630,9 +2604,7 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "设定了在 %(year)s 内要读 %(counter)s 本书的目标"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, fuzzy, python-format
-#| msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-#| msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+#, python-format
 msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_rating)s 星"
@@ -2641,12 +2613,12 @@ msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_
 #, python-format
 msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
 msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] "\"%(book_title)s\" 的书评（%(display_rating)s 星）: %(review_title)s"
+msgstr[0] "《%(book_title)s》的书评（%(display_rating)s 星）: %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
 msgid "Review of \"%(book_title)s\": %(review_title)s"
-msgstr "\"%(book_title)s\" 的书评: %(review_title)s"
+msgstr "《%(book_title)s》的书评: %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
@@ -2777,7 +2749,7 @@ msgstr "移动书目"
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
 msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr "完成 \"<em>%(book_title)s</em>\""
+msgstr "完成《<em>%(book_title)s</em>》"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
@@ -2809,12 +2781,12 @@ msgstr "从 %(name)s 移除"
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
-msgstr "开始 \"<em>%(book_title)s</em>\""
+msgstr "开始《<em>%(book_title)s</em>》"
 
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
 #, python-format
 msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr "想要阅读 \"<em>%(book_title)s</em>\""
+msgstr "想要阅读《<em>%(book_title)s</em>》"
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
 #: bookwyrm/templates/snippets/trimmed_text.html:17
@@ -2831,10 +2803,9 @@ msgid "Open image in new window"
 msgstr "在新窗口中打开图像"
 
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
-#, fuzzy, python-format
-#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+#, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
+msgstr "评论了 <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/note.html:15
 #, python-format
@@ -2842,40 +2813,35 @@ msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(statu
 msgstr "回复了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状态</a>"
 
 #: bookwyrm/templates/snippets/status/headers/quotation.html:2
-#, fuzzy, python-format
+#, python-format
 #| msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
 msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr "由 <a href=\"%(path)s\">%(username)s</a> 报告"
+msgstr "引用了 <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/rating.html:3
-#, fuzzy, python-format
-#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
-msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建"
+msgstr "为 <a href=\"%(book_path)s\">%(book)s</a> 打了分:"
 
 #: bookwyrm/templates/snippets/status/headers/read.html:5
-#, fuzzy, python-format
-#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+#, python-format
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
+msgstr "完成阅读 <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/reading.html:6
-#, fuzzy, python-format
-#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建"
+msgstr "开始阅读 <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/review.html:3
-#, fuzzy, python-format
-#| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建"
+msgstr "为 <a href=\"%(book_path)s\">%(book)s</a> 撰写了书评"
 
 #: bookwyrm/templates/snippets/status/headers/to_read.html:6
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr "回复了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状态</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
@@ -2925,10 +2891,8 @@ msgstr[0] "%(shared_books)s 本在你书架上也有的书"
 
 #: bookwyrm/templates/snippets/suggested_users.html:31
 #: bookwyrm/templates/user/user_preview.html:36
-#, fuzzy
-#| msgid "followed you"
 msgid "Follows you"
-msgstr "关注了你"
+msgstr "正在关注着你"
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
@@ -3079,11 +3043,8 @@ msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] "%(mutuals_display)s 个你也关注的关注者"
 
 #: bookwyrm/templates/user/user_preview.html:38
-#, fuzzy
-#| msgid "follower you follow"
-#| msgid_plural "followers you follow"
 msgid "No followers you follow"
-msgstr "你关注的关注者"
+msgstr "没有你关注的关注者"
 
 #: bookwyrm/templates/user_admin/user.html:9
 msgid "Back to users"
@@ -3167,7 +3128,7 @@ msgstr "%(title)s：%(subtitle)s"
 
 #: bookwyrm/views/authentication.py:69
 msgid "Username or password are incorrect"
-msgstr ""
+msgstr "用户名或密码不正确"
 
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"

From 71404fae0683f77a5001b30896e055e46f98a8ae Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 08:51:23 -0700
Subject: [PATCH 114/272] Adds local only filter to user admin view

---
 bookwyrm/templates/user_admin/user_admin_filters.html | 1 +
 bookwyrm/views/user_admin.py                          | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/bookwyrm/templates/user_admin/user_admin_filters.html b/bookwyrm/templates/user_admin/user_admin_filters.html
index 57e017e5..5283b4e9 100644
--- a/bookwyrm/templates/user_admin/user_admin_filters.html
+++ b/bookwyrm/templates/user_admin/user_admin_filters.html
@@ -3,4 +3,5 @@
 {% block filter_fields %}
 {% include 'user_admin/server_filter.html' %}
 {% include 'user_admin/username_filter.html' %}
+{% include 'directory/community_filter.html' %}
 {% endblock %}
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 9d08e930..7cfefb0f 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -30,6 +30,9 @@ class UserAdminList(View):
         username = request.GET.get("username")
         if username:
             filters["username__icontains"] = username
+        scope = request.GET.get("scope")
+        if scope:
+            filters["local"] = scope == "local"
 
         users = models.User.objects.filter(**filters)
 

From 7345b85ebde8f18c3c65e150aec0b6e4f360345c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 10:25:21 -0700
Subject: [PATCH 115/272] Granular RSS tests

---
 bookwyrm/tests/views/test_rss_feed.py | 77 ++++++++++++++++++---------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index 715add3f..69a9ef02 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -12,47 +12,76 @@ from bookwyrm.views import rss_feed
 class RssFeedView(TestCase):
     """rss feed behaves as expected"""
 
-    def test_rss_feed(self, *_):
-        """load an rss feed"""
-        models.SiteSettings.objects.create()
-
-        user = models.User.objects.create_user(
-            "rss_user", "rss@test.rss", "password", local=True
-        )
-
+    def setUp(self):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+            self.local_user = models.User.objects.create_user(
+                "rss_user", "rss@test.rss", "password", local=True
+            )
         work = models.Work.objects.create(title="Test Work")
-        book = models.Edition.objects.create(
+        self.book = models.Edition.objects.create(
             title="Example Edition",
             remote_id="https://example.com/book/1",
             parent_work=work,
         )
+        self.factory = RequestFactory()
 
+        models.SiteSettings.objects.create()
+
+
+    def test_rss_empty(self, *_):
+        """load an rss feed"""
+        view = rss_feed.RssFeed()
+        request = self.factory.get("/user/rss_user/rss")
+        request.user = self.local_user
+        result = view(request, username=self.local_user.username)
+        self.assertEqual(result.status_code, 200)
+        self.assertIn(b"Status updates from rss_user", result.content)
+        result.render()
+
+    def test_rss_comment(self, *_):
+        """load an rss feed"""
+        models.Comment.objects.create(
+            content="comment test content",
+            user=self.local_user,
+            book=self.book,
+        )
+        view = rss_feed.RssFeed()
+        request = self.factory.get("/user/rss_user/rss")
+        request.user = self.local_user
+        result = view(request, username=self.local_user.username)
+        self.assertEqual(result.status_code, 200)
+        self.assertIn(b"Example Edition", result.content)
+        result.render()
+
+    def test_rss_review(self, *_):
+        """load an rss feed"""
         models.Review.objects.create(
             name="Review name",
             content="test content",
             rating=3,
-            user=user,
-            book=book,
+            user=self.local_user,
+            book=self.book,
         )
+        view = rss_feed.RssFeed()
+        request = self.factory.get("/user/rss_user/rss")
+        request.user = self.local_user
+        result = view(request, username=self.local_user.username)
+        self.assertEqual(result.status_code, 200)
+        result.render()
 
+    def test_rss_quotation(self, *_):
+        """load an rss feed"""
         models.Quotation.objects.create(
             quote="a sickening sense",
             content="test content",
-            user=user,
-            book=book,
+            user=self.local_user,
+            book=self.book,
         )
-
-        models.ReadStatus.objects.create(content="test content", user=user)
-
-        factory = RequestFactory()
-
         view = rss_feed.RssFeed()
-        request = factory.get("/user/rss_user/rss")
-        request.user = user
-
-        result = view(request, username=user.username)
+        request = self.factory.get("/user/rss_user/rss")
+        request.user = self.local_user
+        result = view(request, username=self.local_user.username)
         self.assertEqual(result.status_code, 200)
+        result.render()
 
-        self.assertIn(b"Status updates from rss_user", result.content)
         self.assertIn(b"a sickening sense", result.content)
-        self.assertIn(b"Example Edition", result.content)

From 5de3c75de36351f0b63f29e1bad7226b0ed22e5c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 10:28:32 -0700
Subject: [PATCH 116/272] Remove render from tests

---
 bookwyrm/tests/views/test_rss_feed.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index 69a9ef02..f2d3baf2 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -27,7 +27,6 @@ class RssFeedView(TestCase):
 
         models.SiteSettings.objects.create()
 
-
     def test_rss_empty(self, *_):
         """load an rss feed"""
         view = rss_feed.RssFeed()
@@ -36,7 +35,6 @@ class RssFeedView(TestCase):
         result = view(request, username=self.local_user.username)
         self.assertEqual(result.status_code, 200)
         self.assertIn(b"Status updates from rss_user", result.content)
-        result.render()
 
     def test_rss_comment(self, *_):
         """load an rss feed"""
@@ -51,7 +49,6 @@ class RssFeedView(TestCase):
         result = view(request, username=self.local_user.username)
         self.assertEqual(result.status_code, 200)
         self.assertIn(b"Example Edition", result.content)
-        result.render()
 
     def test_rss_review(self, *_):
         """load an rss feed"""
@@ -67,7 +64,6 @@ class RssFeedView(TestCase):
         request.user = self.local_user
         result = view(request, username=self.local_user.username)
         self.assertEqual(result.status_code, 200)
-        result.render()
 
     def test_rss_quotation(self, *_):
         """load an rss feed"""
@@ -82,6 +78,5 @@ class RssFeedView(TestCase):
         request.user = self.local_user
         result = view(request, username=self.local_user.username)
         self.assertEqual(result.status_code, 200)
-        result.render()
 
         self.assertIn(b"a sickening sense", result.content)

From 7e1b606e1fadd2d2ac671ebd615063d00a138d44 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 11:08:13 -0700
Subject: [PATCH 117/272] Fixes link in status header for comments

---
 bookwyrm/templates/snippets/status/headers/comment.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/headers/comment.html b/bookwyrm/templates/snippets/status/headers/comment.html
index 6886cfed..88ba30ca 100644
--- a/bookwyrm/templates/snippets/status/headers/comment.html
+++ b/bookwyrm/templates/snippets/status/headers/comment.html
@@ -1,2 +1,2 @@
 {% load i18n %}{% load utilities %}
-{% blocktrans with book_path=book.local_path book=status.book|book_title %}commented on <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% blocktrans with book_path=status.book.local_path book=status.book|book_title %}commented on <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}

From 257c9854c205224463ba0f518e06613a3896cc9b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 11:30:11 -0700
Subject: [PATCH 118/272] Move reading modal templates to their own dir

---
 .../templates/reading_progress/finish.html    |  2 +-
 .../templates/reading_progress/start.html     |  2 +-
 bookwyrm/templates/reading_progress/want.html |  2 +-
 .../reading_modals/finish_reading_modal.html  | 34 +++++++++++++
 .../snippets/reading_modals/form.html         |  9 ++++
 .../snippets/reading_modals/layout.html       | 26 ++++++++++
 .../progress_update_modal.html                |  0
 .../reading_modals/start_reading_modal.html   | 22 +++++++++
 .../reading_modals/want_to_read_modal.html    | 13 +++++
 .../shelve_button/finish_reading_modal.html   | 48 -------------------
 .../snippets/shelve_button/shelve_button.html |  8 ++--
 .../shelve_button/start_reading_modal.html    | 42 ----------------
 .../shelve_button/want_to_read_modal.html     | 33 -------------
 13 files changed, 111 insertions(+), 130 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
 create mode 100644 bookwyrm/templates/snippets/reading_modals/form.html
 create mode 100644 bookwyrm/templates/snippets/reading_modals/layout.html
 rename bookwyrm/templates/snippets/{shelve_button => reading_modals}/progress_update_modal.html (100%)
 create mode 100644 bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
 create mode 100644 bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
 delete mode 100644 bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
 delete mode 100644 bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
 delete mode 100644 bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html

diff --git a/bookwyrm/templates/reading_progress/finish.html b/bookwyrm/templates/reading_progress/finish.html
index a9f60f04..ca69128e 100644
--- a/bookwyrm/templates/reading_progress/finish.html
+++ b/bookwyrm/templates/reading_progress/finish.html
@@ -9,6 +9,6 @@ Finish "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/shelve_button/finish_reading_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/start.html b/bookwyrm/templates/reading_progress/start.html
index 9c457947..e24a0e05 100644
--- a/bookwyrm/templates/reading_progress/start.html
+++ b/bookwyrm/templates/reading_progress/start.html
@@ -9,6 +9,6 @@ Start "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/shelve_button/start_reading_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/want.html b/bookwyrm/templates/reading_progress/want.html
index e0353193..6122ade3 100644
--- a/bookwyrm/templates/reading_progress/want.html
+++ b/bookwyrm/templates/reading_progress/want.html
@@ -9,6 +9,6 @@ Want to Read "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/shelve_button/want_to_read_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
new file mode 100644
index 00000000..fdb5d7bb
--- /dev/null
+++ b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
@@ -0,0 +1,34 @@
+{% extends 'snippets/reading_modals/layout.html' %}
+{% load i18n %}
+{% load utilities %}
+
+{% block modal-title %}
+{% blocktrans trimmed with book_title=book|book_title %}
+Finish "<em>{{ book_title }}</em>"
+{% endblocktrans %}
+{% endblock %}
+
+{% block modal-form-open %}
+<form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post">
+{% endblock %}
+
+{% block reading-dates %}
+<div class="columns">
+    <div class="column is-half">
+        <div class="field">
+            <label class="label" for="finish_id_start_date_{{ uuid }}">
+                {% trans "Started reading" %}
+            </label>
+            <input type="date" name="start_date" class="input" id="finish_id_start_date_{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
+        </div>
+    </div>
+    <div class="column is-half">
+        <div class="field">
+            <label class="label" for="id_finish_date_{{ uuid }}">
+                {% trans "Finished reading" %}
+            </label>
+            <input type="date" name="finish_date" class="input" id="id_finish_date_{{ uuid }}" value="{% now "Y-m-d" %}">
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/form.html b/bookwyrm/templates/snippets/reading_modals/form.html
new file mode 100644
index 00000000..da2aad93
--- /dev/null
+++ b/bookwyrm/templates/snippets/reading_modals/form.html
@@ -0,0 +1,9 @@
+{% extends "snippets/create_status/layout.html" %}
+{% load i18n %}
+
+{% block form_open %}{% endblock %}
+
+{% block initial_fields %}
+<input type="hidden" name="user" value="{{ request.user.id }}">
+<input type="hidden" name="mention_books" value="{{ book.id }}">
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/layout.html b/bookwyrm/templates/snippets/reading_modals/layout.html
new file mode 100644
index 00000000..877f14ef
--- /dev/null
+++ b/bookwyrm/templates/snippets/reading_modals/layout.html
@@ -0,0 +1,26 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+{% load utilities %}
+
+{% block modal-body %}
+
+{% block reading-dates %}{% endblock %}
+
+{% with 0|uuid as local_uuid %}
+<div class="is-flex is-justify-content-space-between">
+    <label for="post_status_start_{{ uuid }}" data-controls="reading_content_{{ local_uuid }}_{{ uuid }}" data-controls-checkbox="post_status_start_{{ local_uuid }}_{{ uuid }}" aria-pressed="true">
+        <input type="checkbox" name="post-status" class="checkbox" id="post_status_start_{{ local_uuid }}_{{ uuid }}" checked>
+        {% trans "Post to feed" %}
+    </label>
+    <div class="is-hidden" id="hide_reading_content_{{ local_uuid }}_{{ uuid }}">
+        <button class="button is-link" type="submit">{% trans "Save" %}</button>
+    </div>
+</div>
+
+<div id="reading_content_{{ local_uuid }}_{{ uuid }}">
+    <hr aria-hidden="true">
+    {% include "snippets/reading_modals/form.html" %}
+</div>
+{% endwith %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/progress_update_modal.html b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
similarity index 100%
rename from bookwyrm/templates/snippets/shelve_button/progress_update_modal.html
rename to bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
diff --git a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
new file mode 100644
index 00000000..08191c79
--- /dev/null
+++ b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
@@ -0,0 +1,22 @@
+{% extends 'snippets/reading_modals/layout.html' %}
+{% load i18n %}
+{% load utilities %}
+
+{% block modal-title %}
+{% blocktrans trimmed with book_title=book|book_title %}
+Start "<em>{{ book_title }}</em>"
+{% endblocktrans %}
+{% endblock %}
+
+{% block modal-form-open %}
+<form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post">
+{% endblock %}
+
+{% block reading-dates %}
+<div class="field">
+    <label class="label" for="start_id_start_date_{{ uuid }}">
+        {% trans "Started reading" %}
+    </label>
+    <input type="date" name="start_date" class="input" id="start_id_start_date_{{ uuid }}" value="{% now "Y-m-d" %}">
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
new file mode 100644
index 00000000..5669610c
--- /dev/null
+++ b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
@@ -0,0 +1,13 @@
+{% extends 'snippets/reading_modals/layout.html' %}
+{% load i18n %}
+{% load utilities %}
+
+{% block modal-title %}
+{% blocktrans trimmed with book_title=book|book_title %}
+Want to Read "<em>{{ book_title }}</em>"
+{% endblocktrans %}
+{% endblock %}
+
+{% block modal-form-open %}
+<form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post">
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
deleted file mode 100644
index 36addc7b..00000000
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends 'components/modal.html' %}
-{% load i18n %}
-
-{% block modal-title %}
-{% blocktrans with book_title=book.title %}Finish "<em>{{ book_title }}</em>"{% endblocktrans %}
-{% endblock %}
-
-
-{% block modal-form-open %}
-<form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post">
-{% endblock %}
-
-{% block modal-body %}
-<section class="modal-card-body">
-    {% csrf_token %}
-    <input type="hidden" name="id" value="{{ readthrough.id }}">
-    <div class="field">
-        <label class="label" for="finish_id_start_date-{{ uuid }}">
-            {% trans "Started reading" %}
-        </label>
-        <input type="date" name="start_date" class="input" id="finish_id_start_date-{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
-    </div>
-    <div class="field">
-        <label class="label" for="id_finish_date-{{ uuid }}">
-            {% trans "Finished reading" %}
-        </label>
-        <input type="date" name="finish_date" class="input" id="id_finish_date-{{ uuid }}" value="{% now "Y-m-d" %}">
-    </div>
-</section>
-{% endblock %}
-
-{% block modal-footer %}
-<div class="columns">
-    <div class="column field">
-        <label for="post_status-{{ uuid }}">
-            <input type="checkbox" name="post-status" class="checkbox" id="post_status-{{ uuid }}" checked>
-            {% trans "Post to feed" %}
-        </label>
-        {% include 'snippets/privacy_select.html' %}
-    </div>
-    <div class="column has-text-right">
-        <button type="submit" class="button is-success">{% trans "Save" %}</button>
-        {% trans "Cancel" as button_text %}
-        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="finish-reading" controls_uid=uuid %}
-    </div>
-</div>
-{% endblock %}
-{% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index 40a9f6e7..18941812 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -19,13 +19,13 @@
     {% endif %}
 </div>
 
-{% include 'snippets/shelve_button/want_to_read_modal.html' with book=active_shelf.book controls_text="want_to_read" controls_uid=uuid %}
+{% include 'snippets/reading_modals/want_to_read_modal.html' with book=active_shelf.book controls_text="want_to_read" controls_uid=uuid %}
 
-{% include 'snippets/shelve_button/start_reading_modal.html' with book=active_shelf.book controls_text="start_reading" controls_uid=uuid %}
+{% include 'snippets/reading_modals/start_reading_modal.html' with book=active_shelf.book controls_text="start_reading" controls_uid=uuid %}
 
-{% include 'snippets/shelve_button/finish_reading_modal.html' with book=active_shelf.book controls_text="finish_reading" controls_uid=uuid readthrough=readthrough %}
+{% include 'snippets/reading_modals/finish_reading_modal.html' with book=active_shelf.book controls_text="finish_reading" controls_uid=uuid readthrough=readthrough %}
 
-{% include 'snippets/shelve_button/progress_update_modal.html' with book=active_shelf_book.book controls_text="progress_update" controls_uid=uuid readthrough=readthrough %}
+{% include 'snippets/reading_modals/progress_update_modal.html' with book=active_shelf_book.book controls_text="progress_update" controls_uid=uuid readthrough=readthrough %}
 
 {% endwith %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
deleted file mode 100644
index 1858313b..00000000
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends 'components/modal.html' %}
-{% load i18n %}
-
-{% block modal-title %}
-{% blocktrans trimmed with book_title=book.title %}
-Start "<em>{{ book_title }}</em>"
-{% endblocktrans %}
-{% endblock %}
-
-{% block modal-form-open %}
-<form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post">
-{% endblock %}
-
-{% block modal-body %}
-<section class="modal-card-body">
-    {% csrf_token %}
-    <div class="field">
-        <label class="label" for="start_id_start_date-{{ uuid }}">
-            {% trans "Started reading" %}
-        </label>
-        <input type="date" name="start_date" class="input" id="start_id_start_date-{{ uuid }}" value="{% now "Y-m-d" %}">
-    </div>
-</section>
-{% endblock %}
-
-{% block modal-footer %}
-<div class="columns">
-    <div class="column field">
-        <label for="post_status_start-{{ uuid }}">
-            <input type="checkbox" name="post-status" class="checkbox" id="post_status_start-{{ uuid }}" checked>
-            {% trans "Post to feed" %}
-        </label>
-        {% include 'snippets/privacy_select.html' %}
-    </div>
-    <div class="column has-text-right">
-        <button class="button is-success" type="submit">{% trans "Save" %}</button>
-        {% trans "Cancel" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="start-reading" controls_uid=uuid %}
-    </div>
-</div>
-{% endblock %}
-{% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
deleted file mode 100644
index 643e4a20..00000000
--- a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends 'components/modal.html' %}
-{% load i18n %}
-
-{% block modal-title %}
-{% blocktrans with book_title=book.title %}Want to Read "<em>{{ book_title }}</em>"{% endblocktrans %}
-{% endblock %}
-
-{% block modal-form-open %}
-<form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post">
-    {% csrf_token %}
-    <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-    <input type="hidden" name="shelf" value="to-read">
-{% endblock %}
-
-{% block modal-footer %}
-<div class="columns">
-    <div class="column field">
-        <label for="post_status_want-{{ uuid }}">
-            <input type="checkbox" name="post-status" class="checkbox" id="post_status_want-{{ uuid }}" checked>
-            {% trans "Post to feed" %}
-        </label>
-        {% include 'snippets/privacy_select.html' %}
-    </div>
-    <div class="column">
-        <button class="button is-success" type="submit">
-            <span>{% trans "Want to read" %}</span>
-        </button>
-        {% trans "Cancel" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="want-to-read" controls_uid=uuid %}
-    </div>
-</div>
-{% endblock %}
-{% block modal-form-close %}</form>{% endblock %}

From e6b785d731a7eb72b72a36259c4b1dea2b5bb21e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 12:28:04 -0700
Subject: [PATCH 119/272] No-update mode for "want to read"

---
 bookwyrm/static/js/bookwyrm.js                  | 17 +++++++++++++++++
 .../snippets/reading_modals/layout.html         |  8 +++++---
 .../reading_modals/want_to_read_modal.html      |  1 +
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index a4002c2d..45044b03 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -177,6 +177,12 @@ let BookWyrm = new class {
             this.toggleCheckbox(checkbox, pressed);
         }
 
+        // Toggle form disabled, if appropriate
+        let disable = trigger.dataset.disables;
+        if (disable) {
+            this.toggleDisabled(disable, !pressed);
+        }
+
         // Set focus, if appropriate.
         let focus = trigger.dataset.focusTarget;
 
@@ -227,6 +233,17 @@ let BookWyrm = new class {
         document.getElementById(checkbox).checked = !!pressed;
     }
 
+    /**
+     * Enable or disable a form element or fieldset
+     *
+     * @param  {string}  form_element - id of the element
+     * @param  {boolean} pressed  - Is the trigger pressed?
+     * @return {undefined}
+     */
+    toggleDisabled(form_element, pressed) {
+        document.getElementById(form_element).disabled = !!pressed;
+    }
+
     /**
      * Give the focus to an element.
      * Only move the focus based on user interactions.
diff --git a/bookwyrm/templates/snippets/reading_modals/layout.html b/bookwyrm/templates/snippets/reading_modals/layout.html
index 877f14ef..5190ada4 100644
--- a/bookwyrm/templates/snippets/reading_modals/layout.html
+++ b/bookwyrm/templates/snippets/reading_modals/layout.html
@@ -8,8 +8,8 @@
 
 {% with 0|uuid as local_uuid %}
 <div class="is-flex is-justify-content-space-between">
-    <label for="post_status_start_{{ uuid }}" data-controls="reading_content_{{ local_uuid }}_{{ uuid }}" data-controls-checkbox="post_status_start_{{ local_uuid }}_{{ uuid }}" aria-pressed="true">
-        <input type="checkbox" name="post-status" class="checkbox" id="post_status_start_{{ local_uuid }}_{{ uuid }}" checked>
+    <label for="post_status_{{ local_uuid }}_{{ uuid }}" data-controls="reading_content_{{ local_uuid }}_{{ uuid }}" data-controls-checkbox="post_status_{{ local_uuid }}_{{ uuid }}" data-disables="reading_content_fieldset_{{ local_uuid }}_{{ uuid }}" aria-pressed="true">
+        <input type="checkbox" name="post-status" class="checkbox" id="post_status_{{ local_uuid }}_{{ uuid }}" checked>
         {% trans "Post to feed" %}
     </label>
     <div class="is-hidden" id="hide_reading_content_{{ local_uuid }}_{{ uuid }}">
@@ -19,7 +19,9 @@
 
 <div id="reading_content_{{ local_uuid }}_{{ uuid }}">
     <hr aria-hidden="true">
-    {% include "snippets/reading_modals/form.html" %}
+    <fieldset id="reading_content_fieldset_{{ local_uuid }}_{{ uuid }}">
+        {% include "snippets/reading_modals/form.html" %}
+    </fieldset>
 </div>
 {% endwith %}
 
diff --git a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
index 5669610c..f4f214c8 100644
--- a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
@@ -10,4 +10,5 @@ Want to Read "<em>{{ book_title }}</em>"
 
 {% block modal-form-open %}
 <form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post">
+{% csrf_token %}
 {% endblock %}

From 011175a6e34434a17bb0b586e488ab9cfd722dc4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 12:44:36 -0700
Subject: [PATCH 120/272] Appeases js linter

---
 bookwyrm/static/js/bookwyrm.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 45044b03..c69b4ce8 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -179,6 +179,7 @@ let BookWyrm = new class {
 
         // Toggle form disabled, if appropriate
         let disable = trigger.dataset.disables;
+
         if (disable) {
             this.toggleDisabled(disable, !pressed);
         }

From 0549dbaa6dbce0f3252ea27ae2ec68f6934fef4b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 12:47:12 -0700
Subject: [PATCH 121/272] Make comment optional

---
 bookwyrm/templates/snippets/create_status/content_field.html    | 2 +-
 .../templates/snippets/reading_modals/finish_reading_modal.html | 1 +
 bookwyrm/templates/snippets/reading_modals/layout.html          | 2 +-
 .../templates/snippets/reading_modals/start_reading_modal.html  | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html
index 0a42a832..90337200 100644
--- a/bookwyrm/templates/snippets/create_status/content_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_field.html
@@ -14,6 +14,6 @@ draft: an existing Status object that is providing default values for input fiel
     id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
     placeholder="{{ placeholder }}"
     aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"
-    {% if type != "quotation" %}required{% endif %}
+    {% if not optional and type != "quotation" %}required{% endif %}
 >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
 
diff --git a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
index fdb5d7bb..84e762c5 100644
--- a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
@@ -10,6 +10,7 @@ Finish "<em>{{ book_title }}</em>"
 
 {% block modal-form-open %}
 <form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post">
+{% csrf_token %}
 {% endblock %}
 
 {% block reading-dates %}
diff --git a/bookwyrm/templates/snippets/reading_modals/layout.html b/bookwyrm/templates/snippets/reading_modals/layout.html
index 5190ada4..00e45335 100644
--- a/bookwyrm/templates/snippets/reading_modals/layout.html
+++ b/bookwyrm/templates/snippets/reading_modals/layout.html
@@ -20,7 +20,7 @@
 <div id="reading_content_{{ local_uuid }}_{{ uuid }}">
     <hr aria-hidden="true">
     <fieldset id="reading_content_fieldset_{{ local_uuid }}_{{ uuid }}">
-        {% include "snippets/reading_modals/form.html" %}
+        {% include "snippets/reading_modals/form.html" with optional=True %}
     </fieldset>
 </div>
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
index 08191c79..6b04a32e 100644
--- a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
@@ -10,6 +10,7 @@ Start "<em>{{ book_title }}</em>"
 
 {% block modal-form-open %}
 <form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post">
+{% csrf_token %}
 {% endblock %}
 
 {% block reading-dates %}

From f12c5df28857fb22418c3afe2887338031836472 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 12:58:22 -0700
Subject: [PATCH 122/272] Show "optional" helper on comment field

---
 bookwyrm/templates/snippets/reading_modals/form.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bookwyrm/templates/snippets/reading_modals/form.html b/bookwyrm/templates/snippets/reading_modals/form.html
index da2aad93..00cb4088 100644
--- a/bookwyrm/templates/snippets/reading_modals/form.html
+++ b/bookwyrm/templates/snippets/reading_modals/form.html
@@ -3,6 +3,11 @@
 
 {% block form_open %}{% endblock %}
 
+{% block content_label %}
+{% trans "Comment:" %}
+<span class="help mt-0 has-text-weight-normal">{% trans "(Optional)" %}</span>
+{% endblock %}
+
 {% block initial_fields %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
 <input type="hidden" name="mention_books" value="{{ book.id }}">

From 6280671d921ad3dc91c037e02a7521e152bef908 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 13:04:34 -0700
Subject: [PATCH 123/272] Create comments when commentary is provided

---
 .../templates/snippets/reading_modals/form.html   |  1 +
 bookwyrm/views/reading.py                         | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/snippets/reading_modals/form.html b/bookwyrm/templates/snippets/reading_modals/form.html
index 00cb4088..d1ba916f 100644
--- a/bookwyrm/templates/snippets/reading_modals/form.html
+++ b/bookwyrm/templates/snippets/reading_modals/form.html
@@ -11,4 +11,5 @@
 {% block initial_fields %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
 <input type="hidden" name="mention_books" value="{{ book.id }}">
+<input type="hidden" name="book" value="{{ book.id }}">
 {% endblock %}
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 1c897ab3..39066265 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -12,7 +12,7 @@ from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
 
-from bookwyrm import models
+from bookwyrm import forms, models
 from .helpers import get_edition, handle_reading_status
 
 
@@ -76,8 +76,17 @@ class ReadingStatus(View):
 
         # post about it (if you want)
         if request.POST.get("post-status"):
-            privacy = request.POST.get("privacy")
-            handle_reading_status(request.user, desired_shelf, book, privacy)
+            # is it a comment?
+            if request.POST.get("content"):
+                form = forms.CommentForm(request.POST)
+                if form.is_valid():
+                    form.save()
+                else:
+                    # uh oh
+                    raise Exception("Invalid form")
+            else:
+                privacy = request.POST.get("privacy")
+                handle_reading_status(request.user, desired_shelf, book, privacy)
 
         return redirect(request.headers.get("Referer", "/"))
 

From 1e1bf83201b63ea9ed72ffd927d91043f8e89a36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 13:13:29 -0700
Subject: [PATCH 124/272] Create abstract parent class for book statuses

---
 bookwyrm/models/status.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 3c25f1af..5d40be20 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -235,12 +235,20 @@ class GeneratedNote(Status):
     pure_type = "Note"
 
 
-class Comment(Status):
-    """like a review but without a rating and transient"""
+class BookStatus(Status):
+    """Shared fields for comments, quotes, reviews"""
 
     book = fields.ForeignKey(
         "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
     )
+    pure_type = "Note"
+
+    class Meta:
+        abstract = True
+
+
+class Comment(BookStatus):
+    """like a review but without a rating and transient"""
 
     # this is it's own field instead of a foreign key to the progress update
     # so that the update can be deleted without impacting the status
@@ -265,16 +273,12 @@ class Comment(Status):
         )
 
     activity_serializer = activitypub.Comment
-    pure_type = "Note"
 
 
-class Quotation(Status):
+class Quotation(BookStatus):
     """like a review but without a rating and transient"""
 
     quote = fields.HtmlField()
-    book = fields.ForeignKey(
-        "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
-    )
 
     @property
     def pure_content(self):
@@ -289,16 +293,12 @@ class Quotation(Status):
         )
 
     activity_serializer = activitypub.Quotation
-    pure_type = "Note"
 
 
-class Review(Status):
+class Review(BookStatus):
     """a book review"""
 
     name = fields.CharField(max_length=255, null=True)
-    book = fields.ForeignKey(
-        "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
-    )
     rating = fields.DecimalField(
         default=None,
         null=True,

From 2d20fa4146abe30630904e8409d697820da575c9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 13:21:16 -0700
Subject: [PATCH 125/272] Adds reading status field to book statuses

---
 .../migrations/0083_auto_20210816_2022.py     | 56 +++++++++++++++++++
 bookwyrm/models/status.py                     | 11 ++++
 2 files changed, 67 insertions(+)
 create mode 100644 bookwyrm/migrations/0083_auto_20210816_2022.py

diff --git a/bookwyrm/migrations/0083_auto_20210816_2022.py b/bookwyrm/migrations/0083_auto_20210816_2022.py
new file mode 100644
index 00000000..ecf2778b
--- /dev/null
+++ b/bookwyrm/migrations/0083_auto_20210816_2022.py
@@ -0,0 +1,56 @@
+# Generated by Django 3.2.4 on 2021-08-16 20:22
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0082_auto_20210806_2324"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="comment",
+            name="reading_status",
+            field=bookwyrm.models.fields.CharField(
+                blank=True,
+                choices=[
+                    ("to-read", "Toread"),
+                    ("reading", "Reading"),
+                    ("read", "Read"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="quotation",
+            name="reading_status",
+            field=bookwyrm.models.fields.CharField(
+                blank=True,
+                choices=[
+                    ("to-read", "Toread"),
+                    ("reading", "Reading"),
+                    ("read", "Read"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="review",
+            name="reading_status",
+            field=bookwyrm.models.fields.CharField(
+                blank=True,
+                choices=[
+                    ("to-read", "Toread"),
+                    ("reading", "Reading"),
+                    ("read", "Read"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 5d40be20..9274a581 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -235,6 +235,11 @@ class GeneratedNote(Status):
     pure_type = "Note"
 
 
+ReadingStatusChoices = models.TextChoices(
+    "ReadingStatusChoices", ["to-read", "reading", "read"]
+)
+
+
 class BookStatus(Status):
     """Shared fields for comments, quotes, reviews"""
 
@@ -243,7 +248,13 @@ class BookStatus(Status):
     )
     pure_type = "Note"
 
+    reading_status = fields.CharField(
+        max_length=255, choices=ReadingStatusChoices.choices, null=True, blank=True
+    )
+
     class Meta:
+        """not a real model, sorry"""
+
         abstract = True
 
 

From 48c6a3923ac71f5b52670b1f118995d26dba0835 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 13:32:20 -0700
Subject: [PATCH 126/272] Save reading status update

---
 bookwyrm/forms.py                                              | 1 +
 .../snippets/reading_modals/finish_reading_modal.html          | 1 +
 .../templates/snippets/reading_modals/start_reading_modal.html | 1 +
 .../templates/snippets/reading_modals/want_to_read_modal.html  | 1 +
 bookwyrm/templatetags/status_display.py                        | 3 ++-
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index c9e795c3..e8812470 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -86,6 +86,7 @@ class CommentForm(CustomForm):
             "privacy",
             "progress",
             "progress_mode",
+            "reading_status",
         ]
 
 
diff --git a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
index 84e762c5..3a034693 100644
--- a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
@@ -11,6 +11,7 @@ Finish "<em>{{ book_title }}</em>"
 {% block modal-form-open %}
 <form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post">
 {% csrf_token %}
+<input type="hidden" name="reading_status" value="read">
 {% endblock %}
 
 {% block reading-dates %}
diff --git a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
index 6b04a32e..099fd915 100644
--- a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
@@ -10,6 +10,7 @@ Start "<em>{{ book_title }}</em>"
 
 {% block modal-form-open %}
 <form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post">
+<input type="hidden" name="reading_status" value="reading">
 {% csrf_token %}
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
index f4f214c8..9263fe32 100644
--- a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
@@ -10,5 +10,6 @@ Want to Read "<em>{{ book_title }}</em>"
 
 {% block modal-form-open %}
 <form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post">
+<input type="hidden" name="reading_status" value="toRead">
 {% csrf_token %}
 {% endblock %}
diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
index 0d013775..d0390e38 100644
--- a/bookwyrm/templatetags/status_display.py
+++ b/bookwyrm/templatetags/status_display.py
@@ -70,7 +70,8 @@ def get_header_template(status):
     """get the path for the status template"""
     if isinstance(status, models.Boost):
         status = status.boosted_status
-    filename = "snippets/status/headers/{:s}.html".format(status.status_type.lower())
+    header_type = status.reading_status or status.status_type.lower()
+    filename = f"snippets/status/headers/{header_type}.html"
     header_template = select_template([filename, "snippets/status/headers/note.html"])
     return header_template.render({"status": status})
 

From 5fcea990296de50be89af9441ead0d65a2f6790a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 13:39:56 -0700
Subject: [PATCH 127/272] Indicate reading status changes with comments

---
 bookwyrm/templates/snippets/status/headers/read.html    | 7 ++++---
 bookwyrm/templates/snippets/status/headers/reading.html | 5 ++---
 bookwyrm/templates/snippets/status/headers/to_read.html | 4 ++--
 bookwyrm/templatetags/status_display.py                 | 7 ++++++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/headers/read.html b/bookwyrm/templates/snippets/status/headers/read.html
index f942c0f0..bc6147df 100644
--- a/bookwyrm/templates/snippets/status/headers/read.html
+++ b/bookwyrm/templates/snippets/status/headers/read.html
@@ -1,7 +1,8 @@
 {% spaceless %}
-{% load i18n %}{% load utilities %}
+{% load i18n %}
+{% load utilities %}
+{% load status_display %}
 
-{% with book=status.mention_books.first %}
+{% load_book status as book %}
 {% blocktrans with book_path=book.remote_id book=book|book_title %}finished reading <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
-{% endwith %}
 {% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/headers/reading.html b/bookwyrm/templates/snippets/status/headers/reading.html
index 460c4cae..e8b51f7b 100644
--- a/bookwyrm/templates/snippets/status/headers/reading.html
+++ b/bookwyrm/templates/snippets/status/headers/reading.html
@@ -1,9 +1,8 @@
 {% spaceless %}
 {% load i18n %}
 {% load utilities %}
+{% load status_display %}
 
-{% with book=status.mention_books.first %}
+{% load_book status as book %}
 {% blocktrans with book_path=book.remote_id book=book|book_title %}started reading <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
-{% endwith %}
-
 {% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/headers/to_read.html b/bookwyrm/templates/snippets/status/headers/to_read.html
index 7b89a775..c252e71d 100644
--- a/bookwyrm/templates/snippets/status/headers/to_read.html
+++ b/bookwyrm/templates/snippets/status/headers/to_read.html
@@ -1,8 +1,8 @@
 {% spaceless %}
 {% load i18n %}
 {% load utilities %}
+{% load status_display %}
 
-{% with book=status.mention_books.first %}
+{% load_book status as book %}
 {% blocktrans with book_path=book.remote_id book=book|book_title %}<a href="{{ user_path }}">{{ username }}</a> wants to read <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
-{% endwith %}
 {% endspaceless %}
diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
index d0390e38..e43c0f94 100644
--- a/bookwyrm/templatetags/status_display.py
+++ b/bookwyrm/templatetags/status_display.py
@@ -70,7 +70,12 @@ def get_header_template(status):
     """get the path for the status template"""
     if isinstance(status, models.Boost):
         status = status.boosted_status
-    header_type = status.reading_status or status.status_type.lower()
+    try:
+        header_type = status.reading_status
+        if not header_type:
+            raise AttributeError()
+    except AttributeError:
+        header_type = status.status_type.lower()
     filename = f"snippets/status/headers/{header_type}.html"
     header_template = select_template([filename, "snippets/status/headers/note.html"])
     return header_template.render({"status": status})

From f93587c0e1f10cbd19e1181a4bb89eefadddc20e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 13:44:54 -0700
Subject: [PATCH 128/272] Fixes author page

---
 bookwyrm/templates/author/author.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 0bc42775..1c409d06 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -70,7 +70,7 @@
                 </a>
             </p>
             {% endif %}
-            
+
             {% if author.inventaire_id %}
             <p class="my-1">
                 <a itemprop="sameAs" href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">
@@ -86,7 +86,7 @@
                 </a>
             </p>
             {% endif %}
-            
+
             {% if author.goodreads_key %}
             <p class="my-1">
                 <a itemprop="sameAs" href="https://www.goodreads.com/author/show/{{ author.goodreads_key }}" target="_blank" rel="noopener">
@@ -109,7 +109,7 @@
     <div class="columns is-multiline is-mobile">
     {% for book in books %}
         <div class="column is-one-fifth">
-            {% include 'discover/small-book.html' with book=book %}
+            {% include 'landing/small-book.html' with book=book %}
         </div>
     {% endfor %}
     </div>

From bb49d0dc9b0bf08a1dad6a6c6ac4841f9abe331c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 13:59:15 -0700
Subject: [PATCH 129/272] Adds test

---
 bookwyrm/activitypub/note.py                  |  3 ++
 .../tests/views/inbox/test_inbox_create.py    | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 916da2d0..556ef185 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -59,6 +59,9 @@ class Comment(Note):
     """like a note but with a book"""
 
     inReplyToBook: str
+    readingStatus: str = None
+    progress: int = None
+    progressMode: str = None
     type: str = "Comment"
 
 
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index 6e891723..cc81d7b1 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -77,6 +77,37 @@ class InboxCreate(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Status.objects.count(), 1)
 
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_create_comment_with_reading_status(self, *_):
+        """the "it justs works" mode"""
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            "../../data/ap_comment.json"
+        )
+        status_data = json.loads(datafile.read_bytes())
+        status_data["readingStatus"] = "to-read"
+
+        models.Edition.objects.create(
+            title="Test Book", remote_id="https://example.com/book/1"
+        )
+        activity = self.create_json
+        activity["object"] = status_data
+
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+
+        status = models.Comment.objects.get()
+        self.assertEqual(
+            status.remote_id, "https://example.com/user/mouse/comment/6"
+        )
+        self.assertEqual(status.content, "commentary")
+        self.assertEqual(status.reading_status, "to-read")
+        self.assertEqual(status.user, self.local_user)
+
+        # while we're here, lets ensure we avoid dupes
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Status.objects.count(), 1)
+
     def test_create_status_remote_note_with_mention(self, _):
         """should only create it under the right circumstances"""
         self.assertFalse(

From d7a168e0a93f748cf3665ad5b82fa77ceb62dc2e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 14:00:11 -0700
Subject: [PATCH 130/272] Python formatting

---
 bookwyrm/tests/views/inbox/test_inbox_create.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index cc81d7b1..059d0522 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -80,9 +80,7 @@ class InboxCreate(TestCase):
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_create_comment_with_reading_status(self, *_):
         """the "it justs works" mode"""
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            "../../data/ap_comment.json"
-        )
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_comment.json")
         status_data = json.loads(datafile.read_bytes())
         status_data["readingStatus"] = "to-read"
 
@@ -97,9 +95,7 @@ class InboxCreate(TestCase):
             self.assertTrue(redis_mock.called)
 
         status = models.Comment.objects.get()
-        self.assertEqual(
-            status.remote_id, "https://example.com/user/mouse/comment/6"
-        )
+        self.assertEqual(status.remote_id, "https://example.com/user/mouse/comment/6")
         self.assertEqual(status.content, "commentary")
         self.assertEqual(status.reading_status, "to-read")
         self.assertEqual(status.user, self.local_user)

From 899f91a81107762883e99b27da63f3e68df9c197 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 14:27:43 -0700
Subject: [PATCH 131/272] Adds locales

---
 locale/de_DE/LC_MESSAGES/django.po   | 125 +++++++++++++-------------
 locale/en_US/LC_MESSAGES/django.po   | 121 ++++++++++++-------------
 locale/es/LC_MESSAGES/django.po      | 121 ++++++++++++-------------
 locale/fr_FR/LC_MESSAGES/django.po   | 121 ++++++++++++-------------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 45867 -> 45604 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 127 ++++++++++++++-------------
 locale/zh_Hant/LC_MESSAGES/django.po | 121 ++++++++++++-------------
 7 files changed, 377 insertions(+), 359 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 6d658884..00fbd0e8 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-13 02:21+0000\n"
+"POT-Creation-Date: 2021-08-16 21:26+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -18,67 +18,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:232
+#: bookwyrm/forms.py:233
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/forms.py:246
+#: bookwyrm/forms.py:247
 msgid "One Day"
 msgstr "Ein Tag"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:248
 msgid "One Week"
 msgstr "Eine Woche"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:249
 msgid "One Month"
 msgstr "Ein Monat"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:250
 msgid "Does Not Expire"
 msgstr "Läuft nicht aus"
 
-#: bookwyrm/forms.py:254
+#: bookwyrm/forms.py:255
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d Benutzungen"
 
-#: bookwyrm/forms.py:257
+#: bookwyrm/forms.py:258
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Ungelistet"
 
-#: bookwyrm/forms.py:307
+#: bookwyrm/forms.py:308
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:309
 #, fuzzy
 #| msgid "Title"
 msgid "Book Title"
 msgstr "Titel"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:315
+#: bookwyrm/forms.py:316
 #, fuzzy
 #| msgid "Started reading"
 msgid "Ascending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:317
 #, fuzzy
 #| msgid "Started reading"
 msgid "Descending"
@@ -308,9 +308,8 @@ msgstr ""
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:108
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/layout.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45
 msgid "Save"
 msgstr "Speichern"
@@ -324,10 +323,7 @@ msgstr "Speichern"
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -2709,24 +2705,24 @@ msgid "Some thoughts on the book"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status/comment.html:26
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Fortschritt:"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "Seiten"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "Prozent"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "von %(pages)s Seiten"
@@ -2757,6 +2753,7 @@ msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
 #: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/reading_modals/form.html:7
 #, fuzzy
 #| msgid "Comment"
 msgid "Comment:"
@@ -2926,9 +2923,7 @@ msgid "Goal privacy:"
 msgstr "Sichtbarkeit des Ziels"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+#: bookwyrm/templates/snippets/reading_modals/layout.html:13
 msgid "Post to feed"
 msgstr "Posten"
 
@@ -3005,21 +3000,47 @@ msgstr "Raten"
 msgid "Rate"
 msgstr ""
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr "\"<em>%(book_title)s</em>\" abschließen"
+
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20
 #: bookwyrm/templates/snippets/readthrough_form.html:7
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19
 msgid "Started reading"
 msgstr "Zu lesen angefangen"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+msgid "Finished reading"
+msgstr "Lesen abgeschlossen"
+
+#: bookwyrm/templates/snippets/reading_modals/form.html:8
+msgid "(Optional)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#, fuzzy
+#| msgid "Progress"
+msgid "Update progress"
+msgstr "Fortschritt"
+
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr "\"<em>%(book_title)s</em>\" beginnen"
+
+#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
+
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
-msgid "Finished reading"
-msgstr "Lesen abgeschlossen"
-
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
 msgstr "Registrieren"
@@ -3040,18 +3061,6 @@ msgstr "Buch importieren"
 msgid "Move book"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
-#, python-format
-msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr "\"<em>%(book_title)s</em>\" abschließen"
-
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
-#, fuzzy
-#| msgid "Progress"
-msgid "Update progress"
-msgstr "Fortschritt"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "Mehr Regale"
@@ -3065,7 +3074,6 @@ msgid "Finish reading"
 msgstr "Lesen abschließen"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "Auf Leseliste setzen"
 
@@ -3075,16 +3083,6 @@ msgstr "Auf Leseliste setzen"
 msgid "Remove from %(name)s"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
-#, python-format
-msgid "Start \"<em>%(book_title)s</em>\""
-msgstr "\"<em>%(book_title)s</em>\" beginnen"
-
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
-#, python-format
-msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
-
 #: bookwyrm/templates/snippets/status/content_status.html:72
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
@@ -3123,13 +3121,13 @@ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/headers/read.html:5
+#: bookwyrm/templates/snippets/status/headers/read.html:7
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 
-#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#: bookwyrm/templates/snippets/status/headers/reading.html:7
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3141,7 +3139,7 @@ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#: bookwyrm/templates/snippets/status/headers/to_read.html:7
 #, fuzzy, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3485,6 +3483,11 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#: bookwyrm/views/rss_feed.py:34
+#, python-brace-format
+msgid "Status updates from {obj.display_name}"
+msgstr ""
+
 #, fuzzy
 #~| msgid "Federated Servers"
 #~ msgid "Federated Timeline"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index ba475e53..ac2acf35 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-13 02:21+0000\n"
+"POT-Creation-Date: 2021-08-16 21:26+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:232
+#: bookwyrm/forms.py:233
 msgid "A user with this email already exists."
 msgstr ""
 
-#: bookwyrm/forms.py:246
+#: bookwyrm/forms.py:247
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:248
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:249
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:250
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:254
+#: bookwyrm/forms.py:255
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:257
+#: bookwyrm/forms.py:258
 msgid "Unlimited"
 msgstr ""
 
-#: bookwyrm/forms.py:307
+#: bookwyrm/forms.py:308
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:309
 msgid "Book Title"
 msgstr ""
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:315
+#: bookwyrm/forms.py:316
 msgid "Ascending"
 msgstr ""
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:317
 msgid "Descending"
 msgstr ""
 
@@ -284,9 +284,8 @@ msgstr ""
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:108
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/layout.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45
 msgid "Save"
 msgstr ""
@@ -300,10 +299,7 @@ msgstr ""
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
 msgid "Cancel"
 msgstr ""
 
@@ -2450,24 +2446,24 @@ msgid "Some thoughts on the book"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status/comment.html:26
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16
 msgid "Progress:"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr ""
@@ -2496,6 +2492,7 @@ msgid "Include spoiler alert"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr ""
 
@@ -2646,9 +2643,7 @@ msgid "Goal privacy:"
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+#: bookwyrm/templates/snippets/reading_modals/layout.html:13
 msgid "Post to feed"
 msgstr ""
 
@@ -2723,21 +2718,45 @@ msgstr ""
 msgid "Rate"
 msgstr ""
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20
 #: bookwyrm/templates/snippets/readthrough_form.html:7
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19
 msgid "Started reading"
 msgstr ""
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+msgid "Finished reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/form.html:8
+msgid "(Optional)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+msgid "Update progress"
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr ""
+
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
-msgid "Finished reading"
-msgstr ""
-
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
 msgstr ""
@@ -2754,16 +2773,6 @@ msgstr ""
 msgid "Move book"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
-#, python-format
-msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
-msgid "Update progress"
-msgstr ""
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr ""
@@ -2777,7 +2786,6 @@ msgid "Finish reading"
 msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr ""
 
@@ -2786,16 +2794,6 @@ msgstr ""
 msgid "Remove from %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
-#, python-format
-msgid "Start \"<em>%(book_title)s</em>\""
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
-#, python-format
-msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr ""
-
 #: bookwyrm/templates/snippets/status/content_status.html:72
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
@@ -2830,12 +2828,12 @@ msgstr ""
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/headers/read.html:5
+#: bookwyrm/templates/snippets/status/headers/read.html:7
 #, python-format
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#: bookwyrm/templates/snippets/status/headers/reading.html:7
 #, python-format
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr ""
@@ -2845,7 +2843,7 @@ msgstr ""
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#: bookwyrm/templates/snippets/status/headers/to_read.html:7
 #, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr ""
@@ -3153,3 +3151,8 @@ msgstr ""
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr ""
+
+#: bookwyrm/views/rss_feed.py:34
+#, python-brace-format
+msgid "Status updates from {obj.display_name}"
+msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index d073a36c..04497a2a 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-13 02:21+0000\n"
+"POT-Creation-Date: 2021-08-16 21:26+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:232
+#: bookwyrm/forms.py:233
 msgid "A user with this email already exists."
 msgstr "Ya existe un usuario con ese correo electrónico."
 
-#: bookwyrm/forms.py:246
+#: bookwyrm/forms.py:247
 msgid "One Day"
 msgstr "Un día"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:248
 msgid "One Week"
 msgstr "Una semana"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:249
 msgid "One Month"
 msgstr "Un mes"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:250
 msgid "Does Not Expire"
 msgstr "Nunca se vence"
 
-#: bookwyrm/forms.py:254
+#: bookwyrm/forms.py:255
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
-#: bookwyrm/forms.py:257
+#: bookwyrm/forms.py:258
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/forms.py:307
+#: bookwyrm/forms.py:308
 msgid "List Order"
 msgstr "Orden de la lista"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:309
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Ordenar por"
 
-#: bookwyrm/forms.py:315
+#: bookwyrm/forms.py:316
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:317
 msgid "Descending"
 msgstr "Descendente"
 
@@ -284,9 +284,8 @@ msgstr "Clave Goodreads:"
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:108
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/layout.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45
 msgid "Save"
 msgstr "Guardar"
@@ -300,10 +299,7 @@ msgstr "Guardar"
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2451,24 +2447,24 @@ msgid "Some thoughts on the book"
 msgstr "Algunos pensamientos sobre el libro"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:26
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progreso:"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "páginas"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "por ciento"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
@@ -2497,6 +2493,7 @@ msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
 #: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Comentario:"
 
@@ -2647,9 +2644,7 @@ msgid "Goal privacy:"
 msgstr "Privacidad de meta:"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+#: bookwyrm/templates/snippets/reading_modals/layout.html:13
 msgid "Post to feed"
 msgstr "Compartir con tu feed"
 
@@ -2725,21 +2720,45 @@ msgstr "Da una calificación"
 msgid "Rate"
 msgstr "Calificar"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr "Terminar \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20
 #: bookwyrm/templates/snippets/readthrough_form.html:7
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19
 msgid "Started reading"
 msgstr "Lectura se empezó"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+msgid "Finished reading"
+msgstr "Lectura se terminó"
+
+#: bookwyrm/templates/snippets/reading_modals/form.html:8
+msgid "(Optional)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+msgid "Update progress"
+msgstr "Progreso de actualización"
+
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr "Empezar \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr "Quiero leer \"<em>%(book_title)s</em>\""
+
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "Progreso"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
-msgid "Finished reading"
-msgstr "Lectura se terminó"
-
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
 msgstr "Inscribirse"
@@ -2756,16 +2775,6 @@ msgstr "Importar libro"
 msgid "Move book"
 msgstr "Mover libro"
 
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
-#, python-format
-msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr "Terminar \"<em>%(book_title)s</em>\""
-
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
-msgid "Update progress"
-msgstr "Progreso de actualización"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "Más estantes"
@@ -2779,7 +2788,6 @@ msgid "Finish reading"
 msgstr "Terminar de leer"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "Quiero leer"
 
@@ -2788,16 +2796,6 @@ msgstr "Quiero leer"
 msgid "Remove from %(name)s"
 msgstr "Quitar de %(name)s"
 
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
-#, python-format
-msgid "Start \"<em>%(book_title)s</em>\""
-msgstr "Empezar \"<em>%(book_title)s</em>\""
-
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
-#, python-format
-msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr "Quiero leer \"<em>%(book_title)s</em>\""
-
 #: bookwyrm/templates/snippets/status/content_status.html:72
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
@@ -2832,12 +2830,12 @@ msgstr "citó a <a href=\"%(book_path)s\">%(book)s</a>"
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
 msgstr "calificó <a href=\"%(book_path)s\">%(book)s</a>:"
 
-#: bookwyrm/templates/snippets/status/headers/read.html:5
+#: bookwyrm/templates/snippets/status/headers/read.html:7
 #, python-format
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "terminó de leer <a href=\"%(book_path)s\">%(book)s</a>"
 
-#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#: bookwyrm/templates/snippets/status/headers/reading.html:7
 #, python-format
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "empezó a leer <a href=\"%(book_path)s\">%(book)s</a>"
@@ -2847,7 +2845,7 @@ msgstr "empezó a leer <a href=\"%(book_path)s\">%(book)s</a>"
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "reseñó a <a href=\"%(book_path)s\">%(book)s</a>"
 
-#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#: bookwyrm/templates/snippets/status/headers/to_read.html:7
 #, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3156,6 +3154,11 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
+#: bookwyrm/views/rss_feed.py:34
+#, python-brace-format
+msgid "Status updates from {obj.display_name}"
+msgstr ""
+
 #~ msgid "Local Timeline"
 #~ msgstr "Línea temporal local"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 1ab9157b..46416931 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-13 02:21+0000\n"
+"POT-Creation-Date: 2021-08-16 21:26+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:232
+#: bookwyrm/forms.py:233
 msgid "A user with this email already exists."
 msgstr "Cet email est déjà associé à un compte."
 
-#: bookwyrm/forms.py:246
+#: bookwyrm/forms.py:247
 msgid "One Day"
 msgstr "Un jour"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:248
 msgid "One Week"
 msgstr "Une semaine"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:249
 msgid "One Month"
 msgstr "Un mois"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:250
 msgid "Does Not Expire"
 msgstr "Sans expiration"
 
-#: bookwyrm/forms.py:254
+#: bookwyrm/forms.py:255
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d utilisations"
 
-#: bookwyrm/forms.py:257
+#: bookwyrm/forms.py:258
 msgid "Unlimited"
 msgstr "Sans limite"
 
-#: bookwyrm/forms.py:307
+#: bookwyrm/forms.py:308
 msgid "List Order"
 msgstr "Ordre de la liste"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:309
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Trier par"
 
-#: bookwyrm/forms.py:315
+#: bookwyrm/forms.py:316
 msgid "Ascending"
 msgstr "Ordre croissant"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:317
 msgid "Descending"
 msgstr "Ordre décroissant"
 
@@ -288,9 +288,8 @@ msgstr "Clé Goodreads :"
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:108
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/layout.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45
 msgid "Save"
 msgstr "Enregistrer"
@@ -304,10 +303,7 @@ msgstr "Enregistrer"
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -2473,24 +2469,24 @@ msgid "Some thoughts on the book"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status/comment.html:26
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progression :"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "pages"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "pourcent"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "sur %(pages)s pages"
@@ -2519,6 +2515,7 @@ msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
 #: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Commentaire :"
 
@@ -2675,9 +2672,7 @@ msgid "Goal privacy:"
 msgstr "Confidentialité du défi :"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+#: bookwyrm/templates/snippets/reading_modals/layout.html:13
 msgid "Post to feed"
 msgstr "Publier sur le fil d’actualité"
 
@@ -2752,21 +2747,45 @@ msgstr "Laisser une note"
 msgid "Rate"
 msgstr "Noter"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr "Terminer « <em>%(book_title)s</em> »"
+
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20
 #: bookwyrm/templates/snippets/readthrough_form.html:7
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19
 msgid "Started reading"
 msgstr "Lecture commencée le"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+msgid "Finished reading"
+msgstr "Lecture terminée le"
+
+#: bookwyrm/templates/snippets/reading_modals/form.html:8
+msgid "(Optional)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+msgid "Update progress"
+msgstr "Progression de la mise à jour"
+
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr "Commencer « <em>%(book_title)s</em> »"
+
+#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr "Ajouter « <em>%(book_title)s</em> » aux envies de lecture"
+
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "Progression"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
-msgid "Finished reading"
-msgstr "Lecture terminée le"
-
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
 msgstr "S’enregistrer"
@@ -2783,16 +2802,6 @@ msgstr "Importer le livre"
 msgid "Move book"
 msgstr "Déplacer le livre"
 
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
-#, python-format
-msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr "Terminer « <em>%(book_title)s</em> »"
-
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
-msgid "Update progress"
-msgstr "Progression de la mise à jour"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "Plus d’étagères"
@@ -2806,7 +2815,6 @@ msgid "Finish reading"
 msgstr "Terminer la lecture"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "Je veux le lire"
 
@@ -2815,16 +2823,6 @@ msgstr "Je veux le lire"
 msgid "Remove from %(name)s"
 msgstr "Retirer de %(name)s"
 
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
-#, python-format
-msgid "Start \"<em>%(book_title)s</em>\""
-msgstr "Commencer « <em>%(book_title)s</em> »"
-
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
-#, python-format
-msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr "Ajouter « <em>%(book_title)s</em> » aux envies de lecture"
-
 #: bookwyrm/templates/snippets/status/content_status.html:72
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
@@ -2862,13 +2860,13 @@ msgstr "Signalé par <a href=\"%(path)s\">%(username)s</a>"
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
 msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/headers/read.html:5
+#: bookwyrm/templates/snippets/status/headers/read.html:7
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
 
-#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#: bookwyrm/templates/snippets/status/headers/reading.html:7
 #, fuzzy, python-format
 #| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
@@ -2880,7 +2878,7 @@ msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#: bookwyrm/templates/snippets/status/headers/to_read.html:7
 #, fuzzy, python-format
 #| msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3195,6 +3193,11 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
+#: bookwyrm/views/rss_feed.py:34
+#, python-brace-format
+msgid "Status updates from {obj.display_name}"
+msgstr ""
+
 #~ msgid "Local Timeline"
 #~ msgstr "Fil d’actualité local"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index dbe69686f8f0510405b134346451d40a2258abcc..6739399271062a1ccaacee0d377727c4a396f406 100644
GIT binary patch
delta 14585
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
TwKm+hC+1}Jz4b@kedGTC8%*qH

delta 14657
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
QT@nYC^EX!*^jo?A0|3bp3;+NC

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 54712649..75def373 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-13 02:21+0000\n"
+"POT-Creation-Date: 2021-08-16 21:26+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:232
+#: bookwyrm/forms.py:233
 msgid "A user with this email already exists."
 msgstr "已经存在使用该邮箱的用户。"
 
-#: bookwyrm/forms.py:246
+#: bookwyrm/forms.py:247
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:248
 msgid "One Week"
 msgstr "一周"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:249
 msgid "One Month"
 msgstr "一个月"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:250
 msgid "Does Not Expire"
 msgstr "永不失效"
 
-#: bookwyrm/forms.py:254
+#: bookwyrm/forms.py:255
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:257
+#: bookwyrm/forms.py:258
 msgid "Unlimited"
 msgstr "不受限"
 
-#: bookwyrm/forms.py:307
+#: bookwyrm/forms.py:308
 msgid "List Order"
 msgstr "列表顺序"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:309
 msgid "Book Title"
 msgstr "书名"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "排序方式"
 
-#: bookwyrm/forms.py:315
+#: bookwyrm/forms.py:316
 msgid "Ascending"
 msgstr "升序"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:317
 msgid "Descending"
 msgstr "降序"
 
@@ -284,9 +284,8 @@ msgstr "Goodreads key:"
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:108
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/layout.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45
 msgid "Save"
 msgstr "保存"
@@ -300,10 +299,7 @@ msgstr "保存"
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
 msgid "Cancel"
 msgstr "取消"
 
@@ -1791,8 +1787,9 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "转发了你的 <a href=\"%(related_path)s\">状态</a>"
 
 #: bookwyrm/templates/notifications.html:121
-#, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list “<a href=\"%(list_path)s\">%(list_name)s</a>”"
+#, fuzzy, python-format
+#| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list “<a href=\"%(list_path)s\">%(list_name)s</a>”"
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 “<a href=\"%(list_path)s\">%(list_name)s</a>”"
 
 #: bookwyrm/templates/notifications.html:123
@@ -2446,24 +2443,24 @@ msgid "Some thoughts on the book"
 msgstr "对书的一些看法"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:26
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "进度:"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "页数"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "百分比"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全书 %(pages)s 页"
@@ -2492,6 +2489,7 @@ msgid "Include spoiler alert"
 msgstr "加入剧透警告"
 
 #: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "评论:"
 
@@ -2638,9 +2636,7 @@ msgid "Goal privacy:"
 msgstr "目标隐私:"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+#: bookwyrm/templates/snippets/reading_modals/layout.html:13
 msgid "Post to feed"
 msgstr "发布到消息流中"
 
@@ -2715,21 +2711,45 @@ msgstr "留下评价"
 msgid "Rate"
 msgstr "评价"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr "完成《<em>%(book_title)s</em>》"
+
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20
 #: bookwyrm/templates/snippets/readthrough_form.html:7
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19
 msgid "Started reading"
 msgstr "已开始阅读"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+msgid "Finished reading"
+msgstr "已完成阅读"
+
+#: bookwyrm/templates/snippets/reading_modals/form.html:8
+msgid "(Optional)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+msgid "Update progress"
+msgstr "更新进度"
+
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr "开始《<em>%(book_title)s</em>》"
+
+#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr "想要阅读《<em>%(book_title)s</em>》"
+
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "进度"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
-msgid "Finished reading"
-msgstr "已完成阅读"
-
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
 msgstr "注册"
@@ -2746,16 +2766,6 @@ msgstr "导入书目"
 msgid "Move book"
 msgstr "移动书目"
 
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
-#, python-format
-msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr "完成《<em>%(book_title)s</em>》"
-
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
-msgid "Update progress"
-msgstr "更新进度"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "更多书架"
@@ -2769,7 +2779,6 @@ msgid "Finish reading"
 msgstr "完成阅读"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "想要阅读"
 
@@ -2778,16 +2787,6 @@ msgstr "想要阅读"
 msgid "Remove from %(name)s"
 msgstr "从 %(name)s 移除"
 
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
-#, python-format
-msgid "Start \"<em>%(book_title)s</em>\""
-msgstr "开始《<em>%(book_title)s</em>》"
-
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
-#, python-format
-msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr "想要阅读《<em>%(book_title)s</em>》"
-
 #: bookwyrm/templates/snippets/status/content_status.html:72
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
@@ -2814,7 +2813,6 @@ msgstr "回复了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(sta
 
 #: bookwyrm/templates/snippets/status/headers/quotation.html:2
 #, python-format
-#| msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
 msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "引用了 <a href=\"%(book_path)s\">%(book)s</a>"
 
@@ -2823,12 +2821,12 @@ msgstr "引用了 <a href=\"%(book_path)s\">%(book)s</a>"
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
 msgstr "为 <a href=\"%(book_path)s\">%(book)s</a> 打了分:"
 
-#: bookwyrm/templates/snippets/status/headers/read.html:5
+#: bookwyrm/templates/snippets/status/headers/read.html:7
 #, python-format
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "完成阅读 <a href=\"%(book_path)s\">%(book)s</a>"
 
-#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#: bookwyrm/templates/snippets/status/headers/reading.html:7
 #, python-format
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "开始阅读 <a href=\"%(book_path)s\">%(book)s</a>"
@@ -2838,7 +2836,7 @@ msgstr "开始阅读 <a href=\"%(book_path)s\">%(book)s</a>"
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "为 <a href=\"%(book_path)s\">%(book)s</a> 撰写了书评"
 
-#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#: bookwyrm/templates/snippets/status/headers/to_read.html:7
 #, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3143,6 +3141,11 @@ msgstr "没有找到使用该邮箱的用户。"
 msgid "A password reset link sent to %s"
 msgstr "密码重置连接已发送给 %s"
 
+#: bookwyrm/views/rss_feed.py:34
+#, python-brace-format
+msgid "Status updates from {obj.display_name}"
+msgstr ""
+
 #~ msgid "Local Timeline"
 #~ msgstr "本地时间线"
 
diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index 70caf596..2a39f388 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-13 02:21+0000\n"
+"POT-Creation-Date: 2021-08-16 21:26+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:232
+#: bookwyrm/forms.py:233
 msgid "A user with this email already exists."
 msgstr "已經存在使用該郵箱的使用者。"
 
-#: bookwyrm/forms.py:246
+#: bookwyrm/forms.py:247
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:248
 msgid "One Week"
 msgstr "一週"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:249
 msgid "One Month"
 msgstr "一個月"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:250
 msgid "Does Not Expire"
 msgstr "永不失效"
 
-#: bookwyrm/forms.py:254
+#: bookwyrm/forms.py:255
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:257
+#: bookwyrm/forms.py:258
 msgid "Unlimited"
 msgstr "不受限"
 
-#: bookwyrm/forms.py:307
+#: bookwyrm/forms.py:308
 msgid "List Order"
 msgstr "列表順序"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:309
 msgid "Book Title"
 msgstr "書名"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "評價"
 
-#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "排序方式"
 
-#: bookwyrm/forms.py:315
+#: bookwyrm/forms.py:316
 msgid "Ascending"
 msgstr "升序"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:317
 msgid "Descending"
 msgstr "降序"
 
@@ -290,9 +290,8 @@ msgstr "Goodreads key:"
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:108
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/layout.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45
 msgid "Save"
 msgstr "儲存"
@@ -306,10 +305,7 @@ msgstr "儲存"
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
 msgid "Cancel"
 msgstr "取消"
 
@@ -2487,24 +2483,24 @@ msgid "Some thoughts on the book"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status/comment.html:26
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "進度:"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "頁數"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "百分比"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全書 %(pages)s 頁"
@@ -2533,6 +2529,7 @@ msgid "Include spoiler alert"
 msgstr "加入劇透警告"
 
 #: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "評論:"
 
@@ -2685,9 +2682,7 @@ msgid "Goal privacy:"
 msgstr "目標隱私:"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+#: bookwyrm/templates/snippets/reading_modals/layout.html:13
 msgid "Post to feed"
 msgstr "發佈到即時動態"
 
@@ -2762,21 +2757,45 @@ msgstr "留下評價"
 msgid "Rate"
 msgstr "評價"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr "完成 \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20
 #: bookwyrm/templates/snippets/readthrough_form.html:7
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19
 msgid "Started reading"
 msgstr "已開始閱讀"
 
+#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+msgid "Finished reading"
+msgstr "已完成閱讀"
+
+#: bookwyrm/templates/snippets/reading_modals/form.html:8
+msgid "(Optional)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+msgid "Update progress"
+msgstr "更新進度"
+
+#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr "開始 \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr "想要閱讀 \"<em>%(book_title)s</em>\""
+
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "進度"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
-msgid "Finished reading"
-msgstr "已完成閱讀"
-
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
 msgstr "註冊"
@@ -2793,16 +2812,6 @@ msgstr "匯入書目"
 msgid "Move book"
 msgstr "移動書目"
 
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
-#, python-format
-msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr "完成 \"<em>%(book_title)s</em>\""
-
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
-msgid "Update progress"
-msgstr "更新進度"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "更多書架"
@@ -2816,7 +2825,6 @@ msgid "Finish reading"
 msgstr "完成閱讀"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "想要閱讀"
 
@@ -2825,16 +2833,6 @@ msgstr "想要閱讀"
 msgid "Remove from %(name)s"
 msgstr "從 %(name)s 移除"
 
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
-#, python-format
-msgid "Start \"<em>%(book_title)s</em>\""
-msgstr "開始 \"<em>%(book_title)s</em>\""
-
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
-#, python-format
-msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr "想要閱讀 \"<em>%(book_title)s</em>\""
-
 #: bookwyrm/templates/snippets/status/content_status.html:72
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
@@ -2872,13 +2870,13 @@ msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
 msgstr "由 <a href=\"%(path)s\">%(username)s</a> 建立"
 
-#: bookwyrm/templates/snippets/status/headers/read.html:5
+#: bookwyrm/templates/snippets/status/headers/read.html:7
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
 
-#: bookwyrm/templates/snippets/status/headers/reading.html:6
+#: bookwyrm/templates/snippets/status/headers/reading.html:7
 #, fuzzy, python-format
 #| msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
@@ -2890,7 +2888,7 @@ msgstr "由 <a href=\"%(path)s\">%(username)s</a> 建立"
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
 msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/snippets/status/headers/to_read.html:6
+#: bookwyrm/templates/snippets/status/headers/to_read.html:7
 #, fuzzy, python-format
 #| msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3201,6 +3199,11 @@ msgstr "沒有找到使用該郵箱的使用者。"
 msgid "A password reset link sent to %s"
 msgstr "密碼重置連結已傳送給 %s"
 
+#: bookwyrm/views/rss_feed.py:34
+#, python-brace-format
+msgid "Status updates from {obj.display_name}"
+msgstr ""
+
 #~ msgid "Local Timeline"
 #~ msgstr "本地時間線"
 

From b991510c03f8db27d872260379314eaf2ef0c2b8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 16 Aug 2021 15:00:35 -0700
Subject: [PATCH 132/272] Fixes want to read status slug

---
 .../templates/snippets/reading_modals/want_to_read_modal.html   | 2 +-
 bookwyrm/views/reading.py                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
index 9263fe32..1213b18e 100644
--- a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
@@ -10,6 +10,6 @@ Want to Read "<em>{{ book_title }}</em>"
 
 {% block modal-form-open %}
 <form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post">
-<input type="hidden" name="reading_status" value="toRead">
+<input type="hidden" name="reading_status" value="to-read">
 {% csrf_token %}
 {% endblock %}
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 39066265..9100e1d4 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -83,7 +83,7 @@ class ReadingStatus(View):
                     form.save()
                 else:
                     # uh oh
-                    raise Exception("Invalid form")
+                    raise Exception(form.errors)
             else:
                 privacy = request.POST.get("privacy")
                 handle_reading_status(request.user, desired_shelf, book, privacy)

From 2f93017eaa05fef0a4feda00517114b9894a20db Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 08:45:10 -0700
Subject: [PATCH 133/272] Fixes event propogation

---
 bookwyrm/static/js/bookwyrm.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index c69b4ce8..4d54b723 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -138,7 +138,9 @@ let BookWyrm = new class {
      * @return {undefined}
      */
     toggleAction(event) {
-        event.preventDefault();
+        if (event.currentTarget == event.target) {
+            event.preventDefault();
+        }
         let trigger = event.currentTarget;
         let pressed = trigger.getAttribute('aria-pressed') === 'false';
         let targetId = trigger.dataset.controls;

From 3026a86b117a4c673efb095dd567af8543a74a2a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 09:21:57 -0700
Subject: [PATCH 134/272] Refines preventDefault logic

---
 bookwyrm/static/js/bookwyrm.js                         | 4 ++--
 bookwyrm/templates/snippets/reading_modals/layout.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 4d54b723..db6be3f7 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -138,10 +138,10 @@ let BookWyrm = new class {
      * @return {undefined}
      */
     toggleAction(event) {
-        if (event.currentTarget == event.target) {
+        let trigger = event.currentTarget;
+        if (!trigger.dataset.allowDefault || event.currentTarget == event.target) {
             event.preventDefault();
         }
-        let trigger = event.currentTarget;
         let pressed = trigger.getAttribute('aria-pressed') === 'false';
         let targetId = trigger.dataset.controls;
 
diff --git a/bookwyrm/templates/snippets/reading_modals/layout.html b/bookwyrm/templates/snippets/reading_modals/layout.html
index 00e45335..0f5dedb0 100644
--- a/bookwyrm/templates/snippets/reading_modals/layout.html
+++ b/bookwyrm/templates/snippets/reading_modals/layout.html
@@ -8,7 +8,7 @@
 
 {% with 0|uuid as local_uuid %}
 <div class="is-flex is-justify-content-space-between">
-    <label for="post_status_{{ local_uuid }}_{{ uuid }}" data-controls="reading_content_{{ local_uuid }}_{{ uuid }}" data-controls-checkbox="post_status_{{ local_uuid }}_{{ uuid }}" data-disables="reading_content_fieldset_{{ local_uuid }}_{{ uuid }}" aria-pressed="true">
+    <label for="post_status_{{ local_uuid }}_{{ uuid }}" data-controls="reading_content_{{ local_uuid }}_{{ uuid }}" data-controls-checkbox="post_status_{{ local_uuid }}_{{ uuid }}" data-disables="reading_content_fieldset_{{ local_uuid }}_{{ uuid }}" aria-pressed="true" data-allow-default="true">
         <input type="checkbox" name="post-status" class="checkbox" id="post_status_{{ local_uuid }}_{{ uuid }}" checked>
         {% trans "Post to feed" %}
     </label>

From 8b5ac6b0120f6537a6b045317fcc3986613f1f5a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 09:28:39 -0700
Subject: [PATCH 135/272] Javascript linter

---
 bookwyrm/static/js/bookwyrm.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index db6be3f7..894b1fb6 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -139,6 +139,7 @@ let BookWyrm = new class {
      */
     toggleAction(event) {
         let trigger = event.currentTarget;
+
         if (!trigger.dataset.allowDefault || event.currentTarget == event.target) {
             event.preventDefault();
         }

From ad0fff703054af0256ea0cf66555073f6a2b1b6b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 10:08:07 -0700
Subject: [PATCH 136/272] Prevent overwriting data on import form outside data
 source

---
 bookwyrm/activitypub/base_activity.py     | 13 +++++++++---
 bookwyrm/connectors/abstract_connector.py |  6 +++---
 bookwyrm/models/fields.py                 | 26 ++++++++++++++++++-----
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index ddd45426..c937f672 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -107,7 +107,9 @@ class ActivityObject:
             setattr(self, field.name, value)
 
     # pylint: disable=too-many-locals,too-many-branches
-    def to_model(self, model=None, instance=None, allow_create=True, save=True):
+    def to_model(
+        self, model=None, instance=None, allow_create=True, save=True, overwrite=True
+    ):
         """convert from an activity to a model instance"""
         model = model or get_model_from_type(self.type)
 
@@ -129,9 +131,12 @@ class ActivityObject:
 
         # keep track of what we've changed
         update_fields = []
+        # sets field on the model using the activity value
         for field in instance.simple_fields:
             try:
-                changed = field.set_field_from_activity(instance, self)
+                changed = field.set_field_from_activity(
+                    instance, self, overwrite=overwrite
+                )
                 if changed:
                     update_fields.append(field.name)
             except AttributeError as e:
@@ -140,7 +145,9 @@ class ActivityObject:
         # image fields have to be set after other fields because they can save
         # too early and jank up users
         for field in instance.image_fields:
-            changed = field.set_field_from_activity(instance, self, save=save)
+            changed = field.set_field_from_activity(
+                instance, self, save=save, overwrite=overwrite
+            )
             if changed:
                 update_fields.append(field.name)
 
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index fb102ea4..ffacffdf 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -139,7 +139,7 @@ class AbstractConnector(AbstractMinimalConnector):
                 **dict_from_mappings(work_data, self.book_mappings)
             )
             # this will dedupe automatically
-            work = work_activity.to_model(model=models.Work)
+            work = work_activity.to_model(model=models.Work, overwrite=False)
             for author in self.get_authors_from_data(work_data):
                 work.authors.add(author)
 
@@ -156,7 +156,7 @@ class AbstractConnector(AbstractMinimalConnector):
         mapped_data = dict_from_mappings(edition_data, self.book_mappings)
         mapped_data["work"] = work.remote_id
         edition_activity = activitypub.Edition(**mapped_data)
-        edition = edition_activity.to_model(model=models.Edition)
+        edition = edition_activity.to_model(model=models.Edition, overwrite=False)
         edition.connector = self.connector
         edition.save()
 
@@ -182,7 +182,7 @@ class AbstractConnector(AbstractMinimalConnector):
             return None
 
         # this will dedupe
-        return activity.to_model(model=models.Author)
+        return activity.to_model(model=models.Author, overwrite=False)
 
     @abstractmethod
     def is_work_data(self, data):
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index b58f8174..6ed5aa5e 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -66,7 +66,7 @@ class ActivitypubFieldMixin:
             self.activitypub_field = activitypub_field
         super().__init__(*args, **kwargs)
 
-    def set_field_from_activity(self, instance, data):
+    def set_field_from_activity(self, instance, data, overwrite=True):
         """helper function for assinging a value to the field. Returns if changed"""
         try:
             value = getattr(data, self.get_activitypub_field())
@@ -79,8 +79,15 @@ class ActivitypubFieldMixin:
         if formatted is None or formatted is MISSING or formatted == {}:
             return False
 
+        current_value = (
+            getattr(instance, self.name) if hasattr(instance, self.name) else None
+        )
+        # if we're not in overwrite mode, only continue updating the field if its unset
+        if current_value and not overwrite:
+            return False
+
         # the field is unchanged
-        if hasattr(instance, self.name) and getattr(instance, self.name) == formatted:
+        if current_value == formatted:
             return False
 
         setattr(instance, self.name, formatted)
@@ -210,7 +217,10 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
         )
 
     # pylint: disable=invalid-name
-    def set_field_from_activity(self, instance, data):
+    def set_field_from_activity(self, instance, data, overwrite=True):
+        if not overwrite:
+            return False
+
         original = getattr(instance, self.name)
         to = data.to
         cc = data.cc
@@ -273,8 +283,11 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
         self.link_only = link_only
         super().__init__(*args, **kwargs)
 
-    def set_field_from_activity(self, instance, data):
+    def set_field_from_activity(self, instance, data, overwrite=True):
         """helper function for assinging a value to the field"""
+        if not overwrite and getattr(instance, self.name).exists():
+            return False
+
         value = getattr(data, self.get_activitypub_field())
         formatted = self.field_from_activity(value)
         if formatted is None or formatted is MISSING:
@@ -377,13 +390,16 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         super().__init__(*args, **kwargs)
 
     # pylint: disable=arguments-differ
-    def set_field_from_activity(self, instance, data, save=True):
+    def set_field_from_activity(self, instance, data, save=True, overwrite=True):
         """helper function for assinging a value to the field"""
         value = getattr(data, self.get_activitypub_field())
         formatted = self.field_from_activity(value)
         if formatted is None or formatted is MISSING:
             return False
 
+        if not overwrite and hasattr(instance, self.name):
+            return False
+
         getattr(instance, self.name).save(*formatted, save=save)
         return True
 

From 4b788f5df175d7dcd4855c538bbb2396ecef2200 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 10:26:56 -0700
Subject: [PATCH 137/272] Move editions into their own view file

---
 bookwyrm/views/__init__.py |  5 ++-
 bookwyrm/views/books.py    | 63 +-------------------------------
 bookwyrm/views/editions.py | 75 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 64 deletions(-)
 create mode 100644 bookwyrm/views/editions.py

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 15b55acc..303dad62 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -4,11 +4,12 @@ from .authentication import Login, Register, Logout
 from .authentication import ConfirmEmail, ConfirmEmailCode, resend_link
 from .author import Author, EditAuthor
 from .block import Block, unblock
-from .books import Book, EditBook, ConfirmEditBook, Editions
-from .books import upload_cover, add_description, switch_edition, resolve_book
+from .books import Book, EditBook, ConfirmEditBook
+from .books import upload_cover, add_description, resolve_book
 from .directory import Directory
 from .discover import Discover
 from .edit_user import EditUser, DeleteUser
+from .editions import Editions, switch_edition
 from .federation import Federation, FederatedServer
 from .federation import AddFederatedServer, ImportServerBlocklist
 from .federation import block_server, unblock_server
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 6cd0427c..97c23def 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -24,7 +24,7 @@ from bookwyrm.settings import PAGE_LENGTH
 from .helpers import is_api_request, get_edition, privacy_filter
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 class Book(View):
     """a book! this is the stuff"""
 
@@ -270,37 +270,6 @@ class ConfirmEditBook(View):
         return redirect("/book/%s" % book.id)
 
 
-class Editions(View):
-    """list of editions"""
-
-    def get(self, request, book_id):
-        """list of editions of a book"""
-        work = get_object_or_404(models.Work, id=book_id)
-
-        if is_api_request(request):
-            return ActivitypubResponse(work.to_edition_list(**request.GET))
-        filters = {}
-
-        if request.GET.get("language"):
-            filters["languages__contains"] = [request.GET.get("language")]
-        if request.GET.get("format"):
-            filters["physical_format__iexact"] = request.GET.get("format")
-
-        editions = work.editions.order_by("-edition_rank")
-        languages = set(sum([e.languages for e in editions], []))
-
-        paginated = Paginator(editions.filter(**filters), PAGE_LENGTH)
-        data = {
-            "editions": paginated.get_page(request.GET.get("page")),
-            "work": work,
-            "languages": languages,
-            "formats": set(
-                e.physical_format.lower() for e in editions if e.physical_format
-            ),
-        }
-        return TemplateResponse(request, "book/editions.html", data)
-
-
 @login_required
 @require_POST
 def upload_cover(request, book_id):
@@ -363,33 +332,3 @@ def resolve_book(request):
     book = connector.get_or_create_book(remote_id)
 
     return redirect("book", book.id)
-
-
-@login_required
-@require_POST
-@transaction.atomic
-def switch_edition(request):
-    """switch your copy of a book to a different edition"""
-    edition_id = request.POST.get("edition")
-    new_edition = get_object_or_404(models.Edition, id=edition_id)
-    shelfbooks = models.ShelfBook.objects.filter(
-        book__parent_work=new_edition.parent_work, shelf__user=request.user
-    )
-    for shelfbook in shelfbooks.all():
-        with transaction.atomic():
-            models.ShelfBook.objects.create(
-                created_date=shelfbook.created_date,
-                user=shelfbook.user,
-                shelf=shelfbook.shelf,
-                book=new_edition,
-            )
-            shelfbook.delete()
-
-    readthroughs = models.ReadThrough.objects.filter(
-        book__parent_work=new_edition.parent_work, user=request.user
-    )
-    for readthrough in readthroughs.all():
-        readthrough.book = new_edition
-        readthrough.save()
-
-    return redirect("/book/%d" % new_edition.id)
diff --git a/bookwyrm/views/editions.py b/bookwyrm/views/editions.py
new file mode 100644
index 00000000..d2c2a4d2
--- /dev/null
+++ b/bookwyrm/views/editions.py
@@ -0,0 +1,75 @@
+""" the good stuff! the books! """
+from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator
+from django.db import transaction
+from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
+from django.views import View
+from django.views.decorators.http import require_POST
+
+from bookwyrm import models
+from bookwyrm.activitypub import ActivitypubResponse
+from bookwyrm.settings import PAGE_LENGTH
+from .helpers import is_api_request
+
+
+# pylint: disable=no-self-use
+class Editions(View):
+    """list of editions"""
+
+    def get(self, request, book_id):
+        """list of editions of a book"""
+        work = get_object_or_404(models.Work, id=book_id)
+
+        if is_api_request(request):
+            return ActivitypubResponse(work.to_edition_list(**request.GET))
+        filters = {}
+
+        if request.GET.get("language"):
+            filters["languages__contains"] = [request.GET.get("language")]
+        if request.GET.get("format"):
+            filters["physical_format__iexact"] = request.GET.get("format")
+
+        editions = work.editions.order_by("-edition_rank")
+        languages = set(sum([e.languages for e in editions], []))
+
+        paginated = Paginator(editions.filter(**filters), PAGE_LENGTH)
+        data = {
+            "editions": paginated.get_page(request.GET.get("page")),
+            "work": work,
+            "languages": languages,
+            "formats": set(
+                e.physical_format.lower() for e in editions if e.physical_format
+            ),
+        }
+        return TemplateResponse(request, "book/editions.html", data)
+
+
+@login_required
+@require_POST
+@transaction.atomic
+def switch_edition(request):
+    """switch your copy of a book to a different edition"""
+    edition_id = request.POST.get("edition")
+    new_edition = get_object_or_404(models.Edition, id=edition_id)
+    shelfbooks = models.ShelfBook.objects.filter(
+        book__parent_work=new_edition.parent_work, shelf__user=request.user
+    )
+    for shelfbook in shelfbooks.all():
+        with transaction.atomic():
+            models.ShelfBook.objects.create(
+                created_date=shelfbook.created_date,
+                user=shelfbook.user,
+                shelf=shelfbook.shelf,
+                book=new_edition,
+            )
+            shelfbook.delete()
+
+    readthroughs = models.ReadThrough.objects.filter(
+        book__parent_work=new_edition.parent_work, user=request.user
+    )
+    for readthrough in readthroughs.all():
+        readthrough.book = new_edition
+        readthrough.save()
+
+    return redirect("/book/%d" % new_edition.id)

From 3b5485253620675e9785a3c2fc450a8dfcf150b3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 10:27:14 -0700
Subject: [PATCH 138/272] Adds search filter to UI

---
 bookwyrm/templates/book/edition_filters.html | 1 +
 bookwyrm/templates/book/search_filter.html   | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 bookwyrm/templates/book/search_filter.html

diff --git a/bookwyrm/templates/book/edition_filters.html b/bookwyrm/templates/book/edition_filters.html
index a55b72af..c41ab0c0 100644
--- a/bookwyrm/templates/book/edition_filters.html
+++ b/bookwyrm/templates/book/edition_filters.html
@@ -1,6 +1,7 @@
 {% extends 'snippets/filters_panel/filters_panel.html' %}
 
 {% block filter_fields %}
+{% include 'book/search_filter.html' %}
 {% include 'book/language_filter.html' %}
 {% include 'book/format_filter.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/book/search_filter.html b/bookwyrm/templates/book/search_filter.html
new file mode 100644
index 00000000..f2345a68
--- /dev/null
+++ b/bookwyrm/templates/book/search_filter.html
@@ -0,0 +1,8 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<label class="label" for="id_search">{% trans "Search editions" %}</label>
+<input type="text" class="input" name="q" value="{{ request.GET.q|default:'' }}" id="id_search">
+{% endblock %}
+

From 6db3391f8bec09c3ee78b61e87d0e49ea3892597 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 10:44:24 -0700
Subject: [PATCH 139/272] Search editions in view

---
 bookwyrm/views/editions.py | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/editions.py b/bookwyrm/views/editions.py
index d2c2a4d2..b15e29b7 100644
--- a/bookwyrm/views/editions.py
+++ b/bookwyrm/views/editions.py
@@ -1,7 +1,11 @@
 """ the good stuff! the books! """
+from functools import reduce
+import operator
+
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db import transaction
+from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.views import View
@@ -30,10 +34,31 @@ class Editions(View):
         if request.GET.get("format"):
             filters["physical_format__iexact"] = request.GET.get("format")
 
+        query = request.GET.get("q")
+        search_filters = {}
+        if query:
+            searchable_array_fields = ["languages", "publishers"]
+            searchable_fields = [
+                "title",
+                "physical_format",
+                "isbn_10",
+                "isbn_13",
+                "oclc_number",
+                "asin",
+            ]
+            search_filter_entries = [
+                {f"{f}__icontains": query} for f in searchable_fields
+            ] + [{f"{f}__iexact": query} for f in searchable_array_fields]
+            search_filters = reduce(
+                operator.or_, (Q(**f) for f in search_filter_entries)
+            )
+
         editions = work.editions.order_by("-edition_rank")
         languages = set(sum([e.languages for e in editions], []))
 
-        paginated = Paginator(editions.filter(**filters), PAGE_LENGTH)
+        paginated = Paginator(
+            editions.filter(**filters).filter(search_filters), PAGE_LENGTH
+        )
         data = {
             "editions": paginated.get_page(request.GET.get("page")),
             "work": work,

From bbe5ad7ce1c88931ec7de4c132f1328f0249b426 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 10:49:11 -0700
Subject: [PATCH 140/272] Suppresses pylint warning

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

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index c937f672..d20e7e94 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -106,7 +106,7 @@ class ActivityObject:
                 value = field.default
             setattr(self, field.name, value)
 
-    # pylint: disable=too-many-locals,too-many-branches
+    # pylint: disable=too-many-locals,too-many-branches,too-many-arguments
     def to_model(
         self, model=None, instance=None, allow_create=True, save=True, overwrite=True
     ):

From e5a3d987698c196eae031e2fd14caec304fbeb56 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 10:57:32 -0700
Subject: [PATCH 141/272] Remove unneeded layout file

---
 .../templates/user/layout_without_bio.html    | 58 -------------------
 bookwyrm/templates/user/shelf/shelf.html      | 14 ++---
 2 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100755 bookwyrm/templates/user/layout_without_bio.html

diff --git a/bookwyrm/templates/user/layout_without_bio.html b/bookwyrm/templates/user/layout_without_bio.html
deleted file mode 100755
index d76cdc7c..00000000
--- a/bookwyrm/templates/user/layout_without_bio.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends 'layout.html' %}
-{% load i18n %}
-{% load humanize %}
-{% load utilities %}
-{% load markdown %}
-{% load layout %}
-
-{% block title %}{{ user.display_name }}{% endblock %}
-
-{% block opengraph_images %}
-    {% include 'snippets/opengraph_images.html' with image=user.preview_image %}
-{% endblock %}
-
-{% block content %}
-<header class="block">
-    {% block header %}
-    <h1 class="title">
-        {% trans "User Profile" %}
-    </h1>
-    {% endblock %}
-</header>
-
-
-{% block tabs %}
-{% with user|username as username %}
-<nav class="tabs">
-    <ul>
-        {% url 'user-feed' user|username as url %}
-        <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Activity" %}</a>
-        </li>
-        {% if is_self or user.goal.exists %}
-        {% now 'Y' as year %}
-        {% url 'user-goal' user|username year as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Reading Goal" %}</a>
-        </li>
-        {% endif %}
-        {% if is_self or user.list_set.exists %}
-        {% url 'user-lists' user|username as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Lists" %}</a>
-        </li>
-        {% endif %}
-        {% if user.shelf_set.exists %}
-        {% url 'user-shelves' user|username as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Books" %}</a>
-        </li>
-        {% endif %}
-    </ul>
-</nav>
-{% endwith %}
-{% endblock %}
-
-{% block panel %}{% endblock %}
-
-{% endblock %}
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 7439ead4..c48ec19a 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -1,4 +1,4 @@
-{% extends 'user/layout_without_bio.html' %}
+{% extends 'layout.html' %}
 {% load bookwyrm_tags %}
 {% load utilities %}
 {% load humanize %}
@@ -8,15 +8,17 @@
 {% include 'user/shelf/books_header.html' %}
 {% endblock %}
 
-{% block header %}
-<header class="columns">
+{% block opengraph_images %}
+    {% include 'snippets/opengraph_images.html' with image=user.preview_image %}
+{% endblock %}
+
+{% block content %}
+<header class="block">
     <h1 class="title">
         {% include 'user/shelf/books_header.html' %}
     </h1>
 </header>
-{% endblock %}
 
-{% block tabs %}
 <div class="block columns">
     <div class="column">
         <div class="tabs">
@@ -41,9 +43,7 @@
     </div>
     {% endif %}
 </div>
-{% endblock %}
 
-{% block panel %}
 <div class="block">
     {% include 'user/shelf/create_shelf_form.html' with controls_text='create_shelf_form' %}
 </div>

From cb4c6100aa4b66ad2e364159be440b41143ddb4e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 11:47:10 -0700
Subject: [PATCH 142/272] Adds tests

---
 bookwyrm/tests/views/test_book.py     |  43 ---------
 bookwyrm/tests/views/test_editions.py | 126 ++++++++++++++++++++++++++
 bookwyrm/views/editions.py            |  19 ++--
 3 files changed, 136 insertions(+), 52 deletions(-)
 create mode 100644 bookwyrm/tests/views/test_editions.py

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index c5d86a12..2cd50302 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -280,49 +280,6 @@ class BookViews(TestCase):
         self.assertEqual(book.authors.first().name, "Sappho")
         self.assertEqual(book.authors.first(), book.parent_work.authors.first())
 
-    @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-    def test_switch_edition(self, _):
-        """updates user's relationships to a book"""
-        work = models.Work.objects.create(title="test work")
-        edition1 = models.Edition.objects.create(title="first ed", parent_work=work)
-        edition2 = models.Edition.objects.create(title="second ed", parent_work=work)
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user)
-            models.ShelfBook.objects.create(
-                book=edition1,
-                user=self.local_user,
-                shelf=shelf,
-            )
-        models.ReadThrough.objects.create(user=self.local_user, book=edition1)
-
-        self.assertEqual(models.ShelfBook.objects.get().book, edition1)
-        self.assertEqual(models.ReadThrough.objects.get().book, edition1)
-        request = self.factory.post("", {"edition": edition2.id})
-        request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.switch_edition(request)
-
-        self.assertEqual(models.ShelfBook.objects.get().book, edition2)
-        self.assertEqual(models.ReadThrough.objects.get().book, edition2)
-
-    def test_editions_page(self):
-        """there are so many views, this just makes sure it LOADS"""
-        view = views.Editions.as_view()
-        request = self.factory.get("")
-        with patch("bookwyrm.views.books.is_api_request") as is_api:
-            is_api.return_value = False
-            result = view(request, self.work.id)
-        self.assertIsInstance(result, TemplateResponse)
-        result.render()
-        self.assertEqual(result.status_code, 200)
-
-        request = self.factory.get("")
-        with patch("bookwyrm.views.books.is_api_request") as is_api:
-            is_api.return_value = True
-            result = view(request, self.work.id)
-        self.assertIsInstance(result, ActivitypubResponse)
-        self.assertEqual(result.status_code, 200)
-
     def test_upload_cover_file(self):
         """add a cover via file upload"""
         self.assertFalse(self.book.cover)
diff --git a/bookwyrm/tests/views/test_editions.py b/bookwyrm/tests/views/test_editions.py
new file mode 100644
index 00000000..1bd23ae1
--- /dev/null
+++ b/bookwyrm/tests/views/test_editions.py
@@ -0,0 +1,126 @@
+""" test for app action functionality """
+from unittest.mock import patch
+
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+from bookwyrm.activitypub import ActivitypubResponse
+
+
+class BookViews(TestCase):
+    """books books books"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+            self.local_user = models.User.objects.create_user(
+                "mouse@local.com",
+                "mouse@mouse.com",
+                "mouseword",
+                local=True,
+                localname="mouse",
+                remote_id="https://example.com/users/mouse",
+            )
+        self.work = models.Work.objects.create(title="Test Work")
+        self.book = models.Edition.objects.create(
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
+            physical_format="paperback",
+        )
+
+        models.SiteSettings.objects.create()
+
+    def test_editions_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Editions.as_view()
+        request = self.factory.get("")
+        with patch("bookwyrm.views.editions.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.work.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertTrue("paperback" in result.context_data["formats"])
+
+    def test_editions_page_filtered(self):
+        """editions view with filters"""
+        models.Edition.objects.create(
+            title="Fish",
+            physical_format="okay",
+            parent_work=self.work,
+        )
+        view = views.Editions.as_view()
+        request = self.factory.get("")
+        with patch("bookwyrm.views.editions.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.work.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(len(result.context_data["editions"].object_list), 2)
+        self.assertEqual(len(result.context_data["formats"]), 2)
+        self.assertTrue("paperback" in result.context_data["formats"])
+        self.assertTrue("okay" in result.context_data["formats"])
+
+        request = self.factory.get("", {"q": "fish"})
+        with patch("bookwyrm.views.editions.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.work.id)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(len(result.context_data["editions"].object_list), 1)
+
+        request = self.factory.get("", {"q": "okay"})
+        with patch("bookwyrm.views.editions.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.work.id)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(len(result.context_data["editions"].object_list), 1)
+
+        request = self.factory.get("", {"format": "okay"})
+        with patch("bookwyrm.views.editions.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.work.id)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(len(result.context_data["editions"].object_list), 1)
+
+    def test_editions_page_api(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Editions.as_view()
+        request = self.factory.get("")
+        with patch("bookwyrm.views.editions.is_api_request") as is_api:
+            is_api.return_value = True
+            result = view(request, self.work.id)
+        self.assertIsInstance(result, ActivitypubResponse)
+        self.assertEqual(result.status_code, 200)
+
+    @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+    def test_switch_edition(self, _):
+        """updates user's relationships to a book"""
+        work = models.Work.objects.create(title="test work")
+        edition1 = models.Edition.objects.create(title="first ed", parent_work=work)
+        edition2 = models.Edition.objects.create(title="second ed", parent_work=work)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user)
+            models.ShelfBook.objects.create(
+                book=edition1,
+                user=self.local_user,
+                shelf=shelf,
+            )
+        models.ReadThrough.objects.create(user=self.local_user, book=edition1)
+
+        self.assertEqual(models.ShelfBook.objects.get().book, edition1)
+        self.assertEqual(models.ReadThrough.objects.get().book, edition1)
+        request = self.factory.post("", {"edition": edition2.id})
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.switch_edition(request)
+
+        self.assertEqual(models.ShelfBook.objects.get().book, edition2)
+        self.assertEqual(models.ReadThrough.objects.get().book, edition2)
diff --git a/bookwyrm/views/editions.py b/bookwyrm/views/editions.py
index b15e29b7..6b9bd384 100644
--- a/bookwyrm/views/editions.py
+++ b/bookwyrm/views/editions.py
@@ -34,8 +34,14 @@ class Editions(View):
         if request.GET.get("format"):
             filters["physical_format__iexact"] = request.GET.get("format")
 
+        editions = work.editions.order_by("-edition_rank")
+        languages = set(
+            sum([e for e in editions.values_list("languages", flat=True)], [])
+        )
+
+        editions = editions.filter(**filters)
+
         query = request.GET.get("q")
-        search_filters = {}
         if query:
             searchable_array_fields = ["languages", "publishers"]
             searchable_fields = [
@@ -49,16 +55,11 @@ class Editions(View):
             search_filter_entries = [
                 {f"{f}__icontains": query} for f in searchable_fields
             ] + [{f"{f}__iexact": query} for f in searchable_array_fields]
-            search_filters = reduce(
-                operator.or_, (Q(**f) for f in search_filter_entries)
+            editions = editions.filter(
+                reduce(operator.or_, (Q(**f) for f in search_filter_entries))
             )
 
-        editions = work.editions.order_by("-edition_rank")
-        languages = set(sum([e.languages for e in editions], []))
-
-        paginated = Paginator(
-            editions.filter(**filters).filter(search_filters), PAGE_LENGTH
-        )
+        paginated = Paginator(editions, PAGE_LENGTH)
         data = {
             "editions": paginated.get_page(request.GET.get("page")),
             "work": work,

From b178ba63265e604d0416e3c0cf562c089af086d6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 11:57:19 -0700
Subject: [PATCH 143/272] Removes unneeded list comprehension

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

diff --git a/bookwyrm/views/editions.py b/bookwyrm/views/editions.py
index 6b9bd384..8f59d2fe 100644
--- a/bookwyrm/views/editions.py
+++ b/bookwyrm/views/editions.py
@@ -36,7 +36,7 @@ class Editions(View):
 
         editions = work.editions.order_by("-edition_rank")
         languages = set(
-            sum([e for e in editions.values_list("languages", flat=True)], [])
+            sum(editions.values_list("languages", flat=True), [])
         )
 
         editions = editions.filter(**filters)

From 32d4ae1f4e8fbd095b86e4fd23c455f44d7d4615 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 12:04:14 -0700
Subject: [PATCH 144/272] Python formatting

---
 bookwyrm/views/editions.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bookwyrm/views/editions.py b/bookwyrm/views/editions.py
index 8f59d2fe..7615c497 100644
--- a/bookwyrm/views/editions.py
+++ b/bookwyrm/views/editions.py
@@ -35,9 +35,7 @@ class Editions(View):
             filters["physical_format__iexact"] = request.GET.get("format")
 
         editions = work.editions.order_by("-edition_rank")
-        languages = set(
-            sum(editions.values_list("languages", flat=True), [])
-        )
+        languages = set(sum(editions.values_list("languages", flat=True), []))
 
         editions = editions.filter(**filters)
 

From 0b4a2677453acef5e1d841d173063fa5e60e9cbc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 12:17:35 -0700
Subject: [PATCH 145/272] Adds missing migration

---
 .../migrations/0084_auto_20210817_1916.py     | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 bookwyrm/migrations/0084_auto_20210817_1916.py

diff --git a/bookwyrm/migrations/0084_auto_20210817_1916.py b/bookwyrm/migrations/0084_auto_20210817_1916.py
new file mode 100644
index 00000000..6e826f99
--- /dev/null
+++ b/bookwyrm/migrations/0084_auto_20210817_1916.py
@@ -0,0 +1,56 @@
+# Generated by Django 3.2.4 on 2021-08-17 19:16
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0083_auto_20210816_2022"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="comment",
+            name="reading_status",
+            field=bookwyrm.models.fields.CharField(
+                blank=True,
+                choices=[
+                    ("to-read", "To-Read"),
+                    ("reading", "Reading"),
+                    ("read", "Read"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="quotation",
+            name="reading_status",
+            field=bookwyrm.models.fields.CharField(
+                blank=True,
+                choices=[
+                    ("to-read", "To-Read"),
+                    ("reading", "Reading"),
+                    ("read", "Read"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="review",
+            name="reading_status",
+            field=bookwyrm.models.fields.CharField(
+                blank=True,
+                choices=[
+                    ("to-read", "To-Read"),
+                    ("reading", "Reading"),
+                    ("read", "Read"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]

From 075715ca22b06d3f59edb47ff38223acd0d014c6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 14:35:28 -0700
Subject: [PATCH 146/272] Use gettext_lazy not gettext

---
 bookwyrm/views/password.py | 2 +-
 bookwyrm/views/shelf.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 18fcb02c..6d202ce2 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -5,7 +5,7 @@ from django.core.exceptions import PermissionDenied
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 
 from bookwyrm import models
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index e9ad074d..ba9f6a3c 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -9,7 +9,7 @@ from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.decorators.http import require_POST
 

From 489f97030e67138465aae2548401a77c9e2b042a Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 18 Aug 2021 10:27:17 +0200
Subject: [PATCH 147/272] apply suggested changes

---
 .gitignore                         | 2 +-
 bookwyrm/templatetags/utilities.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74eebb96..624ce100 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,4 @@
 nginx/default.conf
 
 #macOS
-.DS_Store
+**/.DS_Store
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index 1be66049..bcb1ec4e 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -54,7 +54,7 @@ def truncatepath(value, arg):
 
 
 @register.simple_tag(takes_context=False)
-def get_book_cover_thumbnail(book, size, ext):
+def get_book_cover_thumbnail(book, size="medium", ext="jpg"):
     """Returns a book thumbnail at the specified size and extension, with fallback if needed"""
     try:
         cover_thumbnail = getattr(book, "cover_bw_book_%s_%s" % (size, ext))

From 8ba695c21def71c7db3092b27e3e1ba0e575dec9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 19 Aug 2021 15:19:10 -0700
Subject: [PATCH 148/272] Adds max height to modals so they don't disappear on
 small screens

---
 bookwyrm/static/css/bookwyrm.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 6eb068ab..f945b869 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -28,6 +28,9 @@ body {
 .modal-card.is-fullwidth {
     min-width: 75% !important;
 }
+.modal-card-body {
+    max-height: 70vh;
+}
 
 .clip-text {
     max-height: 35em;

From 9a7429b26812dec653ae11767d574a716556955b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 19 Aug 2021 15:30:58 -0700
Subject: [PATCH 149/272] Larger cover sizes for discover and landing views

---
 bookwyrm/templates/discover/large-book.html | 2 +-
 bookwyrm/templates/discover/small-book.html | 2 +-
 bookwyrm/templates/landing/large-book.html  | 2 +-
 bookwyrm/templates/landing/small-book.html  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index c18342ce..6d80c3da 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -10,7 +10,7 @@
             <a
                 class="align to-b to-l"
                 href="{{ book.local_path }}"
-            >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' size='xlarge' %}</a>
+            >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' size='xxlarge' %}</a>
 
             {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             <h3 class="title is-6">
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 5f93bbff..5b207018 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -6,7 +6,7 @@
 {% if status.book or status.mention_books.exists %}
     {% load_book status as book %}
     <a href="{{ book.local_path }}">
-        {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' size='large' %}
+        {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' size='xxlarge' %}
     </a>
 
     <div class="block mt-2">
diff --git a/bookwyrm/templates/landing/large-book.html b/bookwyrm/templates/landing/large-book.html
index 467785c5..03ec718b 100644
--- a/bookwyrm/templates/landing/large-book.html
+++ b/bookwyrm/templates/landing/large-book.html
@@ -9,7 +9,7 @@
                 <a
                     class="align to-b to-l"
                     href="{{ book.local_path }}"
-                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' %}</a>
+                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' size='xxlarge' %}</a>
 
                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             </div>
diff --git a/bookwyrm/templates/landing/small-book.html b/bookwyrm/templates/landing/small-book.html
index 6538f5f5..813fb797 100644
--- a/bookwyrm/templates/landing/small-book.html
+++ b/bookwyrm/templates/landing/small-book.html
@@ -4,7 +4,7 @@
 {% if book %}
     {% with book=book %}
         <a href="{{ book.local_path }}">
-            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' %}
+            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' size='xxlarge' %}
         </a>
 
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}

From 451cb38c6c788a7e9f8f393821af47f953f25889 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 19 Aug 2021 15:33:23 -0700
Subject: [PATCH 150/272] Linter fix

---
 bookwyrm/static/css/bookwyrm.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index f945b869..0724c7f1 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -28,6 +28,7 @@ body {
 .modal-card.is-fullwidth {
     min-width: 75% !important;
 }
+
 .modal-card-body {
     max-height: 70vh;
 }

From bf6ee9f53c391b75b729bd4678c6c5843887385a Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Fri, 20 Aug 2021 18:06:09 +0200
Subject: [PATCH 151/272] Thumbnails: fix default size definition in template
 utility

---
 bookwyrm/templatetags/utilities.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index bcb1ec4e..abb52499 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -56,6 +56,8 @@ def truncatepath(value, arg):
 @register.simple_tag(takes_context=False)
 def get_book_cover_thumbnail(book, size="medium", ext="jpg"):
     """Returns a book thumbnail at the specified size and extension, with fallback if needed"""
+    if size == "":
+        size = "medium"
     try:
         cover_thumbnail = getattr(book, "cover_bw_book_%s_%s" % (size, ext))
         return cover_thumbnail.url

From 596b6ca084aba2cbe6b4e8748b7904d627844ec2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 07:25:18 -0700
Subject: [PATCH 152/272] Resolves warning in books view

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

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 97c23def..c2525295 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -62,7 +62,7 @@ class Book(View):
             queryset = queryset.filter(user=request.user, deleted=False)
         else:
             queryset = reviews.exclude(Q(content__isnull=True) | Q(content=""))
-        queryset = queryset.select_related("user")
+        queryset = queryset.select_related("user").order_by("-published_date")
         paginated = Paginator(queryset, PAGE_LENGTH)
 
         lists = privacy_filter(

From 8055fa8d8fcf1eba7f29ed0960d9b735e6e0470b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 09:03:15 -0700
Subject: [PATCH 153/272] Test out accessibility linter github action

---
 .github/workflows/accessibility.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/accessibility.yml

diff --git a/.github/workflows/accessibility.yml b/.github/workflows/accessibility.yml
new file mode 100644
index 00000000..5c5c0921
--- /dev/null
+++ b/.github/workflows/accessibility.yml
@@ -0,0 +1,27 @@
+name: Accessibility Validation
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Scan for accessibility issues
+	uses: microsoft/accessibility-insights-action@v2
+	with:
+	  repo-token: ${{ secrets.GITHUB_TOKEN }}
+	  site-dir: ${{ github.workspace }}/bookwyrm/templates
+	  scan-url-relative-path: / # use // if windows agen
+
+      - name: Upload report artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: accessibility-reports
+          path: ${{ github.workspace }}/_accessibility-reports

From be94c0a76b670e05f7058f9270ab0fb36c52de3c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:30:15 -0700
Subject: [PATCH 154/272] Remove stray </dl> tag

---
 bookwyrm/templates/book/readthrough.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/templates/book/readthrough.html b/bookwyrm/templates/book/readthrough.html
index 05ed3c63..12430f75 100644
--- a/bookwyrm/templates/book/readthrough.html
+++ b/bookwyrm/templates/book/readthrough.html
@@ -6,7 +6,6 @@
         <div class="columns">
             <div class="column">
                 {% trans "Progress Updates:" %}
-                </dl>
                 <ul>
                     {% if readthrough.finish_date or readthrough.progress %}
                     <li>

From 1aab9e7da9fa93dca888fb4a75fc7746daad8b50 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:30:44 -0700
Subject: [PATCH 155/272] Fixes endif placement on null state for feed

---
 bookwyrm/templates/feed/feed.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 39eebb26..265a467a 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -40,11 +40,10 @@
     {% if suggested_users %}
     {# suggested users for when things are very lonely #}
     {% include 'feed/suggested_users.html' with suggested_users=suggested_users %}
+    {% endif %}
 </div>
 {% endif %}
 
-{% endif %}
-
 {% for activity in activities %}
 
 {% if not activities.number > 1 and forloop.counter0 == 2 and suggested_users %}

From 5bd92a8e34bdb838ea7569823ff99bef2d6d78cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:32:32 -0700
Subject: [PATCH 156/272] Fixes "view directory" link html and adds it to l10n

---
 bookwyrm/templates/feed/suggested_users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/suggested_users.html b/bookwyrm/templates/feed/suggested_users.html
index c095faa5..1de1ae13 100644
--- a/bookwyrm/templates/feed/suggested_users.html
+++ b/bookwyrm/templates/feed/suggested_users.html
@@ -2,5 +2,5 @@
 <section class="block">
     <h2 class="title is-5">{% trans "Who to follow" %}</h2>
     {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %}
-    <a class="help" href="{% url 'directory' %}">View directory <span class="icon icon-arrow-right"></a>
+    <a class="help" href="{% url 'directory' %}">{% trans "View directory" %} <span class="icon icon-arrow-right"></span></a>
 </section>

From af2abcbe3dab283f53e205e12257ddca741185c2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:32:55 -0700
Subject: [PATCH 157/272] Missing close link tag in manage invites view

---
 bookwyrm/templates/settings/manage_invites.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html
index 5b075114..6efaefcf 100644
--- a/bookwyrm/templates/settings/manage_invites.html
+++ b/bookwyrm/templates/settings/manage_invites.html
@@ -54,7 +54,7 @@
         {% endif %}
         {% for invite in invites %}
         <tr>
-            <td><a href="{{ invite.link }}">{{ invite.link }}</td>
+            <td><a href="{{ invite.link }}">{{ invite.link }}</a></td>
             <td>{{ invite.expiry|naturaltime }}</td>
             <td>{{ invite.use_limit }}</td>
             <td>{{ invite.times_used }}</td>

From d1e9a164ff35633152f63f4067e6d527165fa712 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:33:19 -0700
Subject: [PATCH 158/272] Correct close tag in user null state view

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

diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 97f81053..f360a30a 100755
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -71,7 +71,7 @@
     {% endfor %}
     {% if not activities %}
     <div class="block">
-        <p>{% trans "No activities yet!" %}</a>
+        <p>{% trans "No activities yet!" %}</p>
     </div>
     {% endif %}
 

From 053579c2a45d3cfe54d90306f4137b84248fcdbe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:33:50 -0700
Subject: [PATCH 159/272] Clarifies logic in file upload widget

---
 .../clearable_file_input_with_warning.html    | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
index e4906cb9..6370ba39 100644
--- a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
+++ b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
@@ -2,23 +2,30 @@
 {% load utilities %}
 
 {% if widget.is_initial %}
-<p class="mb-1">
-    {{ widget.initial_text }}:
-    <a href="{{ widget.value.url }}">{{ widget.value|truncatepath:10 }}</a>
-</p>
-{% if not widget.required %}
-<p class="mb-1">
-    <label class="has-text-weight-normal">
+    <p class="mb-1">
+        {{ widget.initial_text }}:
+        <a href="{{ widget.value.url }}">{{ widget.value|truncatepath:10 }}</a>
+    </p>
+
+    {% if not widget.required %}
+    <p class="mb-1">
+        <label class="has-text-weight-normal">
             <input type="checkbox" name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}"{% if widget.attrs.disabled %} disabled{% endif %}>
             {{ widget.clear_checkbox_label }}
-    </label>{% endif %}
-</p>
-<p class="mb-1">
-{{ widget.input_text }}:
-{% else %}
-<p class="mb-1">
+        </label>
+    </p>
+    {% endif %}
+
 {% endif %}
-        <input type="{{ widget.type }}" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>
-        <span class="help file-cta is-hidden file-too-big">{% trans "File exceeds maximum size: 10MB" %}</span>
+
+<p class="mb-1">
+    {% if widget.is_initial %}
+        {{ widget.input_text }}:
+    {% endif %}
+
+    <input type="{{ widget.type }}" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>
+    <span class="help file-cta is-hidden file-too-big">
+        {% trans "File exceeds maximum size: 10MB" %}
+    </span>
 </p>
 

From 85a4c331ebf4c838e0f5083c92021f9d94f141e8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:48:26 -0700
Subject: [PATCH 160/272] Use search results template for isbn view

---
 bookwyrm/templates/isbn_search_results.html | 33 ---------------------
 bookwyrm/views/isbn.py                      | 10 +++++--
 2 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 bookwyrm/templates/isbn_search_results.html

diff --git a/bookwyrm/templates/isbn_search_results.html b/bookwyrm/templates/isbn_search_results.html
deleted file mode 100644
index a3861a68..00000000
--- a/bookwyrm/templates/isbn_search_results.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends 'layout.html' %}
-{% load i18n %}
-
-{% block title %}{% trans "Search Results" %}{% endblock %}
-
-{% block content %}
-{% with book_results|first as local_results %}
-<div class="block">
-    <h1 class="title">{% blocktrans %}Search Results for "{{ query }}"{% endblocktrans %}</h1>
-</div>
-
-<div class="block columns">
-    <div class="column">
-        <h2 class="title">{% trans "Matching Books" %}</h2>
-        <section class="block">
-            {% if not results %}
-            <p>{% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}</p>
-            {% else %}
-            <ul>
-            {% for result in results %}
-                <li class="pd-4">
-                    <a href="{{ result.key }}">{% include 'snippets/search_result_text.html' with result=result link=True %}</a>
-                </li>
-            {% endfor %}
-            </ul>
-            {% endif %}
-        </section>
-
-    <div class="column">
-    </div>
-</div>
-{% endwith %}
-{% endblock %}
diff --git a/bookwyrm/views/isbn.py b/bookwyrm/views/isbn.py
index 12208a3d..3055a354 100644
--- a/bookwyrm/views/isbn.py
+++ b/bookwyrm/views/isbn.py
@@ -1,9 +1,11 @@
 """ isbn search view """
+from django.core.paginator import Paginator
 from django.http import JsonResponse
 from django.template.response import TemplateResponse
 from django.views import View
 
 from bookwyrm.connectors import connector_manager
+from bookwyrm.settings import PAGE_LENGTH
 from .helpers import is_api_request
 
 # pylint: disable= no-self-use
@@ -17,8 +19,12 @@ class Isbn(View):
         if is_api_request(request):
             return JsonResponse([r.json() for r in book_results], safe=False)
 
+        paginated = Paginator(book_results, PAGE_LENGTH).get_page(
+            request.GET.get("page")
+        )
         data = {
-            "results": book_results,
+            "results": [{"results": paginated}],
             "query": isbn,
+            "type": "book",
         }
-        return TemplateResponse(request, "isbn_search_results.html", data)
+        return TemplateResponse(request, "search/book.html", data)

From ec10ebbe681f2f9f90c1d97735e812edef757ac7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:49:35 -0700
Subject: [PATCH 161/272] Fixes quote type

---
 bookwyrm/templates/settings/server_blocklist.html   | 2 +-
 bookwyrm/templates/snippets/search_result_text.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/settings/server_blocklist.html b/bookwyrm/templates/settings/server_blocklist.html
index 171cf133..49334982 100644
--- a/bookwyrm/templates/settings/server_blocklist.html
+++ b/bookwyrm/templates/settings/server_blocklist.html
@@ -47,7 +47,7 @@
     <div class="field">
         <label class="label" for="id_file">JSON data:</label>
         <aside class="help">
-            Expects a json file in the format provided by <a href="https://fediblock.org/" target="_blank" rel=”noopener”>FediBlock</a>, with a list of entries that have <code>instance</code> and <code>url</code> fields. For example:
+            Expects a json file in the format provided by <a href="https://fediblock.org/" target="_blank" rel="noopener">FediBlock</a>, with a list of entries that have <code>instance</code> and <code>url</code> fields. For example:
             <pre>
 [
     {
diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index a18b125f..40fa5a3d 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -10,7 +10,7 @@
                 <a
                     href="{{ result.view_link|default:result.key }}"
                     {% if remote_result %}
-                        rel=”noopener”
+                        rel="noopener"
                         target="_blank"
                     {% endif %}
                 >{{ result.title }}</a>

From 24d15133201691ac140e6cf2fd38de7a5a0e2ea5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:49:50 -0700
Subject: [PATCH 162/272] Removes stray close tag in announcements

---
 bookwyrm/templates/settings/announcements.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html
index a0b363e6..18e76531 100644
--- a/bookwyrm/templates/settings/announcements.html
+++ b/bookwyrm/templates/settings/announcements.html
@@ -7,7 +7,6 @@
 {% block edit-button %}
 {% trans "Create Announcement" as button_text %}
 {% include 'snippets/toggle/open_button.html' with controls_text="create_announcement" icon_with_text="plus" text=button_text focus="create_announcement_header" %}
-</a>
 {% endblock %}
 
 {% block panel %}

From e7ee4a45fa0f2012df99ebb1e471bd36ca32f711 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:50:27 -0700
Subject: [PATCH 163/272] adds missing button close tag in shelve button
 options

---
 .../snippets/shelve_button/shelve_button_options.html         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 41e0c9ba..5cce1477 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -13,7 +13,9 @@
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
-    <button type="button" class="button {{ class }}" disabled><span>{% trans "Read" %}</span>
+    <button type="button" class="button {{ class }}" disabled>
+        <span>{% trans "Read" %}</span>
+    </button>
     {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
 
         {% trans "Finish reading" as button_text %}

From f48cea3ed906efd08afe4d6b11b5a8b5529c7e02 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:50:49 -0700
Subject: [PATCH 164/272] Fixes endquote outside of if statement

---
 bookwyrm/templates/snippets/trimmed_text.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index d2e8bc30..e0227a44 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -25,7 +25,7 @@
                         <div class="content">
                             <div
                                 dir="auto"
-                                {% if itemprop %}itemprop="{{ itemprop }}{% endif %}"
+                                {% if itemprop %}itemprop="{{ itemprop }}"{% endif %}
                             >
                                 {{ full }}
                             </div>
@@ -41,7 +41,7 @@
                     <div class="content">
                         <div
                             dir="auto"
-                            {% if itemprop %}itemprop="{{ itemprop }}{% endif %}"
+                            {% if itemprop %}itemprop="{{ itemprop }}"{% endif %}
                         >
                             {{ full }}
                         </div>

From 821d0f49e218a8a36f802aee863fa06d20e4955f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:51:07 -0700
Subject: [PATCH 165/272] Wraps entire div block in spaceless tag

---
 bookwyrm/templates/user/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 41d52812..8ca3bd18 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -31,8 +31,8 @@
         {% spaceless %}
         <div class="column box has-background-white-bis content preserve-whitespace">
             {{ user.summary|to_markdown|safe }}
-        {% endspaceless %}
         </div>
+        {% endspaceless %}
         {% endif %}
     </div>
     {% if not is_self and request.user.is_authenticated %}

From 81d51d0634c8cd6737fa356e4e77c2f3113540c9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 10:53:18 -0700
Subject: [PATCH 166/272] Removes nonfunctional test linter

---
 .github/workflows/accessibility.yml | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 .github/workflows/accessibility.yml

diff --git a/.github/workflows/accessibility.yml b/.github/workflows/accessibility.yml
deleted file mode 100644
index 5c5c0921..00000000
--- a/.github/workflows/accessibility.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Accessibility Validation
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Scan for accessibility issues
-	uses: microsoft/accessibility-insights-action@v2
-	with:
-	  repo-token: ${{ secrets.GITHUB_TOKEN }}
-	  site-dir: ${{ github.workspace }}/bookwyrm/templates
-	  scan-url-relative-path: / # use // if windows agen
-
-      - name: Upload report artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: accessibility-reports
-          path: ${{ github.workspace }}/_accessibility-reports

From a235811524988a75c520d09fc279c38d40107b54 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 11:04:26 -0700
Subject: [PATCH 167/272] Fixes quote style on author page

---
 bookwyrm/templates/author/author.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 1c409d06..77c7b901 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -57,7 +57,7 @@
 
             {% if author.wikipedia_link %}
             <p class="my-1">
-                <a itemprop="sameAs" href="{{ author.wikipedia_link }}" rel=”noopener” target="_blank">
+                <a itemprop="sameAs" href="{{ author.wikipedia_link }}" rel="noopener" target="_blank">
                     {% trans "Wikipedia" %}
                 </a>
             </p>

From 270571668df98d9cab5e4a9a35cc73b8c41412bd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 11:05:38 -0700
Subject: [PATCH 168/272] adds space between attributes on book page

---
 bookwyrm/templates/book/book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 28655fa6..e504041b 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -134,7 +134,7 @@
                     <form name="add-description" method="POST" action="/add-description/{{ book.id }}">
                         {% csrf_token %}
                         <p class="fields is-grouped">
-                            <label class="label"for="id_description_{{ book.id }}">{% trans "Description:" %}</label>
+                            <label class="label" for="id_description_{{ book.id }}">{% trans "Description:" %}</label>
                             <textarea name="description" cols="None" rows="None" class="textarea" id="id_description_{{ book.id }}"></textarea>
                         </p>
                         <div class="field">

From e31783ef6e7edabb79ce91e2dc376779eeade48b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 11:06:27 -0700
Subject: [PATCH 169/272] Cleans up html on import status page

---
 bookwyrm/templates/email/preview.html |  2 +-
 bookwyrm/templates/import_status.html | 45 +++++++++++++--------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/templates/email/preview.html b/bookwyrm/templates/email/preview.html
index 66d856c0..ab432305 100644
--- a/bookwyrm/templates/email/preview.html
+++ b/bookwyrm/templates/email/preview.html
@@ -1,4 +1,4 @@
-<html>
+<html lang="{% get_lang %}">
 <body>
     <div>
         <strong>Subject:</strong> {% include subject_path %}
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index 19dcb431..db7330bb 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -20,10 +20,10 @@
             <dt class="has-text-weight-medium">{% trans "Import completed:" %}</dt>
             <dd class="ml-2">{{ task.date_done | naturaltime }}</dd>
         </div>
+        {% elif task.failed %}
+        <div class="notification is-danger">{% trans "TASK FAILED" %}</div>
+        {% endif %}
     </dl>
-    {% elif task.failed %}
-    <div class="notification is-danger">{% trans "TASK FAILED" %}</div>
-    {% endif %}
 </div>
 
 <div class="block">
@@ -84,26 +84,26 @@
 
             <button class="button is-block mt-3" type="submit">{% trans "Retry items" %}</button>
         </fieldset>
-
-        <hr>
-
-        {% else %}
-        <ul>
-            {% for item in failed_items %}
-            <li class="pb-1">
-                <p>
-                    Line {{ item.index }}:
-                    <strong>{{ item.data.Title }}</strong> by
-                    {{ item.data.Author }}
-                </p>
-                <p>
-                    {{ item.fail_reason }}.
-                </p>
-            </li>
-            {% endfor %}
-        </ul>
-        {% endif %}
     </form>
+
+    <hr>
+
+    {% else %}
+    <ul>
+        {% for item in failed_items %}
+        <li class="pb-1">
+            <p>
+                Line {{ item.index }}:
+                <strong>{{ item.data.Title }}</strong> by
+                {{ item.data.Author }}
+            </p>
+            <p>
+                {{ item.fail_reason }}.
+            </p>
+        </li>
+        {% endfor %}
+    </ul>
+    {% endif %}
 </div>
 {% endif %}
 
@@ -153,7 +153,6 @@
         {% endfor %}
     </table>
 </div>
-</div>
 {% endspaceless %}{% endblock %}
 
 {% block scripts %}

From 6f8ca302e522298778f460fdea750b90ec0d446b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 11:38:57 -0700
Subject: [PATCH 170/272] Clearer form logic in edit book page

---
 bookwyrm/templates/book/edit_book.html | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index ee6cdcad..2f6ca324 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -42,11 +42,18 @@
 </div>
 {% endif %}
 
-{% if book %}
-<form class="block" name="edit-book" action="{{ book.local_path }}/{% if confirm_mode %}confirm{% else %}edit{% endif %}" method="post" enctype="multipart/form-data">
-{% else %}
-<form class="block" name="create-book" action="/create-book{% if confirm_mode %}/confirm{% endif %}" method="post" enctype="multipart/form-data">
-{% endif %}
+<form
+    class="block"
+    {% if book %}
+        name="edit-book"
+        action="{{ book.local_path }}/{% if confirm_mode %}confirm{% else %}edit{% endif %}"
+    {% else %}
+        name="create-book"
+        action="/create-book{% if confirm_mode %}/confirm{% endif %}"
+    {% endif %}
+    method="post"
+    enctype="multipart/form-data"
+>
 
     {% csrf_token %}
     {% if confirm_mode %}

From 0a8a4f0ee43cd203b54c47f2a814cca0d85e7c19 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 11:39:21 -0700
Subject: [PATCH 171/272] Adds curlylint workflow

---
 .github/workflows/curlylint.yaml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .github/workflows/curlylint.yaml

diff --git a/.github/workflows/curlylint.yaml b/.github/workflows/curlylint.yaml
new file mode 100644
index 00000000..bafa61b8
--- /dev/null
+++ b/.github/workflows/curlylint.yaml
@@ -0,0 +1,28 @@
+name: Templates validator
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install curlylint
+        run: pip install curlylint
+
+      - name: Run linter
+        run: >
+          curlylint --rule 'aria_role: true' \
+           --rule 'django_forms_rendering: true' \
+           --rule 'html_has_lang: true' \
+           --rule 'image_alt: true' \
+           --rule 'meta_viewport: true' \
+           --rule 'no_autofocus: true' \
+           --rule 'tabindex_no_positive: true' \
+           --exclude '_modal.html|create_status/layout.html' \
+          bookwyrm/templates

From a70b0e8712e59fd6bd4b69e7b45aee9b763dc17c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 11:45:36 -0700
Subject: [PATCH 172/272] Spacing for curly lint action

---
 .github/workflows/curlylint.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/curlylint.yaml b/.github/workflows/curlylint.yaml
index bafa61b8..e27d0b1b 100644
--- a/.github/workflows/curlylint.yaml
+++ b/.github/workflows/curlylint.yaml
@@ -18,11 +18,11 @@ jobs:
       - name: Run linter
         run: >
           curlylint --rule 'aria_role: true' \
-           --rule 'django_forms_rendering: true' \
-           --rule 'html_has_lang: true' \
-           --rule 'image_alt: true' \
-           --rule 'meta_viewport: true' \
-           --rule 'no_autofocus: true' \
-           --rule 'tabindex_no_positive: true' \
-           --exclude '_modal.html|create_status/layout.html' \
-          bookwyrm/templates
+            --rule 'django_forms_rendering: true' \
+            --rule 'html_has_lang: true' \
+            --rule 'image_alt: true' \
+            --rule 'meta_viewport: true' \
+            --rule 'no_autofocus: true' \
+            --rule 'tabindex_no_positive: true' \
+            --exclude '_modal.html|create_status/layout.html' \
+            bookwyrm/templates

From 3f8eefd694de7e640c130b62dfacb7e6a5f24d66 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 11:49:57 -0700
Subject: [PATCH 173/272] Fixes want to read status header

jankily, mind you
---
 bookwyrm/templatetags/status_display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
index e43c0f94..c92b1877 100644
--- a/bookwyrm/templatetags/status_display.py
+++ b/bookwyrm/templatetags/status_display.py
@@ -71,7 +71,7 @@ def get_header_template(status):
     if isinstance(status, models.Boost):
         status = status.boosted_status
     try:
-        header_type = status.reading_status
+        header_type = status.reading_status.replace("-", "_")
         if not header_type:
             raise AttributeError()
     except AttributeError:

From 7345705b08179ad6a3a02a6135af314b756ea48f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 21 Aug 2021 20:21:39 -0700
Subject: [PATCH 174/272] Small efficiency improvement in list view

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

diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 6e872434..36175937 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -116,7 +116,7 @@ class List(View):
         if direction == "descending":
             directional_sort_by = "-" + directional_sort_by
 
-        items = book_list.listitem_set
+        items = book_list.listitem_set.prefetch_related("user", "book", "book__authors")
         if sort_by == "rating":
             items = items.annotate(
                 average_rating=Avg(

From f284eebecef2b3a98b54a4f4374f4a44f0fd8034 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 07:04:59 -0700
Subject: [PATCH 175/272] Fixes boosts removing statuses from feeds

---
 bookwyrm/activitystreams.py | 5 +++--
 bookwyrm/redis_store.py     | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 0a90c9f4..4b9f6a60 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -273,9 +273,10 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
         created_date__lt=instance.created_date,
     )
     for stream in streams.values():
-        stream.remove_object_from_related_stores(boosted)
+        audience = streams.get_stores_for_object(instance)
+        stream.remove_object_from_related_stores(boosted, stores=audience)
         for status in old_versions:
-            stream.remove_object_from_related_stores(status)
+            stream.remove_object_from_related_stores(status, stores=audience)
 
 
 @receiver(signals.post_delete, sender=models.Boost)
diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py
index fa5c73a5..edba5ae6 100644
--- a/bookwyrm/redis_store.py
+++ b/bookwyrm/redis_store.py
@@ -33,8 +33,9 @@ class RedisStore(ABC):
         # and go!
         return pipeline.execute()
 
-    def remove_object_from_related_stores(self, obj):
+    def remove_object_from_related_stores(self, obj, stores=None):
         """remove an object from all stores"""
+        stores = stores or self.get_stores_for_object(obj)
         pipeline = r.pipeline()
         for store in self.get_stores_for_object(obj):
             pipeline.zrem(store, -1, obj.id)

From 9c21f4d8e673caacda26a2b5e1be3415c90c14b3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 10:36:23 -0700
Subject: [PATCH 176/272] Adds tests for boosts in activitystreams

---
 bookwyrm/activitystreams.py            |  2 +-
 bookwyrm/tests/test_activitystreams.py | 64 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 4b9f6a60..0e07905b 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -273,7 +273,7 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
         created_date__lt=instance.created_date,
     )
     for stream in streams.values():
-        audience = streams.get_stores_for_object(instance)
+        audience = stream.get_stores_for_object(instance)
         stream.remove_object_from_related_stores(boosted, stores=audience)
         for status in old_versions:
             stream.remove_object_from_related_stores(status, stores=audience)
diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index ac57d8b3..1041b889 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -286,3 +286,67 @@ class Activitystreams(TestCase):
         # yes book, yes audience
         result = activitystreams.BooksStream().get_statuses_for_user(self.local_user)
         self.assertEqual(list(result), [status])
+
+    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
+    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
+    def test_boost_to_another_timeline(self, *_):
+        """add a boost and deduplicate the boosted status on the timeline"""
+        status = models.Status.objects.create(user=self.local_user, content="hi")
+        boost = models.Boost.objects.create(
+            boosted_status=status,
+            user=self.another_user,
+        )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ) as mock:
+            activitystreams.add_status_on_create(models.Boost, boost, True)
+        self.assertTrue(mock.called)
+        call_args = mock.call_args
+        self.assertEqual(call_args[0][0], status)
+        self.assertEqual(
+            call_args[1]["stores"], ["{:d}-home".format(self.another_user.id)]
+        )
+
+    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
+    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
+    def test_boost_to_following_timeline(self, *_):
+        """add a boost and deduplicate the boosted status on the timeline"""
+        self.local_user.following.add(self.another_user)
+        status = models.Status.objects.create(user=self.local_user, content="hi")
+        boost = models.Boost.objects.create(
+            boosted_status=status,
+            user=self.another_user,
+        )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ) as mock:
+            activitystreams.add_status_on_create(models.Boost, boost, True)
+        self.assertTrue(mock.called)
+        call_args = mock.call_args
+        self.assertEqual(call_args[0][0], status)
+        self.assertTrue(
+            "{:d}-home".format(self.another_user.id) in call_args[1]["stores"]
+        )
+        self.assertTrue(
+            "{:d}-home".format(self.local_user.id) in call_args[1]["stores"]
+        )
+
+    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
+    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
+    def test_boost_to_same_timeline(self, *_):
+        """add a boost and deduplicate the boosted status on the timeline"""
+        status = models.Status.objects.create(user=self.local_user, content="hi")
+        boost = models.Boost.objects.create(
+            boosted_status=status,
+            user=self.local_user,
+        )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ) as mock:
+            activitystreams.add_status_on_create(models.Boost, boost, True)
+        self.assertTrue(mock.called)
+        call_args = mock.call_args
+        self.assertEqual(call_args[0][0], status)
+        self.assertEqual(
+            call_args[1]["stores"], ["{:d}-home".format(self.local_user.id)]
+        )

From 16235d1d904f0fcba22da09fc80c6c9884e83104 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 10:48:23 -0700
Subject: [PATCH 177/272] Actually use provided stoers list

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

diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py
index edba5ae6..521e73b2 100644
--- a/bookwyrm/redis_store.py
+++ b/bookwyrm/redis_store.py
@@ -37,7 +37,7 @@ class RedisStore(ABC):
         """remove an object from all stores"""
         stores = stores or self.get_stores_for_object(obj)
         pipeline = r.pipeline()
-        for store in self.get_stores_for_object(obj):
+        for store in stores:
             pipeline.zrem(store, -1, obj.id)
         pipeline.execute()
 

From eca0ff371cb1596bfa6cb491b253c8e9e693d5bc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 11:19:15 -0700
Subject: [PATCH 178/272] Adds saved lists many to many field

---
 bookwyrm/migrations/0085_user_saved_lists.py | 20 ++++++++++++++++++++
 bookwyrm/models/user.py                      |  3 +++
 2 files changed, 23 insertions(+)
 create mode 100644 bookwyrm/migrations/0085_user_saved_lists.py

diff --git a/bookwyrm/migrations/0085_user_saved_lists.py b/bookwyrm/migrations/0085_user_saved_lists.py
new file mode 100644
index 00000000..d4d9278c
--- /dev/null
+++ b/bookwyrm/migrations/0085_user_saved_lists.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.2.4 on 2021-08-23 18:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0084_auto_20210817_1916"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="saved_lists",
+            field=models.ManyToManyField(
+                related_name="saved_lists", to="bookwyrm.List"
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index e10bcd29..0ef23d3f 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -104,6 +104,9 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         through_fields=("user_subject", "user_object"),
         related_name="blocked_by",
     )
+    saved_lists = models.ManyToManyField(
+        "List", symmetrical=False, related_name="saved_lists"
+    )
     favorites = models.ManyToManyField(
         "Status",
         symmetrical=False,

From 457415f87488387009c1a1db98ec6b4c554c221f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 11:19:31 -0700
Subject: [PATCH 179/272] Adds bookmark icon

---
 bookwyrm/static/css/fonts/icomoon.eot  | Bin 10112 -> 10012 bytes
 bookwyrm/static/css/fonts/icomoon.svg  |   9 +-
 bookwyrm/static/css/fonts/icomoon.ttf  | Bin 9948 -> 9848 bytes
 bookwyrm/static/css/fonts/icomoon.woff | Bin 10024 -> 9924 bytes
 bookwyrm/static/css/vendor/icons.css   | 128 ++++++++++++-------------
 5 files changed, 65 insertions(+), 72 deletions(-)

diff --git a/bookwyrm/static/css/fonts/icomoon.eot b/bookwyrm/static/css/fonts/icomoon.eot
index 566fb13df682e828cf27f9ccbc1bc52e48e065e2..2c801b2b6993e16343c4b9a3d0e8dd505819653f 100644
GIT binary patch
delta 501
zcmZqhpX0|Wqt3ukF_G1r<^Q_}c@rJV>zNrC81?{hLUL|m!7JY7HVh1mGC+PwdSY<_
zkQM;)Cje=V^qk7Hm;22g0{Jr-7!>zpq$Z}w{wm00U{DSL%9~{X1vt1_Oo03zAYUaT
zx1?f5JI6mDe*=)eA}2pNam~JkTYyp#Kz>+mVnqRiu^to9G8K>lg}lVv)R|tKzk&P<
zKug*R@{3CtK+a=O18GoTU}io)Ifb#>6~q$)I*gftiGh(p;idFTg_mtFZ@uFB|M&lY
zkb0mP!%JD9*mbBF<NwFvEaJ>!^Thnb<bnDa85lOpFntuO2QnCVnQk-ZF(?DAG!he+
zV-yt>VPofGR8~^cXN1t|dW@!mCT8Y#jK+#gGue6AgvG>!*?8D_CAj|l;gaBE<AsRu
zvN44-=P@&JC<y<R7gpe4V&dfd^of%TEW-2<Bm(jdGeZeO0&@@3Zw8*p6_Ul9)1`iL
z%H%zG_dlNB<|_j?3&;ZucRi>6h0&91RLmK*CT~%x;9$DVzyMTGGTA~kU49w&6P_|&
g0p2qH2L4w9QUY!QDFQ15?g6!dyrs2ypXwn-05_3-X#fBK

delta 576
zcmbQ^*Wl0Epw7T>XCkXP%iK!Q7ZV-I>v<R$81?{hLUL|m!Q~%UxEUB2Wq|yg^u*!<
zAT0pocK~UQ^qk7HLt&xsfcyyz3`!~)sfj7lPtVveFeq;U%9~{X1vt1_Oo9A2K)y;w
zZb`-5HC%Q;CeRFqH97goiK`}T1nO4-*%y(USW&=WqQ?ZZOjQIZppciCn>y2r^EZ%h
z0<@&9AiubTff*>npa#;Qz`)FWV{!^(HGcq*Cjf*XIYtJB$sZU+CEH$Jf5r9x@BjY{
zjQ<~tvxv<X^A`i^U|`&=!t_xrj+tQrLj$t{PzO5$KZ7_>pE^IIJfl4$Gn9t$nXap=
zdwK$KCzSqo-rj!VL?C9Gk&z)G0mT1c3`T(s8w?D9cyhaBL;V5<1?B|i1O{%P%hZ5=
zP!u#4G#3XFB5cg;K#EaRM9i8|P+3XMRM5oCSkXvKTv3UQS>YeUgTnj<wUdDh{xJyi
zDkw;)sYx+82+4B%?c^0!U^?*cPFNVD%HIYlH6|GcMwWkn7*!N_h5tGLRUMF06XFvF
zhlA&4E~#&vGA~3c=f?Bfd}ZKf0R|2*s_mVh!05>`D&~yZlS5Q0cz}`%fVc!iPrjm(
qE<cC+7LNqaDqa`fRs357<OKW#ssv^T+z}K41~3DI_U0(nLyQ1Si;c|y

diff --git a/bookwyrm/static/css/fonts/icomoon.svg b/bookwyrm/static/css/fonts/icomoon.svg
index 6be97327..6327b19e 100644
--- a/bookwyrm/static/css/fonts/icomoon.svg
+++ b/bookwyrm/static/css/fonts/icomoon.svg
@@ -33,13 +33,12 @@
 <glyph unicode="&#xe917;" glyph-name="dots-three" d="M512.051 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64zM153.651 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.483 112.589 112.64s-50.381 112.64-112.589 112.64zM870.451 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64z" />
 <glyph unicode="&#xe918;" glyph-name="check" d="M424.653 102.502c-22.272 0-43.366 10.394-56.883 28.314l-182.938 241.715c-23.808 31.386-17.613 76.083 13.824 99.891 31.488 23.91 76.186 17.613 99.994-13.824l120.371-158.925 302.643 485.99c20.838 33.382 64.87 43.622 98.355 22.784 33.434-20.787 43.725-64.819 22.835-98.304l-357.581-573.952c-12.39-20.019-33.843-32.512-57.344-33.587-1.126-0.102-2.15-0.102-3.277-0.102z" />
 <glyph unicode="&#xe919;" glyph-name="dots-three-vertical" d="M512.051 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64zM512.051 706.56c62.208 0 112.589 50.483 112.589 112.64s-50.381 112.64-112.589 112.64c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64zM512.051 215.040c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64z" />
-<glyph unicode="&#xe91a;" glyph-name="stars" d="M726.857 664.381l-38.857 103.619-38.857-103.619-73.143-24.381 73.143-24.381 38.857-103.619 38.857 103.619 73.143 24.381-73.143 24.381zM662.857 280.381l-38.857 103.619-38.857-103.619-73.143-24.381 73.143-24.381 38.857-103.619 38.857 103.619 73.143 24.381-73.143 24.381zM430.703 528.432l-62.703 175.568-62.703-175.568-145.297-48.432 145.297-48.432 62.703-175.568 62.703 175.568 145.297 48.432-145.297 48.432z" />
+<glyph unicode="&#xe91a;" glyph-name="bookmark" horiz-adv-x="731" d="M665.143 877.714c8.571 0 17.143-1.714 25.143-5.143 25.143-9.714 41.143-33.143 41.143-58.857v-736.571c0-25.714-16-49.143-41.143-58.857-8-3.429-16.571-4.571-25.143-4.571-17.714 0-34.286 6.286-47.429 18.286l-252 242.286-252-242.286c-13.143-12-29.714-18.857-47.429-18.857-8.571 0-17.143 1.714-25.143 5.143-25.143 9.714-41.143 33.143-41.143 58.857v736.571c0 25.714 16 49.143 41.143 58.857 8 3.429 16.571 5.143 25.143 5.143h598.857z" />
 <glyph unicode="&#xe91b;" glyph-name="warning" d="M907.5 204.9l-345.1 558.4c-27.8 44.9-73 45-100.8 0v0l-345.1-558.4c-37.3-60.3-10.2-108.9 60.4-108.9h670.2c70.5 0 97.6 48.7 60.4 108.9zM512 192c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zM544 351.9c0-17.4-14.3-31.9-32-31.9-17.8 0-32 14.3-32 31.9v192.2c0 17.4 14.3 31.9 32 31.9v0c17.8 0 32-14.3 32-31.9v-192.2z" />
-<glyph unicode="&#xe91c;" glyph-name="bookmark" d="M800 32h-512v704h224v-292l113.312 86.016 110.688-86.016v292h128v-640c0-35.328-28.672-64-64-64zM625.312 572l-81.312-64v260h160v-260l-78.688 64zM192 800v-32c0-17.664 14.336-32 32-32h32v-704h-32c-35.328 0-64 28.672-64 64v704c0 35.328 28.672 64 64 64h576c23.616 0 44.032-12.928 55.136-32h-631.136c-17.664 0-32-14.304-32-32z" />
 <glyph unicode="&#xe91d;" glyph-name="rss" horiz-adv-x="805" d="M219.429 182.857c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM512 112.571c0.571-10.286-2.857-20-9.714-27.429-6.857-8-16.571-12-26.857-12h-77.143c-18.857 0-34.286 14.286-36 33.143-16.571 174.286-154.857 312.571-329.143 329.143-18.857 1.714-33.143 17.143-33.143 36v77.143c0 10.286 4 20 12 26.857 6.286 6.286 15.429 9.714 24.571 9.714h2.857c121.714-9.714 236.571-62.857 322.857-149.714 86.857-86.286 140-201.143 149.714-322.857zM804.571 111.428c0.571-9.714-2.857-19.429-10.286-26.857-6.857-7.429-16-11.429-26.286-11.429h-81.714c-19.429 0-35.429 14.857-36.571 34.286-18.857 332-283.429 596.571-615.429 616-19.429 1.143-34.286 17.143-34.286 36v81.714c0 10.286 4 19.429 11.429 26.286 6.857 6.857 16 10.286 25.143 10.286h1.714c200-10.286 388-94.286 529.714-236.571 142.286-141.714 226.286-329.714 236.571-529.714z" />
-<glyph unicode="&#xe91e;" glyph-name="heart1" d="M934.176 791.52c-116.128 115.072-301.824 117.472-422.112 9.216-120.32 108.256-305.952 105.856-422.144-9.216-119.712-118.528-119.712-310.688 0-429.28 34.208-33.888 353.696-350.112 353.696-350.112 37.856-37.504 99.072-37.504 136.896 0 0 0 349.824 346.304 353.696 350.112 119.744 118.592 119.744 310.752-0.032 429.28zM888.576 407.424l-353.696-350.112c-12.576-12.512-33.088-12.512-45.6 0l-353.696 350.112c-94.4 93.44-94.4 245.472 0 338.912 91.008 90.080 237.312 93.248 333.088 7.104l43.392-39.040 43.36 39.040c95.808 86.144 242.112 83.008 333.12-7.104 94.4-93.408 94.4-245.44 0.032-338.912zM296.096 719.968c8.864 0 16-7.168 16-16s-7.168-16-16-16h-0.032c-57.408 0-103.968-46.56-103.968-103.968v-0.032c0-8.832-7.168-16-16-16s-16 7.168-16 16v0c0 75.072 60.832 135.904 135.872 135.968 0.064 0 0.064 0.032 0.128 0.032z" />
-<glyph unicode="&#xe91f;" glyph-name="paperplane" d="M1009.376 954.88c-5.312 3.424-11.36 5.12-17.376 5.12-6.176 0-12.384-1.76-17.76-5.376l-960-640c-9.888-6.56-15.328-18.112-14.048-29.952 1.216-11.808 8.896-22.016 19.936-26.368l250.368-100.192 117.728-206.016c5.632-9.888 16.096-16 27.424-16.128 0.128 0 0.224 0 0.352 0 11.232 0 21.664 5.952 27.424 15.552l66.464 110.816 310.24-124.064c3.808-1.536 7.808-2.272 11.872-2.272 5.44 0 10.816 1.376 15.68 4.128 8.448 4.736 14.24 13.056 15.872 22.624l160 960c2.080 12.576-3.488 25.184-14.176 32.128zM100.352 295.136l741.6 494.432-539.2-577.184c-2.848 1.696-5.376 3.936-8.512 5.184l-193.888 77.568zM326.048 189.888c-0.064 0.128-0.16 0.192-0.224 0.32l606.176 648.8-516.768-805.184-89.184 156.064zM806.944 12.512l-273.312 109.312c-6.496 2.56-13.248 3.424-19.936 3.808l420.864 652.416-127.616-765.536z" />
-<glyph unicode="&#xe920;" glyph-name="banknote" d="M1005.28 621.248l-320 320c-15.872 15.872-38.88 22.24-60.672 16.864-11.488-2.816-21.76-8.736-29.888-16.864-7.264-7.264-12.736-16.256-15.872-26.304-14.496-47.008-39.552-87.872-76.64-124.928-49.536-49.504-114.048-87.008-182.304-126.656-72.448-41.984-147.296-85.504-208.64-146.816-52.128-52.192-87.616-110.24-108.416-177.632-7.008-22.752-0.896-47.36 15.872-64.192l320-320c15.872-15.872 38.88-22.24 60.672-16.864 11.488 2.88 21.76 8.736 29.888 16.864 7.264 7.264 12.736 16.256 15.872 26.368 14.528 47.008 39.584 87.872 76.704 124.928 49.504 49.504 113.984 86.944 182.304 126.56 72.384 42.048 147.264 85.568 208.576 146.88 52.128 52.128 87.616 110.24 108.448 177.632 6.976 22.72 0.832 47.424-15.904 64.16zM384 0c-105.984 105.984-214.016 214.048-320 320 90.944 294.432 485.12 281.568 576 576 105.984-105.952 214.048-214.016 320.064-320-90.976-294.368-485.152-281.568-576.064-576zM625.984 483.2c-10.432 8.736-20.928 14.688-31.488 17.632-10.496 2.944-20.992 4.128-31.616 3.36-10.496-0.8-21.248-3.2-32-7.328-10.752-4.192-21.568-8.736-32.448-14.016-17.184 19.744-34.368 39.264-51.552 57.376 7.744 7.008 15.264 10.56 22.496 10.816 7.264 0.32 14.24-0.448 20.864-2.112 6.752-1.696 12.928-3.136 18.624-4.256 5.76-1.12 10.752 0.128 15.136 3.808 4.64 4 7.2 9.184 7.552 15.424 0.32 6.304-2.048 12.448-7.328 18.432-6.752 7.744-14.88 12.448-24.64 14.176-9.632 1.696-19.488 1.568-29.76-0.672-10.112-2.304-19.744-6.112-28.864-11.488s-16.448-10.88-21.888-16.256c-2.080 1.984-4.16 3.936-6.24 5.888-2.304 2.112-5.184 3.264-8.64 3.2-3.488 0-6.368-1.504-8.736-4.256-2.304-2.688-3.36-5.824-2.944-9.12 0.32-3.424 1.696-6.048 4.064-8.064 2.080-1.76 4.16-3.488 6.24-5.312-8.192-9.888-14.944-20.8-20.256-32.32-5.376-11.552-8.576-23.008-9.76-34.112-1.248-11.2-0.064-21.44 3.36-30.944 3.424-9.568 9.76-17.696 19.008-25.376 15.072-12.512 32.8-17.824 53.376-16.64 20.512 1.248 42.624 7.36 66.4 20.128 18.88-21.824 37.824-43.488 56.736-63.616-8-6.752-15.008-10.624-21.184-11.872-6.176-1.312-11.68-1.184-16.672 0.32-4.992 1.568-9.632 3.808-13.888 6.688-4.256 2.944-8.448 5.44-12.64 7.488-4.128 2.048-8.384 3.2-12.736 3.264s-8.992-2.048-14.112-6.432c-5.248-4.576-7.872-9.888-7.872-15.872 0-5.952 2.752-12 8.128-18.112 5.44-6.112 12.512-11.264 21.056-15.328s18.208-6.624 28.832-7.328c10.624-0.736 21.824 0.864 33.632 5.248 11.872 4.32 23.616 12.128 35.2 23.744 5.568-5.44 11.2-10.624 16.8-15.616 2.368-2.048 5.248-3.072 8.736-2.816 3.36 0.128 6.304 1.696 8.64 4.512 2.368 2.88 3.36 6.048 3.008 9.376-0.32 3.36-1.696 5.952-4 7.808-5.632 4.512-11.264 9.248-16.864 14.24 9.568 11.744 17.248 24.128 22.944 36.384 5.696 12.32 9.056 24.192 10.176 35.2 1.12 11.072-0.192 21.056-3.808 30.112-3.584 9.184-9.952 17.056-19.072 24.64zM447.072 461.504c-9.056-0.384-16.96 2.624-23.872 9.312-2.944 2.816-4.992 6.24-6.24 10.304-1.312 4.064-1.76 8.512-1.248 13.376 0.448 4.8 1.888 9.824 4.384 14.88 2.368 5.056 5.888 10.112 10.368 15.008 16.224-16.128 32.416-33.824 48.64-52.128-12.288-6.752-22.976-10.368-32.032-10.752zM598.016 397.44c-2.88-5.312-6.176-10.048-10.048-14.176-17.952 18.112-35.872 38.016-53.76 58.432 4.576 2.048 9.376 4.192 14.56 6.368s10.368 3.616 15.552 4.512c5.312 0.8 10.56 0.576 15.808-0.672 5.184-1.312 10.112-4.128 14.688-8.576 4.512-4.512 7.36-9.184 8.512-14.24 1.248-5.12 1.312-10.304 0.448-15.616-0.928-5.344-2.816-10.656-5.76-16.032zM470.944 250.24c6.304 5.088 15.584 4.832 21.376-1.056 6.272-6.24 6.272-16.448 0-22.688-0.512-0.512-1.056-0.864-1.632-1.312l0.064-0.064c-20.256-15.392-36.896-29.248-54.848-47.2-16.224-16.192-30.88-33.248-43.552-50.56l-20.448-28c-0.64-1.152-1.408-2.208-2.368-3.2-6.272-6.24-16.48-6.24-22.72 0-5.44 5.44-6.112 13.824-2.112 20.064l-0.064 0.064 21.888 29.888c13.664 18.688 29.376 36.992 46.752 54.368 18.080 18.144 37.6 34.336 57.6 49.696h0.064zM588.096 713.12c16.192 16.192 30.816 33.184 43.52 50.592l21.248 29.12c0.768 1.376 1.632 2.752 2.816 3.936 6.304 6.304 16.512 6.304 22.816 0 5.984-6.016 6.24-15.52 0.8-21.888l0.064-0.064-21.888-30.016c-13.696-18.688-29.376-36.928-46.752-54.304-18.080-18.080-37.568-34.336-57.568-49.696l-0.128 0.064c-6.368-5.856-16.256-5.728-22.368 0.448-6.304 6.304-6.304 16.576 0 22.88 1.12 1.184 2.432 2.016 3.744 2.752 18.816 14.368 36.96 29.44 53.696 46.176z" />
+<glyph unicode="&#xe91e;" glyph-name="graphic-heart" d="M934.176 791.52c-116.128 115.072-301.824 117.472-422.112 9.216-120.32 108.256-305.952 105.856-422.144-9.216-119.712-118.528-119.712-310.688 0-429.28 34.208-33.888 353.696-350.112 353.696-350.112 37.856-37.504 99.072-37.504 136.896 0 0 0 349.824 346.304 353.696 350.112 119.744 118.592 119.744 310.752-0.032 429.28zM888.576 407.424l-353.696-350.112c-12.576-12.512-33.088-12.512-45.6 0l-353.696 350.112c-94.4 93.44-94.4 245.472 0 338.912 91.008 90.080 237.312 93.248 333.088 7.104l43.392-39.040 43.36 39.040c95.808 86.144 242.112 83.008 333.12-7.104 94.4-93.408 94.4-245.44 0.032-338.912zM296.096 719.968c8.864 0 16-7.168 16-16s-7.168-16-16-16h-0.032c-57.408 0-103.968-46.56-103.968-103.968v-0.032c0-8.832-7.168-16-16-16s-16 7.168-16 16v0c0 75.072 60.832 135.904 135.872 135.968 0.064 0 0.064 0.032 0.128 0.032z" />
+<glyph unicode="&#xe91f;" glyph-name="graphic-paperplane" d="M1009.376 954.88c-5.312 3.424-11.36 5.12-17.376 5.12-6.176 0-12.384-1.76-17.76-5.376l-960-640c-9.888-6.56-15.328-18.112-14.048-29.952 1.216-11.808 8.896-22.016 19.936-26.368l250.368-100.192 117.728-206.016c5.632-9.888 16.096-16 27.424-16.128 0.128 0 0.224 0 0.352 0 11.232 0 21.664 5.952 27.424 15.552l66.464 110.816 310.24-124.064c3.808-1.536 7.808-2.272 11.872-2.272 5.44 0 10.816 1.376 15.68 4.128 8.448 4.736 14.24 13.056 15.872 22.624l160 960c2.080 12.576-3.488 25.184-14.176 32.128zM100.352 295.136l741.6 494.432-539.2-577.184c-2.848 1.696-5.376 3.936-8.512 5.184l-193.888 77.568zM326.048 189.888c-0.064 0.128-0.16 0.192-0.224 0.32l606.176 648.8-516.768-805.184-89.184 156.064zM806.944 12.512l-273.312 109.312c-6.496 2.56-13.248 3.424-19.936 3.808l420.864 652.416-127.616-765.536z" />
+<glyph unicode="&#xe920;" glyph-name="graphic-banknote" d="M1005.28 621.248l-320 320c-15.872 15.872-38.88 22.24-60.672 16.864-11.488-2.816-21.76-8.736-29.888-16.864-7.264-7.264-12.736-16.256-15.872-26.304-14.496-47.008-39.552-87.872-76.64-124.928-49.536-49.504-114.048-87.008-182.304-126.656-72.448-41.984-147.296-85.504-208.64-146.816-52.128-52.192-87.616-110.24-108.416-177.632-7.008-22.752-0.896-47.36 15.872-64.192l320-320c15.872-15.872 38.88-22.24 60.672-16.864 11.488 2.88 21.76 8.736 29.888 16.864 7.264 7.264 12.736 16.256 15.872 26.368 14.528 47.008 39.584 87.872 76.704 124.928 49.504 49.504 113.984 86.944 182.304 126.56 72.384 42.048 147.264 85.568 208.576 146.88 52.128 52.128 87.616 110.24 108.448 177.632 6.976 22.72 0.832 47.424-15.904 64.16zM384 0c-105.984 105.984-214.016 214.048-320 320 90.944 294.432 485.12 281.568 576 576 105.984-105.952 214.048-214.016 320.064-320-90.976-294.368-485.152-281.568-576.064-576zM625.984 483.2c-10.432 8.736-20.928 14.688-31.488 17.632-10.496 2.944-20.992 4.128-31.616 3.36-10.496-0.8-21.248-3.2-32-7.328-10.752-4.192-21.568-8.736-32.448-14.016-17.184 19.744-34.368 39.264-51.552 57.376 7.744 7.008 15.264 10.56 22.496 10.816 7.264 0.32 14.24-0.448 20.864-2.112 6.752-1.696 12.928-3.136 18.624-4.256 5.76-1.12 10.752 0.128 15.136 3.808 4.64 4 7.2 9.184 7.552 15.424 0.32 6.304-2.048 12.448-7.328 18.432-6.752 7.744-14.88 12.448-24.64 14.176-9.632 1.696-19.488 1.568-29.76-0.672-10.112-2.304-19.744-6.112-28.864-11.488s-16.448-10.88-21.888-16.256c-2.080 1.984-4.16 3.936-6.24 5.888-2.304 2.112-5.184 3.264-8.64 3.2-3.488 0-6.368-1.504-8.736-4.256-2.304-2.688-3.36-5.824-2.944-9.12 0.32-3.424 1.696-6.048 4.064-8.064 2.080-1.76 4.16-3.488 6.24-5.312-8.192-9.888-14.944-20.8-20.256-32.32-5.376-11.552-8.576-23.008-9.76-34.112-1.248-11.2-0.064-21.44 3.36-30.944 3.424-9.568 9.76-17.696 19.008-25.376 15.072-12.512 32.8-17.824 53.376-16.64 20.512 1.248 42.624 7.36 66.4 20.128 18.88-21.824 37.824-43.488 56.736-63.616-8-6.752-15.008-10.624-21.184-11.872-6.176-1.312-11.68-1.184-16.672 0.32-4.992 1.568-9.632 3.808-13.888 6.688-4.256 2.944-8.448 5.44-12.64 7.488-4.128 2.048-8.384 3.2-12.736 3.264s-8.992-2.048-14.112-6.432c-5.248-4.576-7.872-9.888-7.872-15.872 0-5.952 2.752-12 8.128-18.112 5.44-6.112 12.512-11.264 21.056-15.328s18.208-6.624 28.832-7.328c10.624-0.736 21.824 0.864 33.632 5.248 11.872 4.32 23.616 12.128 35.2 23.744 5.568-5.44 11.2-10.624 16.8-15.616 2.368-2.048 5.248-3.072 8.736-2.816 3.36 0.128 6.304 1.696 8.64 4.512 2.368 2.88 3.36 6.048 3.008 9.376-0.32 3.36-1.696 5.952-4 7.808-5.632 4.512-11.264 9.248-16.864 14.24 9.568 11.744 17.248 24.128 22.944 36.384 5.696 12.32 9.056 24.192 10.176 35.2 1.12 11.072-0.192 21.056-3.808 30.112-3.584 9.184-9.952 17.056-19.072 24.64zM447.072 461.504c-9.056-0.384-16.96 2.624-23.872 9.312-2.944 2.816-4.992 6.24-6.24 10.304-1.312 4.064-1.76 8.512-1.248 13.376 0.448 4.8 1.888 9.824 4.384 14.88 2.368 5.056 5.888 10.112 10.368 15.008 16.224-16.128 32.416-33.824 48.64-52.128-12.288-6.752-22.976-10.368-32.032-10.752zM598.016 397.44c-2.88-5.312-6.176-10.048-10.048-14.176-17.952 18.112-35.872 38.016-53.76 58.432 4.576 2.048 9.376 4.192 14.56 6.368s10.368 3.616 15.552 4.512c5.312 0.8 10.56 0.576 15.808-0.672 5.184-1.312 10.112-4.128 14.688-8.576 4.512-4.512 7.36-9.184 8.512-14.24 1.248-5.12 1.312-10.304 0.448-15.616-0.928-5.344-2.816-10.656-5.76-16.032zM470.944 250.24c6.304 5.088 15.584 4.832 21.376-1.056 6.272-6.24 6.272-16.448 0-22.688-0.512-0.512-1.056-0.864-1.632-1.312l0.064-0.064c-20.256-15.392-36.896-29.248-54.848-47.2-16.224-16.192-30.88-33.248-43.552-50.56l-20.448-28c-0.64-1.152-1.408-2.208-2.368-3.2-6.272-6.24-16.48-6.24-22.72 0-5.44 5.44-6.112 13.824-2.112 20.064l-0.064 0.064 21.888 29.888c13.664 18.688 29.376 36.992 46.752 54.368 18.080 18.144 37.6 34.336 57.6 49.696h0.064zM588.096 713.12c16.192 16.192 30.816 33.184 43.52 50.592l21.248 29.12c0.768 1.376 1.632 2.752 2.816 3.936 6.304 6.304 16.512 6.304 22.816 0 5.984-6.016 6.24-15.52 0.8-21.888l0.064-0.064-21.888-30.016c-13.696-18.688-29.376-36.928-46.752-54.304-18.080-18.080-37.568-34.336-57.568-49.696l-0.128 0.064c-6.368-5.856-16.256-5.728-22.368 0.448-6.304 6.304-6.304 16.576 0 22.88 1.12 1.184 2.432 2.016 3.744 2.752 18.816 14.368 36.96 29.44 53.696 46.176z" />
 <glyph unicode="&#xe986;" glyph-name="search" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256z" />
 <glyph unicode="&#xe9d7;" glyph-name="star-empty" d="M1024 562.95l-353.78 51.408-158.22 320.582-158.216-320.582-353.784-51.408 256-249.538-60.432-352.352 316.432 166.358 316.432-166.358-60.434 352.352 256.002 249.538zM512 206.502l-223.462-117.48 42.676 248.83-180.786 176.222 249.84 36.304 111.732 226.396 111.736-226.396 249.836-36.304-180.788-176.222 42.678-248.83-223.462 117.48z" />
 <glyph unicode="&#xe9d8;" glyph-name="star-half" d="M1024 562.95l-353.78 51.408-158.22 320.582-158.216-320.582-353.784-51.408 256-249.538-60.432-352.352 316.432 166.358 316.432-166.358-60.434 352.352 256.002 249.538zM512 206.502l-0.942-0.496 0.942 570.768 111.736-226.396 249.836-36.304-180.788-176.222 42.678-248.83-223.462 117.48z" />
diff --git a/bookwyrm/static/css/fonts/icomoon.ttf b/bookwyrm/static/css/fonts/icomoon.ttf
index 55df6418c496e1175501f1d825da253533fa970e..242ca7392024660f56d38ed4c663daf0daa2aeed 100644
GIT binary patch
delta 504
zcmccP`@^T6fsuiMft#U$ftkU;KUm+0Ux=L<D6$8L6OwZi3tsUqw_#vllmYTf(i4jd
zfV2RRKLJQ{q~}zoz1(m15Xhgwz@WG%BQ-Ha_E$k31A}r1P~I#9D8RwZVgls%0Qo8z
zxg`}d+ByCK`5S=z6*>9Ij)`mbE!+Z>ivS9Q<tA1XFc>odEmHw0P{>QnO`Yk*`5VZ;
z0JNm7AiuZ-=ujX~1F2VFU}io)@j$gRh$94a7c&DB&_4<<rC%z%Y<qd@71#g2|Nn!O
z1H~9#$^yl%L&X^XKNe>ZXBL|$<|if()W<mapqlXJPR0jf^`HRZWxCCr$Dj<f(@0EQ
zj!{%lgpHk#QCUe%pAkZ<>oJ-NnwXi}F&Zl}&1C0c6BZK_X5(S!mEijGhf9KwjTa)q
z%f=MWoX5<>p&<NMURZ&HiHVc*(<e?Yun5ybkO;^>%nT(A3CulAzZrNYUy&%@d|2`)
zr%c|1cmL!0ZN4&avw*z7aMyF{Ul=|4hO#-M)?@*d3J#{*3=BX8C6lM9q{}bke!^46
hE5KXE-@yM$KuW+(AVpw>z&)TgkhiopOQ{}W1OT0<eQ5vy

delta 607
zcmXv~KWq|l82x^Cq|gF#{ON&+`UB1*rh}xV?O+v*E*Q0%ro>6P)D{L1Oc|&Sy{WNV
z2}@0EWN{%KFm!YvZYCxUHK}PBOsa_(W8$D`q8vU9+~xh=@4fHK`|iHu8||Cx#E8gB
zI*AmWU$`*oaG7mzUIXc+yjI*l{$M3y0q9&tTP=bm=%-*yCbzcoCbjqjdW$HeWS6xE
zr@p+KBMR@KK9hxEv6`l#ze6k8e5t&%J9ZgYWYBJ|uyjSMZ@of*(jRy?ua%1w6EN(Y
z2bw?B^2^VzkN$y<VaP_Yuv)^0;!*qkoJ8?srS;^}Z3qc(zr=`lcxR(?_-(A$?e*ZG
zu|seU1`g{Tc}?;Qd0s{Uv8K*`%J)R7kuGv1n8`t2<U}0oEQ>R7z(Xw@L?X!~usLAk
zeLP;N0K#@Q>+=D|@WP}<BN_#&M?QVMMqEsbX>3~}6~7d8PB~}2I6Nbw8N|jt@<rwh
zhtz3jY-TDrDSLyV5s@48=}|#f-`=Si<hFC}S5?1|aGkbvH|=gNw2XEt#gwk@SA{@=
znT)?o;dXa7fv%Qcb)9hk-%GN&a`N|R;OqF>&V9$+FS44j7@~Ik>gOR>%i&ozQEi0F
zHWX_>sn6A@k~#m}dT8_6>h^2)x?@i|Bi)i7OWRW0>B7Q^CImlO`Y|L_HPzkRS6;Gz
D6GoSn

diff --git a/bookwyrm/static/css/fonts/icomoon.woff b/bookwyrm/static/css/fonts/icomoon.woff
index fa53e8cf907f2bb2da3fbf93124bd79a0d1639e8..67b0f0a693f8809a23ecb8560549312a767effa2 100644
GIT binary patch
delta 556
zcmZ4Ccf?nu+~3WOfsp|S)Q&K4gXxONg6iTEwMFWglXDXb7#J8cfWjpp{EBzEO?qN6
zNbC-f&jG~(={c2YK(Qwb42pX|_~m}HhZ(7fDGUtC3xI0OKv?!yL0$$>5GZy7$X5Yj
z4sI5cjNFn6px7TEe+3B7Xy^Eslb;M!=clp+C=dq1YxXVNlABlov{(hCPyvjMnPl=3
zb5j`@RAqpcw}J3XFV5cu`NcrTs)6)E)G-5D%*^K}^DtK1M*!JE3<3<y3`{^@E4-9`
zsqnJx<*ip-|Ns8~50nGydCBln7ASTdD#rN#u{eu3v)DW_KQZ~q2N*>+UuJwHR?i4j
z%FA?{IgddZXt9x)xE!OXpa>f~AEUC8nm!|hR@Y-R6*Mt3w_`L`WSYs&!zL^yCd|ge
z&MU$7=MR?z9~&=3gqMveoH>t~i9<p7ue`7V2NM$~=ciAcTwoEVhaeHKCxEe#z}&<1
zn}KJtf@JY#eyN|FGI<Z){g3Cj`O3h}0(Sph&#8Yw3=ln8Ma7&^YjTWA1qah@1_q#l
zlF1KL(lwWHKjA6k72qx7Z{U9=ASK`?kRq@`;2uyH$Xi-WQsAg%U|<5K1mVris!JIG
D_#T6A

delta 653
zcmX@&yTVVT+~3WOfsp|S)HN8mLA2VP$s5&#Cm&E_nW!yN&y$>+Sir!*m;sc@0pZI(
zu5hO(7K6mD0QnqHERdd4nFbWQ!@!`V0>X#FLf>ViCZ;ej0J#hdW*{v6^o&ggP!K3)
z0px=uR5-X<OfzyzDuB!wAb$-A&t1c1my@3iROhD(vLFJ4S54UXE;q3PXt8Pnkgov7
zCQLGUiMgpju?C>!Z6G|;i}QCuesKxVM<Bfrb<98(GxLqfJdD-00YJ6@5Q4-Q85CYB
zyli`U>lN4kzyJROMSwb9G5|%cLq!<>KNe>Zn=j@srU2BzxcLm@N3l3&h6M}_%nCpg
z*ctd4#DV6h^E1jb+A}gkX&9gBy1KfjClGf+>3`?#?I%tIVx}1x84?me{13)p6xguA
zzyOFR>q|D&FJMq$PGC*|#)$xf8qj}=g2sa8;y^-#jhP)tF^Y<aSu+YME2)_ZnwS|Y
z8i|Q3DzPyu{9|}fnBSmwGH}5^24P+W1t~Q(DJBOYS&qM*yuu1h2maj&3u9FI+aRUJ
zB;&xy^6w9$iUP0jUk9M715#>2e8S*x@!Y&g@*Ahj3(?BC@%%Pl8Ms-10mHy>$KLq~
zjGlZ%*_=^(@*m|29-!m`AT9yXlWSDcHRo{O;*sE4#p}YmihqlMoPeJ|mB0*vJAy*M
Y0B2y(W|9J@8wLg@P*U40uey{G0OE$6Qvd(}

diff --git a/bookwyrm/static/css/vendor/icons.css b/bookwyrm/static/css/vendor/icons.css
index c78af145..db783c24 100644
--- a/bookwyrm/static/css/vendor/icons.css
+++ b/bookwyrm/static/css/vendor/icons.css
@@ -1,156 +1,150 @@
-
-/** @todo Replace icons with SVG symbols.
-    @see https://www.youtube.com/watch?v=9xXBYcWgCHA */
 @font-face {
-    font-family: 'icomoon';
-    src:  url('../fonts/icomoon.eot?n5x55');
-    src:  url('../fonts/icomoon.eot?n5x55#iefix') format('embedded-opentype'),
-        url('../fonts/icomoon.ttf?n5x55') format('truetype'),
-        url('../fonts/icomoon.woff?n5x55') format('woff'),
-        url('../fonts/icomoon.svg?n5x55#icomoon') format('svg');
-    font-weight: normal;
-    font-style: normal;
-    font-display: block;
+  font-family: 'icomoon';
+  src:  url('../fonts/icomoon.eot?19nagi');
+  src:  url('../fonts/icomoon.eot?19nagi#iefix') format('embedded-opentype'),
+    url('../fonts/icomoon.ttf?19nagi') format('truetype'),
+    url('../fonts/icomoon.woff?19nagi') format('woff'),
+    url('../fonts/icomoon.svg?19nagi#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
 }
 
 [class^="icon-"], [class*=" icon-"] {
-    /* use !important to prevent issues with browser extensions that change fonts */
-    font-family: 'icomoon' !important;
-    speak: never;
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    text-transform: none;
-    line-height: 1;
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'icomoon' !important;
+  speak: never;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
 
-    /* Better Font Rendering =========== */
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 .icon-graphic-heart:before {
-    content: "\e91e";
+  content: "\e91e";
 }
 .icon-graphic-paperplane:before {
-    content: "\e91f";
+  content: "\e91f";
 }
 .icon-graphic-banknote:before {
-    content: "\e920";
-}
-.icon-stars:before {
-    content: "\e91a";
+  content: "\e920";
 }
 .icon-warning:before {
-    content: "\e91b";
+  content: "\e91b";
 }
 .icon-book:before {
-    content: "\e900";
+  content: "\e900";
 }
 .icon-bookmark:before {
-    content: "\e91c";
+  content: "\e91a";
 }
 .icon-rss:before {
-    content: "\e91d";
+  content: "\e91d";
 }
 .icon-envelope:before {
-    content: "\e901";
+  content: "\e901";
 }
 .icon-arrow-right:before {
-    content: "\e902";
+  content: "\e902";
 }
 .icon-bell:before {
-    content: "\e903";
+  content: "\e903";
 }
 .icon-x:before {
-    content: "\e904";
+  content: "\e904";
 }
 .icon-quote-close:before {
-    content: "\e905";
+  content: "\e905";
 }
 .icon-quote-open:before {
-    content: "\e906";
+  content: "\e906";
 }
 .icon-image:before {
-    content: "\e907";
+  content: "\e907";
 }
 .icon-pencil:before {
-    content: "\e908";
+  content: "\e908";
 }
 .icon-list:before {
-    content: "\e909";
+  content: "\e909";
 }
 .icon-unlock:before {
-    content: "\e90a";
+  content: "\e90a";
 }
 .icon-unlisted:before {
-    content: "\e90a";
+  content: "\e90a";
 }
 .icon-globe:before {
-    content: "\e90b";
+  content: "\e90b";
 }
 .icon-public:before {
-    content: "\e90b";
+  content: "\e90b";
 }
 .icon-lock:before {
-    content: "\e90c";
+  content: "\e90c";
 }
 .icon-followers:before {
-    content: "\e90c";
+  content: "\e90c";
 }
 .icon-chain-broken:before {
-    content: "\e90d";
+  content: "\e90d";
 }
 .icon-chain:before {
-    content: "\e90e";
+  content: "\e90e";
 }
 .icon-comments:before {
-    content: "\e90f";
+  content: "\e90f";
 }
 .icon-comment:before {
-    content: "\e910";
+  content: "\e910";
 }
 .icon-boost:before {
-    content: "\e911";
+  content: "\e911";
 }
 .icon-arrow-left:before {
-    content: "\e912";
+  content: "\e912";
 }
 .icon-arrow-up:before {
-    content: "\e913";
+  content: "\e913";
 }
 .icon-arrow-down:before {
-    content: "\e914";
+  content: "\e914";
 }
 .icon-home:before {
-    content: "\e915";
+  content: "\e915";
 }
 .icon-local:before {
-    content: "\e916";
+  content: "\e916";
 }
 .icon-dots-three:before {
-    content: "\e917";
+  content: "\e917";
 }
 .icon-check:before {
-    content: "\e918";
+  content: "\e918";
 }
 .icon-dots-three-vertical:before {
-    content: "\e919";
+  content: "\e919";
 }
 .icon-search:before {
-    content: "\e986";
+  content: "\e986";
 }
 .icon-star-empty:before {
-    content: "\e9d7";
+  content: "\e9d7";
 }
 .icon-star-half:before {
-    content: "\e9d8";
+  content: "\e9d8";
 }
 .icon-star-full:before {
-    content: "\e9d9";
+  content: "\e9d9";
 }
 .icon-heart:before {
-    content: "\e9da";
+  content: "\e9da";
 }
 .icon-plus:before {
-    content: "\ea0a";
+  content: "\ea0a";
 }

From 135fcbd26999eb002eff6de13938fe43f55597f2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 13:02:27 -0700
Subject: [PATCH 180/272] Adds button to template

---
 bookwyrm/templates/lists/bookmark_button.html | 39 +++++++++++++++++++
 bookwyrm/templates/lists/list_layout.html     | 11 +++---
 bookwyrm/templates/snippets/fav_button.html   | 20 ++++++++--
 bookwyrm/templatetags/interaction.py          |  5 +++
 4 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 bookwyrm/templates/lists/bookmark_button.html

diff --git a/bookwyrm/templates/lists/bookmark_button.html b/bookwyrm/templates/lists/bookmark_button.html
new file mode 100644
index 00000000..8831d398
--- /dev/null
+++ b/bookwyrm/templates/lists/bookmark_button.html
@@ -0,0 +1,39 @@
+{% load i18n %}
+{% load interaction %}
+
+{% if request.user.is_authenticated %}
+
+{% with request.user|bookmarked:list as bookmarked %}
+<form
+    name="bookmark-{{ list.id }}"
+    action="/"
+    method="POST"
+    class="interaction bookmark_{{ list.id }} {% if bookmarked %}is-hidden{% endif %}"
+    data-id="bookmark_{{ list.id }}"
+>
+    {% csrf_token %}
+    {% trans "Bookmark" as text %}
+    <button class="button">
+        <span class="icon icon-bookmark m-0-mobile" title="{{ text }}"></span>
+        <span class="is-sr-only-mobile">{{ text }}</span>
+    </button>
+</form>
+
+<form
+    name="bookmark-{{ list.id }}"
+    action="/"
+    method="POST"
+    class="interaction active bookmark_{{ list.id }} {% if not bookmarked %}is-hidden{% endif %}"
+    data-id="bookmark_{{ list.id }}"
+>
+    {% csrf_token %}
+    {% trans "Un-bookmark" as text %}
+    <button class="button">
+        <span class="icon icon-bookmark m-0-mobile has-text-primary" title="{{ text }}"></span>
+        <span class="is-sr-only-mobile">{{ text }}</span>
+    </button>
+</form>
+{% endwith %}
+
+{% endif %}
+
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index b24ce9e3..68abafc0 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -11,12 +11,13 @@
             {% include 'lists/created_text.html' with list=list %}
         </p>
     </div>
-    {% if request.user == list.user %}
-    <div class="column is-narrow">
-        {% trans "Edit List" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_list" focus="edit_list_header" %}
+    <div class="column is-narrow is-flex">
+        {% if request.user == list.user %}
+            {% trans "Edit List" as button_text %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_list" focus="edit_list_header" %}
+        {% endif %}
+        {% include "lists/bookmark_button.html" with list=list %}
     </div>
-    {% endif %}
 </header>
 
 <div class="block content">
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index 0670b4c5..bf181b1f 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -4,15 +4,27 @@
 
 {% with status.id|uuid as uuid %}
 {% with request.user|liked:status as liked %}
-<form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav_{{ status.id }}_{{ uuid }} {% if liked %}is-hidden{% endif %}" data-id="fav_{{ status.id }}_{{ uuid }}">
+<form
+    name="favorite"
+    action="/favorite/{{ status.id }}"
+    method="POST"
+    class="interaction fav_{{ status.id }}_{{ uuid }} {% if liked %}is-hidden{% endif %}"
+    data-id="fav_{{ status.id }}_{{ uuid }}"
+>
     {% csrf_token %}
     <button class="button is-small is-light is-transparent" type="submit">
-        <span class="icon icon-heart m-0-mobile" title="{% trans 'Like' %}">
-        </span>
+        <span class="icon icon-heart m-0-mobile" title="{% trans 'Like' %}"></span>
         <span class="is-sr-only-mobile">{% trans "Like" %}</span>
     </button>
 </form>
-<form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav_{{ status.id }}_{{ uuid }} active {% if not liked %}is-hidden{% endif %}" data-id="fav_{{ status.id }}_{{ uuid }}">
+
+<form
+    name="unfavorite"
+    action="/unfavorite/{{ status.id }}"
+    method="POST"
+    class="interaction fav_{{ status.id }}_{{ uuid }} active {% if not liked %}is-hidden{% endif %}"
+    data-id="fav_{{ status.id }}_{{ uuid }}"
+>
     {% csrf_token %}
     <button class="button is-light is-transparent is-small" type="submit">
         <span class="icon icon-heart has-text-primary m-0-mobile" title="{% trans 'Un-like' %}"></span>
diff --git a/bookwyrm/templatetags/interaction.py b/bookwyrm/templatetags/interaction.py
index bbe74600..8ef8e358 100644
--- a/bookwyrm/templatetags/interaction.py
+++ b/bookwyrm/templatetags/interaction.py
@@ -16,3 +16,8 @@ def get_user_liked(user, status):
 def get_user_boosted(user, status):
     """did the given user fav a status?"""
     return status.boosters.filter(user=user).exists()
+
+@register.filter(name="bookmarked")
+def get_user_bookmarked(user, book_list):
+    """did the user bookmark a list"""
+    return user.saved_lists.filter(id=book_list.id).exists()

From 42abc145c888cb2f8854c48e4fec79c7174b3fcc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 13:15:35 -0700
Subject: [PATCH 181/272] Adds action views

---
 bookwyrm/templates/lists/bookmark_button.html |  4 ++--
 bookwyrm/templates/snippets/fav_button.html   |  4 ++--
 bookwyrm/templatetags/interaction.py          |  1 +
 bookwyrm/urls.py                              | 10 +++++++--
 bookwyrm/views/__init__.py                    |  1 +
 bookwyrm/views/list.py                        | 21 +++++++++++++++++++
 6 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/lists/bookmark_button.html b/bookwyrm/templates/lists/bookmark_button.html
index 8831d398..c63a8e1e 100644
--- a/bookwyrm/templates/lists/bookmark_button.html
+++ b/bookwyrm/templates/lists/bookmark_button.html
@@ -6,7 +6,7 @@
 {% with request.user|bookmarked:list as bookmarked %}
 <form
     name="bookmark-{{ list.id }}"
-    action="/"
+    action="{% url 'list-bookmark' list.id %}"
     method="POST"
     class="interaction bookmark_{{ list.id }} {% if bookmarked %}is-hidden{% endif %}"
     data-id="bookmark_{{ list.id }}"
@@ -21,7 +21,7 @@
 
 <form
     name="bookmark-{{ list.id }}"
-    action="/"
+    action="{% url 'list-unbookmark' list.id %}"
     method="POST"
     class="interaction active bookmark_{{ list.id }} {% if not bookmarked %}is-hidden{% endif %}"
     data-id="bookmark_{{ list.id }}"
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index bf181b1f..4645ec06 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -6,7 +6,7 @@
 {% with request.user|liked:status as liked %}
 <form
     name="favorite"
-    action="/favorite/{{ status.id }}"
+    action="{% url 'fav' status.id %}"
     method="POST"
     class="interaction fav_{{ status.id }}_{{ uuid }} {% if liked %}is-hidden{% endif %}"
     data-id="fav_{{ status.id }}_{{ uuid }}"
@@ -20,7 +20,7 @@
 
 <form
     name="unfavorite"
-    action="/unfavorite/{{ status.id }}"
+    action="{% url 'unfav' status.id %}"
     method="POST"
     class="interaction fav_{{ status.id }}_{{ uuid }} active {% if not liked %}is-hidden{% endif %}"
     data-id="fav_{{ status.id }}_{{ uuid }}"
diff --git a/bookwyrm/templatetags/interaction.py b/bookwyrm/templatetags/interaction.py
index 8ef8e358..8ad554e7 100644
--- a/bookwyrm/templatetags/interaction.py
+++ b/bookwyrm/templatetags/interaction.py
@@ -17,6 +17,7 @@ def get_user_boosted(user, status):
     """did the given user fav a status?"""
     return status.boosters.filter(user=user).exists()
 
+
 @register.filter(name="bookmarked")
 def get_user_bookmarked(user, book_list):
     """did the user bookmark a list"""
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 4c85954b..7facde3e 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -233,6 +233,10 @@ urlpatterns = [
     re_path(
         r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
     ),
+    re_path(r"bookmark/(?P<list_id>\d+)/?$", views.bookmark, name="list-bookmark"),
+    re_path(
+        r"^unbookmark/(?P<list_id>\d+)/?$", views.unbookmark, name="list-unbookmark"
+    ),
     # User books
     re_path(r"%s/books/?$" % USER_PATH, views.Shelf.as_view(), name="user-shelves"),
     re_path(
@@ -294,8 +298,10 @@ urlpatterns = [
         name="redraft",
     ),
     # interact
-    re_path(r"^favorite/(?P<status_id>\d+)/?$", views.Favorite.as_view()),
-    re_path(r"^unfavorite/(?P<status_id>\d+)/?$", views.Unfavorite.as_view()),
+    re_path(r"^favorite/(?P<status_id>\d+)/?$", views.Favorite.as_view(), name="fav"),
+    re_path(
+        r"^unfavorite/(?P<status_id>\d+)/?$", views.Unfavorite.as_view(), name="unfav"
+    ),
     re_path(r"^boost/(?P<status_id>\d+)/?$", views.Boost.as_view()),
     re_path(r"^unboost/(?P<status_id>\d+)/?$", views.Unboost.as_view()),
     # books
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 303dad62..bb7f9d3e 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -26,6 +26,7 @@ from .invite import ManageInviteRequests, ignore_invite_request
 from .isbn import Isbn
 from .landing import About, Home, Landing
 from .list import Lists, List, Curate, UserLists
+from .list import bookmark, unbookmark
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 36175937..14966bc2 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -224,6 +224,25 @@ class Curate(View):
 
 
 @require_POST
+@login_required
+def bookmark(request, list_id):
+    """bookmark a list"""
+    book_list = models.List.objects.get(id=list_id)
+    request.user.saved_lists.add(book_list)
+    return redirect("list", list_id)
+
+
+@require_POST
+@login_required
+def unbookmark(request, list_id):
+    """unsave a list"""
+    book_list = models.List.objects.get(id=list_id)
+    request.user.saved_lists.remove(book_list)
+    return redirect("list", list_id)
+
+
+@require_POST
+@login_required
 def add_book(request):
     """put a book on a list"""
     book_list = get_object_or_404(models.List, id=request.POST.get("list"))
@@ -273,6 +292,7 @@ def add_book(request):
 
 
 @require_POST
+@login_required
 def remove_book(request, list_id):
     """remove a book from a list"""
     with transaction.atomic():
@@ -289,6 +309,7 @@ def remove_book(request, list_id):
 
 
 @require_POST
+@login_required
 def set_book_position(request, list_item_id):
     """
     Action for when the list user manually specifies a list position, takes

From a30094c822bd3de26abd89b34f64ddeb977d9255 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 13:40:07 -0700
Subject: [PATCH 182/272] View bookmarked lists

---
 bookwyrm/templates/lists/lists.html | 15 +++++++++++++++
 bookwyrm/urls.py                    |  3 +++
 bookwyrm/views/__init__.py          |  2 +-
 bookwyrm/views/list.py              | 19 +++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 21f6ada4..376449f8 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -27,6 +27,21 @@
     {% include 'lists/create_form.html' with controls_text="create_list" %}
 </div>
 
+{% if request.user.is_authenticated %}
+<nav class="tabs">
+    <ul>
+        {% url 'lists' as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "All Lists" %}</a>
+        </li>
+        {% url 'bookmarked-lists' as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Bookmarked Lists" %}</a>
+        </li>
+    </ul>
+</nav>
+{% endif %}
+
 {% if lists %}
 <section class="block">
     {% include 'lists/list_items.html' with lists=lists %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 7facde3e..fa63e983 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -218,6 +218,9 @@ urlpatterns = [
     # lists
     re_path(r"%s/lists/?$" % USER_PATH, views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
+    re_path(
+        r"^list/bookmarks/?$", views.BookmarkedLists.as_view(), name="bookmarked-lists"
+    ),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
     re_path(r"^list/add-book/?$", views.list.add_book, name="list-add-book"),
     re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index bb7f9d3e..b016b46c 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -25,7 +25,7 @@ from .invite import ManageInvites, Invite, InviteRequest
 from .invite import ManageInviteRequests, ignore_invite_request
 from .isbn import Isbn
 from .landing import About, Home, Landing
-from .list import Lists, List, Curate, UserLists
+from .list import Lists, BookmarkedLists, List, Curate, UserLists
 from .list import bookmark, unbookmark
 from .notifications import Notifications
 from .outbox import Outbox
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 14966bc2..e95ecd57 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -63,6 +63,25 @@ class Lists(View):
         return redirect(book_list.local_path)
 
 
+@method_decorator(login_required, name="dispatch")
+class BookmarkedLists(View):
+    """bookmarked book list page"""
+
+    def get(self, request):
+        """display book lists"""
+        # hide lists with no approved books
+        lists = request.user.saved_lists.order_by("-updated_date")
+
+        paginated = Paginator(lists, 12)
+        data = {
+            "lists": paginated.get_page(request.GET.get("page")),
+            "list_form": forms.ListForm(),
+            "path": "/list",
+        }
+        return TemplateResponse(request, "lists/lists.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
 class UserLists(View):
     """a user's book list page"""
 

From f187d7ec2d77b2da2b20f939f867845193c72482 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 13:53:45 -0700
Subject: [PATCH 183/272] ignore vendor files in editorconfig

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index d102bc5a..b7128419 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -32,7 +32,7 @@ indent_size = 2
 max_line_length = off
 
 # Computer generated files
-[{package.json,*.lock,*.mo}]
+[{vendor/*,package.json,*.lock,*.mo}]
 indent_size = unset
 indent_style = unset
 max_line_length = unset

From d3cfceafca52200a97182b5d0607a6da62786b49 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 13:58:19 -0700
Subject: [PATCH 184/272] Mocks creation of boost

---
 bookwyrm/tests/test_activitystreams.py | 34 +++++++++++++++++---------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index 1041b889..56ba844a 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -8,6 +8,7 @@ from bookwyrm import activitystreams, models
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 @patch("bookwyrm.activitystreams.BooksStream.add_book_statuses")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+# pylint: disable=too-many-public-methods
 class Activitystreams(TestCase):
     """using redis to build activity streams"""
 
@@ -292,10 +293,13 @@ class Activitystreams(TestCase):
     def test_boost_to_another_timeline(self, *_):
         """add a boost and deduplicate the boosted status on the timeline"""
         status = models.Status.objects.create(user=self.local_user, content="hi")
-        boost = models.Boost.objects.create(
-            boosted_status=status,
-            user=self.another_user,
-        )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ):
+            boost = models.Boost.objects.create(
+                boosted_status=status,
+                user=self.another_user,
+            )
         with patch(
             "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
         ) as mock:
@@ -313,10 +317,13 @@ class Activitystreams(TestCase):
         """add a boost and deduplicate the boosted status on the timeline"""
         self.local_user.following.add(self.another_user)
         status = models.Status.objects.create(user=self.local_user, content="hi")
-        boost = models.Boost.objects.create(
-            boosted_status=status,
-            user=self.another_user,
-        )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ):
+            boost = models.Boost.objects.create(
+                boosted_status=status,
+                user=self.another_user,
+            )
         with patch(
             "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
         ) as mock:
@@ -336,10 +343,13 @@ class Activitystreams(TestCase):
     def test_boost_to_same_timeline(self, *_):
         """add a boost and deduplicate the boosted status on the timeline"""
         status = models.Status.objects.create(user=self.local_user, content="hi")
-        boost = models.Boost.objects.create(
-            boosted_status=status,
-            user=self.local_user,
-        )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ):
+            boost = models.Boost.objects.create(
+                boosted_status=status,
+                user=self.local_user,
+            )
         with patch(
             "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
         ) as mock:

From fcd41aaf06b30c3db1cfc762d61c1bd58f914409 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 13:59:23 -0700
Subject: [PATCH 185/272] Add specific vendor file

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index b7128419..f2e8a178 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -32,7 +32,7 @@ indent_size = 2
 max_line_length = off
 
 # Computer generated files
-[{vendor/*,package.json,*.lock,*.mo}]
+[{icons.css,package.json,*.lock,*.mo}]
 indent_size = unset
 indent_style = unset
 max_line_length = unset

From 47dbcc3af07e0e5d37d88c94d5802e4db687543b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 14:15:19 -0700
Subject: [PATCH 186/272] Adds views test

---
 bookwyrm/tests/views/test_list.py | 44 +++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 988d8d4a..f76b6ac9 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -91,6 +91,50 @@ class ListViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_bookmarked_lists_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.BookmarkedLists.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            booklist = models.List.objects.create(name="Public list", user=self.local_user)
+            models.List.objects.create(
+                name="Private list", privacy="direct", user=self.local_user
+            )
+        self.local_user.saved_lists.add(booklist)
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(result.context_data["lists"].object_list, [booklist])
+
+    def test_bookmarked_lists_page_empty(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.BookmarkedLists.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.List.objects.create(name="Public list", user=self.local_user)
+            models.List.objects.create(
+                name="Private list", privacy="direct", user=self.local_user
+            )
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(result.context_data["lists"].object_list, [])
+
+    def test_bookmarked_lists_page_logged_out(self):
+        """logged out bookmarked lists"""
+        view = views.BookmarkedLists.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = view(request)
+        self.assertEqual(result.status_code, 301)
+
     def test_lists_create(self):
         """create list view"""
         view = views.Lists.as_view()

From b7fb55e6ad92fe1dfd44e1f39a54b587ecc76626 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 14:53:48 -0700
Subject: [PATCH 187/272] Fixes test for login redirected view

---
 bookwyrm/tests/views/test_list.py | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index f76b6ac9..e38f4eae 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -91,11 +91,13 @@ class ListViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-    def test_bookmarked_lists_page(self):
+    def test_saved_lists_page(self):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.BookmarkedLists.as_view()
+        view = views.SavedLists.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            booklist = models.List.objects.create(name="Public list", user=self.local_user)
+            booklist = models.List.objects.create(
+                name="Public list", user=self.local_user
+            )
             models.List.objects.create(
                 name="Private list", privacy="direct", user=self.local_user
             )
@@ -109,9 +111,9 @@ class ListViews(TestCase):
         self.assertEqual(result.status_code, 200)
         self.assertEqual(result.context_data["lists"].object_list, [booklist])
 
-    def test_bookmarked_lists_page_empty(self):
+    def test_saved_lists_page_empty(self):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.BookmarkedLists.as_view()
+        view = views.SavedLists.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.List.objects.create(name="Public list", user=self.local_user)
             models.List.objects.create(
@@ -126,9 +128,9 @@ class ListViews(TestCase):
         self.assertEqual(result.status_code, 200)
         self.assertEqual(result.context_data["lists"].object_list, [])
 
-    def test_bookmarked_lists_page_logged_out(self):
-        """logged out bookmarked lists"""
-        view = views.BookmarkedLists.as_view()
+    def test_saved_lists_page_logged_out(self):
+        """logged out saved lists"""
+        view = views.SavedLists.as_view()
         request = self.factory.get("")
         request.user = self.anonymous_user
 
@@ -372,15 +374,9 @@ class ListViews(TestCase):
     def test_user_lists_page_logged_out(self):
         """there are so many views, this just makes sure it LOADS"""
         view = views.UserLists.as_view()
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.List.objects.create(name="Public list", user=self.local_user)
-            models.List.objects.create(
-                name="Private list", privacy="direct", user=self.local_user
-            )
         request = self.factory.get("")
         request.user = self.anonymous_user
 
         result = view(request, self.local_user.username)
-        self.assertIsInstance(result, TemplateResponse)
         result.render()
-        self.assertEqual(result.status_code, 200)
+        self.assertEqual(result.status_code, 302)

From f267e53b56ebce5258f395d1edd5078c33f8696d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 15:07:38 -0700
Subject: [PATCH 188/272] let's call it save not bookmark

---
 bookwyrm/templates/lists/bookmark_button.html | 26 +++++++++----------
 bookwyrm/templates/lists/lists.html           |  6 ++---
 bookwyrm/templatetags/interaction.py          |  6 ++---
 bookwyrm/urls.py                              | 10 +++----
 bookwyrm/views/__init__.py                    |  4 +--
 bookwyrm/views/list.py                        | 14 +++++-----
 6 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/bookwyrm/templates/lists/bookmark_button.html b/bookwyrm/templates/lists/bookmark_button.html
index c63a8e1e..f8f94763 100644
--- a/bookwyrm/templates/lists/bookmark_button.html
+++ b/bookwyrm/templates/lists/bookmark_button.html
@@ -3,32 +3,32 @@
 
 {% if request.user.is_authenticated %}
 
-{% with request.user|bookmarked:list as bookmarked %}
+{% with request.user|saved:list as saved %}
 <form
-    name="bookmark-{{ list.id }}"
-    action="{% url 'list-bookmark' list.id %}"
+    name="save-{{ list.id }}"
+    action="{% url 'list-save' list.id %}"
     method="POST"
-    class="interaction bookmark_{{ list.id }} {% if bookmarked %}is-hidden{% endif %}"
-    data-id="bookmark_{{ list.id }}"
+    class="interaction save_{{ list.id }} {% if saved %}is-hidden{% endif %}"
+    data-id="save_{{ list.id }}"
 >
     {% csrf_token %}
-    {% trans "Bookmark" as text %}
-    <button class="button">
+    {% trans "Save" as text %}
+    <button class="button" type="submit">
         <span class="icon icon-bookmark m-0-mobile" title="{{ text }}"></span>
         <span class="is-sr-only-mobile">{{ text }}</span>
     </button>
 </form>
 
 <form
-    name="bookmark-{{ list.id }}"
-    action="{% url 'list-unbookmark' list.id %}"
+    name="unsave-{{ list.id }}"
+    action="{% url 'list-unsave' list.id %}"
     method="POST"
-    class="interaction active bookmark_{{ list.id }} {% if not bookmarked %}is-hidden{% endif %}"
-    data-id="bookmark_{{ list.id }}"
+    class="interaction save_{{ list.id }} active {% if not saved %}is-hidden{% endif %}"
+    data-id="save_{{ list.id }}"
 >
     {% csrf_token %}
-    {% trans "Un-bookmark" as text %}
-    <button class="button">
+    {% trans "Un-save" as text %}
+    <button class="button" type="submit">
         <span class="icon icon-bookmark m-0-mobile has-text-primary" title="{{ text }}"></span>
         <span class="is-sr-only-mobile">{{ text }}</span>
     </button>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 376449f8..d909f5e8 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -31,12 +31,12 @@
 <nav class="tabs">
     <ul>
         {% url 'lists' as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
+        <li{% if request.path in url %} class="is-active"{% endif %}>
             <a href="{{ url }}">{% trans "All Lists" %}</a>
         </li>
-        {% url 'bookmarked-lists' as url %}
+        {% url 'saved-lists' as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Bookmarked Lists" %}</a>
+            <a href="{{ url }}">{% trans "Saved Lists" %}</a>
         </li>
     </ul>
 </nav>
diff --git a/bookwyrm/templatetags/interaction.py b/bookwyrm/templatetags/interaction.py
index 8ad554e7..64c91f89 100644
--- a/bookwyrm/templatetags/interaction.py
+++ b/bookwyrm/templatetags/interaction.py
@@ -18,7 +18,7 @@ def get_user_boosted(user, status):
     return status.boosters.filter(user=user).exists()
 
 
-@register.filter(name="bookmarked")
-def get_user_bookmarked(user, book_list):
-    """did the user bookmark a list"""
+@register.filter(name="saved")
+def get_user_saved_lists(user, book_list):
+    """did the user save a list"""
     return user.saved_lists.filter(id=book_list.id).exists()
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index fa63e983..4494ba5a 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -218,9 +218,7 @@ urlpatterns = [
     # lists
     re_path(r"%s/lists/?$" % USER_PATH, views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
-    re_path(
-        r"^list/bookmarks/?$", views.BookmarkedLists.as_view(), name="bookmarked-lists"
-    ),
+    re_path(r"^list/saved/?$", views.SavedLists.as_view(), name="saved-lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
     re_path(r"^list/add-book/?$", views.list.add_book, name="list-add-book"),
     re_path(
@@ -236,10 +234,8 @@ urlpatterns = [
     re_path(
         r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
     ),
-    re_path(r"bookmark/(?P<list_id>\d+)/?$", views.bookmark, name="list-bookmark"),
-    re_path(
-        r"^unbookmark/(?P<list_id>\d+)/?$", views.unbookmark, name="list-unbookmark"
-    ),
+    re_path(r"^save-list/(?P<list_id>\d+)/?$", views.saveList, name="list-save"),
+    re_path(r"^unsave-list/(?P<list_id>\d+)/?$", views.unsaveList, name="list-unsave"),
     # User books
     re_path(r"%s/books/?$" % USER_PATH, views.Shelf.as_view(), name="user-shelves"),
     re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index b016b46c..bee367f7 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -25,8 +25,8 @@ from .invite import ManageInvites, Invite, InviteRequest
 from .invite import ManageInviteRequests, ignore_invite_request
 from .isbn import Isbn
 from .landing import About, Home, Landing
-from .list import Lists, BookmarkedLists, List, Curate, UserLists
-from .list import bookmark, unbookmark
+from .list import Lists, SavedLists, List, Curate, UserLists
+from .list import saveList, unsaveList
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index e95ecd57..aab7c251 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -64,8 +64,8 @@ class Lists(View):
 
 
 @method_decorator(login_required, name="dispatch")
-class BookmarkedLists(View):
-    """bookmarked book list page"""
+class SavedLists(View):
+    """saved book list page"""
 
     def get(self, request):
         """display book lists"""
@@ -244,18 +244,18 @@ class Curate(View):
 
 @require_POST
 @login_required
-def bookmark(request, list_id):
-    """bookmark a list"""
-    book_list = models.List.objects.get(id=list_id)
+def saveList(request, list_id):
+    """save a list"""
+    book_list = get_object_or_404(models.List, id=list_id)
     request.user.saved_lists.add(book_list)
     return redirect("list", list_id)
 
 
 @require_POST
 @login_required
-def unbookmark(request, list_id):
+def unsaveList(request, list_id):
     """unsave a list"""
-    book_list = models.List.objects.get(id=list_id)
+    book_list = get_object_or_404(models.List, id=list_id)
     request.user.saved_lists.remove(book_list)
     return redirect("list", list_id)
 

From c727d351ba596954e8050be53447691427ca54f3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 15:33:49 -0700
Subject: [PATCH 189/272] Fixes variable name

---
 bookwyrm/urls.py           | 4 ++--
 bookwyrm/views/__init__.py | 2 +-
 bookwyrm/views/list.py     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 4494ba5a..1dbd67a7 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -234,8 +234,8 @@ urlpatterns = [
     re_path(
         r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
     ),
-    re_path(r"^save-list/(?P<list_id>\d+)/?$", views.saveList, name="list-save"),
-    re_path(r"^unsave-list/(?P<list_id>\d+)/?$", views.unsaveList, name="list-unsave"),
+    re_path(r"^save-list/(?P<list_id>\d+)/?$", views.save_list, name="list-save"),
+    re_path(r"^unsave-list/(?P<list_id>\d+)/?$", views.unsave_list, name="list-unsave"),
     # User books
     re_path(r"%s/books/?$" % USER_PATH, views.Shelf.as_view(), name="user-shelves"),
     re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index bee367f7..f4204925 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -26,7 +26,7 @@ from .invite import ManageInviteRequests, ignore_invite_request
 from .isbn import Isbn
 from .landing import About, Home, Landing
 from .list import Lists, SavedLists, List, Curate, UserLists
-from .list import saveList, unsaveList
+from .list import save_list, unsave_list
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index aab7c251..e6ef52ba 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -244,7 +244,7 @@ class Curate(View):
 
 @require_POST
 @login_required
-def saveList(request, list_id):
+def save_list(request, list_id):
     """save a list"""
     book_list = get_object_or_404(models.List, id=list_id)
     request.user.saved_lists.add(book_list)
@@ -253,7 +253,7 @@ def saveList(request, list_id):
 
 @require_POST
 @login_required
-def unsaveList(request, list_id):
+def unsave_list(request, list_id):
     """unsave a list"""
     book_list = get_object_or_404(models.List, id=list_id)
     request.user.saved_lists.remove(book_list)

From 473ad5ffba28f39e66477fd2fef59637360f4484 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 15:35:51 -0700
Subject: [PATCH 190/272] Fixes tests

---
 bookwyrm/tests/views/test_list.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index e38f4eae..d5e917c3 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -126,7 +126,7 @@ class ListViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.context_data["lists"].object_list, [])
+        self.assertEqual(len(result.context_data["lists"].object_list), 0)
 
     def test_saved_lists_page_logged_out(self):
         """logged out saved lists"""
@@ -135,7 +135,7 @@ class ListViews(TestCase):
         request.user = self.anonymous_user
 
         result = view(request)
-        self.assertEqual(result.status_code, 301)
+        self.assertEqual(result.status_code, 302)
 
     def test_lists_create(self):
         """create list view"""
@@ -378,5 +378,4 @@ class ListViews(TestCase):
         request.user = self.anonymous_user
 
         result = view(request, self.local_user.username)
-        result.render()
         self.assertEqual(result.status_code, 302)

From 26e932aa7b97018717565f9c59bb0435bb4297d1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 15:47:14 -0700
Subject: [PATCH 191/272] Increment unread count less wildly

Works on #1293
---
 bookwyrm/activitystreams.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 0e07905b..c6ad5760 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -23,14 +23,15 @@ class ActivityStream(RedisStore):
         """statuses are sorted by date published"""
         return obj.published_date.timestamp()
 
-    def add_status(self, status):
+    def add_status(self, status, increment_unread=False):
         """add a status to users' feeds"""
         # the pipeline contains all the add-to-stream activities
         pipeline = self.add_object_to_related_stores(status, execute=False)
 
-        for user in self.get_audience(status):
-            # add to the unread status count
-            pipeline.incr(self.unread_id(user))
+        if increment_unread:
+            for user in self.get_audience(status):
+                # add to the unread status count
+                pipeline.incr(self.unread_id(user))
 
         # and go!
         pipeline.execute()
@@ -262,7 +263,7 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
         return
 
     for stream in streams.values():
-        stream.add_status(instance)
+        stream.add_status(instance, increment_unread=created)
 
     if sender != models.Boost:
         return

From d59ac297bb951992e736d3e378326a9e85eb9e03 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 15:54:20 -0700
Subject: [PATCH 192/272] Indicate if a list is saved on the lists tile view

---
 bookwyrm/templates/lists/list_items.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 611975b0..5efa2450 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -1,4 +1,7 @@
+{% load i18n %}
 {% load markdown %}
+{% load interaction %}
+
 <div class="columns is-multiline">
     {% for list in lists %}
     <div class="column is-one-quarter">
@@ -7,6 +10,14 @@
                 <h4 class="card-header-title">
                     <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>
                 </h4>
+                {% if request.user|saved:list %}
+                <div class="card-header-icon">
+                    {% trans "Saved" as text %}
+                    <span class="icon icon-bookmark has-text-grey" title="{{ text }}">
+                        <span class="is-sr-only">{{ text }}</span>
+                    </span>
+                </div>
+                {% endif %}
             </header>
 
             {% with list_books=list.listitem_set.all|slice:5 %}

From 332a712d84752f4071a88698afe4e74f20ac456f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 23 Aug 2021 15:59:58 -0700
Subject: [PATCH 193/272] Safely handle work with no editions error

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

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 842d0997..d2a7b9fa 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -145,8 +145,8 @@ class Connector(AbstractConnector):
     def get_edition_from_work_data(self, data):
         data = self.load_edition_data(data.get("uri"))
         try:
-            uri = data["uris"][0]
-        except KeyError:
+            uri = data.get("uris", [])[0]
+        except IndexError:
             raise ConnectorException("Invalid book data")
         return self.get_book_data(self.get_remote_id(uri))
 

From 2ec01803e0782ea4fb1cf2619534f913187ed824 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 24 Aug 2021 14:16:22 -0700
Subject: [PATCH 194/272] Fixes error for logged out user viewing lists

---
 bookwyrm/templates/lists/list_items.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 5efa2450..9c7e1710 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -10,7 +10,7 @@
                 <h4 class="card-header-title">
                     <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>
                 </h4>
-                {% if request.user|saved:list %}
+                {% if request.user.is_authenticated and request.user|saved:list %}
                 <div class="card-header-icon">
                     {% trans "Saved" as text %}
                     <span class="icon icon-bookmark has-text-grey" title="{{ text }}">

From 3f2f8f0e50e6d0359ce16bc4256769dfa0dbabfb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 27 Aug 2021 10:31:39 -0700
Subject: [PATCH 195/272] Updates migrations

---
 ...{0083_auto_20210811_1817.py => 0086_auto_20210827_1727.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename bookwyrm/migrations/{0083_auto_20210811_1817.py => 0086_auto_20210827_1727.py} (86%)

diff --git a/bookwyrm/migrations/0083_auto_20210811_1817.py b/bookwyrm/migrations/0086_auto_20210827_1727.py
similarity index 86%
rename from bookwyrm/migrations/0083_auto_20210811_1817.py
rename to bookwyrm/migrations/0086_auto_20210827_1727.py
index 2abc88b0..a9c9c7a8 100644
--- a/bookwyrm/migrations/0083_auto_20210811_1817.py
+++ b/bookwyrm/migrations/0086_auto_20210827_1727.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.4 on 2021-08-11 18:17
+# Generated by Django 3.2.4 on 2021-08-27 17:27
 
 from django.db import migrations, models
 import django.db.models.expressions
@@ -7,7 +7,7 @@ import django.db.models.expressions
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("bookwyrm", "0082_auto_20210806_2324"),
+        ("bookwyrm", "0085_user_saved_lists"),
     ]
 
     operations = [

From 2c78eddbeb427a668b7aaeb70c29cf1e1e99d1f9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 27 Aug 2021 10:47:56 -0700
Subject: [PATCH 196/272] Normalize readthrough dates in advance of migration

---
 bookwyrm/migrations/0086_auto_20210827_1727.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bookwyrm/migrations/0086_auto_20210827_1727.py b/bookwyrm/migrations/0086_auto_20210827_1727.py
index a9c9c7a8..7632a5b4 100644
--- a/bookwyrm/migrations/0086_auto_20210827_1727.py
+++ b/bookwyrm/migrations/0086_auto_20210827_1727.py
@@ -4,6 +4,18 @@ from django.db import migrations, models
 import django.db.models.expressions
 
 
+def normalize_readthrough_dates(app_registry, schema_editor):
+    """bih"""
+    db_alias = schema_editor.connection.alias
+    app_registry.get_model("bookwyrm", "Readthrough").objects.using(db_alias).filter(
+        start_date__gt=models.F("finish_date")
+    ).update(start_date=models.F("finish_date"))
+
+
+def reverse_func(apps, schema_editor):
+    """nothing to do here"""
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -11,6 +23,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.RunPython(normalize_readthrough_dates, reverse_func),
         migrations.AlterModelOptions(
             name="readthrough",
             options={"ordering": ("-start_date",)},

From e129b9c1f1787311cc94c33eb11e6f49d1d0f18a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 27 Aug 2021 11:16:51 -0700
Subject: [PATCH 197/272] Adds more readthrough model tests

---
 .../tests/models/test_readthrough_model.py    | 78 ++++++++++++++++---
 1 file changed, 66 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py
index 596753f7..2b6e4fdd 100644
--- a/bookwyrm/tests/models/test_readthrough_model.py
+++ b/bookwyrm/tests/models/test_readthrough_model.py
@@ -1,7 +1,9 @@
 """ testing models """
+import datetime
 from unittest.mock import patch
 from django.test import TestCase
 from django.core.exceptions import ValidationError
+from django.utils import timezone
 
 from bookwyrm import models
 
@@ -21,27 +23,79 @@ class ReadThrough(TestCase):
             title="Example Edition", parent_work=self.work
         )
 
-        self.readthrough = models.ReadThrough.objects.create(
-            user=self.user, book=self.edition
+    def test_valid_date(self):
+        """can't finish a book before you start it"""
+        start = timezone.now()
+        finish = start + datetime.timedelta(days=1)
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+            start_date=start,
+            finish_date=finish,
+        )
+
+    def test_valid_date_null_start(self):
+        """can't finish a book before you start it"""
+        start = timezone.now()
+        finish = start + datetime.timedelta(days=1)
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+            finish_date=finish,
+        )
+
+    def test_valid_date_null_finish(self):
+        """can't finish a book before you start it"""
+        start = timezone.now()
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+            start_date=start,
+        )
+
+    def test_valid_date_null(self):
+        """can't finish a book before you start it"""
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+        )
+
+    def test_valid_date_same(self):
+        """can't finish a book before you start it"""
+        start = timezone.now()
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+            start_date=start,
+            finish_date=start,
         )
 
     def test_progress_update(self):
         """Test progress updates"""
-        self.readthrough.create_update()  # No-op, no progress yet
-        self.readthrough.progress = 10
-        self.readthrough.create_update()
-        self.readthrough.progress = 20
-        self.readthrough.progress_mode = models.ProgressMode.PERCENT
-        self.readthrough.create_update()
+        readthrough = models.ReadThrough.objects.create(
+            user=self.user, book=self.edition
+        )
 
-        updates = self.readthrough.progressupdate_set.order_by("created_date").all()
+        readthrough.create_update()  # No-op, no progress yet
+        readthrough.progress = 10
+        readthrough.create_update()
+        readthrough.progress = 20
+        readthrough.progress_mode = models.ProgressMode.PERCENT
+        readthrough.create_update()
+
+        updates = readthrough.progressupdate_set.order_by("created_date").all()
         self.assertEqual(len(updates), 2)
         self.assertEqual(updates[0].progress, 10)
         self.assertEqual(updates[0].mode, models.ProgressMode.PAGE)
         self.assertEqual(updates[1].progress, 20)
         self.assertEqual(updates[1].mode, models.ProgressMode.PERCENT)
 
-        self.readthrough.progress = -10
-        self.assertRaises(ValidationError, self.readthrough.clean_fields)
-        update = self.readthrough.create_update()
+        readthrough.progress = -10
+        self.assertRaises(ValidationError, readthrough.clean_fields)
+        update = readthrough.create_update()
         self.assertRaises(ValidationError, update.clean_fields)

From 497b54c014f15471a46373475a27a697c59724aa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 27 Aug 2021 11:38:34 -0700
Subject: [PATCH 198/272] Updates test

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

diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index bebd9f5a..61464bc7 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -107,7 +107,7 @@ class ReadingViews(TestCase):
             {
                 "post-status": True,
                 "privacy": "followers",
-                "finish_date": "2020-01-07",
+                "finish_date": timezone.now().isoformat(),
                 "id": readthrough.id,
             },
         )

From 337f1ac7d22a25207bd592a682a144e7bbbf1f23 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 27 Aug 2021 12:12:33 -0700
Subject: [PATCH 199/272] Update locale files

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 24142 -> 23969 bytes
 locale/de_DE/LC_MESSAGES/django.po   | 233 ++++++++++++++------------
 locale/en_US/LC_MESSAGES/django.po   | 219 +++++++++++++------------
 locale/es/LC_MESSAGES/django.mo      | Bin 48511 -> 48314 bytes
 locale/es/LC_MESSAGES/django.po      | 235 +++++++++++++++------------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 46658 -> 46454 bytes
 locale/fr_FR/LC_MESSAGES/django.po   | 235 +++++++++++++++------------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 45604 -> 45438 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 235 +++++++++++++++------------
 locale/zh_Hant/LC_MESSAGES/django.mo | Bin 40493 -> 40319 bytes
 locale/zh_Hant/LC_MESSAGES/django.po | 235 +++++++++++++++------------
 11 files changed, 768 insertions(+), 624 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 543d5355901e12d226dbe40f6d72ce8e7cf616f3..d2d1bc5f38eb929a0f31f3d60009f75aa7c43b5d 100644
GIT binary patch
delta 6953
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

delta 7117
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

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 00fbd0e8..397e18c2 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-08-27 19:11+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -94,29 +94,29 @@ msgstr "%(value)s ist keine gültige remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "Username"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:125
 #, fuzzy
 #| msgid "Title"
 msgid "Books Timeline"
 msgstr "Titel"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 #, fuzzy
@@ -124,27 +124,27 @@ msgstr "Titel"
 msgid "Books"
 msgstr "Buch"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:171
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:172
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:173
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:174
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:175
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:176
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgid "Last edited by:"
 msgstr "Zuletzt bearbeitet von:"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "Metadaten"
 
@@ -251,9 +251,9 @@ msgid "Name:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 #, fuzzy
 #| msgid "Separate multiple publishers with commas."
 msgid "Separate multiple values with commas."
@@ -284,7 +284,7 @@ msgid "Openlibrary key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "Inventaire ID:"
@@ -300,8 +300,9 @@ msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:78
 #: bookwyrm/templates/settings/announcement_form.html:69
@@ -317,8 +318,8 @@ msgstr "Speichern"
 #: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -361,7 +362,7 @@ msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
 #: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
@@ -457,24 +458,24 @@ msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "Cover von URL laden:"
 
@@ -492,144 +493,144 @@ msgstr "Editionen von  %(book_title)s"
 msgid "Add Book"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "Buchinfo bestätigen"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "Existiert \"%(name)s\" bereits als Autor:in?"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, fuzzy, python-format
 #| msgid "Start \"<em>%(book_title)s</em>\""
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "\"<em>%(book_title)s</em>\" beginnen"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "Neue:r Autor:in"
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "Neu als Autor:in erstellen: %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "Ist das eine Edition eines vorhandenen Werkes?"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "Dies ist ein neues Werk."
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "Zurück"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:127
 #: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "Titel:"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "Untertitel:"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "Seriennummer:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 #, fuzzy
 #| msgid "Pages:"
 msgid "Languages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 #, fuzzy
 #| msgid "Published"
 msgid "Publisher:"
 msgstr "Veröffentlicht"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "Erstveröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "Veröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 #, fuzzy
 #| msgid "Author"
 msgid "Authors"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Remove %(name)s"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Author page for %(name)s"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 #, fuzzy
 #| msgid "Edit Author"
 msgid "Add Authors:"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:220
+#: bookwyrm/templates/book/edit_book.html:227
 #: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "Buchidentifikatoren"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr ""
 
@@ -697,31 +698,37 @@ msgstr "bewertet"
 msgid "Progress Updates:"
 msgstr "Fortschrittsupdates:"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "Zeige alle Updates"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "Dieses Fortschrittsupdate löschen"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "Angefangen"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "Lesedaten bearbeiten"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "Diese Lesedaten löschen"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "Suchergebnisse"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/layout.html:71
@@ -1064,22 +1071,22 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
 msgstr "Gerade lesend"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Read"
 msgstr "Gelesen"
 
@@ -1094,6 +1101,10 @@ msgstr "%(year)s Leseziel"
 msgid "Who to follow"
 msgstr ""
 
+#: bookwyrm/templates/feed/suggested_users.html:5
+msgid "View directory"
+msgstr ""
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, fuzzy, python-format
 #| msgid "Want to Read \"<em>%(book_title)s</em>\""
@@ -1112,7 +1123,6 @@ msgid "Search for a book"
 msgstr "Nach einem Buch suchen"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "Keine Bücher für \"%(query)s\" gefunden"
@@ -1274,7 +1284,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)ss %(year)s Bücher"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Import Books"
 msgstr "Bücher importieren"
 
@@ -1328,7 +1338,7 @@ msgstr "Import gestartet:"
 msgid "Import completed:"
 msgstr "Import abgeschlossen:"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:24
 msgid "TASK FAILED"
 msgstr "AUFGABE GESCHEITERT"
 
@@ -1405,19 +1415,6 @@ msgstr "Zugiff verweigert"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Sorry! Dieser Einladecode ist mehr gültig."
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "Suchergebnisse"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Suchergebnisse für \"%(query)s\""
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "Passende Bücher"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1563,6 +1560,10 @@ msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(suppo
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1715,10 +1716,28 @@ msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 msgid "Suggest"
 msgstr "Vorschlagen"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "Speichern"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "Deine Listen"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "Listen"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "Liste erstellen"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -2232,31 +2251,31 @@ msgstr "Aktivität"
 msgid "Create Announcement"
 msgstr "Ankündigungen"
 
-#: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/announcements.html:21
 #, fuzzy
 #| msgid "Added:"
 msgid "Date added"
 msgstr "Hinzugefügt:"
 
-#: bookwyrm/templates/settings/announcements.html:26
+#: bookwyrm/templates/settings/announcements.html:25
 #, fuzzy
 #| msgid "reviewed"
 msgid "Preview"
 msgstr "bewertete"
 
-#: bookwyrm/templates/settings/announcements.html:30
+#: bookwyrm/templates/settings/announcements.html:29
 #, fuzzy
 #| msgid "Started"
 msgid "Start date"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/settings/announcements.html:34
+#: bookwyrm/templates/settings/announcements.html:33
 #, fuzzy
 #| msgid "Edit read dates"
 msgid "End date"
 msgstr "Lesedaten bearbeiten"
 
-#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/announcements.html:37
 #: bookwyrm/templates/settings/federation.html:30
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
@@ -2264,13 +2283,13 @@ msgstr "Lesedaten bearbeiten"
 msgid "Status"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 #, fuzzy
 #| msgid "Activity"
 msgid "active"
 msgstr "Aktivität"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 #, fuzzy
 #| msgid "Activity"
 msgid "inactive"
@@ -2666,7 +2685,7 @@ msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 #, fuzzy
 #| msgid "Add cover"
 msgid "No cover"
@@ -2803,13 +2822,13 @@ msgstr "Diese Lesedaten löschen?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -3021,7 +3040,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 #, fuzzy
 #| msgid "Progress"
 msgid "Update progress"
@@ -3069,15 +3088,15 @@ msgstr "Mehr Regale"
 msgid "Start reading"
 msgstr "Zu lesen beginnen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21
 msgid "Finish reading"
 msgstr "Lesen abschließen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:27
 msgid "Want to read"
 msgstr "Auf Leseliste setzen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:59
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Remove from %(name)s"
@@ -3273,13 +3292,13 @@ msgstr "Regal bearbeiten"
 msgid "Update shelf"
 msgstr "Regal aktualisieren"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
 msgstr "Bücher"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
@@ -3453,11 +3472,11 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr ""
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
@@ -3488,6 +3507,12 @@ msgstr ""
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "Suchergebnisse für \"%(query)s\""
+
+#~ msgid "Matching Books"
+#~ msgstr "Passende Bücher"
+
 #, fuzzy
 #~| msgid "Federated Servers"
 #~ msgid "Federated Timeline"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index ac2acf35..65c402b1 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-08-27 19:11+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -84,53 +84,53 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:125
 msgid "Books Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr ""
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:171
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:172
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:173
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:174
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:175
 msgid "Simplified Chinese"
 msgstr ""
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:176
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -219,7 +219,7 @@ msgid "Last edited by:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr ""
 
@@ -231,9 +231,9 @@ msgid "Name:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr ""
 
@@ -262,7 +262,7 @@ msgid "Openlibrary key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr ""
 
@@ -276,8 +276,9 @@ msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:78
 #: bookwyrm/templates/settings/announcement_form.html:69
@@ -293,8 +294,8 @@ msgstr ""
 #: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -335,7 +336,7 @@ msgid "Add Description"
 msgstr ""
 
 #: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
@@ -418,22 +419,22 @@ msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr ""
 
@@ -448,133 +449,133 @@ msgstr ""
 msgid "Add Book"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:127
 #: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, python-format
 msgid "Remove %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, python-format
 msgid "Author page for %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:220
+#: bookwyrm/templates/book/edit_book.html:227
 #: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr ""
 
@@ -640,31 +641,35 @@ msgstr ""
 msgid "Progress Updates:"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr ""
 
+#: bookwyrm/templates/book/search_filter.html:5
+msgid "Search editions"
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/layout.html:71
@@ -972,18 +977,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "To Read"
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Currently Reading"
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Read"
 msgstr ""
 
@@ -998,6 +1003,10 @@ msgstr ""
 msgid "Who to follow"
 msgstr ""
 
+#: bookwyrm/templates/feed/suggested_users.html:5
+msgid "View directory"
+msgstr ""
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1013,7 +1022,6 @@ msgid "Search for a book"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr ""
@@ -1161,7 +1169,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Import Books"
 msgstr ""
 
@@ -1211,7 +1219,7 @@ msgstr ""
 msgid "Import completed:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:24
 msgid "TASK FAILED"
 msgstr ""
 
@@ -1286,19 +1294,6 @@ msgstr ""
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr ""
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr ""
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr ""
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1438,6 +1433,10 @@ msgstr ""
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1577,10 +1576,22 @@ msgstr ""
 msgid "Suggest"
 msgstr ""
 
+#: bookwyrm/templates/lists/list_items.html:15
+msgid "Saved"
+msgstr ""
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr ""
 
+#: bookwyrm/templates/lists/lists.html:35
+msgid "All Lists"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:39
+msgid "Saved Lists"
+msgstr ""
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -2045,23 +2056,23 @@ msgstr ""
 msgid "Create Announcement"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/announcements.html:21
 msgid "Date added"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcements.html:26
+#: bookwyrm/templates/settings/announcements.html:25
 msgid "Preview"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcements.html:30
+#: bookwyrm/templates/settings/announcements.html:29
 msgid "Start date"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcements.html:34
+#: bookwyrm/templates/settings/announcements.html:33
 msgid "End date"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/announcements.html:37
 #: bookwyrm/templates/settings/federation.html:30
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
@@ -2069,11 +2080,11 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "active"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "inactive"
 msgstr ""
 
@@ -2414,7 +2425,7 @@ msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr ""
 
@@ -2534,13 +2545,13 @@ msgstr ""
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr ""
 
@@ -2739,7 +2750,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 msgid "Update progress"
 msgstr ""
 
@@ -2781,15 +2792,15 @@ msgstr ""
 msgid "Start reading"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21
 msgid "Finish reading"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:27
 msgid "Want to read"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:59
 #, python-format
 msgid "Remove from %(name)s"
 msgstr ""
@@ -2967,11 +2978,11 @@ msgstr ""
 msgid "Update shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Create shelf"
 msgstr ""
 
@@ -3126,11 +3137,11 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr ""
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a7b3e18120821a785b3e99b14f41b1656528ffb5..5123134bf4e165fda9181a0412c7b36a57f34130 100644
GIT binary patch
delta 13921
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
RsK0CH@`0sxWo@h){C`}B1=s)p

delta 14097
zcmZ|V2YAlc|Nrrih)572QCY?<Bm^-+NX&>?g4oiE9byI{wQqax+pZc#tBM+>MU|RW
zt5jR9Z>wm{DvBCy_4j<`oL*P2|8@O8*L6J3IiEA%=kvL9C+)uHUjMxCa{n0Uy~N>K
z=jAxXu*@rtGds8AR4lJr$LSpJI9ZsAQ}GNI#C8deqb5C(F3w!chwCvMw_#EI0u%8n
zreH)Z$Eku@7~nW=X9JmFDn3LPp2lRnXX|U#cAVmr+hThhf>C(P*8hq{DCeug;8+q%
zVG?R#y)hI=V|84Nn(rh=GQV?`Old0e)^(g%tbm!=)p`~OQ?6H!UE@}K9dp%ZP)x&A
zyo8Au%RkzA7RKQ$bm1Y4#;d3e<Zs|Od6?gcB@=}4)@1ad+#P+fFZ$yU%!}jg{b{y5
z*Or&q@+wrn4aiA4Td@G{u=Ss!ALSG1<_w(kw&JSwE~>*5)LDBav05yQRk1i~fvvF+
zcEmi`7u9bNs^4hTLS~{CvIsTtQq;U_lZd}MY^Op4A3z<!ebm`SG<2Lmj7Jx?K(!x;
zipVI`MAI=hF2z!~5;e{zsCM^Jk^399fIN-N1_Bxpe@#%73U!Re5Nv_!(Azo?y(tez
zt$Y+}fiqDHT7&Ah#oj-Ln)qw<#_OmE-a<v{F>3r5ZZc}<)!6K$5PDNCi3)8Q)N2)o
zddLz{J6?$k@IB0fwVIgvL@Z3XHLAV`YJq)ic{pm}qtOT53&?0k%TNn>7u8`mYJkJ&
zgP)_?okK0`3Tg)rP-pxM71~@)%|h~{?uVfk6oDGQx;4qvyPXs=Vch76I*M@^jSFmf
zALgZe2DPBC(FZT1-kNKuf&V~-*t?n8Kq1t`#ZmQ@ZGCN2zh+oV?|&CEm8e*TCGj}s
z#T%#renTCB^Qsv*KdKypnz*zrS4AC79cv5J#IK>+^+APxIBEm4u(00$g=ExmJ?fKe
zC+Y}JpgLYeePUfhJ!CI19D|xWPC8abEocd<-&)iLwxS}o8+CO1kxy^u6#Aie3(jAe
zf@IVo1bxwk>JW`uK!UZYt?z((NYha}>W_-l1k8_%Pzza&8vlLkZtFpN|6~i|pN|IL
z*ov#DiGM@YzeGJ7e#vI#Wl%dxLq)6?>R}v)TKHttgmX|ET54TweFxQV8!FNVl8L_>
zUZ6q)e~%jIC)7Z<Q4h-_Yu=V-=i#Vl#f1eh5p||5QAgDtT{sXm;at?Xt56Hxh>F}E
zHyL$2jat!Hs0iFbh4h&%=WAsa6owkGj4fBg{FLk3`d3i{cSdb&Flzj4)B?t#HZ;xF
zyH}D?sMn!CZoz`M4~yeTR3vVqcKQ%?_AgQGbGJ4F7q*6>B3T-nVKiz1!%&eKWy=eV
zZf7|eg=7tCg6$Z92T&87K}F&+YNz*X`8ftq&Yxm_zK5fB7-y}Ay5AHPkxr=b24O)Q
zgN60}&$10xVIgkpL^V8u+WC1@hs&q|@1R2a0`)V)tBvE7#WJWPOh!eh2Wp%?sD%wj
z^&f}&{xBE)^#0!_qa%2P+Tlx7!+dQWhbTK?sE4f|Y9TYRFfK<;v>Da!1JwJy-_}1y
zjr$zc&%2#jP!Q^fN}*d1Ls>Ffd2Niq6x4uOsE%&b8P3BJxC9k}4^absf@*)*md~Qb
zyNEUMHtJ|gwKof|g!%wWY)||(K^H0%q5;<7)^Qj}{WL6sE3g=DLk)P!dI@z@zn~U$
z9~Js1s0iimU?%oOjTeTRH>Lye*N*B?5reOz7BUm{v@Sx0dNXQ*Pi*<P^%835chH4@
zU=a-NXucg+MD4T_YMw0AIEzs2R=LS2lsix>--`<MLDUY8qjq``)$S^4fZM2rKEnR^
z7goZ)oy<5(Q9ECS`kAo~^-S%<Lihz%L-%DeiDUvgn*mc$3rIyx)E%{u{-}@Qkr;#?
zRAk<@<-MqWXHZ|aFJcJ(hFVBozP)H81+1YM%lu9h8HFMhwZp-von>Rr!-rb=JdDKE
zsCGxKr%~-Mq89W6YT@@$3wn+^bLTZ)Q3ygENjwJV{clf3uSsvz5oDq|jzA4O7PW(^
zwtg0B0Si$JTw(8TLhW!XDq{O=`EyjeuTdNM+15YCP`&@T_%u+5a8!e6)B+N0IT011
z6x0IK?fn5*n({Dve<@a`{5~oYmr)D7huX*!48xZgjiFtL|0`q~l2OP~F$#O3&Tba!
z>0Xc8!3Wk)QJ;KgP!rroP4E=e-bphXD1h@Q24O{f8`b`t_1iS!uh3qhLJ!r?sGUDU
zP52M$wJF%u>?j69Dc85<R8+_Zpe7!Pda9?Oj`U;HxJT^$Z&CAIM?Fiox)Og)RIr;_
zS#i{Wk(e7}aS+x(?Qny2D{3cuP_NUcsD9^Ak^G<a25O=Q)}q}_zdERgvXPsN&b||B
zA?c`zhNA`=huZOUEQ{-~0-i*DR6jv2B&3IF??Nr8Jn9*!jk@0wHGT)wGu9i6qI)=*
zl4NG1LiRo?lzUJMJB%9OOH{{8s3W?C!Fb=^&)d^1JOFh+1hs*Zwmuq5QI17DbM1|8
zr#~4@Fab5;3{=OZs0r7iLc1LmnFGix?Hot7cl9zmtAuJ-7qzqIsEzbM^&5ocF&krW
z9X8kde=aA(tI^whgr;L78Z1Wb@H^D&_YievKI!I%P$(u*u7SEg3KhY5m<Ly&BC!Uw
z!FNy(<2Llh!|2QW&Ix7kOVrN4Lv^^0iojh|$3Ic+0{WO8hM?M4M%5>v+9#nR(bm>?
zLyeb#ir5g;LdT<96*I}G!!qjz)WADX1MkNOJZkH2Vjjv5(FdPmS$v6VAJx}b8TAmx
zqaMEIsIyN+&70Ym_^ZJ<DiqrJs8GI*+VMxIGdzWA_bqCI+gKcb$0#h6VKz_`^HOev
zdTWwV6ZSz(I2N_BS*S=Y&LIALjdM0o5r<DO87uVT?>{&aWAR(mTavH8`I}F9)N8mA
ztKfOmL|y~Tz#$k(xg2WzR@fZZpf+{~E8<Hx8HK*WKyxPX)`mEY`c}xtwey*+FFwfZ
zq#Wj_z6NUIB-8>sV*wnAI-03i9_OHr>?2f!4q!`kA0yL>OweFc(G#`f?dXNqQ3Kw<
zs`v=CqsUBSHnygG0;^;25OYMysEBqz^`DL9aJjwz8L|Pl^97mq-1x>?VW{~t+XRfK
z{vztx@FyHDbfI?A0DZA3YDX!yzB6j)U9keD+xmsJybKpne*}H?{&&pE`EKBJLk+kO
zW7GgO&_mS2^bEUW;BYfx7HY?1Q2n-Jd@jDiAx)j%NAL?N_Q^I+{~gqVo}-Q|@(qrh
z`JLKiN?;Q#g6Y@*M`IiO1nXkKktPz!s2|VWP$3<Ot#BO%;{$Y|?<h8h(Wtj&0;>IL
z)c1fB=q^L%8X3Lcc}JUp%VSx}4Y39eKn?IVR>VW7e)q5%297ZgYZDwuc`x!fI8kHG
zQ7*+)%6D)gHX7$R?8!Mkj`(*WQ*XTasr4o%Qr?2K@g8cTXu?z#TcOT=0tVqURK!-I
zo`DZgNAVFB!b7MdJa6w`viE<o^|#&j#sky`!!uj<nqUUVhyK)uV?m5YO&D*>Eir&{
z7c7heF%-w6>X)P5f=#ILe?+yrh1$pqH<>6hii;*Fi`qdARD=4coixT`*bxIU3lngf
z^$?b(`~r(&iAm=3APyCo4ybX{P~-JMEy(=_nOHItu_1nlTKO|nM_(S{d{_tzU^te<
za_GWlsAr=es{M59d{pR{VHmDP_1kOx4omC(e@;fPL-8plG}X|Xa${7eo1<3V4YlG7
z)Y%V1J?+y_ky?!*xB<101Na&qLyhB_YW`vxhg#Ti3}t@j3>k&=CTfBgs1SKiGXuSX
zr6?CiEu=nb0nJcH)&<pm0Q%rq)B+}>+Ra8SU=1pgAEG|G4`R;m|EI_(<X@`-e?f)n
zJ}R^U(~U8xvu%NuuqP_C3sG;&7L3MQsBr>km<1QZJd`6*4|4_7LzsYWt)zv$(FwJa
zbX0w|t)GNi-~z0NYf%fhf-WpL(?p^&YRC0Z6SPH**W2D7fr`WwTV64f`0LCz*@mB4
zFQ6v8j%D!?`eOJj^Q@FX?WC41H$zR-71b{jUFb$0GG{H8!=spq_fQ*5o6Y%apnkK>
z1aDwo$`epKn1OoDR$@N9XuX13&>i%{N2mq-je7qJ&M^;TIn*=K0DUk8_0V>*^_gxm
z3fXuJ$3<8Gw_$$VZ_6i83%!UM@R}_@L`Co)TOTslj8hi1@P?>|dmKjK0_!f+`0j7W
z6d-dAwe$O^hvliQ{~HyFeDll)P%%`y1XQ~Qs7N$Ljgx{}P#S8d*{BH3LmlOERHP0e
z{oKxZG78!Es1-i84T9&Jj^$7hip3Jx1Qp73)Wb9oHPJ-WPFJ8lPqv_r>@Wu48Pr04
zKrQ$t7SsFxfQ&-#zrfsxw#Hg(qZZf*wezm1o%TU3EDH<abks-ma?}EMV*q}FiqvUT
zWG<i<a91+F^Vl}{8(UD$z0ge58p}}bgz7NXIu*5`d8i3Cp$7gK_4#n#-oJ$fDSIt4
zpA&^q{VJjhn_$l0|ND~B1Vgb9jz%?{ZQY0p^+8mmE}}ko9-u;<-(w<C3KjA=)WnIX
zcCAqn>yJ_R23En<9^$V7&rzX}-NhjM9o4~Su^A```%#WS9l;#bf)`^TzJ>b4+>UMV
zOVmep#1gacMyPR9QT+y?BA2~{_}3*fjS4N`C>F+3sE6$b)I;-^z3;Qs4Cs$~=prx@
zYoQ|7-8vLC!6b~uMW~1zv-KBk`DZs7Jsgiv56^SdM{Ln$W}*(({-{v8F&I}`ccK>f
zh4mupS@;oO!KbJN`Y$)1AJwc4Fz5YmO-3Po9Tm!6r~$Jv1SeooT!H#wv>j{XS$q}q
ztuO<%M@6hVhM*f2k>#j|_&s#tSyUwMV|~5<FUf>bQE#RB6{$1EP+pHZn)B$70dJai
z#Zd#)L`AL%>gbYfeLGb9o~VrtvG+%!9!@vT$5~iI?|;}T)3A*-74`7+K%L=aRAfAu
zi0@!ayom~7+*>AM4Nwnl3)C~z8TC;1M{RHxDk2+DN3$FAGQV?*OnLkY6}p$GBM4q?
z&b$<=LmjMvZBa)u6E)yk)Kk3!gK-~foC{bB@1i0RwZ=rM5~_V1x{HyiM@AFAZf~Tc
zc03sM@JvLtdlxnFQB)`|qc`3_9mQSLzz<R5y+9p>_gb@nK-5OUQ0=R%CH@L=4Jx#g
zCe}`<on&AUoPZi=36{k5s0AEB^*f7t2CksSyMfxkAE<@+tuqS?LT#uRY9mSO+~yaH
zR4ViVG21p=gX*{m!*M6-h|Z$U@;Pb&L2sL1)k>g?a(C2%CZaa5$hsLTP(F-`&~MhK
zZZdjUob@(D$eZPaVGQm<b+~H1gF4Gcs0sc=?L26MDTiTM%CV@3y@oov4AeYRQ5#!k
z%kFh#YErQaweq{D(ENo8VbDhV@L(y*l~4nvpeF8V%l%Mq!x-#=(@{rp8}+(AM@{Ve
zju|Hqx$kzWlhH~Wp<bW1SQ@)wC7g^JcqeK>pQ3ht9<|`xs0h74O_2Lt)88Mp^QxGD
ztxyr2ff{cQ=KTHtFd3cw1=PcK12y2Es0qC{nJ*^6sMo3%DiZBbI~;*p$W+t@mZC4N
zNA=%=K6nt-|2XEwE0X8WxoI2RN3HA+)WBZvnWG6rJ#@`cN7EZMz!+3$C!;SeLM`M?
z)Izq{`n}kh@?m>Fe6u;iis;r^)+3{krl2}zU>+QS(KrSbx{a8GUtt3*`o4LpJ7Y7-
zQ?NLmK`r#I)oY6>hhi)0tDrXI-eTYX6;x<P@1b_G1O0FxYJo>>`5Vkn`6tvf^Q$et
zKt;@FtNDN_iZ03(QS~iR3rj=wAA_22`c~o}MrJ-0I;+iC01u!#et`<{_qKc+^^816
zEv(=+vtSpheKe{*0b{TQYTQw%jm<%AYzZo|YuvWtr1dLQ=zc&=^cWQ?zYolgOQX)X
zDr%x6)Wh2zHBkoU!!f9j+G(hXSE1g9jTniCQIT-pvYE%I5INh;0!m;2#W>W88>1G~
z8arTbtb_ZoD?Y^$*l~w>XisB#%HBKKC052*Jcn`UwJT=>ZYQ3McF-IZvaXncbFeu+
zK}96-L-WU`PN)UVM(uQobuDI7ejmGG#BOtc5^5uJQT^URJ?!sd37$XaAQ_$ckEr+b
zE>^(bZMnoA(=ifLsIQD#*aU2ar%*c!`^fw^qn4=9wn5dWVH;e4E$|wuU!{+^&-~6f
zGFsVojKh7Xojt(H_$TTNE9^CATpc@6Zi;Pj4R*laF&>-kGiN^$^+~!6)qg)~VMkHp
ze~CGN|G!K|@B3}6i1$$oDz@J&APUz~?udo(DJsOipO}F&PzxQ3ir_j_yG@vldr=Fh
za=;v60_x!%bb$EhBGZk3I(U)c`jPxlTtWFuq;Jko#OKtnBR`A!=_C*N0k%(7wd1}n
z?d&I;AH)3`l-uJH+cp(Plf2bf=RcOlRdNdEKc(L${~2}DaSW*hjZ0BZwS%hZMe<!q
zmr2Ro*X|43`?qm6>6$Ii=Dx1^wtRv7WAaU?_jU8nAbaB<ZhTFi2i_S+eRWbA>AzPo
zTX0domV5y1`G|0O;8Cn?$C`wCoev;i5pu3E<cHY&S$u=Co<FCLt?a{~hsbMDy1pUh
zrcrsyiP*{3>uGLFc_B&X_}|NiHi4vG+zZ21w$H1Sb&axR<%enhc4P)o`55Q@=cXDo
zqnyXqy=k4R8(e!Ba1NFtjUXRsC)lK$T<a-MAeFQA-&4nP>m0J>dE|f9`%%PJ48eFN
zi6eC(g;Ng3=AIQ5OXu3^IZ!d!U5#>K(!W<{GNF_+NU@~%>C+#pqdsQupspKM<+qVf
zz=bMsb*J2sKDs91RGS}7{ao^&QD21AF&DoXwxHr2Zv0I}7m}_Oq{E~?ss9S+lk~bp
z(zZU<qP{e#jb~v@uwQO!3y@lScEkk5wWGclCB3c=HieI=({-QpKl0tEuZl^erX-K&
zc}!{dVrq4LL(OLVj&y_6lQdGTxW5^TkqVMeCk2w%HH7>vlXX_wx>1xXkgv);UB0%y
ziY+gq{1NF6_ukQKok`&+X%*=qX+};rLO^~3`MLN5X|%1c!$3<s=PL!f$5Xq2REwH7
zNHs|XC{Lkf8@xiAM$&Z>pOM}qm7?7xQ=Rkw%eN;#mHM5e=H!o%-XotxyPM?ukmsY+
znTfBHc9JjS#WSBpgD4966fe(>2BagTGo*j7G%{aOe(OJVpHf$j)QbMPE^+TQ^7%<u
zZ95<88<O0V2dNQPCGx9D*K<m>&5wa>DmqfJ8~c%T?X#Z8vZQ9V{2uqVkY4qasuC1E
z&(=1hW~5yTSto}46Ygyx)hFN5lU60TWlP(lhnjF@l6ul28E4pgOR+U|%}KiUTG!b7
zohcWkeyHcOD#4*|+q+TN%I1H;zMh9wg5tW6(-(=q?VS-CkgE=5Z^k=AegPICeM;S0
z4EH2d?d8t0Jx<Z07wHeu1n%nEVDFVNMdt&`0o)r;T26kEZMVbTe-)?MI#mrLKiQ6<
zvJd$h)V*u#TJy$)$NITbsN;)A&h-QT9_IdWEKU7sOu(De)gj-KRFbm3RdmJ1q*dhG
z;$PTU_euVgb)_1dyp#u$-$0r}eg@-xPdc3|=c}A))q#qqq<^mv8jhuKoVt3Xw<y=8
z{2KX1IFnSI{7~wD#$BX%lCC8N=W|c4Y9$+_Q(J{pgA~l27x)`#COvsJopH8x8g+iu
zCE)8=iKOd<r$@CQ|BAM>j=K#!6RQQg=TqZHN!MkA6GC|~sfTSnk^Ilx`@*&xZtKfo
zL(&6V-_+J0qwR3&rr2_K++o{jifGC)rtHr76XiJy_eno;Guw7LKz=-_Ch32qm)uXZ
z_i8Fn-9h}0q^p4;=Ub_=E2s~m{dRl*BkHD-Dp1F_U8gtoF8$iy&kjmm&b8D!%yv{U
z({rGDaIWc|udA2tFo*hZ>e||NpJP78NTEKAw3TupJ7#6vOSz{lN7z1p(e4qcK1tUy
zPs_NHaV;n<rsQpF^*v)DJ+pBDb=^@{d-6+3_ecXh>*B)wGsykPolqR%IT;roU6y{|
zQqt9k{IBGb$gjcGlsl8Ek#FbmuMzD2-L^cR)1GIRyAw&rsJ}wpVtj7z{X>2d`Fh;f
zrC($QQg@4_>lcGFit-<}?iJcblP_b-gK1Nj{AB6_d5PE8c%@0Qy_X-Gkb+2kZQVxX
z3w_QN!oU8c2>MnxRnAGPmzU>djj*)q>Za~clxB^|*F{b{=R5c#+k6W3E2-~I+N3^Q
zxyXM=J_@H%-a}eO+E1N}wAM4CX0^29-0e?k9BCHmpjx3n=@dy<DCsQuXuM$SRR8aF
z*VYwdEM3cSFsZgDPkhN-opwdW`xPrNyjMoQ!F^pxnVAE!c2#J<$}g&Ide(@6!?T=r
z={<(^%5d4Dt54=IS43pFp(E0Vjf&2S*mW>%a6)i$zn;S~vs}G0hYd^58j?A<cfa((
s!_%{NRb1AuKz-A*M{gSRPIvV@vM-Cyy?Z$SpL*Aj|7V89>!U*d50G$3Qvd(}

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 04497a2a..076e65f0 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-08-27 19:11+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,53 +84,53 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "nombre de usuario"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home Timeline"
 msgstr "Línea temporal de hogar"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home"
 msgstr "Hogar"
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:125
 msgid "Books Timeline"
 msgstr "Línea temporal de libros"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "Libros"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:171
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:172
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:173
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:174
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:175
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:176
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
@@ -219,7 +219,7 @@ msgid "Last edited by:"
 msgstr "Editado más recientemente por:"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "Metadatos"
 
@@ -231,9 +231,9 @@ msgid "Name:"
 msgstr "Nombre:"
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr "Separar varios valores con comas."
 
@@ -262,7 +262,7 @@ msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr "ID Inventaire:"
 
@@ -276,8 +276,9 @@ msgstr "Clave Goodreads:"
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:78
 #: bookwyrm/templates/settings/announcement_form.html:69
@@ -293,8 +294,8 @@ msgstr "Guardar"
 #: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -335,7 +336,7 @@ msgid "Add Description"
 msgstr "Agregar descripción"
 
 #: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
@@ -418,22 +419,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr "Subir portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "Agregar portada de url:"
 
@@ -448,133 +449,133 @@ msgstr "Editar \"%(book_title)s\""
 msgid "Add Book"
 msgstr "Agregar libro"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "Confirmar información de libro"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "¿Es \"%(name)s\" un autor ya existente?"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "Autor de <em>%(book_title)s</em>"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "Este es un autor nuevo"
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "Creando un autor nuevo: %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "¿Es esta una edición de una obra ya existente?"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "Esta es una obra nueva"
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "Volver"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:127
 #: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "Título:"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "Subtítulo:"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "Número de serie:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr "Idiomas:"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr "Editorial:"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "Fecha de primera publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "Fecha de publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr "Autores"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, python-format
 msgid "Remove %(name)s"
 msgstr "Quitar %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, python-format
 msgid "Author page for %(name)s"
 msgstr "Página de autor por %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr "Agregar Autores:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
-#: bookwyrm/templates/book/edit_book.html:220
+#: bookwyrm/templates/book/edit_book.html:227
 #: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "Portada:"
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "Identificadores de libro"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr "ID OpenLibrary:"
 
@@ -640,31 +641,37 @@ msgstr "lo calificó con"
 msgid "Progress Updates:"
 msgstr "Actualizaciones de progreso:"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "terminado"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "Mostrar todas las actualizaciones"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "Eliminar esta actualización de progreso"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "empezado"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "Editar fechas de lectura"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "Eliminar estas fechas de lectura"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "Resultados de búsqueda"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/layout.html:71
@@ -973,18 +980,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "To Read"
 msgstr "Para leer"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Read"
 msgstr "Leido"
 
@@ -999,6 +1006,12 @@ msgstr "%(year)s Meta de lectura"
 msgid "Who to follow"
 msgstr "A quién seguir"
 
+#: bookwyrm/templates/feed/suggested_users.html:5
+#, fuzzy
+#| msgid "Directory"
+msgid "View directory"
+msgstr "Directorio"
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1014,7 +1027,6 @@ msgid "Search for a book"
 msgstr "Buscar libros"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
@@ -1162,7 +1174,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Los libros de %(username)s para %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Import Books"
 msgstr "Importar libros"
 
@@ -1212,7 +1224,7 @@ msgstr "Importación ha empezado:"
 msgid "Import completed:"
 msgstr "Importación ha terminado:"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:24
 msgid "TASK FAILED"
 msgstr "TAREA FALLÓ"
 
@@ -1287,19 +1299,6 @@ msgstr "Permiso denegado"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "¡Disculpa! Este código de invitación no queda válido."
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "Resultados de búsqueda"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Resultados de búsqueda por \"%(query)s\""
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "Libros correspondientes"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1439,6 +1438,10 @@ msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1578,10 +1581,28 @@ msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)
 msgid "Suggest"
 msgstr "Sugerir"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "Guardar"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "Tus listas"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "Listas"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "Crear lista"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Iniciar sesión"
@@ -2046,23 +2067,23 @@ msgstr "Activ@:"
 msgid "Create Announcement"
 msgstr "Crear anuncio"
 
-#: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/announcements.html:21
 msgid "Date added"
 msgstr "Fecha agregada"
 
-#: bookwyrm/templates/settings/announcements.html:26
+#: bookwyrm/templates/settings/announcements.html:25
 msgid "Preview"
 msgstr "Vista preliminar"
 
-#: bookwyrm/templates/settings/announcements.html:30
+#: bookwyrm/templates/settings/announcements.html:29
 msgid "Start date"
 msgstr "Fecha de inicio"
 
-#: bookwyrm/templates/settings/announcements.html:34
+#: bookwyrm/templates/settings/announcements.html:33
 msgid "End date"
 msgstr "Fecha final"
 
-#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/announcements.html:37
 #: bookwyrm/templates/settings/federation.html:30
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
@@ -2070,11 +2091,11 @@ msgstr "Fecha final"
 msgid "Status"
 msgstr "Status"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "active"
 msgstr "activo"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "inactive"
 msgstr "inactivo"
 
@@ -2415,7 +2436,7 @@ msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr "Sin portada"
 
@@ -2535,13 +2556,13 @@ msgstr "¿Eliminar estas fechas de lectura?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr "Me gusta"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr "Quitar me gusta"
 
@@ -2741,7 +2762,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 msgid "Update progress"
 msgstr "Progreso de actualización"
 
@@ -2783,15 +2804,15 @@ msgstr "Más estantes"
 msgid "Start reading"
 msgstr "Empezar leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21
 msgid "Finish reading"
 msgstr "Terminar de leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:27
 msgid "Want to read"
 msgstr "Quiero leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:59
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "Quitar de %(name)s"
@@ -2969,11 +2990,11 @@ msgstr "Editar estante"
 msgid "Update shelf"
 msgstr "Actualizar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "Todos los libros"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Create shelf"
 msgstr "Crear estante"
 
@@ -3128,11 +3149,11 @@ msgstr "Des-suspender usuario"
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr "Archivo excede el tamaño máximo: 10MB"
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s: %(subtitle)s"
@@ -3159,6 +3180,12 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "Resultados de búsqueda por \"%(query)s\""
+
+#~ msgid "Matching Books"
+#~ msgstr "Libros correspondientes"
+
 #~ msgid "Local Timeline"
 #~ msgstr "Línea temporal local"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 75ac69ebf3b80ff1bbba48c262ed1cbafa631bf5..a28c903f6b91ebac632e7edd76d69c8000dc0242 100644
GIT binary patch
delta 13176
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
T=lay`3l>)P-+pIB=gR*B|AKto

delta 13370
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 46416931..81130aa3 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-08-27 19:11+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -84,55 +84,55 @@ msgstr "%(value)s n’est pas une remote_id valide."
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "nom du compte :"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home Timeline"
 msgstr "Mon fil d’actualité"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home"
 msgstr "Accueil"
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:125
 #, fuzzy
 #| msgid "Book Title"
 msgid "Books Timeline"
 msgstr "Titre du livre"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "Livres"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:171
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:172
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:173
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:174
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:175
 msgid "Simplified Chinese"
 msgstr "简化字"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:176
 #, fuzzy
 #| msgid "Additional info:"
 msgid "Traditional Chinese"
@@ -223,7 +223,7 @@ msgid "Last edited by:"
 msgstr "Dernière modification par :"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "Métadonnées"
 
@@ -235,9 +235,9 @@ msgid "Name:"
 msgstr "Nom :"
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr "Séparez plusieurs valeurs par une virgule."
 
@@ -266,7 +266,7 @@ msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr "Identifiant Inventaire :"
 
@@ -280,8 +280,9 @@ msgstr "Clé Goodreads :"
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:78
 #: bookwyrm/templates/settings/announcement_form.html:69
@@ -297,8 +298,8 @@ msgstr "Enregistrer"
 #: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -339,7 +340,7 @@ msgid "Add Description"
 msgstr "Ajouter une description"
 
 #: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
@@ -422,22 +423,22 @@ msgid "ISBN:"
 msgstr "ISBN :"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr "ASIN :"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
@@ -452,133 +453,133 @@ msgstr "Modifier « %(book_title)s »"
 msgid "Add Book"
 msgstr "Ajouter un livre"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "Confirmer les informations de ce livre"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "Est‑ce que l’auteur/autrice « %(name)s » existe déjà ?"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "Auteur/autrice de <em>%(book_title)s</em>"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice."
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "Création d’un nouvel auteur/autrice : %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "Est‑ce l’édition d’un ouvrage existant ?"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "Il s’agit d’un nouvel ouvrage."
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "Retour"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:127
 #: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "Titre :"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "Sous‑titre :"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "Série :"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "Numéro dans la série :"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr "Langues :"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr "Éditeur :"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, python-format
 msgid "Remove %(name)s"
 msgstr "Retirer %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, python-format
 msgid "Author page for %(name)s"
 msgstr "Page de %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:220
+#: bookwyrm/templates/book/edit_book.html:227
 #: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr "Identifiant Openlibrary :"
 
@@ -644,31 +645,37 @@ msgstr "l’a noté"
 msgid "Progress Updates:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "terminé"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "Montrer toutes les progressions"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "Supprimer cette mise à jour"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "commencé"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "Supprimer ces dates de lecture"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "Résultats de recherche"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/layout.html:71
@@ -983,18 +990,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "To Read"
 msgstr "À lire"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Currently Reading"
 msgstr "Lectures en cours"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Read"
 msgstr "Lu"
 
@@ -1009,6 +1016,12 @@ msgstr "Défi lecture pour %(year)s"
 msgid "Who to follow"
 msgstr "À qui s’abonner"
 
+#: bookwyrm/templates/feed/suggested_users.html:5
+#, fuzzy
+#| msgid "Directory"
+msgid "View directory"
+msgstr "Répertoire"
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1024,7 +1037,6 @@ msgid "Search for a book"
 msgstr "Chercher un livre"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "Aucun livre trouvé pour « %(query)s »"
@@ -1172,7 +1184,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -1224,7 +1236,7 @@ msgstr "Début de l’importation :"
 msgid "Import completed:"
 msgstr "Fin de l’importation :"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:24
 msgid "TASK FAILED"
 msgstr "la tâche a échoué"
 
@@ -1301,19 +1313,6 @@ msgstr "Autorisation refusée"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "Résultats de recherche"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Résultats de recherche pour « %(query)s »"
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "Livres correspondants"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1453,6 +1452,10 @@ msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1592,10 +1595,28 @@ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 msgid "Suggest"
 msgstr "Suggérer"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "Enregistrer"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "Vos listes"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "Listes"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "Créer une liste"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@@ -2067,23 +2088,23 @@ msgstr "Active :"
 msgid "Create Announcement"
 msgstr "Ajouter une annonce"
 
-#: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/announcements.html:21
 msgid "Date added"
 msgstr "Date d’ajout"
 
-#: bookwyrm/templates/settings/announcements.html:26
+#: bookwyrm/templates/settings/announcements.html:25
 msgid "Preview"
 msgstr "Aperçu"
 
-#: bookwyrm/templates/settings/announcements.html:30
+#: bookwyrm/templates/settings/announcements.html:29
 msgid "Start date"
 msgstr "Date de début"
 
-#: bookwyrm/templates/settings/announcements.html:34
+#: bookwyrm/templates/settings/announcements.html:33
 msgid "End date"
 msgstr "Date de fin"
 
-#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/announcements.html:37
 #: bookwyrm/templates/settings/federation.html:30
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
@@ -2091,11 +2112,11 @@ msgstr "Date de fin"
 msgid "Status"
 msgstr "Statut"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "active"
 msgstr "active"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "inactive"
 msgstr "inactive"
 
@@ -2436,7 +2457,7 @@ msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr "Pas de couverture"
 
@@ -2559,13 +2580,13 @@ msgstr "Supprimer ces dates de lecture ?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr "Ajouter aux favoris"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr "Retirer des favoris"
 
@@ -2768,7 +2789,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 msgid "Update progress"
 msgstr "Progression de la mise à jour"
 
@@ -2810,15 +2831,15 @@ msgstr "Plus d’étagères"
 msgid "Start reading"
 msgstr "Commencer la lecture"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21
 msgid "Finish reading"
 msgstr "Terminer la lecture"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:27
 msgid "Want to read"
 msgstr "Je veux le lire"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:59
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "Retirer de %(name)s"
@@ -3005,11 +3026,11 @@ msgstr "Modifier l’étagère"
 msgid "Update shelf"
 msgstr "Mettre l’étagère à jour"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "Tous les livres"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Create shelf"
 msgstr "Créer une étagère"
 
@@ -3167,11 +3188,11 @@ msgstr "Rétablir le compte"
 msgid "Access level:"
 msgstr "Niveau d’accès :"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr "Ce fichier dépasse la taille limite : 10 Mo"
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s (%(subtitle)s)"
@@ -3198,6 +3219,12 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "Résultats de recherche pour « %(query)s »"
+
+#~ msgid "Matching Books"
+#~ msgstr "Livres correspondants"
+
 #~ msgid "Local Timeline"
 #~ msgstr "Fil d’actualité local"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 6739399271062a1ccaacee0d377727c4a396f406..bfcd3d0193b9e570a7d650349aacef21d15e309b 100644
GIT binary patch
delta 13966
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
E2T;Jwy8r+H

delta 14110
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%0Ac
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

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 75def373..df3ee019 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-08-27 19:11+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -84,53 +84,53 @@ msgstr "%(value)s 不是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s 不是有效的用户名"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "用户名"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "已经存在使用该用户名的用户。"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home Timeline"
 msgstr "主页时间线"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home"
 msgstr "主页"
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:125
 msgid "Books Timeline"
 msgstr "书目时间线"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "书目"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:171
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:172
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:173
 msgid "Spanish"
 msgstr "Español（西班牙语）"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:174
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:175
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:176
 msgid "Traditional Chinese"
 msgstr "繁體中文（繁体中文）"
 
@@ -219,7 +219,7 @@ msgid "Last edited by:"
 msgstr "最后编辑人:"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "元数据"
 
@@ -231,9 +231,9 @@ msgid "Name:"
 msgstr "名称:"
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr "请用英文逗号(,)分隔多个值。"
 
@@ -262,7 +262,7 @@ msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr "Inventaire ID:"
 
@@ -276,8 +276,9 @@ msgstr "Goodreads key:"
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:78
 #: bookwyrm/templates/settings/announcement_form.html:69
@@ -293,8 +294,8 @@ msgstr "保存"
 #: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -334,7 +335,7 @@ msgid "Add Description"
 msgstr "添加描述"
 
 #: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "描述:"
@@ -417,22 +418,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "OCLC 号:"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr "上传封面:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "从网址加载封面:"
 
@@ -447,133 +448,133 @@ msgstr "编辑《%(book_title)s》"
 msgid "Add Book"
 msgstr "添加书目"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "确认书目信息"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "“%(name)s” 是已存在的作者吗？"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "<em>%(book_title)s</em> 的作者"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "这是一位新的作者"
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "正在创建新的作者: %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "这是已存在的作品的一个版本吗？"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "这是一个新的作品。"
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "确认"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "返回"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:127
 #: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "标题:"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "副标题:"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "系列:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "系列编号:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr "语言:"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr "出版社:"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "初版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "出版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr "作者"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, python-format
 msgid "Remove %(name)s"
 msgstr "移除 %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, python-format
 msgid "Author page for %(name)s"
 msgstr "%(name)s 的作者页面"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr "添加作者:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr "张三, 李四"
 
-#: bookwyrm/templates/book/edit_book.html:220
+#: bookwyrm/templates/book/edit_book.html:227
 #: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "封面"
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "实体性质"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格式:"
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "页数:"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "书目标识号"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr "Openlibrary ID:"
 
@@ -639,31 +640,37 @@ msgstr "评价了"
 msgid "Progress Updates:"
 msgstr "进度更新:"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "已完成"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "显示所有更新"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "删除此进度更新"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "已开始"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "编辑阅读日期"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "删除这些阅读日期"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "搜索结果"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/layout.html:71
@@ -969,18 +976,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "现在这里还没有任何书目！尝试着从搜索某本书开始吧"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "To Read"
 msgstr "想读"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Currently Reading"
 msgstr "在读"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Read"
 msgstr "读过"
 
@@ -995,6 +1002,12 @@ msgstr "%(year)s 阅读目标"
 msgid "Who to follow"
 msgstr "可以关注的人"
 
+#: bookwyrm/templates/feed/suggested_users.html:5
+#, fuzzy
+#| msgid "Directory"
+msgid "View directory"
+msgstr "目录"
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1010,7 +1023,6 @@ msgid "Search for a book"
 msgstr "搜索书目"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的书目"
@@ -1158,7 +1170,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Import Books"
 msgstr "导入书目"
 
@@ -1208,7 +1220,7 @@ msgstr "导入开始:"
 msgid "Import completed:"
 msgstr "导入完成:"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:24
 msgid "TASK FAILED"
 msgstr "任务失败"
 
@@ -1283,19 +1295,6 @@ msgstr "没有权限"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "抱歉！此邀请码已不再有效。"
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "搜索结果"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "\"%(query)s\" 的搜索结果"
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "匹配的书目"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1435,6 +1434,10 @@ msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是开源软件。你可以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1574,10 +1577,28 @@ msgstr "没有符合 “%(query)s” 请求的书目"
 msgid "Suggest"
 msgstr "推荐"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "保存"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "你的列表"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "列表"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "创建列表"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "登录"
@@ -2043,23 +2064,23 @@ msgstr "活跃:"
 msgid "Create Announcement"
 msgstr "创建公告"
 
-#: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/announcements.html:21
 msgid "Date added"
 msgstr "添加日期:"
 
-#: bookwyrm/templates/settings/announcements.html:26
+#: bookwyrm/templates/settings/announcements.html:25
 msgid "Preview"
 msgstr "预览"
 
-#: bookwyrm/templates/settings/announcements.html:30
+#: bookwyrm/templates/settings/announcements.html:29
 msgid "Start date"
 msgstr "开始日期"
 
-#: bookwyrm/templates/settings/announcements.html:34
+#: bookwyrm/templates/settings/announcements.html:33
 msgid "End date"
 msgstr "结束日期"
 
-#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/announcements.html:37
 #: bookwyrm/templates/settings/federation.html:30
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
@@ -2067,11 +2088,11 @@ msgstr "结束日期"
 msgid "Status"
 msgstr "状态"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "active"
 msgstr "活跃"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "inactive"
 msgstr "停用"
 
@@ -2411,7 +2432,7 @@ msgid "and %(remainder_count_display)s other"
 msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] "与其它 %(remainder_count_display)s 位"
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr "没有封面"
 
@@ -2531,13 +2552,13 @@ msgstr "删除这些阅读日期吗？"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正要删除这篇阅读经过以及与之相关的 %(count)s 次进度更新。"
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr "喜欢"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr "取消喜欢"
 
@@ -2732,7 +2753,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 msgid "Update progress"
 msgstr "更新进度"
 
@@ -2774,15 +2795,15 @@ msgstr "更多书架"
 msgid "Start reading"
 msgstr "开始阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21
 msgid "Finish reading"
 msgstr "完成阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:27
 msgid "Want to read"
 msgstr "想要阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:59
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "从 %(name)s 移除"
@@ -2958,11 +2979,11 @@ msgstr "编辑书架"
 msgid "Update shelf"
 msgstr "更新书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "所有书目"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Create shelf"
 msgstr "创建书架"
 
@@ -3115,11 +3136,11 @@ msgstr "取消停用用户"
 msgid "Access level:"
 msgstr "访问级别:"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr "文件超过了最大大小: 10MB"
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s：%(subtitle)s"
@@ -3146,6 +3167,12 @@ msgstr "密码重置连接已发送给 %s"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "\"%(query)s\" 的搜索结果"
+
+#~ msgid "Matching Books"
+#~ msgstr "匹配的书目"
+
 #~ msgid "Local Timeline"
 #~ msgstr "本地时间线"
 
diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo
index a1075ef48305939c29071de898e0eb30fd353541..0ee84d693016951a6bbb114392d6d72e833bebd6 100644
GIT binary patch
delta 13224
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
L*bzG;CDZ=_IOP)O

delta 13346
zcmYk?2YgP~AII@45fO=oL`2L;hzv7gs~AP>NQ~Gc_6nj_>4Q+Cv_Vm$tr}HI2hmbR
ztLRWlX|>hXEKMnG{jH+@pYL;jeZAaQe|ewZIp>~p?z#6qd776;ANp+j$j9?bNWo<e
z$8aCVDT{+b9jBhJ<7|ylt>etA?Ks&uALrmhd;)Wl948)^U>NSjB6t$Z;4fGb|G}nM
zypH3fVj9-O^%(3p9_JK=a4IfgBtF3QSgtOCBd`n3L#^p&t1np3aY~R!VHDQGir5pw
za2iJ75@Zd|Rt(4Un27f<i}{_Z^;K}3H8=)?8aPfmK7&*7Yix>b8@gBYJhDb-9Y*5!
z7>D;z3yf~$IDXg`LowAHgoVf_V`21QQRa8%QSis**5OslH(I{U@;uauA0c<hIfOy@
zh1GwD0pw?qt#$G(zi0Y3cKa7a-NMr738WB5p%&Ibt#Bw7!!f8U@t`J}gF0~uY9X(q
z7P193@!P10ccJ=!jvDt{)Ry}{>DD*IqU5cgWdAi_S1L5nAk;k^hB{$^b=-^Ep(Ch?
zPNEk2Glt+L)OmMM{UVyUR>Xqjaj0jaI%;80VJYm~g#FiwM^K>^O+}qB54AIkP&=>^
zHSlYwew$DW--+sf5Vd1ppx%NXu?PN&>X)4CIJwvnHQre)uJ*!KacAjf-)N79uF}+9
zV;xl2=BR5;K`pftYN~#yC5=VhjLE3InTeY6c~tu<)Ku%tJd7hhjM}?DQT=?IaWgbw
zU^92Z;;84h6l!5rQG3!5wTZ1z1E*X4V5=X8I`3KJm2j3|bv%j{@BwPVvd!J|E1~wR
zZgY=2a5Jmuh?=;E<wH?dHr||xT2L;k-x}0TZ9y&UJ=7<}r>F&gkLvd;>XYCm>M00p
z;eKRQ@=(x9nxal<hgxX{YG?YRZov@b!@`+}+VXeI-KhSbqWT>{O?bx4xB5G%r^f#&
z_puB@E!Y!9L06Q7T0m3O1Rc!o<^XFSiCXYv%X3f@=UV+*EKU9vYQcw57xD<TlYTAT
zXQ>4840)W&6f|LV)RojXo0=)86H`%J+t2DJpda}()WbLnHO}*>XJMJS84Hr{MLi1#
zP#1au3+co728Bo}Zlfj&Z{-dcgL>*~px)%BSO~kJuDB0s3rAb-K`r1#)Ho|Gf79~q
zsBu0)UFc~n#Qe@#3c7;JsFmMP1Nydhx4H=Go`#_Yj>dABh?+1Jbwxc<S2`5ce-vum
zsb&uPkuSs)T!J1=bcTYS&I_pgAF}|xv;&1v6GWf}jzL{{66)D$WqBHEX9i&ePQb$W
zg1G|Kz819;@20T-8t^a`y0TNKfiGHzTc`yDws9vei@M@?RR1K@fGyA;)3GA<!YVi&
z^~`KU?aYU$`SxRBJlcl+*8ty9(F-qQ05)&yZhd>y6?RAU%fybDjoya|wU7&_h5v<`
z$hVz)USU*T0*hb-s(&TaLTY;`=$<q~-TT(475Bm@9E*Xt6m@G}!}9nB>WUAc&OeHQ
zc+&E-sBwNpzI8bNpl)Gedv~G9SccrwnSxd{8nq?U%sJ)@sL$*br~$WNS=^67_>-BB
z+PT}P1vwquD=dWG9YF0+1ZunlWL}Tcgo3W916IRPsD-RTov<D?@J`G3n<p@k`imHe
zH&6>K*3tczSQ&MNsi^Tsp~iV0)o&U4>;2zCK`Y*l+TvYU6!)X9@F;4le?$#%0kyzu
zSRHSn&ac$Tz0!EpXM7FRGn0aPh%-><4M)v09s~6LPoba*b5K{j81*cyM|J!FHQ+wf
zR-Q&J>?boH6UlF*t}HIqU2qfBgst!i?1aJC7c1i!^ytc7q9E6xPS}82$Trj!??)}<
z3)H<kj+O8tYKseZb_cG6ddibfJCck#uO({S_NWW!YV|!kv;UfS02Nx{aO*G`b%oPW
zJF~#@mr?yTqOK&*>JOqma8985U$ypos09S1*|ULKSY=dwLK^!YO(D@bbi*3tBe6KH
zMlEm~>I!zEe!K0%IQ#+iN#>jG?o<S7fzf6n>I116YMe~eI3rOH?*tD8tz-tifOD}b
zmh9r5(86qo+PZWM#SGMWqfirOqn`3vsD;0d+L0ZWA4ToxS=7YWP`Ao+mx2cL?dmp!
zqb7<*JtVQH2|A*#pbu)G!RU+QaWqauUD+k`4^;o#SPcI~ofq8A-Kny!9w&x^CaP(6
zL!CGcLvS|go~}SGWFu;#Jk-Ov7pvfBn1DA>=a=d3wnw8DPz|*+O;GKr_=Mj73<`Rf
zhGGSrgxZ=FsI6LuTEN?=6F)-rKZv>or!XAPpxSSu7I+`kUNFO5NFb^{48yRz)cc=A
zK_|9FO_YYZvi_)vMxeHCDr$hasBikYsQ$mBcIGaspFfQyu>|S@5>V&W!+30p)o>(w
z+EQ3aL0-b@SfeNZzk+>HSGFEY;2zX1Iga`ra1r@J>;2WK_7?mK)y`$0Ub9Tp4h%<K
z;8@hNH5s*_>Al#06`rF)SNx)NT#35!*HI7Wd#HYgQ2mZs{ynPSdDNBvW%d7}CiL&^
z?ocplVdX53MfI=SoBdaz1r-`N6*W;$%QI0|G8%Oy*;oaqqWY~f-$FfHd8k`)7<G@o
zMctySsGYlqx}cywZvRLR1r3ylG1v&Tpn<3>$ifJmgc@)$YQRmX1@A=dz<%V@*!ddk
zU}RtSPa55j|D5&wNJO80?n7P&r;>ZRQqXI29BbkO)I`<#y92jCy`Jf)38tW)l`m0O
z5;nm7z=}gHyc=q(GtDtLo_q>&SDb5BpEA&UAs#24f}YX=sEJ3T2FgKgc`nA|3e>GQ
zfZCbQu>&5*j#xg^%}1lIbPxLAb<}u&p)TNGv(q4cBkKKMOCgDdKT)@$@?iIb>KIGj
z2vt7_wb0SXho&>dJcjAy(L>z-<C%oI*YBck)u$MVC(sZ7MvZqD{h8k>Fw|`bz(VA~
zmX}0zEQ`EpPG!qyp!&^6JsY{$AGe@C1`c!23&j=%I3IPd`w!>S6wjb;UH=i>|56kt
zP|!e&un2Cld^_sB{tBz$d8~l}Bi$WqfV#plSO%w|p8l6n{Wf7)JdJFU^FNHmo}=8~
zx;dlRe|=JIvWk7E4i`|*Lf~lEil~9=VI}N>wQ&k&<2JM67&l*rx<vt5eAr-LOvclw
z3l1Oaek-mymi@0t#V{)3ae=uLb+68$cHlAw<9*cD2aa=JzYr`+UKUj!Z`LyFo5`qK
z)5`LWW>*gd4bU5daD+L@oNX>PUp3!CJ!HF33p;|^kuz8XgL&sPZfVr#L@XA=MASlC
zpcdq5YZYmz1@u5|{SeEip$49h4R9}NfIH^Ds0sYI52_DF?PN)8j?GXDoNetdnX6qr
z&N>QO*=E$O_|Q81gj(T6%dcVx`QNC8`b}`}We6%yKuuI1bzTZ;2U1ZB>x)|GVAMES
z7^?SwmUUQ;8sHVnx1nCUJk$xnPxBiKqfi5`MeWok%lD!dauBtE6ITC&)t^I+|A*xd
z)vouy$V7K##Zd#4L9IL%HBnvEfKOW964kH0<vmaf?2kGx8_VNN48ygkao#ugng`LN
zfsRm+-<!Xhf18iYph<4O2-N!?gY~dER>!Frjhj&u9yL#)7IwzWH}6bh|2456FR40&
zpz=twn$<V7JOwpySJajDw)*j=$6Sb|XkUriiS4NVCs5~KLG9@E$?U%>Zd=7e>)<!V
zy`msgdn2>C*#@=HRMf)zpavXi_1UQNW?(qZwffi0t*G;Md#vI!^OSiWwc_iR7vuw6
zd2!Ueu7X-XL)5KkjSVmpHSsH`2{xemZ8!H@{Z|-Dz2`>?I^jC%3T~lJc!-*)$TRK-
zN;&i;kHx}R6?I-6RR6|i8>{bzdY$`Ny~pYoVkGrT-FlCcXB|F4y&lI<EB^&G!8L2Y
ziCVEU&9wx2KiN<VNHmkp_NWW!fx56!s2!Yu8h3%Wo%_F-f(G7z8fX`40f$h(%}!zz
zUa)pQJ_NMT5Y#|XmdBxXrh(ZU^*f{;>XWcDs{cz^3Rf%F`=4hGdr&JrfLh46<^`+2
zVY$z<?gE3&a;WnXP&?8DHBky`oKDu>+wv@P8hYRV`4n`;%dKI9`5tQP_Mvv-u+@Ky
zn&1M)U_REwVq8rLY-Vp&H`Gq`K`mr7YNw}SJAA>z`>zRpq(WY>j=!URC)~mASa^o}
zCA2?kpy#kSE=4V5BdUI@<-0Ba7<FMs%`>R}`KX2dIfDsGQt+GUzD8wHE3S{~n1U6t
zljY;g$*6%nsD&>=owp2I;6}^yQMcwEYM!83Zog<$eQgf~P1Fi??>bnA?x=@kD3-?=
zs4INU+-mMdE#NTf_x>@|ct4;fIA`883+1>Ea|G&}mZvcV4Llfi!g$N)SiZ#EX!W~L
zCmupA@H*=Ey+7Y9_0=p9D`R)m1x?4&IM?!Zs0D6C7VdF&Sj8UeaKQ4fEI(=a&sdui
zFIj!5IqpDFScdvI)GcU<dUm>^E^G*DhqBFQP#2oxZRh?k_ZIkHB-F~@MXmS)%fGSq
zA5b44mr)COfO-aMKIfj-#B7P0xIL=92Wo*stvv^|&;`nw-&sXL9bZSS^c^+e2dLL&
zA8O0LK@D^t)jxc$d(SIlA@Z82^XplCvemaWJEInsf!cw==>7ZuWNYxC23~0SD%46h
zS^fcPqJyY~9kKi@s^4YHZ(I9A%Ztx*&ntz|^s9h6zr{T6zrHwhr$Q@w&N{9{fAX~$
zfp20g9zb2eRn)_E*K(ivZhbITqP{Guy_wk#bzWE01q{R#96q1@uS#J%6`Js@b+}?)
zN3Hah<pB%afr_DSMLEkGpx%a7sGaC%^;zaL)Wq{G&oy81Pza!53s%HD)Ghc9wV+F=
z0k5G3cz|i>`@Fl5Zm9Z9%SWJgauVvi1y;Yx+=NNg=V2^*@+oM5kcIAm5oQc(fZC|`
z7N`ZaMJ+T9tKb9-!Zqe*^L_JE)Z26%bzxUg<KDwaz5fA=+yUZI9qL)$(o930&=0kc
zEYuZFL@j8()h{+*#v;_ehTfe;ou6kOM2&L_gP7krLqQ#XvkrfI8~EeF3+@EL*qion
zEQ%A%S*U??Q43m&LAV1o!N;iIil3o&>MrV`i+s@@KCGtqe>;Vicn<Xe6O-#cOpQ?w
zSy#))VKVswRKG7V7|)?5{1de!cPxK|zT|}#y9+B~hMSep`}@BZ1r68)btPS_!%)=D
zOfa9d`g!Iu)K;%UEnpjJhw{t=s0AKJy&dN)zh?$4VgJ=3Vu|~i9fz8*A!^{KFabNE
zuIw4q7U!To7jiKKx1cUyFRJ~d<>yepc5ho=bg4T|G{#V$u$2AR329X53i@F=9D*8f
zHiqCTRKIN)iXUP+9z%WYj(W-c>sD_ZPreIv>k^i^SKb=4$opeF9yjlMtV7IlcdL?7
zACaA~EoNgc+=nHx^a}T(s)bt6Kr_pnh9jw;j~RH&>N~#d_U~m5LtU8XX{(rr+JR-(
zu*ULtP`BiL?1CSgVJqEy1lFN`KkEEjsQwSIGZtFq_RB!!+fe-<A^ki~oz?Ejk}-^i
z_NajdTK#a$AfIS{ZN{!~w|*v;pnVS(!{Zo-=TYMXzTz5!T3CeT(cYZ<A8!pwW)tj1
z#}w4VxdAm$9+ts9*a%Of1`K`G?N<&9kdM(14z=m%V)-aH_5S2k=RWm5djC%n?<n!%
zN%l7L*HFq$sY|u|KlJ|VI7Zu4x5!^H-H+tK)V)Rd4z}U^|BeXC-%!_((9xSbn9%d(
z+3u}!f27etUp5~<ez9aerqJFOClc4JegSnQiC@WkGUyLDfLsT^S{z;kC)je;9k%k5
z80y3Q@6Jh&ALD75YMq+U_LP;6(5VJxe&u`r7FdSz63RWTeYg#>7n3-zFZJiGPJacB
zp?ns9BDPXKje7pPua$~?k#!=d)E5XHSBT@@PW-Dc$}=f<vBiEz&YSB!-sI;`#OK!c
z9^NJP5PH(Pd3*6!R2)rorT!9rMm(YW&l}~uPGtyDi3!SKHM~mw$3zRtfy5NbI(E>m
z51DveMjZ6katkPTCOXi!H0r2s)-hFgPCqz)Bs|~Iu!F+8INCZjGXu@047i$d7!g6=
zP1ur{N3^BwI*y?JUt$a8e$-XN8|2e59&=DfN7{7Uaq&1uXvijp(U438SjWb02ZzrI
zr@xiO&(^MTd*ZeV9HEcZE7ymOj)BzYxkc~KSI93=DuzkA|GjKQpV$Cl<b&xjg#1V1
z_+uw$(Dny)GpIXf{d-V1l>8myP3qd)cn8S$6FOQ^HyIy!GxtYl>S}rTv5`EM6Q9F0
z@`8kpu4ZN0I$1dt$I$kW*hd^CHW87wm<qI4p}ddiV0CeJZWMWC%JonmWIFWxd5;&V
z>_@3B>WiU1@p@49C(<Y{Cv=n}iZVz=8`K}GT3PM-WYp1|^S&Z#6NQP1goijvOmn+9
z-3l;&8!BQMps@|In|uKsT9Vf#-Xeee2&e8Mb+@S0zaS1G9zUM8WEOr-WYM=W*2SH;
z3(pfet`^|>zoxL87^fPJ3It!(oQiacCR$QXXObsTN4AUiTdj)QEY~+59WU76-%~El
zc~4s&LphSVQ^Xh4eMWqwEqR~#fXWWUO3FG~nUC-W@dPL9_>=NNYYQj;&0EU@X?6QC
zo#;sYbZZ+%ev)WS{CDVk;cUWt|I0J@DjMITVwd$8LfvBO+Ts6jCsB&>EL=yQ0LnUs
zl229}p`({M7srwZ5lbldr+*EFI&n0oJW2EO4a!+atR~)|V*(9paRX7Cx+26~LdSZd
z0rff}>6b{kJyC_SjyTHUL=xdgK8VPqtYfZ=_q&0LA;c-&e;+z@A-PO+qFjQ({zv&)
zLdO*9X1Yc1PhXo%Nqx%EL^W%#Zf(;z=fA^`@}S4gNz^&kn4tTAf%u*%K};ZY^d>%}
z{4w#H>d8MPqBuF1d=c^ZQHo?Kb;-oD#A`$*eP71n#P5WT!PLEtt%wptSa*KtxKH#V
zY7rxr7EcJ(zfAQWvpIDrr){>pIMyN8Q4X{4G;xrAHHlw{J>;JdJ&3~exraLX(KY}d
z;ANs7<%>i!8*eXle-rKW$xzHH&rp#-rwzm~LPr!)f%<2#5dGFuUPQSMI^?fnZTt%l
zQ>9}P<$?IT`f%JNE>ZrJxJgv?*0Oh4&^sfAW<(<f`tRsU;S5oW6Uq`bX&bwAX4O#d
zo3x!8e_BtVj(^SP%x7>b(cAKG=u?wePTmyz5U&!&2p!dlkwimg8BU-6L>bCes7pZ|
zMO;13pCq?z-~xD!NTDvoI@YJ$n7WSErwLXidQ$%sv4Zk@)>hokq1yS2_?GyaSZD1k
zD1S)&Lw*(y=uP^9LU$_GVlJU0#!i?+*^fczkiShdA-{sD#7C6Jp^iWo=LgIGA+JO^
z5sz70Bl1kj1sJa=<p!$P{{KO=CgN!*M1wD(<4L=k2X5+&qCSH-M0}t=#MeX^#clXH
zK13Y_F#{J9g^4!Am(=xT%#qj)^QrURe{}MwEJEmb3F~60H{<hyydC9tiH(%Y6Ac((
zCHWJS*I-FoY!LY%;#)#TFtNtUUwUi!2Qyff{;hp@c^i`aPTZzbI=)YArrd`P*D33G
zgUF}uDVs!f1FhVg@(JP)@!!=9p<K^rN5|UvrGh484jVpZXk_!OtdZF}lG;D=k4YPx
z{q(2_*-rZ40pl}=MOqp;Bx`(RROQ%lPY)hHB`!N^M?#mJYQeuQ+?_vX(Un!RFR$Kp
gW%b)Tw#~fc?|)@y?&Vk4I7>U^l-sdz{>{+;16>L_{Qv*}

diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index 2a39f388..c8224be6 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-08-27 19:11+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,55 +84,55 @@ msgstr "%(value)s 不是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s 不是有效的使用者名稱"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:164
 msgid "username"
 msgstr "使用者名稱"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "已經存在使用該名稱的使用者。"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home Timeline"
 msgstr "主頁時間線"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:124
 msgid "Home"
 msgstr "主頁"
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:125
 #, fuzzy
 #| msgid "Book Title"
 msgid "Books Timeline"
 msgstr "書名"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "書目"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:171
 msgid "English"
 msgstr "English（英語）"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:172
 msgid "German"
 msgstr "Deutsch（德語）"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:173
 msgid "Spanish"
 msgstr "Español（西班牙語）"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:174
 msgid "French"
 msgstr "Français（法語）"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:175
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:176
 #, fuzzy
 #| msgid "Tranditional Chinese"
 msgid "Traditional Chinese"
@@ -225,7 +225,7 @@ msgid "Last edited by:"
 msgstr "最後編輯者:"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "元資料"
 
@@ -237,9 +237,9 @@ msgid "Name:"
 msgstr "名稱:"
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr "請用逗號(,)分隔多個值。"
 
@@ -268,7 +268,7 @@ msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr "Inventaire ID:"
 
@@ -282,8 +282,9 @@ msgstr "Goodreads key:"
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:78
 #: bookwyrm/templates/settings/announcement_form.html:69
@@ -299,8 +300,8 @@ msgstr "儲存"
 #: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -340,7 +341,7 @@ msgid "Add Description"
 msgstr "新增描述"
 
 #: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "描述:"
@@ -423,22 +424,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "OCLC 號:"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr "上載封面:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "從網址載入封面:"
 
@@ -453,135 +454,135 @@ msgstr "編輯 \"%(book_title)s\""
 msgid "Add Book"
 msgstr "新增書目"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "確認書目資料"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "\"%(name)s\" 是已存在的作者嗎？"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "<em>%(book_title)s</em> 的作者"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "這是一位新的作者"
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "正在建立新的作者:  %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "這是已存在的作品的另一個版本嗎？"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "這是一個新的作品。"
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "確認"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "返回"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:127
 #: bookwyrm/templates/snippets/create_status/review.html:18
 msgid "Title:"
 msgstr "標題:"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "副標題:"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "系列:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "系列編號:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr "語言:"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr "出版社:"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "初版時間:"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "出版時間:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr "作者"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, fuzzy, python-format
 #| msgid "Remove from %(name)s"
 msgid "Remove %(name)s"
 msgstr "從 %(name)s 移除"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, fuzzy, python-format
 #| msgid "Remove from %(name)s"
 msgid "Author page for %(name)s"
 msgstr "從 %(name)s 移除"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr "新增作者:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr "John Doe, Jane Smith"
 
-#: bookwyrm/templates/book/edit_book.html:220
+#: bookwyrm/templates/book/edit_book.html:227
 #: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "封面"
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "實體性質"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格式:"
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "頁數:"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "書目標識號"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr "Openlibrary ID:"
 
@@ -647,31 +648,37 @@ msgstr "評價了"
 msgid "Progress Updates:"
 msgstr "進度更新:"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "已完成"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "顯示所有更新"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "刪除此進度更新"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "已開始"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "編輯閱讀日期"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "刪除這些閱讀日期"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "搜尋結果"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/layout.html:71
@@ -994,18 +1001,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "現在這裡還沒有任何書目！嘗試著從搜尋某本書開始吧"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "To Read"
 msgstr "想讀"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Currently Reading"
 msgstr "在讀"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
+#: bookwyrm/templates/user/shelf/shelf.html:31
 msgid "Read"
 msgstr "讀過"
 
@@ -1020,6 +1027,12 @@ msgstr "%(year)s 閱讀目標"
 msgid "Who to follow"
 msgstr "可以關注的人"
 
+#: bookwyrm/templates/feed/suggested_users.html:5
+#, fuzzy
+#| msgid "Directory"
+msgid "View directory"
+msgstr "目錄"
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1035,7 +1048,6 @@ msgid "Search for a book"
 msgstr "搜尋書目"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "沒有找到 \"%(query)s\" 的書目"
@@ -1183,7 +1195,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的書目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Import Books"
 msgstr "匯入書目"
 
@@ -1235,7 +1247,7 @@ msgstr "匯入開始:"
 msgid "Import completed:"
 msgstr "匯入完成:"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:24
 msgid "TASK FAILED"
 msgstr "任務失敗"
 
@@ -1312,19 +1324,6 @@ msgstr "沒有權限"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "抱歉！此邀請碼已不再有效。"
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "搜尋結果"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "\"%(query)s\" 的搜尋結果"
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "匹配的書目"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1464,6 +1463,10 @@ msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是開源軟體。你可以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 貢獻或報告問題。"
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1603,10 +1606,28 @@ msgstr "沒有符合 \"%(query)s\" 請求的書目"
 msgid "Suggest"
 msgstr "推薦"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "儲存"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "你的列表"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "列表"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "建立列表"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "登入"
@@ -2078,23 +2099,23 @@ msgstr "活躍:"
 msgid "Create Announcement"
 msgstr "建立公告"
 
-#: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/announcements.html:21
 msgid "Date added"
 msgstr "新增日期:"
 
-#: bookwyrm/templates/settings/announcements.html:26
+#: bookwyrm/templates/settings/announcements.html:25
 msgid "Preview"
 msgstr "預覽"
 
-#: bookwyrm/templates/settings/announcements.html:30
+#: bookwyrm/templates/settings/announcements.html:29
 msgid "Start date"
 msgstr "開始日期"
 
-#: bookwyrm/templates/settings/announcements.html:34
+#: bookwyrm/templates/settings/announcements.html:33
 msgid "End date"
 msgstr "結束日期"
 
-#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/announcements.html:37
 #: bookwyrm/templates/settings/federation.html:30
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
@@ -2102,11 +2123,11 @@ msgstr "結束日期"
 msgid "Status"
 msgstr "狀態"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "active"
 msgstr "啟用"
 
-#: bookwyrm/templates/settings/announcements.html:48
+#: bookwyrm/templates/settings/announcements.html:47
 msgid "inactive"
 msgstr "停用"
 
@@ -2450,7 +2471,7 @@ msgid "and %(remainder_count_display)s other"
 msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr "沒有封面"
 
@@ -2573,13 +2594,13 @@ msgstr "刪除這些閱讀日期嗎？"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正要刪除這篇閱讀經過以及與之相關的 %(count)s 次進度更新。"
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr "喜歡"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr "取消喜歡"
 
@@ -2778,7 +2799,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 msgid "Update progress"
 msgstr "更新進度"
 
@@ -2820,15 +2841,15 @@ msgstr "更多書架"
 msgid "Start reading"
 msgstr "開始閱讀"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21
 msgid "Finish reading"
 msgstr "完成閱讀"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:27
 msgid "Want to read"
 msgstr "想要閱讀"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:59
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "從 %(name)s 移除"
@@ -3013,11 +3034,11 @@ msgstr "編輯書架"
 msgid "Update shelf"
 msgstr "更新書架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "所有書目"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Create shelf"
 msgstr "建立書架"
 
@@ -3173,11 +3194,11 @@ msgstr "取消停用使用者"
 msgid "Access level:"
 msgstr "訪問權限:"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr "檔案超過了最大大小: 10MB"
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
@@ -3204,6 +3225,12 @@ msgstr "密碼重置連結已傳送給 %s"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "\"%(query)s\" 的搜尋結果"
+
+#~ msgid "Matching Books"
+#~ msgstr "匹配的書目"
+
 #~ msgid "Local Timeline"
 #~ msgstr "本地時間線"
 

From 92b96afc2d27561aa683acf261f15aee9393210e Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Fri, 27 Aug 2021 21:27:54 +0200
Subject: [PATCH 200/272] Make webfinger match usernames in case insensitive
 manner

---
 bookwyrm/tests/views/test_wellknown.py | 10 ++++++++++
 bookwyrm/views/wellknown.py            |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py
index 4a3eb579..fcbcc12b 100644
--- a/bookwyrm/tests/views/test_wellknown.py
+++ b/bookwyrm/tests/views/test_wellknown.py
@@ -51,6 +51,16 @@ class UserViews(TestCase):
         data = json.loads(result.getvalue())
         self.assertEqual(data["subject"], "acct:mouse@local.com")
 
+    def test_webfinger_case_sensitivty(self):
+        """ensure that webfinger queries are not case sensitive"""
+        request = self.factory.get("", {"resource": "acct:MoUsE@local.com"})
+        request.user = self.anonymous_user
+
+        result = views.webfinger(request)
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["subject"], "acct:mouse@local.com")
+
     def test_nodeinfo_pointer(self):
         """just tells you where nodeinfo is"""
         request = self.factory.get("")
diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py
index 2462c5a4..9c76beaf 100644
--- a/bookwyrm/views/wellknown.py
+++ b/bookwyrm/views/wellknown.py
@@ -20,7 +20,7 @@ def webfinger(request):
 
     username = resource.replace("acct:", "")
     try:
-        user = models.User.objects.get(username=username)
+        user = models.User.objects.get(username__iexact=username)
     except models.User.DoesNotExist:
         return HttpResponseNotFound("No account found")
 

From 4fb834f10f697de65b3a62c9cfbb4896c9d22a04 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 09:42:03 -0700
Subject: [PATCH 201/272] Simpler feed verification logic

---
 bookwyrm/views/feed.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 7a46ca57..d17de8f9 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -96,15 +96,11 @@ class Status(View):
         try:
             user = get_user_from_username(request.user, username)
             status = models.Status.objects.select_subclasses().get(
-                id=status_id, deleted=False
+                user=user, id=status_id, deleted=False
             )
         except (ValueError, models.Status.DoesNotExist):
             return HttpResponseNotFound()
 
-        # the url should have the poster's username in it
-        if user != status.user:
-            return HttpResponseNotFound()
-
         # make sure the user is authorized to see the status
         if not status.visible_to_user(request.user):
             return HttpResponseNotFound()

From e1af13d03830b22acace8587a1f3cfb1368e4b69 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 09:55:06 -0700
Subject: [PATCH 202/272] Adds test

---
 bookwyrm/tests/views/test_feed.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index 666c3e02..e13dd7f8 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -82,6 +82,27 @@ class FeedViews(TestCase):
 
         self.assertEqual(result.status_code, 404)
 
+    def test_status_page_not_found_wrong_user(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Status.as_view()
+        another_user = models.User.objects.create_user(
+            "rat@local.com",
+            "rat@rat.rat",
+            "password",
+            local=True,
+            localname="rat",
+        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(content="hi", user=another_user)
+
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, "mouse", status.id)
+
+        self.assertEqual(result.status_code, 404)
+
     def test_status_page_with_image(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Status.as_view()

From f308b7793ddfd0a5ea7e7a82c9aae3e63e524e2c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 10:08:41 -0700
Subject: [PATCH 203/272] Adds test for followers only privacy level

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

diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 2520a2fd..80b78231 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -185,6 +185,17 @@ class ModelFields(TestCase):
         instance.set_field_from_activity(model_instance, data)
         self.assertEqual(model_instance.privacy_field, "unlisted")
 
+        data.to = ["http://user_remote/followers"]
+        data.cc = []
+        instance.set_field_from_activity(model_instance, data)
+        self.assertEqual(model_instance.privacy_field, "followers")
+
+        data.to = ["http://user_remote/followers"]
+        data.cc = ["http://mentioned_user/remote_id"]
+        instance.set_field_from_activity(model_instance, data)
+        self.assertEqual(model_instance.privacy_field, "followers")
+
+
     @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_privacy_field_set_activity_from_field(self, *_):

From e9d951e4cd1fd51323814951b5e82b0bc289b607 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 10:33:57 -0700
Subject: [PATCH 204/272] Add user model field for followers url

---
 .../migrations/0086_auto_20210828_1724.py     | 26 +++++++++++++++++++
 bookwyrm/models/user.py                       |  7 +++--
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 bookwyrm/migrations/0086_auto_20210828_1724.py

diff --git a/bookwyrm/migrations/0086_auto_20210828_1724.py b/bookwyrm/migrations/0086_auto_20210828_1724.py
new file mode 100644
index 00000000..35b17758
--- /dev/null
+++ b/bookwyrm/migrations/0086_auto_20210828_1724.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.4 on 2021-08-28 17:24
+
+import bookwyrm.models.fields
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0085_user_saved_lists'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='followers_url',
+            field=bookwyrm.models.fields.CharField(default='/followers', max_length=255),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='followers',
+            field=models.ManyToManyField(through='bookwyrm.UserFollows', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 0ef23d3f..1f501dfc 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -82,13 +82,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     preview_image = models.ImageField(
         upload_to="previews/avatars/", blank=True, null=True
     )
-    followers = fields.ManyToManyField(
+    followers_url = fields.CharField(max_length=255, activitypub_field="followers")
+    followers = models.ManyToManyField(
         "self",
-        link_only=True,
         symmetrical=False,
         through="UserFollows",
         through_fields=("user_object", "user_subject"),
-        related_name="following",
     )
     follow_requests = models.ManyToManyField(
         "self",
@@ -228,7 +227,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     def to_followers_activity(self, **kwargs):
         """activitypub followers list"""
-        remote_id = "%s/followers" % self.remote_id
+        remote_id = self.followers_url
         return self.to_ordered_collection(
             self.followers.order_by("-updated_date").all(),
             remote_id=remote_id,

From 53d9ff87d90ef783de7d9b777b2822d6e9b6d65e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 10:40:52 -0700
Subject: [PATCH 205/272] Look up followers url to determine post privacy

---
 bookwyrm/activitypub/base_activity.py | 2 ++
 bookwyrm/models/fields.py             | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index d20e7e94..52b1b1f2 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -275,6 +275,8 @@ def resolve_remote_id(
 ):
     """take a remote_id and return an instance, creating if necessary"""
     if model:  # a bonus check we can do if we already know the model
+        if isinstance(model, str):
+            model = apps.get_model(f"bookwyrm.{model}", require_ready=True)
         result = model.find_existing_by_remote_id(remote_id)
         if result and not refresh:
             return result if not get_activity else result.to_activity_dataclass()
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 6ed5aa5e..8f4fd28e 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -224,8 +224,14 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
         original = getattr(instance, self.name)
         to = data.to
         cc = data.cc
+
+        # we need to figure out who this is to get their followers link
+        user = activitypub.resolve_remote_id(self.attributedTo, model="User")
+
         if to == [self.public]:
             setattr(instance, self.name, "public")
+        elif to == [user.followers_url]:
+            setattr(instance, self.name, "followers")
         elif cc == []:
             setattr(instance, self.name, "direct")
         elif self.public in cc:

From dc72df73392f8a3b27adbee13836367fa4e35c78 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 10:41:16 -0700
Subject: [PATCH 206/272] Generate likely followers url for existing users

---
 .../migrations/0086_auto_20210828_1724.py     | 37 +++++++++++++++----
 bookwyrm/models/user.py                       |  1 +
 bookwyrm/tests/models/test_fields.py          |  1 -
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/migrations/0086_auto_20210828_1724.py b/bookwyrm/migrations/0086_auto_20210828_1724.py
index 35b17758..21247711 100644
--- a/bookwyrm/migrations/0086_auto_20210828_1724.py
+++ b/bookwyrm/migrations/0086_auto_20210828_1724.py
@@ -3,24 +3,47 @@
 import bookwyrm.models.fields
 from django.conf import settings
 from django.db import migrations, models
+from django.db.models import F, Value, CharField
+from django.db.models.functions import Concat
+
+
+def forwards_func(apps, schema_editor):
+    """generate followers url"""
+    db_alias = schema_editor.connection.alias
+    apps.get_model("bookwyrm", "User").objects.using(db_alias).annotate(
+        generated_url=Concat(
+            F("remote_id"), Value("/followers"), output_field=CharField()
+        )
+    ).update(followers_url=models.F("generated_url"))
+
+
+def reverse_func(apps, schema_editor):
+    """noop"""
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0085_user_saved_lists'),
+        ("bookwyrm", "0085_user_saved_lists"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='user',
-            name='followers_url',
-            field=bookwyrm.models.fields.CharField(default='/followers', max_length=255),
+            model_name="user",
+            name="followers_url",
+            field=bookwyrm.models.fields.CharField(
+                default="/followers", max_length=255
+            ),
             preserve_default=False,
         ),
+        migrations.RunPython(forwards_func, reverse_func),
         migrations.AlterField(
-            model_name='user',
-            name='followers',
-            field=models.ManyToManyField(through='bookwyrm.UserFollows', to=settings.AUTH_USER_MODEL),
+            model_name="user",
+            name="followers",
+            field=models.ManyToManyField(
+                related_name="following",
+                through="bookwyrm.UserFollows",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
     ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 1f501dfc..460a7299 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -88,6 +88,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         symmetrical=False,
         through="UserFollows",
         through_fields=("user_object", "user_subject"),
+        related_name="following",
     )
     follow_requests = models.ManyToManyField(
         "self",
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 80b78231..00318846 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -195,7 +195,6 @@ class ModelFields(TestCase):
         instance.set_field_from_activity(model_instance, data)
         self.assertEqual(model_instance.privacy_field, "followers")
 
-
     @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_privacy_field_set_activity_from_field(self, *_):

From 4f94d99c88303306a15193ffd409ecf72bb4fcd5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 11:16:39 -0700
Subject: [PATCH 207/272] Use None instead of empty string for activitypub null
 value

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

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 556ef185..aca62d7c 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -30,8 +30,8 @@ class Note(ActivityObject):
     to: List[str] = field(default_factory=lambda: [])
     cc: List[str] = field(default_factory=lambda: [])
     replies: Dict = field(default_factory=lambda: {})
-    inReplyTo: str = ""
-    summary: str = ""
+    inReplyTo: str = None
+    summary: str = None
     tag: List[Link] = field(default_factory=lambda: [])
     attachment: List[Document] = field(default_factory=lambda: [])
     sensitive: bool = False

From 2c26b041196fc93458699ac58d398973c8d8ea26 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 11:30:54 -0700
Subject: [PATCH 208/272] Uses correct object to determine author

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

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 8f4fd28e..76cedea0 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -226,7 +226,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
         cc = data.cc
 
         # we need to figure out who this is to get their followers link
-        user = activitypub.resolve_remote_id(self.attributedTo, model="User")
+        user = activitypub.resolve_remote_id(data.attributedTo, model="User")
 
         if to == [self.public]:
             setattr(instance, self.name, "public")

From e4b5890992f887b1d418be7f68a5dd8ae55c2276 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 11:41:33 -0700
Subject: [PATCH 209/272] Updates field tests

---
 bookwyrm/tests/models/test_fields.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 00318846..6730d37b 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -146,6 +146,15 @@ class ModelFields(TestCase):
     def test_privacy_field_set_field_from_activity(self, _):
         """translate between to/cc fields and privacy"""
 
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            test_user = User.objects.create_user(
+                username="test_user@example.com",
+                local=False,
+                remote_id="https://example.com/test_user",
+                inbox="https://example.com/users/test_user/inbox",
+                followers_url="https://example.com/users/test_user/followers",
+            )
+
         @dataclass(init=False)
         class TestActivity(ActivityObject):
             """real simple mock"""
@@ -154,6 +163,7 @@ class ModelFields(TestCase):
             cc: List[str]
             id: str = "http://hi.com"
             type: str = "Test"
+            attributedTo: str = test_user.remote_id
 
         class TestPrivacyModel(ActivitypubMixin, BookWyrmModel):
             """real simple mock model because BookWyrmModel is abstract"""
@@ -185,7 +195,7 @@ class ModelFields(TestCase):
         instance.set_field_from_activity(model_instance, data)
         self.assertEqual(model_instance.privacy_field, "unlisted")
 
-        data.to = ["http://user_remote/followers"]
+        data.to = [test_user.followers_url]
         data.cc = []
         instance.set_field_from_activity(model_instance, data)
         self.assertEqual(model_instance.privacy_field, "followers")

From 1e675384bcf3e6a86fb126e02ad471f8c0bd9fb6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 11:58:41 -0700
Subject: [PATCH 210/272] Updates user model test

---
 bookwyrm/tests/models/test_user_model.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 177b2ad6..1b3a5064 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -5,11 +5,12 @@ from django.test import TestCase
 import responses
 
 from bookwyrm import models
-from bookwyrm.settings import DOMAIN
+from bookwyrm.settings import USE_HTTPS, DOMAIN
 
 # pylint: disable=missing-class-docstring
 # pylint: disable=missing-function-docstring
 class User(TestCase):
+    protocol = "https://" if USE_HTTPS else "http://"
     def setUp(self):
         with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
             self.user = models.User.objects.create_user(
@@ -24,13 +25,13 @@ class User(TestCase):
 
     def test_computed_fields(self):
         """username instead of id here"""
-        expected_id = "https://%s/user/mouse" % DOMAIN
+        expected_id = f"{self.protocol}{DOMAIN}/user/mouse"
         self.assertEqual(self.user.remote_id, expected_id)
-        self.assertEqual(self.user.username, "mouse@%s" % DOMAIN)
+        self.assertEqual(self.user.username, f"mouse@{DOMAIN}")
         self.assertEqual(self.user.localname, "mouse")
-        self.assertEqual(self.user.shared_inbox, "https://%s/inbox" % DOMAIN)
-        self.assertEqual(self.user.inbox, "%s/inbox" % expected_id)
-        self.assertEqual(self.user.outbox, "%s/outbox" % expected_id)
+        self.assertEqual(self.user.shared_inbox, f"{self.protocol}{DOMAIN}/inbox")
+        self.assertEqual(self.user.inbox, f"{expected_id}/inbox")
+        self.assertEqual(self.user.outbox, f"{expected_id}/outbox")
         self.assertIsNotNone(self.user.key_pair.private_key)
         self.assertIsNotNone(self.user.key_pair.public_key)
 

From 9c4fd1e602a0e92b222dd92359f14463ba6b1f15 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 12:06:03 -0700
Subject: [PATCH 211/272] Set user default values

---
 bookwyrm/models/user.py                  | 9 +++++----
 bookwyrm/tests/models/test_user_model.py | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 460a7299..92301d38 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -275,10 +275,11 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             return
 
         # populate fields for local users
-        self.remote_id = "%s/user/%s" % (site_link(), self.localname)
-        self.inbox = "%s/inbox" % self.remote_id
-        self.shared_inbox = "%s/inbox" % site_link()
-        self.outbox = "%s/outbox" % self.remote_id
+        self.remote_id = "{:s}/user/{:s}".format(site_link(), self.localname)
+        self.followers_url = "{:s}/followers".format(self.remote_id)
+        self.inbox = "{:s}/inbox".format(self.remote_id)
+        self.shared_inbox = "{:s}/inbox".format(site_link())
+        self.outbox = "{:s}/outbox".format(self.remote_id)
 
         # an id needs to be set before we can proceed with related models
         super().save(*args, **kwargs)
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 1b3a5064..f717b807 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -32,6 +32,7 @@ class User(TestCase):
         self.assertEqual(self.user.shared_inbox, f"{self.protocol}{DOMAIN}/inbox")
         self.assertEqual(self.user.inbox, f"{expected_id}/inbox")
         self.assertEqual(self.user.outbox, f"{expected_id}/outbox")
+        self.assertEqual(self.user.followers_url, f"{expected_id}/followers")
         self.assertIsNotNone(self.user.key_pair.private_key)
         self.assertIsNotNone(self.user.key_pair.public_key)
 

From a5dcc0e5e4759d71d7a7aeacd644413f3668ba01 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 12:08:24 -0700
Subject: [PATCH 212/272] Support multiple possible fields that indicate user
 ownership

---
 bookwyrm/models/fields.py                | 3 ++-
 bookwyrm/tests/models/test_user_model.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 76cedea0..ef0f3746 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -226,7 +226,8 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
         cc = data.cc
 
         # we need to figure out who this is to get their followers link
-        user = activitypub.resolve_remote_id(data.attributedTo, model="User")
+        user_field = "attributedTo" if hasattr(data, "attributedTo") else "owner"
+        user = activitypub.resolve_remote_id(getattr(data, user_field), model="User")
 
         if to == [self.public]:
             setattr(instance, self.name, "public")
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index f717b807..230c503b 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -11,6 +11,7 @@ from bookwyrm.settings import USE_HTTPS, DOMAIN
 # pylint: disable=missing-function-docstring
 class User(TestCase):
     protocol = "https://" if USE_HTTPS else "http://"
+
     def setUp(self):
         with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
             self.user = models.User.objects.create_user(

From 8629c4450c8eb54e8bcb76bf27ddb3cc6496429e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Aug 2021 12:20:43 -0700
Subject: [PATCH 213/272] Adds test for user followers field from AP

---
 bookwyrm/tests/activitypub/test_person.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py
index 67aaf891..2722aaef 100644
--- a/bookwyrm/tests/activitypub/test_person.py
+++ b/bookwyrm/tests/activitypub/test_person.py
@@ -25,3 +25,4 @@ class Person(TestCase):
         self.assertEqual(user.username, "mouse@example.com")
         self.assertEqual(user.remote_id, "https://example.com/user/mouse")
         self.assertFalse(user.local)
+        self.assertEqual(user.followers_url, "https://example.com/user/mouse/followers")

From 9eea60b35c353eedce88300386482b63d359e7d1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 29 Aug 2021 07:36:59 -0700
Subject: [PATCH 214/272] Fixes call to followers url in serialization

---
 bookwyrm/models/fields.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index ef0f3746..d7bcd99d 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -248,9 +248,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
             mentions = [u.remote_id for u in instance.mention_users.all()]
         # this is a link to the followers list
         # pylint: disable=protected-access
-        followers = instance.user.__class__._meta.get_field(
-            "followers"
-        ).field_to_activity(instance.user.followers)
+        followers = instance.user.followers_url
         if instance.privacy == "public":
             activity["to"] = [self.public]
             activity["cc"] = [followers] + mentions

From 0569bce610686c00c2b174c6282abbdbd6109f36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 29 Aug 2021 07:37:21 -0700
Subject: [PATCH 215/272] Cleaner string formatting in user model

---
 bookwyrm/models/user.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 92301d38..0745dffa 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -275,11 +275,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             return
 
         # populate fields for local users
-        self.remote_id = "{:s}/user/{:s}".format(site_link(), self.localname)
-        self.followers_url = "{:s}/followers".format(self.remote_id)
-        self.inbox = "{:s}/inbox".format(self.remote_id)
-        self.shared_inbox = "{:s}/inbox".format(site_link())
-        self.outbox = "{:s}/outbox".format(self.remote_id)
+        link = site_link()
+        self.remote_id = f"{link}/user/{self.localname}"
+        self.followers_url = f"{self.remote_id}/followers"
+        self.inbox = f"{self.remote_id}/inbox"
+        self.shared_inbox = f"{link}/inbox"
+        self.outbox = f"{self.remote_id}/outbox"
 
         # an id needs to be set before we can proceed with related models
         super().save(*args, **kwargs)

From 76ba56f6564fd0fde4449dc30bbd7baeb832851f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 29 Aug 2021 08:14:53 -0700
Subject: [PATCH 216/272] Fixes admin permissions

---
 bookwyrm/templates/layout.html                | 6 +++---
 bookwyrm/templates/settings/admin_layout.html | 6 ++++++
 bookwyrm/views/user_admin.py                  | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 2b8364ec..43ca81c7 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -109,17 +109,17 @@
                                 {% trans 'Settings' %}
                             </a>
                         </li>
-                        {% if perms.bookwyrm.create_invites or perms.moderate_users %}
+                        {% if perms.bookwyrm.create_invites or perms.moderate_user %}
                         <li class="navbar-divider" role="presentation"></li>
                         {% endif %}
-                        {% if perms.bookwyrm.create_invites %}
+                        {% if perms.bookwyrm.create_invites and not site.allow_registration %}
                         <li>
                             <a href="{% url 'settings-invite-requests' %}" class="navbar-item">
                                 {% trans 'Invites' %}
                             </a>
                         </li>
                         {% endif %}
-                        {% if perms.bookwyrm.moderate_users %}
+                        {% if perms.bookwyrm.moderate_user %}
                         <li>
                             <a href="{% url 'settings-users' %}" class="navbar-item">
                                 {% trans 'Admin' %}
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 9e57076b..6d651647 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -21,23 +21,29 @@
         {% if perms.bookwyrm.create_invites %}
         <h2 class="menu-label">{% trans "Manage Users" %}</h2>
         <ul class="menu-list">
+            {% if perms.bookwyrm.moderate_user %}
             <li>
                 {% url 'settings-users' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Users" %}</a>
             </li>
+            {% endif %}
             <li>
                 {% url 'settings-invite-requests' as url %}
                 {% url 'settings-invites' as alt_url %}
                 <a href="{{ url }}"{% if url in request.path or request.path in alt_url %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
+            {% if perms.bookwyrm.moderate_user %}
             <li>
                 {% url 'settings-reports' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Reports" %}</a>
             </li>
+            {% endif %}
+            {% if perms.bookwyrm.control_federation %}
             <li>
                 {% url 'settings-federation' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Instances" %}</a>
             </li>
+            {% endif %}
         </ul>
         {% endif %}
         {% if perms.bookwyrm.edit_instance_settings %}
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 7cfefb0f..3a9ea339 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -13,7 +13,7 @@ from bookwyrm.settings import PAGE_LENGTH
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required("bookwyrm.moderate_users", raise_exception=True),
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
     name="dispatch",
 )
 class UserAdminList(View):

From 8c8b1168d4ece787b9b5445babffe3c91e0b8a4a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 29 Aug 2021 08:22:14 -0700
Subject: [PATCH 217/272] Support attribution field on boosts

---
 bookwyrm/models/fields.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index d7bcd99d..40684531 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -226,7 +226,12 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
         cc = data.cc
 
         # we need to figure out who this is to get their followers link
-        user_field = "attributedTo" if hasattr(data, "attributedTo") else "owner"
+        for field in ["attributedTo", "owner", "actor"]:
+            if hasattr(data, field):
+                user_field = getattr(data, field)
+                break
+        if not user_field:
+            raise ValidationError("No user field found for privacy", data)
         user = activitypub.resolve_remote_id(getattr(data, user_field), model="User")
 
         if to == [self.public]:

From 082c2708a774f6f2e5bf3e520b5eae82fce7cb87 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 29 Aug 2021 08:50:46 -0700
Subject: [PATCH 218/272] Fixes attribution field logic

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

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 40684531..cc5a7bb5 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -228,7 +228,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
         # we need to figure out who this is to get their followers link
         for field in ["attributedTo", "owner", "actor"]:
             if hasattr(data, field):
-                user_field = getattr(data, field)
+                user_field = field
                 break
         if not user_field:
             raise ValidationError("No user field found for privacy", data)

From b598093e91cdc78e2a7de04c0ac6c2c8c8adcb12 Mon Sep 17 00:00:00 2001
From: reesporte <reesedporter@gmail.com>
Date: Sun, 29 Aug 2021 13:11:35 -0500
Subject: [PATCH 219/272] more spanish translations

---
 locale/es/LC_MESSAGES/django.mo | Bin 48314 -> 48926 bytes
 locale/es/LC_MESSAGES/django.po |  38 ++++++++++----------------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 5123134bf4e165fda9181a0412c7b36a57f34130..6881c1026a28dce7df5ad9a192cb1d35bf90c6b1 100644
GIT binary patch
delta 15178
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

delta 14658
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 076e65f0..11710278 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:11+0000\n"
+"POT-Creation-Date: 2021-08-29 18:01+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Reese Porter <reesedporter@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -667,10 +667,8 @@ msgid "Delete these read dates"
 msgstr "Eliminar estas fechas de lectura"
 
 #: bookwyrm/templates/book/search_filter.html:5
-#, fuzzy
-#| msgid "Search Results"
 msgid "Search editions"
-msgstr "Resultados de búsqueda"
+msgstr "Buscar ediciones"
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
@@ -957,10 +955,8 @@ msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
 #: bookwyrm/templates/feed/feed.html:22
-#, fuzzy, python-format
-#| msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
 msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
-msgstr "cargar <span data-poll=\"stream/%(tab.key)s\">0</span> status(es) no leído(s)"
+msgstr "cargar <span data-poll=\"stream/%(tab_key)s\">0</span> status(es) no leído(s)"
 
 #: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
@@ -1007,10 +1003,8 @@ msgid "Who to follow"
 msgstr "A quién seguir"
 
 #: bookwyrm/templates/feed/suggested_users.html:5
-#, fuzzy
-#| msgid "Directory"
 msgid "View directory"
-msgstr "Directorio"
+msgstr "Ver directorio"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
@@ -1440,7 +1434,7 @@ msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar pr
 
 #: bookwyrm/templates/lists/bookmark_button.html:30
 msgid "Un-save"
-msgstr ""
+msgstr "Des-guardar"
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
@@ -1582,26 +1576,20 @@ msgid "Suggest"
 msgstr "Sugerir"
 
 #: bookwyrm/templates/lists/list_items.html:15
-#, fuzzy
-#| msgid "Save"
 msgid "Saved"
-msgstr "Guardar"
+msgstr "Guardado"
 
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "Tus listas"
 
 #: bookwyrm/templates/lists/lists.html:35
-#, fuzzy
-#| msgid "Lists"
 msgid "All Lists"
-msgstr "Listas"
+msgstr "Todas las listas"
 
 #: bookwyrm/templates/lists/lists.html:39
-#, fuzzy
-#| msgid "Create List"
 msgid "Saved Lists"
-msgstr "Crear lista"
+msgstr "Listas guardadas"
 
 #: bookwyrm/templates/login.html:4
 msgid "Login"
@@ -2694,10 +2682,8 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
-#, fuzzy, python-format
-#| msgid "page %(page)s"
 msgid "page %(page)s"
-msgstr "página %(pages)s"
+msgstr "página %(page)s"
 
 #: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
@@ -2759,7 +2745,7 @@ msgstr "Lectura se terminó"
 
 #: bookwyrm/templates/snippets/reading_modals/form.html:8
 msgid "(Optional)"
-msgstr ""
+msgstr "(Opcional)"
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
@@ -3178,7 +3164,7 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #: bookwyrm/views/rss_feed.py:34
 #, python-brace-format
 msgid "Status updates from {obj.display_name}"
-msgstr ""
+msgstr "Actualizaciones de status de {obj.display_name}"
 
 #~ msgid "Search Results for \"%(query)s\""
 #~ msgstr "Resultados de búsqueda por \"%(query)s\""

From 66f8e9b4fc412b22fa905260a66d04a3f4d0a331 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 29 Aug 2021 11:12:57 -0700
Subject: [PATCH 220/272] Fixes model name

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

diff --git a/bookwyrm/migrations/0086_auto_20210827_1727.py b/bookwyrm/migrations/0086_auto_20210827_1727.py
index 7632a5b4..ef6af206 100644
--- a/bookwyrm/migrations/0086_auto_20210827_1727.py
+++ b/bookwyrm/migrations/0086_auto_20210827_1727.py
@@ -5,9 +5,9 @@ import django.db.models.expressions
 
 
 def normalize_readthrough_dates(app_registry, schema_editor):
-    """bih"""
+    """Find any invalid dates and reset them"""
     db_alias = schema_editor.connection.alias
-    app_registry.get_model("bookwyrm", "Readthrough").objects.using(db_alias).filter(
+    app_registry.get_model("bookwyrm", "ReadThrough").objects.using(db_alias).filter(
         start_date__gt=models.F("finish_date")
     ).update(start_date=models.F("finish_date"))
 

From e98ee64e2ba9e577f4cf118565c5fe81fa6bdc44 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 29 Aug 2021 11:20:30 -0700
Subject: [PATCH 221/272] Merge migration

---
 ...86_auto_20210827_1727_0086_auto_20210828_1724.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bookwyrm/migrations/0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724.py

diff --git a/bookwyrm/migrations/0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724.py b/bookwyrm/migrations/0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724.py
new file mode 100644
index 00000000..cd531161
--- /dev/null
+++ b/bookwyrm/migrations/0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.4 on 2021-08-29 18:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0086_auto_20210827_1727"),
+        ("bookwyrm", "0086_auto_20210828_1724"),
+    ]
+
+    operations = []

From 5291308677964dbb2678b78e0e2eb170b9d85366 Mon Sep 17 00:00:00 2001
From: reesporte <reesedporter@gmail.com>
Date: Mon, 30 Aug 2021 11:12:05 -0500
Subject: [PATCH 222/272] fix link formatting issues

---
 bookwyrm/views/status.py | 46 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 651021b6..e2dd7fd5 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -1,13 +1,18 @@
 """ what are we here for if not for posting """
 import re
 from django.contrib.auth.decorators import login_required
+from django.core.validators import URLValidator
+from django.core.exceptions import ValidationError
 from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
+from django.utils.html import urlize
 from django.views import View
 from markdown import markdown
 
+from urllib.parse import urlparse
+
 from bookwyrm import forms, models
 from bookwyrm.sanitize_html import InputHtmlParser
 from bookwyrm.settings import DOMAIN
@@ -149,12 +154,43 @@ def find_mentions(content):
 
 def format_links(content):
     """detect and format links"""
-    return re.sub(
-        r'([^(href=")]|^|\()(https?:\/\/(%s([\w\.\-_\/+&\?=:;,@#])*))' % regex.DOMAIN,
-        r'\g<1><a href="\g<2>">\g<3></a>',
-        content,
-    )
+    v = URLValidator()
+    formatted_content = ""
+    for potential_link in content.split():
+        try:
+            # raises an error on anything that's not a valid 
+            URLValidator(potential_link)
+        except (ValidationError, UnicodeError):
+            formatted_content += potential_link + " "
+            continue
+        wrapped = _wrapped(potential_link)
+        if wrapped:
+            wrapper_close = potential_link[-1]
+            formatted_content += potential_link[0] 
+            potential_link = potential_link[1:-1]
 
+        # so we can use everything but the scheme in the presentation of the link
+        url = urlparse(potential_link)
+        link = url.netloc + url.path + url.params
+        if url.query != "":
+            link += "?" + url.query 
+        if url.fragment != "":
+            link += "#" + url.fragment
+
+        formatted_content += '<a href="%s">%s</a>' % (potential_link, link)
+
+        if wrapped:
+            formatted_content += wrapper_close 
+
+    return formatted_content
+
+def _wrapped(text):
+    """ check if a line of text is wrapped in parentheses, square brackets or curly brackets. return wrapped status """
+    wrappers = [("(", ")"), ("[","]"), ("{", "}")]
+    for w in wrappers:
+        if text[0] == w[0] and text[-1] == w[-1]:
+            return True 
+    return False
 
 def to_markdown(content):
     """catch links and convert to markdown"""

From aa946e3ab7cfa7ddc63a833131ba3b80408d06fc Mon Sep 17 00:00:00 2001
From: reesporte <reesedporter@gmail.com>
Date: Mon, 30 Aug 2021 11:12:27 -0500
Subject: [PATCH 223/272] add more test cases for link formatting

---
 bookwyrm/tests/views/test_status.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index d4edee0b..b782906d 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -303,6 +303,21 @@ class StatusViews(TestCase):
             '<a href="%s">openlibrary.org/search'
             "?q=arkady+strugatsky&mode=everything</a>" % url,
         )
+        url = "https://tech.lgbt/@bookwyrm"
+        self.assertEqual(
+            views.status.format_links(url), 
+            '<a href="%s">tech.lgbt/@bookwyrm</a>' % url
+        )
+        url = "users.speakeasy.net/~lion/nb/book.pdf"
+        self.assertEqual(
+            views.status.format_links(url),
+            '<a href="%s">users.speakeasy.net/~lion/nb/book.pdf</a>' % url
+        )
+        url = "pkm.one/#/page/The%20Book%20which%20launched%20a%201000%20Note%20taking%20apps"
+        self.assertEqual(
+            views.status.format_links(url),
+            '<a href="%s">%s</a>' % (url, url)
+        )
 
     def test_to_markdown(self, *_):
         """this is mostly handled in other places, but nonetheless"""

From ac6438147dfe88e1837719fb9d1650aa4e63f0ae Mon Sep 17 00:00:00 2001
From: reesporte <reesedporter@gmail.com>
Date: Mon, 30 Aug 2021 11:20:56 -0500
Subject: [PATCH 224/272] remove unused import

---
 bookwyrm/views/status.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index e2dd7fd5..a62e1b48 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -7,7 +7,6 @@ from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
-from django.utils.html import urlize
 from django.views import View
 from markdown import markdown
 

From 6e628fed38bbde01e720a2bf366a5fd9b58695c7 Mon Sep 17 00:00:00 2001
From: reesporte <reesedporter@gmail.com>
Date: Mon, 30 Aug 2021 11:38:00 -0500
Subject: [PATCH 225/272] formatting

---
 bookwyrm/tests/views/test_status.py |  8 +++-----
 bookwyrm/views/status.py            | 16 +++++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index b782906d..893e0650 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -305,18 +305,16 @@ class StatusViews(TestCase):
         )
         url = "https://tech.lgbt/@bookwyrm"
         self.assertEqual(
-            views.status.format_links(url), 
-            '<a href="%s">tech.lgbt/@bookwyrm</a>' % url
+            views.status.format_links(url), '<a href="%s">tech.lgbt/@bookwyrm</a>' % url
         )
         url = "users.speakeasy.net/~lion/nb/book.pdf"
         self.assertEqual(
             views.status.format_links(url),
-            '<a href="%s">users.speakeasy.net/~lion/nb/book.pdf</a>' % url
+            '<a href="%s">users.speakeasy.net/~lion/nb/book.pdf</a>' % url,
         )
         url = "pkm.one/#/page/The%20Book%20which%20launched%20a%201000%20Note%20taking%20apps"
         self.assertEqual(
-            views.status.format_links(url),
-            '<a href="%s">%s</a>' % (url, url)
+            views.status.format_links(url), '<a href="%s">%s</a>' % (url, url)
         )
 
     def test_to_markdown(self, *_):
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index a62e1b48..c415e4b2 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -157,7 +157,7 @@ def format_links(content):
     formatted_content = ""
     for potential_link in content.split():
         try:
-            # raises an error on anything that's not a valid 
+            # raises an error on anything that's not a valid
             URLValidator(potential_link)
         except (ValidationError, UnicodeError):
             formatted_content += potential_link + " "
@@ -165,32 +165,34 @@ def format_links(content):
         wrapped = _wrapped(potential_link)
         if wrapped:
             wrapper_close = potential_link[-1]
-            formatted_content += potential_link[0] 
+            formatted_content += potential_link[0]
             potential_link = potential_link[1:-1]
 
         # so we can use everything but the scheme in the presentation of the link
         url = urlparse(potential_link)
         link = url.netloc + url.path + url.params
         if url.query != "":
-            link += "?" + url.query 
+            link += "?" + url.query
         if url.fragment != "":
             link += "#" + url.fragment
 
         formatted_content += '<a href="%s">%s</a>' % (potential_link, link)
 
         if wrapped:
-            formatted_content += wrapper_close 
+            formatted_content += wrapper_close
 
     return formatted_content
 
+
 def _wrapped(text):
-    """ check if a line of text is wrapped in parentheses, square brackets or curly brackets. return wrapped status """
-    wrappers = [("(", ")"), ("[","]"), ("{", "}")]
+    """check if a line of text is wrapped in parentheses, square brackets or curly brackets. return wrapped status"""
+    wrappers = [("(", ")"), ("[", "]"), ("{", "}")]
     for w in wrappers:
         if text[0] == w[0] and text[-1] == w[-1]:
-            return True 
+            return True
     return False
 
+
 def to_markdown(content):
     """catch links and convert to markdown"""
     content = markdown(content)

From 0f481714c01a65e1cbc94c24227c88ad89527e0c Mon Sep 17 00:00:00 2001
From: reesporte <reesedporter@gmail.com>
Date: Mon, 30 Aug 2021 11:47:19 -0500
Subject: [PATCH 226/272] fix pylint errors

---
 bookwyrm/views/status.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index c415e4b2..eeedcc3d 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -1,5 +1,7 @@
 """ what are we here for if not for posting """
 import re
+from urllib.parse import urlparse
+
 from django.contrib.auth.decorators import login_required
 from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
@@ -8,10 +10,8 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
+
 from markdown import markdown
-
-from urllib.parse import urlparse
-
 from bookwyrm import forms, models
 from bookwyrm.sanitize_html import InputHtmlParser
 from bookwyrm.settings import DOMAIN
@@ -153,7 +153,6 @@ def find_mentions(content):
 
 def format_links(content):
     """detect and format links"""
-    v = URLValidator()
     formatted_content = ""
     for potential_link in content.split():
         try:
@@ -187,8 +186,8 @@ def format_links(content):
 def _wrapped(text):
     """check if a line of text is wrapped in parentheses, square brackets or curly brackets. return wrapped status"""
     wrappers = [("(", ")"), ("[", "]"), ("{", "}")]
-    for w in wrappers:
-        if text[0] == w[0] and text[-1] == w[-1]:
+    for wrapper in wrappers:
+        if text[0] == wrapper[0] and text[-1] == wrapper[-1]:
             return True
     return False
 

From c6d08050e2a2732706f2d1256648868f5118c6e4 Mon Sep 17 00:00:00 2001
From: reesporte <reesedporter@gmail.com>
Date: Mon, 30 Aug 2021 11:51:42 -0500
Subject: [PATCH 227/272] bruh

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

diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index eeedcc3d..fdc23ac4 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -184,7 +184,7 @@ def format_links(content):
 
 
 def _wrapped(text):
-    """check if a line of text is wrapped in parentheses, square brackets or curly brackets. return wrapped status"""
+    """check if a line of text is wrapped"""
     wrappers = [("(", ")"), ("[", "]"), ("{", "}")]
     for wrapper in wrappers:
         if text[0] == wrapper[0] and text[-1] == wrapper[-1]:

From 4f321e5f33eaa1de3f728282d5ebe481c7ebbd1d Mon Sep 17 00:00:00 2001
From: reesporte <reesedporter@gmail.com>
Date: Mon, 30 Aug 2021 14:23:04 -0500
Subject: [PATCH 228/272] fix link formatting issue, for real this time

---
 bookwyrm/tests/views/test_status.py |  6 ++---
 bookwyrm/views/status.py            | 37 ++++++++++++++++-------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 893e0650..ff429e20 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -307,14 +307,14 @@ class StatusViews(TestCase):
         self.assertEqual(
             views.status.format_links(url), '<a href="%s">tech.lgbt/@bookwyrm</a>' % url
         )
-        url = "users.speakeasy.net/~lion/nb/book.pdf"
+        url = "https://users.speakeasy.net/~lion/nb/book.pdf"
         self.assertEqual(
             views.status.format_links(url),
             '<a href="%s">users.speakeasy.net/~lion/nb/book.pdf</a>' % url,
         )
-        url = "pkm.one/#/page/The%20Book%20which%20launched%20a%201000%20Note%20taking%20apps"
+        url = "https://pkm.one/#/page/The%20Book%20which%20launched%20a%201000%20Note%20taking%20apps"
         self.assertEqual(
-            views.status.format_links(url), '<a href="%s">%s</a>' % (url, url)
+            views.status.format_links(url), '<a href="%s">%s</a>' % (url, url[8:])
         )
 
     def test_to_markdown(self, *_):
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index fdc23ac4..fe1dfda1 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -153,32 +153,37 @@ def find_mentions(content):
 
 def format_links(content):
     """detect and format links"""
+    validator = URLValidator()
     formatted_content = ""
-    for potential_link in content.split():
-        try:
-            # raises an error on anything that's not a valid
-            URLValidator(potential_link)
-        except (ValidationError, UnicodeError):
-            formatted_content += potential_link + " "
-            continue
+    split_content = content.split()
+
+    for index, potential_link in enumerate(split_content):
         wrapped = _wrapped(potential_link)
         if wrapped:
             wrapper_close = potential_link[-1]
             formatted_content += potential_link[0]
             potential_link = potential_link[1:-1]
 
-        # so we can use everything but the scheme in the presentation of the link
-        url = urlparse(potential_link)
-        link = url.netloc + url.path + url.params
-        if url.query != "":
-            link += "?" + url.query
-        if url.fragment != "":
-            link += "#" + url.fragment
+        try:
+            # raises an error on anything that's not a valid link
+            validator(potential_link)
 
-        formatted_content += '<a href="%s">%s</a>' % (potential_link, link)
+            # use everything but the scheme in the presentation of the link
+            url = urlparse(potential_link)
+            link = url.netloc + url.path + url.params
+            if url.query != "":
+                link += "?" + url.query
+            if url.fragment != "":
+                link += "#" + url.fragment
+
+            formatted_content += '<a href="%s">%s</a>' % (potential_link, link)
+        except (ValidationError, UnicodeError):
+            formatted_content += potential_link
 
         if wrapped:
             formatted_content += wrapper_close
+        if index < len(split_content) - 1:
+            formatted_content += " "
 
     return formatted_content
 
@@ -194,8 +199,8 @@ def _wrapped(text):
 
 def to_markdown(content):
     """catch links and convert to markdown"""
-    content = markdown(content)
     content = format_links(content)
+    content = markdown(content)
     # sanitize resulting html
     sanitizer = InputHtmlParser()
     sanitizer.feed(content)

From c3ff7fcf9b68848a56f8979378f1cb15437ba8b1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 30 Aug 2021 13:44:19 -0700
Subject: [PATCH 229/272] Resolves merge weirdness

---
 bookwyrm/activitystreams.py | 37 +++----------------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 0755314b..621f06da 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -360,7 +360,8 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
     if not created or not instance.local:
         return
 
-    populate_streams_task.delay(instance.id)
+    for stream in streams.values():
+        populate_stream_task.delay(stream, instance.id)
 
 
 @receiver(signals.pre_save, sender=models.ShelfBook)
@@ -393,28 +394,6 @@ def remove_statuses_on_shelve(sender, instance, *args, **kwargs):
     BooksStream().remove_book_statuses(instance.user, instance.book)
 
 
-@receiver(signals.pre_save, sender=models.ShelfBook)
-# pylint: disable=unused-argument
-def add_statuses_on_shelve(sender, instance, *args, **kwargs):
-    """update books stream when user shelves a book"""
-    if not instance.user.local:
-        return
-    book = None
-    if hasattr(instance, "book"):
-        book = instance.book
-    elif instance.mention_books.exists():
-        book = instance.mention_books.first()
-    if not book:
-        return
-
-    # check if the book is already on the user's shelves
-    editions = book.parent_work.editions.all()
-    if models.ShelfBook.objects.filter(user=instance.user, book__in=editions).exists():
-        return
-
-    BooksStream().add_book_statuses(instance.user, book)
-
-
 @receiver(signals.post_delete, sender=models.ShelfBook)
 # pylint: disable=unused-argument
 def remove_statuses_on_unshelve(sender, instance, *args, **kwargs):
@@ -439,16 +418,6 @@ def remove_statuses_on_unshelve(sender, instance, *args, **kwargs):
 
 # ---- TASKS
 
-# TODO: merge conflict: reconcile these tasks
-
-@app.task
-def populate_streams_task(user_id):
-    """create a user's streams"""
-    user = models.User.objects.get(id=user_id)
-    for stream in streams.values():
-        stream.populate_streams(user)
-
-
 @app.task
 def populate_stream_task(stream, user_id):
     """background task for populating an empty activitystream"""
@@ -495,4 +464,4 @@ def add_user_statuses_task(viewer_id, user_id, stream_list=None):
     viewer = models.User.objects.get(id=viewer_id)
     user = models.User.objects.get(id=user_id)
     for stream in stream_list:
-        stream.add_user_statuses(viewer, user)
\ No newline at end of file
+        stream.add_user_statuses(viewer, user)

From 32f044445f1baa2b3b694282ab0d7fdffd91be22 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 30 Aug 2021 13:50:54 -0700
Subject: [PATCH 230/272] Fix merge weirdness around shelve/unshelve

---
 bookwyrm/activitystreams.py | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index a5f95ac9..aa627b7a 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -373,28 +373,20 @@ def add_statuses_on_shelve(sender, instance, *args, **kwargs):
     """update books stream when user shelves a book"""
     if not instance.user.local:
         return
+    book = None
+    if hasattr(instance, "book"):
+        book = instance.book
+    elif instance.mention_books.exists():
+        book = instance.mention_books.first()
+    if not book:
+        return
+
     # check if the book is already on the user's shelves
-    if models.ShelfBook.objects.filter(
-        user=instance.user, book__in=instance.book.parent_work.editions.all()
-    ).exists():
+    editions = book.parent_work.editions.all()
+    if models.ShelfBook.objects.filter(user=instance.user, book__in=editions).exists():
         return
 
-    BooksStream().add_book_statuses(instance.user, instance.book)
-
-
-@receiver(signals.post_delete, sender=models.ShelfBook)
-# pylint: disable=unused-argument
-def remove_statuses_on_shelve(sender, instance, *args, **kwargs):
-    """update books stream when user unshelves a book"""
-    if not instance.user.local:
-        return
-    # check if the book is actually unshelved, not just moved
-    if models.ShelfBook.objects.filter(
-        user=instance.user, book__in=instance.book.parent_work.editions.all()
-    ).exists():
-        return
-
-    BooksStream().remove_book_statuses(instance.user, instance.book)
+    BooksStream().add_book_statuses(instance.user, book)
 
 
 @receiver(signals.post_delete, sender=models.ShelfBook)
@@ -421,6 +413,7 @@ def remove_statuses_on_unshelve(sender, instance, *args, **kwargs):
 
 # ---- TASKS
 
+
 @app.task
 def populate_stream_task(stream, user_id):
     """background task for populating an empty activitystream"""

From d7557926f7a2eba1d8444d8e0e25048b3dcb2f68 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 30 Aug 2021 14:06:29 -0700
Subject: [PATCH 231/272] Create task for shelve updates

---
 bookwyrm/activitystreams.py | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index aa627b7a..cb59f1a7 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -373,20 +373,14 @@ def add_statuses_on_shelve(sender, instance, *args, **kwargs):
     """update books stream when user shelves a book"""
     if not instance.user.local:
         return
-    book = None
-    if hasattr(instance, "book"):
-        book = instance.book
-    elif instance.mention_books.exists():
-        book = instance.mention_books.first()
-    if not book:
-        return
+    book = instance.book
 
     # check if the book is already on the user's shelves
     editions = book.parent_work.editions.all()
     if models.ShelfBook.objects.filter(user=instance.user, book__in=editions).exists():
         return
 
-    BooksStream().add_book_statuses(instance.user, book)
+    add_book_statuses_task.delay(instance.user.id, book.id)
 
 
 @receiver(signals.post_delete, sender=models.ShelfBook)
@@ -396,24 +390,35 @@ def remove_statuses_on_unshelve(sender, instance, *args, **kwargs):
     if not instance.user.local:
         return
 
-    book = None
-    if hasattr(instance, "book"):
-        book = instance.book
-    elif instance.mention_books.exists():
-        book = instance.mention_books.first()
-    if not book:
-        return
+    book = instance.book
+
     # check if the book is actually unshelved, not just moved
     editions = book.parent_work.editions.all()
     if models.ShelfBook.objects.filter(user=instance.user, book__in=editions).exists():
         return
 
-    BooksStream().remove_book_statuses(instance.user, instance.book)
+    remove_book_statuses_task.delay(instance.user.id, book.id)
 
 
 # ---- TASKS
 
 
+@app.task
+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)
+    book = models.Edition.objects.get(id=book_id)
+    BooksStream().add_book_statuses(user, book)
+
+
+@app.task
+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)
+    book = models.Edition.objects.get(id=book_id)
+    BooksStream().remove_book_statuses(user, book)
+
+
 @app.task
 def populate_stream_task(stream, user_id):
     """background task for populating an empty activitystream"""

From 3d394f96bf3d424a4a678390f5c1207fbf794ef3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 2 Sep 2021 08:48:53 -0700
Subject: [PATCH 232/272] Fixes testing if authors are present

---
 bookwyrm/templates/book/book.html             | 2 +-
 bookwyrm/templates/snippets/book_titleby.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index e504041b..334d2b61 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -43,7 +43,7 @@
                 </p>
             {% endif %}
 
-            {% if book.authors %}
+            {% if book.authors.exists %}
                 <div class="subtitle">
                     {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
                 </div>
diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index 5eddabff..1c2bb176 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -2,7 +2,7 @@
 {% load utilities %}
 {% spaceless %}
 
-{% if book.authors %}
+{% if book.authors.exists %}
 {% blocktrans trimmed with path=book.local_path title=book|book_title %}
 <a href="{{ path }}">{{ title }}</a> by
 {% endblocktrans %}

From a236163e6704d318c3895971ea8bac1c1d8501bb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 2 Sep 2021 09:12:56 -0700
Subject: [PATCH 233/272] Small cleanup

---
 bookwyrm/templates/book/book.html  | 1 -
 bookwyrm/templatetags/utilities.py | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 334d2b61..6fa2e441 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -4,7 +4,6 @@
 {% load humanize %}
 {% load utilities %}
 {% load static %}
-{% load layout %}
 
 {% block title %}{{ book|book_title }}{% endblock %}
 
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index abb52499..eeef26be 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -55,7 +55,8 @@ def truncatepath(value, arg):
 
 @register.simple_tag(takes_context=False)
 def get_book_cover_thumbnail(book, size="medium", ext="jpg"):
-    """Returns a book thumbnail at the specified size and extension, with fallback if needed"""
+    """Returns a book thumbnail at the specified size and extension,
+       with fallback if needed"""
     if size == "":
         size = "medium"
     try:

From 5bfa09e4116749e3da6220cb9885fa81c623736a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 2 Sep 2021 09:13:02 -0700
Subject: [PATCH 234/272] Fixes whitespace when formatting links

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

diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index fe1dfda1..b58e4941 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -155,7 +155,7 @@ def format_links(content):
     """detect and format links"""
     validator = URLValidator()
     formatted_content = ""
-    split_content = content.split()
+    split_content = content.split(" ")
 
     for index, potential_link in enumerate(split_content):
         wrapped = _wrapped(potential_link)

From ccc41deb36cda6d22d512ff85a5ec26b896ea10e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 2 Sep 2021 13:29:05 -0700
Subject: [PATCH 235/272] Retain whitespace in split for detecting urls

---
 bookwyrm/templatetags/utilities.py  |  2 +-
 bookwyrm/tests/views/test_status.py | 23 ++++++++++++++++++++++-
 bookwyrm/views/status.py            |  8 ++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index eeef26be..c8ebd17d 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -56,7 +56,7 @@ def truncatepath(value, arg):
 @register.simple_tag(takes_context=False)
 def get_book_cover_thumbnail(book, size="medium", ext="jpg"):
     """Returns a book thumbnail at the specified size and extension,
-       with fallback if needed"""
+    with fallback if needed"""
     if size == "":
         size = "medium"
     try:
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index ff429e20..6c236b6d 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -281,7 +281,7 @@ class StatusViews(TestCase):
             ("@nutria@%s" % DOMAIN, user),
         )
 
-    def test_format_links(self, *_):
+    def test_format_links_simple_url(self, *_):
         """find and format urls into a tags"""
         url = "http://www.fish.com/"
         self.assertEqual(
@@ -291,6 +291,27 @@ class StatusViews(TestCase):
             views.status.format_links("(%s)" % url),
             '(<a href="%s">www.fish.com/</a>)' % url,
         )
+
+    def test_format_links_paragraph_break(self, *_):
+        """find and format urls into a tags"""
+        url = """okay
+
+http://www.fish.com/"""
+        self.assertEqual(
+            views.status.format_links(url),
+            'okay\n\n<a href="http://www.fish.com/">www.fish.com/</a>',
+        )
+
+    def test_format_links_parens(self, *_):
+        """find and format urls into a tags"""
+        url = "http://www.fish.com/"
+        self.assertEqual(
+            views.status.format_links("(%s)" % url),
+            '(<a href="%s">www.fish.com/</a>)' % url,
+        )
+
+    def test_format_links_special_chars(self, *_):
+        """find and format urls into a tags"""
         url = "https://archive.org/details/dli.granth.72113/page/n25/mode/2up"
         self.assertEqual(
             views.status.format_links(url),
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index b58e4941..a864d4b7 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -155,9 +155,11 @@ def format_links(content):
     """detect and format links"""
     validator = URLValidator()
     formatted_content = ""
-    split_content = content.split(" ")
+    split_content = re.split(r"(\s+)", content)
 
-    for index, potential_link in enumerate(split_content):
+    for potential_link in split_content:
+        if not potential_link:
+            continue
         wrapped = _wrapped(potential_link)
         if wrapped:
             wrapper_close = potential_link[-1]
@@ -182,8 +184,6 @@ def format_links(content):
 
         if wrapped:
             formatted_content += wrapper_close
-        if index < len(split_content) - 1:
-            formatted_content += " "
 
     return formatted_content
 

From 4009e80babb537533f74b8e91297c9fecbe187ba Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 10:33:40 -0700
Subject: [PATCH 236/272] Fixes logo path on about page

---
 bookwyrm/templates/snippets/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/about.html b/bookwyrm/templates/snippets/about.html
index b94777d1..c9a9db80 100644
--- a/bookwyrm/templates/snippets/about.html
+++ b/bookwyrm/templates/snippets/about.html
@@ -3,7 +3,7 @@
 <div class="columns">
     <div class="column is-narrow is-hidden-mobile">
         <figure class="block is-w-xl">
-            <img src="{% if site.logo %}/images/{{ site.logo }}{% else %}{% static "images/logo.png" %}{% endif %}" alt="BookWyrm logo">
+            <img src="{% if site.logo %}{% get_media_prefix %}{{ site.logo }}{% else %}{% static "images/logo.png" %}{% endif %}" alt="BookWyrm logo">
         </figure>
     </div>
     <div class="content">

From 94f4a016657aaa5aa3e583709364eb7a152cebe8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 13:25:57 -0700
Subject: [PATCH 237/272] Remove requried attribute on content field in create
 review form

---
 bookwyrm/templates/snippets/create_status/content_field.html | 2 +-
 bookwyrm/templates/snippets/create_status/review.html        | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html
index 90337200..90746736 100644
--- a/bookwyrm/templates/snippets/create_status/content_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_field.html
@@ -14,6 +14,6 @@ draft: an existing Status object that is providing default values for input fiel
     id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
     placeholder="{{ placeholder }}"
     aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"
-    {% if not optional and type != "quotation" %}required{% endif %}
+    {% if not optional and type != "quotation" and type != "review" %}required{% endif %}
 >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
 
diff --git a/bookwyrm/templates/snippets/create_status/review.html b/bookwyrm/templates/snippets/create_status/review.html
index be17b7f2..714055a1 100644
--- a/bookwyrm/templates/snippets/create_status/review.html
+++ b/bookwyrm/templates/snippets/create_status/review.html
@@ -11,8 +11,6 @@ draft: the content of an existing Status object to be edited (used in delete and
 uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
 {% endcomment %}
 
-{% with type="review" %}
-
 {% block pre_content_additions %}
     <div class="field">
         <label class="label" for="id_name_{{ book.id }}">{% trans "Title:" %}</label>
@@ -31,5 +29,3 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
 {% block content_label %}
     {% trans "Review:" %}
 {% endblock %}
-
-{% endwith %}

From 8e2acb733ccd939437a1283fa3589749bcf1ee18 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 14:13:54 -0700
Subject: [PATCH 238/272] Use non-www domain canonically

---
 nginx/production | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nginx/production b/nginx/production
index 54c84af4..76f18f32 100644
--- a/nginx/production
+++ b/nginx/production
@@ -24,6 +24,10 @@ server {
 #     listen 443 ssl http2;
 #
 #     server_name your-domain.com;
+
+#     if ($host != "you-domain.com") {
+#         return 301 $scheme://your-domain.com$request_uri;
+#     }
 #
 #     # SSL code
 #     ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem;

From d046deaf11d5c2dc43ebe68e2c81feccaa76c46a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 14:42:11 -0700
Subject: [PATCH 239/272] Adds totals and page counts to shelf headers

---
 bookwyrm/templates/user/shelf/shelf.html | 36 ++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 61458fcc..06507d3e 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -24,11 +24,26 @@
         <div class="tabs">
             <ul>
             <li class="{% if shelf.identifier == 'all' %}is-active{% endif %}">
-                <a href="{% url 'user-shelves' user|username %}"{% if shelf.identifier == 'all' %} aria-current="page"{% endif %}>{% trans "All books" %}</a>
+                <a href="{% url 'user-shelves' user|username %}"{% if shelf.identifier == 'all' %} aria-current="page"{% endif %}>
+                    {% trans "All books" %}
+                </a>
             </li>
             {% for shelf_tab in shelves %}
             <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
-                <a href="{{ shelf_tab.local_path }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{% if shelf_tab.identifier == 'to-read' %}{% trans "To Read" %}{% elif shelf_tab.identifier == 'reading' %}{% trans "Currently Reading" %}{% elif shelf_tab.identifier == 'read' %}{% trans "Read" %}{% else %}{{ shelf_tab.name }}{% endif %}</a>
+                <a
+                    href="{{ shelf_tab.local_path }}"
+                    {% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}
+                >
+                    {% if shelf_tab.identifier == 'to-read' %}
+                        {% trans "To Read" %}
+                    {% elif shelf_tab.identifier == 'reading' %}
+                        {% trans "Currently Reading" %}
+                    {% elif shelf_tab.identifier == 'read' %}
+                        {% trans "Read" %}
+                    {% else %}
+                        {{ shelf_tab.name }}
+                    {% endif %}
+                </a>
             </li>
             {% endfor %}
             </ul>
@@ -55,6 +70,23 @@
             <span class="subtitle">
                 {% include 'snippets/privacy-icons.html' with item=shelf %}
             </span>
+            {% with count=books.paginator.count %}
+            {% if count %}
+            <p class="help">
+                {% blocktrans trimmed count counter=count with formatted_count=count|intcomma %}
+                    {{ formatted_count }} book
+                {% plural %}
+                    {{ formatted_count }} books
+                {% endblocktrans %}
+
+                {% if books.has_other_pages %}
+                    {% blocktrans trimmed with start=books.start_index end=books.end_index %}
+                    (showing {{ start }}-{{ end }})
+                    {% endblocktrans %}
+                {% endif %}
+            </p>
+            {% endif %}
+            {% endwith %}
         </h2>
     </div>
     {% if is_self and shelf.id %}

From 2ecec1a165956b189c6820a045a4e0bf1cbe6e94 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 14:46:06 -0700
Subject: [PATCH 240/272] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.po   | 134 ++++++++++++++------------
 locale/en_US/LC_MESSAGES/django.po   | 134 ++++++++++++++------------
 locale/es/LC_MESSAGES/django.po      | 136 +++++++++++++++------------
 locale/fr_FR/LC_MESSAGES/django.po   | 134 ++++++++++++++------------
 locale/zh_Hans/LC_MESSAGES/django.po | 133 ++++++++++++++------------
 locale/zh_Hant/LC_MESSAGES/django.po | 133 ++++++++++++++------------
 6 files changed, 438 insertions(+), 366 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 397e18c2..2aeb0f42 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:11+0000\n"
+"POT-Creation-Date: 2021-09-05 21:43+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -63,8 +63,8 @@ msgstr "Titel"
 
 #: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr ""
 
@@ -191,12 +191,12 @@ msgid "Wikipedia"
 msgstr ""
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
@@ -299,7 +299,7 @@ msgid "Goodreads key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:140
 #: bookwyrm/templates/book/edit_book.html:328
 #: bookwyrm/templates/book/readthrough.html:76
 #: bookwyrm/templates/lists/bookmark_button.html:15
@@ -316,7 +316,7 @@ msgid "Save"
 msgstr "Speichern"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:329
 #: bookwyrm/templates/book/readthrough.html:77
@@ -328,112 +328,112 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "von"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 #, fuzzy
 #| msgid "Failed to load"
 msgid "Failed to load cover"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:136
 #: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Deine Regale"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Dein Account"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -441,13 +441,13 @@ msgstr "Orte"
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
 msgid "Add"
@@ -601,7 +601,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:227
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr ""
 
@@ -1071,14 +1071,14 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:38
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:40
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
@@ -1086,7 +1086,7 @@ msgstr "Gerade lesend"
 
 #: bookwyrm/templates/feed/layout.html:27
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "Gelesen"
 
@@ -1284,7 +1284,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)ss %(year)s Bücher"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:42
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "Bücher importieren"
 
@@ -1387,14 +1387,14 @@ msgid "Book"
 msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "Autor*in"
 
@@ -1491,7 +1491,7 @@ msgid "Settings"
 msgstr "Einstellungen"
 
 #: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/settings/admin_layout.html:33
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1838,7 +1838,7 @@ msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:38
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
@@ -2123,7 +2123,7 @@ msgstr "Suche"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -2143,7 +2143,7 @@ msgstr ""
 msgid "Manage Users"
 msgstr "Nutzer*innen verwalten"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 #, fuzzy
@@ -2151,38 +2151,38 @@ msgstr "Nutzer*innen verwalten"
 msgid "Federated Instances"
 msgstr "Föderierende Server"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:50
 msgid "Instance Settings"
 msgstr "Instanzeinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/announcements.html:3
 #: bookwyrm/templates/settings/announcements.html:5
 msgid "Announcements"
 msgstr "Ankündigungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Seiteneinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:55
+#: bookwyrm/templates/settings/admin_layout.html:61
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Instanzinformationen"
 
-#: bookwyrm/templates/settings/admin_layout.html:56
+#: bookwyrm/templates/settings/admin_layout.html:62
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Bilder"
 
-#: bookwyrm/templates/settings/admin_layout.html:57
+#: bookwyrm/templates/settings/admin_layout.html:63
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/settings/admin_layout.html:58
+#: bookwyrm/templates/settings/admin_layout.html:64
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Registrierung"
@@ -3292,40 +3292,52 @@ msgstr "Regal bearbeiten"
 msgid "Update shelf"
 msgstr "Regal aktualisieren"
 
-#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
 msgstr "Bücher"
 
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 65c402b1..db73cda6 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:11+0000\n"
+"POT-Creation-Date: 2021-09-05 21:43+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -57,8 +57,8 @@ msgstr ""
 
 #: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr ""
 
@@ -177,12 +177,12 @@ msgid "Wikipedia"
 msgstr ""
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr ""
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr ""
 
@@ -275,7 +275,7 @@ msgid "Goodreads key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:140
 #: bookwyrm/templates/book/edit_book.html:328
 #: bookwyrm/templates/book/readthrough.html:76
 #: bookwyrm/templates/lists/bookmark_button.html:15
@@ -292,7 +292,7 @@ msgid "Save"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:329
 #: bookwyrm/templates/book/readthrough.html:77
@@ -304,99 +304,99 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:136
 #: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -404,11 +404,11 @@ msgstr ""
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
 msgid "Add"
@@ -546,7 +546,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:227
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr ""
 
@@ -977,18 +977,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:27
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr ""
 
@@ -1169,7 +1169,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:42
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr ""
 
@@ -1266,14 +1266,14 @@ msgid "Book"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr ""
 
@@ -1368,7 +1368,7 @@ msgid "Settings"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/settings/admin_layout.html:33
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1683,7 +1683,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:38
 msgid "Reports"
 msgstr ""
 
@@ -1945,7 +1945,7 @@ msgstr ""
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1964,44 +1964,44 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Instances"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:50
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/announcements.html:3
 #: bookwyrm/templates/settings/announcements.html:5
 msgid "Announcements"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:55
+#: bookwyrm/templates/settings/admin_layout.html:61
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:56
+#: bookwyrm/templates/settings/admin_layout.html:62
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:57
+#: bookwyrm/templates/settings/admin_layout.html:63
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:58
+#: bookwyrm/templates/settings/admin_layout.html:64
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr ""
@@ -2978,38 +2978,50 @@ msgstr ""
 msgid "Update shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 11710278..9c65dd4d 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-29 18:01+0000\n"
+"POT-Creation-Date: 2021-09-05 21:43+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: Reese Porter <reesedporter@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Título"
 
 #: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "Calificación"
 
@@ -177,12 +177,12 @@ msgid "Wikipedia"
 msgstr "Wikipedia"
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr "Ver en Inventaire"
 
@@ -275,7 +275,7 @@ msgid "Goodreads key:"
 msgstr "Clave Goodreads:"
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:140
 #: bookwyrm/templates/book/edit_book.html:328
 #: bookwyrm/templates/book/readthrough.html:76
 #: bookwyrm/templates/lists/bookmark_button.html:15
@@ -292,7 +292,7 @@ msgid "Save"
 msgstr "Guardar"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:329
 #: bookwyrm/templates/book/readthrough.html:77
@@ -304,99 +304,99 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "por"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "Editar Libro"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr "No se pudo cargar la portada"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:136
 #: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr "Reseñas"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr "Tus reseñas"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr "Tus comentarios"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr "Tus citas"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -404,11 +404,11 @@ msgstr "Lugares"
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr "Agregar a lista"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
 msgid "Add"
@@ -546,7 +546,7 @@ msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
 #: bookwyrm/templates/book/edit_book.html:227
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr "Portada:"
 
@@ -955,6 +955,7 @@ msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
 #: bookwyrm/templates/feed/feed.html:22
+#, python-format
 msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
 msgstr "cargar <span data-poll=\"stream/%(tab_key)s\">0</span> status(es) no leído(s)"
 
@@ -976,18 +977,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr "Para leer"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/layout.html:27
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "Leido"
 
@@ -1168,7 +1169,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Los libros de %(username)s para %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:42
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "Importar libros"
 
@@ -1265,14 +1266,14 @@ msgid "Book"
 msgstr "Libro"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "Autor/Autora"
 
@@ -1367,7 +1368,7 @@ msgid "Settings"
 msgstr "Configuración"
 
 #: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/settings/admin_layout.html:33
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1682,7 +1683,7 @@ msgstr "Informes: %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:38
 msgid "Reports"
 msgstr "Informes"
 
@@ -1944,7 +1945,7 @@ msgstr "Tipo de búsqueda"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1963,44 +1964,44 @@ msgstr "Adminstración"
 msgid "Manage Users"
 msgstr "Administrar usuarios"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Instances"
 msgstr "Instancias federalizadas"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:50
 msgid "Instance Settings"
 msgstr "Configuración de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/announcements.html:3
 #: bookwyrm/templates/settings/announcements.html:5
 msgid "Announcements"
 msgstr "Anuncios"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Configuración de sitio"
 
-#: bookwyrm/templates/settings/admin_layout.html:55
+#: bookwyrm/templates/settings/admin_layout.html:61
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Información de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:56
+#: bookwyrm/templates/settings/admin_layout.html:62
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Imagenes"
 
-#: bookwyrm/templates/settings/admin_layout.html:57
+#: bookwyrm/templates/settings/admin_layout.html:63
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenido del pie de página"
 
-#: bookwyrm/templates/settings/admin_layout.html:58
+#: bookwyrm/templates/settings/admin_layout.html:64
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Registración"
@@ -2682,6 +2683,7 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
+#, python-format
 msgid "page %(page)s"
 msgstr "página %(page)s"
 
@@ -2976,38 +2978,50 @@ msgstr "Editar estante"
 msgid "Update shelf"
 msgstr "Actualizar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "Todos los libros"
 
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "Crear estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "Editar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "Empezado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 81130aa3..b2d22240 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:11+0000\n"
+"POT-Creation-Date: 2021-09-05 21:43+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Titre du livre"
 
 #: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "Note"
 
@@ -181,12 +181,12 @@ msgid "Wikipedia"
 msgstr "Wikipedia"
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr "Voir sur Inventaire"
 
@@ -279,7 +279,7 @@ msgid "Goodreads key:"
 msgstr "Clé Goodreads :"
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:140
 #: bookwyrm/templates/book/edit_book.html:328
 #: bookwyrm/templates/book/readthrough.html:76
 #: bookwyrm/templates/lists/bookmark_button.html:15
@@ -296,7 +296,7 @@ msgid "Save"
 msgstr "Enregistrer"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:329
 #: bookwyrm/templates/book/readthrough.html:77
@@ -308,99 +308,99 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "par"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr "La couverture n’a pu être chargée"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s critique)"
 msgstr[1] "(%(review_count)s critiques)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:136
 #: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr "Critiques"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr "Vos critiques"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr "Vos commentaires"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr "Vos citations"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -408,11 +408,11 @@ msgstr "Lieux"
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr "Ajouter à la liste"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
 msgid "Add"
@@ -550,7 +550,7 @@ msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
 #: bookwyrm/templates/book/edit_book.html:227
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr "Couverture"
 
@@ -990,18 +990,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr "À lire"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr "Lectures en cours"
 
 #: bookwyrm/templates/feed/layout.html:27
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "Lu"
 
@@ -1184,7 +1184,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:42
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -1285,14 +1285,14 @@ msgid "Book"
 msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "Auteur/autrice"
 
@@ -1387,7 +1387,7 @@ msgid "Settings"
 msgstr "Paramètres"
 
 #: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/settings/admin_layout.html:33
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1708,7 +1708,7 @@ msgstr "Signalements : %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:38
 msgid "Reports"
 msgstr "Signalements"
 
@@ -1977,7 +1977,7 @@ msgstr "Type de recherche"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1996,44 +1996,44 @@ msgstr "Administration"
 msgid "Manage Users"
 msgstr "Gérer les comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Instances"
 msgstr "Instances fédérées"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:50
 msgid "Instance Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/announcements.html:3
 #: bookwyrm/templates/settings/announcements.html:5
 msgid "Announcements"
 msgstr "Annonces"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
-#: bookwyrm/templates/settings/admin_layout.html:55
+#: bookwyrm/templates/settings/admin_layout.html:61
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Information sur l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:56
+#: bookwyrm/templates/settings/admin_layout.html:62
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Images"
 
-#: bookwyrm/templates/settings/admin_layout.html:57
+#: bookwyrm/templates/settings/admin_layout.html:63
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/settings/admin_layout.html:58
+#: bookwyrm/templates/settings/admin_layout.html:64
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Inscription"
@@ -3026,38 +3026,50 @@ msgstr "Modifier l’étagère"
 msgid "Update shelf"
 msgstr "Mettre l’étagère à jour"
 
-#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "Tous les livres"
 
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "Créer une étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "Date d’ajout"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index df3ee019..21791638 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:11+0000\n"
+"POT-Creation-Date: 2021-09-05 21:43+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "书名"
 
 #: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "评价"
 
@@ -177,12 +177,12 @@ msgid "Wikipedia"
 msgstr "维基百科"
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr "在 Inventaire 查看"
 
@@ -275,7 +275,7 @@ msgid "Goodreads key:"
 msgstr "Goodreads key:"
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:140
 #: bookwyrm/templates/book/edit_book.html:328
 #: bookwyrm/templates/book/readthrough.html:76
 #: bookwyrm/templates/lists/bookmark_button.html:15
@@ -292,7 +292,7 @@ msgid "Save"
 msgstr "保存"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:329
 #: bookwyrm/templates/book/readthrough.html:77
@@ -304,98 +304,98 @@ msgstr "保存"
 msgid "Cancel"
 msgstr "取消"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "作者"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "添加封面"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr "加载封面失败"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "添加描述"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:136
 #: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "描述:"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "本书的 <a href=\"%(book_path)s\">另一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr "书评"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr "你的书评"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr "你的评论"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr "你的引用"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -403,11 +403,11 @@ msgstr "地点"
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr "添加到列表"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
 msgid "Add"
@@ -545,7 +545,7 @@ msgid "John Doe, Jane Smith"
 msgstr "张三, 李四"
 
 #: bookwyrm/templates/book/edit_book.html:227
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr "封面"
 
@@ -976,18 +976,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "现在这里还没有任何书目！尝试着从搜索某本书开始吧"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr "想读"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr "在读"
 
 #: bookwyrm/templates/feed/layout.html:27
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "读过"
 
@@ -1170,7 +1170,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:42
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "导入书目"
 
@@ -1267,14 +1267,14 @@ msgid "Book"
 msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "作者"
 
@@ -1369,7 +1369,7 @@ msgid "Settings"
 msgstr "设置"
 
 #: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/settings/admin_layout.html:33
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1690,7 +1690,7 @@ msgstr "报告: %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:38
 msgid "Reports"
 msgstr "报告"
 
@@ -1953,7 +1953,7 @@ msgstr "搜索类型"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1972,44 +1972,44 @@ msgstr "管理"
 msgid "Manage Users"
 msgstr "管理用户"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Instances"
 msgstr "互联实例"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:50
 msgid "Instance Settings"
 msgstr "实例设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/announcements.html:3
 #: bookwyrm/templates/settings/announcements.html:5
 msgid "Announcements"
 msgstr "公告"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "站点设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:55
+#: bookwyrm/templates/settings/admin_layout.html:61
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "实例信息"
 
-#: bookwyrm/templates/settings/admin_layout.html:56
+#: bookwyrm/templates/settings/admin_layout.html:62
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "图像"
 
-#: bookwyrm/templates/settings/admin_layout.html:57
+#: bookwyrm/templates/settings/admin_layout.html:63
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "页脚内容"
 
-#: bookwyrm/templates/settings/admin_layout.html:58
+#: bookwyrm/templates/settings/admin_layout.html:64
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "注册"
@@ -2979,38 +2979,49 @@ msgstr "编辑书架"
 msgid "Update shelf"
 msgstr "更新书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "所有书目"
 
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "编辑书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "上架时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "开始时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "完成时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "删除书架"
 
diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index c8224be6..1eddada7 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:11+0000\n"
+"POT-Creation-Date: 2021-09-05 21:43+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "書名"
 
 #: bookwyrm/forms.py:310
 #: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "評價"
 
@@ -181,12 +181,12 @@ msgid "Wikipedia"
 msgstr "維基百科"
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 檢視"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr "在 Inventaire 檢視"
 
@@ -281,7 +281,7 @@ msgid "Goodreads key:"
 msgstr "Goodreads key:"
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:140
 #: bookwyrm/templates/book/edit_book.html:328
 #: bookwyrm/templates/book/readthrough.html:76
 #: bookwyrm/templates/lists/bookmark_button.html:15
@@ -298,7 +298,7 @@ msgid "Save"
 msgstr "儲存"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:329
 #: bookwyrm/templates/book/readthrough.html:77
@@ -310,98 +310,98 @@ msgstr "儲存"
 msgid "Cancel"
 msgstr "取消"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "作者"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "編輯書目"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "新增封面"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr "載入封面失敗"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 則書評)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "新增描述"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:136
 #: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "描述:"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 個版本</a>"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 書架上。"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "本書的 <a href=\"%(book_path)s\">另一個版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 書架上。"
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "你的閱讀活動"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "新增閱讀日期"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "建立"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "你還未閱讀這本書。"
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr "書評"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr "你的書評"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr "你的評論"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr "你的引用"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "主題"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "地點"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -409,11 +409,11 @@ msgstr "地點"
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr "新增到列表"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
 msgid "Add"
@@ -553,7 +553,7 @@ msgid "John Doe, Jane Smith"
 msgstr "John Doe, Jane Smith"
 
 #: bookwyrm/templates/book/edit_book.html:227
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr "封面"
 
@@ -1001,18 +1001,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "現在這裡還沒有任何書目！嘗試著從搜尋某本書開始吧"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr "想讀"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr "在讀"
 
 #: bookwyrm/templates/feed/layout.html:27
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17
-#: bookwyrm/templates/user/shelf/shelf.html:31
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "讀過"
 
@@ -1195,7 +1195,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的書目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:42
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "匯入書目"
 
@@ -1296,14 +1296,14 @@ msgid "Book"
 msgstr "書目"
 
 #: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "標題"
 
 #: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "作者"
 
@@ -1398,7 +1398,7 @@ msgid "Settings"
 msgstr "設定"
 
 #: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/settings/admin_layout.html:33
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1719,7 +1719,7 @@ msgstr "舉報: %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:38
 msgid "Reports"
 msgstr "舉報"
 
@@ -1988,7 +1988,7 @@ msgstr "搜尋類別"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -2007,44 +2007,44 @@ msgstr "管理"
 msgid "Manage Users"
 msgstr "管理使用者"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Instances"
 msgstr "聯合實例"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:50
 msgid "Instance Settings"
 msgstr "實例設定"
 
-#: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/announcements.html:3
 #: bookwyrm/templates/settings/announcements.html:5
 msgid "Announcements"
 msgstr "公告"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "網站設定"
 
-#: bookwyrm/templates/settings/admin_layout.html:55
+#: bookwyrm/templates/settings/admin_layout.html:61
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "實例資訊"
 
-#: bookwyrm/templates/settings/admin_layout.html:56
+#: bookwyrm/templates/settings/admin_layout.html:62
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "圖片"
 
-#: bookwyrm/templates/settings/admin_layout.html:57
+#: bookwyrm/templates/settings/admin_layout.html:63
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "頁尾內容"
 
-#: bookwyrm/templates/settings/admin_layout.html:58
+#: bookwyrm/templates/settings/admin_layout.html:64
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "註冊"
@@ -3034,38 +3034,49 @@ msgstr "編輯書架"
 msgid "Update shelf"
 msgstr "更新書架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "所有書目"
 
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "建立書架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "編輯書架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "上架時間"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "開始時間"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "完成時間"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "此書架是空的。"
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "刪除書架"
 

From a2811b6c1b60f981ce2887ed9a07f89ad41309ac Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 15:14:57 -0700
Subject: [PATCH 241/272] Fixes redirects in fallback post modal

---
 bookwyrm/views/reading.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 9100e1d4..70dc2147 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -31,6 +31,7 @@ class ReadingStatus(View):
         }.get(status)
         if not template:
             return HttpResponseNotFound()
+        # redirect if we're already on this shelf
         return TemplateResponse(request, f"reading_progress/{template}", {"book": book})
 
     def post(self, request, status, book_id):
@@ -58,11 +59,15 @@ class ReadingStatus(View):
             )
             .first()
         )
+
+        referer = request.headers.get("Referer", "/")
+        if "reading-status" in referer:
+            referer = "/"
         if current_status_shelfbook is not None:
             if current_status_shelfbook.shelf.identifier != desired_shelf.identifier:
                 current_status_shelfbook.delete()
             else:  # It already was on the shelf
-                return redirect(request.headers.get("Referer", "/"))
+                return redirect(referer)
 
         models.ShelfBook.objects.create(
             book=book, shelf=desired_shelf, user=request.user
@@ -87,8 +92,7 @@ class ReadingStatus(View):
             else:
                 privacy = request.POST.get("privacy")
                 handle_reading_status(request.user, desired_shelf, book, privacy)
-
-        return redirect(request.headers.get("Referer", "/"))
+        return redirect(referer)
 
 
 @login_required

From 99904618accd8f9c2eec84e5167414cf00bf19ed Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 15:24:09 -0700
Subject: [PATCH 242/272] Fixes close buttons on modals

---
 bookwyrm/templates/components/modal.html        | 12 ++++++++++--
 bookwyrm/templates/reading_progress/finish.html |  2 +-
 bookwyrm/templates/reading_progress/start.html  |  2 +-
 bookwyrm/templates/reading_progress/want.html   |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index d8c1a468..2eabd2e2 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -14,7 +14,11 @@
             <h2 class="modal-card-title is-flex-shrink-1" id="modal_card_title_{{ controls_text }}_{{ controls_uid }}">
                 {% block modal-title %}{% endblock %}
             </h2>
-            {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %}
+            {% if static %}
+                <a href="/" class="delete">{{ label }}</a>
+            {% else %}
+                {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %}
+            {% endif %}
         </header>
         {% block modal-form-open %}{% endblock %}
         {% if not no_body %}
@@ -27,6 +31,10 @@
         </footer>
         {% block modal-form-close %}{% endblock %}
     </div>
-    {% include 'snippets/toggle/toggle_button.html' with label=label class="modal-close is-large" nonbutton=True %}
+    {% if static %}
+        <a href="/" class="modal-close is-large">{{ label }}</a>
+    {% else %}
+        {% include 'snippets/toggle/toggle_button.html' with label=label class="modal-close is-large" nonbutton=True %}
+    {% endif %}
 </div>
 
diff --git a/bookwyrm/templates/reading_progress/finish.html b/bookwyrm/templates/reading_progress/finish.html
index ca69128e..501fb3c4 100644
--- a/bookwyrm/templates/reading_progress/finish.html
+++ b/bookwyrm/templates/reading_progress/finish.html
@@ -9,6 +9,6 @@ Finish "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True static=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/start.html b/bookwyrm/templates/reading_progress/start.html
index e24a0e05..df8f698a 100644
--- a/bookwyrm/templates/reading_progress/start.html
+++ b/bookwyrm/templates/reading_progress/start.html
@@ -9,6 +9,6 @@ Start "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True static=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/want.html b/bookwyrm/templates/reading_progress/want.html
index 6122ade3..31f047cf 100644
--- a/bookwyrm/templates/reading_progress/want.html
+++ b/bookwyrm/templates/reading_progress/want.html
@@ -9,6 +9,6 @@ Want to Read "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True static=True %}
 
 {% endblock %}

From b80de929fd1118cd213b2aef7f0f9f1183cad7d6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 16:00:40 -0700
Subject: [PATCH 243/272] Create and view quotation page numbers

---
 bookwyrm/activitypub/note.py                  |  2 +
 bookwyrm/forms.py                             |  2 +
 .../migrations/0088_auto_20210905_2233.py     | 34 ++++++++++++++++
 bookwyrm/models/status.py                     | 10 +++++
 .../snippets/create_status/comment.html       | 25 ++++++++++--
 .../snippets/create_status/quotation.html     | 39 +++++++++++++++++--
 .../snippets/status/content_status.html       | 12 +++++-
 7 files changed, 116 insertions(+), 8 deletions(-)
 create mode 100644 bookwyrm/migrations/0088_auto_20210905_2233.py

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index aca62d7c..d61471fe 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -70,6 +70,8 @@ class Quotation(Comment):
     """a quote and commentary on a book"""
 
     quote: str
+    position: int = None
+    positionMode: str = None
     type: str = "Quotation"
 
 
diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index e8812470..69052605 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -101,6 +101,8 @@ class QuotationForm(CustomForm):
             "content_warning",
             "sensitive",
             "privacy",
+            "position",
+            "position_mode",
         ]
 
 
diff --git a/bookwyrm/migrations/0088_auto_20210905_2233.py b/bookwyrm/migrations/0088_auto_20210905_2233.py
new file mode 100644
index 00000000..028cf7bf
--- /dev/null
+++ b/bookwyrm/migrations/0088_auto_20210905_2233.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.2.4 on 2021-09-05 22:33
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="quotation",
+            name="position",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+            ),
+        ),
+        migrations.AddField(
+            model_name="quotation",
+            name="position_mode",
+            field=models.CharField(
+                blank=True,
+                choices=[("PG", "page"), ("PCT", "percent")],
+                default="PG",
+                max_length=3,
+                null=True,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 9274a581..d0f094d2 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -290,6 +290,16 @@ class Quotation(BookStatus):
     """like a review but without a rating and transient"""
 
     quote = fields.HtmlField()
+    position = models.IntegerField(
+        validators=[MinValueValidator(0)], null=True, blank=True
+    )
+    position_mode = models.CharField(
+        max_length=3,
+        choices=ProgressMode.choices,
+        default=ProgressMode.PAGE,
+        null=True,
+        blank=True,
+    )
 
     @property
     def pure_content(self):
diff --git a/bookwyrm/templates/snippets/create_status/comment.html b/bookwyrm/templates/snippets/create_status/comment.html
index d830ddcb..8f3f5c2b 100644
--- a/bookwyrm/templates/snippets/create_status/comment.html
+++ b/bookwyrm/templates/snippets/create_status/comment.html
@@ -26,13 +26,32 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
             <label class="label" for="progress_{{ uuid }}">{% trans "Progress:" %}</label>
             <div class="field has-addons mb-0">
                 <div class="control">
-                    <input aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{% firstof draft.progress readthrough.progress '' %}" id="progress_{{ uuid }}">
+                    <input
+                        aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
+                        class="input"
+                        type="number"
+                        min="0"
+                        name="progress"
+                        size="3"
+                        value="{% firstof draft.progress readthrough.progress '' %}"
+                        id="progress_{{ uuid }}"
+                    >
                 </div>
                 <div class="control">
                     <div class="select">
                         <select name="progress_mode" aria-label="Progress mode">
-                            <option value="PG" {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
-                            <option value="PCT" {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
+                            <option
+                                value="PG"
+                                {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}
+                            >
+                                {% trans "pages" %}
+                            </option>
+                            <option
+                                value="PCT"
+                                {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}
+                            >
+                                {% trans "percent" %}
+                            </option>
                         </select>
                     </div>
                 </div>
diff --git a/bookwyrm/templates/snippets/create_status/quotation.html b/bookwyrm/templates/snippets/create_status/quotation.html
index 03e9c25b..c6f1f85f 100644
--- a/bookwyrm/templates/snippets/create_status/quotation.html
+++ b/bookwyrm/templates/snippets/create_status/quotation.html
@@ -11,8 +11,6 @@ draft: the content of an existing Status object to be edited (used in delete and
 uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
 {% endcomment %}
 
-{% with type="quotation" %}
-
 {% block pre_content_additions %}
     <div class="field">
         <label class="label" for="id_quote_{{ book.id }}_{{ type }}">
@@ -29,6 +27,39 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
             >{{ draft.quote|default:'' }}</textarea>
         </div>
     </div>
+    <div class="field">
+        <label class="label" for="position_{{ uuid }}">{% trans "Position:" %}</label>
+        <div class="field has-addons mb-0">
+            <div class="control">
+                <div class="select">
+                    <select name="position_mode" aria-label="Position mode">
+                        <option
+                            value="PG"
+                            {% if draft.position_mode == 'PG' or not draft %}selected{% endif %}
+                        >
+                            {% trans "On page:" %}
+                        </option>
+                        <option
+                            value="PCT"
+                            {% if draft.position_mode == 'PCT' %}selected{% endif %}
+                        >
+                            {% trans "At percent:" %}
+                        </option>
+                    </select>
+                </div>
+            </div>
+            <div class="control">
+                <input
+                    aria-label="{% if draft.position_mode == 'PG' %}Page{% else %}Percent{% endif %}"
+                    class="input"
+                    type="number"
+                    min="0"
+                    name="position"
+                    size="3"
+                    value="{% firstof draft.position '' %}"
+                    id="position_{{ uuid }}"
+                >
+            </div>
+        </div>
+    </div>
 {% endblock %}
-
-{% endwith %}
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 781af279..788ea395 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -2,6 +2,7 @@
 {% load markdown %}
 {% load i18n %}
 {% load static %}
+{% load humanize %}
 
 {% with status_type=status.status_type %}
 <div
@@ -95,7 +96,16 @@
                     <div class="quote block">
                         <blockquote dir="auto" class="content mb-2">{{ status.quote|safe }}</blockquote>
 
-                        <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
+                        <p>
+                            &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}
+                            {% if status.position %}
+                                {% if status.position_mode == 'PG' %}
+                                    {% blocktrans with page=status.position|intcomma %}(Page {{ page }}){% endblocktrans %}
+                                {% else %}
+                                    {% blocktrans with percent=status.position %}({{ percent }}%){% endblocktrans %}
+                                {% endif %}
+                            {% endif %}
+                        </p>
                     </div>
                 {% endif %}
 

From 2118ba71ea35bb26212d412754b8e6a92fbaf1d9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Sep 2021 16:12:09 -0700
Subject: [PATCH 244/272] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.po   | 82 +++++++++++++++++++---------
 locale/en_US/LC_MESSAGES/django.po   | 74 ++++++++++++++++---------
 locale/es/LC_MESSAGES/django.po      | 82 +++++++++++++++++++---------
 locale/fr_FR/LC_MESSAGES/django.po   | 82 +++++++++++++++++++---------
 locale/zh_Hans/LC_MESSAGES/django.po | 82 +++++++++++++++++++---------
 locale/zh_Hant/LC_MESSAGES/django.po | 82 +++++++++++++++++++---------
 6 files changed, 328 insertions(+), 156 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 2aeb0f42..b3623765 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 21:43+0000\n"
+"POT-Creation-Date: 2021-09-05 23:09+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -18,67 +18,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:235
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:249
 msgid "One Day"
 msgstr "Ein Tag"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:250
 msgid "One Week"
 msgstr "Eine Woche"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:251
 msgid "One Month"
 msgstr "Ein Monat"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:252
 msgid "Does Not Expire"
 msgstr "Läuft nicht aus"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:257
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d Benutzungen"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:260
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Ungelistet"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:310
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:311
 #, fuzzy
 #| msgid "Title"
 msgid "Book Title"
 msgstr "Titel"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
+#: bookwyrm/forms.py:312
+#: bookwyrm/templates/snippets/create_status/review.html:23
 #: bookwyrm/templates/user/shelf/shelf.html:117
 #: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:318
 #, fuzzy
 #| msgid "Started reading"
 msgid "Ascending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:319
 #, fuzzy
 #| msgid "Started reading"
 msgid "Descending"
@@ -536,7 +536,7 @@ msgid "Back"
 msgstr "Zurück"
 
 #: bookwyrm/templates/book/edit_book.html:127
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "Titel:"
 
@@ -2728,19 +2728,19 @@ msgstr ""
 msgid "Progress:"
 msgstr "Fortschritt:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/create_status/comment.html:47
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "Seiten"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "Prozent"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
+#: bookwyrm/templates/snippets/create_status/comment.html:60
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
@@ -2789,25 +2789,43 @@ msgstr "Privat"
 msgid "Post"
 msgstr "Absenden"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 #, fuzzy
 #| msgid "Quote"
 msgid "Quote:"
 msgstr "Zitieren"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, fuzzy, python-format
 #| msgid "Editions of %(book_title)s"
 msgid "An excerpt from '%(book_title)s'"
 msgstr "Editionen von  %(book_title)s"
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:31
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "Beschreibung:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:40
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "Seiten"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:46
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "Prozent"
+
+#: bookwyrm/templates/snippets/create_status/review.html:18
 #, fuzzy, python-format
 #| msgid "Editions of %(book_title)s"
 msgid "Your review of '%(book_title)s'"
 msgstr "Editionen von  %(book_title)s"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:30
 #, fuzzy
 #| msgid "Review"
 msgid "Review:"
@@ -3102,17 +3120,29 @@ msgstr "Auf Leseliste setzen"
 msgid "Remove from %(name)s"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/snippets/status/content_status.html:72
+#: bookwyrm/templates/snippets/status/content_status.html:73
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
+#: bookwyrm/templates/snippets/status/content_status.html:88
 #: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "Weniger anzeigen"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "(Page %(page)s)"
+msgstr "%(pages)s Seiten"
+
+#: bookwyrm/templates/snippets/status/content_status.html:105
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "%(percent)s%% komplett!"
+
+#: bookwyrm/templates/snippets/status/content_status.html:127
 msgid "Open image in new window"
 msgstr "Bild in neuem Fenster öffnen"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index db73cda6..5fb90611 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 21:43+0000\n"
+"POT-Creation-Date: 2021-09-05 23:09+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:235
 msgid "A user with this email already exists."
 msgstr ""
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:249
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:250
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:251
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:252
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:257
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:260
 msgid "Unlimited"
 msgstr ""
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:310
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:311
 msgid "Book Title"
 msgstr ""
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
+#: bookwyrm/forms.py:312
+#: bookwyrm/templates/snippets/create_status/review.html:23
 #: bookwyrm/templates/user/shelf/shelf.html:117
 #: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:318
 msgid "Ascending"
 msgstr ""
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:319
 msgid "Descending"
 msgstr ""
 
@@ -491,7 +491,7 @@ msgid "Back"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:127
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr ""
 
@@ -2461,19 +2461,19 @@ msgstr ""
 msgid "Progress:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/create_status/comment.html:47
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
+#: bookwyrm/templates/snippets/create_status/comment.html:60
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
@@ -2518,21 +2518,33 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, python-format
 msgid "An excerpt from '%(book_title)s'"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:31
+msgid "Position:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:40
+msgid "On page:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:46
+msgid "At percent:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/review.html:18
 #, python-format
 msgid "Your review of '%(book_title)s'"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:30
 msgid "Review:"
 msgstr ""
 
@@ -2805,17 +2817,27 @@ msgstr ""
 msgid "Remove from %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:72
+#: bookwyrm/templates/snippets/status/content_status.html:73
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
+#: bookwyrm/templates/snippets/status/content_status.html:88
 #: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, python-format
+msgid "(Page %(page)s)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/content_status.html:105
+#, python-format
+msgid "(%(percent)s%%)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/content_status.html:127
 msgid "Open image in new window"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 9c65dd4d..48e8e8ce 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 21:43+0000\n"
+"POT-Creation-Date: 2021-09-05 23:09+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: Reese Porter <reesedporter@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:235
 msgid "A user with this email already exists."
 msgstr "Ya existe un usuario con ese correo electrónico."
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:249
 msgid "One Day"
 msgstr "Un día"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:250
 msgid "One Week"
 msgstr "Una semana"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:251
 msgid "One Month"
 msgstr "Un mes"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:252
 msgid "Does Not Expire"
 msgstr "Nunca se vence"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:257
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:260
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:310
 msgid "List Order"
 msgstr "Orden de la lista"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:311
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
+#: bookwyrm/forms.py:312
+#: bookwyrm/templates/snippets/create_status/review.html:23
 #: bookwyrm/templates/user/shelf/shelf.html:117
 #: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Ordenar por"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:318
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:319
 msgid "Descending"
 msgstr "Descendente"
 
@@ -491,7 +491,7 @@ msgid "Back"
 msgstr "Volver"
 
 #: bookwyrm/templates/book/edit_book.html:127
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "Título:"
 
@@ -2461,19 +2461,19 @@ msgstr "Algunos pensamientos sobre el libro"
 msgid "Progress:"
 msgstr "Progreso:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/create_status/comment.html:47
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "por ciento"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
+#: bookwyrm/templates/snippets/create_status/comment.html:60
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
@@ -2518,21 +2518,39 @@ msgstr "Privada"
 msgid "Post"
 msgstr "Compartir"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr "Cita:"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, python-format
 msgid "An excerpt from '%(book_title)s'"
 msgstr "Un extracto de '%(book_title)s'"
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:31
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "Descripción:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:40
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "páginas"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:46
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "por ciento"
+
+#: bookwyrm/templates/snippets/create_status/review.html:18
 #, python-format
 msgid "Your review of '%(book_title)s'"
 msgstr "Tu reseña de '%(book_title)s'"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:30
 msgid "Review:"
 msgstr "Reseña:"
 
@@ -2805,17 +2823,29 @@ msgstr "Quiero leer"
 msgid "Remove from %(name)s"
 msgstr "Quitar de %(name)s"
 
-#: bookwyrm/templates/snippets/status/content_status.html:72
+#: bookwyrm/templates/snippets/status/content_status.html:73
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "Mostrar más"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
+#: bookwyrm/templates/snippets/status/content_status.html:88
 #: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "Mostrar menos"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "page %(page)s"
+msgid "(Page %(page)s)"
+msgstr "página %(page)s"
+
+#: bookwyrm/templates/snippets/status/content_status.html:105
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "%(percent)s%% terminado!"
+
+#: bookwyrm/templates/snippets/status/content_status.html:127
 msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index b2d22240..647d18ec 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 21:43+0000\n"
+"POT-Creation-Date: 2021-09-05 23:09+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:235
 msgid "A user with this email already exists."
 msgstr "Cet email est déjà associé à un compte."
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:249
 msgid "One Day"
 msgstr "Un jour"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:250
 msgid "One Week"
 msgstr "Une semaine"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:251
 msgid "One Month"
 msgstr "Un mois"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:252
 msgid "Does Not Expire"
 msgstr "Sans expiration"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:257
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d utilisations"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:260
 msgid "Unlimited"
 msgstr "Sans limite"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:310
 msgid "List Order"
 msgstr "Ordre de la liste"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:311
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
+#: bookwyrm/forms.py:312
+#: bookwyrm/templates/snippets/create_status/review.html:23
 #: bookwyrm/templates/user/shelf/shelf.html:117
 #: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Trier par"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:318
 msgid "Ascending"
 msgstr "Ordre croissant"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:319
 msgid "Descending"
 msgstr "Ordre décroissant"
 
@@ -495,7 +495,7 @@ msgid "Back"
 msgstr "Retour"
 
 #: bookwyrm/templates/book/edit_book.html:127
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "Titre :"
 
@@ -2494,19 +2494,19 @@ msgstr ""
 msgid "Progress:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/create_status/comment.html:47
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "pages"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "pourcent"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
+#: bookwyrm/templates/snippets/create_status/comment.html:60
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
@@ -2551,23 +2551,41 @@ msgstr "Privé"
 msgid "Post"
 msgstr "Publier"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr "Citation :"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, fuzzy, python-format
 #| msgid "Edit \"%(book_title)s\""
 msgid "An excerpt from '%(book_title)s'"
 msgstr "Modifier « %(book_title)s »"
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:31
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "Description :"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:40
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "pages"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:46
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "pourcent"
+
+#: bookwyrm/templates/snippets/create_status/review.html:18
 #, fuzzy, python-format
 #| msgid "Editions of %(book_title)s"
 msgid "Your review of '%(book_title)s'"
 msgstr "Éditions de %(book_title)s"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:30
 msgid "Review:"
 msgstr "Critique :"
 
@@ -2844,17 +2862,29 @@ msgstr "Je veux le lire"
 msgid "Remove from %(name)s"
 msgstr "Retirer de %(name)s"
 
-#: bookwyrm/templates/snippets/status/content_status.html:72
+#: bookwyrm/templates/snippets/status/content_status.html:73
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "Déplier"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
+#: bookwyrm/templates/snippets/status/content_status.html:88
 #: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "Replier"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "page %(page)s"
+msgid "(Page %(page)s)"
+msgstr "page %(page)s"
+
+#: bookwyrm/templates/snippets/status/content_status.html:105
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "%(percent)s%% terminé !"
+
+#: bookwyrm/templates/snippets/status/content_status.html:127
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 21791638..3adb5aef 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 21:43+0000\n"
+"POT-Creation-Date: 2021-09-05 23:09+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:235
 msgid "A user with this email already exists."
 msgstr "已经存在使用该邮箱的用户。"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:249
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:250
 msgid "One Week"
 msgstr "一周"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:251
 msgid "One Month"
 msgstr "一个月"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:252
 msgid "Does Not Expire"
 msgstr "永不失效"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:257
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:260
 msgid "Unlimited"
 msgstr "不受限"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:310
 msgid "List Order"
 msgstr "列表顺序"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:311
 msgid "Book Title"
 msgstr "书名"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
+#: bookwyrm/forms.py:312
+#: bookwyrm/templates/snippets/create_status/review.html:23
 #: bookwyrm/templates/user/shelf/shelf.html:117
 #: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "排序方式"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:318
 msgid "Ascending"
 msgstr "升序"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:319
 msgid "Descending"
 msgstr "降序"
 
@@ -490,7 +490,7 @@ msgid "Back"
 msgstr "返回"
 
 #: bookwyrm/templates/book/edit_book.html:127
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "标题:"
 
@@ -2468,19 +2468,19 @@ msgstr "对书的一些看法"
 msgid "Progress:"
 msgstr "进度:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/create_status/comment.html:47
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "页数"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
+#: bookwyrm/templates/snippets/create_status/comment.html:60
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
@@ -2525,21 +2525,39 @@ msgstr "私密"
 msgid "Post"
 msgstr "发布"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr "引用:"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, python-format
 msgid "An excerpt from '%(book_title)s'"
 msgstr "摘自《%(book_title)s》的节录"
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:31
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "描述:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:40
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "页数"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:46
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "百分比"
+
+#: bookwyrm/templates/snippets/create_status/review.html:18
 #, python-format
 msgid "Your review of '%(book_title)s'"
 msgstr "你对《%(book_title)s》的书评"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:30
 msgid "Review:"
 msgstr "书评:"
 
@@ -2808,17 +2826,29 @@ msgstr "想要阅读"
 msgid "Remove from %(name)s"
 msgstr "从 %(name)s 移除"
 
-#: bookwyrm/templates/snippets/status/content_status.html:72
+#: bookwyrm/templates/snippets/status/content_status.html:73
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "显示更多"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
+#: bookwyrm/templates/snippets/status/content_status.html:88
 #: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "显示更少"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "page %(page)s"
+msgid "(Page %(page)s)"
+msgstr "第 %(page)s 页"
+
+#: bookwyrm/templates/snippets/status/content_status.html:105
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "完成了 %(percent)s%% ！"
+
+#: bookwyrm/templates/snippets/status/content_status.html:127
 msgid "Open image in new window"
 msgstr "在新窗口中打开图像"
 
diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index 1eddada7..2149c913 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 21:43+0000\n"
+"POT-Creation-Date: 2021-09-05 23:09+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:235
 msgid "A user with this email already exists."
 msgstr "已經存在使用該郵箱的使用者。"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:249
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:250
 msgid "One Week"
 msgstr "一週"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:251
 msgid "One Month"
 msgstr "一個月"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:252
 msgid "Does Not Expire"
 msgstr "永不失效"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:257
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:260
 msgid "Unlimited"
 msgstr "不受限"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:310
 msgid "List Order"
 msgstr "列表順序"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:311
 msgid "Book Title"
 msgstr "書名"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
+#: bookwyrm/forms.py:312
+#: bookwyrm/templates/snippets/create_status/review.html:23
 #: bookwyrm/templates/user/shelf/shelf.html:117
 #: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "評價"
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "排序方式"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:318
 msgid "Ascending"
 msgstr "升序"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:319
 msgid "Descending"
 msgstr "降序"
 
@@ -496,7 +496,7 @@ msgid "Back"
 msgstr "返回"
 
 #: bookwyrm/templates/book/edit_book.html:127
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "標題:"
 
@@ -2508,19 +2508,19 @@ msgstr ""
 msgid "Progress:"
 msgstr "進度:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
+#: bookwyrm/templates/snippets/create_status/comment.html:47
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "頁數"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
+#: bookwyrm/templates/snippets/create_status/comment.html:60
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
@@ -2565,23 +2565,41 @@ msgstr "私密"
 msgid "Post"
 msgstr "釋出"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr "引用:"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, fuzzy, python-format
 #| msgid "Edit \"%(book_title)s\""
 msgid "An excerpt from '%(book_title)s'"
 msgstr "編輯 \"%(book_title)s\""
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:31
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "描述:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:40
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "頁數"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:46
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "百分比"
+
+#: bookwyrm/templates/snippets/create_status/review.html:18
 #, fuzzy, python-format
 #| msgid "Editions of %(book_title)s"
 msgid "Your review of '%(book_title)s'"
 msgstr "%(book_title)s 的各版本"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:30
 msgid "Review:"
 msgstr "書評:"
 
@@ -2854,17 +2872,29 @@ msgstr "想要閱讀"
 msgid "Remove from %(name)s"
 msgstr "從 %(name)s 移除"
 
-#: bookwyrm/templates/snippets/status/content_status.html:72
+#: bookwyrm/templates/snippets/status/content_status.html:73
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
 msgstr "顯示更多"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
+#: bookwyrm/templates/snippets/status/content_status.html:88
 #: bookwyrm/templates/snippets/trimmed_text.html:34
 msgid "Show less"
 msgstr "顯示更少"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "page %(page)s"
+msgid "(Page %(page)s)"
+msgstr "第 %(page)s 頁"
+
+#: bookwyrm/templates/snippets/status/content_status.html:105
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "完成了 %(percent)s%% ！"
+
+#: bookwyrm/templates/snippets/status/content_status.html:127
 msgid "Open image in new window"
 msgstr "在新視窗中開啟圖片"
 

From 0f32471b2a727d3a24128ffbe4cdbcb40feedd90 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 08:31:40 -0700
Subject: [PATCH 245/272] Show quotes without content as large discover cards

---
 bookwyrm/views/discover.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py
index 059365f9..2ae4a930 100644
--- a/bookwyrm/views/discover.py
+++ b/bookwyrm/views/discover.py
@@ -16,6 +16,7 @@ class Discover(View):
 
     def get(self, request):
         """tiled book activity page"""
+        # all activities in the "federated" feed associated with a book
         activities = (
             activitystreams.streams["local"]
             .get_activity_stream(request.user)
@@ -29,13 +30,19 @@ class Discover(View):
 
         large_activities = Paginator(
             activities.filter(mention_books__isnull=True)
-            .exclude(content=None, quotation__quote=None)
-            .exclude(content=""),
+            # exclude statuses with no user-provided content for large panels
+            .exclude(
+                Q(Q(content="") | Q(content__isnull=True)) & Q(quotation__isnull=True),
+            ),
             6,
         )
         small_activities = Paginator(
             activities.filter(
-                Q(mention_books__isnull=False) | Q(content=None) | Q(content="")
+                Q(mention_books__isnull=False)
+                | Q(
+                    Q(Q(content="") | Q(content__isnull=True))
+                    & Q(quotation__isnull=True),
+                )
             ),
             4,
         )

From a68196d9bbd5cfa2d68142afd4f320633890f1e9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 08:54:57 -0700
Subject: [PATCH 246/272] Improves user admin filter behavior

---
 bookwyrm/templates/user_admin/user_admin_filters.html | 2 +-
 bookwyrm/views/user_admin.py                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/user_admin/user_admin_filters.html b/bookwyrm/templates/user_admin/user_admin_filters.html
index 5283b4e9..c9c7a93f 100644
--- a/bookwyrm/templates/user_admin/user_admin_filters.html
+++ b/bookwyrm/templates/user_admin/user_admin_filters.html
@@ -1,7 +1,7 @@
 {% extends 'snippets/filters_panel/filters_panel.html' %}
 
 {% block filter_fields %}
-{% include 'user_admin/server_filter.html' %}
 {% include 'user_admin/username_filter.html' %}
 {% include 'directory/community_filter.html' %}
+{% include 'user_admin/server_filter.html' %}
 {% endblock %}
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 3a9ea339..ac5357a2 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -31,8 +31,8 @@ class UserAdminList(View):
         if username:
             filters["username__icontains"] = username
         scope = request.GET.get("scope")
-        if scope:
-            filters["local"] = scope == "local"
+        if scope and scope == "local":
+            filters["local"] = True
 
         users = models.User.objects.filter(**filters)
 

From 2886c15e1d70d1ee8acbd3e0cd9825f7affa7688 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 09:35:25 -0700
Subject: [PATCH 247/272] Adds more info to user admin page

---
 bookwyrm/templates/user_admin/user.html      | 12 +--
 bookwyrm/templates/user_admin/user_info.html | 93 +++++++++++++++++++-
 2 files changed, 99 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html
index c79c6971..5c118175 100644
--- a/bookwyrm/templates/user_admin/user.html
+++ b/bookwyrm/templates/user_admin/user.html
@@ -2,13 +2,15 @@
 {% load i18n %}
 
 {% block title %}{{ user.username }}{% endblock %}
-{% block header %}{{ user.username }}{% endblock %}
+{% block header %}
+{{ user.username }}
+<p class="help has-text-weight-normal">
+    <a href="{% url 'settings-users' %}">{% trans "Back to users" %}</a>
+</p>
+
+{% endblock %}
 
 {% block panel %}
-<div class="block">
-    <a href="{% url 'settings-users' %}">{% trans "Back to users" %}</a>
-</div>
-
 {% include 'user_admin/user_info.html' with user=user %}
 
 {% include 'user_admin/user_moderation_actions.html' with user=user %}
diff --git a/bookwyrm/templates/user_admin/user_info.html b/bookwyrm/templates/user_admin/user_info.html
index 579b3af7..69a84a66 100644
--- a/bookwyrm/templates/user_admin/user_info.html
+++ b/bookwyrm/templates/user_admin/user_info.html
@@ -1,8 +1,10 @@
 {% load i18n %}
 {% load markdown %}
+{% load humanize %}
+
 <div class="block columns">
     <div class="column is-flex is-flex-direction-column">
-        <h4 class="title is-4">{% trans "User details" %}</h4>
+        <h4 class="title is-4">{% trans "Profile" %}</h4>
         <div class="box is-flex-grow-1">
             {% include 'user/user_preview.html' with user=user %}
             {% if user.summary %}
@@ -14,6 +16,95 @@
             <p class="mt-2"><a href="{{ user.local_path }}">{% trans "View user profile" %}</a></p>
         </div>
     </div>
+    <div class="column is-flex is-flex-direction-column is-4">
+        <h4 class="title is-4">{% trans "Status" %}</h4>
+        <div class="box is-flex-grow-1 has-text-weight-bold">
+            {% if user.is_active %}
+            <p class="notification is-success">
+                {% trans "Active" %}
+            </p>
+            {% else %}
+            <p class="notification is-warning">
+                {% trans "Inactive" %}
+                {% if user.deactivation_reason %}
+                ({{ user.deactivation_reason }})
+                {% endif %}
+            </p>
+            {% endif %}
+            <p class="notification">
+                {% if user.local %}
+                {% trans "Local" %}
+                {% else %}
+                {% trans "Remote" %}
+                {% endif %}
+            </p>
+        </div>
+    </div>
+</div>
+
+<div class="block columns">
+    <div class="column is-flex is-flex-direction-column">
+        <h4 class="title is-4">{% trans "User details" %}</h4>
+        <div class="box content is-flex-grow-1">
+            <dl>
+                {% if user.local %}
+                <div class="is-flex">
+                    <dt>{% trans "Email:" %}</dt>
+                    <dd>{{ user.email }}</dd>
+                </div>
+                {% endif %}
+
+                {% with report_count=user.report_set.count %}
+                <div class="is-flex">
+                    <dt>{% trans "Reports:" %}</dt>
+                    <dd>
+                        {{ report_count|intcomma }}
+                        {% if report_count > 0 %}
+                        <a href="{% url 'settings-reports' %}?username={{ user.username }}">
+                            {% trans "(View reports)" %}
+                        </a>
+                        {% endif %}
+                    </dd>
+                </div>
+                {% endwith %}
+
+                <div class="is-flex">
+                    <dt>{% trans "Blocked by count:" %}</dt>
+                    <dd>{{ user.blocked_by.count }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Last active date:" %}</dt>
+                    <dd>{{ user.last_active_date }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Manually approved followers:" %}</dt>
+                    <dd>{{ user.manually_approves_followers }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Discoverable:" %}</dt>
+                    <dd>{{ user.discoverable }}</dd>
+                </div>
+
+                {% if not user.is_active %}
+                <div class="is-flex">
+                    <dt>{% trans "Deactivation reason:" %}</dt>
+                    <dd>{{ user.deactivation_reason }}</dd>
+                </div>
+                {% endif %}
+
+                {% if not user.is_active and user.deactivation_reason == "pending" %}
+                <div class="is-flex">
+                    <dt>{% trans "Confirmation code:" %}</dt>
+                    <dd>{{ user.confirmation_code }}</dd>
+                </div>
+                {% endif %}
+            </dl>
+        </div>
+    </div>
+
     {% if not user.local %}
     {% with server=user.federated_server %}
     <div class="column is-half is-flex is-flex-direction-column">

From 34a5eccba76f0aa34f735fd4ccca18ee7a92186f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 09:43:41 -0700
Subject: [PATCH 248/272] Increase max upload size in nginx

---
 nginx/production | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nginx/production b/nginx/production
index 76f18f32..3c8b2ea7 100644
--- a/nginx/production
+++ b/nginx/production
@@ -24,7 +24,9 @@ server {
 #     listen 443 ssl http2;
 #
 #     server_name your-domain.com;
-
+#
+#     client_max_body_size 3M;
+#
 #     if ($host != "you-domain.com") {
 #         return 301 $scheme://your-domain.com$request_uri;
 #     }

From eb67c4730f37b7f5134ee9a7517005a12f51136a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 09:48:57 -0700
Subject: [PATCH 249/272] Renames list layout file

---
 bookwyrm/templates/lists/curate.html                       | 2 +-
 bookwyrm/templates/lists/{list_layout.html => layout.html} | 0
 bookwyrm/templates/lists/list.html                         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename bookwyrm/templates/lists/{list_layout.html => layout.html} (100%)

diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index 661410e8..638d86b8 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -1,4 +1,4 @@
-{% extends 'lists/list_layout.html' %}
+{% extends 'lists/layout.html' %}
 {% load i18n %}
 {% block panel %}
 
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/layout.html
similarity index 100%
rename from bookwyrm/templates/lists/list_layout.html
rename to bookwyrm/templates/lists/layout.html
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 37f7079b..35014a7b 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,4 +1,4 @@
-{% extends 'lists/list_layout.html' %}
+{% extends 'lists/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% load markdown %}

From 1e037d20a499c7943572acbc4f5a3865e47eab43 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 10:03:00 -0700
Subject: [PATCH 250/272] Adds delete button to list

---
 bookwyrm/templates/lists/edit_form.html |  1 +
 bookwyrm/templates/lists/form.html      | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/lists/edit_form.html b/bookwyrm/templates/lists/edit_form.html
index 917e5e2a..def47f06 100644
--- a/bookwyrm/templates/lists/edit_form.html
+++ b/bookwyrm/templates/lists/edit_form.html
@@ -9,4 +9,5 @@
 <form name="edit-list" method="post" action="{% url 'list' list.id %}">
     {% include 'lists/form.html' %}
 </form>
+{% include "lists/delete_list_modal.html" with controls_text="delete_list" controls_uid=list.id %}
 {% endblock %}
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index e5eb9c37..4252d709 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -3,7 +3,7 @@
 <input type="hidden" name="user" value="{{ request.user.id }}">
 
 <div class="columns">
-    <div class="column">
+    <div class="column is-two-thirds">
         <div class="field">
             <label class="label" for="id_name">{% trans "Name:" %}</label>
             {{ list_form.name }}
@@ -34,12 +34,19 @@
         </fieldset>
     </div>
 </div>
-<div class="field has-addons">
-    <div class="control">
-        {% include 'snippets/privacy_select.html' with current=list.privacy %}
+<div class="columns is-mobile">
+    <div class="column">
+        <div class="field has-addons">
+            <div class="control">
+                {% include 'snippets/privacy_select.html' with current=list.privacy %}
+            </div>
+            <div class="control">
+                <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+            </div>
+        </div>
     </div>
-    <div class="control">
-        <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+    <div class="column is-narrow">
+        {% trans "Delete list" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class="is-danger" text=button_text icon_with_text="x" controls_text="delete_list" controls_uid=list.id focus="modal_title_delete_list" %}
     </div>
 </div>
-

From c630ec3572195104331617742c7495364e5b6ee9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 10:38:37 -0700
Subject: [PATCH 251/272] Adds delete list view

---
 bookwyrm/urls.py           |  1 +
 bookwyrm/views/__init__.py |  1 +
 bookwyrm/views/list.py     | 15 +++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 1dbd67a7..991114fa 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -220,6 +220,7 @@ urlpatterns = [
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/saved/?$", views.SavedLists.as_view(), name="saved-lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
+    re_path(r"^list/delete/(?P<list_id>\d+)/?$", views.delete_list, name="delete-list"),
     re_path(r"^list/add-book/?$", views.list.add_book, name="list-add-book"),
     re_path(
         r"^list/(?P<list_id>\d+)/remove/?$",
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index f4204925..ca52800c 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -27,6 +27,7 @@ from .isbn import Isbn
 from .landing import About, Home, Landing
 from .list import Lists, SavedLists, List, Curate, UserLists
 from .list import save_list, unsave_list
+from .list import delete_list
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index e6ef52ba..af99e9f5 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -3,6 +3,7 @@ from typing import Optional
 from urllib.parse import urlencode
 
 from django.contrib.auth.decorators import login_required
+from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator
 from django.db import IntegrityError, transaction
 from django.db.models import Avg, Count, DecimalField, Q, Max
@@ -260,6 +261,20 @@ def unsave_list(request, list_id):
     return redirect("list", list_id)
 
 
+@require_POST
+@login_required
+def delete_list(request, list_id):
+    """delete a list"""
+    book_list = get_object_or_404(models.List, id=list_id)
+
+    # only the owner or a moderator can delete a list
+    if book_list.user != request.user and not request.user.has_perm("moderate_post"):
+        raise PermissionDenied
+
+    book_list.delete()
+    return redirect("lists")
+
+
 @require_POST
 @login_required
 def add_book(request):

From c4f2d670488d8c9248adfd6816e8c03a05b4f628 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 10:52:20 -0700
Subject: [PATCH 252/272] Adds view tests

---
 bookwyrm/tests/views/test_list_actions.py | 32 +++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py
index 2339427c..710d83de 100644
--- a/bookwyrm/tests/views/test_list_actions.py
+++ b/bookwyrm/tests/views/test_list_actions.py
@@ -3,6 +3,7 @@ import json
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
+from django.core.exceptions import PermissionDenied
 from django.test import TestCase
 from django.test.client import RequestFactory
 
@@ -66,6 +67,37 @@ class ListActionViews(TestCase):
         self.anonymous_user.is_authenticated = False
         models.SiteSettings.objects.create()
 
+    def test_delete_list(self):
+        """delete an entire list"""
+        models.ListItem.objects.create(
+            book_list=self.list,
+            user=self.local_user,
+            book=self.book,
+            approved=True,
+            order=1,
+        )
+        models.ListItem.objects.create(
+            book_list=self.list,
+            user=self.local_user,
+            book=self.book_two,
+            approved=False,
+            order=2,
+        )
+        request = self.factory.post("")
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.delete_list(request, self.list.id)
+        self.assertEqual(mock.call_count, 1)
+        self.assertFalse(models.List.objects.exists())
+        self.assertFalse(models.ListItem.objects.exists())
+
+    def test_delete_list_permission_denied(self):
+        """delete an entire list"""
+        request = self.factory.post("")
+        request.user = self.rat
+        with self.assertRaises(PermissionDenied):
+            views.delete_list(request, self.list.id)
+
     def test_curate_approve(self):
         """approve a pending item"""
         view = views.Curate.as_view()

From 5640ae4f7e2230220f2ae3474b59800424e5feb5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 11:24:08 -0700
Subject: [PATCH 253/272] Handle deletions of ordered collections

---
 bookwyrm/models/activitypub_mixin.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 4e313723..f287b752 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -362,6 +362,13 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
             self.collection_queryset, **kwargs
         ).serialize()
 
+    def delete(self, *args, broadcast=True, **kwargs):
+        """Delete the object"""
+        activity = self.to_delete_activity(self.user)
+        super().delete(*args, **kwargs)
+        if self.user.local and broadcast:
+            self.broadcast(activity, self.user)
+
 
 class CollectionItemMixin(ActivitypubMixin):
     """for items that are part of an (Ordered)Collection"""

From d212cbfd3c6f13bb00da90f0d6bbe2f74914cb07 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 11:54:53 -0700
Subject: [PATCH 254/272] Adds new template

---
 .../templates/lists/delete_list_modal.html    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 bookwyrm/templates/lists/delete_list_modal.html

diff --git a/bookwyrm/templates/lists/delete_list_modal.html b/bookwyrm/templates/lists/delete_list_modal.html
new file mode 100644
index 00000000..ee7a3393
--- /dev/null
+++ b/bookwyrm/templates/lists/delete_list_modal.html
@@ -0,0 +1,21 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+
+{% block modal-title %}{% trans "Delete this list?" %}{% endblock %}
+
+{% block modal-body %}
+{% trans "This action cannot be un-done" %}
+{% endblock %}
+
+{% block modal-footer %}
+<form name="delete-list-{{ list.id }}" action="{% url 'delete-list' list.id %}" method="POST">
+    {% csrf_token %}
+    <input type="hidden" name="id" value="{{ list.id }}">
+    <button class="button is-danger" type="submit">
+        {% trans "Delete" %}
+    </button>
+    {% trans "Cancel" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete_list" controls_uid=list.id %}
+</form>
+{% endblock %}
+

From ae81d6cf71b44468b15eb14e06e35322410795e0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 11:55:04 -0700
Subject: [PATCH 255/272] More tests

---
 bookwyrm/models/activitypub_mixin.py          | 10 ++++++++
 .../tests/views/inbox/test_inbox_delete.py    | 25 +++++++++++++------
 bookwyrm/tests/views/test_list_actions.py     |  5 ++++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index f287b752..3e9e1940 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -369,6 +369,16 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
         if self.user.local and broadcast:
             self.broadcast(activity, self.user)
 
+    def to_delete_activity(self, user):
+        """notice of deletion"""
+        return activitypub.Delete(
+            id=self.remote_id + "/activity",
+            actor=user.remote_id,
+            to=["%s/followers" % user.remote_id],
+            cc=["https://www.w3.org/ns/activitystreams#Public"],
+            object=self.remote_id,
+        ).serialize()
+
 
 class CollectionItemMixin(ActivitypubMixin):
     """for items that are part of an (Ordered)Collection"""
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 1566c05a..fef5ce51 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -40,14 +40,6 @@ class InboxActivities(TestCase):
                 remote_id="https://example.com/status/1",
             )
 
-        self.create_json = {
-            "id": "hi",
-            "type": "Create",
-            "actor": "hi",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {},
-        }
         models.SiteSettings.objects.create()
 
     def test_delete_status(self):
@@ -137,3 +129,20 @@ class InboxActivities(TestCase):
         # nothing happens.
         views.inbox.activity_task(activity)
         self.assertEqual(models.User.objects.filter(is_active=True).count(), 2)
+
+    def test_delete_list(self):
+        """delete a list"""
+        book_list = models.List.objects.create(
+            name="test list",
+            user=self.remote_user,
+        )
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/test-user#delete",
+            "type": "Delete",
+            "actor": "https://example.com/users/test-user",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "object": book_list.remote_id,
+        }
+        views.inbox.activity_task(activity)
+        self.assertFalse(models.List.objects.exists())
diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py
index 710d83de..e268905d 100644
--- a/bookwyrm/tests/views/test_list_actions.py
+++ b/bookwyrm/tests/views/test_list_actions.py
@@ -87,6 +87,11 @@ class ListActionViews(TestCase):
         request.user = self.local_user
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.delete_list(request, self.list.id)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Delete")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["object"], self.list.remote_id)
+
         self.assertEqual(mock.call_count, 1)
         self.assertFalse(models.List.objects.exists())
         self.assertFalse(models.ListItem.objects.exists())

From cb21099e0b29edca72d694f52936df9d9290150c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 12:00:10 -0700
Subject: [PATCH 256/272] Fixes serialization of delete activity

---
 bookwyrm/models/activitypub_mixin.py            | 10 ----------
 bookwyrm/tests/views/inbox/test_inbox_delete.py |  2 +-
 bookwyrm/tests/views/test_list_actions.py       |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 3e9e1940..f287b752 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -369,16 +369,6 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
         if self.user.local and broadcast:
             self.broadcast(activity, self.user)
 
-    def to_delete_activity(self, user):
-        """notice of deletion"""
-        return activitypub.Delete(
-            id=self.remote_id + "/activity",
-            actor=user.remote_id,
-            to=["%s/followers" % user.remote_id],
-            cc=["https://www.w3.org/ns/activitystreams#Public"],
-            object=self.remote_id,
-        ).serialize()
-
 
 class CollectionItemMixin(ActivitypubMixin):
     """for items that are part of an (Ordered)Collection"""
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index fef5ce51..c40f7a33 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -142,7 +142,7 @@ class InboxActivities(TestCase):
             "type": "Delete",
             "actor": "https://example.com/users/test-user",
             "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "object": book_list.remote_id,
+            "object": {"id": book_list.remote_id, "type": "List"}
         }
         views.inbox.activity_task(activity)
         self.assertFalse(models.List.objects.exists())
diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py
index e268905d..8ebeea28 100644
--- a/bookwyrm/tests/views/test_list_actions.py
+++ b/bookwyrm/tests/views/test_list_actions.py
@@ -90,7 +90,7 @@ class ListActionViews(TestCase):
         activity = json.loads(mock.call_args[0][1])
         self.assertEqual(activity["type"], "Delete")
         self.assertEqual(activity["actor"], self.local_user.remote_id)
-        self.assertEqual(activity["object"], self.list.remote_id)
+        self.assertEqual(activity["object"]["id"], self.list.remote_id)
 
         self.assertEqual(mock.call_count, 1)
         self.assertFalse(models.List.objects.exists())

From 8382d1a684f4eafe5b078cb67a43e1bbbbf956bd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 12:30:11 -0700
Subject: [PATCH 257/272] Updates tests

---
 bookwyrm/tests/views/inbox/test_inbox_delete.py | 12 +++++++++++-
 bookwyrm/tests/views/test_list_actions.py       |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index c40f7a33..f47d8737 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -135,6 +135,7 @@ class InboxActivities(TestCase):
         book_list = models.List.objects.create(
             name="test list",
             user=self.remote_user,
+            remote_id="https://example.com/list/1",
         )
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -142,7 +143,16 @@ class InboxActivities(TestCase):
             "type": "Delete",
             "actor": "https://example.com/users/test-user",
             "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "object": {"id": book_list.remote_id, "type": "List"}
+            "object": {
+                "id": book_list.remote_id,
+                "owner": self.remote_user.remote_id,
+                "type": "BookList",
+                "totalItems": 0,
+                "first": "",
+                "name": "test list",
+                "to": [],
+                "cc": [],
+            },
         }
         views.inbox.activity_task(activity)
         self.assertFalse(models.List.objects.exists())
diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py
index 8ebeea28..b998f274 100644
--- a/bookwyrm/tests/views/test_list_actions.py
+++ b/bookwyrm/tests/views/test_list_actions.py
@@ -91,6 +91,7 @@ class ListActionViews(TestCase):
         self.assertEqual(activity["type"], "Delete")
         self.assertEqual(activity["actor"], self.local_user.remote_id)
         self.assertEqual(activity["object"]["id"], self.list.remote_id)
+        self.assertEqual(activity["object"]["type"], "BookList")
 
         self.assertEqual(mock.call_count, 1)
         self.assertFalse(models.List.objects.exists())

From a8973336d9ff90b90b2a310f32d0e96e9935079b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 12:58:18 -0700
Subject: [PATCH 258/272] Adds mock to list items creation

---
 bookwyrm/tests/views/test_list_actions.py | 29 ++++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py
index b998f274..84c5540c 100644
--- a/bookwyrm/tests/views/test_list_actions.py
+++ b/bookwyrm/tests/views/test_list_actions.py
@@ -69,20 +69,21 @@ class ListActionViews(TestCase):
 
     def test_delete_list(self):
         """delete an entire list"""
-        models.ListItem.objects.create(
-            book_list=self.list,
-            user=self.local_user,
-            book=self.book,
-            approved=True,
-            order=1,
-        )
-        models.ListItem.objects.create(
-            book_list=self.list,
-            user=self.local_user,
-            book=self.book_two,
-            approved=False,
-            order=2,
-        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book_two,
+                approved=False,
+                order=2,
+            )
         request = self.factory.post("")
         request.user = self.local_user
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:

From a6b0ba1826f53cd865cd5eacbf81e72a22a5d74c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 13:53:49 -0700
Subject: [PATCH 259/272] Updates activistreams add_status mock

---
 .../tests/activitypub/test_base_activity.py   |  2 +-
 .../tests/importers/test_goodreads_import.py  |  4 ++--
 .../importers/test_librarything_import.py     |  2 +-
 .../tests/management/test_populate_streams.py |  2 +-
 .../tests/models/test_activitypub_mixin.py    |  2 +-
 bookwyrm/tests/models/test_base_model.py      |  6 ++---
 bookwyrm/tests/models/test_fields.py          |  2 +-
 bookwyrm/tests/models/test_status_model.py    |  2 +-
 bookwyrm/tests/test_activitystreams.py        |  2 +-
 bookwyrm/tests/test_suggested_users.py        |  2 +-
 bookwyrm/tests/test_templatetags.py           |  2 +-
 .../tests/views/inbox/test_inbox_announce.py  | 10 ++++----
 .../tests/views/inbox/test_inbox_create.py    | 16 ++++++-------
 .../tests/views/inbox/test_inbox_delete.py    |  2 +-
 bookwyrm/tests/views/inbox/test_inbox_like.py |  2 +-
 bookwyrm/tests/views/test_book.py             |  2 +-
 bookwyrm/tests/views/test_discover.py         |  3 +--
 bookwyrm/tests/views/test_feed.py             |  2 +-
 bookwyrm/tests/views/test_goal.py             |  2 +-
 bookwyrm/tests/views/test_helpers.py          |  2 +-
 bookwyrm/tests/views/test_interaction.py      | 18 +++++++-------
 bookwyrm/tests/views/test_outbox.py           |  8 +++----
 bookwyrm/tests/views/test_reading.py          |  2 +-
 bookwyrm/tests/views/test_rss_feed.py         |  2 +-
 bookwyrm/tests/views/test_status.py           | 24 +++++++++----------
 25 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index 0758fe99..1b2dd798 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -19,7 +19,7 @@ from bookwyrm.activitypub import ActivitySerializerError
 from bookwyrm import models
 
 
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index e92bdb35..2f1a8318 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -215,7 +215,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2020, 10, 21))
         self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_handle_imported_book_review(self, *_):
         """goodreads review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
@@ -237,7 +237,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(review.published_date, make_date(2019, 7, 8))
         self.assertEqual(review.privacy, "unlisted")
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_handle_imported_book_rating(self, *_):
         """goodreads rating import"""
         import_job = models.ImportJob.objects.create(user=self.user)
diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
index 504951c2..3a9cf8c9 100644
--- a/bookwyrm/tests/importers/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -197,7 +197,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2007, 4, 16))
         self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_handle_imported_book_review(self, *_):
         """librarything review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
index 50192a71..5b1139f9 100644
--- a/bookwyrm/tests/management/test_populate_streams.py
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -37,7 +37,7 @@ class Activitystreams(TestCase):
 
     def test_populate_streams(self, _):
         """make sure the function on the redis manager gets called"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Comment.objects.create(
                 user=self.local_user, content="hi", book=self.book
             )
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 01d06e02..30aa9117 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -20,7 +20,7 @@ from bookwyrm.settings import PAGE_LENGTH
 
 
 # pylint: disable=invalid-name
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class ActivitypubMixins(TestCase):
     """functionality shared across models"""
diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 43cd5d3f..1aed644e 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -62,7 +62,7 @@ class BaseModel(TestCase):
         base_model.set_remote_id(None, instance, False)
         self.assertIsNone(instance.remote_id)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_object_visible_to_user(self, _):
         """does a user have permission to view an object"""
         obj = models.Status.objects.create(
@@ -91,7 +91,7 @@ class BaseModel(TestCase):
         obj.mention_users.add(self.local_user)
         self.assertTrue(obj.visible_to_user(self.local_user))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_object_visible_to_user_follower(self, _):
         """what you can see if you follow a user"""
         self.remote_user.followers.add(self.local_user)
@@ -111,7 +111,7 @@ class BaseModel(TestCase):
         obj.mention_users.add(self.local_user)
         self.assertTrue(obj.visible_to_user(self.local_user))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_object_visible_to_user_blocked(self, _):
         """you can't see it if they block you"""
         self.remote_user.blocks.add(self.local_user)
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 6730d37b..88b07a29 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -206,7 +206,7 @@ class ModelFields(TestCase):
         self.assertEqual(model_instance.privacy_field, "followers")
 
     @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_privacy_field_set_activity_from_field(self, *_):
         """translate between to/cc fields and privacy"""
         user = User.objects.create_user(
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 22b95922..91db382e 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -15,7 +15,7 @@ from bookwyrm import activitypub, models, settings
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.Status.broadcast")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
 class Status(TestCase):
     """lotta types of statuses"""
diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index 56ba844a..a5b7e17f 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -5,7 +5,7 @@ from bookwyrm import activitystreams, models
 
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.activitystreams.BooksStream.add_book_statuses")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 # pylint: disable=too-many-public-methods
diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py
index 7e4a9d00..6d45e915 100644
--- a/bookwyrm/tests/test_suggested_users.py
+++ b/bookwyrm/tests/test_suggested_users.py
@@ -10,7 +10,7 @@ from bookwyrm.suggested_users import suggested_users, get_annotated_users
 
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index d75d368c..f30ab6f7 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -15,7 +15,7 @@ from bookwyrm.templatetags import (
 )
 
 
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
 class TemplateTags(TestCase):
     """lotta different things here"""
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index 8bc6cd1d..ec827d75 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -35,7 +35,7 @@ class InboxActivities(TestCase):
             )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            with patch("bookwyrm.activitystreams.add_status_task.delay"):
                 self.status = models.Status.objects.create(
                     user=self.local_user,
                     content="Test status",
@@ -53,7 +53,7 @@ class InboxActivities(TestCase):
 
         models.SiteSettings.objects.create()
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
     def test_boost(self, redis_mock, _):
         """boost a status"""
@@ -84,7 +84,7 @@ class InboxActivities(TestCase):
         self.assertEqual(notification.related_status, self.status)
 
     @responses.activate
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
     def test_boost_remote_status(self, redis_mock, _):
         """boost a status from a remote server"""
@@ -141,7 +141,7 @@ class InboxActivities(TestCase):
             content="hi",
             user=self.remote_user,
         )
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status.save(broadcast=False)
         activity = {
             "type": "Announce",
@@ -158,7 +158,7 @@ class InboxActivities(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Boost.objects.count(), 0)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
     def test_unboost(self, *_):
         """undo a boost"""
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index 059d0522..cb5cd216 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -47,7 +47,7 @@ class InboxCreate(TestCase):
         }
         models.SiteSettings.objects.create()
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_create_status(self, *_):
         """the "it justs works" mode"""
         datafile = pathlib.Path(__file__).parent.joinpath(
@@ -61,7 +61,7 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
 
@@ -77,7 +77,7 @@ class InboxCreate(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Status.objects.count(), 1)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_create_comment_with_reading_status(self, *_):
         """the "it justs works" mode"""
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_comment.json")
@@ -90,7 +90,7 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
 
@@ -115,7 +115,7 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
         status = models.Status.objects.last()
@@ -128,7 +128,7 @@ class InboxCreate(TestCase):
 
     def test_create_status_remote_note_with_reply(self, _):
         """should only create it under the right circumstances"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             parent_status = models.Status.objects.create(
                 user=self.local_user,
                 content="Test status",
@@ -145,7 +145,7 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
         status = models.Status.objects.last()
@@ -184,7 +184,7 @@ class InboxCreate(TestCase):
             "rating": 3,
             "@context": "https://www.w3.org/ns/activitystreams",
         }
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
         rating = models.ReviewRating.objects.first()
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 1566c05a..a58e0a4b 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -33,7 +33,7 @@ class InboxActivities(TestCase):
                 inbox="https://example.com/users/rat/inbox",
                 outbox="https://example.com/users/rat/outbox",
             )
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             self.status = models.Status.objects.create(
                 user=self.remote_user,
                 content="Test status",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py
index 56f21e89..2f6e3971 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_like.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_like.py
@@ -34,7 +34,7 @@ class InboxActivities(TestCase):
             )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            with patch("bookwyrm.activitystreams.add_status_task.delay"):
                 self.status = models.Status.objects.create(
                     user=self.local_user,
                     content="Test status",
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 2cd50302..3b2ab697 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -74,7 +74,7 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_book_page_statuses(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Book.as_view()
diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py
index eff62cb6..7b08f260 100644
--- a/bookwyrm/tests/views/test_discover.py
+++ b/bookwyrm/tests/views/test_discover.py
@@ -1,7 +1,6 @@
 """ test for app action functionality """
 from unittest.mock import patch
 from django.contrib.auth.models import AnonymousUser
-from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
@@ -41,7 +40,7 @@ class DiscoverViews(TestCase):
         result.render()
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_discover_page(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Discover.as_view()
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index e13dd7f8..805fa2c9 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -15,7 +15,7 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 class FeedViews(TestCase):
diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py
index 23bd8e1a..ea0cd1c9 100644
--- a/bookwyrm/tests/views/test_goal.py
+++ b/bookwyrm/tests/views/test_goal.py
@@ -104,7 +104,7 @@ class GoalViews(TestCase):
         result = view(request, self.local_user.localname, self.year)
         self.assertEqual(result.status_code, 404)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_create_goal(self, _):
         """create a new goal"""
         view = views.Goal.as_view()
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index b9a82e68..f3797cc5 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -11,7 +11,7 @@ from bookwyrm import models, views
 from bookwyrm.settings import USER_AGENT
 
 
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 class ViewsHelpers(TestCase):
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index d83fc119..63b69007 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -8,7 +8,7 @@ from bookwyrm import models, views
 
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
+@patch("bookwyrm.activitystreams.remove_object_from_related_stores")
 class InteractionViews(TestCase):
     """viewing and creating statuses"""
 
@@ -47,7 +47,7 @@ class InteractionViews(TestCase):
         view = views.Favorite.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
@@ -65,7 +65,7 @@ class InteractionViews(TestCase):
         view = views.Unfavorite.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
             views.Favorite.as_view()(request, status.id)
 
@@ -82,7 +82,7 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
@@ -104,7 +104,7 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             with patch(
@@ -128,7 +128,7 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(
                 user=self.local_user, content="hi", privacy="unlisted"
             )
@@ -143,7 +143,7 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(
                 user=self.local_user, content="hi", privacy="followers"
             )
@@ -156,14 +156,14 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
             view(request, status.id)
         self.assertEqual(models.Boost.objects.count(), 1)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_unboost(self, *_):
         """undo a boost"""
         view = views.Unboost.as_view()
diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py
index fe493bb8..eef9ed88 100644
--- a/bookwyrm/tests/views/test_outbox.py
+++ b/bookwyrm/tests/views/test_outbox.py
@@ -56,7 +56,7 @@ class OutboxView(TestCase):
 
     def test_outbox_privacy(self, _):
         """don't show dms et cetera in outbox"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Status.objects.create(
                 content="PRIVATE!!", user=self.local_user, privacy="direct"
             )
@@ -79,7 +79,7 @@ class OutboxView(TestCase):
 
     def test_outbox_filter(self, _):
         """if we only care about reviews, only get reviews"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Review.objects.create(
                 content="look at this",
                 name="hi",
@@ -105,7 +105,7 @@ class OutboxView(TestCase):
 
     def test_outbox_bookwyrm_request_true(self, _):
         """should differentiate between bookwyrm and outside requests"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Review.objects.create(
                 name="hi",
                 content="look at this",
@@ -123,7 +123,7 @@ class OutboxView(TestCase):
 
     def test_outbox_bookwyrm_request_false(self, _):
         """should differentiate between bookwyrm and outside requests"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Review.objects.create(
                 name="hi",
                 content="look at this",
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index 61464bc7..f15e99a7 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -8,7 +8,7 @@ from django.utils import timezone
 from bookwyrm import models, views
 
 
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 class ReadingViews(TestCase):
     """viewing and creating statuses"""
diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index f2d3baf2..a7d95854 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -8,7 +8,7 @@ from bookwyrm.views import rss_feed
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 class RssFeedView(TestCase):
     """rss feed behaves as expected"""
 
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index ff429e20..27d9de2d 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -59,7 +59,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             view(request, "comment")
             self.assertTrue(redis_mock.called)
 
@@ -74,7 +74,7 @@ class StatusViews(TestCase):
         user = models.User.objects.create_user(
             "rat", "rat@rat.com", "password", local=True
         )
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             parent = models.Status.objects.create(
                 content="parent status", user=self.local_user
             )
@@ -89,7 +89,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             view(request, "reply")
             self.assertTrue(redis_mock.called)
 
@@ -119,7 +119,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             view(request, "comment")
             self.assertTrue(redis_mock.called)
 
@@ -147,7 +147,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             view(request, "comment")
             self.assertTrue(redis_mock.called)
         status = models.Status.objects.get()
@@ -163,7 +163,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
             view(request, "reply")
             self.assertTrue(redis_mock.called)
 
@@ -179,7 +179,7 @@ class StatusViews(TestCase):
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Comment.objects.create(
                 content="hi", book=self.book, user=self.local_user
             )
@@ -200,7 +200,7 @@ class StatusViews(TestCase):
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.ReviewRating.objects.create(
                 book=self.book, rating=2.0, user=self.local_user
             )
@@ -220,7 +220,7 @@ class StatusViews(TestCase):
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.GeneratedNote.objects.create(
                 content="hi", user=self.local_user
             )
@@ -344,7 +344,7 @@ class StatusViews(TestCase):
     def test_handle_delete_status(self, mock, *_):
         """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
@@ -364,7 +364,7 @@ class StatusViews(TestCase):
     def test_handle_delete_status_permission_denied(self, *_):
         """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
@@ -378,7 +378,7 @@ class StatusViews(TestCase):
     def test_handle_delete_status_moderator(self, mock, _):
         """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")

From bb94995389f9d2309ccbe903ba1415689f105c68 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 14:48:45 -0700
Subject: [PATCH 260/272] Where you need one mock, you probably need the other

---
 bookwyrm/tests/activitypub/test_base_activity.py     |  4 +++-
 bookwyrm/tests/importers/test_goodreads_import.py    |  4 +++-
 bookwyrm/tests/importers/test_librarything_import.py |  4 +++-
 bookwyrm/tests/management/test_populate_streams.py   |  4 +++-
 bookwyrm/tests/models/test_activitypub_mixin.py      |  4 +++-
 bookwyrm/tests/models/test_base_model.py             |  4 +++-
 bookwyrm/tests/models/test_import_model.py           |  4 +++-
 bookwyrm/tests/models/test_list.py                   |  4 +++-
 bookwyrm/tests/models/test_readthrough_model.py      |  4 +++-
 bookwyrm/tests/models/test_relationship_models.py    |  4 +++-
 bookwyrm/tests/models/test_shelf_model.py            |  4 +++-
 bookwyrm/tests/models/test_status_model.py           |  4 +++-
 bookwyrm/tests/models/test_user_model.py             |  4 +++-
 bookwyrm/tests/test_activitystreams.py               |  4 +++-
 bookwyrm/tests/test_emailing.py                      |  4 +++-
 bookwyrm/tests/test_preview_images.py                |  4 +++-
 bookwyrm/tests/test_signing.py                       |  4 +++-
 bookwyrm/tests/test_suggested_users.py               |  4 +++-
 bookwyrm/tests/test_templatetags.py                  |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox.py             |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_add.py         |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_announce.py    |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_block.py       |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_create.py      |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_delete.py      |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_follow.py      |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_like.py        |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_remove.py      |  4 +++-
 bookwyrm/tests/views/inbox/test_inbox_update.py      |  4 +++-
 bookwyrm/tests/views/test_announcements.py           |  4 +++-
 bookwyrm/tests/views/test_authentication.py          |  4 +++-
 bookwyrm/tests/views/test_author.py                  |  4 +++-
 bookwyrm/tests/views/test_block.py                   |  4 +++-
 bookwyrm/tests/views/test_book.py                    |  4 +++-
 bookwyrm/tests/views/test_directory.py               |  4 +++-
 bookwyrm/tests/views/test_discover.py                |  4 +++-
 bookwyrm/tests/views/test_edit_user.py               |  4 +++-
 bookwyrm/tests/views/test_editions.py                |  4 +++-
 bookwyrm/tests/views/test_federation.py              |  4 +++-
 bookwyrm/tests/views/test_feed.py                    |  4 +++-
 bookwyrm/tests/views/test_follow.py                  | 12 +++++++++---
 bookwyrm/tests/views/test_get_started.py             |  4 +++-
 bookwyrm/tests/views/test_goal.py                    |  4 +++-
 bookwyrm/tests/views/test_helpers.py                 |  4 +++-
 bookwyrm/tests/views/test_import.py                  |  4 +++-
 bookwyrm/tests/views/test_interaction.py             |  4 +++-
 bookwyrm/tests/views/test_invite.py                  |  4 +++-
 bookwyrm/tests/views/test_isbn.py                    |  4 +++-
 bookwyrm/tests/views/test_landing.py                 |  4 +++-
 bookwyrm/tests/views/test_list.py                    |  4 +++-
 bookwyrm/tests/views/test_list_actions.py            |  4 +++-
 bookwyrm/tests/views/test_notifications.py           |  4 +++-
 bookwyrm/tests/views/test_outbox.py                  |  4 +++-
 bookwyrm/tests/views/test_password.py                |  4 +++-
 bookwyrm/tests/views/test_reading.py                 |  4 +++-
 bookwyrm/tests/views/test_readthrough.py             |  4 +++-
 bookwyrm/tests/views/test_reports.py                 |  4 +++-
 bookwyrm/tests/views/test_rss_feed.py                |  4 +++-
 bookwyrm/tests/views/test_search.py                  |  4 +++-
 bookwyrm/tests/views/test_shelf.py                   |  4 +++-
 bookwyrm/tests/views/test_status.py                  |  4 +++-
 bookwyrm/tests/views/test_updates.py                 |  4 +++-
 bookwyrm/tests/views/test_user.py                    |  8 ++++++--
 bookwyrm/tests/views/test_user_admin.py              |  4 +++-
 bookwyrm/tests/views/test_wellknown.py               |  4 +++-
 65 files changed, 204 insertions(+), 68 deletions(-)

diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index 1b2dd798..d0426a22 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -28,7 +28,9 @@ class BaseActivity(TestCase):
 
     def setUp(self):
         """we're probably going to re-use this so why copy/paste"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index 2f1a8318..a6639164 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -30,7 +30,9 @@ class GoodreadsImport(TestCase):
         self.importer = GoodreadsImporter()
         datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         self.csv = open(datafile, "r", encoding=self.importer.encoding)
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "password", local=True
             )
diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
index 3a9cf8c9..1abfdbb1 100644
--- a/bookwyrm/tests/importers/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -31,7 +31,9 @@ class LibrarythingImport(TestCase):
 
         # Librarything generates latin encoded exports...
         self.csv = open(datafile, "r", encoding=self.importer.encoding)
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mmai", "mmai@mmai.mmai", "password", local=True
             )
diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
index 5b1139f9..ca21b0ee 100644
--- a/bookwyrm/tests/management/test_populate_streams.py
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -12,7 +12,9 @@ class Activitystreams(TestCase):
 
     def setUp(self):
         """we need some stuff"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 30aa9117..911cca5c 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -27,7 +27,9 @@ class ActivitypubMixins(TestCase):
 
     def setUp(self):
         """shared data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 1aed644e..28564740 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -13,7 +13,9 @@ class BaseModel(TestCase):
 
     def setUp(self):
         """shared data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py
index 15a75a96..caf61034 100644
--- a/bookwyrm/tests/models/test_import_model.py
+++ b/bookwyrm/tests/models/test_import_model.py
@@ -59,7 +59,9 @@ class ImportJob(TestCase):
         unknown_read_data["Exclusive Shelf"] = "read"
         unknown_read_data["Date Read"] = ""
 
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py
index 6e1ff809..0d749453 100644
--- a/bookwyrm/tests/models/test_list.py
+++ b/bookwyrm/tests/models/test_list.py
@@ -11,7 +11,9 @@ class List(TestCase):
 
     def setUp(self):
         """look, a list"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py
index 2b6e4fdd..5d8450a1 100644
--- a/bookwyrm/tests/models/test_readthrough_model.py
+++ b/bookwyrm/tests/models/test_readthrough_model.py
@@ -13,7 +13,9 @@ class ReadThrough(TestCase):
 
     def setUp(self):
         """look, a shelf"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py
index f66cf109..7383a489 100644
--- a/bookwyrm/tests/models/test_relationship_models.py
+++ b/bookwyrm/tests/models/test_relationship_models.py
@@ -21,7 +21,9 @@ class Relationship(TestCase):
                 inbox="https://example.com/users/rat/inbox",
                 outbox="https://example.com/users/rat/outbox",
             )
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index f6fd6850..cb7f78c3 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -13,7 +13,9 @@ class Shelf(TestCase):
 
     def setUp(self):
         """look, a shelf"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 91db382e..9913911c 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -22,7 +22,9 @@ class Status(TestCase):
 
     def setUp(self):
         """useful things for creating a status"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 230c503b..528d3fdc 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -13,7 +13,9 @@ class User(TestCase):
     protocol = "https://" if USE_HTTPS else "http://"
 
     def setUp(self):
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse@%s" % DOMAIN,
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index a5b7e17f..38f90af9 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -14,7 +14,9 @@ class Activitystreams(TestCase):
 
     def setUp(self):
         """use a test csv"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py
index 4c3d86a4..2f24122e 100644
--- a/bookwyrm/tests/test_emailing.py
+++ b/bookwyrm/tests/test_emailing.py
@@ -14,7 +14,9 @@ class Emailing(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py
index 37638c27..760ff4c4 100644
--- a/bookwyrm/tests/test_preview_images.py
+++ b/bookwyrm/tests/test_preview_images.py
@@ -29,7 +29,9 @@ class PreviewImages(TestCase):
         avatar_file = pathlib.Path(__file__).parent.joinpath(
             "../static/images/no_cover.jpg"
         )
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "possum@local.com",
                 "possum@possum.possum",
diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py
index d9a87dd5..d33687a5 100644
--- a/bookwyrm/tests/test_signing.py
+++ b/bookwyrm/tests/test_signing.py
@@ -37,7 +37,9 @@ class Signature(TestCase):
 
     def setUp(self):
         """create users and test data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.mouse = models.User.objects.create_user(
                 "mouse@%s" % DOMAIN,
                 "mouse@example.com",
diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py
index 6d45e915..67b1940d 100644
--- a/bookwyrm/tests/test_suggested_users.py
+++ b/bookwyrm/tests/test_suggested_users.py
@@ -19,7 +19,9 @@ class SuggestedUsers(TestCase):
 
     def setUp(self):
         """use a test csv"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index f30ab6f7..312d107b 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -22,7 +22,9 @@ class TemplateTags(TestCase):
 
     def setUp(self):
         """create some filler objects"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py
index 8e49d25a..a84458ab 100644
--- a/bookwyrm/tests/views/inbox/test_inbox.py
+++ b/bookwyrm/tests/views/inbox/test_inbox.py
@@ -19,7 +19,9 @@ class Inbox(TestCase):
         self.client = Client()
         self.factory = RequestFactory()
 
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index 07525c34..33e6c55b 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -13,7 +13,9 @@ class InboxAdd(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index ec827d75..fcf3e410 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -13,7 +13,9 @@ class InboxActivities(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
index ce650a00..dc29954d 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_block.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -12,7 +12,9 @@ class InboxBlock(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index cb5cd216..76afb538 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -16,7 +16,9 @@ class InboxCreate(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index a58e0a4b..23a956b2 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -13,7 +13,9 @@ class InboxActivities(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py
index d1a4e0d0..62c84044 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_follow.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py
@@ -13,7 +13,9 @@ class InboxRelationships(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py
index 2f6e3971..db8f1fca 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_like.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_like.py
@@ -12,7 +12,9 @@ class InboxActivities(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
index 3d64fcb2..cb4e4a16 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_remove.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -12,7 +12,9 @@ class InboxRemove(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
index 4abb0fa0..fc3b3a2a 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_update.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -14,7 +14,9 @@ class InboxUpdate(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py
index 16ef81e9..44b5d5b6 100644
--- a/bookwyrm/tests/views/test_announcements.py
+++ b/bookwyrm/tests/views/test_announcements.py
@@ -13,7 +13,9 @@ class AnnouncementViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index 22008e10..23091641 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -20,7 +20,9 @@ class AuthenticationViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@your.domain.here",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py
index 6157b651..7a0065c9 100644
--- a/bookwyrm/tests/views/test_author.py
+++ b/bookwyrm/tests/views/test_author.py
@@ -17,7 +17,9 @@ class AuthorViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py
index 11283869..28f52639 100644
--- a/bookwyrm/tests/views/test_block.py
+++ b/bookwyrm/tests/views/test_block.py
@@ -14,7 +14,9 @@ class BlockViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 3b2ab697..99022ec5 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -24,7 +24,9 @@ class BookViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py
index bdda8101..93dc3528 100644
--- a/bookwyrm/tests/views/test_directory.py
+++ b/bookwyrm/tests/views/test_directory.py
@@ -15,7 +15,9 @@ class DirectoryViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py
index 7b08f260..4b8927bc 100644
--- a/bookwyrm/tests/views/test_discover.py
+++ b/bookwyrm/tests/views/test_discover.py
@@ -14,7 +14,9 @@ class DiscoverViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
index df89d5b0..70e5eafd 100644
--- a/bookwyrm/tests/views/test_edit_user.py
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -22,7 +22,9 @@ class EditUserViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_editions.py b/bookwyrm/tests/views/test_editions.py
index 1bd23ae1..6ab81955 100644
--- a/bookwyrm/tests/views/test_editions.py
+++ b/bookwyrm/tests/views/test_editions.py
@@ -15,7 +15,9 @@ class BookViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index f43a9623..ce5de7e3 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -15,7 +15,9 @@ class FederationViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index 805fa2c9..bcb9247e 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -24,7 +24,9 @@ class FeedViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index 714284b0..a1dda42a 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -16,7 +16,9 @@ class FollowViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -67,7 +69,9 @@ class FollowViews(TestCase):
 
     def test_handle_follow_local_manually_approves(self):
         """send a follow request"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             rat = models.User.objects.create_user(
                 "rat@local.com",
                 "rat@rat.com",
@@ -91,7 +95,9 @@ class FollowViews(TestCase):
 
     def test_handle_follow_local(self):
         """send a follow request"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             rat = models.User.objects.create_user(
                 "rat@local.com",
                 "rat@rat.com",
diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index eb9d67b5..2f9e9772 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -13,7 +13,9 @@ class GetStartedViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py
index ea0cd1c9..2ecce0ac 100644
--- a/bookwyrm/tests/views/test_goal.py
+++ b/bookwyrm/tests/views/test_goal.py
@@ -16,7 +16,9 @@ class GoalViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index f3797cc5..d8012d8e 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -20,7 +20,9 @@ class ViewsHelpers(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             with patch("bookwyrm.suggested_users.rerank_user_task.delay"):
                 self.local_user = models.User.objects.create_user(
                     "mouse@local.com",
diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py
index d9d67d56..2027d284 100644
--- a/bookwyrm/tests/views/test_import.py
+++ b/bookwyrm/tests/views/test_import.py
@@ -15,7 +15,9 @@ class ImportViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index 63b69007..aa3ea511 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -15,7 +15,9 @@ class InteractionViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py
index 6ad46420..c1e425c8 100644
--- a/bookwyrm/tests/views/test_invite.py
+++ b/bookwyrm/tests/views/test_invite.py
@@ -16,7 +16,9 @@ class InviteViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py
index 7c413e8b..a6a45174 100644
--- a/bookwyrm/tests/views/test_isbn.py
+++ b/bookwyrm/tests/views/test_isbn.py
@@ -16,7 +16,9 @@ class IsbnViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py
index 476da74b..f3a50fbc 100644
--- a/bookwyrm/tests/views/test_landing.py
+++ b/bookwyrm/tests/views/test_landing.py
@@ -15,7 +15,9 @@ class LandingViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index d5e917c3..35befec6 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -17,7 +17,9 @@ class ListViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py
index 2339427c..dadb9812 100644
--- a/bookwyrm/tests/views/test_list_actions.py
+++ b/bookwyrm/tests/views/test_list_actions.py
@@ -15,7 +15,9 @@ class ListActionViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py
index af6aac13..d97616ce 100644
--- a/bookwyrm/tests/views/test_notifications.py
+++ b/bookwyrm/tests/views/test_notifications.py
@@ -14,7 +14,9 @@ class NotificationViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py
index eef9ed88..a1f62cc6 100644
--- a/bookwyrm/tests/views/test_outbox.py
+++ b/bookwyrm/tests/views/test_outbox.py
@@ -18,7 +18,9 @@ class OutboxView(TestCase):
     def setUp(self):
         """we'll need some data"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py
index 5f59e9e3..b07d98a7 100644
--- a/bookwyrm/tests/views/test_password.py
+++ b/bookwyrm/tests/views/test_password.py
@@ -15,7 +15,9 @@ class PasswordViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index f15e99a7..d5b5faca 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -16,7 +16,9 @@ class ReadingViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index 618d9cf8..d58e152e 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -22,7 +22,9 @@ class ReadThrough(TestCase):
             title="Example Edition", parent_work=self.work
         )
 
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco"
             )
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 7d39a007..c93594e2 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -13,7 +13,9 @@ class ReportViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index a7d95854..d4d11261 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -13,7 +13,9 @@ class RssFeedView(TestCase):
     """rss feed behaves as expected"""
 
     def setUp(self):
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "rss_user", "rss@test.rss", "password", local=True
             )
diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 3da6f866..dacbcbde 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -19,7 +19,9 @@ class Views(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index 44c4b9cb..19f86daf 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -17,7 +17,9 @@ class ShelfViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 27d9de2d..1ff12e24 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -17,7 +17,9 @@ class StatusViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py
index 627b756e..27181fc9 100644
--- a/bookwyrm/tests/views/test_updates.py
+++ b/bookwyrm/tests/views/test_updates.py
@@ -15,7 +15,9 @@ class UpdateViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 740f0d29..4702725e 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -17,7 +17,9 @@ class UserViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -32,7 +34,9 @@ class UserViews(TestCase):
             title="test", parent_work=models.Work.objects.create(title="test work")
         )
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+            with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+                "bookwyrm.activitystreams.populate_stream_task.delay"
+            ):
                 models.ShelfBook.objects.create(
                     book=self.book,
                     user=self.local_user,
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index 86309045..f8e85119 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -14,7 +14,9 @@ class UserAdminViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py
index fcbcc12b..7aca0236 100644
--- a/bookwyrm/tests/views/test_wellknown.py
+++ b/bookwyrm/tests/views/test_wellknown.py
@@ -16,7 +16,9 @@ class UserViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",

From 72d5238590de71c13bcdf46c409bbee4c2c57a97 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 14:50:33 -0700
Subject: [PATCH 261/272] More mocks

---
 bookwyrm/tests/activitypub/test_base_activity.py     | 1 +
 bookwyrm/tests/importers/test_goodreads_import.py    | 1 +
 bookwyrm/tests/importers/test_librarything_import.py | 1 +
 bookwyrm/tests/models/test_fields.py                 | 1 +
 bookwyrm/tests/models/test_shelf_model.py            | 1 +
 bookwyrm/tests/test_activitystreams.py               | 1 +
 bookwyrm/tests/test_suggested_users.py               | 1 +
 bookwyrm/tests/views/test_authentication.py          | 1 +
 bookwyrm/tests/views/test_directory.py               | 1 +
 bookwyrm/tests/views/test_editions.py                | 1 +
 bookwyrm/tests/views/test_feed.py                    | 1 +
 bookwyrm/tests/views/test_get_started.py             | 2 ++
 bookwyrm/tests/views/test_helpers.py                 | 1 +
 bookwyrm/tests/views/test_reading.py                 | 1 +
 bookwyrm/tests/views/test_readthrough.py             | 1 +
 bookwyrm/tests/views/test_reports.py                 | 1 +
 bookwyrm/tests/views/test_shelf.py                   | 1 +
 bookwyrm/tests/views/test_status.py                  | 1 +
 bookwyrm/tests/views/test_user.py                    | 1 +
 bookwyrm/tests/views/test_user_admin.py              | 1 +
 20 files changed, 21 insertions(+)

diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index d0426a22..7117eb52 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -23,6 +23,7 @@ from bookwyrm import models
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class BaseActivity(TestCase):
     """the super class for model-linked activitypub dataclasses"""
 
diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index a6639164..64a97b39 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -22,6 +22,7 @@ def make_date(*args):
 
 # pylint: disable=consider-using-with
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class GoodreadsImport(TestCase):
     """importing from goodreads csv"""
 
diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
index 1abfdbb1..4d91a9c5 100644
--- a/bookwyrm/tests/importers/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -21,6 +21,7 @@ def make_date(*args):
 
 # pylint: disable=consider-using-with
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class LibrarythingImport(TestCase):
     """importing from librarything tsv"""
 
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 88b07a29..af0a12aa 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -25,6 +25,7 @@ from bookwyrm.models.activitypub_mixin import ActivitypubMixin
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class ModelFields(TestCase):
     """overwrites standard model feilds to work with activitypub"""
 
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index cb7f78c3..3179b138 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -8,6 +8,7 @@ from bookwyrm import models, settings
 
 # pylint: disable=unused-argument
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class Shelf(TestCase):
     """some activitypub oddness ahead"""
 
diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index 38f90af9..aecc448c 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -8,6 +8,7 @@ from bookwyrm import activitystreams, models
 @patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.activitystreams.BooksStream.add_book_statuses")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 # pylint: disable=too-many-public-methods
 class Activitystreams(TestCase):
     """using redis to build activity streams"""
diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py
index 67b1940d..39758252 100644
--- a/bookwyrm/tests/test_suggested_users.py
+++ b/bookwyrm/tests/test_suggested_users.py
@@ -12,6 +12,7 @@ from bookwyrm.suggested_users import suggested_users, get_annotated_users
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 class SuggestedUsers(TestCase):
diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index 23091641..f0fd5392 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -14,6 +14,7 @@ from bookwyrm.settings import DOMAIN
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class AuthenticationViews(TestCase):
     """login and password management"""
 
diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py
index 93dc3528..52f9c085 100644
--- a/bookwyrm/tests/views/test_directory.py
+++ b/bookwyrm/tests/views/test_directory.py
@@ -32,6 +32,7 @@ class DirectoryViews(TestCase):
         self.anonymous_user.is_authenticated = False
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.rerank_user_task.delay")
     def test_directory_page(self, *_):
         """there are so many views, this just makes sure it LOADS"""
diff --git a/bookwyrm/tests/views/test_editions.py b/bookwyrm/tests/views/test_editions.py
index 6ab81955..1cd256b1 100644
--- a/bookwyrm/tests/views/test_editions.py
+++ b/bookwyrm/tests/views/test_editions.py
@@ -103,6 +103,7 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     def test_switch_edition(self, _):
         """updates user's relationships to a book"""
         work = models.Work.objects.create(title="test work")
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index bcb9247e..843a9fd7 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -17,6 +17,7 @@ from bookwyrm.activitypub import ActivitypubResponse
 @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
 @patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 class FeedViews(TestCase):
     """activity feed, statuses, dms"""
diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index 2f9e9772..98962bc4 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -46,6 +46,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.rerank_user_task.delay")
     def test_profile_view_post(self, *_):
         """save basic user details"""
@@ -90,6 +91,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     def test_books_view_post(self, _):
         """shelve some books"""
         view = views.GetStartedBooks.as_view()
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index d8012d8e..8f7b45a3 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -13,6 +13,7 @@ from bookwyrm.settings import USER_AGENT
 
 @patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 class ViewsHelpers(TestCase):
     """viewing and creating statuses"""
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index d5b5faca..acd14775 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -10,6 +10,7 @@ from bookwyrm import models, views
 
 @patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class ReadingViews(TestCase):
     """viewing and creating statuses"""
 
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index d58e152e..c246a263 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -8,6 +8,7 @@ from bookwyrm import models
 
 
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class ReadThrough(TestCase):
     """readthrough tests"""
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index c93594e2..2f9ee27b 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -119,6 +119,7 @@ class ReportViews(TestCase):
         self.assertFalse(report.resolved)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.remove_user_task.delay")
     def test_suspend_user(self, *_):
         """toggle whether a user is able to log in"""
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index 19f86daf..d7d33465 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -11,6 +11,7 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class ShelfViews(TestCase):
     """tag views"""
 
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 1ff12e24..a3c812b4 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -10,6 +10,7 @@ from bookwyrm.settings import DOMAIN
 
 # pylint: disable=invalid-name
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class StatusViews(TestCase):
     """viewing and creating statuses"""
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 4702725e..d14c6243 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -103,6 +103,7 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     def test_followers_page_blocked(self, _):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Followers.as_view()
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index f8e85119..eab8ab68 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -51,6 +51,7 @@ class UserAdminViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.remove_user_task.delay")
     def test_user_admin_page_post(self, *_):
         """set the user's group"""

From 227b72eaf999c02ecbfabbb73b30a34b790cf5c4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 15:09:04 -0700
Subject: [PATCH 262/272] Fixes mocks syntax

---
 .../tests/importers/test_goodreads_import.py  | 16 +++----
 .../importers/test_librarything_import.py     | 14 +++----
 bookwyrm/tests/models/test_fields.py          | 42 +++++++++----------
 bookwyrm/tests/models/test_shelf_model.py     |  8 ++--
 bookwyrm/tests/views/test_authentication.py   | 28 ++++++-------
 bookwyrm/tests/views/test_get_started.py      |  3 +-
 bookwyrm/tests/views/test_status.py           |  2 +-
 bookwyrm/tests/views/test_user.py             |  4 +-
 8 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index 64a97b39..47fd6a33 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -56,7 +56,7 @@ class GoodreadsImport(TestCase):
             parent_work=work,
         )
 
-    def test_create_job(self, _):
+    def test_create_job(self, *_):
         """creates the import job entry and checks csv"""
         import_job = self.importer.create_job(self.user, self.csv, False, "public")
         self.assertEqual(import_job.user, self.user)
@@ -72,7 +72,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(import_items[2].index, 2)
         self.assertEqual(import_items[2].data["Book Id"], "28694510")
 
-    def test_create_retry_job(self, _):
+    def test_create_retry_job(self, *_):
         """trying again with items that didn't import"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
@@ -90,7 +90,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(retry_items[1].index, 1)
         self.assertEqual(retry_items[1].data["Book Id"], "52691223")
 
-    def test_start_import(self, _):
+    def test_start_import(self, *_):
         """begin loading books"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         MockTask = namedtuple("Task", ("id"))
@@ -102,7 +102,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(import_job.task_id, "7")
 
     @responses.activate
-    def test_import_data(self, _):
+    def test_import_data(self, *_):
         """resolve entry"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         book = models.Edition.objects.create(title="Test Book")
@@ -117,7 +117,7 @@ class GoodreadsImport(TestCase):
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
 
-    def test_handle_imported_book(self, _):
+    def test_handle_imported_book(self, *_):
         """goodreads import added a book, this adds related connections"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         self.assertIsNone(shelf.books.first())
@@ -148,7 +148,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2020, 10, 21))
         self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25))
 
-    def test_handle_imported_book_already_shelved(self, _):
+    def test_handle_imported_book_already_shelved(self, *_):
         """goodreads import added a book, this adds related connections"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = self.user.shelf_set.filter(identifier="to-read").first()
@@ -186,7 +186,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2020, 10, 21))
         self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25))
 
-    def test_handle_import_twice(self, _):
+    def test_handle_import_twice(self, *_):
         """re-importing books"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
@@ -264,7 +264,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(review.published_date, make_date(2019, 7, 8))
         self.assertEqual(review.privacy, "unlisted")
 
-    def test_handle_imported_book_reviews_disabled(self, _):
+    def test_handle_imported_book_reviews_disabled(self, *_):
         """goodreads review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
index 4d91a9c5..c7ddbed6 100644
--- a/bookwyrm/tests/importers/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -57,7 +57,7 @@ class LibrarythingImport(TestCase):
             parent_work=work,
         )
 
-    def test_create_job(self, _):
+    def test_create_job(self, *_):
         """creates the import job entry and checks csv"""
         import_job = self.importer.create_job(self.user, self.csv, False, "public")
         self.assertEqual(import_job.user, self.user)
@@ -73,7 +73,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(import_items[2].index, 2)
         self.assertEqual(import_items[2].data["Book Id"], "5015399")
 
-    def test_create_retry_job(self, _):
+    def test_create_retry_job(self, *_):
         """trying again with items that didn't import"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
@@ -92,7 +92,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(retry_items[1].data["Book Id"], "5015319")
 
     @responses.activate
-    def test_import_data(self, _):
+    def test_import_data(self, *_):
         """resolve entry"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         book = models.Edition.objects.create(title="Test Book")
@@ -107,7 +107,7 @@ class LibrarythingImport(TestCase):
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
 
-    def test_handle_imported_book(self, _):
+    def test_handle_imported_book(self, *_):
         """librarything import added a book, this adds related connections"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         self.assertIsNone(shelf.books.first())
@@ -137,7 +137,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2007, 4, 16))
         self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8))
 
-    def test_handle_imported_book_already_shelved(self, _):
+    def test_handle_imported_book_already_shelved(self, *_):
         """librarything import added a book, this adds related connections"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = self.user.shelf_set.filter(identifier="to-read").first()
@@ -169,7 +169,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2007, 4, 16))
         self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8))
 
-    def test_handle_import_twice(self, _):
+    def test_handle_import_twice(self, *_):
         """re-importing books"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
@@ -222,7 +222,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(review.published_date, make_date(2007, 5, 8))
         self.assertEqual(review.privacy, "unlisted")
 
-    def test_handle_imported_book_reviews_disabled(self, _):
+    def test_handle_imported_book_reviews_disabled(self, *_):
         """librarything review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index af0a12aa..1796b84b 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -29,7 +29,7 @@ from bookwyrm.models.activitypub_mixin import ActivitypubMixin
 class ModelFields(TestCase):
     """overwrites standard model feilds to work with activitypub"""
 
-    def test_validate_remote_id(self, _):
+    def test_validate_remote_id(self, *_):
         """should look like a url"""
         self.assertIsNone(fields.validate_remote_id("http://www.example.com"))
         self.assertIsNone(fields.validate_remote_id("https://www.example.com"))
@@ -46,7 +46,7 @@ class ModelFields(TestCase):
             "http://www.example.com/dlfjg 23/x",
         )
 
-    def test_activitypub_field_mixin(self, _):
+    def test_activitypub_field_mixin(self, *_):
         """generic mixin with super basic to and from functionality"""
         instance = fields.ActivitypubFieldMixin()
         self.assertEqual(instance.field_to_activity("fish"), "fish")
@@ -64,7 +64,7 @@ class ModelFields(TestCase):
         instance.name = "snake_case_name"
         self.assertEqual(instance.get_activitypub_field(), "snakeCaseName")
 
-    def test_set_field_from_activity(self, _):
+    def test_set_field_from_activity(self, *_):
         """setter from entire json blob"""
 
         @dataclass
@@ -83,7 +83,7 @@ class ModelFields(TestCase):
         instance.set_field_from_activity(mock_model, data)
         self.assertEqual(mock_model.field_name, "hi")
 
-    def test_set_activity_from_field(self, _):
+    def test_set_activity_from_field(self, *_):
         """set json field given entire model"""
 
         @dataclass
@@ -101,7 +101,7 @@ class ModelFields(TestCase):
         instance.set_activity_from_field(data, mock_model)
         self.assertEqual(data["fieldName"], "bip")
 
-    def test_remote_id_field(self, _):
+    def test_remote_id_field(self, *_):
         """just sets some defaults on charfield"""
         instance = fields.RemoteIdField()
         self.assertEqual(instance.max_length, 255)
@@ -110,7 +110,7 @@ class ModelFields(TestCase):
         with self.assertRaises(ValidationError):
             instance.run_validators("http://www.example.com/dlfjg 23/x")
 
-    def test_username_field(self, _):
+    def test_username_field(self, *_):
         """again, just setting defaults on username field"""
         instance = fields.UsernameField()
         self.assertEqual(instance.activitypub_field, "preferredUsername")
@@ -131,7 +131,7 @@ class ModelFields(TestCase):
 
         self.assertEqual(instance.field_to_activity("test@example.com"), "test")
 
-    def test_privacy_field_defaults(self, _):
+    def test_privacy_field_defaults(self, *_):
         """post privacy field's many default values"""
         instance = fields.PrivacyField()
         self.assertEqual(instance.max_length, 255)
@@ -144,7 +144,7 @@ class ModelFields(TestCase):
             instance.public, "https://www.w3.org/ns/activitystreams#Public"
         )
 
-    def test_privacy_field_set_field_from_activity(self, _):
+    def test_privacy_field_set_field_from_activity(self, *_):
         """translate between to/cc fields and privacy"""
 
         with patch("bookwyrm.models.user.set_remote_server.delay"):
@@ -252,7 +252,7 @@ class ModelFields(TestCase):
         self.assertEqual(activity["to"], [user.remote_id])
         self.assertEqual(activity["cc"], [])
 
-    def test_foreign_key(self, _):
+    def test_foreign_key(self, *_):
         """should be able to format a related model"""
         instance = fields.ForeignKey("User", on_delete=models.CASCADE)
         Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
@@ -261,7 +261,7 @@ class ModelFields(TestCase):
         self.assertEqual(instance.field_to_activity(item), "https://e.b/c")
 
     @responses.activate
-    def test_foreign_key_from_activity_str(self, _):
+    def test_foreign_key_from_activity_str(self, *_):
         """create a new object from a foreign key"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
@@ -308,7 +308,7 @@ class ModelFields(TestCase):
         self.assertEqual(value.name, "MOUSE?? MOUSE!!")
         # et cetera but we're not testing serializing user json
 
-    def test_foreign_key_from_activity_dict_existing(self, _):
+    def test_foreign_key_from_activity_dict_existing(self, *_):
         """test receiving a dict of an existing object in the db"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
@@ -327,7 +327,7 @@ class ModelFields(TestCase):
             value = instance.field_from_activity(activitypub.Person(**userdata))
         self.assertEqual(value, user)
 
-    def test_foreign_key_from_activity_str_existing(self, _):
+    def test_foreign_key_from_activity_str_existing(self, *_):
         """test receiving a remote id of an existing object in the db"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         user = User.objects.create_user(
@@ -340,14 +340,14 @@ class ModelFields(TestCase):
         value = instance.field_from_activity(user.remote_id)
         self.assertEqual(value, user)
 
-    def test_one_to_one_field(self, _):
+    def test_one_to_one_field(self, *_):
         """a gussied up foreign key"""
         instance = fields.OneToOneField("User", on_delete=models.CASCADE)
         Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
         item = Serializable(lambda: {"a": "b"}, "https://e.b/c")
         self.assertEqual(instance.field_to_activity(item), {"a": "b"})
 
-    def test_many_to_many_field(self, _):
+    def test_many_to_many_field(self, *_):
         """lists!"""
         instance = fields.ManyToManyField("User")
 
@@ -365,7 +365,7 @@ class ModelFields(TestCase):
         self.assertEqual(instance.field_to_activity(items), "example.com/snake_case")
 
     @responses.activate
-    def test_many_to_many_field_from_activity(self, _):
+    def test_many_to_many_field_from_activity(self, *_):
         """resolve related fields for a list, takes a list of remote ids"""
         instance = fields.ManyToManyField(User)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
@@ -385,7 +385,7 @@ class ModelFields(TestCase):
         self.assertEqual(len(value), 1)
         self.assertIsInstance(value[0], User)
 
-    def test_tag_field(self, _):
+    def test_tag_field(self, *_):
         """a special type of many to many field"""
         instance = fields.TagField("User")
 
@@ -404,7 +404,7 @@ class ModelFields(TestCase):
         self.assertEqual(result[0].name, "Name")
         self.assertEqual(result[0].type, "Serializable")
 
-    def test_tag_field_from_activity(self, _):
+    def test_tag_field_from_activity(self, *_):
         """loadin' a list of items from Links"""
         # TODO
 
@@ -449,7 +449,7 @@ class ModelFields(TestCase):
         self.assertIsInstance(loaded_image, list)
         self.assertIsInstance(loaded_image[1], ContentFile)
 
-    def test_image_serialize(self, _):
+    def test_image_serialize(self, *_):
         """make sure we're creating sensible image paths"""
         ValueMock = namedtuple("ValueMock", ("url"))
         value_mock = ValueMock("/images/fish.jpg")
@@ -458,7 +458,7 @@ class ModelFields(TestCase):
         self.assertEqual(result.url, "https://your.domain.here/images/fish.jpg")
         self.assertEqual(result.name, "hello")
 
-    def test_datetime_field(self, _):
+    def test_datetime_field(self, *_):
         """this one is pretty simple, it just has to use isoformat"""
         instance = fields.DateTimeField()
         now = timezone.now()
@@ -466,12 +466,12 @@ class ModelFields(TestCase):
         self.assertEqual(instance.field_from_activity(now.isoformat()), now)
         self.assertEqual(instance.field_from_activity("bip"), None)
 
-    def test_array_field(self, _):
+    def test_array_field(self, *_):
         """idk why it makes them strings but probably for a good reason"""
         instance = fields.ArrayField(fields.IntegerField)
         self.assertEqual(instance.field_to_activity([0, 1]), ["0", "1"])
 
-    def test_html_field(self, _):
+    def test_html_field(self, *_):
         """sanitizes html, the sanitizer has its own tests"""
         instance = fields.HtmlField()
         self.assertEqual(
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index 3179b138..54d81162 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -23,7 +23,7 @@ class Shelf(TestCase):
         work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(title="test book", parent_work=work)
 
-    def test_remote_id(self, _):
+    def test_remote_id(self, *_):
         """shelves use custom remote ids"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
@@ -32,7 +32,7 @@ class Shelf(TestCase):
         expected_id = "https://%s/user/mouse/books/test-shelf" % settings.DOMAIN
         self.assertEqual(shelf.get_remote_id(), expected_id)
 
-    def test_to_activity(self, _):
+    def test_to_activity(self, *_):
         """jsonify it"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
@@ -46,7 +46,7 @@ class Shelf(TestCase):
         self.assertEqual(activity_json["name"], "Test Shelf")
         self.assertEqual(activity_json["owner"], self.local_user.remote_id)
 
-    def test_create_update_shelf(self, _):
+    def test_create_update_shelf(self, *_):
         """create and broadcast shelf creation"""
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
@@ -67,7 +67,7 @@ class Shelf(TestCase):
         self.assertEqual(activity["object"]["name"], "arthur russel")
         self.assertEqual(shelf.name, "arthur russel")
 
-    def test_shelve(self, _):
+    def test_shelve(self, *_):
         """create and broadcast shelf creation"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index f0fd5392..95a4d9a0 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -38,7 +38,7 @@ class AuthenticationViews(TestCase):
             id=1, require_confirm_email=False
         )
 
-    def test_login_get(self, _):
+    def test_login_get(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         login = views.Login.as_view()
         request = self.factory.get("")
@@ -54,7 +54,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
 
-    def test_login_post_localname(self, _):
+    def test_login_post_localname(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Login.as_view()
         form = forms.LoginForm()
@@ -68,7 +68,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
 
-    def test_login_post_username(self, _):
+    def test_login_post_username(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Login.as_view()
         form = forms.LoginForm()
@@ -82,7 +82,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
 
-    def test_login_post_email(self, _):
+    def test_login_post_email(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Login.as_view()
         form = forms.LoginForm()
@@ -96,7 +96,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
 
-    def test_login_post_invalid_credentials(self, _):
+    def test_login_post_invalid_credentials(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Login.as_view()
         form = forms.LoginForm()
@@ -114,7 +114,7 @@ class AuthenticationViews(TestCase):
             "Username or password are incorrect",
         )
 
-    def test_register(self, _):
+    def test_register(self, *_):
         """create a user"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
@@ -162,7 +162,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(nutria.deactivation_reason, "pending")
         self.assertIsNotNone(nutria.confirmation_code)
 
-    def test_register_trailing_space(self, _):
+    def test_register_trailing_space(self, *_):
         """django handles this so weirdly"""
         view = views.Register.as_view()
         request = self.factory.post(
@@ -178,7 +178,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(nutria.localname, "nutria")
         self.assertEqual(nutria.local, True)
 
-    def test_register_invalid_email(self, _):
+    def test_register_invalid_email(self, *_):
         """gotta have an email"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
@@ -189,7 +189,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(models.User.objects.count(), 1)
         response.render()
 
-    def test_register_invalid_username(self, _):
+    def test_register_invalid_username(self, *_):
         """gotta have an email"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
@@ -217,7 +217,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(models.User.objects.count(), 1)
         response.render()
 
-    def test_register_closed_instance(self, _):
+    def test_register_closed_instance(self, *_):
         """you can't just register"""
         view = views.Register.as_view()
         self.settings.allow_registration = False
@@ -229,7 +229,7 @@ class AuthenticationViews(TestCase):
         with self.assertRaises(PermissionDenied):
             view(request)
 
-    def test_register_invite(self, _):
+    def test_register_invite(self, *_):
         """you can't just register"""
         view = views.Register.as_view()
         self.settings.allow_registration = False
@@ -282,7 +282,7 @@ class AuthenticationViews(TestCase):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
 
-    def test_confirm_email_code_get(self, _):
+    def test_confirm_email_code_get(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         self.settings.require_confirm_email = True
         self.settings.save()
@@ -311,7 +311,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
 
-    def test_confirm_email_code_get_invalid_code(self, _):
+    def test_confirm_email_code_get_invalid_code(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         self.settings.require_confirm_email = True
         self.settings.save()
@@ -334,7 +334,7 @@ class AuthenticationViews(TestCase):
         self.assertFalse(self.local_user.is_active)
         self.assertEqual(self.local_user.deactivation_reason, "pending")
 
-    def test_confirm_email_get(self, _):
+    def test_confirm_email_get(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         self.settings.require_confirm_email = True
         self.settings.save()
diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index 98962bc4..d4baa72f 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -7,6 +7,7 @@ from django.test.client import RequestFactory
 from bookwyrm import forms, models, views
 
 
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class GetStartedViews(TestCase):
     """helping new users get oriented"""
 
@@ -46,7 +47,6 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.rerank_user_task.delay")
     def test_profile_view_post(self, *_):
         """save basic user details"""
@@ -91,7 +91,6 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-@patch("bookwyrm.activitystreams.populate_stream_task.delay")
     def test_books_view_post(self, _):
         """shelve some books"""
         view = views.GetStartedBooks.as_view()
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index a3c812b4..ef460282 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -378,7 +378,7 @@ class StatusViews(TestCase):
         status.refresh_from_db()
         self.assertFalse(status.deleted)
 
-    def test_handle_delete_status_moderator(self, mock, _):
+    def test_handle_delete_status_moderator(self, mock, *_):
         """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
         with patch("bookwyrm.activitystreams.add_status_task.delay"):
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index d14c6243..7209c8ed 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -103,8 +103,8 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-@patch("bookwyrm.activitystreams.populate_stream_task.delay")
-    def test_followers_page_blocked(self, _):
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    def test_followers_page_blocked(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Followers.as_view()
         request = self.factory.get("")

From 38dc640dd50a0c2c5efdcb0e68b1110704c2741f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 15:10:52 -0700
Subject: [PATCH 263/272] Mock for goodreads import test`

---
 bookwyrm/tests/importers/test_goodreads_import.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index 47fd6a33..dd33a140 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -23,6 +23,7 @@ def make_date(*args):
 # pylint: disable=consider-using-with
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay.delay")
 class GoodreadsImport(TestCase):
     """importing from goodreads csv"""
 

From 4db255758184bf7f7af3658375d88c366e9063ae Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 15:39:32 -0700
Subject: [PATCH 264/272] Fixes handling boosts

---
 bookwyrm/activitystreams.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index cb59f1a7..51bb7493 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -272,16 +272,8 @@ def add_status_on_create_command(sender, instance, created):
     """runs this code only after the database commit completes"""
     add_status_task.delay(instance.id, increment_unread_unread=created)
 
-    if sender != models.Boost:
-        return
-    # remove the original post and other, earlier boosts
-    boosted = instance.boost.boosted_status
-    old_versions = models.Boost.objects.filter(
-        boosted_status__id=boosted.id,
-        created_date__lt=instance.created_date,
-    ).values_list("id", flat=True)
-    remove_status_task.delay(boosted.id)
-    remove_status_task.delay(old_versions)
+    if sender == models.Boost:
+        handle_boost_task.delay(instance.id)
 
 
 @receiver(signals.post_delete, sender=models.Boost)
@@ -466,3 +458,21 @@ def add_user_statuses_task(viewer_id, user_id, stream_list=None):
     user = models.User.objects.get(id=user_id)
     for stream in stream_list:
         stream.add_user_statuses(viewer, user)
+
+
+@app.task
+def handle_boost_task(boost_id):
+    """remove the original post and other, earlier boosts"""
+    instance = models.Status.objects.get(id=boost_id)
+    boosted = instance.boost.boosted_status.id
+
+    old_versions = models.Boost.objects.filter(
+        boosted_status__id=boosted.id,
+        created_date__lt=instance.created_date,
+    ).values_list("id", flat=True)
+
+    for stream in streams.values():
+        audience = stream.get_stores_for_object(instance)
+        stream.remove_object_from_related_stores(boosted, stores=audience)
+        for status in old_versions:
+            stream.remove_object_from_related_stores(status, stores=audience)

From e35c8059606197fdf53f4b7f4ea228ccf5dad971 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 15:48:02 -0700
Subject: [PATCH 265/272] Fixes typo in function call

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

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 51bb7493..4389fab4 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -270,7 +270,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"""
-    add_status_task.delay(instance.id, increment_unread_unread=created)
+    add_status_task.delay(instance.id, increment_unread=created)
 
     if sender == models.Boost:
         handle_boost_task.delay(instance.id)

From 4ea9637a2ddab89f102239d7adf15116929ade8e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 16:16:45 -0700
Subject: [PATCH 266/272] Updates activitystreams tests

---
 bookwyrm/activitystreams.py             |  2 +-
 bookwyrm/tests/test_activitystreams.py  | 21 ++++++++-------------
 bookwyrm/tests/views/test_directory.py  |  2 +-
 bookwyrm/tests/views/test_editions.py   |  2 +-
 bookwyrm/tests/views/test_reports.py    |  2 +-
 bookwyrm/tests/views/test_user_admin.py |  2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 4389fab4..6dedd717 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -464,7 +464,7 @@ def add_user_statuses_task(viewer_id, user_id, stream_list=None):
 def handle_boost_task(boost_id):
     """remove the original post and other, earlier boosts"""
     instance = models.Status.objects.get(id=boost_id)
-    boosted = instance.boost.boosted_status.id
+    boosted = instance.boost.boosted_status
 
     old_versions = models.Boost.objects.filter(
         boosted_status__id=boosted.id,
diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index aecc448c..add5875f 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -6,7 +6,7 @@ from bookwyrm import activitystreams, models
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.activitystreams.add_status_task.delay")
-@patch("bookwyrm.activitystreams.BooksStream.add_book_statuses")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
 # pylint: disable=too-many-public-methods
@@ -296,9 +296,7 @@ class Activitystreams(TestCase):
     def test_boost_to_another_timeline(self, *_):
         """add a boost and deduplicate the boosted status on the timeline"""
         status = models.Status.objects.create(user=self.local_user, content="hi")
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ):
+        with patch("bookwyrm.activitystreams.handle_boost_task.delay"):
             boost = models.Boost.objects.create(
                 boosted_status=status,
                 user=self.another_user,
@@ -306,7 +304,8 @@ class Activitystreams(TestCase):
         with patch(
             "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
         ) as mock:
-            activitystreams.add_status_on_create(models.Boost, boost, True)
+            activitystreams.handle_boost_task(boost.id)
+
         self.assertTrue(mock.called)
         call_args = mock.call_args
         self.assertEqual(call_args[0][0], status)
@@ -320,9 +319,7 @@ class Activitystreams(TestCase):
         """add a boost and deduplicate the boosted status on the timeline"""
         self.local_user.following.add(self.another_user)
         status = models.Status.objects.create(user=self.local_user, content="hi")
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ):
+        with patch("bookwyrm.activitystreams.handle_boost_task.delay"):
             boost = models.Boost.objects.create(
                 boosted_status=status,
                 user=self.another_user,
@@ -330,7 +327,7 @@ class Activitystreams(TestCase):
         with patch(
             "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
         ) as mock:
-            activitystreams.add_status_on_create(models.Boost, boost, True)
+            activitystreams.handle_boost_task(boost.id)
         self.assertTrue(mock.called)
         call_args = mock.call_args
         self.assertEqual(call_args[0][0], status)
@@ -346,9 +343,7 @@ class Activitystreams(TestCase):
     def test_boost_to_same_timeline(self, *_):
         """add a boost and deduplicate the boosted status on the timeline"""
         status = models.Status.objects.create(user=self.local_user, content="hi")
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ):
+        with patch("bookwyrm.activitystreams.handle_boost_task.delay"):
             boost = models.Boost.objects.create(
                 boosted_status=status,
                 user=self.local_user,
@@ -356,7 +351,7 @@ class Activitystreams(TestCase):
         with patch(
             "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
         ) as mock:
-            activitystreams.add_status_on_create(models.Boost, boost, True)
+            activitystreams.handle_boost_task(boost.id)
         self.assertTrue(mock.called)
         call_args = mock.call_args
         self.assertEqual(call_args[0][0], status)
diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py
index 52f9c085..90638b0a 100644
--- a/bookwyrm/tests/views/test_directory.py
+++ b/bookwyrm/tests/views/test_directory.py
@@ -32,7 +32,7 @@ class DirectoryViews(TestCase):
         self.anonymous_user.is_authenticated = False
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.rerank_user_task.delay")
     def test_directory_page(self, *_):
         """there are so many views, this just makes sure it LOADS"""
diff --git a/bookwyrm/tests/views/test_editions.py b/bookwyrm/tests/views/test_editions.py
index 1cd256b1..d1eb34c4 100644
--- a/bookwyrm/tests/views/test_editions.py
+++ b/bookwyrm/tests/views/test_editions.py
@@ -103,7 +103,7 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
     def test_switch_edition(self, _):
         """updates user's relationships to a book"""
         work = models.Work.objects.create(title="test work")
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 2f9ee27b..1b0b6008 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -119,7 +119,7 @@ class ReportViews(TestCase):
         self.assertFalse(report.resolved)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.remove_user_task.delay")
     def test_suspend_user(self, *_):
         """toggle whether a user is able to log in"""
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index eab8ab68..3917a6fd 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -51,7 +51,7 @@ class UserAdminViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.remove_user_task.delay")
     def test_user_admin_page_post(self, *_):
         """set the user's group"""

From db34918347ea62e18219e7dcb5ce521e474e6f47 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 16:33:21 -0700
Subject: [PATCH 267/272] Updates user view test

---
 bookwyrm/tests/views/test_user.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 7209c8ed..614f772d 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -33,15 +33,14 @@ class UserViews(TestCase):
         self.book = models.Edition.objects.create(
             title="test", parent_work=models.Work.objects.create(title="test work")
         )
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
-                "bookwyrm.activitystreams.populate_stream_task.delay"
-            ):
-                models.ShelfBook.objects.create(
-                    book=self.book,
-                    user=self.local_user,
-                    shelf=self.local_user.shelf_set.first(),
-                )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"), patch(
+            "bookwyrm.suggested_users.rerank_suggestions_task.delay"
+        ), patch("bookwyrm.activitystreams.add_book_statuses_task.delay"):
+            models.ShelfBook.objects.create(
+                book=self.book,
+                user=self.local_user,
+                shelf=self.local_user.shelf_set.first(),
+            )
 
         models.SiteSettings.objects.create()
         self.anonymous_user = AnonymousUser

From 59400511c94dee5abe5f821e4cff8b409d68fdd3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 16:59:58 -0700
Subject: [PATCH 268/272] mocks mocks more mocks

---
 .../tests/importers/test_goodreads_import.py  |  2 +-
 .../importers/test_librarything_import.py     |  1 +
 .../tests/models/test_relationship_models.py  | 11 +++--
 bookwyrm/tests/models/test_shelf_model.py     |  1 +
 bookwyrm/tests/models/test_status_model.py    | 17 +++----
 bookwyrm/tests/test_suggested_users.py        |  1 +
 bookwyrm/tests/test_templatetags.py           | 17 +++----
 .../tests/views/inbox/test_inbox_create.py    | 47 +++++++------------
 bookwyrm/tests/views/test_block.py            |  4 +-
 bookwyrm/tests/views/test_edit_user.py        |  4 +-
 bookwyrm/tests/views/test_feed.py             | 13 ++---
 bookwyrm/tests/views/test_follow.py           | 14 +++---
 bookwyrm/tests/views/test_get_started.py      | 13 ++---
 bookwyrm/tests/views/test_interaction.py      | 15 ++----
 bookwyrm/tests/views/test_status.py           |  1 +
 15 files changed, 75 insertions(+), 86 deletions(-)

diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index dd33a140..387d9f4f 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -23,7 +23,7 @@ def make_date(*args):
 # pylint: disable=consider-using-with
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
-@patch("bookwyrm.activitystreams.add_book_statuses_task.delay.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class GoodreadsImport(TestCase):
     """importing from goodreads csv"""
 
diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
index c7ddbed6..dfdd515e 100644
--- a/bookwyrm/tests/importers/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -22,6 +22,7 @@ def make_date(*args):
 # pylint: disable=consider-using-with
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class LibrarythingImport(TestCase):
     """importing from librarything tsv"""
 
diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py
index 7383a489..04dbe1a3 100644
--- a/bookwyrm/tests/models/test_relationship_models.py
+++ b/bookwyrm/tests/models/test_relationship_models.py
@@ -6,6 +6,7 @@ from django.test import TestCase
 from bookwyrm import models
 
 
+@patch("bookwyrm.activitystreams.add_user_statuses_task.delay")
 class Relationship(TestCase):
     """following, blocking, stuff like that"""
 
@@ -30,7 +31,7 @@ class Relationship(TestCase):
         self.local_user.remote_id = "http://local.com/user/mouse"
         self.local_user.save(broadcast=False, update_fields=["remote_id"])
 
-    def test_user_follows_from_request(self):
+    def test_user_follows_from_request(self, _):
         """convert a follow request into a follow"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             request = models.UserFollowRequest.objects.create(
@@ -51,7 +52,7 @@ class Relationship(TestCase):
         self.assertEqual(rel.user_subject, self.local_user)
         self.assertEqual(rel.user_object, self.remote_user)
 
-    def test_user_follows_from_request_custom_remote_id(self):
+    def test_user_follows_from_request_custom_remote_id(self, _):
         """store a specific remote id for a relationship provided by remote"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             request = models.UserFollowRequest.objects.create(
@@ -69,7 +70,7 @@ class Relationship(TestCase):
         self.assertEqual(rel.user_object, self.remote_user)
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    def test_follow_request_activity(self, broadcast_mock):
+    def test_follow_request_activity(self, broadcast_mock, _):
         """accept a request and make it a relationship"""
         models.UserFollowRequest.objects.create(
             user_subject=self.local_user,
@@ -81,7 +82,7 @@ class Relationship(TestCase):
         self.assertEqual(activity["type"], "Follow")
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    def test_follow_request_accept(self, broadcast_mock):
+    def test_follow_request_accept(self, broadcast_mock, _):
         """accept a request and make it a relationship"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(
@@ -107,7 +108,7 @@ class Relationship(TestCase):
         self.assertEqual(rel.user_object, self.local_user)
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    def test_follow_request_reject(self, broadcast_mock):
+    def test_follow_request_reject(self, broadcast_mock, _):
         """accept a request and make it a relationship"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index 54d81162..26bf8d8a 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -9,6 +9,7 @@ from bookwyrm import models, settings
 # pylint: disable=unused-argument
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class Shelf(TestCase):
     """some activitypub oddness ahead"""
 
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 9913911c..6bdfa336 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -16,7 +16,7 @@ from bookwyrm import activitypub, models, settings
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.Status.broadcast")
 @patch("bookwyrm.activitystreams.add_status_task.delay")
-@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
+@patch("bookwyrm.activitystreams.remove_status_task.delay")
 class Status(TestCase):
     """lotta types of statuses"""
 
@@ -120,15 +120,12 @@ class Status(TestCase):
 
     def test_status_to_activity_tombstone(self, *_):
         """subclass of the base model version with a "pure" serializer"""
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ):
-            status = models.Status.objects.create(
-                content="test content",
-                user=self.local_user,
-                deleted=True,
-                deleted_date=timezone.now(),
-            )
+        status = models.Status.objects.create(
+            content="test content",
+            user=self.local_user,
+            deleted=True,
+            deleted_date=timezone.now(),
+        )
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Tombstone")
diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py
index 39758252..6b794b5d 100644
--- a/bookwyrm/tests/test_suggested_users.py
+++ b/bookwyrm/tests/test_suggested_users.py
@@ -13,6 +13,7 @@ from bookwyrm.suggested_users import suggested_users, get_annotated_users
 @patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 class SuggestedUsers(TestCase):
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 312d107b..e13b50dc 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -16,7 +16,7 @@ from bookwyrm.templatetags import (
 
 
 @patch("bookwyrm.activitystreams.add_status_task.delay")
-@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
+@patch("bookwyrm.activitystreams.remove_status_task.delay")
 class TemplateTags(TestCase):
     """lotta different things here"""
 
@@ -75,15 +75,12 @@ class TemplateTags(TestCase):
         second_child = models.Status.objects.create(
             reply_parent=parent, user=self.user, content="hi"
         )
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ):
-            third_child = models.Status.objects.create(
-                reply_parent=parent,
-                user=self.user,
-                deleted=True,
-                deleted_date=timezone.now(),
-            )
+        third_child = models.Status.objects.create(
+            reply_parent=parent,
+            user=self.user,
+            deleted=True,
+            deleted_date=timezone.now(),
+        )
 
         replies = status_display.get_replies(parent)
         self.assertEqual(len(replies), 2)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index 76afb538..3e1a22ae 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -11,6 +11,7 @@ from bookwyrm.activitypub import ActivitySerializerError
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class InboxCreate(TestCase):
     """readthrough tests"""
 
@@ -49,7 +50,6 @@ class InboxCreate(TestCase):
         }
         models.SiteSettings.objects.create()
 
-    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_create_status(self, *_):
         """the "it justs works" mode"""
         datafile = pathlib.Path(__file__).parent.joinpath(
@@ -63,9 +63,7 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
 
         status = models.Quotation.objects.get()
         self.assertEqual(
@@ -79,7 +77,6 @@ class InboxCreate(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Status.objects.count(), 1)
 
-    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_create_comment_with_reading_status(self, *_):
         """the "it justs works" mode"""
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_comment.json")
@@ -92,9 +89,7 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
 
         status = models.Comment.objects.get()
         self.assertEqual(status.remote_id, "https://example.com/user/mouse/comment/6")
@@ -106,7 +101,7 @@ class InboxCreate(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Status.objects.count(), 1)
 
-    def test_create_status_remote_note_with_mention(self, _):
+    def test_create_status_remote_note_with_mention(self, *_):
         """should only create it under the right circumstances"""
         self.assertFalse(
             models.Notification.objects.filter(user=self.local_user).exists()
@@ -117,9 +112,8 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
+
         status = models.Status.objects.last()
         self.assertEqual(status.content, "test content in note")
         self.assertEqual(status.mention_users.first(), self.local_user)
@@ -128,14 +122,13 @@ class InboxCreate(TestCase):
         )
         self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
 
-    def test_create_status_remote_note_with_reply(self, _):
+    def test_create_status_remote_note_with_reply(self, *_):
         """should only create it under the right circumstances"""
-        with patch("bookwyrm.activitystreams.add_status_task.delay"):
-            parent_status = models.Status.objects.create(
-                user=self.local_user,
-                content="Test status",
-                remote_id="https://example.com/status/1",
-            )
+        parent_status = models.Status.objects.create(
+            user=self.local_user,
+            content="Test status",
+            remote_id="https://example.com/status/1",
+        )
 
         self.assertEqual(models.Status.objects.count(), 1)
         self.assertFalse(models.Notification.objects.filter(user=self.local_user))
@@ -147,16 +140,14 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
         status = models.Status.objects.last()
         self.assertEqual(status.content, "test content in note")
         self.assertEqual(status.reply_parent, parent_status)
         self.assertTrue(models.Notification.objects.filter(user=self.local_user))
         self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
 
-    def test_create_rating(self, _):
+    def test_create_rating(self, *_):
         """a remote rating activity"""
         book = models.Edition.objects.create(
             title="Test Book", remote_id="https://example.com/book/1"
@@ -186,14 +177,12 @@ class InboxCreate(TestCase):
             "rating": 3,
             "@context": "https://www.w3.org/ns/activitystreams",
         }
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
         rating = models.ReviewRating.objects.first()
         self.assertEqual(rating.book, book)
         self.assertEqual(rating.rating, 3.0)
 
-    def test_create_list(self, _):
+    def test_create_list(self, *_):
         """a new list"""
         activity = self.create_json
         activity["object"] = {
@@ -217,7 +206,7 @@ class InboxCreate(TestCase):
         self.assertEqual(book_list.description, "summary text")
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
-    def test_create_unsupported_type(self, _):
+    def test_create_unsupported_type(self, *_):
         """ignore activities we know we can't handle"""
         activity = self.create_json
         activity["object"] = {
@@ -227,7 +216,7 @@ class InboxCreate(TestCase):
         # just observer how it doesn't throw an error
         views.inbox.activity_task(activity)
 
-    def test_create_unknown_type(self, _):
+    def test_create_unknown_type(self, *_):
         """ignore activities we know we've never heard of"""
         activity = self.create_json
         activity["object"] = {
diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py
index 28f52639..f1ec42f0 100644
--- a/bookwyrm/tests/views/test_block.py
+++ b/bookwyrm/tests/views/test_block.py
@@ -59,7 +59,7 @@ class BlockViews(TestCase):
 
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.remove_user_statuses"):
+        with patch("bookwyrm.activitystreams.remove_user_statuses_task.delay"):
             view(request, self.remote_user.id)
         block = models.UserBlocks.objects.get()
         self.assertEqual(block.user_subject, self.local_user)
@@ -74,7 +74,7 @@ class BlockViews(TestCase):
         request = self.factory.post("")
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_user_statuses"):
+        with patch("bookwyrm.activitystreams.add_user_statuses_task.delay"):
             views.block.unblock(request, self.remote_user.id)
 
         self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
index 70e5eafd..07e54e4e 100644
--- a/bookwyrm/tests/views/test_edit_user.py
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -39,7 +39,9 @@ class EditUserViews(TestCase):
             self.book = models.Edition.objects.create(
                 title="test", parent_work=models.Work.objects.create(title="test work")
             )
-            with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"), patch(
+                "bookwyrm.activitystreams.add_book_statuses_task.delay"
+            ):
                 models.ShelfBook.objects.create(
                     book=self.book,
                     user=self.local_user,
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index 843a9fd7..526cb0f9 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -172,14 +172,15 @@ class FeedViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+    @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
     def test_get_suggested_book(self, *_):
         """gets books the ~*~ algorithm ~*~ thinks you want to post about"""
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.ShelfBook.objects.create(
-                book=self.book,
-                user=self.local_user,
-                shelf=self.local_user.shelf_set.get(identifier="reading"),
-            )
+        models.ShelfBook.objects.create(
+            book=self.book,
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.get(identifier="reading"),
+        )
         suggestions = views.feed.get_suggested_books(self.local_user)
         self.assertEqual(suggestions[0]["name"], "Currently Reading")
         self.assertEqual(suggestions[0]["books"][0], self.book)
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index a1dda42a..947c55cf 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -10,6 +10,7 @@ from django.test.client import RequestFactory
 from bookwyrm import models, views
 
 
+@patch("bookwyrm.activitystreams.add_user_statuses_task.delay")
 class FollowViews(TestCase):
     """follows"""
 
@@ -52,7 +53,7 @@ class FollowViews(TestCase):
             parent_work=self.work,
         )
 
-    def test_handle_follow_remote(self):
+    def test_handle_follow_remote(self, _):
         """send a follow request"""
         request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
@@ -67,7 +68,7 @@ class FollowViews(TestCase):
         self.assertEqual(rel.user_object, self.remote_user)
         self.assertEqual(rel.status, "follow_request")
 
-    def test_handle_follow_local_manually_approves(self):
+    def test_handle_follow_local_manually_approves(self, _):
         """send a follow request"""
         with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
             "bookwyrm.activitystreams.populate_stream_task.delay"
@@ -93,7 +94,7 @@ class FollowViews(TestCase):
         self.assertEqual(rel.user_object, rat)
         self.assertEqual(rel.status, "follow_request")
 
-    def test_handle_follow_local(self):
+    def test_handle_follow_local(self, _):
         """send a follow request"""
         with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
             "bookwyrm.activitystreams.populate_stream_task.delay"
@@ -119,7 +120,8 @@ class FollowViews(TestCase):
         self.assertEqual(rel.user_object, rat)
         self.assertEqual(rel.status, "follows")
 
-    def test_handle_unfollow(self):
+    @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
+    def test_handle_unfollow(self, *_):
         """send an unfollow"""
         request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
@@ -133,7 +135,7 @@ class FollowViews(TestCase):
 
         self.assertEqual(self.remote_user.followers.count(), 0)
 
-    def test_handle_accept(self):
+    def test_handle_accept(self, _):
         """accept a follow request"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(
@@ -152,7 +154,7 @@ class FollowViews(TestCase):
         # follow relationship should exist
         self.assertEqual(self.local_user.followers.first(), self.remote_user)
 
-    def test_handle_reject(self):
+    def test_handle_reject(self, _):
         """reject a follow request"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(
diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index d4baa72f..135896dc 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -34,7 +34,7 @@ class GetStartedViews(TestCase):
         )
         models.SiteSettings.objects.create()
 
-    def test_profile_view(self):
+    def test_profile_view(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedProfile.as_view()
         request = self.factory.get("")
@@ -66,7 +66,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(self.local_user.name, "New Name")
         self.assertTrue(self.local_user.discoverable)
 
-    def test_books_view(self):
+    def test_books_view(self, _):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedBooks.as_view()
         request = self.factory.get("")
@@ -78,7 +78,7 @@ class GetStartedViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-    def test_books_view_with_query(self):
+    def test_books_view_with_query(self, _):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedBooks.as_view()
         request = self.factory.get("?query=Example")
@@ -91,7 +91,8 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-    def test_books_view_post(self, _):
+    @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+    def test_books_view_post(self, *_):
         """shelve some books"""
         view = views.GetStartedBooks.as_view()
         data = {self.book.id: self.local_user.shelf_set.first().id}
@@ -110,7 +111,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(shelfbook.user, self.local_user)
 
     @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions")
-    def test_users_view(self, _):
+    def test_users_view(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedUsers.as_view()
         request = self.factory.get("")
@@ -123,7 +124,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions")
-    def test_users_view_with_query(self, _):
+    def test_users_view_with_query(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedUsers.as_view()
         request = self.factory.get("?query=rat")
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index aa3ea511..e8b9353e 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -8,7 +8,7 @@ from bookwyrm import models, views
 
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-@patch("bookwyrm.activitystreams.remove_object_from_related_stores")
+@patch("bookwyrm.activitystreams.remove_status_task.delay")
 class InteractionViews(TestCase):
     """viewing and creating statuses"""
 
@@ -173,17 +173,12 @@ class InteractionViews(TestCase):
         request.user = self.remote_user
         status = models.Status.objects.create(user=self.local_user, content="hi")
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ):
-            views.Boost.as_view()(request, status.id)
+        views.Boost.as_view()(request, status.id)
 
         self.assertEqual(models.Boost.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
-            view(request, status.id)
-            self.assertTrue(redis_mock.called)
+
+        view(request, status.id)
+
         self.assertEqual(models.Boost.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index ef460282..c197a0bc 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -11,6 +11,7 @@ from bookwyrm.settings import DOMAIN
 # pylint: disable=invalid-name
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.remove_status_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class StatusViews(TestCase):
     """viewing and creating statuses"""

From 2653458e569953d6642651b4fa25d27944989810 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 18:39:14 -0700
Subject: [PATCH 269/272] another round of mocks

---
 bookwyrm/tests/models/test_shelf_model.py     |  1 +
 .../tests/views/inbox/test_inbox_announce.py  | 17 +++---
 .../tests/views/inbox/test_inbox_block.py     |  4 +-
 .../tests/views/inbox/test_inbox_delete.py    | 10 ++--
 .../tests/views/inbox/test_inbox_follow.py    |  3 +-
 .../tests/views/inbox/test_inbox_update.py    |  3 +-
 bookwyrm/tests/views/test_editions.py         |  2 +-
 bookwyrm/tests/views/test_reading.py          |  1 +
 bookwyrm/tests/views/test_readthrough.py      |  2 +
 bookwyrm/tests/views/test_shelf.py            |  2 +
 bookwyrm/tests/views/test_status.py           | 54 ++++++-------------
 11 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index 26bf8d8a..fe179e88 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -10,6 +10,7 @@ from bookwyrm import models, settings
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
 class Shelf(TestCase):
     """some activitypub oddness ahead"""
 
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index fcf3e410..3a108878 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -55,9 +55,8 @@ class InboxActivities(TestCase):
 
         models.SiteSettings.objects.create()
 
-    @patch("bookwyrm.activitystreams.add_status_task.delay")
-    @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
-    def test_boost(self, redis_mock, _):
+    @patch("bookwyrm.activitystreams.handle_boost_task.delay")
+    def test_boost(self, _):
         """boost a status"""
         self.assertEqual(models.Notification.objects.count(), 0)
         activity = {
@@ -73,9 +72,6 @@ class InboxActivities(TestCase):
             discarder.return_value = False
             views.inbox.activity_task(activity)
 
-        # boost added to redis activitystreams
-        self.assertTrue(redis_mock.called)
-
         # boost created of correct status
         boost = models.Boost.objects.get()
         self.assertEqual(boost.boosted_status, self.status)
@@ -86,9 +82,8 @@ class InboxActivities(TestCase):
         self.assertEqual(notification.related_status, self.status)
 
     @responses.activate
-    @patch("bookwyrm.activitystreams.add_status_task.delay")
-    @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
-    def test_boost_remote_status(self, redis_mock, _):
+    @patch("bookwyrm.activitystreams.handle_boost_task.delay")
+    def test_boost_remote_status(self, _):
         """boost a status from a remote server"""
         work = models.Work.objects.create(title="work title")
         book = models.Edition.objects.create(
@@ -129,7 +124,6 @@ class InboxActivities(TestCase):
         with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
             discarder.return_value = False
             views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
 
         boost = models.Boost.objects.get()
         self.assertEqual(boost.boosted_status.remote_id, "https://remote.com/status/1")
@@ -161,7 +155,8 @@ class InboxActivities(TestCase):
         self.assertEqual(models.Boost.objects.count(), 0)
 
     @patch("bookwyrm.activitystreams.add_status_task.delay")
-    @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
+    @patch("bookwyrm.activitystreams.handle_boost_task.delay")
+    @patch("bookwyrm.activitystreams.remove_status_task.delay")
     def test_unboost(self, *_):
         """undo a boost"""
         boost = models.Boost.objects.create(
diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
index dc29954d..154391ed 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_block.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -56,7 +56,7 @@ class InboxBlock(TestCase):
         }
 
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_user_statuses"
+            "bookwyrm.activitystreams.remove_user_statuses_task.delay"
         ) as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
@@ -94,7 +94,7 @@ class InboxBlock(TestCase):
             },
         }
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.add_user_statuses"
+            "bookwyrm.activitystreams.add_user_statuses_task.delay"
         ) as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 23a956b2..3bda8ace 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -1,4 +1,4 @@
-""" tests incoming activities"""
+"""tests incoming activities"""
 from datetime import datetime
 from unittest.mock import patch
 
@@ -63,9 +63,7 @@ class InboxActivities(TestCase):
             "actor": self.remote_user.remote_id,
             "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
         # deletion doens't remove the status, it turns it into a tombstone
@@ -94,9 +92,7 @@ class InboxActivities(TestCase):
             "actor": self.remote_user.remote_id,
             "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
         # deletion doens't remove the status, it turns it into a tombstone
diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py
index 62c84044..6b629c2f 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_follow.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py
@@ -183,7 +183,8 @@ class InboxRelationships(TestCase):
         views.inbox.activity_task(activity)
         self.assertIsNone(self.local_user.followers.first())
 
-    def test_follow_accept(self):
+    @patch("bookwyrm.activitystreams.add_user_statuses_task.delay")
+    def test_follow_accept(self, _):
         """a remote user approved a follow request from local"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollowRequest.objects.create(
diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
index fc3b3a2a..ec10f2f8 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_update.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -83,7 +83,8 @@ class InboxUpdate(TestCase):
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
     @patch("bookwyrm.suggested_users.rerank_user_task.delay")
-    def test_update_user(self, _):
+    @patch("bookwyrm.activitystreams.add_user_statuses_task.delay")
+    def test_update_user(self, *_):
         """update an existing user"""
         models.UserFollows.objects.create(
             user_subject=self.local_user,
diff --git a/bookwyrm/tests/views/test_editions.py b/bookwyrm/tests/views/test_editions.py
index d1eb34c4..4a4dc3cb 100644
--- a/bookwyrm/tests/views/test_editions.py
+++ b/bookwyrm/tests/views/test_editions.py
@@ -104,7 +104,7 @@ class BookViews(TestCase):
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
     @patch("bookwyrm.activitystreams.populate_stream_task.delay")
-    def test_switch_edition(self, _):
+    def test_switch_edition(self, *_):
         """updates user's relationships to a book"""
         work = models.Work.objects.create(title="test work")
         edition1 = models.Edition.objects.create(title="first ed", parent_work=work)
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index acd14775..df1e83c6 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -11,6 +11,7 @@ from bookwyrm import models, views
 @patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class ReadingViews(TestCase):
     """viewing and creating statuses"""
 
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index c246a263..b3656f4c 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -10,6 +10,8 @@ from bookwyrm import models
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
 class ReadThrough(TestCase):
     """readthrough tests"""
 
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index d7d33465..d873edc6 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -12,6 +12,8 @@ from bookwyrm.activitypub import ActivitypubResponse
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
 class ShelfViews(TestCase):
     """tag views"""
 
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index c197a0bc..aad040cb 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -63,9 +63,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            view(request, "comment")
-            self.assertTrue(redis_mock.called)
+        view(request, "comment")
 
         status = models.Comment.objects.get()
         self.assertEqual(status.content, "<p>hi</p>")
@@ -78,10 +76,9 @@ class StatusViews(TestCase):
         user = models.User.objects.create_user(
             "rat", "rat@rat.com", "password", local=True
         )
-        with patch("bookwyrm.activitystreams.add_status_task.delay"):
-            parent = models.Status.objects.create(
-                content="parent status", user=self.local_user
-            )
+        parent = models.Status.objects.create(
+            content="parent status", user=self.local_user
+        )
         form = forms.ReplyForm(
             {
                 "content": "hi",
@@ -93,9 +90,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = user
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            view(request, "reply")
-            self.assertTrue(redis_mock.called)
+        view(request, "reply")
 
         status = models.Status.objects.get(user=user)
         self.assertEqual(status.content, "<p>hi</p>")
@@ -123,9 +118,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            view(request, "comment")
-            self.assertTrue(redis_mock.called)
+        view(request, "comment")
 
         status = models.Status.objects.get()
         self.assertEqual(list(status.mention_users.all()), [user])
@@ -151,9 +144,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            view(request, "comment")
-            self.assertTrue(redis_mock.called)
+        view(request, "comment")
         status = models.Status.objects.get()
 
         form = forms.ReplyForm(
@@ -167,9 +158,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = user
 
-        with patch("bookwyrm.activitystreams.add_status_task.delay") as redis_mock:
-            view(request, "reply")
-            self.assertTrue(redis_mock.called)
+        view(request, "reply")
 
         reply = models.Status.replies(status).first()
         self.assertEqual(reply.content, "<p>right</p>")
@@ -183,14 +172,11 @@ class StatusViews(TestCase):
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.add_status_task.delay"):
-            status = models.Comment.objects.create(
-                content="hi", book=self.book, user=self.local_user
-            )
+        status = models.Comment.objects.create(
+            content="hi", book=self.book, user=self.local_user
+        )
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as mock:
             result = view(request, status.id)
             self.assertTrue(mock.called)
         result.render()
@@ -209,9 +195,7 @@ class StatusViews(TestCase):
                 book=self.book, rating=2.0, user=self.local_user
             )
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as mock:
             result = view(request, status.id)
             self.assertFalse(mock.called)
         self.assertEqual(result.status_code, 400)
@@ -229,9 +213,7 @@ class StatusViews(TestCase):
                 content="hi", user=self.local_user
             )
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as mock:
             result = view(request, status.id)
             self.assertFalse(mock.called)
         self.assertEqual(result.status_code, 400)
@@ -354,9 +336,7 @@ class StatusViews(TestCase):
         request = self.factory.post("")
         request.user = self.local_user
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock:
             view(request, status.id)
             self.assertTrue(redis_mock.called)
         activity = json.loads(mock.call_args_list[1][0][1])
@@ -389,9 +369,7 @@ class StatusViews(TestCase):
         request.user = self.remote_user
         request.user.is_superuser = True
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock:
             view(request, status.id)
             self.assertTrue(redis_mock.called)
         activity = json.loads(mock.call_args_list[1][0][1])

From c56a9021b6b4f26b11a2a19c01fba8126f05ea8f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 18:55:48 -0700
Subject: [PATCH 270/272] A few more failing tests

---
 bookwyrm/tests/views/inbox/test_inbox_block.py | 1 +
 bookwyrm/tests/views/test_editions.py          | 1 +
 bookwyrm/tests/views/test_reading.py           | 3 ++-
 bookwyrm/tests/views/test_readthrough.py       | 6 ++++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
index 154391ed..d8685a12 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_block.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -69,6 +69,7 @@ class InboxBlock(TestCase):
         self.assertFalse(models.UserFollows.objects.exists())
         self.assertFalse(models.UserFollowRequest.objects.exists())
 
+    @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
     def test_handle_unblock(self):
         """unblock a user"""
         self.remote_user.blocks.add(self.local_user)
diff --git a/bookwyrm/tests/views/test_editions.py b/bookwyrm/tests/views/test_editions.py
index 4a4dc3cb..a138f345 100644
--- a/bookwyrm/tests/views/test_editions.py
+++ b/bookwyrm/tests/views/test_editions.py
@@ -104,6 +104,7 @@ class BookViews(TestCase):
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
     @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
     def test_switch_edition(self, *_):
         """updates user's relationships to a book"""
         work = models.Work.objects.create(title="test work")
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index df1e83c6..1df7d147 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -77,7 +77,8 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.user, self.local_user)
         self.assertEqual(readthrough.book, self.book)
 
-    def test_start_reading_reshelf(self, *_):
+    @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+    def test_start_reading_reshelve(self, *_):
         """begin a book"""
         to_read_shelf = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ)
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index b3656f4c..07997ed2 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -35,7 +35,8 @@ class ReadThrough(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.client.force_login(self.user)
 
-    def test_create_basic_readthrough(self, delay_mock, _):
+    @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
+    def test_create_basic_readthrough(self, delay_mock, *_):
         """A basic readthrough doesn't create a progress update"""
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
@@ -56,7 +57,8 @@ class ReadThrough(TestCase):
         self.assertEqual(readthroughs[0].finish_date, None)
         self.assertEqual(delay_mock.call_count, 1)
 
-    def test_create_progress_readthrough(self, delay_mock, _):
+    @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
+    def test_create_progress_readthrough(self, delay_mock, *_):
         """a readthrough with progress"""
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 

From 9988a3e82bb9f9c5e562a86eb3bf63208dd72ea6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 18:58:45 -0700
Subject: [PATCH 271/272] More test fixes

---
 bookwyrm/tests/views/test_readthrough.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index 07997ed2..ef149ce3 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -36,7 +36,7 @@ class ReadThrough(TestCase):
             self.client.force_login(self.user)
 
     @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
-    def test_create_basic_readthrough(self, delay_mock, *_):
+    def test_create_basic_readthrough(self, *_):
         """A basic readthrough doesn't create a progress update"""
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
@@ -55,10 +55,9 @@ class ReadThrough(TestCase):
         )
         self.assertEqual(readthroughs[0].progress, None)
         self.assertEqual(readthroughs[0].finish_date, None)
-        self.assertEqual(delay_mock.call_count, 1)
 
     @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
-    def test_create_progress_readthrough(self, delay_mock, *_):
+    def test_create_progress_readthrough(self, *_):
         """a readthrough with progress"""
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
@@ -93,8 +92,6 @@ class ReadThrough(TestCase):
         self.assertEqual(progress_updates[0].progress, 100)
 
         # Edit doesn't publish anything
-        self.assertEqual(delay_mock.call_count, 1)
-
         self.client.post(
             "/delete-readthrough",
             {

From 0a9d515d4559e80e2a6c953865a7396a279e0a8a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 20:37:09 -0700
Subject: [PATCH 272/272] two more mocks

---
 bookwyrm/tests/views/inbox/test_inbox_block.py | 2 +-
 bookwyrm/tests/views/test_reading.py           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
index d8685a12..ffd74dbd 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_block.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -70,7 +70,7 @@ class InboxBlock(TestCase):
         self.assertFalse(models.UserFollowRequest.objects.exists())
 
     @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
-    def test_handle_unblock(self):
+    def test_handle_unblock(self, _):
         """unblock a user"""
         self.remote_user.blocks.add(self.local_user)
 
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index 1df7d147..3f5846d0 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -78,6 +78,7 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.book, self.book)
 
     @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+    @patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
     def test_start_reading_reshelve(self, *_):
         """begin a book"""
         to_read_shelf = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ)