From 2faf5cea2a723c43b09b5ffba164e951b23f9682 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 09:01:31 -0800
Subject: [PATCH 01/54] modifies edit book code to allow creation as well

---
 bookwyrm/templates/edit_book.html | 80 +++++++++++++++++++------------
 bookwyrm/urls.py                  |  1 +
 bookwyrm/views/books.py           | 34 ++++++++-----
 3 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 4d215949..aab9e103 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -2,12 +2,16 @@
 {% load i18n %}
 {% load humanize %}
 
-{% block title %}{% trans "Edit Book" %}{% endblock %}
+{% block title %}{% if book %}{% blocktrans with book_title=book.title %}Edit "{{ book_title }}"{% endblocktrans %}{% else %}{% trans "Add Book" %}{% endif %}{% endblock %}
 
 {% block content %}
 <header class="block">
     <h1 class="title level-left">
-        Edit "{{ book.title }}"
+        {% if book %}
+        {% blocktrans with book_title=book.title %}Edit "{{ book.title }}"{% endblocktrans %}
+        {% else %}
+        {% trans "Add Book" %}
+        {% endif %}
     </h1>
     <div>
         <p>{% trans "Added:" %} {{ book.created_date | naturaltime }}</p>
@@ -27,35 +31,49 @@
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
         <div class="column">
