diff --git a/.env.example b/.env.example
index cf3705af..2397a5b1 100644
--- a/.env.example
+++ b/.env.example
@@ -36,3 +36,4 @@ EMAIL_PORT=587
 EMAIL_HOST_USER=mail@your.domain.here
 EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
+EMAIL_USE_SSL=false
diff --git a/README.md b/README.md
index e798fedf..dc3af920 100644
--- a/README.md
+++ b/README.md
@@ -156,24 +156,6 @@ The `production` branch of BookWyrm contains a number of tools not on the `main`
 
 Instructions for running BookWyrm in production:
 
-- Get the application code:
-    `git clone git@github.com:mouse-reeve/bookwyrm.git`
-- Switch to the `production` branch
-    `git checkout production`
-- Create your environment variables file
-    `cp .env.example .env`
-    - Add your domain, email address, SMTP credentials
-    - Set a secure redis password and secret key
-    - Set a secure database password for postgres
-- Update your nginx configuration in `nginx/default.conf`
-    - Replace `your-domain.com` with your domain name
-- Run the application (this should also set up a Certbot ssl cert for your domain) with
-    `docker-compose up --build`, and make sure all the images build successfully
-- When docker has built successfully, stop the process with `CTRL-C`
-- Comment out the `command: certonly...` line in `docker-compose.yml`
-- Run docker-compose in the background with: `docker-compose up -d`
-- Initialize the database with: `./bw-dev initdb`
-- Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
 - Get the application code:
     `git clone git@github.com:mouse-reeve/bookwyrm.git`
 - Switch to the `production` branch