-            <h2 class="title is-4">{% trans "Metadata" %}</h2>
-            <p class="fields is-grouped"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
-            {% for error in form.title.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label> {{ form.subtitle }} </p>
-            {% for error in form.subtitle.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_description">{% trans "Description:" %}</label> {{ form.description }} </p>
-            {% for error in form.description.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_series">{% trans "Series:" %}</label> {{ form.series }} </p>
-            {% for error in form.series.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_series_number">{% trans "Series number:" %}</label> {{ form.series_number }} </p>
-            {% for error in form.series_number.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_first_published_date">{% trans "First published date:" %}</label> {{ form.first_published_date }} </p>
-            {% for error in form.first_published_date.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_published_date">{% trans "Published date:" %}</label> {{ form.published_date }} </p>
-            {% for error in form.published_date.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            <section class="block">
+                <h2 class="title is-4">{% trans "Metadata" %}</h2>
+                <p class="fields is-grouped"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
+                {% for error in form.title.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label> {{ form.subtitle }} </p>
+                {% for error in form.subtitle.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_description">{% trans "Description:" %}</label> {{ form.description }} </p>
+                {% for error in form.description.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_series">{% trans "Series:" %}</label> {{ form.series }} </p>
+                {% for error in form.series.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_series_number">{% trans "Series number:" %}</label> {{ form.series_number }} </p>
+                {% for error in form.series_number.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_first_published_date">{% trans "First published date:" %}</label> {{ form.first_published_date }} </p>
+                {% for error in form.first_published_date.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_published_date">{% trans "Published date:" %}</label> {{ form.published_date }} </p>
+                {% for error in form.published_date.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </section>
+
+            <section class="block">
+                <h2 class="title is-4">{% trans "Authors" %}</h2>
+                {% for author in book.authors.all %}
+                <p><a href="{{ author.local_path }}">{{ author.name }}</a>
+                <label class="label">
+                    <input type="checkbox" name="remove-author" value="{{ author.id }}"> {% trans "Remove this author" %}
+                </label>
+                {% endfor %}
+                <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
+                <input class="input" type="text" name="author" id="id_add_author" placeholder="John Doe">
+            </section>
         </div>
 
         <div class="column">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a741088a..dfb64c23 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -134,6 +134,7 @@ urlpatterns = [
     re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
     re_path(r'^resolve-book/?$', views.resolve_book),
     re_path(r'^switch-edition/?$', views.switch_edition),
+    re_path(r'^create-book/?$', views.EditBook.as_view()),
 
     # author
     re_path(r'^author/(?P<author_id>\d+)(.json)?/?$', views.Author.as_view()),
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 4d6afba9..1754982e 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -106,28 +106,40 @@ class Book(View):
     name='dispatch')
 class EditBook(View):
     ''' edit a book '''
-    def get(self, request, book_id):
+    def get(self, request, book_id=None):
         ''' info about a book '''
-        book = get_edition(book_id)
-        if not book.description:
-            book.description = book.parent_work.description
+        book = None
+        if book_id:
+            book = get_edition(book_id)
+            if not book.description:
+                book.description = book.parent_work.description
         data = {
             'book': book,
             'form': forms.EditionForm(instance=book)
         }
         return TemplateResponse(request, 'edit_book.html', data)
 
-    def post(self, request, book_id):
+    def post(self, request, book_id=None):
         ''' edit a book cool '''
-        book = get_object_or_404(models.Edition, id=book_id)
-
+        book = get_object_or_404(models.Edition, id=book_id) if book_id \
+                else None
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
+
+        data = {
+            'book': book,
+            'form': form
+        }
         if not form.is_valid():
-            data = {
-                'book': book,
-                'form': form
-            }
             return TemplateResponse(request, 'edit_book.html', data)
+
+        if not book or form.author:
+            # creting a book or adding an author to a book needs another step
+            return TemplateResponse(request, 'confirm_book.html', data)
+
+        # remove authors
+        if request.POST.get('remove-author'):
+            import pdb;pdb.set_trace()
+            author = get_object_or_404(id=author_id)
         book = form.save()
 
         return redirect('/book/%s' % book.id)

From b2d1384bc5065725ec51c4204cc97f64a9a751f6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 13:48:50 -0800
Subject: [PATCH 02/54] UI for adding and removing authors

---
 bookwyrm/templates/edit_book.html | 43 ++++++++++++++++++++++++++++---
 bookwyrm/tests/views/test_book.py | 16 ++++++++++++
 bookwyrm/views/books.py           | 33 ++++++++++++++++++------
 3 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index aab9e103..d0eb50be 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -26,7 +26,8 @@
 </div>
 {% endif %}
 
-<form class="block" name="edit-book" action="{{ book.local_path }}/edit" method="post" enctype="multipart/form-data">
+<form class="block" name="edit-book" action="{{ book.local_path }}/edit#deduplication" method="post" enctype="multipart/form-data">
+    <fieldset {% if confirm_mode %}disabled{% endif %}>
     {% csrf_token %}
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
@@ -68,11 +69,11 @@
                 {% for author in book.authors.all %}
                 <p><a href="{{ author.local_path }}">{{ author.name }}</a>
                 <label class="label">
-                    <input type="checkbox" name="remove-author" value="{{ author.id }}"> {% trans "Remove this author" %}
+                    <input type="checkbox" name="remove_author" value="{{ author.id }}"> {% trans "Remove this author" %}
                 </label>
                 {% endfor %}
                 <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
-                <input class="input" type="text" name="author" id="id_add_author" placeholder="John Doe">
+                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="John Doe" value="{{ add_author }}">
             </section>
         </div>
 
@@ -138,6 +139,42 @@
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
         <a class="button" href="/book/{{ book.id }}">{% trans "Cancel" %}</a>
     </div>
+    </fieldset>
 </form>
 
+{% if author_matches or book_matches %}
+<hr class="block">
+<form class="box content" id="deduplication">
+    <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
+    <div class="columns">
+        {% if author_matches.exists %}
+        <fieldset class="column is-half">
+            <legend class="label">{% blocktrans %}Is "{{ add_author }}" an existing author?{% endblocktrans %}</legend>
+            {% for match in author_matches %}
+            <label class="label"><input type="radio" name="author_match" value="{{ match.id }}"> {{ match.name }}</label>
+            <p class="help">
+                <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
+            </p>
+            {% endfor %}
+            <label class="label"><input type="radio" name="author_match"> this is a new author</label>
+        </fieldset>
+        {% else %}
+        <p class="column is-half">{% blocktrans %}Creating a new author: {{ add_author }}{% endblocktrans %}</p>
+        {% endif %}
+
+        {% if not book %}
+        <fieldset class="column is-half">
+            <legend class="title is-5">{% trans "Is this an editions of an existing work?" %}</legend>
+            {% for match in book_matches %}
+            <label class="label"><input type="radio" name="book_match" value="{{ match.id }}"> {{ match.title }}</label>
+            {% endfor %}
+            <label class="label"><input type="radio" name="book_match"> this is a new work</label>
+        </fieldset>
+        {% endif %}
+    </div>
+
+    <button class="button is-primary" type="submit">{% trans "save" %}</button>
+</form>
+{% endif %}
+
 {% endblock %}
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index b3360200..b7eaac4b 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -83,6 +83,22 @@ class BookViews(TestCase):
         self.assertEqual(self.book.title, 'New Title')
 
 
+    def test_edit_book_add_author(self):
+        ''' lets a user edit a book '''
+        view = views.EditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm(instance=self.book)
+        form.data['title'] = 'New Title'
+        form.data['last_edited_by'] = self.local_user.id
+        form.data['add_author'] = "John Doe"
+        request = self.factory.post('', form.data)
+        request.user = self.local_user
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            view(request, self.book.id)
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.title, 'New Title')
+
+
     def test_switch_edition(self):
         ''' updates user's relationships to a book '''
         work = models.Work.objects.create(title='test work')
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 1754982e..174ddaa3 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,6 +1,7 @@
 ''' the good stuff! the books! '''
-from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.postgres.search import SearchRank, SearchVector
+from django.core.paginator import Paginator
 from django.db import transaction
 from django.db.models import Avg, Q
 from django.http import HttpResponseNotFound
@@ -132,16 +133,32 @@ class EditBook(View):
         if not form.is_valid():
             return TemplateResponse(request, 'edit_book.html', data)
 
-        if not book or form.author:
+        add_author = request.POST.get('add_author')
+        if not book or add_author:
             # creting a book or adding an author to a book needs another step
-            return TemplateResponse(request, 'confirm_book.html', data)
+            data['confirm_mode'] = True
+            data['add_author'] = add_author
+            # check for existing authors
+            vector = SearchVector('name', weight='A') +\
+                     SearchVector('aliases', weight='B')
+
+            data['author_matches'] = models.Author.objects.annotate(
+                search=vector
+            ).annotate(
+                rank=SearchRank(vector, add_author)
+            ).filter(rank__gt=0.8).order_by('-rank')[:5]
+
+            # check if this is an edition of an existing work
+            author_text = book.author_text if book else add_author
+            data['book_matches'] = connector_manager.local_search(
+                '%s %s' % (form.cleaned_data.get('title'), author_text),
+                min_confidence=0.5,
+                raw=True
+            )[:5]
+
+            return TemplateResponse(request, 'edit_book.html', data)
 
-        # remove authors
-        if request.POST.get('remove-author'):
-            import pdb;pdb.set_trace()
-            author = get_object_or_404(id=author_id)
         book = form.save()
-
         return redirect('/book/%s' % book.id)
 
 

From 5c089db086f6d85748cfff84ea04d54aababd5fa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 17:09:49 -0800
Subject: [PATCH 03/54] Full add author flow

---
 bookwyrm/templates/edit_book.html | 84 +++++++++++++++++--------------
 bookwyrm/tests/views/test_book.py | 13 +----
 bookwyrm/urls.py                  |  1 +
 bookwyrm/views/__init__.py        |  2 +-
 bookwyrm/views/books.py           | 53 +++++++++++++++++--
 5 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index d0eb50be..0637bb79 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -8,7 +8,7 @@
 <header class="block">
     <h1 class="title level-left">
         {% if book %}
-        {% blocktrans with book_title=book.title %}Edit "{{ book.title }}"{% endblocktrans %}
+        {% blocktrans with book_title=book.title %}Edit "{{ book_title }}"{% endblocktrans %}
         {% else %}
         {% trans "Add Book" %}
         {% endif %}
@@ -26,9 +26,46 @@
 </div>
 {% endif %}
 
-<form class="block" name="edit-book" action="{{ book.local_path }}/edit#deduplication" method="post" enctype="multipart/form-data">
-    <fieldset {% if confirm_mode %}disabled{% endif %}>
+<form class="block" name="edit-book" action="{{ book.local_path }}/{% if confirm_mode %}confirm{% else %}edit{% endif %}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
+    {% if confirm_mode %}
+    <div class="box">
+        <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
+        <div class="columns">
+            {% if author_matches.exists %}
+            <fieldset class="column is-half">
+                <legend class="label">{% blocktrans with name=add_author %}Is "{{ name }}" an existing author?{% endblocktrans %}</legend>
+                {% for match in author_matches %}
+                <label><input type="radio" name="author_match" value="{{ match.id }}" required> {{ match.name }}</label>
+                <p class="help">
+                    <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
+                </p>
+                {% endfor %}
+                <label><input type="radio" name="author_match"> {% trans "This is a new author" %}</label>
+            </fieldset>
+            {% else %}
+            <p class="column is-half">{% blocktrans with name=add_author %}Creating a new author: {{ name }}{% endblocktrans %}</p>
+            {% endif %}
+
+            {% if not book %}
+            <fieldset class="column is-half">
+                <legend class="title is-5">{% trans "Is this an editions of an existing work?" %}</legend>
+                {% for match in book_matches %}
+                <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
+                {% endfor %}
+                <label><input type="radio" name="parent_work"> this is a new work</label>
+            </fieldset>
+            {% endif %}
+        </div>
+
+        <button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
+        <button class="button" type="button">{% trans "Back" %}</button>
+    </div>
+
+    <hr class="block">
+    {% endif %}
+
+    <fieldset>
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
         <div class="column">
@@ -72,8 +109,12 @@
                     <input type="checkbox" name="remove_author" value="{{ author.id }}"> {% trans "Remove this author" %}
                 </label>
                 {% endfor %}
+                {% if confirm_mode %}
+                <input type="hidden" name="add_author" id="id_add_author" value="{{ add_author }}">
+                {% else %}
                 <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
-                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="John Doe" value="{{ add_author }}">
+                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe' %}" value="{{ add_author }}">
+                {% endif %}
             </section>
         </div>
 
@@ -142,39 +183,4 @@
     </fieldset>
 </form>
 
-{% if author_matches or book_matches %}
-<hr class="block">
-<form class="box content" id="deduplication">
-    <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
-    <div class="columns">
-        {% if author_matches.exists %}
-        <fieldset class="column is-half">
-            <legend class="label">{% blocktrans %}Is "{{ add_author }}" an existing author?{% endblocktrans %}</legend>
-            {% for match in author_matches %}
-            <label class="label"><input type="radio" name="author_match" value="{{ match.id }}"> {{ match.name }}</label>
-            <p class="help">
-                <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
-            </p>
-            {% endfor %}
-            <label class="label"><input type="radio" name="author_match"> this is a new author</label>
-        </fieldset>
-        {% else %}
-        <p class="column is-half">{% blocktrans %}Creating a new author: {{ add_author }}{% endblocktrans %}</p>
-        {% endif %}
-
-        {% if not book %}
-        <fieldset class="column is-half">
-            <legend class="title is-5">{% trans "Is this an editions of an existing work?" %}</legend>
-            {% for match in book_matches %}
-            <label class="label"><input type="radio" name="book_match" value="{{ match.id }}"> {{ match.title }}</label>
-            {% endfor %}
-            <label class="label"><input type="radio" name="book_match"> this is a new work</label>
-        </fieldset>
-        {% endif %}
-    </div>
-
-    <button class="button is-primary" type="submit">{% trans "save" %}</button>
-</form>
-{% endif %}
-
 {% endblock %}
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index b7eaac4b..8a6c66cb 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -85,18 +85,7 @@ class BookViews(TestCase):
 
     def test_edit_book_add_author(self):
         ''' lets a user edit a book '''
-        view = views.EditBook.as_view()
-        self.local_user.groups.add(self.group)
-        form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        form.data['add_author'] = "John Doe"
-        request = self.factory.post('', form.data)
-        request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            view(request, self.book.id)
-        self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'New Title')
+        # TODO
 
 
     def test_switch_edition(self):
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index dfb64c23..9e0d4630 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -129,6 +129,7 @@ urlpatterns = [
     # books
     re_path(r'%s(.json)?/?$' % book_path, views.Book.as_view()),
     re_path(r'%s/edit/?$' % book_path, views.EditBook.as_view()),
+    re_path(r'%s/confirm/?$' % book_path, views.ConfirmEditBook.as_view()),
     re_path(r'%s/editions(.json)?/?$' % book_path, views.Editions.as_view()),
     re_path(r'^upload-cover/(?P<book_id>\d+)/?$', views.upload_cover),
     re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 2c7cdc46..c3d17da7 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -2,7 +2,7 @@
 from .authentication import Login, Register, Logout
 from .author import Author, EditAuthor
 from .block import Block, unblock
-from .books import Book, EditBook, Editions
+from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .error import not_found_page, server_error_page
 from .federation import Federation
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 174ddaa3..0097eb9f 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -122,8 +122,8 @@ class EditBook(View):
 
     def post(self, request, book_id=None):
         ''' edit a book cool '''
-        book = get_object_or_404(models.Edition, id=book_id) if book_id \
-                else None
+        # returns None if no match is found
+        book = models.Edition.objects.filter(id=book_id).first()
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
 
         data = {
@@ -134,9 +134,8 @@ class EditBook(View):
             return TemplateResponse(request, 'edit_book.html', data)
 
         add_author = request.POST.get('add_author')
-        if not book or add_author:
-            # creting a book or adding an author to a book needs another step
-            data['confirm_mode'] = True
+        # we're adding an author through a free text field
+        if add_author:
             data['add_author'] = add_author
             # check for existing authors
             vector = SearchVector('name', weight='A') +\
@@ -148,6 +147,8 @@ class EditBook(View):
                 rank=SearchRank(vector, add_author)
             ).filter(rank__gt=0.8).order_by('-rank')[:5]
 
+        # we're creating a new book
+        if not book:
             # check if this is an edition of an existing work
             author_text = book.author_text if book else add_author
             data['book_matches'] = connector_manager.local_search(
@@ -156,12 +157,54 @@ class EditBook(View):
                 raw=True
             )[:5]
 
+        # either of the above cases requires additional confirmation
+        if add_author or not book:
+            # creting a book or adding an author to a book needs another step
+            data['confirm_mode'] = True
             return TemplateResponse(request, 'edit_book.html', data)
 
         book = form.save()
         return redirect('/book/%s' % book.id)
 
 
+@method_decorator(login_required, name='dispatch')
+@method_decorator(
+    permission_required('bookwyrm.edit_book', raise_exception=True),
+    name='dispatch')
+class ConfirmEditBook(View):
+    ''' confirm edits to a book '''
+    def post(self, request, book_id=None):
+        ''' edit a book cool '''
+        # returns None if no match is found
+        book = models.Edition.objects.filter(id=book_id).first()
+        form = forms.EditionForm(request.POST, request.FILES, instance=book)
+
+        data = {
+            'book': book,
+            'form': form
+        }
+        if not form.is_valid():
+            return TemplateResponse(request, 'edit_book.html', data)
+
+        # create work, if needed
+        # TODO
+
+        # save book
+        book = form.save()
+
+        # get or create author as needed
+        if request.POST.get('add_author'):
+            if request.POST.get('author_match'):
+                author = get_object_or_404(
+                    models.Author, id=request.POST['author_match'])
+            else:
+                author = models.Author.objects.create(
+                    name=request.POST.get('add_author'))
+            book.authors.add(author)
+
+        return redirect('/book/%s' % book.id)
+
+
 class Editions(View):
     ''' list of editions '''
     def get(self, request, book_id):

From bbd3ac7242662964b055c89344de25c745c77019 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 13:17:11 -0800
Subject: [PATCH 04/54] Removes ID field from hideen form value

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

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 0637bb79..dc927e8a 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -110,7 +110,7 @@
                 </label>
                 {% endfor %}
                 {% if confirm_mode %}
-                <input type="hidden" name="add_author" id="id_add_author" value="{{ add_author }}">
+                <input type="hidden" name="add_author" value="{{ add_author }}">
                 {% else %}
                 <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
                 <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe' %}" value="{{ add_author }}">

From f1b699d8105c96dbb83f2b88102dffd75e83ddd0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 13:59:27 -0800
Subject: [PATCH 05/54] Tests adding author to book

---
 bookwyrm/tests/views/test_book.py | 36 +++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 8a6c66cb..0ba09e3b 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -84,8 +84,40 @@ class BookViews(TestCase):
 
 
     def test_edit_book_add_author(self):
-        ''' lets a user edit a book '''
-        # TODO
+        ''' lets a user edit a book with new authors '''
+        view = views.EditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm(instance=self.book)
+        form.data['title'] = 'New Title'
+        form.data['last_edited_by'] = self.local_user.id
+        form.data['add_author'] = 'Sappho'
+        request = self.factory.post('', form.data)
+        request.user = self.local_user
+
+        result = view(request, self.book.id)
+        result.render()
+
+        # the changes haven't been saved yet
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.title, 'Example Edition')
+
+    def test_edit_book_add_new_author_confirm(self):
+        ''' lets a user edit a book confirmed with new authors '''
+        view = views.ConfirmEditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm(instance=self.book)
+        form.data['title'] = 'New Title'
+        form.data['last_edited_by'] = self.local_user.id
+        form.data['add_author'] = 'Sappho'
+        request = self.factory.post('', form.data)
+        request.user = self.local_user
+
+        view(request, self.book.id)
+
+        # the changes haven't been saved yet
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.title, 'New Title')
+        self.assertEqual(self.book.authors.first().name, 'Sappho')
 
 
     def test_switch_edition(self):

From 79d9c493f7fcc8b64d9e3c878f8358f331c29d11 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 14:19:22 -0800
Subject: [PATCH 06/54] Remove author flow

---
 bookwyrm/templates/edit_book.html | 14 ++++++++------
 bookwyrm/views/books.py           |  4 ++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index dc927e8a..a4d62efd 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -103,12 +103,14 @@
 
             <section class="block">
                 <h2 class="title is-4">{% trans "Authors" %}</h2>
-                {% for author in book.authors.all %}
-                <p><a href="{{ author.local_path }}">{{ author.name }}</a>
-                <label class="label">
-                    <input type="checkbox" name="remove_author" value="{{ author.id }}"> {% trans "Remove this author" %}
-                </label>
-                {% endfor %}
+                <fieldset>
+                    {% for author in book.authors.all %}
+                    <p><a href="{{ author.local_path }}">{{ author.name }}</a>
+                    <label class="label">
+                        <input type="checkbox" name="remove_authors" value="{{ author.id }}"> {% trans "Remove this author" %}
+                    </label>
+                    {% endfor %}
+                </fieldset>
                 {% if confirm_mode %}
                 <input type="hidden" name="add_author" value="{{ add_author }}">
                 {% else %}
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 0097eb9f..cc05a79c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -163,6 +163,10 @@ class EditBook(View):
             data['confirm_mode'] = True
             return TemplateResponse(request, 'edit_book.html', data)
 
+        remove_authors = request.POST.getlist('remove_authors')
+        for author_id in remove_authors:
+            book.authors.remove(author_id)
+
         book = form.save()
         return redirect('/book/%s' % book.id)
 

From 1eac2b938618f6dcf8ed63989ed39b560e6cd826 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 15:14:57 -0800
Subject: [PATCH 07/54] Test for deleting authors

---
 bookwyrm/tests/views/test_book.py | 20 +++++++++++++++++++-
 bookwyrm/views/books.py           |  4 ++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 0ba09e3b..6a28ba9d 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -114,11 +114,29 @@ class BookViews(TestCase):
 
         view(request, self.book.id)
 
-        # the changes haven't been saved yet
         self.book.refresh_from_db()
         self.assertEqual(self.book.title, 'New Title')
         self.assertEqual(self.book.authors.first().name, 'Sappho')
 
+    def test_edit_book_remove_author(self):
+        ''' remove an author from a book '''
+        author = models.Author.objects.create(name='Sappho')
+        self.book.authors.add(author)
+        form = forms.EditionForm(instance=self.book)
+        view = views.EditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm(instance=self.book)
+        form.data['title'] = 'New Title'
+        form.data['last_edited_by'] = self.local_user.id
+        form.data['remove_authors'] = [author.id]
+        request = self.factory.post('', form.data)
+        request.user = self.local_user
+
+        view(request, self.book.id)
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.title, 'New Title')
+        self.assertFalse(self.book.authors.exists())
+
 
     def test_switch_edition(self):
         ''' updates user's relationships to a book '''
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index cc05a79c..07a1d437 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -206,6 +206,10 @@ class ConfirmEditBook(View):
                     name=request.POST.get('add_author'))
             book.authors.add(author)
 
+        remove_authors = request.POST.getlist('remove_authors')
+        for author_id in remove_authors:
+            book.authors.remove(author_id)
+
         return redirect('/book/%s' % book.id)
 
 

From d3162e12db9d4f9ae975253f5fe10e21747f6c0a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 08:51:54 -0800
Subject: [PATCH 08/54] Adds broadcast mock to edit book tests

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

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 6a28ba9d..484c695b 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -112,7 +112,8 @@ class BookViews(TestCase):
         request = self.factory.post('', form.data)
         request.user = self.local_user
 
-        view(request, self.book.id)
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            view(request, self.book.id)
 
         self.book.refresh_from_db()
         self.assertEqual(self.book.title, 'New Title')
@@ -132,7 +133,8 @@ class BookViews(TestCase):
         request = self.factory.post('', form.data)
         request.user = self.local_user
 
-        view(request, self.book.id)
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            view(request, self.book.id)
         self.book.refresh_from_db()
         self.assertEqual(self.book.title, 'New Title')
         self.assertFalse(self.book.authors.exists())

From a5baa1f5c618e393b8f8e791c3730868044324da Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 09:28:22 -0800
Subject: [PATCH 09/54] Create new books

---
 bookwyrm/forms.py                      |  2 +-
 bookwyrm/templates/edit_book.html      | 11 ++++---
 bookwyrm/templates/search_results.html |  4 +++
 bookwyrm/urls.py                       |  3 +-
 bookwyrm/views/books.py                | 42 +++++++++++++++-----------
 5 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index b920fc9c..1ab6e0ee 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -134,7 +134,7 @@ class EditionForm(CustomForm):
             'updated_date',
             'edition_rank',
 
-            'authors',# TODO
+            'authors',
             'parent_work',
             'shelves',
 
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index a4d62efd..1ebcc6b9 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -13,11 +13,13 @@
         {% trans "Add Book" %}
         {% endif %}
     </h1>
+    {% if book %}
     <div>
         <p>{% trans "Added:" %} {{ book.created_date | naturaltime }}</p>
         <p>{% trans "Updated:" %} {{ book.updated_date | naturaltime }}</p>
         <p>{% trans "Last edited by:" %} <a href="{{ book.last_edited_by.remote_id }}">{{ book.last_edited_by.display_name }}</a></p>
     </div>
+    {% endif %}
 </header>
 
 {% if form.non_field_errors %}
@@ -26,7 +28,12 @@
 </div>
 {% endif %}
 
+{% if book %}
 <form class="block" name="edit-book" action="{{ book.local_path }}/{% if confirm_mode %}confirm{% else %}edit{% endif %}" method="post" enctype="multipart/form-data">
+{% else %}
+<form class="block" name="create-book" action="/create-book{% if confirm_mode %}/confirm{% endif %}" method="post" enctype="multipart/form-data">
+{% endif %}
+
     {% csrf_token %}
     {% if confirm_mode %}
     <div class="box">
@@ -111,12 +118,8 @@
                     </label>
                     {% endfor %}
                 </fieldset>
-                {% if confirm_mode %}
-                <input type="hidden" name="add_author" value="{{ add_author }}">
-                {% else %}
                 <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
                 <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe' %}" value="{{ add_author }}">
-                {% endif %}
             </section>
         </div>
 
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 4e8481f0..13497df8 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -68,6 +68,10 @@
             {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results" %}
             {% endif %}
         </div>
+
+        <div class="block">
+            <a href="/create-book">Manually add book</a>
+        </div>
         {% endif %}
     </div>
     <div class="column">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 25b44fb4..0000015e 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -130,12 +130,13 @@ urlpatterns = [
     re_path(r'%s(.json)?/?$' % book_path, views.Book.as_view()),
     re_path(r'%s/edit/?$' % book_path, views.EditBook.as_view()),
     re_path(r'%s/confirm/?$' % book_path, views.ConfirmEditBook.as_view()),
+    re_path(r'^create-book/?$', views.EditBook.as_view()),
+    re_path(r'^create-book/confirm?$', views.ConfirmEditBook.as_view()),
     re_path(r'%s/editions(.json)?/?$' % book_path, views.Editions.as_view()),
     re_path(r'^upload-cover/(?P<book_id>\d+)/?$', views.upload_cover),
     re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
     re_path(r'^resolve-book/?$', views.resolve_book),
     re_path(r'^switch-edition/?$', views.switch_edition),
-    re_path(r'^create-book/?$', views.EditBook.as_view()),
 
     # isbn
     re_path(r'^isbn/(?P<isbn>\d+)(.json)?/?$', views.Isbn.as_view()),
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 5f03e1a9..a115ac49 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -145,7 +145,7 @@ class EditBook(View):
                 search=vector
             ).annotate(
                 rank=SearchRank(vector, add_author)
-            ).filter(rank__gt=0.8).order_by('-rank')[:5]
+            ).filter(rank__gt=0.4).order_by('-rank')[:5]
 
         # we're creating a new book
         if not book:
@@ -190,25 +190,33 @@ class ConfirmEditBook(View):
         if not form.is_valid():
             return TemplateResponse(request, 'edit_book.html', data)
 
-        # create work, if needed
-        # TODO
+        with transaction.atomic():
+            # save book
+            book = form.save()
 
-        # save book
-        book = form.save()
+            # get or create author as needed
+            if request.POST.get('add_author'):
+                if request.POST.get('author_match'):
+                    author = get_object_or_404(
+                        models.Author, id=request.POST['author_match'])
+                else:
+                    author = models.Author.objects.create(
+                        name=request.POST.get('add_author'))
+                book.authors.add(author)
 
-        # get or create author as needed
-        if request.POST.get('add_author'):
-            if request.POST.get('author_match'):
-                author = get_object_or_404(
-                    models.Author, id=request.POST['author_match'])
-            else:
-                author = models.Author.objects.create(
-                    name=request.POST.get('add_author'))
-            book.authors.add(author)
+            # create work, if needed
+            if not book_id:
+                work_match = request.POST.get('parent_work')
+                if work_match:
+                    work = get_object_or_404(models.Work, id=work_match)
+                else:
+                    work = models.Work.objects.create(title=form.cleaned_data.title)
+                    work.authors.set(book.authors.all())
+                book.parent_work = work
+                book.save()
 
-        remove_authors = request.POST.getlist('remove_authors')
-        for author_id in remove_authors:
-            book.authors.remove(author_id)
+            for author_id in request.POST.getlist('remove_authors'):
+                book.authors.remove(author_id)
 
         return redirect('/book/%s' % book.id)
 

From acbebbe94768bdefe763424ff157a6f3a13059bd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 10:10:30 -0800
Subject: [PATCH 10/54] Formats code changes

---
 bookwyrm/forms.py                 |  1 -
 bookwyrm/tests/views/test_book.py | 45 ++++++++--------
 bookwyrm/urls.py                  | 21 ++++----
 bookwyrm/views/books.py           | 87 +++++++++++++++----------------
 bw-dev                            |  2 +-
 5 files changed, 75 insertions(+), 81 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 09e13ae5..99c45ed2 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -138,7 +138,6 @@ class EditionForm(CustomForm):
     class Meta:
         model = models.Edition
         exclude = [
-
             "remote_id",
             "origin_id",
             "created_date",
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index feadf862..02493769 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -85,14 +85,14 @@ class BookViews(TestCase):
         self.assertEqual(self.book.title, "New Title")
 
     def test_edit_book_add_author(self):
-        ''' lets a user edit a book with new authors '''
+        """ lets a user edit a book with new authors """
         view = views.EditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        form.data['add_author'] = 'Sappho'
-        request = self.factory.post('', form.data)
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        form.data["add_author"] = "Sappho"
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
         result = view(request, self.book.id)
@@ -100,47 +100,46 @@ class BookViews(TestCase):
 
         # the changes haven't been saved yet
         self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'Example Edition')
+        self.assertEqual(self.book.title, "Example Edition")
 
     def test_edit_book_add_new_author_confirm(self):
-        ''' lets a user edit a book confirmed with new authors '''
+        """ lets a user edit a book confirmed with new authors """
         view = views.ConfirmEditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        form.data['add_author'] = 'Sappho'
-        request = self.factory.post('', form.data)
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        form.data["add_author"] = "Sappho"
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, self.book.id)
 
         self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'New Title')
-        self.assertEqual(self.book.authors.first().name, 'Sappho')
+        self.assertEqual(self.book.title, "New Title")
+        self.assertEqual(self.book.authors.first().name, "Sappho")
 
     def test_edit_book_remove_author(self):
-        ''' remove an author from a book '''
-        author = models.Author.objects.create(name='Sappho')
+        """ remove an author from a book """
+        author = models.Author.objects.create(name="Sappho")
         self.book.authors.add(author)
         form = forms.EditionForm(instance=self.book)
         view = views.EditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        form.data['remove_authors'] = [author.id]
-        request = self.factory.post('', form.data)
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        form.data["remove_authors"] = [author.id]
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, self.book.id)
         self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'New Title')
+        self.assertEqual(self.book.title, "New Title")
         self.assertFalse(self.book.authors.exists())
 
-
     def test_switch_edition(self):
         """ updates user's relationships to a book """
         work = models.Work.objects.create(title="test work")
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 246ac8af..ed752e75 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -117,17 +117,16 @@ urlpatterns = [
     re_path(r"^boost/(?P<status_id>\d+)/?$", views.Boost.as_view()),
     re_path(r"^unboost/(?P<status_id>\d+)/?$", views.Unboost.as_view()),
     # books
-    re_path(r'%s(.json)?/?$' % book_path, views.Book.as_view()),
-    re_path(r'%s/edit/?$' % book_path, views.EditBook.as_view()),
-    re_path(r'%s/confirm/?$' % book_path, views.ConfirmEditBook.as_view()),
-    re_path(r'^create-book/?$', views.EditBook.as_view()),
-    re_path(r'^create-book/confirm?$', views.ConfirmEditBook.as_view()),
-    re_path(r'%s/editions(.json)?/?$' % book_path, views.Editions.as_view()),
-    re_path(r'^upload-cover/(?P<book_id>\d+)/?$', views.upload_cover),
-    re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
-    re_path(r'^resolve-book/?$', views.resolve_book),
-    re_path(r'^switch-edition/?$', views.switch_edition),
-
+    re_path(r"%s(.json)?/?$" % book_path, views.Book.as_view()),
+    re_path(r"%s/edit/?$" % book_path, views.EditBook.as_view()),
+    re_path(r"%s/confirm/?$" % book_path, views.ConfirmEditBook.as_view()),
+    re_path(r"^create-book/?$", views.EditBook.as_view()),
+    re_path(r"^create-book/confirm?$", views.ConfirmEditBook.as_view()),
+    re_path(r"%s/editions(.json)?/?$" % book_path, views.Editions.as_view()),
+    re_path(r"^upload-cover/(?P<book_id>\d+)/?$", views.upload_cover),
+    re_path(r"^add-description/(?P<book_id>\d+)/?$", views.add_description),
+    re_path(r"^resolve-book/?$", views.resolve_book),
+    re_path(r"^switch-edition/?$", views.switch_edition),
     # isbn
     re_path(r"^isbn/(?P<isbn>\d+)(.json)?/?$", views.Isbn.as_view()),
     # author
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 7c3ec348..55cc75b4 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -106,107 +106,104 @@ class Book(View):
     permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
 )
 class EditBook(View):
-    ''' edit a book '''
+    """ edit a book """
+
     def get(self, request, book_id=None):
-        ''' info about a book '''
+        """ info about a book """
         book = None
         if book_id:
             book = get_edition(book_id)
             if not book.description:
                 book.description = book.parent_work.description
-        data = {
-            'book': book,
-            'form': forms.EditionForm(instance=book)
-        }
-        return TemplateResponse(request, 'edit_book.html', data)
+        data = {"book": book, "form": forms.EditionForm(instance=book)}
+        return TemplateResponse(request, "edit_book.html", data)
 
     def post(self, request, book_id=None):
-        ''' edit a book cool '''
+        """ edit a book cool """
         # returns None if no match is found
         book = models.Edition.objects.filter(id=book_id).first()
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
 
-        data = {
-            'book': book,
-            'form': form
-        }
+        data = {"book": book, "form": form}
         if not form.is_valid():
-            return TemplateResponse(request, 'edit_book.html', data)
+            return TemplateResponse(request, "edit_book.html", data)
 
-        add_author = request.POST.get('add_author')
+        add_author = request.POST.get("add_author")
         # we're adding an author through a free text field
         if add_author:
-            data['add_author'] = add_author
+            data["add_author"] = add_author
             # check for existing authors
-            vector = SearchVector('name', weight='A') +\
-                     SearchVector('aliases', weight='B')
+            vector = SearchVector("name", weight="A") + SearchVector(
+                "aliases", weight="B"
+            )
 
-            data['author_matches'] = models.Author.objects.annotate(
-                search=vector
-            ).annotate(
-                rank=SearchRank(vector, add_author)
-            ).filter(rank__gt=0.4).order_by('-rank')[:5]
+            data["author_matches"] = (
+                models.Author.objects.annotate(search=vector)
+                .annotate(rank=SearchRank(vector, add_author))
+                .filter(rank__gt=0.4)
+                .order_by("-rank")[:5]
+            )
 
         # we're creating a new book
         if not book:
             # check if this is an edition of an existing work
             author_text = book.author_text if book else add_author
-            data['book_matches'] = connector_manager.local_search(
-                '%s %s' % (form.cleaned_data.get('title'), author_text),
+            data["book_matches"] = connector_manager.local_search(
+                "%s %s" % (form.cleaned_data.get("title"), author_text),
                 min_confidence=0.5,
-                raw=True
+                raw=True,
             )[:5]
 
         # either of the above cases requires additional confirmation
         if add_author or not book:
             # creting a book or adding an author to a book needs another step
-            data['confirm_mode'] = True
-            return TemplateResponse(request, 'edit_book.html', data)
+            data["confirm_mode"] = True
+            return TemplateResponse(request, "edit_book.html", data)
 
-        remove_authors = request.POST.getlist('remove_authors')
+        remove_authors = request.POST.getlist("remove_authors")
         for author_id in remove_authors:
             book.authors.remove(author_id)
 
         book = form.save()
-        return redirect('/book/%s' % book.id)
+        return redirect("/book/%s" % book.id)
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required('bookwyrm.edit_book', raise_exception=True),
-    name='dispatch')
+    permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
+)
 class ConfirmEditBook(View):
-    ''' confirm edits to a book '''
+    """ confirm edits to a book """
+
     def post(self, request, book_id=None):
-        ''' edit a book cool '''
+        """ edit a book cool """
         # returns None if no match is found
         book = models.Edition.objects.filter(id=book_id).first()
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
 
-        data = {
-            'book': book,
-            'form': form
-        }
+        data = {"book": book, "form": form}
         if not form.is_valid():
-            return TemplateResponse(request, 'edit_book.html', data)
+            return TemplateResponse(request, "edit_book.html", data)
 
         with transaction.atomic():
             # save book
             book = form.save()
 
             # get or create author as needed
-            if request.POST.get('add_author'):
-                if request.POST.get('author_match'):
+            if request.POST.get("add_author"):
+                if request.POST.get("author_match"):
                     author = get_object_or_404(
-                        models.Author, id=request.POST['author_match'])
+                        models.Author, id=request.POST["author_match"]
+                    )
                 else:
                     author = models.Author.objects.create(
-                        name=request.POST.get('add_author'))
+                        name=request.POST.get("add_author")
+                    )
                 book.authors.add(author)
 
             # create work, if needed
             if not book_id:
-                work_match = request.POST.get('parent_work')
+                work_match = request.POST.get("parent_work")
                 if work_match:
                     work = get_object_or_404(models.Work, id=work_match)
                 else:
@@ -215,7 +212,7 @@ class ConfirmEditBook(View):
                 book.parent_work = work
                 book.save()
 
-            for author_id in request.POST.getlist('remove_authors'):
+            for author_id in request.POST.getlist("remove_authors"):
                 book.authors.remove(author_id)
 
         return redirect("/book/%s" % book.id)
diff --git a/bw-dev b/bw-dev
index 74c42fbb..712b8028 100755
--- a/bw-dev
+++ b/bw-dev
@@ -36,7 +36,7 @@ function initdb {
 }
 
 function makeitblack {
-    runweb black celerywyrm bookwyrm
+    docker-compose run --rm web black celerywyrm bookwyrm
 }
 
 CMD=$1

From 58b48faff870723a8aba0bf745756c82c266c6ed Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 10:48:45 -0800
Subject: [PATCH 11/54] Tests create books flow

---
 bookwyrm/tests/views/test_book.py | 29 +++++++++++++++++++++++++++++
 bookwyrm/views/books.py           |  3 +--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 02493769..90b7359d 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -140,6 +140,35 @@ class BookViews(TestCase):
         self.assertEqual(self.book.title, "New Title")
         self.assertFalse(self.book.authors.exists())
 
+    def test_create_book(self):
+        """ create an entirely new book and work """
+        view = views.ConfirmEditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm()
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request)
+        book = models.Edition.objects.get(title="New Title")
+        self.assertEqual(book.parent_work.title, "New Title")
+
+    def test_create_book_existing_work(self):
+        """ create an entirely new book and work """
+        view = views.ConfirmEditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm()
+        form.data["title"] = "New Title"
+        form.data["parent_work"] = self.work.id
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request)
+        book = models.Edition.objects.get(title="New Title")
+        self.assertEqual(book.parent_work, self.work)
+
     def test_switch_edition(self):
         """ updates user's relationships to a book """
         work = models.Work.objects.create(title="test work")
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 55cc75b4..ecba4376 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,5 +1,4 @@
 """ the good stuff! the books! """
-from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.postgres.search import SearchRank, SearchVector
 from django.core.paginator import Paginator
@@ -207,7 +206,7 @@ class ConfirmEditBook(View):
                 if work_match:
                     work = get_object_or_404(models.Work, id=work_match)
                 else:
-                    work = models.Work.objects.create(title=form.cleaned_data.title)
+                    work = models.Work.objects.create(title=form.cleaned_data["title"])
                     work.authors.set(book.authors.all())
                 book.parent_work = work
                 book.save()

From 37e29cc735f8b4c01fb225ab78265656f145bca7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 11:11:05 -0800
Subject: [PATCH 12/54] Adds tests of creating book with author

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

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 90b7359d..bba83714 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -169,6 +169,23 @@ class BookViews(TestCase):
         book = models.Edition.objects.get(title="New Title")
         self.assertEqual(book.parent_work, self.work)
 
+    def test_create_book_with_author(self):
+        """ create an entirely new book and work """
+        view = views.ConfirmEditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm()
+        form.data["title"] = "New Title"
+        form.data["add_author"] = "Sappho"
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request)
+        book = models.Edition.objects.get(title="New Title")
+        self.assertEqual(book.parent_work.title, "New Title")
+        self.assertEqual(book.authors.first().name, "Sappho")
+        self.assertEqual(book.authors.first(), book.parent_work.authors.first())
+
     def test_switch_edition(self):
         """ updates user's relationships to a book """
         work = models.Work.objects.create(title="test work")

From 500394fc52bc5b75393d5632fa6412c01fa244ac Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 11:54:26 -0800
Subject: [PATCH 13/54] Make sure creating books doesn't broadcast in tests

---
 bookwyrm/tests/views/test_book.py | 12 ++++++------
 bookwyrm/views/books.py           |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index bba83714..1549bdc6 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -149,8 +149,8 @@ class BookViews(TestCase):
         form.data["last_edited_by"] = self.local_user.id
         request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request)
+
+        view(request)
         book = models.Edition.objects.get(title="New Title")
         self.assertEqual(book.parent_work.title, "New Title")
 
@@ -164,8 +164,8 @@ class BookViews(TestCase):
         form.data["last_edited_by"] = self.local_user.id
         request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request)
+
+        view(request)
         book = models.Edition.objects.get(title="New Title")
         self.assertEqual(book.parent_work, self.work)
 
@@ -179,8 +179,8 @@ class BookViews(TestCase):
         form.data["last_edited_by"] = self.local_user.id
         request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request)
+
+        view(request)
         book = models.Edition.objects.get(title="New Title")
         self.assertEqual(book.parent_work.title, "New Title")
         self.assertEqual(book.authors.first().name, "Sappho")
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index ecba4376..ae60c677 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -209,7 +209,8 @@ class ConfirmEditBook(View):
                     work = models.Work.objects.create(title=form.cleaned_data["title"])
                     work.authors.set(book.authors.all())
                 book.parent_work = work
-                book.save()
+                # we don't tell the world when creating a book
+                book.save(broadcast=False)
 
             for author_id in request.POST.getlist("remove_authors"):
                 book.authors.remove(author_id)

From a29d6a5f16ba1f0f75d0d283c4d01917bc0e4d82 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 14:11:08 -0800
Subject: [PATCH 14/54] Hide secondary save button in confirm mode

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

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 1ebcc6b9..700dc570 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -72,7 +72,6 @@
     <hr class="block">
     {% endif %}
 
-    <fieldset>
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
         <div class="column">
@@ -181,11 +180,12 @@
         </div>
     </div>
 
+    {% if not confirm_mode %}
     <div class="block">
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
         <a class="button" href="/book/{{ book.id }}">{% trans "Cancel" %}</a>
     </div>
-    </fieldset>
+    {% endif %}
 </form>
 
 {% endblock %}

From ab57b5b906641df96be76fee71186d8eb4b51896 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 15:49:44 -0800
Subject: [PATCH 15/54] First pass at views for reporting

---
 bookwyrm/templates/layout.html                |  4 +-
 bookwyrm/templates/settings/admin_layout.html |  4 ++
 .../templates/settings/report_preview.html    | 14 +++++++
 bookwyrm/templates/settings/reports.html      | 27 +++++++++++++
 .../snippets/status/status_options.html       |  5 +++
 bookwyrm/templates/snippets/user_options.html |  3 ++
 bookwyrm/urls.py                              |  7 ++++
 bookwyrm/views/__init__.py                    |  3 +-
 bookwyrm/views/reports.py                     | 38 +++++++++++++++++++
 9 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/templates/settings/report_preview.html
 create mode 100644 bookwyrm/templates/settings/reports.html
 create mode 100644 bookwyrm/views/reports.py

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 901a12ff..fc2ebdb7 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -114,8 +114,8 @@
                     {% endif %}
                     {% if perms.bookwyrm.edit_instance_settings %}
                     <li>