diff --git a/bookwyrm/migrations/0063_auto_20210408_1556.py b/bookwyrm/migrations/0063_auto_20210408_1556.py
new file mode 100644
index 00000000..750997fb
--- /dev/null
+++ b/bookwyrm/migrations/0063_auto_20210408_1556.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.1.6 on 2021-04-08 15:56
+
+import bookwyrm.models.fields
+import django.contrib.postgres.fields.citext
+import django.contrib.postgres.operations
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0062_auto_20210407_1545"),
+    ]
+
+    operations = [
+        django.contrib.postgres.operations.CITextExtension(),
+        migrations.AlterField(
+            model_name="user",
+            name="localname",
+            field=django.contrib.postgres.fields.citext.CICharField(
+                max_length=255,
+                null=True,
+                unique=True,
+                validators=[bookwyrm.models.fields.validate_localname],
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index dcc4162e..c519f76c 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -4,6 +4,7 @@ from urllib.parse import urlparse
 
 from django.apps import apps
 from django.contrib.auth.models import AbstractUser, Group
+from django.contrib.postgres.fields import CICharField
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.utils import timezone
@@ -54,7 +55,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     summary = fields.HtmlField(null=True, blank=True)
     local = models.BooleanField(default=False)
     bookwyrm_user = fields.BooleanField(default=True)
-    localname = models.CharField(
+    localname = CICharField(
         max_length=255,
         null=True,
         unique=True,
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 845f81c4..146d4fff 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -24,7 +24,8 @@ EMAIL_HOST = env("EMAIL_HOST")
 EMAIL_PORT = env("EMAIL_PORT", 587)
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
-EMAIL_USE_TLS = env("EMAIL_USE_TLS", True)
+EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", True)
+EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
 DEFAULT_FROM_EMAIL = "admin@{:s}".format(env("DOMAIN"))
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index b91cebba..4d978d7e 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -6,24 +6,36 @@
 {% block title %}{{ book.title }}{% endblock %}
 
 {% block content %}
-<div class="block">
+{% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}
+<div class="block" itemscope itemtype="https://schema.org/Book">
     <div class="columns is-mobile">
         <div class="column">
             <h1 class="title">
-                {{ book.title }}{% if book.subtitle %}:
-                <small>{{ book.subtitle }}</small>{% endif %}
+                <span itemprop="name">
+                    {{ book.title }}{% if book.subtitle %}:
+                        <small>{{ book.subtitle }}</small>
+                    {% endif %}
+                </span>
+
                 {% if book.series %}
-                <small class="has-text-grey-dark">({{ book.series }}{% if book.series_number %} #{{ book.series_number }}{% endif %})</small><br>
+                    <meta itemprop="isPartOf" content="{{ book.series }}">
+                    <meta itemprop="volumeNumber" content="{{ book.series_number }}">
+
+                    <small class="has-text-grey-dark">
+                        ({{ book.series }}
+                        {% if book.series_number %} #{{ book.series_number }}{% endif %})
+                    </small>
+                    <br>
                 {% endif %}
             </h1>
             {% if book.authors %}
             <h2 class="subtitle">
-                {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
+            {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
             </h2>
             {% endif %}
         </div>
 
-        {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
+        {% if user_authenticated and can_edit_book %}
         <div class="column is-narrow">
             <a href="{{ book.id }}/edit">
                 <span class="icon icon-pencil" title="{% trans "Edit Book" %}">
@@ -44,7 +56,7 @@
                 {% include 'snippets/shelve_button/shelve_button.html' %}
             </div>
 
-            {% if request.user.is_authenticated and not book.cover %}
+            {% 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" %}
@@ -60,7 +72,7 @@
                     {% if book.isbn_13 %}
                     <div class="is-flex is-justify-content-space-between is-align-items-center">
                         <dt>{% trans "ISBN:" %}</dt>
-                        <dd>{{ book.isbn_13 }}</dd>
+                        <dd itemprop="isbn">{{ book.isbn_13 }}</dd>
                     </div>
                     {% endif %}
 
@@ -89,14 +101,31 @@
 
         <div class="column is-three-fifths">
             <div class="block">
-                <h3 class="field is-grouped">
+                <h3
+                    class="field is-grouped"
+                    itemprop="aggregateRating"
+                    itemscope
+                    itemtype="https://schema.org/AggregateRating"
+                >
+                    <meta itemprop="ratingValue" content="{{ rating|floatformat }}">
+                    {# @todo Is it possible to not hard-code the value? #}
+                    <meta itemprop="bestRating" content="5">
+                    <meta itemprop="reviewCount" content="{{ review_count }}">
+
                     {% include 'snippets/stars.html' with rating=rating %}
-                    {% blocktrans count counter=review_count %}({{ review_count }} review){% plural %}({{ review_count }} reviews){% endblocktrans %}
+
+                    {% blocktrans count counter=review_count trimmed %}
+                        ({{ review_count }} review)
+                    {% plural %}
+                        ({{ review_count }} reviews)
+                    {% endblocktrans %}
                 </h3>
 
-                {% include 'snippets/trimmed_text.html' with full=book|book_description %}
+                {% with full=book|book_description itemprop='abstract' %}
+                    {% include 'snippets/trimmed_text.html' %}
+                {% endwith %}
 
-                {% if request.user.is_authenticated and perms.bookwyrm.edit_book and not book|book_description %}
+                {% 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" %}
 
@@ -138,7 +167,7 @@
                 {% endfor %}
             </div>
 
-            {% if request.user.is_authenticated %}
+            {% if user_authenticated %}
             <section class="block">
                 <header class="columns">
                     <h2 class="column title is-5 mb-1">{% trans "Your reading activity" %}</h2>
@@ -176,14 +205,15 @@
         </div>
         <div class="column is-one-fifth">
             {% if book.subjects %}
-            <section class="content block">
-                <h2 class="title is-5">{% trans "Subjects" %}</h2>
-                <ul>
-                {% for subject in book.subjects %}
-                    <li>{{ subject }}</li>
-                {% endfor %}
-                </ul>
-            </section>
+                <section class="content block">
+                    <h2 class="title is-5">{% trans "Subjects" %}</h2>
+
+                    <ul>
+                        {% for subject in book.subjects %}
+                            <li itemprop="about">{{ subject }}</li>
+                        {% endfor %}
+                    </ul>
+                </section>
             {% endif %}
 
             {% if book.subject_places %}
@@ -229,41 +259,54 @@
             {% endif %}
         </div>
     </div>
-</div>
 
-<div class="block" id="reviews">
-    {% for review in reviews %}
-    <div class="block">
-        {% include 'snippets/status/status.html' with status=review hide_book=True depth=1 %}
-    </div>
-    {% endfor %}
-
-    <div class="block is-flex is-flex-wrap-wrap">
-        {% for rating in ratings %}
-        <div class="block mr-5">
-            <div class="media">
-                <div class="media-left">{% include 'snippets/avatar.html' with user=rating.user %}</div>
-                <div class="media-content">
-                    <div>
-                        <a href="{{ rating.user.local_path }}">{{ rating.user.display_name }}</a>
-                    </div>
-                    <div class="is-flex">
-                        <p class="mr-1">{% trans "rated it" %}</p>
-                        {% include 'snippets/stars.html' with rating=rating.rating %}
-                    </div>
-                    <div>
-                        <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
-                    </div>
-                </div>
+    <div class="block" id="reviews">
+        {% for review in reviews %}
+            <div
+                class="block"
+                itemprop="review"
+                itemscope
+                itemtype="https://schema.org/Review"
+            >
+                {% with status=review hide_book=True depth=1 %}
+                    {% include 'snippets/status/status.html' %}
+                {% endwith %}
             </div>
-        </div>
         {% endfor %}
-    </div>
-    <div class="block">
-        {% include 'snippets/pagination.html' with page=reviews path=book.local_path anchor="#reviews" %}
+
+        <div class="block is-flex is-flex-wrap-wrap">
+            {% for rating in ratings %}
+                {% with user=rating.user %}
+                    <div class="block mr-5">
+                        <div class="media">
+                            <div class="media-left">
+                                {% include 'snippets/avatar.html' %}
+                            </div>
+
+                            <div class="media-content">
+                                <div>
+                                    <a href="{{ user.local_path }}">{{ user.display_name }}</a>
+                                </div>
+                                <div class="is-flex">
+                                    <p class="mr-1">{% trans "rated it" %}</p>
+
+                                    {% include 'snippets/stars.html' with rating=rating.rating %}
+                                </div>
+                                <div>
+                                    <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endwith %}
+            {% endfor %}
+        </div>
+        <div class="block">
+            {% include 'snippets/pagination.html' with page=reviews path=book.local_path anchor="#reviews" %}
+        </div>
     </div>
 </div>
-
+{% endwith %}
 {% endblock %}
 
 {% block scripts %}
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 15202d80..af5d4d69 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -90,7 +90,7 @@
                 <h2 class="title is-4">{% trans "Metadata" %}</h2>
                 <p class="mb-2">
                     <label class="label" for="id_title">{% trans "Title:" %}</label>
-                    <input type="text" name="title" value="{{ form.title.value }}" maxlength="255" class="input" required="" id="id_title">
+                    <input type="text" name="title" value="{{ form.title.value|default:'' }}" maxlength="255" class="input" required="" id="id_title">
                 </p>
                 {% for error in form.title.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -98,7 +98,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label>
-                    <input type="text" name="subtitle" value="{{ form.subtitle.value }}" maxlength="255" class="input" required="" id="id_subtitle">
+                    <input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" id="id_subtitle">
                 </p>
                 {% for error in form.subtitle.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -130,7 +130,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if book.first_published_date %} value="{{ book.first_published_date|date:'Y-m-d' }}"{% endif %}>
+                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -138,7 +138,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <input type="date" name="published_date" class="input" id="id_published_date"{% if book.published_date %} value="{{ book.published_date|date:'Y-m-d' }}"{% endif %}>
+                    <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %}>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html
index 0ab35401..a16332c5 100644
--- a/bookwyrm/templates/book/publisher_info.html
+++ b/bookwyrm/templates/book/publisher_info.html
@@ -1,24 +1,69 @@
+{% spaceless %}
+
 {% load i18n %}
+
 <p>
-    {% if book.physical_format and not book.pages %}
-    {{ book.physical_format | title }}
-    {% elif book.physical_format and book.pages %}
-    {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
-    {% elif book.pages %}
-    {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
-    {% endif %}
+    {% with format=book.physical_format pages=book.pages %}
+        {% if format %}
+            {% comment %}
+                @todo The bookFormat property is limited to a list of values whereas the book edition is free text.
+                @see https://schema.org/bookFormat
+            {% endcomment %}
+            <meta itemprop="bookFormat" content="{{ format }}">
+        {% endif %}
+
+        {% if pages %}
+            <meta itemprop="numberOfPages" content="{{ pages }}">
+        {% endif %}
+
+        {% if format and not pages %}
+            {% blocktrans %}{{ format }}{% endblocktrans %}
+        {% elif format and pages %}
+            {% blocktrans %}{{ format }}, {{ pages }} pages{% endblocktrans %}
+        {% elif pages %}
+            {% blocktrans %}{{ pages }} pages{% endblocktrans %}
+        {% endif %}
+    {% endwith %}
 </p>
+
 {% if book.languages %}
-<p>
-    {% blocktrans with languages=book.languages|join:", " %}{{ languages }} language{% endblocktrans %}
-</p>
+    {% for language in book.languages %}
+        <meta itemprop="inLanguage" content="{{ language }}">
+    {% endfor %}
+
+    <p>
+        {% with languages=book.languages|join:", " %}
+            {% blocktrans %}{{ languages }} language{% endblocktrans %}
+        {% endwith %}
+    </p>
 {% endif %}
+
 <p>
-    {% if book.published_date and book.publishers %}
-    {% blocktrans with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
-    {% elif book.published_date %}
-    {% blocktrans with date=book.published_date|date:'M jS Y' %}Published {{ date }}{% endblocktrans %}
-    {% elif book.publishers %}
-    {% blocktrans with publisher=book.publishers|join:', ' %}Published by {{ publisher }}.{% endblocktrans %}
-    {% endif %}
+    {% with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}
+        {% if date or book.first_published_date %}
+            <meta
+                itemprop="datePublished"
+                content="{{ book.first_published_date|default:book.published_date|date:'Y-m-d' }}"
+            >
+        {% endif %}
+
+        {% comment %}
+            @todo The publisher property needs to be an Organization or a Person. We’ll be using Thing which is the more generic ancestor.
+            @see https://schema.org/Publisher
+        {% endcomment %}
+        {% if book.publishers %}
+            {% for publisher in book.publishers %}
+                <meta itemprop="publisher" content="{{ publisher }}">
+            {% endfor %}
+        {% endif %}
+
+        {% if date and publisher %}
+            {% blocktrans %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
+        {% elif date %}
+            {% blocktrans %}Published {{ date }}{% endblocktrans %}
+        {% elif publisher %}
+            {% blocktrans %}Published by {{ publisher }}.{% endblocktrans %}
+        {% endif %}
+    {% endwith %}
 </p>
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/authors.html b/bookwyrm/templates/snippets/authors.html
index dd94b471..9459b0fe 100644
--- a/bookwyrm/templates/snippets/authors.html
+++ b/bookwyrm/templates/snippets/authors.html
@@ -1 +1,17 @@
-{% for author in book.authors.all %}<a href="/author/{{ author.id }}" class="author">{{ author.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
+{% spaceless %}
+{% comment %}
+    @todo The author property needs to be an Organization or a Person. We’ll be using Thing which is the more generic ancestor.
+    @see https://schema.org/Author
+{% endcomment %}
+{% for author in book.authors.all %}
+    <a
+        href="/author/{{ author.id }}"
+        class="author"
+        itemprop="author"
+        itemscope
+        itemtype="https://schema.org/Thing"
+    ><span
+        itemprop="name"
+    >{{ author.name }}<span></a>{% if not forloop.last %}, {% endif %}
+{% endfor %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 0dbc3672..ce47819e 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,13 +1,29 @@
+{% spaceless %}
+
 {% load bookwyrm_tags %}
+{% load i18n %}
+
 <div class="cover-container is-{{ size }}">
-{% if book.cover %}
-<img class="book-cover" src="/images/{{ book.cover }}" alt="{{ book.alt_text }}" title="{{ book.alt_text }}">
-{% else %}
-    <div class="no-cover book-cover">
-        <img class="book-cover" src="/static/images/no_cover.jpg" alt="No cover">
-        <div>
-            <p>{{ book.alt_text }}</p>
+    {% if book.cover %}
+        <img
+            class="book-cover"
+            src="/images/{{ book.cover }}"
+            alt="{{ book.alt_text }}"
+            title="{{ book.alt_text }}"
+            itemprop="thumbnailUrl"
+        >
+    {% else %}
+        <div class="no-cover book-cover">
+            <img
+                class="book-cover"
+                src="/static/images/no_cover.jpg"
+                alt="{% trans "No cover" %}"
+            >
+
+            <div>
+                <p>{{ book.alt_text }}</p>
+            </div>
         </div>
-    </div>
-{% endif %}
+    {% endif %}
 </div>
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 43cdc5d2..499c31ad 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -1,68 +1,137 @@
+{% spaceless %}
+
 {% load bookwyrm_tags %}
 {% load i18n %}
-<div class="block">
-    {% if status.status_type == 'Review' or status.status_type == 'Rating' %}
-    <div>
-        {% if status.name %}
-        <h3 class="title is-5 has-subtitle" dir="auto">
-            {{ status.name|escape }}
-        </h3>
-        {% endif %}
-        {% include 'snippets/stars.html' with rating=status.rating %}
-    </div>
+
+{% with status_type=status.status_type %}
+<div
+    class="block"
+
+    {% if status_type == 'Review' %}
+        {% firstof "reviewBody" as body_prop %}
+        {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
+    {% endif %}
+
+    {% if status_type == 'Rating' %}
+        itemprop="rating"
+        itemtype="https://schema.org/Rating"
+    {% endif %}
+>
+    {% if status_type == 'Review' or status_type == 'Rating' %}
+        <div>
+            {% if status.name %}
+                <h3
+                    class="title is-5 has-subtitle"
+                    dir="auto"
+                    itemprop="name"
+                >
+                    {{ status.name|escape }}
+                </h3>
+            {% endif %}
+
+            <span
+                class="is-sr-only"
+                {{ rating_type }}
+            >
+                <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                {% if status_type == 'Rating' %}
+                    {# @todo Is it possible to not hard-code the value? #}
+                    <meta itemprop="bestRating" content="5">
+                {% endif %}
+            </span>
+
+            {% include 'snippets/stars.html' with rating=status.rating %}
+        </div>
     {% endif %}
 
     {% if status.content_warning %}
-    <div>
-        <p>{{ status.content_warning }}</p>
-        {% trans "Show more" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-    </div>
+        <div>
+            <p>{{ status.content_warning }}</p>
+
+            {% trans "Show more" as button_text %}
+
+            {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                {% include 'snippets/toggle/open_button.html' %}
+            {% endwith %}
+        </div>
     {% endif %}
 
-    <div{% if status.content_warning %} class="hidden" id="show-status-cw-{{ status.id }}"{% endif %}>
+    <div
         {% if status.content_warning %}
-        {% trans "Show less" as button_text %}
-        {% include 'snippets/toggle/close_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+            id="show-status-cw-{{ status.id }}"
+            class="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 %}
+                {% include 'snippets/toggle/close_button.html' %}
+            {% endwith %}
         {% endif %}
 
         {% if status.quote %}
-        <div class="quote block">
-            <blockquote dir="auto" class="mb-2">{{ status.quote | safe }}</blockquote>
+            <div class="quote block">
+                <blockquote dir="auto" class="mb-2">{{ status.quote | safe }}</blockquote>
 
-            <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
-        </div>
-        {% endif %}
-
-        {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
-        {% include 'snippets/trimmed_text.html' with full=status.content|safe no_trim=status.content_warning %}
-        {% endif %}
-        {% if status.attachments.exists %}
-        <div class="block">
-            <div class="columns">
-                {% for attachment in status.attachments.all %}
-                <div class="column is-narrow">
-                    <figure class="image is-128x128">
-                        <a href="/images/{{ attachment.image }}" target="_blank" aria-label="{% trans 'Open image in new window' %}">
-                            <img src="/images/{{ attachment.image }}"{% if attachment.caption %} alt="{{ attachment.caption }}" title="{{ attachment.caption }}"{% endif %}>
-                        </a>
-                    </figure>
-                </div>
-                {% endfor %}
+                <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
+            </div>
+        {% endif %}
+
+        {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
+            {% with full=status.content|safe no_trim=status.content_warning itemprop=body_prop %}
+                {% include 'snippets/trimmed_text.html' %}
+            {% endwith %}
+        {% endif %}
+
+        {% if status.attachments.exists %}
+            <div class="block">
+                <div class="columns">
+                    {% for attachment in status.attachments.all %}
+                        <div class="column is-narrow">
+                            <figure class="image is-128x128">
+                                <a
+                                    href="/images/{{ attachment.image }}"
+                                    target="_blank"
+                                    aria-label="{% trans 'Open image in new window' %}"
+                                >
+                                    <img
+                                        src="/images/{{ attachment.image }}"
+
+                                        {% if attachment.caption %}
+                                            alt="{{ attachment.caption }}"
+                                            title="{{ attachment.caption }}"
+                                        {% endif %}
+                                    >
+                                </a>
+                            </figure>
+                        </div>
+                    {% endfor %}
+                </div>
             </div>
-        </div>
         {% endif %}
     </div>
 </div>
 
 {% if not hide_book %}
-{% if status.book or status.mention_books.count %}
-<div class="{% if status.status_type != 'GeneratedNote' %}box has-background-white-bis{% endif %}">
-    {% if status.book %}
-    {% include 'snippets/status/book_preview.html' with book=status.book %}
-    {% elif status.mention_books.count %}
-    {% include 'snippets/status/book_preview.html' with book=status.mention_books.first %}
+    {% if status.book or status.mention_books.count %}
+        <div
+            {% if status_type != 'GeneratedNote' %}
+                class="box has-background-white-bis"
+            {% endif %}
+        >
+            {% if status.book %}
+                {% with book=status.book %}
+                    {% include 'snippets/status/book_preview.html' %}
+                {% endwith %}
+            {% elif status.mention_books.count %}
+                {% with book=status.mention_books.first %}
+                    {% include 'snippets/status/book_preview.html' %}
+                {% endwith %}
+            {% endif %}
+        </div>
     {% endif %}
-</div>
-{% endif %}
 {% endif %}
+{% endwith %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 818c7237..6493bd54 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,9 +1,19 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
-<a href="{{ status.user.local_path }}">
-{% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
-{{ status.user.display_name }}
-</a>
+<span
+    itemprop="author"
+    itemscope
+    itemtype="https://schema.org/Person"
+>
+    <a
+        href="{{ status.user.local_path }}"
+        itemprop="url"
+    >
+        {% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
+
+        <span itemprop="name">{{ status.user.display_name }}</span>
+    </a>
+</span>
 
 {% if status.status_type == 'GeneratedNote' %}
     {{ status.content | safe }}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index f91fe19b..4b103176 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -1,40 +1,49 @@
+{% spaceless %}
 {% load bookwyrm_tags %}
 {% load i18n %}
 
 {% with 0|uuid as uuid %}
-{% if full %}
-{% with full|to_markdown|safe as full %}
+    {% if full %}
+        {% with full|to_markdown|safe as full %}
+            {% with full|to_markdown|safe|truncatewords_html:60 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>
 
-{% with full|to_markdown|safe|truncatewords_html:60 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>
+                                {% 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" %}
+                            </div>
+                        </div>
+                    </div>
+                    <div id="full-{{ uuid }}" class="hidden">
+                        <div class="content">
+                            <div
+                                dir="auto"
+                                {% if itemprop %}itemprop="{{ itemprop }}{% endif %}"
+                            >
+                                {{ full }}
+                            </div>
 
-        <div>
-            {% 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" %}
-        </div>
-    </div>
-</div>
-<div id="full-{{ uuid }}" class="hidden">
-    <div class="content">
-        <div dir="auto">{{ full }}</div>
-
-        <div>
-            {% trans "Show less" as button_text %}
-            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
-        </div>
-    </div>
-</div>
-{% else %}
-<div class="content">
-    <div dir="auto">{{ full }}</div>
-</div>
-{% endif %}
+                            <div>
+                                {% trans "Show less" as button_text %}
+                                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
+                            </div>
+                        </div>
+                    </div>
+                    {% else %}
+                    <div class="content">
+                        <div
+                            dir="auto"
+                            {% if itemprop %}itemprop="{{ itemprop }}{% endif %}"
+                        >
+                            {{ full }}
+                        </div>
+                    </div>
+                {% endif %}
+            {% endwith %}
+        {% endwith %}
+    {% endif %}
 {% endwith %}
-
-{% endwith %}
-{% endif %}
-{% endwith %}
-
+{% endspaceless %}
diff --git a/bookwyrm/tests/views/inbox/__init__.py b/bookwyrm/tests/views/inbox/__init__.py
new file mode 100644
index 00000000..b6e690fd
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py
new file mode 100644
index 00000000..deba6e69
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox.py
@@ -0,0 +1,133 @@
+""" tests incoming activities"""
+import json
+from unittest.mock import patch
+
+from django.http import HttpResponseNotAllowed, HttpResponseNotFound
+from django.test import TestCase, Client
+from django.test.client import RequestFactory
+
+from bookwyrm import models
+
+
+# pylint: disable=too-many-public-methods
+class Inbox(TestCase):
+    """ readthrough tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.client = Client()
+        self.factory = RequestFactory()
+        local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        local_user.remote_id = "https://example.com/user/mouse"
+        local_user.save(broadcast=False)
+        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_inbox_invalid_get(self):
+        """ shouldn't try to handle if the user is not found """
+        result = self.client.get("/inbox", content_type="application/json")
+        self.assertIsInstance(result, HttpResponseNotAllowed)
+
+    def test_inbox_invalid_user(self):
+        """ shouldn't try to handle if the user is not found """
+        result = self.client.post(
+            "/user/bleh/inbox",
+            '{"type": "Test", "object": "exists"}',
+            content_type="application/json",
+        )
+        self.assertIsInstance(result, HttpResponseNotFound)
+
+    def test_inbox_invalid_bad_signature(self):
+        """ bad request for invalid signature """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            mock_valid.return_value = False
+            result = self.client.post(
+                "/user/mouse/inbox",
+                '{"type": "Announce", "object": "exists"}',
+                content_type="application/json",
+            )
+            self.assertEqual(result.status_code, 401)
+
+    def test_inbox_invalid_bad_signature_delete(self):
+        """ invalid signature for Delete is okay though """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            mock_valid.return_value = False
+            result = self.client.post(
+                "/user/mouse/inbox",
+                '{"type": "Delete", "object": "exists"}',
+                content_type="application/json",
+            )
+            self.assertEqual(result.status_code, 200)
+
+    def test_inbox_unknown_type(self):
+        """ never heard of that activity type, don't have a handler for it """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            result = self.client.post(
+                "/inbox",
+                '{"type": "Fish", "object": "exists"}',
+                content_type="application/json",
+            )
+            mock_valid.return_value = True
+            self.assertIsInstance(result, HttpResponseNotFound)
+
+    def test_inbox_success(self):
+        """ a known type, for which we start a task """
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/list/22",
+            "type": "BookList",
+            "totalItems": 1,
+            "first": "https://example.com/list/22?page=1",
+            "last": "https://example.com/list/22?page=1",
+            "name": "Test List",
+            "owner": "https://example.com/user/mouse",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "summary": "summary text",
+            "curation": "curated",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            mock_valid.return_value = True
+
+            with patch("bookwyrm.views.inbox.activity_task.delay"):
+                result = self.client.post(
+                    "/inbox", json.dumps(activity), content_type="application/json"
+                )
+        self.assertEqual(result.status_code, 200)
+
+    def test_is_blocked_user_agent(self):
+        """ check for blocked servers """
+        request = self.factory.post(
+            "",
+            HTTP_USER_AGENT="http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)",
+        )
+        self.assertFalse(views.inbox.is_blocked_user_agent(request))
+
+        models.FederatedServer.objects.create(
+            server_name="mastodon.social", status="blocked"
+        )
+        self.assertTrue(views.inbox.is_blocked_user_agent(request))
+
+    def test_is_blocked_activity(self):
+        """ check for blocked servers """
+        activity = {"actor": "https://mastodon.social/user/whaatever/else"}
+        self.assertFalse(views.inbox.is_blocked_activity(activity))
+
+        models.FederatedServer.objects.create(
+            server_name="mastodon.social", status="blocked"
+        )
+        self.assertTrue(views.inbox.is_blocked_activity(activity))
diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
new file mode 100644
index 00000000..638d56d7
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -0,0 +1,156 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+import responses
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+    def test_handle_add_book_to_shelf(self):
+        """ shelving a book """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
+        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
+        shelf.save()
+
+        activity = {
+            "id": "https://bookwyrm.social/shelfbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        self.assertEqual(shelf.books.first(), book)
+
+    @responses.activate
+    def test_handle_add_book_to_list(self):
+        """ listing a book """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+
+        responses.add(
+            responses.GET,
+            "https://bookwyrm.social/user/mouse/list/to-read",
+            json={
+                "id": "https://example.com/list/22",
+                "type": "BookList",
+                "totalItems": 1,
+                "first": "https://example.com/list/22?page=1",
+                "last": "https://example.com/list/22?page=1",
+                "name": "Test List",
+                "owner": "https://example.com/user/mouse",
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://example.com/user/mouse/followers"],
+                "summary": "summary text",
+                "curation": "curated",
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        )
+
+        activity = {
+            "id": "https://bookwyrm.social/listbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://bookwyrm.social/user/mouse/list/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+
+        booklist = models.List.objects.get()
+        self.assertEqual(booklist.name, "Test List")
+        self.assertEqual(booklist.books.first(), book)
+
+    @responses.activate
+    def test_handle_tag_book(self):
+        """ listing a book """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+
+        responses.add(
+            responses.GET,
+            "https://www.example.com/tag/cool-tag",
+            json={
+                "id": "https://1b1a78582461.ngrok.io/tag/tag",
+                "type": "OrderedCollection",
+                "totalItems": 0,
+                "first": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
+                "last": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
+                "name": "cool tag",
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        )
+
+        activity = {
+            "id": "https://bookwyrm.social/listbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://www.example.com/tag/cool-tag",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+
+        tag = models.Tag.objects.get()
+        self.assertFalse(models.List.objects.exists())
+        self.assertEqual(tag.name, "cool tag")
+        self.assertEqual(tag.books.first(), book)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
new file mode 100644
index 00000000..a730045a
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -0,0 +1,190 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+import responses
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+                self.status = models.Status.objects.create(
+                    user=self.local_user,
+                    content="Test status",
+                    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()
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_boost(self, _):
+        """ boost a status """
+        self.assertEqual(models.Notification.objects.count(), 0)
+        activity = {
+            "type": "Announce",
+            "id": "%s/boost" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": self.status.remote_id,
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+        }
+        with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
+            discarder.return_value = False
+            views.inbox.activity_task(activity)
+        boost = models.Boost.objects.get()
+        self.assertEqual(boost.boosted_status, self.status)
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.related_status, self.status)
+
+    @responses.activate
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_boost_remote_status(self, redis_mock):
+        """ boost a status """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        self.assertEqual(models.Notification.objects.count(), 0)
+        activity = {
+            "type": "Announce",
+            "id": "%s/boost" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": "https://remote.com/status/1",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+        }
+        responses.add(
+            responses.GET,
+            "https://remote.com/status/1",
+            json={
+                "id": "https://remote.com/status/1",
+                "type": "Comment",
+                "published": "2021-04-05T18:04:59.735190+00:00",
+                "attributedTo": self.remote_user.remote_id,
+                "content": "<p>a comment</p>",
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://b875df3d118b.ngrok.io/user/mouse/followers"],
+                "inReplyTo": "",
+                "inReplyToBook": book.remote_id,
+                "summary": "",
+                "tag": [],
+                "sensitive": False,
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        )
+
+        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")
+        self.assertEqual(boost.boosted_status.comment.status_type, "Comment")
+        self.assertEqual(boost.boosted_status.comment.book, book)
+
+    @responses.activate
+    def test_handle_discarded_boost(self):
+        """ test a boost of a mastodon status that will be discarded """
+        status = models.Status(
+            content="hi",
+            user=self.remote_user,
+        )
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status.save(broadcast=False)
+        activity = {
+            "type": "Announce",
+            "id": "http://www.faraway.com/boost/12",
+            "actor": self.remote_user.remote_id,
+            "object": status.remote_id,
+        }
+        responses.add(
+            responses.GET, status.remote_id, json=status.to_activity(), status=200
+        )
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Boost.objects.count(), 0)
+
+    def test_handle_unboost(self):
+        """ undo a boost """
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            boost = models.Boost.objects.create(
+                boosted_status=self.status, user=self.remote_user
+            )
+        activity = {
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {
+                "type": "Announce",
+                "id": boost.remote_id,
+                "actor": self.remote_user.remote_id,
+                "object": self.status.remote_id,
+                "to": ["https://www.w3.org/ns/activitystreams#public"],
+                "cc": ["https://example.com/user/mouse/followers"],
+                "published": "Mon, 25 May 2020 19:31:20 GMT",
+            },
+        }
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        self.assertFalse(models.Boost.objects.exists())
+
+    def test_handle_unboost_unknown_boost(self):
+        """ undo a boost """
+        activity = {
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {
+                "type": "Announce",
+                "id": "http://fake.com/unknown/boost",
+                "actor": self.remote_user.remote_id,
+                "object": self.status.remote_id,
+            },
+        }
+        views.inbox.activity_task(activity)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
new file mode 100644
index 00000000..e686c6b7
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -0,0 +1,98 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxBlock(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+    def test_handle_blocks(self):
+        """ create a "block" database entry from an activity """
+        self.local_user.followers.add(self.remote_user)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.UserFollowRequest.objects.create(
+                user_subject=self.local_user, user_object=self.remote_user
+            )
+        self.assertTrue(models.UserFollows.objects.exists())
+        self.assertTrue(models.UserFollowRequest.objects.exists())
+
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/9e1f41ac-9ddd-4159",
+            "type": "Block",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse",
+        }
+
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_user_statuses"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
+        block = models.UserBlocks.objects.get()
+        self.assertEqual(block.user_subject, self.remote_user)
+        self.assertEqual(block.user_object, self.local_user)
+        self.assertEqual(block.remote_id, "https://example.com/9e1f41ac-9ddd-4159")
+
+        self.assertFalse(models.UserFollows.objects.exists())
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+
+    def test_handle_unblock(self):
+        """ unblock a user """
+        self.remote_user.blocks.add(self.local_user)
+
+        block = models.UserBlocks.objects.get()
+        block.remote_id = "https://example.com/9e1f41ac-9ddd-4159"
+        block.save()
+
+        self.assertEqual(block.user_subject, self.remote_user)
+        self.assertEqual(block.user_object, self.local_user)
+        activity = {
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": "https://example.com/9e1f41ac-9ddd-4159",
+                "type": "Block",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse",
+            },
+        }
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.add_user_statuses"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
new file mode 100644
index 00000000..437f6ffc
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -0,0 +1,151 @@
+""" tests incoming activities"""
+import json
+import pathlib
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ readthrough tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+                self.status = models.Status.objects.create(
+                    user=self.local_user,
+                    content="Test status",
+                    remote_id="https://example.com/status/1",
+                )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        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_handle_create_status(self):
+        """ the "it justs works" mode """
+        self.assertEqual(models.Status.objects.count(), 1)
+
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            "../../data/ap_quotation.json"
+        )
+        status_data = json.loads(datafile.read_bytes())
+        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.Quotation.objects.get()
+        self.assertEqual(
+            status.remote_id, "https://example.com/user/mouse/quotation/13"
+        )
+        self.assertEqual(status.quote, "quote body")
+        self.assertEqual(status.content, "commentary")
+        self.assertEqual(status.user, self.local_user)
+        self.assertEqual(models.Status.objects.count(), 2)
+
+        # while we're here, lets ensure we avoid dupes
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Status.objects.count(), 2)
+
+    def test_handle_create_status_remote_note_with_mention(self):
+        """ should only create it under the right circumstances """
+        self.assertEqual(models.Status.objects.count(), 1)
+        self.assertFalse(
+            models.Notification.objects.filter(user=self.local_user).exists()
+        )
+
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_note.json")
+        status_data = json.loads(datafile.read_bytes())
+        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.Status.objects.last()
+        self.assertEqual(status.content, "test content in note")
+        self.assertEqual(status.mention_users.first(), self.local_user)
+        self.assertTrue(
+            models.Notification.objects.filter(user=self.local_user).exists()
+        )
+        self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
+
+    def test_handle_create_status_remote_note_with_reply(self):
+        """ should only create it under the right circumstances """
+        self.assertEqual(models.Status.objects.count(), 1)
+        self.assertFalse(models.Notification.objects.filter(user=self.local_user))
+
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_note.json")
+        status_data = json.loads(datafile.read_bytes())
+        del status_data["tag"]
+        status_data["inReplyTo"] = self.status.remote_id
+        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.Status.objects.last()
+        self.assertEqual(status.content, "test content in note")
+        self.assertEqual(status.reply_parent, self.status)
+        self.assertTrue(models.Notification.objects.filter(user=self.local_user))
+        self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
+
+    def test_handle_create_list(self):
+        """ a new list """
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/list/22",
+            "type": "BookList",
+            "totalItems": 1,
+            "first": "https://example.com/list/22?page=1",
+            "last": "https://example.com/list/22?page=1",
+            "name": "Test List",
+            "owner": "https://example.com/user/mouse",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "summary": "summary text",
+            "curation": "curated",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        book_list = models.List.objects.get()
+        self.assertEqual(book_list.name, "Test List")
+        self.assertEqual(book_list.curation, "curated")
+        self.assertEqual(book_list.description, "summary text")
+        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
new file mode 100644
index 00000000..65a75426
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -0,0 +1,106 @@
+""" tests incoming activities"""
+from datetime import datetime
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            self.status = models.Status.objects.create(
+                user=self.remote_user,
+                content="Test status",
+                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_handle_delete_status(self):
+        """ remove a status """
+        self.assertFalse(self.status.deleted)
+        activity = {
+            "type": "Delete",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "id": "%s/activity" % self.status.remote_id,
+            "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:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        # deletion doens't remove the status, it turns it into a tombstone
+        status = models.Status.objects.get()
+        self.assertTrue(status.deleted)
+        self.assertIsInstance(status.deleted_date, datetime)
+
+    def test_handle_delete_status_notifications(self):
+        """ remove a status with related notifications """
+        models.Notification.objects.create(
+            related_status=self.status,
+            user=self.local_user,
+            notification_type="MENTION",
+        )
+        # this one is innocent, don't delete it
+        notif = models.Notification.objects.create(
+            user=self.local_user, notification_type="MENTION"
+        )
+        self.assertFalse(self.status.deleted)
+        self.assertEqual(models.Notification.objects.count(), 2)
+        activity = {
+            "type": "Delete",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "id": "%s/activity" % self.status.remote_id,
+            "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:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        # deletion doens't remove the status, it turns it into a tombstone
+        status = models.Status.objects.get()
+        self.assertTrue(status.deleted)
+        self.assertIsInstance(status.deleted_date, datetime)
+
+        # notifications should be truly deleted
+        self.assertEqual(models.Notification.objects.count(), 1)
+        self.assertEqual(models.Notification.objects.get(), notif)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py
new file mode 100644
index 00000000..c549c31b
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py
@@ -0,0 +1,205 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxRelationships(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+    def test_handle_follow(self):
+        """ remote user wants to follow local user """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123",
+            "type": "Follow",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse",
+        }
+
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.inbox.activity_task(activity)
+            self.assertEqual(mock.call_count, 1)
+
+        # notification created
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.notification_type, "FOLLOW")
+
+        # the request should have been deleted
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+
+        # the follow relationship should exist
+        follow = models.UserFollows.objects.get(user_object=self.local_user)
+        self.assertEqual(follow.user_subject, self.remote_user)
+
+    def test_handle_follow_manually_approved(self):
+        """ needs approval before following """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123",
+            "type": "Follow",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse",
+        }
+
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.inbox.activity_task(activity)
+
+        # notification created
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.notification_type, "FOLLOW_REQUEST")
+
+        # the request should exist
+        request = models.UserFollowRequest.objects.get()
+        self.assertEqual(request.user_subject, self.remote_user)
+        self.assertEqual(request.user_object, self.local_user)
+
+        # the follow relationship should not exist
+        follow = models.UserFollows.objects.all()
+        self.assertEqual(list(follow), [])
+
+    def test_handle_undo_follow_request(self):
+        """ the requester cancels a follow request """
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            request = models.UserFollowRequest.objects.create(
+                user_subject=self.remote_user, user_object=self.local_user
+            )
+        self.assertTrue(self.local_user.follower_requests.exists())
+
+        activity = {
+            "type": "Undo",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "actor": self.remote_user.remote_id,
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": request.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse",
+            },
+        }
+
+        views.inbox.activity_task(activity)
+
+        self.assertFalse(self.local_user.follower_requests.exists())
+
+    def test_handle_unfollow(self):
+        """ remove a relationship """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            rel = models.UserFollows.objects.create(
+                user_subject=self.remote_user, user_object=self.local_user
+            )
+        activity = {
+            "type": "Undo",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "actor": self.remote_user.remote_id,
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "object": {
+                "id": rel.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse",
+            },
+        }
+        self.assertEqual(self.remote_user, self.local_user.followers.first())
+
+        views.inbox.activity_task(activity)
+        self.assertIsNone(self.local_user.followers.first())
+
+    def test_handle_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(
+                user_subject=self.local_user, user_object=self.remote_user
+            )
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123#accepts",
+            "type": "Accept",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "id": rel.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/user/mouse",
+                "object": "https://example.com/users/rat",
+            },
+        }
+
+        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+
+        # request should be deleted
+        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
+
+        # relationship should be created
+        follows = self.remote_user.followers
+        self.assertEqual(follows.count(), 1)
+        self.assertEqual(follows.first(), self.local_user)
+
+    def test_handle_follow_reject(self):
+        """ turn down a follow request """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            rel = models.UserFollowRequest.objects.create(
+                user_subject=self.local_user, user_object=self.remote_user
+            )
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123#accepts",
+            "type": "Reject",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "id": rel.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/user/mouse",
+                "object": "https://example.com/users/rat",
+            },
+        }
+
+        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+
+        # request should be deleted
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+        self.assertFalse(self.remote_user.followers.exists())
diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py
new file mode 100644
index 00000000..05105b75
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_like.py
@@ -0,0 +1,110 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+                self.status = models.Status.objects.create(
+                    user=self.local_user,
+                    content="Test status",
+                    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_handle_favorite(self):
+        """ fav a status """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/fav/1",
+            "actor": "https://example.com/users/rat",
+            "type": "Like",
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "object": self.status.remote_id,
+        }
+
+        views.inbox.activity_task(activity)
+
+        fav = models.Favorite.objects.get(remote_id="https://example.com/fav/1")
+        self.assertEqual(fav.status, self.status)
+        self.assertEqual(fav.remote_id, "https://example.com/fav/1")
+        self.assertEqual(fav.user, self.remote_user)
+
+    def test_ignore_favorite(self):
+        """ don't try to save an unknown status """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/fav/1",
+            "actor": "https://example.com/users/rat",
+            "type": "Like",
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "object": "https://unknown.status/not-found",
+        }
+
+        views.inbox.activity_task(activity)
+
+        self.assertFalse(models.Favorite.objects.exists())
+
+    def test_handle_unfavorite(self):
+        """ fav a status """
+        activity = {
+            "id": "https://example.com/fav/1#undo",
+            "type": "Undo",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "actor": self.remote_user.remote_id,
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": "https://example.com/fav/1",
+                "actor": "https://example.com/users/rat",
+                "type": "Like",
+                "published": "Mon, 25 May 2020 19:31:20 GMT",
+                "object": self.status.remote_id,
+            },
+        }
+        models.Favorite.objects.create(
+            status=self.status,
+            user=self.remote_user,
+            remote_id="https://example.com/fav/1",
+        )
+        self.assertEqual(models.Favorite.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Favorite.objects.count(), 0)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
new file mode 100644
index 00000000..b3e42bbd
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -0,0 +1,61 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+    def test_handle_unshelve_book(self):
+        """ remove a book from a shelf """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
+        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
+        shelf.save()
+
+        shelfbook = models.ShelfBook.objects.create(
+            user=self.remote_user, shelf=shelf, book=book
+        )
+
+        self.assertEqual(shelf.books.first(), book)
+        self.assertEqual(shelf.books.count(), 1)
+
+        activity = {
+            "id": shelfbook.remote_id,
+            "type": "Remove",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        self.assertFalse(shelf.books.exists())
diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
new file mode 100644
index 00000000..012343e7
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -0,0 +1,149 @@
+""" tests incoming activities"""
+import json
+import pathlib
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxUpdate(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+
+        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_handle_update_list(self):
+        """ a new list """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            book_list = models.List.objects.create(
+                name="hi", remote_id="https://example.com/list/22", user=self.local_user
+            )
+        activity = {
+            "type": "Update",
+            "to": [],
+            "cc": [],
+            "actor": "hi",
+            "id": "sdkjf",
+            "object": {
+                "id": "https://example.com/list/22",
+                "type": "BookList",
+                "totalItems": 1,
+                "first": "https://example.com/list/22?page=1",
+                "last": "https://example.com/list/22?page=1",
+                "name": "Test List",
+                "owner": "https://example.com/user/mouse",
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://example.com/user/mouse/followers"],
+                "summary": "summary text",
+                "curation": "curated",
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        }
+        views.inbox.activity_task(activity)
+        book_list.refresh_from_db()
+        self.assertEqual(book_list.name, "Test List")
+        self.assertEqual(book_list.curation, "curated")
+        self.assertEqual(book_list.description, "summary text")
+        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
+
+    def test_handle_update_user(self):
+        """ update an existing user """
+        # we only do this with remote users
+        self.local_user.local = False
+        self.local_user.save()
+
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_user.json")
+        userdata = json.loads(datafile.read_bytes())
+        del userdata["icon"]
+        self.assertIsNone(self.local_user.name)
+        views.inbox.activity_task(
+            {
+                "type": "Update",
+                "to": [],
+                "cc": [],
+                "actor": "hi",
+                "id": "sdkjf",
+                "object": userdata,
+            }
+        )
+        user = models.User.objects.get(id=self.local_user.id)
+        self.assertEqual(user.name, "MOUSE?? MOUSE!!")
+        self.assertEqual(user.username, "mouse@example.com")
+        self.assertEqual(user.localname, "mouse")
+        self.assertTrue(user.discoverable)
+
+    def test_handle_update_edition(self):
+        """ update an existing edition """
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json")
+        bookdata = json.loads(datafile.read_bytes())
+
+        models.Work.objects.create(
+            title="Test Work", remote_id="https://bookwyrm.social/book/5988"
+        )
+        book = models.Edition.objects.create(
+            title="Test Book", remote_id="https://bookwyrm.social/book/5989"
+        )
+
+        del bookdata["authors"]
+        self.assertEqual(book.title, "Test Book")
+
+        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
+            views.inbox.activity_task(
+                {
+                    "type": "Update",
+                    "to": [],
+                    "cc": [],
+                    "actor": "hi",
+                    "id": "sdkjf",
+                    "object": bookdata,
+                }
+            )
+        book = models.Edition.objects.get(id=book.id)
+        self.assertEqual(book.title, "Piranesi")
+
+    def test_handle_update_work(self):
+        """ update an existing edition """
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_work.json")
+        bookdata = json.loads(datafile.read_bytes())
+
+        book = models.Work.objects.create(
+            title="Test Book", remote_id="https://bookwyrm.social/book/5988"
+        )
+
+        del bookdata["authors"]
+        self.assertEqual(book.title, "Test Book")
+        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
+            views.inbox.activity_task(
+                {
+                    "type": "Update",
+                    "to": [],
+                    "cc": [],
+                    "actor": "hi",
+                    "id": "sdkjf",
+                    "object": bookdata,
+                }
+            )
+        book = models.Work.objects.get(id=book.id)
+        self.assertEqual(book.title, "Piranesi")
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index c646b4b4..7d2bc42c 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -112,6 +112,9 @@ class ViewsHelpers(TestCase):
         result = views.helpers.handle_remote_webfinger("mouse@local.com")
         self.assertEqual(result, self.local_user)
 
+        result = views.helpers.handle_remote_webfinger("mOuSe@loCal.cOm")
+        self.assertEqual(result, self.local_user)
+
     @responses.activate
     def test_load_user(self, _):
         """ find a remote user using webfinger """
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
deleted file mode 100644
index aa625ef2..00000000
--- a/bookwyrm/tests/views/test_inbox.py
+++ /dev/null
@@ -1,1013 +0,0 @@
-""" tests incoming activities"""
-from datetime import datetime
-import json
-import pathlib
-from unittest.mock import patch
-
-from django.http import HttpResponseNotAllowed, HttpResponseNotFound
-from django.test import TestCase, Client
-from django.test.client import RequestFactory
-import responses
-
-from bookwyrm import models, views
-
-
-# pylint: disable=too-many-public-methods
-class Inbox(TestCase):
-    """ readthrough tests """
-
-    def setUp(self):
-        """ basic user and book data """
-        self.client = Client()
-        self.factory = RequestFactory()
-        self.local_user = models.User.objects.create_user(
-            "mouse@example.com",
-            "mouse@mouse.com",
-            "mouseword",
-            local=True,
-            localname="mouse",
-        )
-        self.local_user.remote_id = "https://example.com/user/mouse"
-        self.local_user.save(broadcast=False)
-        with patch("bookwyrm.models.user.set_remote_server.delay"):
-            self.remote_user = models.User.objects.create_user(
-                "rat",
-                "rat@rat.com",
-                "ratword",
-                local=False,
-                remote_id="https://example.com/users/rat",
-                inbox="https://example.com/users/rat/inbox",
-                outbox="https://example.com/users/rat/outbox",
-            )
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-                self.status = models.Status.objects.create(
-                    user=self.local_user,
-                    content="Test status",
-                    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_inbox_invalid_get(self):
-        """ shouldn't try to handle if the user is not found """
-        result = self.client.get("/inbox", content_type="application/json")
-        self.assertIsInstance(result, HttpResponseNotAllowed)
-
-    def test_inbox_invalid_user(self):
-        """ shouldn't try to handle if the user is not found """
-        result = self.client.post(
-            "/user/bleh/inbox",
-            '{"type": "Test", "object": "exists"}',
-            content_type="application/json",
-        )
-        self.assertIsInstance(result, HttpResponseNotFound)
-
-    def test_inbox_invalid_bad_signature(self):
-        """ bad request for invalid signature """
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            mock_valid.return_value = False
-            result = self.client.post(
-                "/user/mouse/inbox",
-                '{"type": "Announce", "object": "exists"}',
-                content_type="application/json",
-            )
-            self.assertEqual(result.status_code, 401)
-
-    def test_inbox_invalid_bad_signature_delete(self):
-        """ invalid signature for Delete is okay though """
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            mock_valid.return_value = False
-            result = self.client.post(
-                "/user/mouse/inbox",
-                '{"type": "Delete", "object": "exists"}',
-                content_type="application/json",
-            )
-            self.assertEqual(result.status_code, 200)
-
-    def test_inbox_unknown_type(self):
-        """ never heard of that activity type, don't have a handler for it """
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            result = self.client.post(
-                "/inbox",
-                '{"type": "Fish", "object": "exists"}',
-                content_type="application/json",
-            )
-            mock_valid.return_value = True
-            self.assertIsInstance(result, HttpResponseNotFound)
-
-    def test_inbox_success(self):
-        """ a known type, for which we start a task """
-        activity = self.create_json
-        activity["object"] = {
-            "id": "https://example.com/list/22",
-            "type": "BookList",
-            "totalItems": 1,
-            "first": "https://example.com/list/22?page=1",
-            "last": "https://example.com/list/22?page=1",
-            "name": "Test List",
-            "owner": "https://example.com/user/mouse",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "summary": "summary text",
-            "curation": "curated",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            mock_valid.return_value = True
-
-            with patch("bookwyrm.views.inbox.activity_task.delay"):
-                result = self.client.post(
-                    "/inbox", json.dumps(activity), content_type="application/json"
-                )
-        self.assertEqual(result.status_code, 200)
-
-    def test_handle_create_status(self):
-        """ the "it justs works" mode """
-        self.assertEqual(models.Status.objects.count(), 1)
-
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_quotation.json")
-        status_data = json.loads(datafile.read_bytes())
-        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.Quotation.objects.get()
-        self.assertEqual(
-            status.remote_id, "https://example.com/user/mouse/quotation/13"
-        )
-        self.assertEqual(status.quote, "quote body")
-        self.assertEqual(status.content, "commentary")
-        self.assertEqual(status.user, self.local_user)
-        self.assertEqual(models.Status.objects.count(), 2)
-
-        # while we're here, lets ensure we avoid dupes
-        views.inbox.activity_task(activity)
-        self.assertEqual(models.Status.objects.count(), 2)
-
-    def test_handle_create_status_remote_note_with_mention(self):
-        """ should only create it under the right circumstances """
-        self.assertEqual(models.Status.objects.count(), 1)
-        self.assertFalse(
-            models.Notification.objects.filter(user=self.local_user).exists()
-        )
-
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_note.json")
-        status_data = json.loads(datafile.read_bytes())
-        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.Status.objects.last()
-        self.assertEqual(status.content, "test content in note")
-        self.assertEqual(status.mention_users.first(), self.local_user)
-        self.assertTrue(
-            models.Notification.objects.filter(user=self.local_user).exists()
-        )
-        self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
-
-    def test_handle_create_status_remote_note_with_reply(self):
-        """ should only create it under the right circumstances """
-        self.assertEqual(models.Status.objects.count(), 1)
-        self.assertFalse(models.Notification.objects.filter(user=self.local_user))
-
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_note.json")
-        status_data = json.loads(datafile.read_bytes())
-        del status_data["tag"]
-        status_data["inReplyTo"] = self.status.remote_id
-        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.Status.objects.last()
-        self.assertEqual(status.content, "test content in note")
-        self.assertEqual(status.reply_parent, self.status)
-        self.assertTrue(models.Notification.objects.filter(user=self.local_user))
-        self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
-
-    def test_handle_create_list(self):
-        """ a new list """
-        activity = self.create_json
-        activity["object"] = {
-            "id": "https://example.com/list/22",
-            "type": "BookList",
-            "totalItems": 1,
-            "first": "https://example.com/list/22?page=1",
-            "last": "https://example.com/list/22?page=1",
-            "name": "Test List",
-            "owner": "https://example.com/user/mouse",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "summary": "summary text",
-            "curation": "curated",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-        book_list = models.List.objects.get()
-        self.assertEqual(book_list.name, "Test List")
-        self.assertEqual(book_list.curation, "curated")
-        self.assertEqual(book_list.description, "summary text")
-        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
-
-    def test_handle_follow(self):
-        """ remote user wants to follow local user """
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123",
-            "type": "Follow",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse",
-        }
-
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.inbox.activity_task(activity)
-            self.assertEqual(mock.call_count, 1)
-
-        # notification created
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.notification_type, "FOLLOW")
-
-        # the request should have been deleted
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-
-        # the follow relationship should exist
-        follow = models.UserFollows.objects.get(user_object=self.local_user)
-        self.assertEqual(follow.user_subject, self.remote_user)
-
-    def test_handle_follow_manually_approved(self):
-        """ needs approval before following """
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123",
-            "type": "Follow",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse",
-        }
-
-        self.local_user.manually_approves_followers = True
-        self.local_user.save(broadcast=False)
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.inbox.activity_task(activity)
-
-        # notification created
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.notification_type, "FOLLOW_REQUEST")
-
-        # the request should exist
-        request = models.UserFollowRequest.objects.get()
-        self.assertEqual(request.user_subject, self.remote_user)
-        self.assertEqual(request.user_object, self.local_user)
-
-        # the follow relationship should not exist
-        follow = models.UserFollows.objects.all()
-        self.assertEqual(list(follow), [])
-
-    def test_handle_undo_follow_request(self):
-        """ the requester cancels a follow request """
-        self.local_user.manually_approves_followers = True
-        self.local_user.save(broadcast=False)
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            request = models.UserFollowRequest.objects.create(
-                user_subject=self.remote_user, user_object=self.local_user
-            )
-        self.assertTrue(self.local_user.follower_requests.exists())
-
-        activity = {
-            "type": "Undo",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "actor": self.remote_user.remote_id,
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "object": {
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "id": request.remote_id,
-                "type": "Follow",
-                "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse",
-            },
-        }
-
-        views.inbox.activity_task(activity)
-
-        self.assertFalse(self.local_user.follower_requests.exists())
-
-    def test_handle_unfollow(self):
-        """ remove a relationship """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            rel = models.UserFollows.objects.create(
-                user_subject=self.remote_user, user_object=self.local_user
-            )
-        activity = {
-            "type": "Undo",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "actor": self.remote_user.remote_id,
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "object": {
-                "id": rel.remote_id,
-                "type": "Follow",
-                "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse",
-            },
-        }
-        self.assertEqual(self.remote_user, self.local_user.followers.first())
-
-        views.inbox.activity_task(activity)
-        self.assertIsNone(self.local_user.followers.first())
-
-    def test_handle_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(
-                user_subject=self.local_user, user_object=self.remote_user
-            )
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123#accepts",
-            "type": "Accept",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "id": rel.remote_id,
-                "type": "Follow",
-                "actor": "https://example.com/user/mouse",
-                "object": "https://example.com/users/rat",
-            },
-        }
-
-        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
-
-        views.inbox.activity_task(activity)
-
-        # request should be deleted
-        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
-
-        # relationship should be created
-        follows = self.remote_user.followers
-        self.assertEqual(follows.count(), 1)
-        self.assertEqual(follows.first(), self.local_user)
-
-    def test_handle_follow_reject(self):
-        """ turn down a follow request """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            rel = models.UserFollowRequest.objects.create(
-                user_subject=self.local_user, user_object=self.remote_user
-            )
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123#accepts",
-            "type": "Reject",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "id": rel.remote_id,
-                "type": "Follow",
-                "actor": "https://example.com/user/mouse",
-                "object": "https://example.com/users/rat",
-            },
-        }
-
-        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
-
-        views.inbox.activity_task(activity)
-
-        # request should be deleted
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-        self.assertFalse(self.remote_user.followers.exists())
-
-    def test_handle_update_list(self):
-        """ a new list """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            book_list = models.List.objects.create(
-                name="hi", remote_id="https://example.com/list/22", user=self.local_user
-            )
-        activity = {
-            "type": "Update",
-            "to": [],
-            "cc": [],
-            "actor": "hi",
-            "id": "sdkjf",
-            "object": {
-                "id": "https://example.com/list/22",
-                "type": "BookList",
-                "totalItems": 1,
-                "first": "https://example.com/list/22?page=1",
-                "last": "https://example.com/list/22?page=1",
-                "name": "Test List",
-                "owner": "https://example.com/user/mouse",
-                "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                "cc": ["https://example.com/user/mouse/followers"],
-                "summary": "summary text",
-                "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        }
-        views.inbox.activity_task(activity)
-        book_list.refresh_from_db()
-        self.assertEqual(book_list.name, "Test List")
-        self.assertEqual(book_list.curation, "curated")
-        self.assertEqual(book_list.description, "summary text")
-        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
-
-    def test_handle_delete_status(self):
-        """ remove a status """
-        self.status.user = self.remote_user
-        self.status.save(broadcast=False)
-
-        self.assertFalse(self.status.deleted)
-        activity = {
-            "type": "Delete",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "id": "%s/activity" % self.status.remote_id,
-            "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:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        # deletion doens't remove the status, it turns it into a tombstone
-        status = models.Status.objects.get()
-        self.assertTrue(status.deleted)
-        self.assertIsInstance(status.deleted_date, datetime)
-
-    def test_handle_delete_status_notifications(self):
-        """ remove a status with related notifications """
-        self.status.user = self.remote_user
-        self.status.save(broadcast=False)
-        models.Notification.objects.create(
-            related_status=self.status,
-            user=self.local_user,
-            notification_type="MENTION",
-        )
-        # this one is innocent, don't delete it
-        notif = models.Notification.objects.create(
-            user=self.local_user, notification_type="MENTION"
-        )
-        self.assertFalse(self.status.deleted)
-        self.assertEqual(models.Notification.objects.count(), 2)
-        activity = {
-            "type": "Delete",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "id": "%s/activity" % self.status.remote_id,
-            "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:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        # deletion doens't remove the status, it turns it into a tombstone
-        status = models.Status.objects.get()
-        self.assertTrue(status.deleted)
-        self.assertIsInstance(status.deleted_date, datetime)
-
-        # notifications should be truly deleted
-        self.assertEqual(models.Notification.objects.count(), 1)
-        self.assertEqual(models.Notification.objects.get(), notif)
-
-    def test_handle_favorite(self):
-        """ fav a status """
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/fav/1",
-            "actor": "https://example.com/users/rat",
-            "type": "Like",
-            "published": "Mon, 25 May 2020 19:31:20 GMT",
-            "object": self.status.remote_id,
-        }
-
-        views.inbox.activity_task(activity)
-
-        fav = models.Favorite.objects.get(remote_id="https://example.com/fav/1")
-        self.assertEqual(fav.status, self.status)
-        self.assertEqual(fav.remote_id, "https://example.com/fav/1")
-        self.assertEqual(fav.user, self.remote_user)
-
-    def test_ignore_favorite(self):
-        """ don't try to save an unknown status """
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/fav/1",
-            "actor": "https://example.com/users/rat",
-            "type": "Like",
-            "published": "Mon, 25 May 2020 19:31:20 GMT",
-            "object": "https://unknown.status/not-found",
-        }
-
-        views.inbox.activity_task(activity)
-
-        self.assertFalse(models.Favorite.objects.exists())
-
-    def test_handle_unfavorite(self):
-        """ fav a status """
-        activity = {
-            "id": "https://example.com/fav/1#undo",
-            "type": "Undo",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "actor": self.remote_user.remote_id,
-            "object": {
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "id": "https://example.com/fav/1",
-                "actor": "https://example.com/users/rat",
-                "type": "Like",
-                "published": "Mon, 25 May 2020 19:31:20 GMT",
-                "object": self.status.remote_id,
-            },
-        }
-        models.Favorite.objects.create(
-            status=self.status,
-            user=self.remote_user,
-            remote_id="https://example.com/fav/1",
-        )
-        self.assertEqual(models.Favorite.objects.count(), 1)
-
-        views.inbox.activity_task(activity)
-        self.assertEqual(models.Favorite.objects.count(), 0)
-
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_handle_boost(self, _):
-        """ boost a status """
-        self.assertEqual(models.Notification.objects.count(), 0)
-        activity = {
-            "type": "Announce",
-            "id": "%s/boost" % self.status.remote_id,
-            "actor": self.remote_user.remote_id,
-            "object": self.status.remote_id,
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "published": "Mon, 25 May 2020 19:31:20 GMT",
-        }
-        with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
-            discarder.return_value = False
-            views.inbox.activity_task(activity)
-        boost = models.Boost.objects.get()
-        self.assertEqual(boost.boosted_status, self.status)
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.related_status, self.status)
-
-    @responses.activate
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_handle_boost_remote_status(self, redis_mock):
-        """ boost a status """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-        self.assertEqual(models.Notification.objects.count(), 0)
-        activity = {
-            "type": "Announce",
-            "id": "%s/boost" % self.status.remote_id,
-            "actor": self.remote_user.remote_id,
-            "object": "https://remote.com/status/1",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "published": "Mon, 25 May 2020 19:31:20 GMT",
-        }
-        responses.add(
-            responses.GET,
-            "https://remote.com/status/1",
-            json={
-                "id": "https://remote.com/status/1",
-                "type": "Comment",
-                "published": "2021-04-05T18:04:59.735190+00:00",
-                "attributedTo": self.remote_user.remote_id,
-                "content": "<p>a comment</p>",
-                "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                "cc": ["https://b875df3d118b.ngrok.io/user/mouse/followers"],
-                "inReplyTo": "",
-                "inReplyToBook": book.remote_id,
-                "summary": "",
-                "tag": [],
-                "sensitive": False,
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        )
-
-        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")
-        self.assertEqual(boost.boosted_status.comment.status_type, "Comment")
-        self.assertEqual(boost.boosted_status.comment.book, book)
-
-    @responses.activate
-    def test_handle_discarded_boost(self):
-        """ test a boost of a mastodon status that will be discarded """
-        status = models.Status(
-            content="hi",
-            user=self.remote_user,
-        )
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-            status.save(broadcast=False)
-        activity = {
-            "type": "Announce",
-            "id": "http://www.faraway.com/boost/12",
-            "actor": self.remote_user.remote_id,
-            "object": status.remote_id,
-        }
-        responses.add(
-            responses.GET, status.remote_id, json=status.to_activity(), status=200
-        )
-        views.inbox.activity_task(activity)
-        self.assertEqual(models.Boost.objects.count(), 0)
-
-    def test_handle_unboost(self):
-        """ undo a boost """
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-            boost = models.Boost.objects.create(
-                boosted_status=self.status, user=self.remote_user
-            )
-        activity = {
-            "type": "Undo",
-            "actor": "hi",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {
-                "type": "Announce",
-                "id": boost.remote_id,
-                "actor": self.remote_user.remote_id,
-                "object": self.status.remote_id,
-                "to": ["https://www.w3.org/ns/activitystreams#public"],
-                "cc": ["https://example.com/user/mouse/followers"],
-                "published": "Mon, 25 May 2020 19:31:20 GMT",
-            },
-        }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        self.assertFalse(models.Boost.objects.exists())
-
-    def test_handle_unboost_unknown_boost(self):
-        """ undo a boost """
-        activity = {
-            "type": "Undo",
-            "actor": "hi",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {
-                "type": "Announce",
-                "id": "http://fake.com/unknown/boost",
-                "actor": self.remote_user.remote_id,
-                "object": self.status.remote_id,
-            },
-        }
-        views.inbox.activity_task(activity)
-
-    def test_handle_add_book_to_shelf(self):
-        """ shelving a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
-        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
-        shelf.save()
-
-        activity = {
-            "id": "https://bookwyrm.social/shelfbook/6189#add",
-            "type": "Add",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-        self.assertEqual(shelf.books.first(), book)
-
-    def test_handle_unshelve_book(self):
-        """ remove a book from a shelf """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
-        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
-        shelf.save()
-
-        shelfbook = models.ShelfBook.objects.create(
-            user=self.remote_user, shelf=shelf, book=book
-        )
-
-        self.assertEqual(shelf.books.first(), book)
-        self.assertEqual(shelf.books.count(), 1)
-
-        activity = {
-            "id": shelfbook.remote_id,
-            "type": "Remove",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-        self.assertFalse(shelf.books.exists())
-
-    @responses.activate
-    def test_handle_add_book_to_list(self):
-        """ listing a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-
-        responses.add(
-            responses.GET,
-            "https://bookwyrm.social/user/mouse/list/to-read",
-            json={
-                "id": "https://example.com/list/22",
-                "type": "BookList",
-                "totalItems": 1,
-                "first": "https://example.com/list/22?page=1",
-                "last": "https://example.com/list/22?page=1",
-                "name": "Test List",
-                "owner": "https://example.com/user/mouse",
-                "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                "cc": ["https://example.com/user/mouse/followers"],
-                "summary": "summary text",
-                "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        )
-
-        activity = {
-            "id": "https://bookwyrm.social/listbook/6189#add",
-            "type": "Add",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://bookwyrm.social/user/mouse/list/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-
-        booklist = models.List.objects.get()
-        self.assertEqual(booklist.name, "Test List")
-        self.assertEqual(booklist.books.first(), book)
-
-    @responses.activate
-    def test_handle_tag_book(self):
-        """ listing a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-
-        responses.add(
-            responses.GET,
-            "https://www.example.com/tag/cool-tag",
-            json={
-                "id": "https://1b1a78582461.ngrok.io/tag/tag",
-                "type": "OrderedCollection",
-                "totalItems": 0,
-                "first": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
-                "last": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
-                "name": "cool tag",
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        )
-
-        activity = {
-            "id": "https://bookwyrm.social/listbook/6189#add",
-            "type": "Add",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://www.example.com/tag/cool-tag",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-
-        tag = models.Tag.objects.get()
-        self.assertFalse(models.List.objects.exists())
-        self.assertEqual(tag.name, "cool tag")
-        self.assertEqual(tag.books.first(), book)
-
-    def test_handle_update_user(self):
-        """ update an existing user """
-        # we only do this with remote users
-        self.local_user.local = False
-        self.local_user.save()
-
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
-        userdata = json.loads(datafile.read_bytes())
-        del userdata["icon"]
-        self.assertIsNone(self.local_user.name)
-        views.inbox.activity_task(
-            {
-                "type": "Update",
-                "to": [],
-                "cc": [],
-                "actor": "hi",
-                "id": "sdkjf",
-                "object": userdata,
-            }
-        )
-        user = models.User.objects.get(id=self.local_user.id)
-        self.assertEqual(user.name, "MOUSE?? MOUSE!!")
-        self.assertEqual(user.username, "mouse@example.com")
-        self.assertEqual(user.localname, "mouse")
-        self.assertTrue(user.discoverable)
-
-    def test_handle_update_edition(self):
-        """ update an existing edition """
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_edition.json")
-        bookdata = json.loads(datafile.read_bytes())
-
-        models.Work.objects.create(
-            title="Test Work", remote_id="https://bookwyrm.social/book/5988"
-        )
-        book = models.Edition.objects.create(
-            title="Test Book", remote_id="https://bookwyrm.social/book/5989"
-        )
-
-        del bookdata["authors"]
-        self.assertEqual(book.title, "Test Book")
-
-        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
-            views.inbox.activity_task(
-                {
-                    "type": "Update",
-                    "to": [],
-                    "cc": [],
-                    "actor": "hi",
-                    "id": "sdkjf",
-                    "object": bookdata,
-                }
-            )
-        book = models.Edition.objects.get(id=book.id)
-        self.assertEqual(book.title, "Piranesi")
-
-    def test_handle_update_work(self):
-        """ update an existing edition """
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_work.json")
-        bookdata = json.loads(datafile.read_bytes())
-
-        book = models.Work.objects.create(
-            title="Test Book", remote_id="https://bookwyrm.social/book/5988"
-        )
-
-        del bookdata["authors"]
-        self.assertEqual(book.title, "Test Book")
-        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
-            views.inbox.activity_task(
-                {
-                    "type": "Update",
-                    "to": [],
-                    "cc": [],
-                    "actor": "hi",
-                    "id": "sdkjf",
-                    "object": bookdata,
-                }
-            )
-        book = models.Work.objects.get(id=book.id)
-        self.assertEqual(book.title, "Piranesi")
-
-    def test_handle_blocks(self):
-        """ create a "block" database entry from an activity """
-        self.local_user.followers.add(self.remote_user)
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.local_user, user_object=self.remote_user
-            )
-        self.assertTrue(models.UserFollows.objects.exists())
-        self.assertTrue(models.UserFollowRequest.objects.exists())
-
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/9e1f41ac-9ddd-4159",
-            "type": "Block",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse",
-        }
-
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_user_statuses"
-        ) as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        views.inbox.activity_task(activity)
-        block = models.UserBlocks.objects.get()
-        self.assertEqual(block.user_subject, self.remote_user)
-        self.assertEqual(block.user_object, self.local_user)
-        self.assertEqual(block.remote_id, "https://example.com/9e1f41ac-9ddd-4159")
-
-        self.assertFalse(models.UserFollows.objects.exists())
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-
-    def test_handle_unblock(self):
-        """ unblock a user """
-        self.remote_user.blocks.add(self.local_user)
-
-        block = models.UserBlocks.objects.get()
-        block.remote_id = "https://example.com/9e1f41ac-9ddd-4159"
-        block.save()
-
-        self.assertEqual(block.user_subject, self.remote_user)
-        self.assertEqual(block.user_object, self.local_user)
-        activity = {
-            "type": "Undo",
-            "actor": "hi",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "id": "https://example.com/9e1f41ac-9ddd-4159",
-                "type": "Block",
-                "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse",
-            },
-        }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.add_user_statuses"
-        ) as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        self.assertFalse(models.UserBlocks.objects.exists())
-
-    def test_is_blocked_user_agent(self):
-        """ check for blocked servers """
-        request = self.factory.post(
-            "",
-            HTTP_USER_AGENT="http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)",
-        )
-        self.assertFalse(views.inbox.is_blocked_user_agent(request))
-
-        models.FederatedServer.objects.create(
-            server_name="mastodon.social", status="blocked"
-        )
-        self.assertTrue(views.inbox.is_blocked_user_agent(request))
-
-    def test_is_blocked_activity(self):
-        """ check for blocked servers """
-        activity = {"actor": "https://mastodon.social/user/whaatever/else"}
-        self.assertFalse(views.inbox.is_blocked_activity(activity))
-
-        models.FederatedServer.objects.create(
-            server_name="mastodon.social", status="blocked"
-        )
-        self.assertTrue(views.inbox.is_blocked_activity(activity))
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 58886cad..731fc24c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,6 +1,7 @@
 """ the good stuff! the books! """
 from uuid import uuid4
 
+from dateutil.parser import parse as dateparse
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.postgres.search import SearchRank, SearchVector
 from django.core.files.base import ContentFile
@@ -10,6 +11,7 @@ from django.db.models import Avg, Q
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
+from django.utils.datastructures import MultiValueDictKeyError
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
@@ -172,6 +174,20 @@ class EditBook(View):
             data["confirm_mode"] = True
             # this isn't preserved because it isn't part of the form obj
             data["remove_authors"] = request.POST.getlist("remove_authors")
+            # make sure the dates are passed in as datetime, they're currently a string
+            # QueryDicts are immutable, we need to copy
+            formcopy = data["form"].data.copy()
+            try:
+                formcopy["first_published_date"] = dateparse(
+                    formcopy["first_published_date"]
+                )
+            except (MultiValueDictKeyError, ValueError):
+                pass
+            try:
+                formcopy["published_date"] = dateparse(formcopy["published_date"])
+            except (MultiValueDictKeyError, ValueError):
+                pass
+            data["form"].data = formcopy
             return TemplateResponse(request, "book/edit_book.html", data)
 
         remove_authors = request.POST.getlist("remove_authors")
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 41e6a608..2b6501ff 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -124,7 +124,7 @@ def handle_remote_webfinger(query):
         return None
 
     try:
-        user = models.User.objects.get(username=query)
+        user = models.User.objects.get(username__iexact=query)
     except models.User.DoesNotExist:
         url = "https://%s/.well-known/webfinger?resource=acct:%s" % (domain, query)
         try:
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 28f393c8..9e7df9f4 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -34,7 +34,7 @@ class Search(View):
         if query and re.match(regex.full_username, query):
             handle_remote_webfinger(query)
 
-        # do a  user search
+        # do a user search
         user_results = (
             models.User.viewer_aware_objects(request.user)
             .annotate(
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 7591163b..952fe5b1 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -20,7 +20,8 @@ EMAIL_HOST = env("EMAIL_HOST")
 EMAIL_PORT = env("EMAIL_PORT")
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
-EMAIL_USE_TLS = env("EMAIL_USE_TLS")
+EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS")
+EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
 
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index c765cb89..c05a9f7a 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-04-05 07:29+0000\n"
+"POT-Creation-Date: 2021-04-09 21:53+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"
@@ -44,7 +44,6 @@ msgid "%(count)d uses"
 msgstr "%(count)d utilisations"
 
 #: bookwyrm/forms.py:251
-#| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Sans limite"
 
@@ -59,7 +58,6 @@ msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
 #: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
-#| msgid "Username:"
 msgid "username"
 msgstr "nom du compte :"
 
@@ -120,64 +118,62 @@ msgstr "Wikipedia"
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
 
-#: bookwyrm/templates/book/book.html:21
+#: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "par"
 
-#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
+#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book/book.html:49
+#: bookwyrm/templates/book/book.html:61
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:53
-#| msgid "Failed to load"
+#: bookwyrm/templates/book/book.html:65
 msgid "Failed to load cover"
 msgstr "La couverture n’a pu être chargée"
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:74
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: bookwyrm/templates/book/book.html:69
-#: bookwyrm/templates/book/edit_book.html:217
+#: bookwyrm/templates/book/book.html:81
+#: bookwyrm/templates/book/edit_book.html:223
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
-#: bookwyrm/templates/book/book.html:76
-#: bookwyrm/templates/book/edit_book.html:221
+#: bookwyrm/templates/book/book.html:88
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "ASIN:"
 msgstr "ASIN :"
 
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:97
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:94
+#: 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:100
-#| msgid "Description:"
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:107
-#: bookwyrm/templates/book/edit_book.html:101
+#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:111
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/edit_book.html:237
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
@@ -188,9 +184,9 @@ msgstr "Description :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
+#: 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:232
+#: bookwyrm/templates/book/edit_book.html:238
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -203,92 +199,84 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:150
 #, python-format
-#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 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:129
+#: bookwyrm/templates/book/book.html:158
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 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:135
+#: bookwyrm/templates/book/book.html:164
 #, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_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 "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:144
+#: bookwyrm/templates/book/book.html:173
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:146
-#| msgid "Edit read dates"
+#: bookwyrm/templates/book/book.html:175
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:180
 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:158
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:209
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:221
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:232 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:213
-#| msgid "Go to list"
+#: bookwyrm/templates/book/book.html:243
 msgid "Add to list"
 msgstr "Ajouter à la liste"
 
-#: bookwyrm/templates/book/book.html:223
+#: bookwyrm/templates/book/book.html:253
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book/book.html:251
+#: bookwyrm/templates/book/book.html:291
 msgid "rated it"
 msgstr "l’a noté"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:169
-#| msgid "Add cover"
+#: bookwyrm/templates/book/edit_book.html:175
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:175
+#: bookwyrm/templates/book/edit_book.html:181
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
 #, python-format
-#| msgid "Finish \"<em>%(book_title)s</em>\""
 msgid "Edit \"%(book_title)s\""
 msgstr "Modifier « %(book_title)s »"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:13
-#| msgid "Add Books"
 msgid "Add Book"
 msgstr "Ajouter un livre"
 
@@ -318,7 +306,6 @@ msgstr "Est‑ce que l’auteur ou l’autrice « %(name)s » existe déjà
 
 #: bookwyrm/templates/book/edit_book.html:52
 #, python-format
-#| msgid "Start \"<em>%(book_title)s</em>\""
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "Commencer « <em>%(book_title)s</em> »"
 
@@ -354,97 +341,92 @@ msgstr "Retour"
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: bookwyrm/templates/book/edit_book.html:91
+#: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "Titre :"
 
-#: bookwyrm/templates/book/edit_book.html:96
+#: bookwyrm/templates/book/edit_book.html:100
 msgid "Subtitle:"
 msgstr "Sous‑titre :"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:112
 msgid "Series:"
 msgstr "Série :"
 
-#: bookwyrm/templates/book/edit_book.html:111
+#: bookwyrm/templates/book/edit_book.html:117
 msgid "Series number:"
 msgstr "Numéro dans la série :"
 
-#: bookwyrm/templates/book/edit_book.html:117
-#| msgid "Published"
+#: bookwyrm/templates/book/edit_book.html:123
 msgid "Publisher:"
 msgstr "Éditeur :"
 
-#: bookwyrm/templates/book/edit_book.html:119
+#: bookwyrm/templates/book/edit_book.html:125
 msgid "Separate multiple publishers with commas."
 msgstr "Séparez plusieurs éditeurs par une virgule."
 
-#: bookwyrm/templates/book/edit_book.html:126
+#: bookwyrm/templates/book/edit_book.html:132
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:134
+#: bookwyrm/templates/book/edit_book.html:140
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:143
-#| msgid "Author"
+#: bookwyrm/templates/book/edit_book.html:149
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:149
+#: bookwyrm/templates/book/edit_book.html:155
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:154
-#| msgid "Edit Author"
+#: bookwyrm/templates/book/edit_book.html:160
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/book/edit_book.html:161
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:161
+#: bookwyrm/templates/book/edit_book.html:167
 #: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:188
+#: bookwyrm/templates/book/edit_book.html:194
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:189
+#: bookwyrm/templates/book/edit_book.html:195
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:203
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:204
+#: bookwyrm/templates/book/edit_book.html:210
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:209
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:219
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/book/editions.html:5
 #, python-format
-#| msgid "Finish \"<em>%(book_title)s</em>\""
 msgid "Editions of %(book_title)s"
 msgstr "Éditions de %(book_title)s"
 
@@ -462,36 +444,37 @@ msgstr "Tou(te)s"
 msgid "Language:"
 msgstr "Langue :"
 
-#: bookwyrm/templates/book/publisher_info.html:6
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "%(format)s"
+msgstr "%(format)s"
+
+#: bookwyrm/templates/book/publisher_info.html:24
 #, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "%(format)s, %(pages)s pages"
 msgstr "%(format)s, %(pages)s pages"
 
-#: bookwyrm/templates/book/publisher_info.html:8
+#: bookwyrm/templates/book/publisher_info.html:26
 #, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "%(pages)s pages"
 msgstr "%(pages)s pages"
 
-#: bookwyrm/templates/book/publisher_info.html:13
+#: bookwyrm/templates/book/publisher_info.html:38
 #, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "%(languages)s language"
 msgstr "%(languages)s langues"
 
-#: bookwyrm/templates/book/publisher_info.html:18
+#: bookwyrm/templates/book/publisher_info.html:65
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
 msgstr "Publié %(date)s par %(publisher)s."
 
-#: bookwyrm/templates/book/publisher_info.html:20
+#: bookwyrm/templates/book/publisher_info.html:67
 #, python-format
-#| msgid "Published date:"
 msgid "Published %(date)s"
 msgstr "Publié %(date)s"
 
-#: bookwyrm/templates/book/publisher_info.html:22
+#: bookwyrm/templates/book/publisher_info.html:69
 #, python-format
 msgid "Published by %(publisher)s."
 msgstr "Publié par %(publisher)s."
@@ -501,27 +484,22 @@ msgstr "Publié par %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#| msgid "Closed"
 msgid "Close"
 msgstr "Fermer"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#| msgid "Boost status"
 msgid "Compose status"
 msgstr "Rédiger un statut"
 
 #: bookwyrm/templates/directory/community_filter.html:5
-#| msgid "Comment"
 msgid "Community"
 msgstr "Communauté"
 
 #: bookwyrm/templates/directory/community_filter.html:8
-#| msgid "Blocked users"
 msgid "Local users"
 msgstr "Comptes locaux"
 
 #: bookwyrm/templates/directory/community_filter.html:12
-#| msgid "Federated"
 msgid "Federated community"
 msgstr "Communauté fédérée"
 
@@ -537,7 +515,6 @@ msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à décou
 
 #: bookwyrm/templates/directory/directory.html:26
 #, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
 msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
 
@@ -547,14 +524,12 @@ msgid "Dismiss message"
 msgstr "Rejeter le message"
 
 #: bookwyrm/templates/directory/directory.html:71
-#| msgid "followed you"
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] "compte auquel vous êtes abonné(e)"
 msgstr[1] "comptes auxquels vous êtes abonné(e)"
 
 #: bookwyrm/templates/directory/directory.html:78
-#| msgid "Your shelves"
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] "livre sur vos étagères"
@@ -573,7 +548,6 @@ msgid "Order by"
 msgstr "Trier par"
 
 #: bookwyrm/templates/directory/sort_filter.html:8
-#| msgid "Suggest"
 msgid "Suggested"
 msgstr "Suggéré"
 
@@ -582,12 +556,10 @@ msgid "Recently active"
 msgstr "Actif récemment"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
-#| msgid "User Activity"
 msgid "User type"
 msgstr "Type de compte"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
-#| msgid "Blocked users"
 msgid "BookWyrm users"
 msgstr "Comptes BookWyrm"
 
@@ -597,7 +569,6 @@ msgstr "Tous les comptes connus"
 
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
-#| msgid "Join %(name)s"
 msgid "About %(site_name)s"
 msgstr "À propos de %(site_name)s"
 
@@ -667,7 +638,6 @@ msgid "Your Account"
 msgstr "Votre compte"
 
 #: bookwyrm/templates/edit_author.html:5
-#| msgid "Edit Author"
 msgid "Edit Author:"
 msgstr "Modifier l’auteur ou l’autrice :"
 
@@ -722,7 +692,6 @@ msgstr "Paramètres d’email"
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
 #, python-format
-#| msgid "Join %(name)s"
 msgid "You're invited to join %(site_name)s!"
 msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s !"
 
@@ -741,7 +710,6 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#| msgid "More about this site"
 msgid "Learn more about this instance:"
 msgstr "En savoir plus sur cete instance :"
 
@@ -766,7 +734,6 @@ msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Reset your %(site_name)s password"
 msgstr "Réinitialiser votre mot de passe sur %(site_name)s"
 
@@ -793,12 +760,10 @@ msgid "Home Timeline"
 msgstr "Mon fil d’actualité"
 
 #: bookwyrm/templates/feed/feed.html:11
-#| msgid "%(tab_title)s Timeline"
 msgid "Local Timeline"
 msgstr "Fil d’actualité local"
 
 #: bookwyrm/templates/feed/feed.html:13
-#| msgid "Federated Servers"
 msgid "Federated Timeline"
 msgstr "Fil d’actualité des instances fédérées"
 
@@ -829,7 +794,6 @@ msgid "Who to follow"
 msgstr "À qui s’abonner"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
-#| msgid "Updated:"
 msgid "Updates"
 msgstr "Mises à jour"
 
@@ -845,13 +809,11 @@ msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:28
-#| msgid "Read"
 msgid "To Read"
 msgstr "À lire"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/user/shelf.html:28
-#| msgid "Started reading"
 msgid "Currently Reading"
 msgstr "En train de lire"
 
@@ -883,12 +845,10 @@ msgstr[1] "%(shared_books)s livres sur vos étagères"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
-#| msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgid "Have you read %(book_title)s?"
 msgstr "Avez‑vous lu « <em>%(book_title)s</em> » ?"
 
 #: bookwyrm/templates/get_started/books.html:6
-#| msgid "Started reading"
 msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
@@ -919,13 +879,11 @@ msgid "Search"
 msgstr "Chercher"
 
 #: bookwyrm/templates/get_started/books.html:26
-#| msgid "Suggest Books"
 msgid "Suggested Books"
 msgstr "Suggérer des livres"
 
 #: bookwyrm/templates/get_started/books.html:41
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Popular on %(site_name)s"
 msgstr "Populaire sur %(site_name)s"
 
@@ -941,7 +899,6 @@ msgstr "Enregistrer &amp; continuer"
 
 #: bookwyrm/templates/get_started/layout.html:14
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Welcome to %(site_name)s!"
 msgstr "Bienvenu(e) sur %(site_name)s !"
 
@@ -951,17 +908,14 @@ msgstr "Voici quelques étapes pour commencer votre profil."
 
 #: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
-#| msgid "User Profile"
 msgid "Create your profile"
 msgstr "Créez votre profil"
 
 #: bookwyrm/templates/get_started/layout.html:34
-#| msgid "Add Books"
 msgid "Add books"
 msgstr "Ajoutez des livres"
 
 #: bookwyrm/templates/get_started/layout.html:38
-#| msgid "Friendly"
 msgid "Find friends"
 msgstr "Établissez des contacts"
 
@@ -970,7 +924,6 @@ msgid "Skip this step"
 msgstr "Passer cette étape"
 
 #: bookwyrm/templates/get_started/layout.html:48
-#| msgid "Finished"
 msgid "Finish"
 msgstr "Terminer"
 
@@ -1008,7 +961,6 @@ msgid "Your account will show up in the directory, and may be recommended to oth
 msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
-#| msgid "Search for a book or user"
 msgid "Search for a user"
 msgstr "Chercher un compte"
 
@@ -1024,7 +976,6 @@ msgid "%(year)s Reading Progress"
 msgstr "Progression de lecture pour %(year)s"
 
 #: bookwyrm/templates/goal.html:11
-#| msgid "Edit Book"
 msgid "Edit Goal"
 msgstr "Modifier le défi"
 
@@ -1041,13 +992,11 @@ msgstr "%(name)s n’a aucun défi lecture pour %(year)s."
 
 #: bookwyrm/templates/goal.html:51
 #, python-format
-#| msgid "Your books"
 msgid "Your %(year)s Books"
 msgstr "Vos livres en %(year)s"
 
 #: bookwyrm/templates/goal.html:53
 #, python-format
-#| msgid "%(username)s has no followers"
 msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
@@ -1057,7 +1006,6 @@ msgid "Import Books"
 msgstr "Importer des livres"
 
 #: bookwyrm/templates/import.html:16
-#| msgid "Data source"
 msgid "Data source:"
 msgstr "Source de données :"
 
@@ -1193,7 +1141,6 @@ msgid "Feed"
 msgstr "Fil d’actualité"
 
 #: bookwyrm/templates/layout.html:102
-#| msgid "Instance Settings"
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -1226,7 +1173,6 @@ msgid "Username:"
 msgstr "Nom du compte :"
 
 #: bookwyrm/templates/layout.html:156
-#| msgid "Password:"
 msgid "password"
 msgstr "Mot de passe"
 
@@ -1267,13 +1213,11 @@ msgstr "Créer une liste"
 
 #: bookwyrm/templates/lists/created_text.html:5
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Créée et modérée par <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/created_text.html:7
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
 
@@ -1341,7 +1285,6 @@ msgstr "Cette liste est vide actuellement"
 
 #: bookwyrm/templates/lists/list.html:35
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
 
@@ -1375,6 +1318,10 @@ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 msgid "Suggest"
 msgstr "Suggérer"
 
+#: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr "Vos listes"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@@ -1404,12 +1351,10 @@ msgid "Back to reports"
 msgstr "Retour aux signalements"
 
 #: bookwyrm/templates/moderation/report.html:18
-#| msgid "Notifications"
 msgid "Actions"
 msgstr "Actions"
 
 #: bookwyrm/templates/moderation/report.html:19
-#| msgid "User Profile"
 msgid "View user profile"
 msgstr "Voir le profil"
 
@@ -1438,7 +1383,6 @@ msgid "Comment"
 msgstr "Commentaire"
 
 #: bookwyrm/templates/moderation/report.html:59
-#| msgid "Delete status"
 msgid "Reported statuses"
 msgstr "Statuts signalés"
 
@@ -1452,7 +1396,6 @@ msgstr "Les statuts ont été supprimés"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Report @%(username)s"
 msgstr "Signaler @%(username)s"
 
@@ -1462,7 +1405,6 @@ msgid "This report will be sent to %(site_name)s's moderators for review."
 msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement."
 
 #: bookwyrm/templates/moderation/report_modal.html:22
-#| msgid "More about this site"
 msgid "More info about this report:"
 msgstr "En savoir plus sur ce signalement :"
 
@@ -1472,7 +1414,6 @@ msgstr "Aucune note fournie"
 
 #: bookwyrm/templates/moderation/report_preview.html:20
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Signalé par <a href=\"%(path)s\">%(username)s</a>"
 
@@ -1486,30 +1427,25 @@ msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Reports: %(server_name)s"
 msgstr "Signalements : %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:16
 #: bookwyrm/templates/settings/admin_layout.html:28
-#| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Signalements"
 
 #: bookwyrm/templates/moderation/reports.html:13
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Reports: <small>%(server_name)s</small>"
 msgstr "Signalements: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:27
-#| msgid "Shelved"
 msgid "Resolved"
 msgstr "Résolus"
 
 #: bookwyrm/templates/moderation/reports.html:34
-#| msgid "No books found"
 msgid "No reports found."
 msgstr "Aucun signalement trouvé."
 
@@ -1741,7 +1677,6 @@ msgstr "Paramètres de l’instance"
 #: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
-#| msgid "Instance Settings"
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
@@ -1774,17 +1709,14 @@ msgid "Details"
 msgstr "Détails"
 
 #: bookwyrm/templates/settings/federated_server.html:15
-#| msgid "Software"
 msgid "Software:"
 msgstr "Logiciel :"
 
 #: bookwyrm/templates/settings/federated_server.html:19
-#| msgid "Description:"
 msgid "Version:"
 msgstr "Description :"
 
 #: bookwyrm/templates/settings/federated_server.html:23
-#| msgid "Status"
 msgid "Status:"
 msgstr "Statut :"
 
@@ -1794,7 +1726,6 @@ msgid "Activity"
 msgstr "Activité"
 
 #: bookwyrm/templates/settings/federated_server.html:33
-#| msgid "Username:"
 msgid "Users:"
 msgstr "Comptes :"
 
@@ -1804,22 +1735,18 @@ msgid "View all"
 msgstr "Voir tous"
 
 #: bookwyrm/templates/settings/federated_server.html:40
-#| msgid "Recent Imports"
 msgid "Reports:"
 msgstr "Signalements :"
 
 #: bookwyrm/templates/settings/federated_server.html:47
-#| msgid "followed you"
 msgid "Followed by us:"
 msgstr "Suivi par nous :"
 
 #: bookwyrm/templates/settings/federated_server.html:53
-#| msgid "followed you"
 msgid "Followed by them:"
 msgstr "Suivi par eux :"
 
 #: bookwyrm/templates/settings/federated_server.html:59
-#| msgid "Blocked Users"
 msgid "Blocked by us:"
 msgstr "Bloqués par nous :"
 
@@ -1828,7 +1755,6 @@ msgid "Server name"
 msgstr "Nom du serveur"
 
 #: bookwyrm/templates/settings/federation.html:17
-#| msgid "Federated"
 msgid "Date federated"
 msgstr "Date de fédération"
 
@@ -1847,7 +1773,6 @@ msgstr "Statut"
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
-#| msgid "Invites"
 msgid "Invite Requests"
 msgstr "Invitations"
 
@@ -1856,12 +1781,10 @@ msgid "Ignored Invite Requests"
 msgstr "Invitations ignorées"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
-#| msgid "Federated"
 msgid "Date requested"
 msgstr "Date d’envoi"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:39
-#| msgid "Accept"
 msgid "Date accepted"
 msgstr "Date de validation"
 
@@ -1870,18 +1793,15 @@ msgid "Email"
 msgstr "Email"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:47
-#| msgid "Notifications"
 msgid "Action"
 msgstr "Action"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:50
-#| msgid "Follow Requests"
 msgid "No requests"
 msgstr "Aucune demande"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/status_filter.html:16
-#| msgid "Accept"
 msgid "Accepted"
 msgstr "Accepté(e)s"
 
@@ -2004,7 +1924,6 @@ msgid "Allow registration:"
 msgstr "Autoriser l’enregistrement :"
 
 #: bookwyrm/templates/settings/site.html:83
-#| msgid "Follow Requests"
 msgid "Allow invite requests:"
 msgstr "Autoriser les demandes d’invitation :"
 
@@ -2018,12 +1937,10 @@ msgid "Users: <small>%(server_name)s</small>"
 msgstr "Comptes : <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/settings/user_admin.html:20
-#| msgid "Username:"
 msgid "Username"
 msgstr "Nom du compte"
 
 #: bookwyrm/templates/settings/user_admin.html:24
-#| msgid "added"
 msgid "Date Added"
 msgstr "Date d’ajout"
 
@@ -2032,12 +1949,10 @@ msgid "Last Active"
 msgstr "Dernière activité"
 
 #: bookwyrm/templates/settings/user_admin.html:36
-#| msgid "Remove"
 msgid "Remote server"
 msgstr "Serveur distant"
 
 #: bookwyrm/templates/settings/user_admin.html:45
-#| msgid "Activity"
 msgid "Active"
 msgstr "Actif"
 
@@ -2057,6 +1972,11 @@ msgstr "Bloquer"
 msgid "Un-block"
 msgstr "Débloquer"
 
+#: bookwyrm/templates/snippets/book_cover.html:20
+#: bookwyrm/templates/snippets/search_result_text.html:10
+msgid "No cover"
+msgstr "Aucune couverture"
+
 #: bookwyrm/templates/snippets/book_titleby.html:3
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
@@ -2095,12 +2015,10 @@ msgid "Comment:"
 msgstr "Commentaire :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:20
-#| msgid "Quote"
 msgid "Quote:"
 msgstr "Citation :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:22
-#| msgid "Review"
 msgid "Review:"
 msgstr "Critique :"
 
@@ -2174,7 +2092,6 @@ msgid "Un-like status"
 msgstr "Retirer le statut des favoris"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
-#| msgid "Show less"
 msgid "Show filters"
 msgstr "Afficher les filtres"
 
@@ -2187,7 +2104,6 @@ msgid "Apply filters"
 msgstr "Appliquer les filtres"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
-#| msgid "Clear search"
 msgid "Clear filters"
 msgstr "Annuler les filtres"
 
@@ -2196,7 +2112,6 @@ msgid "Follow"
 msgstr "S’abonner"
 
 #: bookwyrm/templates/snippets/follow_button.html:18
-#| msgid "Send follow request"
 msgid "Undo follow request"
 msgstr "Annuler la demande d’abonnement"
 
@@ -2230,7 +2145,6 @@ msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, 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"
 msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
@@ -2297,13 +2211,11 @@ msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
-#| msgid "of %(pages)s pages"
 msgid "page %(page)s of %(total_pages)s"
 msgstr "page %(page)s sur %(total_pages)s pages"
 
 #: bookwyrm/templates/snippets/page_text.html:6
 #, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "page %(page)s"
 msgstr "page %(page)s"
 
@@ -2374,7 +2286,6 @@ msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
 #: bookwyrm/templates/snippets/readthrough.html:61
-#| msgid "Delete these read dates?"
 msgid "Delete these read dates"
 msgstr "Supprimer ces dates de lecture"
 
@@ -2398,35 +2309,29 @@ msgid "Sign Up"
 msgstr "S’enregistrer"
 
 #: bookwyrm/templates/snippets/report_button.html:5
-#| msgid "Import"
 msgid "Report"
 msgstr "Signaler"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:21
 msgid "rated"
 msgstr "a noté"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:23
 msgid "reviewed"
 msgstr "a écrit une critique de"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:25
 msgid "commented on"
 msgstr "a commenté"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:17
+#: bookwyrm/templates/snippets/status/status_header.html:27
 msgid "quoted"
 msgstr "a cité"
 
-#: bookwyrm/templates/snippets/search_result_text.html:10
-#| msgid "Add cover"
-msgid "No cover"
-msgstr "Aucune couverture"
-
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
@@ -2437,7 +2342,6 @@ msgid "Import book"
 msgstr "Importer le livre"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-#| msgid "Your books"
 msgid "Move book"
 msgstr "Déplacer le livre"
 
@@ -2448,7 +2352,6 @@ 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:35
-#| msgid "Updated:"
 msgid "Update progress"
 msgstr "Progression de la mise à jour"
 
@@ -2457,12 +2360,10 @@ msgid "More shelves"
 msgstr "Plus d’étagères"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
-#| msgid "Started reading"
 msgid "Start reading"
 msgstr "Commencer la lecture"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
-#| msgid "Finished reading"
 msgid "Finish reading"
 msgstr "Terminer la lecture"
 
@@ -2473,7 +2374,6 @@ msgstr "Je veux le lire"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Remove from %(name)s"
 msgstr "Retirer de %(name)s"
 
@@ -2502,41 +2402,37 @@ msgstr "Supprimer le statut"
 msgid "Reply"
 msgstr "Répondre"
 
-#: bookwyrm/templates/snippets/status/status_content.html:18
+#: bookwyrm/templates/snippets/status/status_content.html:52
 #: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "Déplier"
 
-#: bookwyrm/templates/snippets/status/status_content.html:25
-#: bookwyrm/templates/snippets/trimmed_text.html:25
+#: bookwyrm/templates/snippets/status/status_content.html:67
+#: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
 msgstr "Replier"
 
-#: bookwyrm/templates/snippets/status/status_content.html:46
+#: bookwyrm/templates/snippets/status/status_content.html:97
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
-#: bookwyrm/templates/snippets/status/status_header.html:22
+#: bookwyrm/templates/snippets/status/status_header.html:32
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
 msgstr "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/status_header.html:24
+#: bookwyrm/templates/snippets/status/status_header.html:34
 #, 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\">comment</a>"
 msgstr "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/status_header.html:26
+#: bookwyrm/templates/snippets/status/status_header.html:36
 #, 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\">quote</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/status_header.html:28
+#: bookwyrm/templates/snippets/status/status_header.html:38
 #, 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 "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
@@ -2546,7 +2442,6 @@ msgid "More options"
 msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:27
-#| msgid "Delete these read dates?"
 msgid "Delete & re-draft"
 msgstr "Supprimer & recommencer la rédaction"
 
@@ -2555,12 +2450,10 @@ msgid "Switch to this edition"
 msgstr "Changer vers cette édition"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
-#| msgid "Started reading"
 msgid "Sorted ascending"
 msgstr "Trié par ordre croissant"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10
-#| msgid "Started reading"
 msgid "Sorted descending"
 msgstr "Trié par ordre décroissant"
 
@@ -2579,7 +2472,6 @@ msgstr "Livres tagués « %(tag.name)s »"
 
 #: bookwyrm/templates/user/books_header.html:5
 #, python-format
-#| msgid "%(username)s has no followers"
 msgid "%(username)s's books"
 msgstr "Livres de %(username)s"
 
@@ -2616,13 +2508,8 @@ msgstr "Abonné(e) à"
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s n’est abonné(e) à personne"
 
-#: bookwyrm/templates/user/lists.html:9
-msgid "Your Lists"
-msgstr "Vos listes"
-
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Lists: %(username)s"
 msgstr "Listes : %(username)s"
 
@@ -2631,7 +2518,6 @@ msgid "Create list"
 msgstr "Créer une liste"
 
 #: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
-#| msgid "books"
 msgid "All books"
 msgstr "Tous les livres"
 
@@ -2669,7 +2555,6 @@ msgstr "Modifier le profil"
 
 #: bookwyrm/templates/user/user.html:34
 #, python-format
-#| msgid "See all %(size)s"
 msgid "View all %(size)s"
 msgstr "Voir les %(size)s"
 
@@ -2703,7 +2588,6 @@ msgid "Reading Goal"
 msgstr "Défi lecture"
 
 #: bookwyrm/templates/user/user_layout.html:68
-#| msgid "Book"
 msgid "Books"
 msgstr "Livres"
 
@@ -2714,7 +2598,6 @@ msgstr "Enregistré(e) %(date)s"
 
 #: bookwyrm/templates/user/user_preview.html:15
 #, python-format
-#| msgid "%(username)s has no followers"
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s abonnement"
diff --git a/requirements.txt b/requirements.txt
index 16561da5..6b7d82d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 celery==4.4.2
-Django==3.1.6
+Django==3.1.8
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4