-                        <a href="{% url 'settings-site' %}" class="navbar-item">
-                            {% trans 'Site Configuration' %}
+                        <a href="{% url 'settings-reports' %}" class="navbar-item">
+                            {% trans 'Admin' %}
                         </a>
                     </li>
                     {% endif %}
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 16741436..312d502a 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -18,6 +18,10 @@
                 {% url 'settings-invites' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
+            <li>
+                {% url 'settings-reports' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Reports" %}</a>
+            </li>
             <li>
                 {% url 'settings-federation' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Servers" %}</a>
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/settings/report_preview.html
new file mode 100644
index 00000000..67bffe27
--- /dev/null
+++ b/bookwyrm/templates/settings/report_preview.html
@@ -0,0 +1,14 @@
+{% extends 'components/card.html' %}
+{% load i18n %}
+{% block card-header %}
+<h2 class="title is-4">
+    <a href="{% url settings-report report.id %}">report title</a></h2>
+{% endblock %}
+
+{% block card-content %}
+about this report
+{% endblock %}
+
+{% block card-footer %}
+footer
+{% endblock
diff --git a/bookwyrm/templates/settings/reports.html b/bookwyrm/templates/settings/reports.html
new file mode 100644
index 00000000..efca7244
--- /dev/null
+++ b/bookwyrm/templates/settings/reports.html
@@ -0,0 +1,27 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+
+{% block header %}{% trans "Reports" %}{% endblock %}
+
+{% block panel %}
+<div class="tabs">
+    <ul>
+        <li class="{% if filter == 'open' %}is-active{% endif %}"{% if filter == 'open' %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?status=open">{% trans "Open" %}</a>
+        </li>
+        <li class="{% if filter == 'resolved' %}is-active{% endif %}"{% if filter == 'resolved' %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?status=closed">{% trans "Resolved" %}</a>
+        </li>
+    </ul>
+</div>
+
+<ul>
+    {% for report in reports %}
+    <li class="card">
+        {% include 'settings/report_preview.html' with report=report %}
+    </li>
+    {% endfor %}
+</ul>
+
+{% endblock %}
+
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index babd8296..0f099e17 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -10,6 +10,7 @@
 
 {% block dropdown-list %}
 {% if status.user == request.user %}
+{# things you can do to your own statuses #}
 <li role="menuitem">
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
@@ -19,9 +20,13 @@
     </form>
 </li>
 {% else %}
+{# things you can do to other people's statuses #}
 <li role="menuitem">
     <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
+<li role="menuitem">
+    <a href="{{ status.local_path }}/report" class="button is-fullwidth is-small">{% trans "Report status" %}</a>
+</li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
 </li>
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index b3f66782..c9fdac0a 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -12,6 +12,9 @@
 <li role="menuitem">
     <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
+<li role="menuitem">
+    <a href="{{ user.local_path }}/report" class="button is-fullwidth is-small">{% trans "Report user" %}</a>
+</li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %}
 </li>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 844f8993..c7ec7f4b 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -54,6 +54,13 @@ urlpatterns = [
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
+    # moderation
+    re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"),
+    re_path(
+        r"^settings/report/(?P<report_id>\d+)/?$",
+        views.Report.as_view(),
+        name="settings-report",
+    ),
     re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
     # landing pages
     re_path(r"^about/?$", views.About.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 48da8ec1..36a64ddf 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -20,15 +20,16 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
+from .reports import Report, Reports
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
-from .tag import Tag, AddTag, RemoveTag
 from .search import Search
 from .shelf import Shelf
 from .shelf import user_shelves_page, create_shelf, delete_shelf
 from .shelf import shelve, unshelve
 from .site import Site
 from .status import CreateStatus, DeleteStatus
+from .tag import Tag, AddTag, RemoveTag
 from .updates import Updates
 from .user import User, EditUser, Followers, Following
 from .isbn import Isbn
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
new file mode 100644
index 00000000..a90fffaf
--- /dev/null
+++ b/bookwyrm/views/reports.py
@@ -0,0 +1,38 @@
+""" moderation via flagged posts and users """
+from django.contrib.auth.decorators import login_required, permission_required
+from django.shortcuts import get_object_or_404
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import models
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
+    name="dispatch",
+)
+@method_decorator(
+    permission_required("bookwyrm.moderate_post", raise_exception=True),
+    name="dispatch",
+)
+class Reports(View):
+    """ list of reports  """
+
+    def get(self, request, status="open"):
+        """ view current reports """
+        data = {
+            "status": status
+        }  # {"reports": models.Report.objects.filter(status=status)}
+        return TemplateResponse(request, "settings/reports.html", data)
+
+
+class Report(View):
+    """ view a specific report """
+
+    def get(self, request, report_id):
+        """ load a report """
+        data = {"report": get_object_or_404(models.REport, id=report_id)}
+        return TemplateResponse(request, "settings/report.html", data)

From 7337a357fa676459634cab18c47b9c3a2fd6690c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 16:02:16 -0800
Subject: [PATCH 16/54] Adds tests file

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

diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
new file mode 100644
index 00000000..3b8dec26
--- /dev/null
+++ b/bookwyrm/tests/views/test_reports.py
@@ -0,0 +1,48 @@
+""" test for app action functionality """
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models
+from bookwyrm import views
+
+
+class ReportViews(TestCase):
+    """ every response to a get request, html or json """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.SiteSettings.objects.create()
+
+    def test_reports_page(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Reports.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_report_page(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Report.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        report = models.Report.objects.create()
+
+        result = view(request, report.id)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From e59c12768642a9ebaa810a138972eebf6098c6b7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 17:16:59 -0800
Subject: [PATCH 17/54] Adds models for reporting

---
 .gitignore                                    |  3 +-
 .../migrations/0049_report_reportcomment.py   | 48 +++++++++++++++++++
 bookwyrm/models/__init__.py                   |  1 +
 bookwyrm/models/federated_server.py           |  2 +-
 bookwyrm/models/report.py                     | 23 +++++++++
 bookwyrm/tests/views/test_reports.py          |  9 +++-
 bookwyrm/views/reports.py                     | 12 +++--
 7 files changed, 90 insertions(+), 8 deletions(-)
 create mode 100644 bookwyrm/migrations/0049_report_reportcomment.py
 create mode 100644 bookwyrm/models/report.py

diff --git a/.gitignore b/.gitignore
index 1384056f..4b5b7fef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /venv
 *.pyc
 *.swp
+**/__pycache__
 
 # VSCode
 /.vscode
@@ -15,4 +16,4 @@
 /images/
 
 # Testing
-.coverage
\ No newline at end of file
+.coverage
diff --git a/bookwyrm/migrations/0049_report_reportcomment.py b/bookwyrm/migrations/0049_report_reportcomment.py
new file mode 100644
index 00000000..deb8ba6f
--- /dev/null
+++ b/bookwyrm/migrations/0049_report_reportcomment.py
@@ -0,0 +1,48 @@
+# Generated by Django 3.0.7 on 2021-03-09 00:55
+
+import bookwyrm.models.fields
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0048_merge_20210308_1754'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Report',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_date', models.DateTimeField(auto_now_add=True)),
+                ('updated_date', models.DateTimeField(auto_now=True)),
+                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
+                ('note', models.TextField(blank=True, null=True)),
+                ('resolved', models.BooleanField(default=False)),
+                ('reporter', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reporter', to=settings.AUTH_USER_MODEL)),
+                ('statuses', models.ManyToManyField(to='bookwyrm.Status')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='ReportComment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_date', models.DateTimeField(auto_now_add=True)),
+                ('updated_date', models.DateTimeField(auto_now=True)),
+                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
+                ('note', models.TextField()),
+                ('report', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Report')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 67ee16d3..326a673e 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -21,6 +21,7 @@ from .tag import Tag, UserTag
 
 from .user import User, KeyPair, AnnualGoal
 from .relationship import UserFollows, UserFollowRequest, UserBlocks
+from .report import Report, ReportComment
 from .federated_server import FederatedServer
 
 from .import_job import ImportJob, ImportItem
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index ce804310..8f7d903e 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -4,7 +4,7 @@ from .base_model import BookWyrmModel
 
 
 class FederatedServer(BookWyrmModel):
-    """ store which server's we federate with """
+    """ store which servers we federate with """
 
     server_name = models.CharField(max_length=255, unique=True)
     # federated, blocked, whatever else
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
new file mode 100644
index 00000000..afbc356b
--- /dev/null
+++ b/bookwyrm/models/report.py
@@ -0,0 +1,23 @@
+""" flagged for moderation """
+from django.db import models
+from .base_model import BookWyrmModel
+
+
+class Report(BookWyrmModel):
+    """ reported status or user """
+
+    reporter = models.ForeignKey(
+        "User", related_name="reporter", on_delete=models.PROTECT
+    )
+    note = models.TextField(null=True, blank=True)
+    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    statuses = models.ManyToManyField("Status")
+    resolved = models.BooleanField(default=False)
+
+
+class ReportComment(BookWyrmModel):
+    """ updates on a report """
+
+    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    note = models.TextField()
+    report = models.ForeignKey(Report, on_delete=models.PROTECT)
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 3b8dec26..d35633cb 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -20,6 +20,13 @@ class ReportViews(TestCase):
             local=True,
             localname="mouse",
         )
+        self.local_user = models.User.objects.create_user(
+            "rat@local.com",
+            "rat@mouse.mouse",
+            "password",
+            local=True,
+            localname="rat",
+        )
         models.SiteSettings.objects.create()
 
     def test_reports_page(self):
@@ -39,7 +46,7 @@ class ReportViews(TestCase):
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
-        report = models.Report.objects.create()
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
 
         result = view(request, report.id)
 
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index a90fffaf..2e374d5e 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -8,7 +8,7 @@ from django.views import View
 from bookwyrm import models
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
     permission_required("bookwyrm.moderate_user", raise_exception=True),
@@ -21,11 +21,13 @@ from bookwyrm import models
 class Reports(View):
     """ list of reports  """
 
-    def get(self, request, status="open"):
+    def get(self, request):
         """ view current reports """
+        resolved = request.GET.get("resolved")
         data = {
-            "status": status
-        }  # {"reports": models.Report.objects.filter(status=status)}
+            "resolved": resolved,
+            "reports": models.Report.objects.filter(resolved=resolved),
+        }
         return TemplateResponse(request, "settings/reports.html", data)
 
 
@@ -34,5 +36,5 @@ class Report(View):
 
     def get(self, request, report_id):
         """ load a report """
-        data = {"report": get_object_or_404(models.REport, id=report_id)}
+        data = {"report": get_object_or_404(models.Report, id=report_id)}
         return TemplateResponse(request, "settings/report.html", data)

From 21f199c5482d2aae87058433ce68c2d6930e610a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 18:36:34 -0800
Subject: [PATCH 18/54] Make reports

---
 bookwyrm/forms.py                             |  6 ++++
 ...tcomment.py => 0049_auto_20210309_0156.py} | 12 ++++---
 bookwyrm/models/report.py                     | 11 ++++++-
 bookwyrm/templates/settings/report.html       |  2 ++
 .../templates/settings/report_preview.html    |  4 +--
 .../templates/snippets/report_button.html     |  7 ++++
 .../snippets/status/status_options.html       |  2 +-
 bookwyrm/templates/snippets/user_options.html |  2 +-
 bookwyrm/tests/views/test_reports.py          | 33 +++++++++++++++++--
 bookwyrm/urls.py                              |  5 +--
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/reports.py                     | 29 ++++++++++++++--
 12 files changed, 96 insertions(+), 19 deletions(-)
 rename bookwyrm/migrations/{0049_report_reportcomment.py => 0049_auto_20210309_0156.py} (83%)
 create mode 100644 bookwyrm/templates/settings/report.html
 create mode 100644 bookwyrm/templates/snippets/report_button.html

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 380e701f..654130cf 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -231,3 +231,9 @@ class ListForm(CustomForm):
     class Meta:
         model = models.List
         fields = ["user", "name", "description", "curation", "privacy"]
+
+
+class ReportForm(CustomForm):
+    class Meta:
+        model = models.Report
+        fields = ["user", "reporter", "statuses", "note"]
diff --git a/bookwyrm/migrations/0049_report_reportcomment.py b/bookwyrm/migrations/0049_auto_20210309_0156.py
similarity index 83%
rename from bookwyrm/migrations/0049_report_reportcomment.py
rename to bookwyrm/migrations/0049_auto_20210309_0156.py
index deb8ba6f..494f5bc8 100644
--- a/bookwyrm/migrations/0049_report_reportcomment.py
+++ b/bookwyrm/migrations/0049_auto_20210309_0156.py
@@ -1,9 +1,10 @@
-# Generated by Django 3.0.7 on 2021-03-09 00:55
+# Generated by Django 3.0.7 on 2021-03-09 01:56
 
 import bookwyrm.models.fields
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+import django.db.models.expressions
 
 
 class Migration(migrations.Migration):
@@ -23,12 +24,9 @@ class Migration(migrations.Migration):
                 ('note', models.TextField(blank=True, null=True)),
                 ('resolved', models.BooleanField(default=False)),
                 ('reporter', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reporter', to=settings.AUTH_USER_MODEL)),
-                ('statuses', models.ManyToManyField(to='bookwyrm.Status')),
+                ('statuses', models.ManyToManyField(blank=True, null=True, to='bookwyrm.Status')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
             ],
-            options={
-                'abstract': False,
-            },
         ),
         migrations.CreateModel(
             name='ReportComment',
@@ -45,4 +43,8 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.AddConstraint(
+            model_name='report',
+            constraint=models.CheckConstraint(check=models.Q(_negated=True, reporter=django.db.models.expressions.F('user')), name='self_report'),
+        ),
     ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index afbc356b..e1e8c2a4 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -1,5 +1,6 @@
 """ flagged for moderation """
 from django.db import models
+from django.db.models import F, Q
 from .base_model import BookWyrmModel
 
 
@@ -11,9 +12,17 @@ class Report(BookWyrmModel):
     )
     note = models.TextField(null=True, blank=True)
     user = models.ForeignKey("User", on_delete=models.PROTECT)
-    statuses = models.ManyToManyField("Status")
+    statuses = models.ManyToManyField("Status", null=True, blank=True)
     resolved = models.BooleanField(default=False)
 
+    class Meta:
+        """ don't let users report themselves """
+        constraints = [
+            models.CheckConstraint(
+                check=~Q(reporter=F('user')),
+                name='self_report'
+            )
+        ]
 
 class ReportComment(BookWyrmModel):
     """ updates on a report """
diff --git a/bookwyrm/templates/settings/report.html b/bookwyrm/templates/settings/report.html
new file mode 100644
index 00000000..1f55906b
--- /dev/null
+++ b/bookwyrm/templates/settings/report.html
@@ -0,0 +1,2 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/settings/report_preview.html
index 67bffe27..b72dd958 100644
--- a/bookwyrm/templates/settings/report_preview.html
+++ b/bookwyrm/templates/settings/report_preview.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block card-header %}
 <h2 class="title is-4">
-    <a href="{% url settings-report report.id %}">report title</a></h2>
+    <a href="{% url 'settings-report' report.id %}">report title</a></h2>
 {% endblock %}
 
 {% block card-content %}
@@ -11,4 +11,4 @@ about this report
 
 {% block card-footer %}
 footer
-{% endblock
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
new file mode 100644
index 00000000..5fbaee99
--- /dev/null
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+<form name="report" method="post" action="{% url 'report' %}">
+    {% csrf_token %}
+    <input type="hidden" name="reporter" value="{{ request.user.id }}">
+    <input type="hidden" name="user" value="{{ user.id }}">
+    <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Report" %}</button>
+</form>
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 0f099e17..f703ba6e 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -25,7 +25,7 @@
     <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
-    <a href="{{ status.local_path }}/report" class="button is-fullwidth is-small">{% trans "Report status" %}</a>
+    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index c9fdac0a..585417c7 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -13,7 +13,7 @@
     <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
-    <a href="{{ user.local_path }}/report" class="button is-fullwidth is-small">{% trans "Report user" %}</a>
+    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %}
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index d35633cb..70414dcb 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -3,8 +3,7 @@ from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models
-from bookwyrm import views
+from bookwyrm import forms, models, views
 
 
 class ReportViews(TestCase):
@@ -20,7 +19,7 @@ class ReportViews(TestCase):
             local=True,
             localname="mouse",
         )
-        self.local_user = models.User.objects.create_user(
+        self.rat = models.User.objects.create_user(
             "rat@local.com",
             "rat@mouse.mouse",
             "password",
@@ -35,6 +34,20 @@ class ReportViews(TestCase):
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
+
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_reports_page_with_data(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Reports.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
@@ -53,3 +66,17 @@ class ReportViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_make_report(self):
+        """ a user reports another user """
+        form = forms.ReportForm()
+        form.data["reporter"] = self.local_user.id
+        form.data["user"] = self.rat.id
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        views.make_report(request)
+
+        report = models.Report.objects.get()
+        self.assertEqual(report.reporter, self.local_user)
+        self.assertEqual(report.user, self.rat)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index c7ec7f4b..42b9803d 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -54,14 +54,15 @@ urlpatterns = [
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
+    re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
     # moderation
     re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"),
     re_path(
-        r"^settings/report/(?P<report_id>\d+)/?$",
+        r"^settings/reports/(?P<report_id>\d+)/?$",
         views.Report.as_view(),
         name="settings-report",
     ),
-    re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
+    re_path(r"^report/?$", views.make_report, name="report"),
     # landing pages
     re_path(r"^about/?$", views.About.as_view()),
     path("", views.Home.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 36a64ddf..b433dca2 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -20,7 +20,7 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
-from .reports import Report, Reports
+from .reports import Report, Reports, make_report
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 2e374d5e..9eaf9bdc 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -1,11 +1,12 @@
 """ moderation via flagged posts and users """
 from django.contrib.auth.decorators import login_required, permission_required
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
+from django.views.decorators.http import require_POST
 
-from bookwyrm import models
+from bookwyrm import forms, models
 
 
 # pylint: disable=no-self-use
@@ -23,7 +24,7 @@ class Reports(View):
 
     def get(self, request):
         """ view current reports """
-        resolved = request.GET.get("resolved")
+        resolved = request.GET.get("resolved", False)
         data = {
             "resolved": resolved,
             "reports": models.Report.objects.filter(resolved=resolved),
@@ -31,6 +32,15 @@ class Reports(View):
         return TemplateResponse(request, "settings/reports.html", data)
 
 
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
+    name="dispatch",
+)
+@method_decorator(
+    permission_required("bookwyrm.moderate_post", raise_exception=True),
+    name="dispatch",
+)
 class Report(View):
     """ view a specific report """
 
@@ -38,3 +48,16 @@ class Report(View):
         """ load a report """
         data = {"report": get_object_or_404(models.Report, id=report_id)}
         return TemplateResponse(request, "settings/report.html", data)
+
+
+@login_required
+@require_POST
+def make_report(request):
+    """ a user reports something """
+    form = forms.ReportForm(request.POST)
+    if not form.is_valid():
+        print(form.errors)
+        return redirect(request.headers.get("Referer", "/"))
+
+    form.save()
+    return redirect(request.headers.get("Referer", "/"))

From ff624e33fa93a46ef238596709eea4b96d63bb14 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 9 Mar 2021 10:08:02 -0800
Subject: [PATCH 19/54] fixes display of report items on admin page

---
 bookwyrm/templates/settings/admin_layout.html   |  2 +-
 bookwyrm/templates/settings/report_preview.html | 13 +++++++++----
 bookwyrm/templates/settings/reports.html        |  8 ++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 312d502a..a34fe638 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -46,7 +46,7 @@
         </ul>
         {% endif %}
     </nav>
-    <div class="column content">
+    <div class="column">
         {% block panel %}{% endblock %}
     </div>
 </div>
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/settings/report_preview.html
index b72dd958..63eca0fc 100644
--- a/bookwyrm/templates/settings/report_preview.html
+++ b/bookwyrm/templates/settings/report_preview.html
@@ -1,14 +1,19 @@
 {% extends 'components/card.html' %}
 {% load i18n %}
 {% block card-header %}
-<h2 class="title is-4">
-    <a href="{% url 'settings-report' report.id %}">report title</a></h2>
+<h2 class="card-header-title has-background-white-ter is-block">
+    <a href="{% url 'settings-report' report.id %}">report title</a>
+</h2>
 {% endblock %}
 
 {% block card-content %}
-about this report
+<div class="block">
+    about this report
+</div>
 {% endblock %}
 
 {% block card-footer %}
-footer
+<div class="card-footer-item">
+    footer
+</div>
 {% endblock %}
diff --git a/bookwyrm/templates/settings/reports.html b/bookwyrm/templates/settings/reports.html
index efca7244..59fbaf56 100644
--- a/bookwyrm/templates/settings/reports.html
+++ b/bookwyrm/templates/settings/reports.html
@@ -15,13 +15,13 @@
     </ul>
 </div>
 
-<ul>
+<div class="block">
     {% for report in reports %}
-    <li class="card">
+    <div class="block">
         {% include 'settings/report_preview.html' with report=report %}
-    </li>
+    </div>
     {% endfor %}
-</ul>
+</div>
 
 {% endblock %}
 

From 999bff4bbadb25f0e1a3015a4ece75bcc0559baa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 9 Mar 2021 12:35:07 -0800
Subject: [PATCH 20/54] Basic reports admin templates

---
 bookwyrm/templates/settings/report.html       | 41 +++++++++++++++++++
 .../templates/settings/report_preview.html    | 13 ++++--
 bookwyrm/templates/settings/reports.html      |  9 ++--
 bookwyrm/views/reports.py                     |  2 +-
 4 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/settings/report.html b/bookwyrm/templates/settings/report.html
index 1f55906b..74c3641b 100644
--- a/bookwyrm/templates/settings/report.html
+++ b/bookwyrm/templates/settings/report.html
@@ -1,2 +1,43 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
+{% block header %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
+
+{% block panel %}
+<div class="block">
+    <a href="{% url 'settings-reports' %}">{% trans "Back to reports" %}</a>
+</div>
+
+<div class="block">
+    {% include 'settings/report_preview.html' with report=report %}
+</div>
+
+<div class="block content">
+    <h3>{% trans "Actions" %}</h3>
+    <div class="field is-grouped">
+        <button class="button">Direct message</button>
+        <button class="button">Suspend</button>
+    </div>
+
+    {% for comment in report.reportcomment_set.all %}
+    <div class="block">
+        {{ comment }}
+    </div>
+    {% endfor %}
+    <form>
+        <label for="report_comment" class="label">Comment on report</label>
+        <textarea name="comment" id="report_comment" class="textarea"></textarea>
+        <button class="button">{% trans "Comment" %}</button>
+    </forM=m>
+</div>
+
+<div class="block content">
+    <h3>{% trans "Reported statuses" %}</h3>
+    <ul>
+        {% for status in report.statuses.all %}
+        <li>{{ status.id }}</li>
+        {% endfor %}
+    </ul>
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/settings/report_preview.html
index 63eca0fc..25cb8a2f 100644
--- a/bookwyrm/templates/settings/report_preview.html
+++ b/bookwyrm/templates/settings/report_preview.html
@@ -1,19 +1,26 @@
 {% extends 'components/card.html' %}
 {% load i18n %}
+{% load humanize %}
 {% block card-header %}
 <h2 class="card-header-title has-background-white-ter is-block">
-    <a href="{% url 'settings-report' report.id %}">report title</a>
+    <a href="{% url 'settings-report' report.id %}">{{ report.user.username }}</a>
 </h2>
 {% endblock %}
 
 {% block card-content %}
 <div class="block">
-    about this report
+    {% if report.notes %}{{ report.notes }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
 </div>
 {% endblock %}
 
 {% block card-footer %}
 <div class="card-footer-item">
-    footer
+    <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
+</div>
+<div class="card-footer-item">
+    {{ report.created_date | naturaltime }}
+</div>
+<div class="card-footer-item">
+    <button class="button">{% trans "Mark as resolved" %}</button>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/settings/reports.html b/bookwyrm/templates/settings/reports.html
index 59fbaf56..329901ea 100644
--- a/bookwyrm/templates/settings/reports.html
+++ b/bookwyrm/templates/settings/reports.html
@@ -1,16 +1,17 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
 
+{% block title %}{% trans "Reports" %}{% endblock %}
 {% block header %}{% trans "Reports" %}{% endblock %}
 
 {% block panel %}
 <div class="tabs">
     <ul>
-        <li class="{% if filter == 'open' %}is-active{% endif %}"{% if filter == 'open' %} aria-current="page"{% endif %}>
-            <a href="{% url 'settings-reports' %}?status=open">{% trans "Open" %}</a>
+        <li class="{% if not resolved %}is-active{% endif %}"{% if not resolved == 'open' %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?resolved=false">{% trans "Open" %}</a>
         </li>
-        <li class="{% if filter == 'resolved' %}is-active{% endif %}"{% if filter == 'resolved' %} aria-current="page"{% endif %}>
-            <a href="{% url 'settings-reports' %}?status=closed">{% trans "Resolved" %}</a>
+        <li class="{% if resolved %}is-active{% endif %}"{% if resolved %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?resolved=true">{% trans "Resolved" %}</a>
         </li>
     </ul>
 </div>
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 9eaf9bdc..eda56532 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -24,7 +24,7 @@ class Reports(View):
 
     def get(self, request):
         """ view current reports """
-        resolved = request.GET.get("resolved", False)
+        resolved = request.GET.get("resolved") == "true"
         data = {
             "resolved": resolved,
             "reports": models.Report.objects.filter(resolved=resolved),

From 0d2c641d01dc7017ebb2a45d8941569b1d5e3df5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 9 Mar 2021 12:57:38 -0800
Subject: [PATCH 21/54] Reformats report model

---
 .../migrations/0049_auto_20210309_0156.py     | 107 ++++++++++++++----
 bookwyrm/models/report.py                     |   7 +-
 2 files changed, 88 insertions(+), 26 deletions(-)

diff --git a/bookwyrm/migrations/0049_auto_20210309_0156.py b/bookwyrm/migrations/0049_auto_20210309_0156.py
index 494f5bc8..ae9d77a8 100644
--- a/bookwyrm/migrations/0049_auto_20210309_0156.py
+++ b/bookwyrm/migrations/0049_auto_20210309_0156.py
@@ -10,41 +10,104 @@ import django.db.models.expressions
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0048_merge_20210308_1754'),
+        ("bookwyrm", "0048_merge_20210308_1754"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Report',
+            name="Report",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('note', models.TextField(blank=True, null=True)),
-                ('resolved', models.BooleanField(default=False)),
-                ('reporter', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reporter', to=settings.AUTH_USER_MODEL)),
-                ('statuses', models.ManyToManyField(blank=True, null=True, to='bookwyrm.Status')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("note", models.TextField(blank=True, null=True)),
+                ("resolved", models.BooleanField(default=False)),
+                (
+                    "reporter",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="reporter",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "statuses",
+                    models.ManyToManyField(blank=True, null=True, to="bookwyrm.Status"),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
-            name='ReportComment',
+            name="ReportComment",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('note', models.TextField()),
-                ('report', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Report')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("note", models.TextField()),
+                (
+                    "report",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Report",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.AddConstraint(
-            model_name='report',
-            constraint=models.CheckConstraint(check=models.Q(_negated=True, reporter=django.db.models.expressions.F('user')), name='self_report'),
+            model_name="report",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    _negated=True, reporter=django.db.models.expressions.F("user")
+                ),
+                name="self_report",
+            ),
         ),
     ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index e1e8c2a4..3a8fdd13 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -17,13 +17,12 @@ class Report(BookWyrmModel):
 
     class Meta:
         """ don't let users report themselves """
+
         constraints = [
-            models.CheckConstraint(
-                check=~Q(reporter=F('user')),
-                name='self_report'
-            )
+            models.CheckConstraint(check=~Q(reporter=F("user")), name="self_report")
         ]
 
+
 class ReportComment(BookWyrmModel):
     """ updates on a report """
 

From 7f452066939495ee74a7f2dac129bae1c1e2d7e8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 10 Mar 2021 12:38:49 -0800
Subject: [PATCH 22/54] Moves moderation templates to their own directory

---
 bookwyrm/templates/{settings => moderation}/report.html       | 2 +-
 .../templates/{settings => moderation}/report_preview.html    | 0
 bookwyrm/templates/{settings => moderation}/reports.html      | 2 +-
 bookwyrm/templates/snippets/report_button.html                | 1 +
 bookwyrm/views/reports.py                                     | 4 ++--
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename bookwyrm/templates/{settings => moderation}/report.html (94%)
 rename bookwyrm/templates/{settings => moderation}/report_preview.html (100%)
 rename bookwyrm/templates/{settings => moderation}/reports.html (91%)

diff --git a/bookwyrm/templates/settings/report.html b/bookwyrm/templates/moderation/report.html
similarity index 94%
rename from bookwyrm/templates/settings/report.html
rename to bookwyrm/templates/moderation/report.html
index 74c3641b..ca68d51d 100644
--- a/bookwyrm/templates/settings/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -10,7 +10,7 @@
 </div>
 
 <div class="block">
-    {% include 'settings/report_preview.html' with report=report %}
+    {% include 'moderation/report_preview.html' with report=report %}
 </div>
 
 <div class="block content">
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
similarity index 100%
rename from bookwyrm/templates/settings/report_preview.html
rename to bookwyrm/templates/moderation/report_preview.html
diff --git a/bookwyrm/templates/settings/reports.html b/bookwyrm/templates/moderation/reports.html
similarity index 91%
rename from bookwyrm/templates/settings/reports.html
rename to bookwyrm/templates/moderation/reports.html
index 329901ea..ebf29a7a 100644
--- a/bookwyrm/templates/settings/reports.html
+++ b/bookwyrm/templates/moderation/reports.html
@@ -19,7 +19,7 @@
 <div class="block">
     {% for report in reports %}
     <div class="block">
-        {% include 'settings/report_preview.html' with report=report %}
+        {% include 'moderation/report_preview.html' with report=report %}
     </div>
     {% endfor %}
 </div>
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 5fbaee99..9d32d5fb 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -3,5 +3,6 @@
     {% csrf_token %}
     <input type="hidden" name="reporter" value="{{ request.user.id }}">
     <input type="hidden" name="user" value="{{ user.id }}">
+    <input type="hidden" name="statuses" value="{{ user.id }}">
     <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Report" %}</button>
 </form>
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index eda56532..87547081 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -29,7 +29,7 @@ class Reports(View):
             "resolved": resolved,
             "reports": models.Report.objects.filter(resolved=resolved),
         }
-        return TemplateResponse(request, "settings/reports.html", data)
+        return TemplateResponse(request, "moderation/reports.html", data)
 
 
 @method_decorator(login_required, name="dispatch")
@@ -47,7 +47,7 @@ class Report(View):
     def get(self, request, report_id):
         """ load a report """
         data = {"report": get_object_or_404(models.Report, id=report_id)}
-        return TemplateResponse(request, "settings/report.html", data)
+        return TemplateResponse(request, "moderation/report.html", data)
 
 
 @login_required

From 965d84f86f4e9bef3eabeac6512058183229c462 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 15:41:12 -0800
Subject: [PATCH 23/54] Fixes creating news works

---
 bookwyrm/templates/edit_book.html | 2 +-
 bookwyrm/views/books.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 700dc570..e42f77f2 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -60,7 +60,7 @@
                 {% for match in book_matches %}
                 <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
                 {% endfor %}
-                <label><input type="radio" name="parent_work"> this is a new work</label>
+                <label><input type="radio" name="parent_work" value="0"> this is a new work</label>
             </fieldset>
             {% endif %}
         </div>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index ae60c677..9048f43d 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -203,7 +203,7 @@ class ConfirmEditBook(View):
             # create work, if needed
             if not book_id:
                 work_match = request.POST.get("parent_work")
-                if work_match:
+                if work_match and work_match != "0":
                     work = get_object_or_404(models.Work, id=work_match)
                 else:
                     work = models.Work.objects.create(title=form.cleaned_data["title"])

From c1976dbd62bf5491b4e5036e2005ddd1ba61db12 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 16:33:49 -0800
Subject: [PATCH 24/54] Add multiple authors

---
 bookwyrm/templates/edit_book.html | 55 ++++++++++++++++++-------------
 bookwyrm/views/books.py           | 47 +++++++++++++++-----------
 2 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index e42f77f2..107e75c5 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -39,29 +39,37 @@
     <div class="box">
         <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
         <div class="columns">
-            {% if author_matches.exists %}
-            <fieldset class="column is-half">
-                <legend class="label">{% blocktrans with name=add_author %}Is "{{ name }}" an existing author?{% endblocktrans %}</legend>
-                {% for match in author_matches %}
-                <label><input type="radio" name="author_match" value="{{ match.id }}" required> {{ match.name }}</label>
-                <p class="help">
-                    <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
-                </p>
+            {% if author_matches %}
+            <div class="column is-half">
+                {% for author in author_matches %}
+                <fieldset class="mb-4">
+                    <legend class="title is-5 mb-1">{% blocktrans with name=author.name %}Is "{{ name }}" an existing author?{% endblocktrans %}</legend>
+                    {% with forloop.counter as counter %}
+                    {% for match in author.matches %}
+                    <label><input type="radio" name="author_match-{{ counter }}" value="{{ match.id }}" required> {{ match.name }}</label>
+                    <p class="help">
+                        <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
+                    </p>
+                    {% endfor %}
+                    <label><input type="radio" name="author_match-{{ counter }}" value="0" required> {% trans "This is a new author" %}</label>
+                    {% endwith %}
+                </fieldset>
                 {% endfor %}
-                <label><input type="radio" name="author_match"> {% trans "This is a new author" %}</label>
-            </fieldset>
+            </div>
             {% else %}
             <p class="column is-half">{% blocktrans with name=add_author %}Creating a new author: {{ name }}{% endblocktrans %}</p>
             {% endif %}
 
             {% if not book %}
-            <fieldset class="column is-half">
-                <legend class="title is-5">{% trans "Is this an editions of an existing work?" %}</legend>
-                {% for match in book_matches %}
-                <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
-                {% endfor %}
-                <label><input type="radio" name="parent_work" value="0"> this is a new work</label>
-            </fieldset>
+            <div class="column is-half">
+                <fieldset>
+                    <legend class="title is-5 mb-1">{% trans "Is this an edition of an existing work?" %}</legend>
+                    {% for match in book_matches %}
+                    <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
+                    {% endfor %}
+                    <label><input type="radio" name="parent_work" value="0" required> {% trans "This is a new work" %}</label>
+                </fieldset>
+            </div>
             {% endif %}
         </div>
 
@@ -109,16 +117,19 @@
 
             <section class="block">
                 <h2 class="title is-4">{% trans "Authors" %}</h2>
+                {% if book.authors.exists %}
                 <fieldset>
                     {% for author in book.authors.all %}
-                    <p><a href="{{ author.local_path }}">{{ author.name }}</a>
-                    <label class="label">
-                        <input type="checkbox" name="remove_authors" value="{{ author.id }}"> {% trans "Remove this author" %}
+                    <label class="label mb-2">
+                        <input type="checkbox" name="remove_authors" value="{{ author.id }}" {% if author.id|stringformat:"i" in remove_authors %}checked{% endif %}>
+                        {% blocktrans with name=author.name path=author.local_path %}Remove <a href="{{ path }}">{{ name }}</a>{% endblocktrans %}
                     </label>
                     {% endfor %}
                 </fieldset>
-                <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
-                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe' %}" value="{{ add_author }}">
+                {% endif %}
+                <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
+                <p class="help">Separate multiple author names with commas.</p>
+                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}">
             </section>
         </div>
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 9048f43d..ff0d6764 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -131,17 +131,22 @@ class EditBook(View):
         # we're adding an author through a free text field
         if add_author:
             data["add_author"] = add_author
-            # check for existing authors
-            vector = SearchVector("name", weight="A") + SearchVector(
-                "aliases", weight="B"
-            )
+            data['author_matches'] = []
+            for author in add_author.split(','):
+                # check for existing authors
+                vector = SearchVector("name", weight="A") + SearchVector(
+                    "aliases", weight="B"
+                )
 
-            data["author_matches"] = (
-                models.Author.objects.annotate(search=vector)
-                .annotate(rank=SearchRank(vector, add_author))
-                .filter(rank__gt=0.4)
-                .order_by("-rank")[:5]
-            )
+                data["author_matches"].append({
+                    'name': author.strip(),
+                    'matches': (
+                        models.Author.objects.annotate(search=vector)
+                        .annotate(rank=SearchRank(vector, add_author))
+                        .filter(rank__gt=0.4)
+                        .order_by("-rank")[:5]
+                    )
+                })
 
         # we're creating a new book
         if not book:
@@ -157,6 +162,8 @@ class EditBook(View):
         if add_author or not book:
             # creting a book or adding an author to a book needs another step
             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")
             return TemplateResponse(request, "edit_book.html", data)
 
         remove_authors = request.POST.getlist("remove_authors")
@@ -190,15 +197,17 @@ class ConfirmEditBook(View):
 
             # get or create author as needed
             if request.POST.get("add_author"):
-                if request.POST.get("author_match"):
-                    author = get_object_or_404(
-                        models.Author, id=request.POST["author_match"]
-                    )
-                else:
-                    author = models.Author.objects.create(
-                        name=request.POST.get("add_author")
-                    )
-                book.authors.add(author)
+                for (i, author) in enumerate(request.POST.get("add_author").split(',')):
+                    match = request.POST.get("author_match-%d" % i)
+                    if match and match != "0":
+                        author = get_object_or_404(
+                            models.Author, id=request.POST["author_match-%d" % i]
+                        )
+                    else:
+                        author = models.Author.objects.create(
+                            name=author.strip()
+                        )
+                    book.authors.add(author)
 
             # create work, if needed
             if not book_id:

From 28db3e2733d57e9b7a5988e22d2e6c376587496a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 16:40:35 -0800
Subject: [PATCH 25/54] Formatting

---
 bookwyrm/views/books.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index ff0d6764..1cb21f5e 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -131,22 +131,24 @@ class EditBook(View):
         # we're adding an author through a free text field
         if add_author:
             data["add_author"] = add_author
-            data['author_matches'] = []
-            for author in add_author.split(','):
+            data["author_matches"] = []
+            for author in add_author.split(","):
                 # check for existing authors
                 vector = SearchVector("name", weight="A") + SearchVector(
                     "aliases", weight="B"
                 )
 
-                data["author_matches"].append({
-                    'name': author.strip(),
-                    'matches': (
-                        models.Author.objects.annotate(search=vector)
-                        .annotate(rank=SearchRank(vector, add_author))
-                        .filter(rank__gt=0.4)
-                        .order_by("-rank")[:5]
-                    )
-                })
+                data["author_matches"].append(
+                    {
+                        "name": author.strip(),
+                        "matches": (
+                            models.Author.objects.annotate(search=vector)
+                            .annotate(rank=SearchRank(vector, add_author))
+                            .filter(rank__gt=0.4)
+                            .order_by("-rank")[:5]
+                        ),
+                    }
+                )
 
         # we're creating a new book
         if not book:
@@ -197,16 +199,14 @@ class ConfirmEditBook(View):
 
             # get or create author as needed
             if request.POST.get("add_author"):
-                for (i, author) in enumerate(request.POST.get("add_author").split(',')):
+                for (i, author) in enumerate(request.POST.get("add_author").split(",")):
                     match = request.POST.get("author_match-%d" % i)
                     if match and match != "0":
                         author = get_object_or_404(
                             models.Author, id=request.POST["author_match-%d" % i]
                         )
                     else:
-                        author = models.Author.objects.create(
-                            name=author.strip()
-                        )
+                        author = models.Author.objects.create(name=author.strip())
                     book.authors.add(author)
 
             # create work, if needed

From 33b8537a3d692c2dcbcab73b7c4da11958c79094 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 17:38:21 -0800
Subject: [PATCH 26/54] Let user supply a note for report

---
 bookwyrm/models/report.py                     |  1 +
 bookwyrm/templates/moderation/report.html     | 10 +++--
 .../templates/moderation/report_modal.html    | 37 +++++++++++++++++++
 .../templates/moderation/report_preview.html  |  2 +-
 bookwyrm/templates/notifications.html         | 10 +----
 .../templates/snippets/report_button.html     | 16 ++++----
 .../snippets/status/status_body.html          |  9 ++++-
 .../snippets/status/status_options.html       |  4 +-
 .../templates/snippets/status_preview.html    |  9 +++++
 9 files changed, 73 insertions(+), 25 deletions(-)
 create mode 100644 bookwyrm/templates/moderation/report_modal.html
 create mode 100644 bookwyrm/templates/snippets/status_preview.html

diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 3a8fdd13..8893f42f 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -21,6 +21,7 @@ class Report(BookWyrmModel):
         constraints = [
             models.CheckConstraint(check=~Q(reporter=F("user")), name="self_report")
         ]
+        ordering = ("-created_date",)
 
 
 class ReportComment(BookWyrmModel):
diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index ca68d51d..ce0a0b3a 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -32,11 +32,13 @@
     </forM=m>
 </div>
 
-<div class="block content">
-    <h3>{% trans "Reported statuses" %}</h3>
+<div class="block">
+    <h3 class="title is-4">{% trans "Reported statuses" %}</h3>
     <ul>
-        {% for status in report.statuses.all %}
-        <li>{{ status.id }}</li>
+        {% for status in report.statuses.select_subclasses.all %}
+        <li>
+            {% include 'snippets/status/status.html' with status=status moderation_mode=True %}
+        </li>
         {% endfor %}
     </ul>
 </div>
diff --git a/bookwyrm/templates/moderation/report_modal.html b/bookwyrm/templates/moderation/report_modal.html
new file mode 100644
index 00000000..28613130
--- /dev/null
+++ b/bookwyrm/templates/moderation/report_modal.html
@@ -0,0 +1,37 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+{% load humanize %}
+
+{% block modal-title %}
+{% blocktrans with username=user.username %}Report @{{ username }}{% endblocktrans %}
+{% endblock %}
+
+{% block modal-form-open %}
+<form name="report" method="post" action="{% url 'report' %}">
+{% endblock %}
+
+{% block modal-body %}
+
+{% csrf_token %}
+<input type="hidden" name="reporter" value="{{ reporter.id }}">
+<input type="hidden" name="user" value="{{ user.id }}">
+<input type="hidden" name="statuses" value="{{ status.id }}">
+
+<section class="content">
+    <p>{% blocktrans with site_name=site.name %}This report will be sent to {{ site_name }}'s moderators for review.{% endblocktrans %}</p>
+    <label class="label" for="id_{{ controls_uid}}_report_note">{% trans "More info about this report:" %}</label>
+    <textarea class="textarea" name="note" id="id_{{ controls_uid }}_report_note"></textarea>
+</section>
+
+{% endblock %}
+
+
+{% block modal-footer %}
+
+<button class="button is-success" type="submit">{% trans "Submit" %}</button>
+{% trans "Cancel" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="report" controls_uid=report_uuid class="" %}
+
+{% endblock %}
+{% block modal-form-close %}</form>{% endblock %}
+
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 25cb8a2f..9acc4f77 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -9,7 +9,7 @@
 
 {% block card-content %}
 <div class="block">
-    {% if report.notes %}{{ report.notes }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
+    {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 80ee2250..3f0300bd 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -115,15 +115,7 @@
                     <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-white{% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %} has-text-black{% else %}-bis has-text-grey-dark{% endif %}{% endif %}">
                         <div class="columns">
                             <div class="column">
-                                {% if related_status.content %}
-                                <a href="{{ related_status.local_path }}">
-                                    {{ related_status.content | safe | truncatewords_html:10 }}{% if related_status.mention_books %} <em>{{ related_status.mention_books.first.title }}</em>{% endif %}
-                                </a>
-                                {% elif related_status.quote %}
-                                <a href="{{ related_status.local_path }}">{{ related_status.quote | safe | truncatewords_html:10 }}</a>
-                                {% elif related_status.rating %}
-                                {% include 'snippets/stars.html' with rating=related_status.rating %}
-                                {% endif %}
+                                {% include 'snippets/status_preview.html' with status=related_status %}
                             </div>
                             <div class="column is-narrow {% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %}has-text-black{% else %}has-text-grey-dark{% endif %}">
                                 {{ related_status.published_date | post_date }}
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 9d32d5fb..2fa0a3f3 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -1,8 +1,10 @@
 {% load i18n %}
-<form name="report" method="post" action="{% url 'report' %}">
-    {% csrf_token %}
-    <input type="hidden" name="reporter" value="{{ request.user.id }}">
-    <input type="hidden" name="user" value="{{ user.id }}">
-    <input type="hidden" name="statuses" value="{{ user.id }}">
-    <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Report" %}</button>
-</form>
+{% load bookwyrm_tags %}
+{% with 0|uuid as report_uuid %}
+
+{% trans "Report" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with class="is-danger is-light is-small is-fullwidth" text=button_text controls_text="report" controls_uid=report_uuid focus="modal-title-report" disabled=is_current %}
+
+{% include 'moderation/report_modal.html' with user=user reporter=request.user controls_text="report" controls_uid=report_uuid %}
+
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index 8d6c21ed..f3732d1a 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -18,7 +18,10 @@
 
 {% block card-footer %}
 <div class="card-footer-item">
-    {% if request.user.is_authenticated %}
+    {% if moderation_mode and perms.bookwyrm.moderate_post %}
+    {# moderation options #}
+    <button class="button is-danger is-light">{% trans "Delete status" %}</button>
+    {% elif request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
             {% trans "Reply" as button_text %}
@@ -56,14 +59,16 @@
 <div class="card-footer-item">
     <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
 </div>
+{% if not moderation_mode %}
 <div class="card-footer-item">
     {% include 'snippets/status/status_options.html' with class="is-small" right=True %}
 </div>
+{% endif %}
 {% endblock %}
 
 
 {% block card-bonus %}
-{% if request.user.is_authenticated %}
+{% if request.user.is_authenticated and not moderation_mode %}
 {% with status.id|uuid as uuid %}
 <section class="hidden" id="show-comment-{{ status.id }}">
     <div class="card-footer">
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index f703ba6e..3c710055 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -22,10 +22,10 @@
 {% else %}
 {# things you can do to other people's statuses #}
 <li role="menuitem">
-    <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
+    <a href="/direct-messages/{{ status.user|username }}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
-    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
+    {% include 'snippets/report_button.html' with user=status.user status=status %}
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
diff --git a/bookwyrm/templates/snippets/status_preview.html b/bookwyrm/templates/snippets/status_preview.html
new file mode 100644
index 00000000..b1eb3eca
--- /dev/null
+++ b/bookwyrm/templates/snippets/status_preview.html
@@ -0,0 +1,9 @@
+{% if status.content %}
+<a href="{{ status.local_path }}">
+    {{ status.content | safe | truncatewords_html:10 }}{% if status.mention_books %} <em>{{ status.mention_books.first.title }}</em>{% endif %}
+</a>
+{% elif status.quote %}
+<a href="{{ status.local_path }}">{{ status.quote | safe | truncatewords_html:10 }}</a>
+{% elif status.rating %}
+{% include 'snippets/stars.html' with rating=status.rating %}
+{% endif %}

From 4583662f51935097f577fb3a0c436cdb5fa28373 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 17:45:41 -0800
Subject: [PATCH 27/54] Whitespace for so accesslint can clap at me every time
 I commit

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

diff --git a/bookwyrm/templates/moderation/report_modal.html b/bookwyrm/templates/moderation/report_modal.html
index 28613130..ce8408ee 100644
--- a/bookwyrm/templates/moderation/report_modal.html
+++ b/bookwyrm/templates/moderation/report_modal.html
@@ -19,7 +19,7 @@
 
 <section class="content">
     <p>{% blocktrans with site_name=site.name %}This report will be sent to {{ site_name }}'s moderators for review.{% endblocktrans %}</p>
-    <label class="label" for="id_{{ controls_uid}}_report_note">{% trans "More info about this report:" %}</label>
+    <label class="label" for="id_{{ controls_uid }}_report_note">{% trans "More info about this report:" %}</label>
     <textarea class="textarea" name="note" id="id_{{ controls_uid }}_report_note"></textarea>
 </section>
 

From b42c761b0b986402c973d53697e937cd692e1adf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 09:46:28 -0800
Subject: [PATCH 28/54] Safer author add logic

---
 bookwyrm/templates/edit_book.html | 6 ++++--
 bookwyrm/views/books.py           | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 107e75c5..61f04e37 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -74,7 +74,9 @@
         </div>
 
         <button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
-        <button class="button" type="button">{% trans "Back" %}</button>
+        <a href="#" class="button" data-back>
+            <span>{% trans "Back" %}</span>
+        </a>
     </div>
 
     <hr class="block">
@@ -129,7 +131,7 @@
                 {% endif %}
                 <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
                 <p class="help">Separate multiple author names with commas.</p>
-                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}">
+                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}" {% if confirm_mode %}readonly{% endif %}>
             </section>
         </div>
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 1cb21f5e..0a11b87c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -133,6 +133,8 @@ class EditBook(View):
             data["add_author"] = add_author
             data["author_matches"] = []
             for author in add_author.split(","):
+                if not author:
+                    continue
                 # check for existing authors
                 vector = SearchVector("name", weight="A") + SearchVector(
                     "aliases", weight="B"
@@ -200,6 +202,8 @@ class ConfirmEditBook(View):
             # get or create author as needed
             if request.POST.get("add_author"):
                 for (i, author) in enumerate(request.POST.get("add_author").split(",")):
+                    if not author:
+                        continue
                     match = request.POST.get("author_match-%d" % i)
                     if match and match != "0":
                         author = get_object_or_404(

From bedc9e0a88e6e8d36f096eb7c94e3768918bc5f2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 10:22:03 -0800
Subject: [PATCH 29/54] Resolve and re-open reports

---
 .../templates/moderation/report_preview.html  | 11 +++++++++-
 bookwyrm/tests/views/test_reports.py          | 20 ++++++++++++++++++-
 bookwyrm/urls.py                              |  5 +++++
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/reports.py                     | 15 ++++++++++++++
 5 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 9acc4f77..3888be27 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -21,6 +21,15 @@
     {{ report.created_date | naturaltime }}
 </div>
 <div class="card-footer-item">
-    <button class="button">{% trans "Mark as resolved" %}</button>
+    <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
+        {% csrf_token %}
+        <button class="button" type="submit">
+            {% if report.resolved %}
+            {% trans "Re-open" %}
+            {% else %}
+            {% trans "Resolve" %}
+            {% endif %}
+        </button>
+    </form>
 </div>
 {% endblock %}
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 70414dcb..1a5bfd15 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -46,7 +46,7 @@ class ReportViews(TestCase):
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
-        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        models.Report.objects.create(reporter=self.local_user, user=self.rat)
 
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
@@ -80,3 +80,21 @@ class ReportViews(TestCase):
         report = models.Report.objects.get()
         self.assertEqual(report.reporter, self.local_user)
         self.assertEqual(report.user, self.rat)
+
+    def test_resolve_report(self):
+        """ toggle report resolution status """
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        self.assertFalse(report.resolved)
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        # resolve
+        views.resolve_report(request, report.id)
+        report.refresh_from_db()
+        self.assertTrue(report.resolved)
+
+        # un-resolve
+        views.resolve_report(request, report.id)
+        report.refresh_from_db()
+        self.assertFalse(report.resolved)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 42b9803d..551be1e3 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -62,6 +62,11 @@ urlpatterns = [
         views.Report.as_view(),
         name="settings-report",
     ),
+    re_path(
+        r"^settings/reports/(?P<report_id>\d+)/resolve/?$",
+        views.resolve_report,
+        name="settings-report-resolve",
+    ),
     re_path(r"^report/?$", views.make_report, name="report"),
     # landing pages
     re_path(r"^about/?$", views.About.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index b433dca2..63ab98e5 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -20,7 +20,7 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
-from .reports import Report, Reports, make_report
+from .reports import Report, Reports, make_report, resolve_report
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 87547081..59b9b9e4 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -49,6 +49,21 @@ class Report(View):
         data = {"report": get_object_or_404(models.Report, id=report_id)}
         return TemplateResponse(request, "moderation/report.html", data)
 
+    def post(self, request, report_id):
+        """ update a report """
+
+
+@login_required
+@permission_required("bookwyrm_moderate_post")
+def resolve_report(_, report_id):
+    """ mark a report as (un)resolved """
+    report = get_object_or_404(models.Report, id=report_id)
+    report.resolved = not report.resolved
+    report.save()
+    if not report.resolved:
+        return redirect("settings-report", report.id)
+    return redirect("settings-reports")
+
 
 @login_required
 @require_POST

From 8bd12f0e062337a5bfeb6b103f7d36ab8498ab61 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 10:27:08 -0800
Subject: [PATCH 30/54] Remove unused method

---
 bookwyrm/views/reports.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 59b9b9e4..ad22da2b 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -49,9 +49,6 @@ class Report(View):
         data = {"report": get_object_or_404(models.Report, id=report_id)}
         return TemplateResponse(request, "moderation/report.html", data)
 
-    def post(self, request, report_id):
-        """ update a report """
-
 
 @login_required
 @permission_required("bookwyrm_moderate_post")

From 422cd2da73c7583a1383bb6f5722295711fd8eb5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 10:37:52 -0800
Subject: [PATCH 31/54] Direct message report action

---
 bookwyrm/templates/moderation/report.html              | 2 +-
 bookwyrm/templates/snippets/status/status_options.html | 2 +-
 bookwyrm/urls.py                                       | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index ce0a0b3a..32fdf6d7 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -16,7 +16,7 @@
 <div class="block content">
     <h3>{% trans "Actions" %}</h3>
     <div class="field is-grouped">
-        <button class="button">Direct message</button>
+        <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
         <button class="button">Suspend</button>
     </div>
 
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 3c710055..6f0ca2e6 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -22,7 +22,7 @@
 {% else %}
 {# things you can do to other people's statuses #}
 <li role="menuitem">
-    <a href="/direct-messages/{{ status.user|username }}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
+    <a href="{% url 'direct-messages-user' status.user|username %}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
     {% include 'snippets/report_button.html' with user=status.user status=status %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 551be1e3..0ad464f4 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -75,10 +75,13 @@ urlpatterns = [
     re_path(r"^notifications/?$", views.Notifications.as_view()),
     # feeds
     re_path(r"^(?P<tab>home|local|federated)/?$", views.Feed.as_view()),
-    re_path(r"^direct-messages/?$", views.DirectMessage.as_view()),
+    re_path(
+        r"^direct-messages/?$", views.DirectMessage.as_view(), name="direct-messages"
+    ),
     re_path(
         r"^direct-messages/(?P<username>%s)?$" % regex.username,
         views.DirectMessage.as_view(),
+        name="direct-messages-user",
     ),
     # search
     re_path(r"^search/?$", views.Search.as_view()),

From 677a49fee31cc2fe0e24848ea05cbe9a9f3ff63f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 11:13:53 -0800
Subject: [PATCH 32/54] Option to deactivate reported users

---
 bookwyrm/templates/moderation/report.html     | 15 ++++++++++++---
 .../templates/moderation/report_preview.html  |  7 +++++--
 bookwyrm/tests/views/test_reports.py          | 19 +++++++++++++++++++
 bookwyrm/urls.py                              |  5 +++++
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/reports.py                     | 10 ++++++++++
 6 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index 32fdf6d7..b2e61cc4 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -15,9 +15,18 @@
 
 <div class="block content">
     <h3>{% trans "Actions" %}</h3>
-    <div class="field is-grouped">
-        <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
-        <button class="button">Suspend</button>
+    <div class="is-flex">
+        <p class="mr-1">
+            <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
+        </p>
+        <form name="deactivate" method="post" action="{% url 'settings-report-deactivate' report.id  %}">
+            {% csrf_token %}
+            {% if report.user.is_active %}
+            <button type="submit" class="button is-danger is-light">{% trans "Deactivate user" %}</button>
+            {% else %}
+            <button class="button">{% trans "Reactivate user" %}</button>
+            {% endif %}
+        </form>
     </div>
 
     {% for comment in report.reportcomment_set.all %}
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 3888be27..c35010cf 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -8,8 +8,11 @@
 {% endblock %}
 
 {% block card-content %}
-<div class="block">
-    {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
+<div class="block content">
+    <p>
+        {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
+    </p>
+    <p><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 1a5bfd15..724e7b5a 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -98,3 +98,22 @@ class ReportViews(TestCase):
         views.resolve_report(request, report.id)
         report.refresh_from_db()
         self.assertFalse(report.resolved)
+
+
+    def test_deactivate_user(self):
+        """ toggle whether a user is able to log in """
+        self.assertTrue(self.rat.is_active)
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        # resolve
+        views.deactivate_user(request, report.id)
+        self.rat.refresh_from_db()
+        self.assertFalse(self.rat.is_active)
+
+        # un-resolve
+        views.deactivate_user(request, report.id)
+        self.rat.refresh_from_db()
+        self.assertTrue(self.rat.is_active)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 0ad464f4..26ce67a3 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -62,6 +62,11 @@ urlpatterns = [
         views.Report.as_view(),
         name="settings-report",
     ),
+    re_path(
+        r"^settings/reports/(?P<report_id>\d+)/deactivate/?$",
+        views.deactivate_user,
+        name="settings-report-deactivate",
+    ),
     re_path(
         r"^settings/reports/(?P<report_id>\d+)/resolve/?$",
         views.resolve_report,
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 63ab98e5..606624b8 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -20,7 +20,7 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
-from .reports import Report, Reports, make_report, resolve_report
+from .reports import Report, Reports, make_report, resolve_report, deactivate_user
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index ad22da2b..2ba0d27a 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -50,6 +50,16 @@ class Report(View):
         return TemplateResponse(request, "moderation/report.html", data)
 
 
+@login_required
+@permission_required("bookwyrm_moderate_user")
+def deactivate_user(_, report_id):
+    """ mark an account as inactive """
+    report = get_object_or_404(models.Report, id=report_id)
+    report.user.is_active = not report.user.is_active
+    report.user.save()
+    return redirect("settings-report", report.id)
+
+
 @login_required
 @permission_required("bookwyrm_moderate_post")
 def resolve_report(_, report_id):

From 8c74beb78cec60bf44723661b2b6dd2ed5304a3a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 11:25:56 -0800
Subject: [PATCH 33/54] Allow moderators to delete reported statuses

---
 bookwyrm/templates/moderation/report.html     |  5 +++
 .../templates/moderation/report_preview.html  |  1 -
 .../snippets/status/status_body.html          |  9 ++++-
 bookwyrm/tests/views/test_reports.py          |  1 -
 bookwyrm/tests/views/test_status.py           | 34 ++++++++++++++++++-
 bookwyrm/views/status.py                      |  2 +-
 6 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index b2e61cc4..ae014d68 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -15,6 +15,7 @@
 
 <div class="block content">
     <h3>{% trans "Actions" %}</h3>
+    <p><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
     <div class="is-flex">
         <p class="mr-1">
             <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
@@ -46,7 +47,11 @@
     <ul>
         {% for status in report.statuses.select_subclasses.all %}
         <li>
+            {% if status.deleted %}
+            <em>{% trans "Statuses has been deleted" %}</em>
+            {% else %}
             {% include 'snippets/status/status.html' with status=status moderation_mode=True %}
+            {% endif %}
         </li>
         {% endfor %}
     </ul>
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index c35010cf..3a5ebcf9 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -12,7 +12,6 @@
     <p>
         {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
     </p>
-    <p><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index f3732d1a..a7e8e884 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -19,8 +19,15 @@
 {% block card-footer %}
 <div class="card-footer-item">
     {% if moderation_mode and perms.bookwyrm.moderate_post %}
+
     {# moderation options #}
-    <button class="button is-danger is-light">{% trans "Delete status" %}</button>
+    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+        {% csrf_token %}
+        <button class="button is-danger is-light" type="submit">
+            {% trans "Delete status" %}
+        </button>
+    </form>
+
     {% elif request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 724e7b5a..98d28acd 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -99,7 +99,6 @@ class ReportViews(TestCase):
         report.refresh_from_db()
         self.assertFalse(report.resolved)
 
-
     def test_deactivate_user(self):
         """ toggle whether a user is able to log in """
         self.assertTrue(self.rat.is_active)
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 7fdc0e06..32080a5a 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -216,7 +216,7 @@ class StatusViews(TestCase):
             '<a href="%s">'
             "archive.org/details/dli.granth.72113/page/n25/mode/2up</a>" % url,
         )
-        url = "https://openlibrary.org/search" "?q=arkady+strugatsky&mode=everything"
+        url = "https://openlibrary.org/search?q=arkady+strugatsky&mode=everything"
         self.assertEqual(
             views.status.format_links(url),
             '<a href="%s">openlibrary.org/search'
@@ -253,3 +253,35 @@ class StatusViews(TestCase):
             self.assertEqual(activity["object"]["type"], "Tombstone")
         status.refresh_from_db()
         self.assertTrue(status.deleted)
+
+    def test_handle_delete_status_permission_denied(self):
+        """ marks a status as deleted """
+        view = views.DeleteStatus.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
+        self.assertFalse(status.deleted)
+        request = self.factory.post("")
+        request.user = self.remote_user
+
+        view(request, status.id)
+
+        status.refresh_from_db()
+        self.assertFalse(status.deleted)
+
+    def test_handle_delete_status_moderator(self):
+        """ marks a status as deleted """
+        view = views.DeleteStatus.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
+        self.assertFalse(status.deleted)
+        request = self.factory.post("")
+        request.user = self.remote_user
+        request.user.is_superuser = True
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            view(request, status.id)
+            activity = json.loads(mock.call_args_list[0][0][1])
+            self.assertEqual(activity["type"], "Delete")
+            self.assertEqual(activity["object"]["type"], "Tombstone")
+        status.refresh_from_db()
+        self.assertTrue(status.deleted)
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 8cc5df69..0cb5974b 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -75,7 +75,7 @@ class DeleteStatus(View):
         status = get_object_or_404(models.Status, id=status_id)
 
         # don't let people delete other people's statuses
-        if status.user != request.user:
+        if status.user != request.user and not request.user.has_perm("moderate_post"):
             return HttpResponseBadRequest()
 
         # perform deletion

From 46581e37e2b34d78679fcb2e58d0a1e2b75b125d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 15:24:57 -0800
Subject: [PATCH 34/54] Mocks boradcast for moderation test

---
 bookwyrm/tests/views/test_reports.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 98d28acd..d181febc 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -107,12 +108,14 @@ class ReportViews(TestCase):
         request.user = self.local_user
         request.user.is_superuser = True
 
-        # resolve
-        views.deactivate_user(request, report.id)
+        # de-activate
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.deactivate_user(request, report.id)
         self.rat.refresh_from_db()
         self.assertFalse(self.rat.is_active)
 
-        # un-resolve
-        views.deactivate_user(request, report.id)
+        # re-activate
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.deactivate_user(request, report.id)
         self.rat.refresh_from_db()
         self.assertTrue(self.rat.is_active)

From 9245b9d9caeccba90c7b7afb62af1269d6ffca59 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 15:56:54 -0800
Subject: [PATCH 35/54] Comments on reports

---
 bookwyrm/models/report.py                 |  5 +++++
 bookwyrm/templates/moderation/report.html | 23 ++++++++++++++++++-----
 bookwyrm/views/reports.py                 | 14 +++++++++++++-
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 8893f42f..a1e17eb2 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -30,3 +30,8 @@ class ReportComment(BookWyrmModel):
     user = models.ForeignKey("User", on_delete=models.PROTECT)
     note = models.TextField()
     report = models.ForeignKey(Report, on_delete=models.PROTECT)
+
+    class Meta:
+        """ sort comments """
+
+        ordering = ("-created_date",)
diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index ae014d68..d2769544 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -1,5 +1,6 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+{% load humanize %}
 
 {% block title %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
 {% block header %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
@@ -29,17 +30,29 @@
             {% endif %}
         </form>
     </div>
+</div>
 
+<div class="block">
+    <h3 class="title is-4">{% trans "Moderator Comments" %}</h3>
     {% for comment in report.reportcomment_set.all %}
-    <div class="block">
-        {{ comment }}
+    <div class="card block">
+        <p class="card-content">{{ comment.note }}</p>
+        <div class="card-footer">
+            <div class="card-footer-item">
+                <a href="{{ comment.user.local_path }}">{{ comment.user.display_name }}</a>
+            </div>
+            <div class="card-footer-item">
+                {{ comment.created_date | naturaltime }}
+            </div>
+        </div>
     </div>
     {% endfor %}
-    <form>
+    <form class="block" name="report-comment" method="post" action="{% url 'settings-report' report.id %}">
+        {% csrf_token %}
         <label for="report_comment" class="label">Comment on report</label>
-        <textarea name="comment" id="report_comment" class="textarea"></textarea>
+        <textarea name="note" id="report_comment" class="textarea"></textarea>
         <button class="button">{% trans "Comment" %}</button>
-    </forM=m>
+    </form>
 </div>
 
 <div class="block">
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 2ba0d27a..06909cf1 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -46,9 +46,21 @@ class Report(View):
 
     def get(self, request, report_id):
         """ load a report """
-        data = {"report": get_object_or_404(models.Report, id=report_id)}
+        data = {
+            "report": get_object_or_404(models.Report, id=report_id),
+        }
         return TemplateResponse(request, "moderation/report.html", data)
 
+    def post(self, request, report_id):
+        """ comment on a report """
+        report = get_object_or_404(models.Report, id=report_id)
+        models.ReportComment.objects.create(
+            user=request.user,
+            report=report,
+            note=request.POST.get("note"),
+        )
+        return redirect("settings-report", report.id)
+
 
 @login_required
 @permission_required("bookwyrm_moderate_user")

From 7323f638032771ce04b97a6ceb186a0a4ecf2626 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 16:02:23 -0800
Subject: [PATCH 36/54] Adds test for report comments

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

diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index d181febc..1c56067a 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -68,6 +68,21 @@ class ReportViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_report_comment(self):
+        """ comment on a report """
+        view = views.Report.as_view()
+        request = self.factory.post("", {"note": "hi"})
+        request.user = self.local_user
+        request.user.is_superuser = True
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+
+        view(request, report.id)
+
+        comment = models.ReportComment.objects.get()
+        self.assertEqual(comment.user, self.local_user)
+        self.assertEqual(comment.note, "hi")
+        self.assertEqual(comment.report, report)
+
     def test_make_report(self):
         """ a user reports another user """
         form = forms.ReportForm()

From 1617cfaac71b680e0d4dd264718934776d9a3725 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 16:20:10 -0800
Subject: [PATCH 37/54] Clarifies report headers in moderation panel

---
 bookwyrm/templates/moderation/report.html         | 8 ++++++--
 bookwyrm/templates/moderation/report_preview.html | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index d2769544..a231c41c 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -2,8 +2,8 @@
 {% load i18n %}
 {% load humanize %}
 
-{% block title %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
-{% block header %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
+{% block header %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
 
 {% block panel %}
 <div class="block">
@@ -57,6 +57,9 @@
 
 <div class="block">
     <h3 class="title is-4">{% trans "Reported statuses" %}</h3>
+    {% if not report.statuses.exists %}
+    <em>{% trans "No statuses reported" %}</em>
+    {% else %}
     <ul>
         {% for status in report.statuses.select_subclasses.all %}
         <li>
@@ -68,5 +71,6 @@
         </li>
         {% endfor %}
     </ul>
+    {% endif %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 3a5ebcf9..363783d5 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -3,7 +3,7 @@
 {% load humanize %}
 {% block card-header %}
 <h2 class="card-header-title has-background-white-ter is-block">
-    <a href="{% url 'settings-report' report.id %}">{{ report.user.username }}</a>
+    <a href="{% url 'settings-report' report.id %}">{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}</a>
 </h2>
 {% endblock %}
 

From 848edd29726dff04c581c1f0dae571441132e8a8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 16:31:46 -0800
Subject: [PATCH 38/54] Adds missing migration for reports model

---
 .../migrations/0050_auto_20210313_0030.py     | 26 +++++++++++++++++++
 bookwyrm/models/report.py                     |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/migrations/0050_auto_20210313_0030.py

diff --git a/bookwyrm/migrations/0050_auto_20210313_0030.py b/bookwyrm/migrations/0050_auto_20210313_0030.py
new file mode 100644
index 00000000..8c81c452
--- /dev/null
+++ b/bookwyrm/migrations/0050_auto_20210313_0030.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.0.7 on 2021-03-13 00:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0049_auto_20210309_0156"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="report",
+            options={"ordering": ("-created_date",)},
+        ),
+        migrations.AlterModelOptions(
+            name="reportcomment",
+            options={"ordering": ("-created_date",)},
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="statuses",
+            field=models.ManyToManyField(blank=True, to="bookwyrm.Status"),
+        ),
+    ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index a1e17eb2..6a76d9fd 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -12,7 +12,7 @@ class Report(BookWyrmModel):
     )
     note = models.TextField(null=True, blank=True)
     user = models.ForeignKey("User", on_delete=models.PROTECT)
-    statuses = models.ManyToManyField("Status", null=True, blank=True)
+    statuses = models.ManyToManyField("Status", blank=True)
     resolved = models.BooleanField(default=False)
 
     class Meta:

From 2548ba926aaca6be25ae5e26cbe0c55271edfedd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 07:15:30 -0800
Subject: [PATCH 39/54] Fixes error when receiving Undo for unknown boost

---
 bookwyrm/activitypub/verbs.py      |  3 +++
 bookwyrm/tests/views/test_inbox.py | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index cd7a757b..1788dda7 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -70,6 +70,9 @@ class Undo(Verb):
         if self.object.type == "Follow":
             model = apps.get_model("bookwyrm.UserFollows")
         obj = self.object.to_model(model=model, save=False, allow_create=False)
+        if not obj:
+            # if we don't have the object, we can't undo it. happens a lot with boosts
+            return
         obj.delete()
 
 
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index cab50892..d43018db 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -563,6 +563,23 @@ class Inbox(TestCase):
         }
         views.inbox.activity_task(activity)
 
+    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")

From 1f4b3e958639c951a63c2335e4a828ca7d28ed01 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 07:38:19 -0800
Subject: [PATCH 40/54] Adds tests for status recipients property

---
 bookwyrm/tests/models/test_status_model.py | 121 +++++++++++++++------
 1 file changed, 87 insertions(+), 34 deletions(-)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 21982c20..ddc92d36 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -12,15 +12,26 @@ from django.utils import timezone
 from bookwyrm import models, settings
 
 
+# pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.Status.broadcast")
 class Status(TestCase):
     """ lotta types of statuses """
 
     def setUp(self):
         """ useful things for creating a status """
-        self.user = models.User.objects.create_user(
+        self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
+        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",
+            )
         self.book = models.Edition.objects.create(title="Test Edition")
 
         image_file = pathlib.Path(__file__).parent.joinpath(
@@ -34,22 +45,22 @@ class Status(TestCase):
 
     def test_status_generated_fields(self, _):
         """ setting remote id """
-        status = models.Status.objects.create(content="bleh", user=self.user)
+        status = models.Status.objects.create(content="bleh", user=self.local_user)
         expected_id = "https://%s/user/mouse/status/%d" % (settings.DOMAIN, status.id)
         self.assertEqual(status.remote_id, expected_id)
         self.assertEqual(status.privacy, "public")
 
     def test_replies(self, _):
         """ get a list of replies """
-        parent = models.Status.objects.create(content="hi", user=self.user)
+        parent = models.Status.objects.create(content="hi", user=self.local_user)
         child = models.Status.objects.create(
-            content="hello", reply_parent=parent, user=self.user
+            content="hello", reply_parent=parent, user=self.local_user
         )
         models.Review.objects.create(
-            content="hey", reply_parent=parent, user=self.user, book=self.book
+            content="hey", reply_parent=parent, user=self.local_user, book=self.book
         )
         models.Status.objects.create(
-            content="hi hello", reply_parent=child, user=self.user
+            content="hi hello", reply_parent=child, user=self.local_user
         )
 
         replies = models.Status.replies(parent)
@@ -75,15 +86,15 @@ class Status(TestCase):
 
     def test_to_replies(self, _):
         """ activitypub replies collection """
-        parent = models.Status.objects.create(content="hi", user=self.user)
+        parent = models.Status.objects.create(content="hi", user=self.local_user)
         child = models.Status.objects.create(
-            content="hello", reply_parent=parent, user=self.user
+            content="hello", reply_parent=parent, user=self.local_user
         )
         models.Review.objects.create(
-            content="hey", reply_parent=parent, user=self.user, book=self.book
+            content="hey", reply_parent=parent, user=self.local_user, book=self.book
         )
         models.Status.objects.create(
-            content="hi hello", reply_parent=child, user=self.user
+            content="hi hello", reply_parent=child, user=self.local_user
         )
 
         replies = parent.to_replies()
@@ -92,7 +103,9 @@ class Status(TestCase):
 
     def test_status_to_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
-        status = models.Status.objects.create(content="test content", user=self.user)
+        status = models.Status.objects.create(
+            content="test content", user=self.local_user
+        )
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Note")
@@ -103,7 +116,7 @@ class Status(TestCase):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Status.objects.create(
             content="test content",
-            user=self.user,
+            user=self.local_user,
             deleted=True,
             deleted_date=timezone.now(),
         )
@@ -114,7 +127,9 @@ class Status(TestCase):
 
     def test_status_to_pure_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
-        status = models.Status.objects.create(content="test content", user=self.user)
+        status = models.Status.objects.create(
+            content="test content", user=self.local_user
+        )
         activity = status.to_activity(pure=True)
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Note")
@@ -125,10 +140,10 @@ class Status(TestCase):
     def test_generated_note_to_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
         status = models.GeneratedNote.objects.create(
-            content="test content", user=self.user
+            content="test content", user=self.local_user
         )
         status.mention_books.set([self.book])
-        status.mention_users.set([self.user])
+        status.mention_users.set([self.local_user])
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "GeneratedNote")
@@ -139,10 +154,10 @@ class Status(TestCase):
     def test_generated_note_to_pure_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
         status = models.GeneratedNote.objects.create(
-            content="test content", user=self.user
+            content="test content", user=self.local_user
         )
         status.mention_books.set([self.book])
-        status.mention_users.set([self.user])
+        status.mention_users.set([self.local_user])
         activity = status.to_activity(pure=True)
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(
@@ -163,7 +178,7 @@ class Status(TestCase):
     def test_comment_to_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Comment.objects.create(
-            content="test content", user=self.user, book=self.book
+            content="test content", user=self.local_user, book=self.book
         )
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
@@ -174,7 +189,7 @@ class Status(TestCase):
     def test_comment_to_pure_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Comment.objects.create(
-            content="test content", user=self.user, book=self.book
+            content="test content", user=self.local_user, book=self.book
         )
         activity = status.to_activity(pure=True)
         self.assertEqual(activity["id"], status.remote_id)
@@ -196,7 +211,7 @@ class Status(TestCase):
         status = models.Quotation.objects.create(
             quote="a sickening sense",
             content="test content",
-            user=self.user,
+            user=self.local_user,
             book=self.book,
         )
         activity = status.to_activity()
@@ -211,7 +226,7 @@ class Status(TestCase):
         status = models.Quotation.objects.create(
             quote="a sickening sense",
             content="test content",
-            user=self.user,
+            user=self.local_user,
             book=self.book,
         )
         activity = status.to_activity(pure=True)
@@ -235,7 +250,7 @@ class Status(TestCase):
             name="Review name",
             content="test content",
             rating=3,
-            user=self.user,
+            user=self.local_user,
             book=self.book,
         )
         activity = status.to_activity()
@@ -252,7 +267,7 @@ class Status(TestCase):
             name="Review name",
             content="test content",
             rating=3,
-            user=self.user,
+            user=self.local_user,
             book=self.book,
         )
         activity = status.to_activity(pure=True)
@@ -275,30 +290,34 @@ class Status(TestCase):
 
         def fav_broadcast_mock(_, activity, user):
             """ ok """
-            self.assertEqual(user.remote_id, self.user.remote_id)
+            self.assertEqual(user.remote_id, self.local_user.remote_id)
             self.assertEqual(activity["type"], "Like")
 
         models.Favorite.broadcast = fav_broadcast_mock
 
-        status = models.Status.objects.create(content="test content", user=self.user)
-        fav = models.Favorite.objects.create(status=status, user=self.user)
+        status = models.Status.objects.create(
+            content="test content", user=self.local_user
+        )
+        fav = models.Favorite.objects.create(status=status, user=self.local_user)
 
         # can't fav a status twice
         with self.assertRaises(IntegrityError):
-            models.Favorite.objects.create(status=status, user=self.user)
+            models.Favorite.objects.create(status=status, user=self.local_user)
 
         activity = fav.to_activity()
         self.assertEqual(activity["type"], "Like")
-        self.assertEqual(activity["actor"], self.user.remote_id)
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
         self.assertEqual(activity["object"], status.remote_id)
         models.Favorite.broadcast = real_broadcast
 
     def test_boost(self, _):
         """ boosting, this one's a bit fussy """
-        status = models.Status.objects.create(content="test content", user=self.user)
-        boost = models.Boost.objects.create(boosted_status=status, user=self.user)
+        status = models.Status.objects.create(
+            content="test content", user=self.local_user
+        )
+        boost = models.Boost.objects.create(boosted_status=status, user=self.local_user)
         activity = boost.to_activity()
-        self.assertEqual(activity["actor"], self.user.remote_id)
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
         self.assertEqual(activity["object"], status.remote_id)
         self.assertEqual(activity["type"], "Announce")
         self.assertEqual(activity, boost.to_activity(pure=True))
@@ -306,18 +325,20 @@ class Status(TestCase):
     def test_notification(self, _):
         """ a simple model """
         notification = models.Notification.objects.create(
-            user=self.user, notification_type="FAVORITE"
+            user=self.local_user, notification_type="FAVORITE"
         )
         self.assertFalse(notification.read)
 
         with self.assertRaises(IntegrityError):
             models.Notification.objects.create(
-                user=self.user, notification_type="GLORB"
+                user=self.local_user, notification_type="GLORB"
             )
 
     def test_create_broadcast(self, broadcast_mock):
         """ should send out two verions of a status on create """
-        models.Comment.objects.create(content="hi", user=self.user, book=self.book)
+        models.Comment.objects.create(
+            content="hi", user=self.local_user, book=self.book
+        )
         self.assertEqual(broadcast_mock.call_count, 2)
         pure_call = broadcast_mock.call_args_list[0]
         bw_call = broadcast_mock.call_args_list[1]
@@ -332,3 +353,35 @@ class Status(TestCase):
         args = bw_call[0][0]
         self.assertEqual(args["type"], "Create")
         self.assertEqual(args["object"]["type"], "Comment")
+
+    def test_recipients_with_mentions(self, _):
+        """ get recipients to broadcast a status """
+        status = models.GeneratedNote.objects.create(
+            content="test content", user=self.local_user
+        )
+        status.mention_users.add(self.remote_user)
+
+        self.assertEqual(status.recipients, [self.remote_user])
+
+    def test_recipients_with_reply_parent(self, _):
+        """ get recipients to broadcast a status """
+        parent_status = models.GeneratedNote.objects.create(
+            content="test content", user=self.remote_user
+        )
+        status = models.GeneratedNote.objects.create(
+            content="test content", user=self.local_user, reply_parent=parent_status
+        )
+
+        self.assertEqual(status.recipients, [self.remote_user])
+
+    def test_recipients_with_reply_parent_and_mentions(self, _):
+        """ get recipients to broadcast a status """
+        parent_status = models.GeneratedNote.objects.create(
+            content="test content", user=self.remote_user
+        )
+        status = models.GeneratedNote.objects.create(
+            content="test content", user=self.local_user, reply_parent=parent_status
+        )
+        status.mention_users.set([self.remote_user])
+
+        self.assertEqual(status.recipients, [self.remote_user])

From 919b166241ee1b9b2193265d4a07f75e27096982 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:13:20 -0800
Subject: [PATCH 41/54] Catch error in serializing unknown boosts

---
 bookwyrm/activitypub/base_activity.py      |  5 ++---
 bookwyrm/connectors/abstract_connector.py  |  2 +-
 bookwyrm/models/status.py                  |  9 +++++++--
 bookwyrm/tests/models/test_status_model.py | 16 +++++++++++++++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 315ff58c..170bdfb9 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -258,10 +258,9 @@ def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
     # load the data and create the object
     try:
         data = get_data(remote_id)
-    except (ConnectorException, ConnectionError):
+    except ConnectorException:
         raise ActivitySerializerError(
-            "Could not connect to host for remote_id in %s model: %s"
-            % (model.__name__, remote_id)
+            "Could not connect to host for remote_id in: %s" % (remote_id)
         )
     # determine the model implicitly, if not provided
     if not model:
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 9f31b337..3ebedf65 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -244,7 +244,7 @@ def get_data(url):
                 "User-Agent": settings.USER_AGENT,
             },
         )
-    except (RequestError, SSLError) as e:
+    except (RequestError, SSLError, ConnectionError) as e:
         logger.exception(e)
         raise ConnectorException()
 
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 80f2b593..c5e69936 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -115,13 +115,18 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
     def ignore_activity(cls, activity):
         """ keep notes if they are replies to existing statuses """
         if activity.type == "Announce":
-            # keep it if the booster or the boosted are local
-            boosted = activitypub.resolve_remote_id(activity.object, save=False)
+            try:
+                boosted = activitypub.resolve_remote_id(activity.object, save=False)
+            except activitypub.ActivitySerializerError:
+                # if we can't load the status, definitely ignore it
+                return True
+            # keep the boost if we would keep the status
             return cls.ignore_activity(boosted.to_activity_dataclass())
 
         # keep if it if it's a custom type
         if activity.type != "Note":
             return False
+        # keep it if it's a reply to an existing status
         if cls.objects.filter(remote_id=activity.inReplyTo).exists():
             return False
 
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index ddc92d36..b2ee69b8 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -8,8 +8,9 @@ from django.core.files.base import ContentFile
 from django.db import IntegrityError
 from django.test import TestCase
 from django.utils import timezone
+import responses
 
-from bookwyrm import models, settings
+from bookwyrm import activitypub, models, settings
 
 
 # pylint: disable=too-many-public-methods
@@ -385,3 +386,16 @@ class Status(TestCase):
         status.mention_users.set([self.remote_user])
 
         self.assertEqual(status.recipients, [self.remote_user])
+
+    @responses.activate
+    def test_ignore_activity_boost(self, _):
+        """ don't bother with most remote statuses """
+        activity = activitypub.Announce(
+            id="http://www.faraway.com/boost/12",
+            actor=self.remote_user.remote_id,
+            object="http://fish.com/nothing",
+        )
+
+        responses.add(responses.GET, "http://fish.com/nothing", status=404)
+
+        self.assertTrue(models.Status.ignore_activity(activity))

From 3edfcb76318e6f09e6d14a8dfdc623ac5e6a8bfe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:15:58 -0800
Subject: [PATCH 42/54] Trying to fix broadcast connectionerror exceptions

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

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 4ced78c2..691cad00 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -456,8 +456,8 @@ def broadcast_task(sender_id, activity, recipients):
     for recipient in recipients:
         try:
             sign_and_send(sender, activity, recipient)
-        except (HTTPError, SSLError, ConnectionError) as e:
-            logger.exception(e)
+        except (HTTPError, SSLError, ConnectionError):
+            pass
 
 
 def sign_and_send(sender, data, destination):

From e1a8c4d260df6d4d26d3fbabeea2082a4f845a3a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:43:36 -0800
Subject: [PATCH 43/54] Fixes handling incoming unshelve activities

---
 bookwyrm/activitypub/verbs.py        |  8 +++++--
 bookwyrm/models/activitypub_mixin.py |  7 +++---
 bookwyrm/tests/views/test_inbox.py   | 35 ++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index cd7a757b..48dbf28b 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -137,7 +137,7 @@ class Add(Verb):
     def action(self):
         """ add obj to collection """
         target = resolve_remote_id(self.target, refresh=False)
-        # we want to related field that isn't the book, this is janky af sorry
+        # we want to get the related field that isn't the book, this is janky af sorry
         model = [t for t in type(target)._meta.related_objects if t.name != "edition"][
             0
         ].related_model
@@ -153,7 +153,11 @@ class Remove(Verb):
 
     def action(self):
         """ find and remove the activity object """
-        obj = self.object.to_model(save=False, allow_create=False)
+        target = resolve_remote_id(self.target, refresh=False)
+        model = [t for t in type(target)._meta.related_objects if t.name != "edition"][
+            0
+        ].related_model
+        obj = self.to_model(model=model, save=False, allow_create=False)
         obj.delete()
 
 
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 4ced78c2..adc8e2f3 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -362,14 +362,15 @@ class CollectionItemMixin(ActivitypubMixin):
         """ broadcast a remove activity """
         activity = self.to_remove_activity()
         super().delete(*args, **kwargs)
-        self.broadcast(activity, self.user)
+        if self.user.local:
+            self.broadcast(activity, self.user)
 
     def to_add_activity(self):
         """ AP for shelving a book"""
         object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Add(
-            id="%s#add" % self.remote_id,
+            id=self.remote_id,
             actor=self.user.remote_id,
             object=object_field,
             target=collection_field.remote_id,
@@ -380,7 +381,7 @@ class CollectionItemMixin(ActivitypubMixin):
         object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Remove(
-            id="%s#remove" % self.remote_id,
+            id=self.remote_id,
             actor=self.user.remote_id,
             object=object_field,
             target=collection_field.remote_id,
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index cab50892..35f5bf4c 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -591,6 +591,41 @@ class Inbox(TestCase):
         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 """

From 2ab913018d9dde0e9e35aea49f3c1a24ce83b526 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:52:36 -0800
Subject: [PATCH 44/54] Use get_data helper when executing searches

---
 bookwyrm/connectors/abstract_connector.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 9f31b337..9d8a05e0 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -44,21 +44,10 @@ class AbstractMinimalConnector(ABC):
         if min_confidence:
             params["min_confidence"] = min_confidence
 
-        resp = requests.get(
+        data = get_data(
             "%s%s" % (self.search_url, query),
             params=params,
-            headers={
-                "Accept": "application/json; charset=utf-8",
-                "User-Agent": settings.USER_AGENT,
-            },
         )
-        if not resp.ok:
-            resp.raise_for_status()
-        try:
-            data = resp.json()
-        except ValueError as e:
-            logger.exception(e)
-            raise ConnectorException("Unable to parse json response", e)
         results = []
 
         for doc in self.parse_search_data(data)[:10]:
@@ -234,11 +223,12 @@ def dict_from_mappings(data, mappings):
     return result
 
 
-def get_data(url):
+def get_data(url, params=None):
     """ wrapper for request.get """
     try:
         resp = requests.get(
             url,
+            params=params,
             headers={
                 "Accept": "application/json; charset=utf-8",
                 "User-Agent": settings.USER_AGENT,

From e459c440de12d11535d3f8e04d4cde5b25b36cc7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:52:48 -0800
Subject: [PATCH 45/54] tests formulating search queries with min_confidence
 field

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

diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index 957d3233..d710abf8 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -71,6 +71,18 @@ class AbstractConnector(TestCase):
         self.assertEqual(results[1], "b")
         self.assertEqual(results[2], "c")
 
+    @responses.activate
+    def test_search_min_confidence(self):
+        """ makes an http request to the outside service """
+        responses.add(
+            responses.GET,
+            "https://example.com/search?q=a%20book%20title&min_confidence=1",
+            json=["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"],
+            status=200,
+        )
+        results = self.test_connector.search("a book title", min_confidence=1)
+        self.assertEqual(len(results), 10)
+
     def test_search_result(self):
         """ a class that stores info about a search result """
         result = SearchResult(

From d3b1941eaad6b91f93e19e76361e412e9d072520 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 09:07:19 -0800
Subject: [PATCH 46/54] Uses get_data helper in isbn search (plus test)

---
 bookwyrm/connectors/abstract_connector.py        | 16 +++-------------
 .../test_abstract_minimal_connector.py           | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 9d8a05e0..7635f57e 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -57,24 +57,14 @@ class AbstractMinimalConnector(ABC):
     def isbn_search(self, query):
         """ isbn search """
         params = {}
-        resp = requests.get(
+        data = get_data(
             "%s%s" % (self.isbn_search_url, query),
             params=params,
-            headers={
-                "Accept": "application/json; charset=utf-8",
-                "User-Agent": settings.USER_AGENT,
-            },
         )
-        if not resp.ok:
-            resp.raise_for_status()
-        try:
-            data = resp.json()
-        except ValueError as e:
-            logger.exception(e)
-            raise ConnectorException("Unable to parse json response", e)
         results = []
 
-        for doc in self.parse_isbn_search_data(data):
+        # this shouldn't be returning mutliple results, but just in case
+        for doc in self.parse_isbn_search_data(data)[:10]:
             results.append(self.format_isbn_search_result(doc))
         return results
 
diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index d710abf8..fa7c85f4 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -19,7 +19,7 @@ class AbstractConnector(TestCase):
             books_url="https://example.com/books",
             covers_url="https://example.com/covers",
             search_url="https://example.com/search?q=",
-            isbn_search_url="https://example.com/isbn",
+            isbn_search_url="https://example.com/isbn?q=",
         )
 
         class TestConnector(abstract_connector.AbstractMinimalConnector):
@@ -50,7 +50,7 @@ class AbstractConnector(TestCase):
         self.assertEqual(connector.books_url, "https://example.com/books")
         self.assertEqual(connector.covers_url, "https://example.com/covers")
         self.assertEqual(connector.search_url, "https://example.com/search?q=")
-        self.assertEqual(connector.isbn_search_url, "https://example.com/isbn")
+        self.assertEqual(connector.isbn_search_url, "https://example.com/isbn?q=")
         self.assertIsNone(connector.name)
         self.assertEqual(connector.identifier, "example.com")
         self.assertIsNone(connector.max_query_count)
@@ -83,6 +83,18 @@ class AbstractConnector(TestCase):
         results = self.test_connector.search("a book title", min_confidence=1)
         self.assertEqual(len(results), 10)
 
+    @responses.activate
+    def test_isbn_search(self):
+        """ makes an http request to the outside service """
+        responses.add(
+            responses.GET,
+            "https://example.com/isbn?q=123456",
+            json=["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"],
+            status=200,
+        )
+        results = self.test_connector.isbn_search("123456")
+        self.assertEqual(len(results), 10)
+
     def test_search_result(self):
         """ a class that stores info about a search result """
         result = SearchResult(

From 382170d662d71fdd896a889e48d5faecf4d3426f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 09:27:59 -0800
Subject: [PATCH 47/54] Adds get_or_create_author abstract connector test

---
 .../connectors/test_abstract_connector.py     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py
index 9aa78f6a..97190c16 100644
--- a/bookwyrm/tests/connectors/test_abstract_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_connector.py
@@ -122,3 +122,27 @@ class AbstractConnector(TestCase):
         self.assertEqual(result, self.book)
         self.assertEqual(models.Edition.objects.count(), 1)
         self.assertEqual(models.Edition.objects.count(), 1)
+
+    @responses.activate
+    def test_get_or_create_author(self):
+        """ load an author """
+        self.connector.author_mappings = [
+            Mapping("id"),
+            Mapping("name"),
+        ]
+
+        responses.add(
+            responses.GET,
+            "https://www.example.com/author",
+            json={"id": "https://www.example.com/author", "name": "Test Author"},
+        )
+        result = self.connector.get_or_create_author("https://www.example.com/author")
+        self.assertIsInstance(result, models.Author)
+        self.assertEqual(result.name, "Test Author")
+        self.assertEqual(result.origin_id, "https://www.example.com/author")
+
+    def test_get_or_create_author_existing(self):
+        """ get an existing author """
+        author = models.Author.objects.create(name="Test Author")
+        result = self.connector.get_or_create_author(author.remote_id)
+        self.assertEqual(author, result)

From 6b22de207577356127f924e9177e460fb2e3b94e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 09:41:40 -0800
Subject: [PATCH 48/54] More tests for bookwyrm connector

---
 .../connectors/test_bookwyrm_connector.py      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py
index 1fc71688..386c1350 100644
--- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py
+++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py
@@ -23,10 +23,12 @@ class BookWyrmConnector(TestCase):
         )
         self.connector = Connector("example.com")
 
-        work_file = pathlib.Path(__file__).parent.joinpath("../data/bw_work.json")
-        edition_file = pathlib.Path(__file__).parent.joinpath("../data/bw_edition.json")
-        self.work_data = json.loads(work_file.read_bytes())
-        self.edition_data = json.loads(edition_file.read_bytes())
+    def test_get_or_create_book_existing(self):
+        """ load book activity """
+        work = models.Work.objects.create(title="Test Work")
+        book = models.Edition.objects.create(title="Test Edition", parent_work=work)
+        result = self.connector.get_or_create_book(book.remote_id)
+        self.assertEqual(book, result)
 
     def test_format_search_result(self):
         """ create a SearchResult object from search response json """
@@ -42,3 +44,11 @@ class BookWyrmConnector(TestCase):
         self.assertEqual(result.author, "Susanna Clarke")
         self.assertEqual(result.year, 2017)
         self.assertEqual(result.connector, self.connector)
+
+    def test_format_isbn_search_result(self):
+        """ just gotta attach the connector  """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_search.json")
+        search_data = json.loads(datafile.read_bytes())
+        results = self.connector.parse_isbn_search_data(search_data)
+        result = self.connector.format_isbn_search_result(results[0])
+        self.assertEqual(result.connector, self.connector)

From 414dd6bd20f93691dc8f3c1816c31c6966b9a083 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 10:01:17 -0800
Subject: [PATCH 49/54] Adds isbn search test to connector manager

---
 bookwyrm/connectors/connector_manager.py            |  4 ++--
 bookwyrm/tests/connectors/test_connector_manager.py | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 3891d02a..3ed25ceb 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -18,7 +18,7 @@ def search(query, min_confidence=0.1):
     results = []
 
     # Have we got a ISBN ?
-    isbn = re.sub("[\W_]", "", query)
+    isbn = re.sub(r"[\W_]", "", query)
     maybe_isbn = len(isbn) in [10, 13]  # ISBN10 or ISBN13
 
     dedup_slug = lambda r: "%s/%s/%s" % (r.title, r.author, r.year)
@@ -36,7 +36,7 @@ def search(query, min_confidence=0.1):
                     pass
 
         # if no isbn search or results, we fallback to generic search
-        if result_set == None or result_set == []:
+        if result_set in (None, []):
             try:
                 result_set = connector.search(query, min_confidence=min_confidence)
             except (HTTPError, ConnectorException):
diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py
index 4410e011..52589323 100644
--- a/bookwyrm/tests/connectors/test_connector_manager.py
+++ b/bookwyrm/tests/connectors/test_connector_manager.py
@@ -15,7 +15,7 @@ class ConnectorManager(TestCase):
         self.work = models.Work.objects.create(title="Example Work")
 
         self.edition = models.Edition.objects.create(
-            title="Example Edition", parent_work=self.work
+            title="Example Edition", parent_work=self.work, isbn_10="0000000000"
         )
         self.work.default_edition = self.edition
         self.work.save()
@@ -28,6 +28,7 @@ class ConnectorManager(TestCase):
             base_url="http://test.com/",
             books_url="http://test.com/",
             covers_url="http://test.com/",
+            isbn_search_url="http://test.com/isbn/",
         )
 
     def test_get_or_create_connector(self):
@@ -58,6 +59,14 @@ class ConnectorManager(TestCase):
         self.assertEqual(len(results[0]["results"]), 1)
         self.assertEqual(results[0]["results"][0].title, "Example Edition")
 
+    def test_search_isbn(self):
+        """ special handling if a query resembles an isbn """
+        results = connector_manager.search("0000000000")
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0]["connector"], SelfConnector)
+        self.assertEqual(len(results[0]["results"]), 1)
+        self.assertEqual(results[0]["results"][0].title, "Example Edition")
+
     def test_local_search(self):
         """ search only the local database """
         results = connector_manager.local_search("Example")

From 76f16432698c4c4067d834ea82b9dfb7be4ef729 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 10:11:13 -0800
Subject: [PATCH 50/54] Tests ignore edition openlibrary connector code

also removes print statements oops
---
 bookwyrm/connectors/openlibrary.py                     |  4 ----
 .../tests/connectors/test_openlibrary_connector.py     | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index fb9a4e47..c83a65d6 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -161,21 +161,17 @@ def ignore_edition(edition_data):
     """ don't load a million editions that have no metadata """
     # an isbn, we love to see it
     if edition_data.get("isbn_13") or edition_data.get("isbn_10"):
-        print(edition_data.get("isbn_10"))
         return False
     # grudgingly, oclc can stay
     if edition_data.get("oclc_numbers"):
-        print(edition_data.get("oclc_numbers"))
         return False
     # if it has a cover it can stay
     if edition_data.get("covers"):
-        print(edition_data.get("covers"))
         return False
     # keep non-english editions
     if edition_data.get("languages") and "languages/eng" not in str(
         edition_data.get("languages")
     ):
-        print(edition_data.get("languages"))
         return False
     return True
 
diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py
index bb018830..3cff4fb0 100644
--- a/bookwyrm/tests/connectors/test_openlibrary_connector.py
+++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py
@@ -8,6 +8,7 @@ import responses
 
 from bookwyrm import models
 from bookwyrm.connectors.openlibrary import Connector
+from bookwyrm.connectors.openlibrary import ignore_edition
 from bookwyrm.connectors.openlibrary import get_languages, get_description
 from bookwyrm.connectors.openlibrary import pick_default_edition, get_openlibrary_key
 from bookwyrm.connectors.abstract_connector import SearchResult
@@ -237,3 +238,12 @@ class Openlibrary(TestCase):
         self.assertEqual(result.pages, 491)
         self.assertEqual(result.subjects[0], "Fantasy.")
         self.assertEqual(result.physical_format, "Hardcover")
+
+    def test_ignore_edition(self):
+        """ skip editions with poor metadata """
+        self.assertFalse(ignore_edition({"isbn_13": "hi"}))
+        self.assertFalse(ignore_edition({"oclc_numbers": "hi"}))
+        self.assertFalse(ignore_edition({"covers": "hi"}))
+        self.assertFalse(ignore_edition({"languages": "languages/fr"}))
+        self.assertTrue(ignore_edition({"languages": "languages/eng"}))
+        self.assertTrue(ignore_edition({"format": "paperback"}))

From 139416d9c37762e51b7b07a4e2969bcfbf2a3aa1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 10:58:54 -0800
Subject: [PATCH 51/54] Moves federation info endpoints into views module

---
 bookwyrm/tests/views/test_user.py      |  1 -
 bookwyrm/tests/views/test_wellknown.py | 84 ++++++++++++++++++++++++++
 bookwyrm/urls.py                       | 12 ++--
 bookwyrm/views/__init__.py             |  3 +-
 bookwyrm/{ => views}/wellknown.py      | 31 ++++------
 5 files changed, 103 insertions(+), 28 deletions(-)
 create mode 100644 bookwyrm/tests/views/test_wellknown.py
 rename bookwyrm/{ => views}/wellknown.py (86%)

diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 596ea8bf..426c1a79 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -5,7 +5,6 @@ from PIL import Image
 
 from django.contrib.auth.models import AnonymousUser
 from django.core.files.base import ContentFile
-from django.core.files.uploadedfile import SimpleUploadedFile
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py
new file mode 100644
index 00000000..f408460f
--- /dev/null
+++ b/bookwyrm/tests/views/test_wellknown.py
@@ -0,0 +1,84 @@
+""" test for app action functionality """
+import json
+from unittest.mock import patch
+
+from django.contrib.auth.models import AnonymousUser
+from django.http import JsonResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+
+class UserViews(TestCase):
+    """ view user and edit profile """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.User.objects.create_user(
+            "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            models.User.objects.create_user(
+                "rat",
+                "rat@remote.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()
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+
+    def test_webfinger(self):
+        """ there are so many views, this just makes sure it LOADS """
+        request = self.factory.get("", {"resource": "acct:mouse@local.com"})
+        request.user = self.anonymous_user
+
+        result = views.webfinger(request)
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["subject"], "acct:mouse@local.com")
+
+    def test_nodeinfo_pointer(self):
+        """ just tells you where nodeinfo is """
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = views.nodeinfo_pointer(request)
+        data = json.loads(result.getvalue())
+        self.assertIsInstance(result, JsonResponse)
+        self.assertTrue("href" in data["links"][0])
+
+    def test_nodeinfo(self):
+        """ info about the instance """
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = views.nodeinfo(request)
+        data = json.loads(result.getvalue())
+        self.assertIsInstance(result, JsonResponse)
+        self.assertEqual(data["software"]["name"], "bookwyrm")
+        self.assertEqual(data["usage"]["users"]["total"], 2)
+        self.assertEqual(models.User.objects.count(), 3)
+
+    def test_instanceinfo(self):
+        """ about the instance's user activity """
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = views.instance_info(request)
+        data = json.loads(result.getvalue())
+        self.assertIsInstance(result, JsonResponse)
+        self.assertEqual(data["stats"]["user_count"], 2)
+        self.assertEqual(models.User.objects.count(), 3)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 70998172..b645e943 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -4,7 +4,7 @@ from django.contrib import admin
 from django.urls import path, re_path
 
 
-from bookwyrm import settings, views, wellknown
+from bookwyrm import settings, views
 from bookwyrm.utils import regex
 
 user_path = r"^user/(?P<username>%s)" % regex.username
@@ -31,11 +31,11 @@ urlpatterns = [
     re_path(r"^inbox/?$", views.Inbox.as_view()),
     re_path(r"%s/inbox/?$" % local_user_path, views.Inbox.as_view()),
     re_path(r"%s/outbox/?$" % local_user_path, views.Outbox.as_view()),
-    re_path(r"^.well-known/webfinger/?$", wellknown.webfinger),
-    re_path(r"^.well-known/nodeinfo/?$", wellknown.nodeinfo_pointer),
-    re_path(r"^nodeinfo/2\.0/?$", wellknown.nodeinfo),
-    re_path(r"^api/v1/instance/?$", wellknown.instance_info),
-    re_path(r"^api/v1/instance/peers/?$", wellknown.peers),
+    re_path(r"^.well-known/webfinger/?$", views.webfinger),
+    re_path(r"^.well-known/nodeinfo/?$", views.nodeinfo_pointer),
+    re_path(r"^nodeinfo/2\.0/?$", views.nodeinfo),
+    re_path(r"^api/v1/instance/?$", views.instance_info),
+    re_path(r"^api/v1/instance/peers/?$", views.peers),
     # polling updates
     re_path("^api/updates/notifications/?$", views.Updates.as_view()),
     # authentication
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index e7f84544..2c32bc9d 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -14,6 +14,7 @@ from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
 from .invite import ManageInvites, Invite
+from .isbn import Isbn
 from .landing import About, Home, Discover
 from .list import Lists, List, Curate, UserLists
 from .notifications import Notifications
@@ -32,4 +33,4 @@ from .status import CreateStatus, DeleteStatus
 from .tag import Tag, AddTag, RemoveTag
 from .updates import Updates
 from .user import User, EditUser, Followers, Following
-from .isbn import Isbn
+from .wellknown import webfinger, nodeinfo_pointer, nodeinfo, instance_info, peers
diff --git a/bookwyrm/wellknown.py b/bookwyrm/views/wellknown.py
similarity index 86%
rename from bookwyrm/wellknown.py
rename to bookwyrm/views/wellknown.py
index eb014808..127c7491 100644
--- a/bookwyrm/wellknown.py
+++ b/bookwyrm/views/wellknown.py
@@ -4,18 +4,17 @@ from dateutil.relativedelta import relativedelta
 from django.http import HttpResponseNotFound
 from django.http import JsonResponse
 from django.utils import timezone
+from django.views.decorators.http import require_GET
 
 from bookwyrm import models
 from bookwyrm.settings import DOMAIN, VERSION
 
 
+@require_GET
 def webfinger(request):
     """ allow other servers to ask about a user """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     resource = request.GET.get("resource")
-    if not resource and not resource.startswith("acct:"):
+    if not resource or not resource.startswith("acct:"):
         return HttpResponseNotFound()
 
     username = resource.replace("acct:", "")
@@ -38,11 +37,9 @@ def webfinger(request):
     )
 
 
-def nodeinfo_pointer(request):
+@require_GET
+def nodeinfo_pointer(_):
     """ direct servers to nodeinfo """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     return JsonResponse(
         {
             "links": [
@@ -55,11 +52,9 @@ def nodeinfo_pointer(request):
     )
 
 
-def nodeinfo(request):
+@require_GET
+def nodeinfo(_):
     """ basic info about the server """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     status_count = models.Status.objects.filter(user__local=True).count()
     user_count = models.User.objects.filter(local=True).count()
 
@@ -92,11 +87,9 @@ def nodeinfo(request):
     )
 
 
-def instance_info(request):
+@require_GET
+def instance_info(_):
     """ let's talk about your cool unique instance """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     user_count = models.User.objects.filter(local=True).count()
     status_count = models.Status.objects.filter(user__local=True).count()
 
@@ -120,10 +113,8 @@ def instance_info(request):
     )
 
 
-def peers(request):
+@require_GET
+def peers(_):
     """ list of federated servers this instance connects with """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     names = models.FederatedServer.objects.values_list("server_name", flat=True)
     return JsonResponse(list(names), safe=False)

From 1f2da1865564a20a82d1a97b8c17e4fb5571718e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 11:11:06 -0800
Subject: [PATCH 52/54] Adds test for updates endpoint

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

diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py
new file mode 100644
index 00000000..b41b2014
--- /dev/null
+++ b/bookwyrm/tests/views/test_updates.py
@@ -0,0 +1,42 @@
+""" test for app action functionality """
+import json
+from django.http import JsonResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+
+class UpdateViews(TestCase):
+    """ lets the ui check for unread notification """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.SiteSettings.objects.create()
+
+    def test_get_updates(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Updates.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["notifications"], 0)
+
+        models.Notification.objects.create(
+            notification_type="BOOST", user=self.local_user
+        )
+        result = view(request)
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["notifications"], 1)

From 7cf0f904e5268b5e4b0e0b7c69a64ee5a2b508e2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 12:04:30 -0800
Subject: [PATCH 53/54] Adds production port instructions to main branch readme

---
 README.md | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 89 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 98ce9c76..3d5ea4a7 100644
--- a/README.md
+++ b/README.md
@@ -169,8 +169,11 @@ Instructions for running BookWyrm in production:
    - Set a secure database password for postgres
  - Update your nginx configuration in `nginx/default.conf`
    - Replace `your-domain.com` with your domain name
+   - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
  - 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
+    - If you are running other services on your host machine, you may run into errors where services fail when attempting to bind to a port.
+    See the [troubleshooting guide](#port-conflicts) for advice on resolving this.
  - 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`
@@ -201,19 +204,99 @@ There are three concepts in the book data model:
  - `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
  - `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
  - `Edition`, a concrete, actually published version of a book
- 
+
 Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
 
 ### Backups
 
-Bookwyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
+BookWyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
 Backups are named `backup__%Y-%m-%d.sql`.
 
 The db service has an optional script for periodically pruning the backups directory so that all recent daily backups are kept, but for older backups, only weekly or monthly backups are kept.
 To enable this script:
-- Uncomment the final line in `postgres-docker/cronfile`
-- rebuild your instance `docker-compose up --build`
+ - Uncomment the final line in `postgres-docker/cronfile`
+ - rebuild your instance `docker-compose up --build`
 
 You can copy backups from the backups volume to your host machine with `docker cp`:
-- Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
-- Run `docker cp <container_name>:/backups <host machine path>
+ - Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
+ - Run `docker cp <container_name>:/backups <host machine path>`
+
+### Port Conflicts
+
+BookWyrm has multiple services that run on their default ports.
+This means that, depending on what else you are running on your host machine, you may run into errors when building or running BookWyrm when attempts to bind to those ports fail.
+
+If this occurs, you will need to change your configuration to run services on different ports.
+This may require one or more changes the following files:
+ - `docker-compose.yml`
+ - `nginx/default.conf`
+ - `.env` (You create this file yourself during setup)
+
+E.g., If you need Redis to run on a different port:
+ - In `docker-compose.yml`:
+    - In `services` -> `redis` -> `command`, add `--port YOUR_PORT` to the command
+    - In `services` -> `redis` -> `ports`, change `6379:6379` to your port
+ - In `.env`, update `REDIS_PORT`
+
+If you are already running a web-server on your machine, you will need to set up a reverse-proxy.
+
+#### Running BookWyrm Behind a Reverse-Proxy
+
+If you are running another web-server on your machine, you should have it handle proxying web requests to BookWyrm.
+
+The default BookWyrm configuration already has an nginx server that proxies requests to the django app that handles SSL and directly serves static files.
+The static files are stored in a Docker volume that several BookWyrm services access, so it is not recommended to remove this server completely.
+
+To run BookWyrm behind a reverse-proxy, make the following changes:
+ - In `nginx/default.conf`:
+    - Comment out the two default servers
+    - Uncomment the server labeled Reverse-Proxy server
+    - Replace `your-domain.com` with your domain name
+ - In `docker-compose.yml`:
+    - In `services` -> `nginx` -> `ports`, comment out the default ports and add `- 8001:8001`
+    - In `services` -> `nginx` -> `volumes`, comment out the two volumes that begin `./certbot/`
+    - In `services`, comment out the `certbot` service
+
+At this point, you can follow, the [setup](#server-setup) instructions as listed.
+Once docker is running, you can access your BookWyrm instance at `http://localhost:8001` (**NOTE:** your server is not accessible over `https`).
+
+Steps for setting up a reverse-proxy are server dependent.
+
+##### Nginx
+
+Before you can set up nginx, you will need to locate your nginx configuration directory, which is dependent on your platform and how you installed nginx.
+See [nginx's guide](http://nginx.org/en/docs/beginners_guide.html) for details.
+
+To set up your server:
+ - In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
+ - In your nginx `servers` directory, create a new file named after your domain containing the following information:
+   ```nginx
+   server {
+      server_name your-domain.com www.your-domain.com;
+
+      location / {
+          proxy_pass http://localhost:8000;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      location /images/ {
+          proxy_pass http://localhost:8001;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      location /static/ {
+          proxy_pass http://localhost:8001;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      listen [::]:80 ssl;
+      listen 80 ssl;
+   }
+   ```
+ - run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
+ - restart nginx
+
+If everything worked correctly, your BookWyrm instance should now be externally accessible.
\ No newline at end of file

From 091ad5306199a564dd9a979b5e6c4e0aea9fb5b3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 12:13:44 -0800
Subject: [PATCH 54/54] JS linting and whitespace fixes

---
 bookwyrm/static/js/shared.js | 406 +++++++++++++++++------------------
 1 file changed, 203 insertions(+), 203 deletions(-)

diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 65f0dd65..391efcc2 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -209,249 +209,249 @@ function removeClass(el, className) {
 */
 class TabGroup {
     constructor(container) {
-      this.container = container;
-  
-      this.tablist = this.container.querySelector('[role="tablist"]');
-      this.buttons = this.tablist.querySelectorAll('[role="tab"]');
-      this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
-      this.delay = this.determineDelay();
-  
-      if(!this.tablist || !this.buttons.length || !this.panels.length) {
-        return;
-      }
-  
-      this.keys = this.keys();
-      this.direction = this.direction();
-      this.initButtons();
-      this.initPanels();
+        this.container = container;
+
+        this.tablist = this.container.querySelector('[role="tablist"]');
+        this.buttons = this.tablist.querySelectorAll('[role="tab"]');
+        this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
+        this.delay = this.determineDelay();
+
+        if(!this.tablist || !this.buttons.length || !this.panels.length) {
+            return;
+        }
+
+        this.keys = this.keys();
+        this.direction = this.direction();
+        this.initButtons();
+        this.initPanels();
     }
-  
+
     keys() {
-      return {
-        end: 35,
-        home: 36,
-        left: 37,
-        up: 38,
-        right: 39,
-        down: 40
-      };
+        return {
+            end: 35,
+            home: 36,
+            left: 37,
+            up: 38,
+            right: 39,
+            down: 40
+        };
     }
-  
+
     // Add or substract depending on key pressed
     direction() {
-      return {
-        37: -1,
-        38: -1,
-        39: 1,
-        40: 1
-      };
+        return {
+            37: -1,
+            38: -1,
+            39: 1,
+            40: 1
+        };
     }
-  
-    initButtons() {
-      let count = 0;
-      for(let button of this.buttons) {
-        let isSelected = button.getAttribute("aria-selected") === "true";
-        button.setAttribute("tabindex", isSelected ? "0" : "-1");
-  
-        button.addEventListener('click', this.clickEventListener.bind(this));
-        button.addEventListener('keydown', this.keydownEventListener.bind(this));
-        button.addEventListener('keyup', this.keyupEventListener.bind(this));
-  
-        button.index = count++;
-      }
-    }
-  
-    initPanels() {
-      let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
-      for(let panel of this.panels) {
-        if(panel.getAttribute("id") !== selectedPanelId) {
-          panel.setAttribute("hidden", "");
-        }
-        panel.setAttribute("tabindex", "0");
-      }
-    }
-  
-    clickEventListener(event) {
-      let button = event.target.closest('a');
 
-      event.preventDefault();
-  
-      this.activateTab(button, false);
+    initButtons() {
+        let count = 0;
+        for(let button of this.buttons) {
+            let isSelected = button.getAttribute("aria-selected") === "true";
+            button.setAttribute("tabindex", isSelected ? "0" : "-1");
+
+            button.addEventListener('click', this.clickEventListener.bind(this));
+            button.addEventListener('keydown', this.keydownEventListener.bind(this));
+            button.addEventListener('keyup', this.keyupEventListener.bind(this));
+
+            button.index = count++;
+        }
     }
-  
+
+    initPanels() {
+        let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
+        for(let panel of this.panels) {
+            if(panel.getAttribute("id") !== selectedPanelId) {
+                panel.setAttribute("hidden", "");
+            }
+            panel.setAttribute("tabindex", "0");
+        }
+    }
+
+    clickEventListener(event) {
+        let button = event.target.closest('a');
+
+        event.preventDefault();
+
+        this.activateTab(button, false);
+    }
+
     // Handle keydown on tabs
     keydownEventListener(event) {
-      var key = event.keyCode;
-  
-      switch (key) {
-        case this.keys.end:
-          event.preventDefault();
-          // Activate last tab
-          this.activateTab(this.buttons[this.buttons.length - 1]);
-          break;
-        case this.keys.home:
-          event.preventDefault();
-          // Activate first tab
-          this.activateTab(this.buttons[0]);
-          break;
-  
-        // Up and down are in keydown
-        // because we need to prevent page scroll >:)
-        case this.keys.up:
-        case this.keys.down:
-          this.determineOrientation(event);
-          break;
-      };
+        var key = event.keyCode;
+
+        switch (key) {
+            case this.keys.end:
+                event.preventDefault();
+                // Activate last tab
+                this.activateTab(this.buttons[this.buttons.length - 1]);
+                break;
+            case this.keys.home:
+                event.preventDefault();
+                // Activate first tab
+                this.activateTab(this.buttons[0]);
+                break;
+
+            // Up and down are in keydown
+            // because we need to prevent page scroll >:)
+            case this.keys.up:
+            case this.keys.down:
+                this.determineOrientation(event);
+                break;
+        }
     }
-  
+
     // Handle keyup on tabs
     keyupEventListener(event) {
-      var key = event.keyCode;
-  
-      switch (key) {
-        case this.keys.left:
-        case this.keys.right:
-          this.determineOrientation(event);
-          break;
-      };
+        var key = event.keyCode;
+
+        switch (key) {
+            case this.keys.left:
+            case this.keys.right:
+                this.determineOrientation(event);
+                break;
+        }
     }
-  
+
     // When a tablist’s aria-orientation is set to vertical,
     // only up and down arrow should function.
     // In all other cases only left and right arrow function.
     determineOrientation(event) {
-      var key = event.keyCode;
-      var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
-      var proceed = false;
-  
-      if (vertical) {
-        if (key === this.keys.up || key === this.keys.down) {
-          event.preventDefault();
-          proceed = true;
-        };
-      }
-      else {
-        if (key === this.keys.left || key === this.keys.right) {
-          proceed = true;
-        };
-      };
-  
-      if (proceed) {
-        this.switchTabOnArrowPress(event);
-      };
+        var key = event.keyCode;
+        var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
+        var proceed = false;
+
+        if (vertical) {
+            if (key === this.keys.up || key === this.keys.down) {
+                event.preventDefault();
+                proceed = true;
+            }
+        }
+        else {
+            if (key === this.keys.left || key === this.keys.right) {
+                proceed = true;
+            }
+        }
+
+        if (proceed) {
+            this.switchTabOnArrowPress(event);
+        }
     }
-  
+
     // Either focus the next, previous, first, or last tab
     // depending on key pressed
     switchTabOnArrowPress(event) {
-      var pressed = event.keyCode;
-  
-      for (let button of this.buttons) {
-        button.addEventListener('focus', this.focusEventHandler.bind(this));
-      };
-  
-      if (this.direction[pressed]) {
-        var target = event.target;
-        if (target.index !== undefined) {
-          if (this.buttons[target.index + this.direction[pressed]]) {
-            this.buttons[target.index + this.direction[pressed]].focus();
-          }
-          else if (pressed === this.keys.left || pressed === this.keys.up) {
-            this.focusLastTab();
-          }
-          else if (pressed === this.keys.right || pressed == this.keys.down) {
-            this.focusFirstTab();
-          }
+        var pressed = event.keyCode;
+
+        for (let button of this.buttons) {
+            button.addEventListener('focus', this.focusEventHandler.bind(this));
+        }
+
+        if (this.direction[pressed]) {
+            var target = event.target;
+            if (target.index !== undefined) {
+                if (this.buttons[target.index + this.direction[pressed]]) {
+                    this.buttons[target.index + this.direction[pressed]].focus();
+                }
+                else if (pressed === this.keys.left || pressed === this.keys.up) {
+                    this.focusLastTab();
+                }
+                else if (pressed === this.keys.right || pressed == this.keys.down) {
+                    this.focusFirstTab();
+                }
+            }
         }
-      }
     }
-  
+
     // Activates any given tab panel
     activateTab (tab, setFocus) {
-      if(tab.getAttribute("role") !== "tab") {
-        tab = tab.closest('[role="tab"]');
-      }
-  
-      setFocus = setFocus || true;
-  
-      // Deactivate all other tabs
-      this.deactivateTabs();
-  
-      // Remove tabindex attribute
-      tab.removeAttribute('tabindex');
-  
-      // Set the tab as selected
-      tab.setAttribute('aria-selected', 'true');
-      
-      // Give the tab parent an is-active class
-      tab.parentNode.classList.add('is-active');
-  
-      // Get the value of aria-controls (which is an ID)
-      var controls = tab.getAttribute('aria-controls');
-  
-      // Remove hidden attribute from tab panel to make it visible
-      document.getElementById(controls).removeAttribute('hidden');
-  
-      // Set focus when required
-      if (setFocus) {
-        tab.focus();
-      }
+        if(tab.getAttribute("role") !== "tab") {
+            tab = tab.closest('[role="tab"]');
+        }
+
+        setFocus = setFocus || true;
+
+        // Deactivate all other tabs
+        this.deactivateTabs();
+
+        // Remove tabindex attribute
+        tab.removeAttribute('tabindex');
+
+        // Set the tab as selected
+        tab.setAttribute('aria-selected', 'true');
+
+        // Give the tab parent an is-active class
+        tab.parentNode.classList.add('is-active');
+
+        // Get the value of aria-controls (which is an ID)
+        var controls = tab.getAttribute('aria-controls');
+
+        // Remove hidden attribute from tab panel to make it visible
+        document.getElementById(controls).removeAttribute('hidden');
+
+        // Set focus when required
+        if (setFocus) {
+            tab.focus();
+        }
     }
-  
+
     // Deactivate all tabs and tab panels
     deactivateTabs() {
-      for (let button of this.buttons) {
-        button.parentNode.classList.remove('is-active');
-        button.setAttribute('tabindex', '-1');
-        button.setAttribute('aria-selected', 'false');
-        button.removeEventListener('focus', this.focusEventHandler.bind(this));
-      }
-  
-      for (let panel of this.panels) {
-        panel.setAttribute('hidden', 'hidden');
-      }
+        for (let button of this.buttons) {
+            button.parentNode.classList.remove('is-active');
+            button.setAttribute('tabindex', '-1');
+            button.setAttribute('aria-selected', 'false');
+            button.removeEventListener('focus', this.focusEventHandler.bind(this));
+        }
+
+        for (let panel of this.panels) {
+            panel.setAttribute('hidden', 'hidden');
+        }
     }
-  
+
     focusFirstTab() {
-      this.buttons[0].focus();
+        this.buttons[0].focus();
     }
-  
+
     focusLastTab() {
-      this.buttons[this.buttons.length - 1].focus();
+        this.buttons[this.buttons.length - 1].focus();
     }
-  
+
     // Determine whether there should be a delay
     // when user navigates with the arrow keys
     determineDelay() {
-      var hasDelay = this.tablist.hasAttribute('data-delay');
-      var delay = 0;
-  
-      if (hasDelay) {
-        var delayValue = this.tablist.getAttribute('data-delay');
-        if (delayValue) {
-          delay = delayValue;
+        var hasDelay = this.tablist.hasAttribute('data-delay');
+        var delay = 0;
+
+        if (hasDelay) {
+            var delayValue = this.tablist.getAttribute('data-delay');
+            if (delayValue) {
+                delay = delayValue;
+            }
+            else {
+                // If no value is specified, default to 300ms
+                delay = 300;
+            }
         }
-        else {
-          // If no value is specified, default to 300ms
-          delay = 300;
-        };
-      };
-  
-      return delay;
+
+        return delay;
     }
-  
+
     focusEventHandler(event) {
-      var target = event.target;
-  
-      setTimeout(this.checkTabFocus.bind(this), this.delay, target);
-    };
-  
+        var target = event.target;
+
+        setTimeout(this.checkTabFocus.bind(this), this.delay, target);
+    }
+
     // Only activate tab on focus if it still has focus after the delay
     checkTabFocus(target) {
-      let focused = document.activeElement;
-  
-      if (target === focused) {
-        this.activateTab(target, false);
-      }
+        let focused = document.activeElement;
+
+        if (target === focused) {
+            this.activateTab(target, false);
+        }
     }
-  }
+}