From 3e3c90ec0359c523a061900ee81e913e7a299804 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 07:49:25 +1000
Subject: [PATCH 001/193] add views for groups

---
 bookwyrm/views/__init__.py |  1 +
 bookwyrm/views/group.py    | 51 ++++++++++++++++++++++++++++++++++++++
 bookwyrm/views/user.py     | 17 +++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 bookwyrm/views/group.py

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 16ebb2bad..5776106bd 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,6 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
+from .group import UserGroups
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
new file mode 100644
index 000000000..7be10a917
--- /dev/null
+++ b/bookwyrm/views/group.py
@@ -0,0 +1,51 @@
+"""group views"""
+from typing import Optional
+from urllib.parse import urlencode
+
+from django.contrib.auth.decorators import login_required
+from django.core.exceptions import PermissionDenied
+from django.core.paginator import Paginator
+from django.db import IntegrityError, transaction
+from django.db.models import Avg, Count, DecimalField, Q, Max
+from django.db.models.functions import Coalesce
+from django.http import HttpResponseNotFound, HttpResponseBadRequest, HttpResponse
+from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.views.decorators.http import require_POST
+
+from bookwyrm import forms, models
+from bookwyrm.connectors import connector_manager
+from bookwyrm.settings import PAGE_LENGTH
+from .helpers import is_api_request, privacy_filter
+from .helpers import get_user_from_username
+
+@method_decorator(login_required, name="dispatch")
+class UserGroups(View):
+    """a user's groups page"""
+
+    def get(self, request, username):
+        """display a group"""
+        user = get_user_from_username(request.user, username)
+        groups = models.GroupMember.objects.filter(user=user)
+        # groups = privacy_filter(request.user, groups)
+        paginated = Paginator(groups, 12)
+
+        data = {
+            "user": user,
+            "is_self": request.user.id == user.id,
+            "groups": paginated.get_page(request.GET.get("page")),
+            "group_form": forms.GroupsForm(),
+            "path": user.local_path + "/groups",
+        }
+        return TemplateResponse(request, "user/groups.html", data)
+
+# @require_POST
+# @login_required
+# def save_list(request, group_id):
+#     """save a group"""
+#     group = get_object_or_404(models.Group, id=group_id)
+#     request.user.saved_group.add(group)
+#     return redirect("user", request.user.id) # TODO: change this to group page
\ No newline at end of file
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index ca6eb0a52..63194ceb7 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -1,4 +1,5 @@
 """ non-interactive pages """
+from bookwyrm.models.group import GroupMember
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.shortcuts import redirect
@@ -132,6 +133,22 @@ class Following(View):
         }
         return TemplateResponse(request, "user/relationships/following.html", data)
 
+class Groups(View):
+    """list of user's groups view"""
+
+    def get(self, request, username):
+        """list of groups"""
+        user = get_user_from_username(request.user, username)
+
+        paginated = Paginator(
+            GroupMember.objects.filter(user=user)
+        )
+        data = {
+            "user": user,
+            "is_self": request.user.id == user.id,
+            "group_list": paginated.get_page(request.GET.get("page")),
+        }
+        return TemplateResponse(request, "user/groups.html", data)
 
 @require_POST
 @login_required

From b74cd3709629f52c7c0dce1a321888fd7c7b21d1 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 07:49:54 +1000
Subject: [PATCH 002/193] add models for groups

---
 bookwyrm/models/__init__.py |  2 ++
 bookwyrm/models/group.py    | 45 +++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 bookwyrm/models/group.py

diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index bffd62b45..2774f081d 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -21,6 +21,8 @@ from .relationship import UserFollows, UserFollowRequest, UserBlocks
 from .report import Report, ReportComment
 from .federated_server import FederatedServer
 
+from .group import Group, GroupList, GroupMember
+
 from .import_job import ImportJob, ImportItem
 
 from .site import SiteSettings, SiteInvite
diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
new file mode 100644
index 000000000..a91c56cb1
--- /dev/null
+++ b/bookwyrm/models/group.py
@@ -0,0 +1,45 @@
+""" do book related things with other users """
+from django.apps import apps
+from django.db import models
+from django.utils import timezone
+
+from bookwyrm.settings import DOMAIN
+from .base_model import BookWyrmModel
+from . import fields
+
+
+class Group(BookWyrmModel):
+    """A group of users"""
+
+    name = fields.CharField(max_length=100)
+    manager = fields.ForeignKey(
+        "User", on_delete=models.PROTECT)
+    description = fields.TextField(blank=True, null=True)
+    privacy = fields.PrivacyField()
+
+    lists = models.ManyToManyField(
+        "List",
+        symmetrical=False,
+        through="GroupList",
+        through_fields=("group", "book_list"),
+    )
+
+    members = models.ManyToManyField(
+        "User",
+        symmetrical=False,
+        through="GroupMember",
+        through_fields=("group", "user"),
+        related_name="members"
+    )
+
+class GroupList(BookWyrmModel):
+    """Lists that group members can edit"""
+
+    group = models.ForeignKey("Group", on_delete=models.CASCADE)
+    book_list = models.ForeignKey("List", on_delete=models.CASCADE)
+
+class GroupMember(models.Model):
+    """Users who are members of a group"""
+
+    group = models.ForeignKey("Group", on_delete=models.CASCADE)
+    user = models.ForeignKey("User", on_delete=models.CASCADE)
\ No newline at end of file

From 71b1c6117ce3ec26236f87ac7848c95e9a83ff93 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 07:50:57 +1000
Subject: [PATCH 003/193] update templates for groups

---
 bookwyrm/templates/user/groups.html | 42 +++++++++++++++++++++++++++++
 bookwyrm/templates/user/layout.html |  6 +++++
 2 files changed, 48 insertions(+)
 create mode 100644 bookwyrm/templates/user/groups.html

diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
new file mode 100644
index 000000000..edbba8496
--- /dev/null
+++ b/bookwyrm/templates/user/groups.html
@@ -0,0 +1,42 @@
+{% extends 'user/layout.html' %}
+{% load i18n %}
+
+{% block header %}
+<div class="columns is-mobile">
+    <div class="column">
+        <h1 class="title">
+            {% if is_self %}
+            {% trans "Your Groups" %}
+            {% else %}
+            {% blocktrans with username=user.display_name %}Groups: {{ username }}{% endblocktrans %}
+            {% endif %}
+        </h1>
+    </div>
+    {% if is_self %}
+    <div class="column is-narrow">
+        {% trans "Create group" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create_group" icon_with_text="plus" text=button_text %}
+    </div>
+    {% endif %}
+</div>
+{% endblock %}
+
+
+{% block panel %}
+<section class="block">
+    <form name="create-group" method="post" action="{% url 'groups' %}" class="box is-hidden" id="create_group">
+        <header class="columns">
+            <h3 class="title column">{% trans "Create group" %}</h3>
+            <div class="column is-narrow">
+                {% include 'snippets/toggle/toggle_button.html' with controls_text="create_group" label="close" class="delete" nonbutton=True %}
+            </div>
+        </header>
+        {% include 'groups/form.html' %}
+    </form>
+
+    <!-- {% include 'lists/list_items.html' with lists=lists %} -->
+</section>
+<div>
+    <!-- {% include 'snippets/pagination.html' with page=user_groups path=path %} -->
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 8ca3bd180..22b8e2ce4 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -75,6 +75,12 @@
             <a href="{{ url }}">{% trans "Lists" %}</a>
         </li>
         {% endif %}
+        {% if is_self or user.groups_set.exists %}
+        {% url 'user-groups' user|username as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Groups" %}</a>
+        </li>
+        {% endif %}
         {% if user.shelf_set.exists %}
         {% url 'user-shelves' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>

From 99b533510a228469563eb4d6cc4e4f6ad78eb2dd Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 07:51:51 +1000
Subject: [PATCH 004/193] add group templates

---
 bookwyrm/templates/groups/create_form.html | 12 ++++++++
 bookwyrm/templates/groups/form.html        | 34 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 bookwyrm/templates/groups/create_form.html
 create mode 100644 bookwyrm/templates/groups/form.html

diff --git a/bookwyrm/templates/groups/create_form.html b/bookwyrm/templates/groups/create_form.html
new file mode 100644
index 000000000..d146a922e
--- /dev/null
+++ b/bookwyrm/templates/groups/create_form.html
@@ -0,0 +1,12 @@
+{% extends 'components/inline_form.html' %}
+{% load i18n %}
+
+{% block header %}
+{% trans "Create Group" %}
+{% endblock %}
+
+{% block form %}
+    <form name="create-group" method="post" action="{% url 'user-groups' %}">
+    {% include 'group/form.html' %}
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
new file mode 100644
index 000000000..fb53e60fd
--- /dev/null
+++ b/bookwyrm/templates/groups/form.html
@@ -0,0 +1,34 @@
+{% load i18n %}
+{% csrf_token %}
+<input type="hidden" name="user" value="{{ request.user.id }}">
+
+<div class="columns">
+    <div class="column is-two-thirds">
+        <div class="field">
+            <label class="label" for="id_name">{% trans "Name:" %}</label>
+            {{ group_form.name }}
+        </div>
+        <div class="field">
+            <label class="label" for="id_description">{% trans "Description:" %}</label>
+            {{ group_form.description }}
+        </div>
+    </div>
+</div>
+<div class="columns is-mobile">
+    <div class="column">
+        <div class="field has-addons">
+            <div class="control">
+                {% include 'snippets/privacy_select.html' with current=group.privacy %}
+            </div>
+            <div class="control">
+                <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+            </div>
+        </div>
+    </div>
+    {% if group.id %}
+    <div class="column is-narrow">
+        {% trans "Delete group" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class="is-danger" text=button_text icon_with_text="x" controls_text="delete_group" controls_uid=group.id focus="modal_title_delete_group" %}
+    </div>
+    {% endif %}
+</div>

From e07a25e288f33628afe6962f7d65647c56b59d35 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 07:52:40 +1000
Subject: [PATCH 005/193] add groups urls

---
 bookwyrm/urls.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index d54347f0f..759350cca 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -253,6 +253,9 @@ urlpatterns = [
     re_path(r"^hide-suggestions/?$", views.hide_suggestions, name="hide-suggestions"),
     # lists
     re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
+    re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
+    re_path(r"^group/?$", views.UserGroups.as_view(), name="groups"),
+    # re_path(r"^save-group/(?P<group_id>\d+)/?$", views.save_group, name="group-save"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/saved/?$", views.SavedLists.as_view(), name="saved-lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),

From 4e93b09067bc50df73c45f179689bd1936296096 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 14:12:36 +1000
Subject: [PATCH 006/193] create group form

adds a group creation form to user dashboard
---
 bookwyrm/forms.py                          |  4 ++
 bookwyrm/templates/groups/create_form.html |  3 +-
 bookwyrm/templates/groups/form.html        |  8 ++--
 bookwyrm/templates/user/groups.html        |  4 +-
 bookwyrm/urls.py                           |  5 ++-
 bookwyrm/views/__init__.py                 |  2 +-
 bookwyrm/views/group.py                    | 44 ++++++++++++++++------
 7 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 23063ff7c..ceff1b2a7 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -295,6 +295,10 @@ class ListForm(CustomForm):
         model = models.List
         fields = ["user", "name", "description", "curation", "privacy"]
 
+class GroupForm(CustomForm):
+    class Meta:
+        model = models.Group
+        fields = ["name", "description", "privacy"]
 
 class ReportForm(CustomForm):
     class Meta:
diff --git a/bookwyrm/templates/groups/create_form.html b/bookwyrm/templates/groups/create_form.html
index d146a922e..b469ce00d 100644
--- a/bookwyrm/templates/groups/create_form.html
+++ b/bookwyrm/templates/groups/create_form.html
@@ -6,7 +6,8 @@
 {% endblock %}
 
 {% block form %}
-    <form name="create-group" method="post" action="{% url 'user-groups' %}">
+<form name="create-list" method="post" action="{% url 'lists' %}">
     {% include 'group/form.html' %}
 </form>
 {% endblock %}
+
diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index fb53e60fd..e640fd26b 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -5,16 +5,16 @@
 <div class="columns">
     <div class="column is-two-thirds">
         <div class="field">
-            <label class="label" for="id_name">{% trans "Name:" %}</label>
+            <label class="label" for="id_name">{% trans "Group Name:" %}</label>
             {{ group_form.name }}
         </div>
         <div class="field">
-            <label class="label" for="id_description">{% trans "Description:" %}</label>
+            <label class="label" for="id_description">{% trans "Group Description:" %}</label>
             {{ group_form.description }}
         </div>
     </div>
 </div>
-<div class="columns is-mobile">
+<!-- <div class="columns is-mobile">
     <div class="column">
         <div class="field has-addons">
             <div class="control">
@@ -31,4 +31,4 @@
         {% include 'snippets/toggle/toggle_button.html' with class="is-danger" text=button_text icon_with_text="x" controls_text="delete_group" controls_uid=group.id focus="modal_title_delete_group" %}
     </div>
     {% endif %}
-</div>
+</div> -->
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index edbba8496..3a5b9c76b 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -34,9 +34,9 @@
         {% include 'groups/form.html' %}
     </form>
 
-    <!-- {% include 'lists/list_items.html' with lists=lists %} -->
+    {% include 'groups/group_items.html' with groups=groups %}
 </section>
 <div>
-    <!-- {% include 'snippets/pagination.html' with page=user_groups path=path %} -->
+    {% include 'snippets/pagination.html' with page=user_groups path=path %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 759350cca..bc50bb09a 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -254,8 +254,9 @@ urlpatterns = [
     # lists
     re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
-    re_path(r"^group/?$", views.UserGroups.as_view(), name="groups"),
-    # re_path(r"^save-group/(?P<group_id>\d+)/?$", views.save_group, name="group-save"),
+    re_path(r"^groups/?$", views.UserGroups.as_view(), name="groups"),
+    # re_path(r"^group/?$", views.Group.as_view(), name="group"),
+    re_path(r"^create-shelf/?$", views.create_shelf, name="group-create"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/saved/?$", views.SavedLists.as_view(), name="saved-lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 5776106bd..50f3bf4f1 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import UserGroups
+from .group import Group, UserGroups
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 7be10a917..f90537b85 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -19,9 +19,39 @@ from django.views.decorators.http import require_POST
 from bookwyrm import forms, models
 from bookwyrm.connectors import connector_manager
 from bookwyrm.settings import PAGE_LENGTH
-from .helpers import is_api_request, privacy_filter
+from .helpers import privacy_filter
 from .helpers import get_user_from_username
 
+class Group(View):
+    """group page"""
+
+    def get(self, request):
+        """display a group"""
+
+        groups = models.Group.objects.query(members__contains=request.user) 
+        groups = privacy_filter(
+            request.user, groups, privacy_levels=["public", "followers"]
+        )
+
+        paginated = Paginator(groups, 12)
+        data = {
+            "lists": paginated.get_page(request.GET.get("page")),
+            "list_form": forms.GroupForm(),
+            "path": "/group",
+        }
+        return TemplateResponse(request, "groups/group.html", data)
+
+    @method_decorator(login_required, name="dispatch")
+    # pylint: disable=unused-argument
+    def post(self, request):
+        """create a book_list"""
+        form = forms.ListForm(request.POST)
+        if not form.is_valid():
+            return redirect("lists")
+        book_list = form.save()
+
+        return redirect(book_list.local_path)
+
 @method_decorator(login_required, name="dispatch")
 class UserGroups(View):
     """a user's groups page"""
@@ -30,22 +60,14 @@ class UserGroups(View):
         """display a group"""
         user = get_user_from_username(request.user, username)
         groups = models.GroupMember.objects.filter(user=user)
-        # groups = privacy_filter(request.user, groups)
+        groups = privacy_filter(request.user, groups)
         paginated = Paginator(groups, 12)
 
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
             "groups": paginated.get_page(request.GET.get("page")),
-            "group_form": forms.GroupsForm(),
+            "group_form": forms.GroupForm(),
             "path": user.local_path + "/groups",
         }
         return TemplateResponse(request, "user/groups.html", data)
-
-# @require_POST
-# @login_required
-# def save_list(request, group_id):
-#     """save a group"""
-#     group = get_object_or_404(models.Group, id=group_id)
-#     request.user.saved_group.add(group)
-#     return redirect("user", request.user.id) # TODO: change this to group page
\ No newline at end of file

From f32a2cc4d00d954732ca3a11de7eb735ddd0182d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 15:04:52 +1000
Subject: [PATCH 007/193] group creation form can now be submitted!

Whoops
---
 bookwyrm/templates/groups/create_form.html | 2 +-
 bookwyrm/templates/groups/form.html        | 8 ++++----
 bookwyrm/views/group.py                    | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/groups/create_form.html b/bookwyrm/templates/groups/create_form.html
index b469ce00d..103ce223a 100644
--- a/bookwyrm/templates/groups/create_form.html
+++ b/bookwyrm/templates/groups/create_form.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block form %}
-<form name="create-list" method="post" action="{% url 'lists' %}">
+<form name="create-group" method="post" action="{% url 'groups' %}">
     {% include 'group/form.html' %}
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index e640fd26b..38df17a6a 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -14,12 +14,12 @@
         </div>
     </div>
 </div>
-<!-- <div class="columns is-mobile">
+<div class="columns is-mobile">
     <div class="column">
         <div class="field has-addons">
-            <div class="control">
+            <!-- <div class="control">
                 {% include 'snippets/privacy_select.html' with current=group.privacy %}
-            </div>
+            </div> -->
             <div class="control">
                 <button type="submit" class="button is-primary">{% trans "Save" %}</button>
             </div>
@@ -31,4 +31,4 @@
         {% include 'snippets/toggle/toggle_button.html' with class="is-danger" text=button_text icon_with_text="x" controls_text="delete_group" controls_uid=group.id focus="modal_title_delete_group" %}
     </div>
     {% endif %}
-</div> -->
+</div>
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index f90537b85..83cc3b05a 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -59,8 +59,9 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        groups = models.GroupMember.objects.filter(user=user)
-        groups = privacy_filter(request.user, groups)
+        # groups = models.GroupMember.objects.filter(user=user)
+        groups = models.Group.objects.filter(members=request.user) 
+        # groups = privacy_filter(request.user, groups)
         paginated = Paginator(groups, 12)
 
         data = {

From 9b6d2a9d88b8280527a284a071a6406f7f212532 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 20:34:11 +1000
Subject: [PATCH 008/193] add group page

---
 bookwyrm/forms.py                             |  2 +-
 bookwyrm/templates/groups/create_form.html    | 13 -----
 bookwyrm/templates/groups/created_text.html   |  6 +++
 .../templates/groups/delete_group_modal.html  | 21 ++++++++
 bookwyrm/templates/groups/edit_form.html      | 13 +++++
 bookwyrm/templates/groups/form.html           |  5 +-
 bookwyrm/templates/groups/layout.html         | 32 +++++++++++++
 bookwyrm/templates/user/groups.html           |  2 +-
 bookwyrm/urls.py                              |  7 ++-
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/group.py                       | 48 ++++++++++++-------
 11 files changed, 112 insertions(+), 39 deletions(-)
 delete mode 100644 bookwyrm/templates/groups/create_form.html
 create mode 100644 bookwyrm/templates/groups/created_text.html
 create mode 100644 bookwyrm/templates/groups/delete_group_modal.html
 create mode 100644 bookwyrm/templates/groups/edit_form.html
 create mode 100644 bookwyrm/templates/groups/layout.html

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index ceff1b2a7..0987924ed 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -298,7 +298,7 @@ class ListForm(CustomForm):
 class GroupForm(CustomForm):
     class Meta:
         model = models.Group
-        fields = ["name", "description", "privacy"]
+        fields = ["manager", "privacy", "name", "description"]
 
 class ReportForm(CustomForm):
     class Meta:
diff --git a/bookwyrm/templates/groups/create_form.html b/bookwyrm/templates/groups/create_form.html
deleted file mode 100644
index 103ce223a..000000000
--- a/bookwyrm/templates/groups/create_form.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'components/inline_form.html' %}
-{% load i18n %}
-
-{% block header %}
-{% trans "Create Group" %}
-{% endblock %}
-
-{% block form %}
-<form name="create-group" method="post" action="{% url 'groups' %}">
-    {% include 'group/form.html' %}
-</form>
-{% endblock %}
-
diff --git a/bookwyrm/templates/groups/created_text.html b/bookwyrm/templates/groups/created_text.html
new file mode 100644
index 000000000..e7409942a
--- /dev/null
+++ b/bookwyrm/templates/groups/created_text.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% spaceless %}
+
+{% blocktrans with username=group.manager.display_name path=group.manager.local_path %}Managed by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
+
+{% endspaceless %}
diff --git a/bookwyrm/templates/groups/delete_group_modal.html b/bookwyrm/templates/groups/delete_group_modal.html
new file mode 100644
index 000000000..ff6593e50
--- /dev/null
+++ b/bookwyrm/templates/groups/delete_group_modal.html
@@ -0,0 +1,21 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+
+{% block modal-title %}{% trans "Delete this group?" %}{% endblock %}
+
+{% block modal-body %}
+{% trans "This action cannot be un-done" %}
+{% endblock %}
+
+{% block modal-footer %}
+<div >
+    {% csrf_token %}
+    <input type="hidden" name="id" value="{{ group.id }}">
+    <button class="button is-danger" type="submit">
+        {% trans "Delete" %}
+    </button>
+    {% trans "Cancel" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete_list" controls_uid=list.id %}
+  </div>
+{% endblock %}
+
diff --git a/bookwyrm/templates/groups/edit_form.html b/bookwyrm/templates/groups/edit_form.html
new file mode 100644
index 000000000..1c58dc77e
--- /dev/null
+++ b/bookwyrm/templates/groups/edit_form.html
@@ -0,0 +1,13 @@
+{% extends 'components/inline_form.html' %}
+{% load i18n %}
+
+{% block header %}
+{% trans "Edit Group" %}
+{% endblock %}
+
+{% block form %}
+<form name="edit-group" method="post" action="{% url 'group' group.id %}">
+    {% include 'groups/form.html' %}
+</form>
+{% include "groups/delete_group_modal.html" with controls_text="delete_group" controls_uid=group.id %}
+{% endblock %}
diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index 38df17a6a..f764db6f9 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -1,9 +1,12 @@
 {% load i18n %}
 {% csrf_token %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
-
+{{ group_form.non_field_errors }}
 <div class="columns">
+
     <div class="column is-two-thirds">
+        <input type="hidden" name="manager" value="{{ request.user.id }}" />
+        <input type="hidden" name="privacy" value="public" />
         <div class="field">
             <label class="label" for="id_name">{% trans "Group Name:" %}</label>
             {{ group_form.name }}
diff --git a/bookwyrm/templates/groups/layout.html b/bookwyrm/templates/groups/layout.html
new file mode 100644
index 000000000..03a957d0a
--- /dev/null
+++ b/bookwyrm/templates/groups/layout.html
@@ -0,0 +1,32 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{{ group.name }}{% endblock %}
+
+{% block content %}
+<header class="columns content is-mobile">
+    <div class="column">
+        <h1 class="title">{{ group.name }} <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=group %}</span></h1>
+        <p class="subtitle help">
+            {% include 'groups/created_text.html' with group=group %}
+        </p>
+    </div>
+    <div class="column is-narrow is-flex">
+        {% if request.user == group.manager %}
+            {% trans "Edit group" as button_text %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_group" focus="edit_group_header" %}
+        {% endif %}
+    </div>
+</header>
+
+<div class="block content">
+    {% include 'snippets/trimmed_text.html' with full=group.description %}
+</div>
+
+<div class="block">
+    {% include 'groups/edit_form.html' with controls_text="edit_group" %}
+</div>
+
+{% block panel %}{% endblock %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index 3a5b9c76b..39e09bc19 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -24,7 +24,7 @@
 
 {% block panel %}
 <section class="block">
-    <form name="create-group" method="post" action="{% url 'groups' %}" class="box is-hidden" id="create_group">
+    <form name="create-group" method="post" action="{% url 'create-group' %}" class="box is-hidden" id="create_group">
         <header class="columns">
             <h3 class="title column">{% trans "Create group" %}</h3>
             <div class="column is-narrow">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index bc50bb09a..ac7257e33 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -254,9 +254,8 @@ urlpatterns = [
     # lists
     re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
-    re_path(r"^groups/?$", views.UserGroups.as_view(), name="groups"),
-    # re_path(r"^group/?$", views.Group.as_view(), name="group"),
-    re_path(r"^create-shelf/?$", views.create_shelf, name="group-create"),
+    re_path(r"^create-group/?$", views.create_group, name="create-group"),
+    re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/saved/?$", views.SavedLists.as_view(), name="saved-lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
@@ -280,7 +279,7 @@ urlpatterns = [
     # User books
     re_path(rf"{USER_PATH}/books/?$", views.Shelf.as_view(), name="user-shelves"),
     re_path(
-        rf"^{USER_PATH}/(helf|books)/(?P<shelf_identifier>[\w-]+)(.json)?/?$",
+        rf"^{USER_PATH}/( |books)/(?P<shelf_identifier>[\w-]+)(.json)?/?$",
         views.Shelf.as_view(),
         name="shelf",
     ),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 50f3bf4f1..6f55159df 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import Group, UserGroups
+from .group import Group, UserGroups, create_group
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 83cc3b05a..ba5c251a9 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -25,32 +25,32 @@ from .helpers import get_user_from_username
 class Group(View):
     """group page"""
 
-    def get(self, request):
+    def get(self, request, group_id):
         """display a group"""
 
-        groups = models.Group.objects.query(members__contains=request.user) 
-        groups = privacy_filter(
-            request.user, groups, privacy_levels=["public", "followers"]
-        )
+        group = models.Group.objects.get(id=group_id) 
+        # groups = privacy_filter(
+        #     request.user, groups, privacy_levels=["public", "followers"]
+        # )
+
 
-        paginated = Paginator(groups, 12)
         data = {
-            "lists": paginated.get_page(request.GET.get("page")),
+            "group": group,
             "list_form": forms.GroupForm(),
             "path": "/group",
         }
         return TemplateResponse(request, "groups/group.html", data)
 
-    @method_decorator(login_required, name="dispatch")
-    # pylint: disable=unused-argument
-    def post(self, request):
-        """create a book_list"""
-        form = forms.ListForm(request.POST)
-        if not form.is_valid():
-            return redirect("lists")
-        book_list = form.save()
+    # @method_decorator(login_required, name="dispatch")
+    # # pylint: disable=unused-argument
+    # def post(self, request):
+    #     """create a book_list"""
+    #     form = forms.ListForm(request.POST)
+    #     if not form.is_valid():
+    #         return redirect("lists")
+    #     book_list = form.save()
 
-        return redirect(book_list.local_path)
+    #     return redirect(book_list.local_path)
 
 @method_decorator(login_required, name="dispatch")
 class UserGroups(View):
@@ -60,7 +60,7 @@ class UserGroups(View):
         """display a group"""
         user = get_user_from_username(request.user, username)
         # groups = models.GroupMember.objects.filter(user=user)
-        groups = models.Group.objects.filter(members=request.user) 
+        groups = models.Group.objects.filter(members=user) 
         # groups = privacy_filter(request.user, groups)
         paginated = Paginator(groups, 12)
 
@@ -69,6 +69,18 @@ class UserGroups(View):
             "is_self": request.user.id == user.id,
             "groups": paginated.get_page(request.GET.get("page")),
             "group_form": forms.GroupForm(),
-            "path": user.local_path + "/groups",
+            "path": user.local_path + "/group",
         }
         return TemplateResponse(request, "user/groups.html", data)
+
+@login_required
+@require_POST
+def create_group(request):
+    """user groups"""
+    form = forms.GroupForm(request.POST)
+    if not form.is_valid():
+        print("invalid!")
+        return redirect(request.headers.get("Referer", "/"))
+
+    group = form.save()
+    return redirect(group.local_path)
\ No newline at end of file

From 264d9b2f3c4fc5ebc37a89d829a629250feacde5 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 20:35:51 +1000
Subject: [PATCH 009/193] add group page template

---
 bookwyrm/templates/groups/group.html | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 bookwyrm/templates/groups/group.html

diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
new file mode 100644
index 000000000..a8d65f7fc
--- /dev/null
+++ b/bookwyrm/templates/groups/group.html
@@ -0,0 +1,34 @@
+{% extends 'groups/layout.html' %}
+{% load i18n %}
+{% load bookwyrm_tags %}
+{% load markdown %}
+
+{% block panel %}
+
+<div class="columns mt-3">
+    <section class="column is-three-quarters">
+        {% if request.GET.updated %}
+        <div class="notification is-primary">
+            {% trans "You successfully added a user to this group!" %}
+        </div>
+        {% endif %}
+
+        {% if not members.object_list.exists %}
+        <p>{% trans "This group has no members" %}</p>
+        {% else %}
+        <ol start="{{ members.start_index }}" class="ordered-list">
+        {% for member in members %}
+            <li class="block mb-5">
+                <div class="card">
+                  <p>member.username</p>
+                </div>
+                </div>
+            </li>
+        {% endfor %}
+        </ol>
+        {% endif %}
+        {% include "snippets/pagination.html" with page=items %}
+    </section>
+
+</div>
+{% endblock %}

From 86a60d58e5284df5d7ab5bc20ba8ebd673936467 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 21:24:06 +1000
Subject: [PATCH 010/193] add user cards to group pages

---
 bookwyrm/templates/groups/group.html | 27 +++++++++++++++++++++------
 bookwyrm/views/group.py              | 15 ++-------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index a8d65f7fc..01a10a39a 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -13,19 +13,34 @@
         </div>
         {% endif %}
 
-        {% if not members.object_list.exists %}
+        {% if not group.members.exists %}
         <p>{% trans "This group has no members" %}</p>
         {% else %}
-        <ol start="{{ members.start_index }}" class="ordered-list">
-        {% for member in members %}
+        <h2 class="heading">Group Members</h2>
+        <ul start="{{ members.start_index }}" class="ordered-list">
+        {% for member in group.members.all %}
             <li class="block mb-5">
+              <div class="column is-one-third">
+                  {% include 'directory/user_card.html' %}
+              </div>
+            </li>
+        {% endfor %}
+        </ul>
+        {% endif %}
+        {% if not group.lists.exists %}
+        <p>{% trans "This group has no lists" %}</p>
+        {% else %}
+        <h2 class="heading">Lists</h2>
+        <ul start="{{ lists.start_index }}" class="ordered-list">
+        {% for list in group.lists.all %}
+            <li class="block mb-5">
+              <!-- TODO: make these proper list cards -->
                 <div class="card">
-                  <p>member.username</p>
-                </div>
+                  <a href={{ member.local_path }}>{{ list.name }}</a>
                 </div>
             </li>
         {% endfor %}
-        </ol>
+        </ul>
         {% endif %}
         {% include "snippets/pagination.html" with page=items %}
     </section>
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index ba5c251a9..59d3e8d1e 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -41,17 +41,6 @@ class Group(View):
         }
         return TemplateResponse(request, "groups/group.html", data)
 
-    # @method_decorator(login_required, name="dispatch")
-    # # pylint: disable=unused-argument
-    # def post(self, request):
-    #     """create a book_list"""
-    #     form = forms.ListForm(request.POST)
-    #     if not form.is_valid():
-    #         return redirect("lists")
-    #     book_list = form.save()
-
-    #     return redirect(book_list.local_path)
-
 @method_decorator(login_required, name="dispatch")
 class UserGroups(View):
     """a user's groups page"""
@@ -59,9 +48,7 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        # groups = models.GroupMember.objects.filter(user=user)
         groups = models.Group.objects.filter(members=user) 
-        # groups = privacy_filter(request.user, groups)
         paginated = Paginator(groups, 12)
 
         data = {
@@ -83,4 +70,6 @@ def create_group(request):
         return redirect(request.headers.get("Referer", "/"))
 
     group = form.save()
+    # TODO: add user as group member
+    models.GroupMember.objects.create(group=group, user=request.user)
     return redirect(group.local_path)
\ No newline at end of file

From d4fcf88cf5357c525ba9c76b962fd9e944f1bae3 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 24 Sep 2021 21:57:01 +1000
Subject: [PATCH 011/193] add list cards to groups page

- add list cards to groups page based on lists page
- add sort to members on group page
---
 bookwyrm/templates/groups/group.html | 40 +++++++++++++++++++++++++---
 bookwyrm/views/group.py              |  2 +-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 01a10a39a..c14694154 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -34,10 +34,44 @@
         <ul start="{{ lists.start_index }}" class="ordered-list">
         {% for list in group.lists.all %}
             <li class="block mb-5">
-              <!-- TODO: make these proper list cards -->
-                <div class="card">
-                  <a href={{ member.local_path }}>{{ list.name }}</a>
+              <div class="columns is-multiline">
+                {% for list in lists %}
+                <div class="column is-one-quarter">
+                    <div class="card is-stretchable">
+                        <header class="card-header">
+                            <h4 class="card-header-title">
+                                <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>
+                            </h4>
+                        </header>
+            
+                        {% with list_books=list.listitem_set.all|slice:5 %}
+                            {% if list_books %}
+                                <div class="card-image columns is-mobile is-gapless is-clipped">
+                                    {% for book in list_books %}
+                                        <a class="column is-cover" href="{{ book.book.local_path }}">
+                                            {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' size='small' aria='show' %}
+                                        </a>
+                                    {% endfor %}
+                                </div>
+                            {% endif %}
+                        {% endwith %}
+            
+                        <div class="card-content is-flex-grow-0">
+                            <div class="is-clipped" {% if list.description %}title="{{ list.description }}"{% endif %}>
+                            {% if list.description %}
+                                {{ list.description|to_markdown|safe|truncatechars_html:30 }}
+                            {% else %}
+                            &nbsp;
+                            {% endif %}
+                            </div>
+                            <p class="subtitle help">
+                                {% include 'lists/created_text.html' with list=list %}
+                            </p>
+                        </div>
+                    </div>
                 </div>
+                {% endfor %}
+            </div>
             </li>
         {% endfor %}
         </ul>
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 59d3e8d1e..fd4e7f2cd 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -48,7 +48,7 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        groups = models.Group.objects.filter(members=user) 
+        groups = models.Group.objects.filter(members=user).order_by("-updated_date")
         paginated = Paginator(groups, 12)
 
         data = {

From 273ad9a4664bfcb4f26281918da9a004bcc36fa8 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 10:55:32 +1000
Subject: [PATCH 012/193] add create_group to __init__.py

you probably want this otherwise nothing previously added for group creation will work :-)
---
 bookwyrm/views/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 6f55159df..7969ef7ac 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import Group, UserGroups, create_group
+from .group import Group, UserGroups, FindAndAddUsers, create_group
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost

From 8c326ec52fc46bb0a84e392058c520b3ca6b7ad0 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 11:10:06 +1000
Subject: [PATCH 013/193] user groups listing template

- creates groups/user_groups template for listing a user's groups on their user page
---
 bookwyrm/templates/groups/user_groups.html | 35 ++++++++++++++++++++++
 bookwyrm/templates/user/groups.html        |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/templates/groups/user_groups.html

diff --git a/bookwyrm/templates/groups/user_groups.html b/bookwyrm/templates/groups/user_groups.html
new file mode 100644
index 000000000..9c48a8429
--- /dev/null
+++ b/bookwyrm/templates/groups/user_groups.html
@@ -0,0 +1,35 @@
+{% load i18n %}
+{% load markdown %}
+{% load interaction %}
+
+<div class="columns is-multiline">
+    {% for group in groups %}
+    <div class="column is-one-quarter">
+        <div class="card is-stretchable">
+            <header class="card-header">
+                <h4 class="card-header-title">
+                    <a href="{{ group.local_path }}">{{ group.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=group %}</span>
+                </h4>
+                {% if request.user.is_authenticated and request.user|saved:list %}
+                <div class="card-header-icon">
+                    {% trans "Saved" as text %}
+                    <span class="icon icon-bookmark has-text-grey" title="{{ text }}">
+                        <span class="is-sr-only">{{ text }}</span>
+                    </span>
+                </div>
+                {% endif %}
+            </header>
+
+            <div class="card-content is-flex-grow-0">
+                <div class="is-clipped" {% if group.description %}title="{{ group.description }}"{% endif %}>
+                {% if group.description %}
+                    {{ group.description|to_markdown|safe|truncatechars_html:30 }}
+                {% else %}
+                &nbsp;
+                {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+</div>
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index 39e09bc19..912d5ec3d 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -34,7 +34,7 @@
         {% include 'groups/form.html' %}
     </form>
 
-    {% include 'groups/group_items.html' with groups=groups %}
+    {% include 'groups/user_groups.html' with groups=groups %}
 </section>
 <div>
     {% include 'snippets/pagination.html' with page=user_groups path=path %}

From cbe172df3d587cb82d772f1a1639095b47c0df79 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 11:11:58 +1000
Subject: [PATCH 014/193] find users for groups

- search for users to add to a group
- display suggested users on search results screen

TODO: actaully enable users to be added!
TODO: groups/suggested_users probably could be replaced with some logic in snippets/suggested_users.html
---
 bookwyrm/templates/groups/find_users.html     |  6 +++
 bookwyrm/templates/groups/group.html          | 23 ++-------
 .../templates/groups/suggested_users.html     | 42 +++++++++++++++++
 bookwyrm/templates/groups/users.html          | 41 ++++++++++++++++
 .../snippets/add_to_group_button.html         | 47 +++++++++++++++++++
 5 files changed, 139 insertions(+), 20 deletions(-)
 create mode 100644 bookwyrm/templates/groups/find_users.html
 create mode 100644 bookwyrm/templates/groups/suggested_users.html
 create mode 100644 bookwyrm/templates/groups/users.html
 create mode 100644 bookwyrm/templates/snippets/add_to_group_button.html

diff --git a/bookwyrm/templates/groups/find_users.html b/bookwyrm/templates/groups/find_users.html
new file mode 100644
index 000000000..9154a5275
--- /dev/null
+++ b/bookwyrm/templates/groups/find_users.html
@@ -0,0 +1,6 @@
+{% extends 'groups/group.html' %}
+
+{% block panel %}
+<h1 class="title">Add users to <a href="{{ group.local_path }}">{{ group.name }}</a></h1>
+  {% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %}
+{% endblock %}
\ No newline at end of file
diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index c14694154..a73d78250 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -7,30 +7,13 @@
 
 <div class="columns mt-3">
     <section class="column is-three-quarters">
-        {% if request.GET.updated %}
-        <div class="notification is-primary">
-            {% trans "You successfully added a user to this group!" %}
-        </div>
-        {% endif %}
 
-        {% if not group.members.exists %}
-        <p>{% trans "This group has no members" %}</p>
-        {% else %}
-        <h2 class="heading">Group Members</h2>
-        <ul start="{{ members.start_index }}" class="ordered-list">
-        {% for member in group.members.all %}
-            <li class="block mb-5">
-              <div class="column is-one-third">
-                  {% include 'directory/user_card.html' %}
-              </div>
-            </li>
-        {% endfor %}
-        </ul>
-        {% endif %}
+        {% include "groups/users.html" %}
+
+        <h2 class="heading">Lists</h2>
         {% if not group.lists.exists %}
         <p>{% trans "This group has no lists" %}</p>
         {% else %}
-        <h2 class="heading">Lists</h2>
         <ul start="{{ lists.start_index }}" class="ordered-list">
         {% for list in group.lists.all %}
             <li class="block mb-5">
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
new file mode 100644
index 000000000..472841e54
--- /dev/null
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -0,0 +1,42 @@
+{% load i18n %}
+{% load utilities %}
+{% load humanize %}
+{% if suggested_users %}
+<div class="columns is-mobile scroll-x mb-0">
+    {% for user in suggested_users %}
+    <div class="column is-flex is-flex-grow-0">
+        <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
+            <a href="{{ user.local_path }}" class="has-text-black">
+                {% include 'snippets/avatar.html' with user=user large=True %}
+                <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
+                <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
+            </a>
+            {% include 'snippets/add_to_group_button.html' with user=user minimal=True %}
+            {% if user.mutuals %}
+            <p class="help">
+                {% blocktrans trimmed with mutuals=user.mutuals|intcomma count counter=user.mutuals %}
+                {{ mutuals }} follower you follow
+                {% plural %}
+                {{ mutuals }} followers you follow{% endblocktrans %}
+            </p>
+            {% elif user.shared_books %}
+            <p class="help">
+                {% blocktrans trimmed with shared_books=user.shared_books|intcomma count counter=user.shared_books %}
+                {{ shared_books }} book on your shelves
+                {% plural %}
+                {{ shared_books }} books on your shelves
+                {% endblocktrans %}
+            </p>
+            {% elif request.user in user.following.all %}
+            <p class="help">
+                {% trans "Follows you" %}
+            </p>
+            {% endif %}
+        </div>
+    </div>
+    {% endfor %}
+    {% else %}
+    No users found for {{ query }}
+{% endif %}
+</div>
+
diff --git a/bookwyrm/templates/groups/users.html b/bookwyrm/templates/groups/users.html
new file mode 100644
index 000000000..c7470b328
--- /dev/null
+++ b/bookwyrm/templates/groups/users.html
@@ -0,0 +1,41 @@
+{% load i18n %}
+
+{% if request.GET.updated %}
+<div class="notification is-primary">
+    {% trans "You successfully added a user to this group!" %}
+</div>
+{% endif %}
+
+<h2 class="heading">Group Members</h2>
+<p class="subtitle is-6">{% trans "Members can add and remove books on your group's book lists" %}</p>
+
+{% block panel %}
+<div class="block">
+    <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
+        <div class="control">
+            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
+            {% if request.GET.query and no_results %}
+            <p class="help">{% blocktrans with query=request.GET.query %}No users found for "{{ query }}"{% endblocktrans %}</p>
+            {% endif %}
+        </div>
+        <div class="control">
+            <button class="button" type="submit">
+                <span class="icon icon-search" title="{% trans 'Search' %}">
+                    <span class="is-sr-only">{% trans "Search" %}</span>
+                </span>
+            </button>
+        </div>
+    </form>
+    {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %}
+</div>
+{% endblock %}
+
+<ul start="{{ members.start_index }}" class="ordered-list">
+{% for member in group.members.all %}
+    <li class="block mb-5">
+      <div class="column is-one-third">
+          {% include 'directory/user_card.html' %}
+      </div>
+    </li>
+{% endfor %}
+</ul>
\ No newline at end of file
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
new file mode 100644
index 000000000..51c3179be
--- /dev/null
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -0,0 +1,47 @@
+{% load i18n %}
+{% if request.user == user or not request.user.is_authenticated %}
+<!-- TODO: blocking is irrelevant here, but ...is it? -->
+{% elif user in request.user.blocks.all %}
+{% include 'snippets/block_button.html' with blocks=True %}
+{% else %}
+
+<div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
+    <div class="control">
+      <!-- TODO: make this "add-to-group" -->
+        <form action="{% url 'follow' %}" method="POST" class="interaction follow_{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow_{{ user.id }}">
+            {% csrf_token %}
+            <input type="hidden" name="user" value="{{ user.username }}">
+            <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">
+                {% if show_username %}
+                {% blocktrans with username=user.localname %}Follow @{{ username }}{% endblocktrans %}
+                {% else %}
+                {% trans "Follow" %}
+                {% endif %}
+            </button>
+        </form>
+        <!-- TODO: make this "remove-from-group" -->
+        <form action="{% url 'unfollow' %}" method="POST" class="interaction follow_{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow_{{ user.id }}">
+            {% csrf_token %}
+            <input type="hidden" name="user" value="{{ user.username }}">
+            {% if user.manually_approves_followers and request.user not in user.followers.all %}
+            <button class="button is-small is-danger is-light" type="submit">
+                {% trans "Undo follow request" %}
+            </button>
+            {% else %}
+            <button class="button is-small is-danger is-light" type="submit">
+                {% if show_username %}
+                {% blocktrans with username=user.localname %}Unfollow @{{ username }}{% endblocktrans %}
+                {% else %}
+                {% trans "Unfollow" %}
+                {% endif %}
+            </button>
+            {% endif %}
+        </form>
+    </div>
+    {% if not minimal %}
+    <div class="control">
+        {% include 'snippets/user_options.html' with user=user class="is-small" %}
+    </div>
+    {% endif %}
+</div>
+{% endif %}

From 7c0deabcb29ee05bbd76297c7a20ba94682863ca Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 11:14:04 +1000
Subject: [PATCH 015/193] update urls and group view for searching users to add
 to group

---
 bookwyrm/urls.py        |  6 ++++--
 bookwyrm/views/group.py | 44 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index ac7257e33..cdf7493f1 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -251,11 +251,13 @@ urlpatterns = [
         name="user-following",
     ),
     re_path(r"^hide-suggestions/?$", views.hide_suggestions, name="hide-suggestions"),
-    # lists
-    re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
+    # groups
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
     re_path(r"^create-group/?$", views.create_group, name="create-group"),
     re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
+    re_path(r"^group/(?P<group_id>\d+)/find-users/?$", views.FindAndAddUsers.as_view(), name="group-find-users"),
+    # lists
+    re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/saved/?$", views.SavedLists.as_view(), name="saved-lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index fd4e7f2cd..c344f92bc 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -5,20 +5,17 @@ from urllib.parse import urlencode
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator
-from django.db import IntegrityError, transaction
-from django.db.models import Avg, Count, DecimalField, Q, Max
-from django.db.models.functions import Coalesce
 from django.http import HttpResponseNotFound, HttpResponseBadRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
-from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
+from django.contrib.postgres.search import TrigramSimilarity
+from django.db.models.functions import Greatest
 
 from bookwyrm import forms, models
-from bookwyrm.connectors import connector_manager
-from bookwyrm.settings import PAGE_LENGTH
+from bookwyrm.suggested_users import suggested_users
 from .helpers import privacy_filter
 from .helpers import get_user_from_username
 
@@ -60,6 +57,39 @@ class UserGroups(View):
         }
         return TemplateResponse(request, "user/groups.html", data)
 
+@method_decorator(login_required, name="dispatch")
+class FindAndAddUsers(View):
+    """find friends to add to your group"""
+    """this is taken from the Get Started friend finder"""
+
+    def get(self, request, group_id):
+        """basic profile info"""
+        query = request.GET.get("query")
+        user_results = (
+            models.User.viewer_aware_objects(request.user)
+            .annotate(
+                similarity=Greatest(
+                    TrigramSimilarity("username", query),
+                    TrigramSimilarity("localname", query),
+                )
+            )
+            .filter(
+                similarity__gt=0.5,
+            )
+            .order_by("-similarity")[:5]
+        )
+        data = {"no_results": not user_results}
+
+        if user_results.count() < 5:
+            user_results = list(user_results) + suggested_users.get_suggestions(
+                request.user
+            )
+
+        data["suggested_users"] = user_results
+        data["group"] = get_object_or_404(models.Group, id=group_id)
+        data["query"] = query
+        return TemplateResponse(request, "groups/find_users.html", data)
+
 @login_required
 @require_POST
 def create_group(request):
@@ -70,6 +100,6 @@ def create_group(request):
         return redirect(request.headers.get("Referer", "/"))
 
     group = form.save()
-    # TODO: add user as group member
+    # add the creator as a group member
     models.GroupMember.objects.create(group=group, user=request.user)
     return redirect(group.local_path)
\ No newline at end of file

From 8d17f888ea0e7c2c43180098cca629eff5016dc8 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 11:36:35 +1000
Subject: [PATCH 016/193] improve naming of templates and urls for groups

---
 bookwyrm/templates/groups/group.html   |  2 +-
 bookwyrm/templates/groups/members.html | 65 ++++++++++++++++++++++++++
 bookwyrm/templates/groups/users.html   | 41 ----------------
 bookwyrm/urls.py                       |  2 +-
 4 files changed, 67 insertions(+), 43 deletions(-)
 create mode 100644 bookwyrm/templates/groups/members.html
 delete mode 100644 bookwyrm/templates/groups/users.html

diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index a73d78250..4fea5a84e 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -8,7 +8,7 @@
 <div class="columns mt-3">
     <section class="column is-three-quarters">
 
-        {% include "groups/users.html" %}
+        {% include "groups/members.html" %}
 
         <h2 class="heading">Lists</h2>
         {% if not group.lists.exists %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
new file mode 100644
index 000000000..b10cdd5f4
--- /dev/null
+++ b/bookwyrm/templates/groups/members.html
@@ -0,0 +1,65 @@
+{% load i18n %}
+{% load utilities %}
+{% load humanize %}
+<!-- TODO: do we need this? -->
+{% if request.GET.updated %}
+<div class="notification is-primary">
+    {% trans "You successfully added a user to this group!" %}
+</div>
+{% endif %}
+
+<h2 class="heading">Group Members</h2>
+<p class="subtitle is-6">{% trans "Members can add and remove books on your group's book lists" %}</p>
+
+{% block panel %}
+<div class="block">
+    <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
+        <div class="control">
+            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
+        </div>
+        <div class="control">
+            <button class="button" type="submit">
+                <span class="icon icon-search" title="{% trans 'Search' %}">
+                    <span class="is-sr-only">{% trans "Search" %}</span>
+                </span>
+            </button>
+        </div>
+    </form>
+    {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %}
+</div>
+{% endblock %}
+
+<ul start="{{ members.start_index }}" class="ordered-list">
+{% for member in group.members.all %}
+<div class="column is-flex is-flex-grow-0">
+  <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
+      <a href="{{ user.local_path }}" class="has-text-black">
+          {% include 'snippets/avatar.html' with user=user large=True %}
+          <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
+          <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
+      </a>
+      {% include 'snippets/add_to_group_button.html' with user=user minimal=True %}
+      {% if user.mutuals %}
+      <p class="help">
+          {% blocktrans trimmed with mutuals=user.mutuals|intcomma count counter=user.mutuals %}
+          {{ mutuals }} follower you follow
+          {% plural %}
+          {{ mutuals }} followers you follow{% endblocktrans %}
+      </p>
+      {% elif user.shared_books %}
+      <p class="help">
+          {% blocktrans trimmed with shared_books=user.shared_books|intcomma count counter=user.shared_books %}
+          {{ shared_books }} book on your shelves
+          {% plural %}
+          {{ shared_books }} books on your shelves
+          {% endblocktrans %}
+      </p>
+      {% elif request.user in user.following.all %}
+      <p class="help">
+          {% trans "Follows you" %}
+      </p>
+      {% endif %}
+  </div>
+</div>
+{% endfor %}
+</ul>
\ No newline at end of file
diff --git a/bookwyrm/templates/groups/users.html b/bookwyrm/templates/groups/users.html
deleted file mode 100644
index c7470b328..000000000
--- a/bookwyrm/templates/groups/users.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% load i18n %}
-
-{% if request.GET.updated %}
-<div class="notification is-primary">
-    {% trans "You successfully added a user to this group!" %}
-</div>
-{% endif %}
-
-<h2 class="heading">Group Members</h2>
-<p class="subtitle is-6">{% trans "Members can add and remove books on your group's book lists" %}</p>
-
-{% block panel %}
-<div class="block">
-    <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
-        <div class="control">
-            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
-            {% if request.GET.query and no_results %}
-            <p class="help">{% blocktrans with query=request.GET.query %}No users found for "{{ query }}"{% endblocktrans %}</p>
-            {% endif %}
-        </div>
-        <div class="control">
-            <button class="button" type="submit">
-                <span class="icon icon-search" title="{% trans 'Search' %}">
-                    <span class="is-sr-only">{% trans "Search" %}</span>
-                </span>
-            </button>
-        </div>
-    </form>
-    {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %}
-</div>
-{% endblock %}
-
-<ul start="{{ members.start_index }}" class="ordered-list">
-{% for member in group.members.all %}
-    <li class="block mb-5">
-      <div class="column is-one-third">
-          {% include 'directory/user_card.html' %}
-      </div>
-    </li>
-{% endfor %}
-</ul>
\ No newline at end of file
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index cdf7493f1..e688f813f 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -255,7 +255,7 @@ urlpatterns = [
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
     re_path(r"^create-group/?$", views.create_group, name="create-group"),
     re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
-    re_path(r"^group/(?P<group_id>\d+)/find-users/?$", views.FindAndAddUsers.as_view(), name="group-find-users"),
+    re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindAndAddUsers.as_view(), name="group-find-users"),
     # lists
     re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),

From e800106be4768ff6d6472b6ebf614604e019647e Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 11:37:08 +1000
Subject: [PATCH 017/193] smaller cards for group members

- this will also enable members to be removed easily by managers in a future commit.
---
 bookwyrm/templates/groups/suggested_users.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 472841e54..40d32f3f3 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -1,6 +1,20 @@
 {% load i18n %}
 {% load utilities %}
 {% load humanize %}
+<div class="block">
+  <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
+      <div class="control">
+          <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
+      </div>
+      <div class="control">
+          <button class="button" type="submit">
+              <span class="icon icon-search" title="{% trans 'Search' %}">
+                  <span class="is-sr-only">{% trans "Search" %}</span>
+              </span>
+          </button>
+      </div>
+  </form>
+</div>
 {% if suggested_users %}
 <div class="columns is-mobile scroll-x mb-0">
     {% for user in suggested_users %}

From b645d753036f6640497f2358581442c5298b2f50 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 17:34:44 +1000
Subject: [PATCH 018/193] add and remove users from groups

---
 bookwyrm/models/group.py                      |  9 ++-
 bookwyrm/templates/groups/members.html        | 27 +++----
 .../snippets/add_to_group_button.html         | 16 ++--
 bookwyrm/urls.py                              |  4 +-
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/group.py                       | 75 ++++++++++++++++---
 6 files changed, 100 insertions(+), 33 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index a91c56cb1..01fdbdd63 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -42,4 +42,11 @@ class GroupMember(models.Model):
     """Users who are members of a group"""
 
     group = models.ForeignKey("Group", on_delete=models.CASCADE)
-    user = models.ForeignKey("User", on_delete=models.CASCADE)
\ No newline at end of file
+    user = models.ForeignKey("User", on_delete=models.CASCADE)
+
+    class Meta:
+        constraints = [
+          models.UniqueConstraint(
+            fields=["group", "user"], name="unique_member"
+          )
+        ]
\ No newline at end of file
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index b10cdd5f4..55d7fd749 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -30,36 +30,37 @@
 {% endblock %}
 
 <ul start="{{ members.start_index }}" class="ordered-list">
-{% for member in group.members.all %}
+
 <div class="column is-flex is-flex-grow-0">
-  <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
-      <a href="{{ user.local_path }}" class="has-text-black">
-          {% include 'snippets/avatar.html' with user=user large=True %}
-          <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
-          <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
+  {% for member in group.members.all %}
+  <span class="box has-text-centered is-shadowless has-background-white-bis m-0">
+      <a href="{{ member.local_path }}" class="has-text-black">
+          {% include 'snippets/avatar.html' with user=member large=True %}
+          <span title="{{ member.display_name }}" class="is-block is-6 has-text-weight-bold">{{ member.display_name|truncatechars:10 }}</span>
+          <span title="@{{ member|username }}" class="is-block pb-3">@{{ member|username|truncatechars:8 }}</span>
       </a>
-      {% include 'snippets/add_to_group_button.html' with user=user minimal=True %}
-      {% if user.mutuals %}
+      {% include 'snippets/add_to_group_button.html' with user=member minimal=True %}
+      {% if member.mutuals %}
       <p class="help">
-          {% blocktrans trimmed with mutuals=user.mutuals|intcomma count counter=user.mutuals %}
+          {% blocktrans trimmed with mutuals=member.mutuals|intcomma count counter=member.mutuals %}
           {{ mutuals }} follower you follow
           {% plural %}
           {{ mutuals }} followers you follow{% endblocktrans %}
       </p>
-      {% elif user.shared_books %}
+      {% elif member.shared_books %}
       <p class="help">
-          {% blocktrans trimmed with shared_books=user.shared_books|intcomma count counter=user.shared_books %}
+          {% blocktrans trimmed with shared_books=member.shared_books|intcomma count counter=member.shared_books %}
           {{ shared_books }} book on your shelves
           {% plural %}
           {{ shared_books }} books on your shelves
           {% endblocktrans %}
       </p>
-      {% elif request.user in user.following.all %}
+      {% elif request.user in member.following.all %}
       <p class="help">
           {% trans "Follows you" %}
       </p>
       {% endif %}
-  </div>
+    </span>
 </div>
 {% endfor %}
 </ul>
\ No newline at end of file
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index 51c3179be..aea0532f1 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -7,21 +7,21 @@
 
 <div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
     <div class="control">
-      <!-- TODO: make this "add-to-group" -->
-        <form action="{% url 'follow' %}" method="POST" class="interaction follow_{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow_{{ user.id }}">
+        <form action="{% url 'add-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if user in group.members.all %}is-hidden{%endif %}" data-id="add_{{ user.id }}">
             {% csrf_token %}
+            <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
             <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">
                 {% if show_username %}
-                {% blocktrans with username=user.localname %}Follow @{{ username }}{% endblocktrans %}
+                {% blocktrans with username=user.localname %}Add @{{ username }}{% endblocktrans %}
                 {% else %}
-                {% trans "Follow" %}
+                {% trans "Add" %}
                 {% endif %}
             </button>
         </form>
-        <!-- TODO: make this "remove-from-group" -->
-        <form action="{% url 'unfollow' %}" method="POST" class="interaction follow_{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow_{{ user.id }}">
+        <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if user not in group.members.all %}is-hidden{%endif %}" data-id="add_{{ user.id }}">
             {% csrf_token %}
+            <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
             {% if user.manually_approves_followers and request.user not in user.followers.all %}
             <button class="button is-small is-danger is-light" type="submit">
@@ -30,9 +30,9 @@
             {% else %}
             <button class="button is-small is-danger is-light" type="submit">
                 {% if show_username %}
-                {% blocktrans with username=user.localname %}Unfollow @{{ username }}{% endblocktrans %}
+                {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
                 {% else %}
-                {% trans "Unfollow" %}
+                {% trans "Remove" %}
                 {% endif %}
             </button>
             {% endif %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index e688f813f..0c7b19393 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -255,7 +255,9 @@ urlpatterns = [
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
     re_path(r"^create-group/?$", views.create_group, name="create-group"),
     re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
-    re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindAndAddUsers.as_view(), name="group-find-users"),
+    re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindUsers.as_view(), name="group-find-users"),
+    re_path(r"^add-group-member/?$", views.add_member, name="add-group-member"),
+    re_path(r"^remove-group-member/?$", views.remove_member, name="remove-group-member"),
     # lists
     re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 7969ef7ac..187897066 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import Group, UserGroups, FindAndAddUsers, create_group
+from .group import Group, UserGroups, FindUsers, create_group, add_member, remove_member
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index c344f92bc..addf9e47c 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -1,11 +1,8 @@
 """group views"""
-from typing import Optional
-from urllib.parse import urlencode
-
 from django.contrib.auth.decorators import login_required
-from django.core.exceptions import PermissionDenied
+from django.db import IntegrityError
 from django.core.paginator import Paginator
-from django.http import HttpResponseNotFound, HttpResponseBadRequest, HttpResponse
+from django.http import HttpResponseNotFound, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -16,7 +13,7 @@ from django.db.models.functions import Greatest
 
 from bookwyrm import forms, models
 from bookwyrm.suggested_users import suggested_users
-from .helpers import privacy_filter
+from .helpers import privacy_filter # TODO:
 from .helpers import get_user_from_username
 
 class Group(View):
@@ -58,9 +55,9 @@ class UserGroups(View):
         return TemplateResponse(request, "user/groups.html", data)
 
 @method_decorator(login_required, name="dispatch")
-class FindAndAddUsers(View):
+class FindUsers(View):
     """find friends to add to your group"""
-    """this is taken from the Get Started friend finder"""
+    """this is mostly taken from the Get Started friend finder"""
 
     def get(self, request, group_id):
         """basic profile info"""
@@ -102,4 +99,64 @@ def create_group(request):
     group = form.save()
     # add the creator as a group member
     models.GroupMember.objects.create(group=group, user=request.user)
-    return redirect(group.local_path)
\ No newline at end of file
+    return redirect(group.local_path)
+
+@require_POST
+@login_required
+def add_member(request):
+    """add a member to the group"""
+
+    # TODO: if groups become AP values we need something like get_group_from_group_fullname
+    # group = get_object_or_404(models.Group, id=request.POST.get("group"))
+    group = models.Group.objects.get(id=request.POST["group"])
+    if not group:
+        return HttpResponseBadRequest()
+
+    user = get_user_from_username(request.user, request.POST["user"])
+    if not user:
+        return HttpResponseBadRequest()
+
+    if not group.manager == request.user:
+        return HttpResponseBadRequest()
+
+    try:
+        models.GroupMember.objects.create(
+          group=group,
+          user=user
+        )
+
+    except IntegrityError:
+        print("no integrity")
+        pass
+
+    # TODO: how do we return and update AJAX data?
+    return redirect(user.local_path)
+
+@require_POST
+@login_required
+def remove_member(request):
+    """remove a member from the group"""
+
+    # TODO: if groups become AP values we need something like get_group_from_group_fullname
+    # group = get_object_or_404(models.Group, id=request.POST.get("group"))
+    group = models.Group.objects.get(id=request.POST["group"])
+    if not group:
+        return HttpResponseBadRequest()
+
+    user = get_user_from_username(request.user, request.POST["user"])
+    if not user:
+        return HttpResponseBadRequest()
+
+    if not group.manager == request.user:
+        return HttpResponseBadRequest()
+
+    try:
+        membership = models.GroupMember.objects.get(group=group,user=user)
+        membership.delete()
+
+    except IntegrityError:
+        print("no integrity")
+        pass
+
+    # TODO: how do we return and update AJAX data?
+    return redirect(user.local_path)
\ No newline at end of file

From 62a5ed7a9ed0463e13beb67240eb750fd7986e55 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 19:53:06 +1000
Subject: [PATCH 019/193] identify group manager

---
 bookwyrm/templates/groups/members.html | 13 ++++++-------
 bookwyrm/templatetags/bookwyrm_tags.py | 13 +++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 55d7fd749..7dce08918 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load utilities %}
 {% load humanize %}
+{% load bookwyrm_tags %}
 <!-- TODO: do we need this? -->
 {% if request.GET.updated %}
 <div class="notification is-primary">
@@ -29,11 +30,9 @@
 </div>
 {% endblock %}
 
-<ul start="{{ members.start_index }}" class="ordered-list">
-
 <div class="column is-flex is-flex-grow-0">
   {% for member in group.members.all %}
-  <span class="box has-text-centered is-shadowless has-background-white-bis m-0">
+  <div class="box has-text-centered is-shadowless has-background-white-bis my-0 mx-2">
       <a href="{{ member.local_path }}" class="has-text-black">
           {% include 'snippets/avatar.html' with user=member large=True %}
           <span title="{{ member.display_name }}" class="is-block is-6 has-text-weight-bold">{{ member.display_name|truncatechars:10 }}</span>
@@ -60,7 +59,7 @@
           {% trans "Follows you" %}
       </p>
       {% endif %}
-    </span>
-</div>
-{% endfor %}
-</ul>
\ No newline at end of file
+      {% identify_manager %}
+    </div>
+    {% endfor %}
+  </div>
\ No newline at end of file
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index e00a8331d..a219beb4f 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -1,6 +1,7 @@
 """ template filters """
 from django import template
 from django.db.models import Avg
+from django.utils.safestring import mark_safe
 
 from bookwyrm import models, views
 
@@ -98,3 +99,15 @@ def mutuals_count(context, user):
     if not viewer.is_authenticated:
         return None
     return user.followers.filter(followers=viewer).count()
+
+@register.simple_tag(takes_context=True)
+def identify_manager(context):
+    """boolean for whether user is group manager"""
+    group = context['group']
+    member = context['member']
+    snippet =  mark_safe('')
+
+    if group.manager == member:
+        snippet = mark_safe('<span class="icon icon-star-full" title="Manager"><span class="is-sr-only">Manager</span></span>')
+
+    return snippet
\ No newline at end of file

From 035fc5209d373ef4ba9d23dc1deac94c47ccf816 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 20:23:59 +1000
Subject: [PATCH 020/193] better logic for identifying group manager

---
 bookwyrm/templates/groups/members.html |  6 +++++-
 bookwyrm/templatetags/bookwyrm_tags.py | 13 -------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 7dce08918..80dab21c9 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -38,6 +38,11 @@
           <span title="{{ member.display_name }}" class="is-block is-6 has-text-weight-bold">{{ member.display_name|truncatechars:10 }}</span>
           <span title="@{{ member|username }}" class="is-block pb-3">@{{ member|username|truncatechars:8 }}</span>
       </a>
+      {% if group.manager == member %}
+      <span class="icon icon-star-full" title="Manager">
+        <span class="is-sr-only">Manager</span>
+      </span>
+      {% endif %}
       {% include 'snippets/add_to_group_button.html' with user=member minimal=True %}
       {% if member.mutuals %}
       <p class="help">
@@ -59,7 +64,6 @@
           {% trans "Follows you" %}
       </p>
       {% endif %}
-      {% identify_manager %}
     </div>
     {% endfor %}
   </div>
\ No newline at end of file
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index a219beb4f..e00a8331d 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -1,7 +1,6 @@
 """ template filters """
 from django import template
 from django.db.models import Avg
-from django.utils.safestring import mark_safe
 
 from bookwyrm import models, views
 
@@ -99,15 +98,3 @@ def mutuals_count(context, user):
     if not viewer.is_authenticated:
         return None
     return user.followers.filter(followers=viewer).count()
-
-@register.simple_tag(takes_context=True)
-def identify_manager(context):
-    """boolean for whether user is group manager"""
-    group = context['group']
-    member = context['member']
-    snippet =  mark_safe('')
-
-    if group.manager == member:
-        snippet = mark_safe('<span class="icon icon-star-full" title="Manager"><span class="is-sr-only">Manager</span></span>')
-
-    return snippet
\ No newline at end of file

From ec0720514e9e458f9c933eed63a19744c064f160 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 25 Sep 2021 20:25:30 +1000
Subject: [PATCH 021/193] don't allow non-manager to add and remove group
 members

---
 bookwyrm/templates/snippets/add_to_group_button.html | 2 +-
 bookwyrm/views/group.py                              | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index aea0532f1..f533af6ea 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% if request.user == user or not request.user.is_authenticated %}
+{% if request.user == user or not request.user == group.manager or not request.user.is_authenticated %}
 <!-- TODO: blocking is irrelevant here, but ...is it? -->
 {% elif user in request.user.blocks.all %}
 {% include 'snippets/block_button.html' with blocks=True %}
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index addf9e47c..4214908af 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -47,7 +47,7 @@ class UserGroups(View):
 
         data = {
             "user": user,
-            "is_self": request.user.id == user.id,
+            "is_self": request.user.id == user.id, # CHECK is this relevant here?
             "groups": paginated.get_page(request.GET.get("page")),
             "group_form": forms.GroupForm(),
             "path": user.local_path + "/group",
@@ -82,9 +82,12 @@ class FindUsers(View):
                 request.user
             )
 
+        group = get_object_or_404(models.Group, id=group_id)
+
         data["suggested_users"] = user_results
-        data["group"] = get_object_or_404(models.Group, id=group_id)
+        data["group"] = group
         data["query"] = query
+        data["requestor_is_manager"] = request.user == group.manager
         return TemplateResponse(request, "groups/find_users.html", data)
 
 @login_required
@@ -129,7 +132,6 @@ def add_member(request):
         print("no integrity")
         pass
 
-    # TODO: how do we return and update AJAX data?
     return redirect(user.local_path)
 
 @require_POST
@@ -158,5 +160,4 @@ def remove_member(request):
         print("no integrity")
         pass
 
-    # TODO: how do we return and update AJAX data?
     return redirect(user.local_path)
\ No newline at end of file

From 686198472df29ed021ec0c7c77c81d5f9310fbfc Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 26 Sep 2021 15:50:15 +1000
Subject: [PATCH 022/193] update group and list models

- remove GroupList model
- add a group foreign key value  to List model
- remove reference to lists in Group model
---
 bookwyrm/models/__init__.py |  2 +-
 bookwyrm/models/group.py    | 14 --------------
 bookwyrm/models/list.py     |  7 +++++++
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 2774f081d..a4a06ebad 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -21,7 +21,7 @@ from .relationship import UserFollows, UserFollowRequest, UserBlocks
 from .report import Report, ReportComment
 from .federated_server import FederatedServer
 
-from .group import Group, GroupList, GroupMember
+from .group import Group, GroupMember
 
 from .import_job import ImportJob, ImportItem
 
diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 01fdbdd63..c1aa2d707 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -16,14 +16,6 @@ class Group(BookWyrmModel):
         "User", on_delete=models.PROTECT)
     description = fields.TextField(blank=True, null=True)
     privacy = fields.PrivacyField()
-
-    lists = models.ManyToManyField(
-        "List",
-        symmetrical=False,
-        through="GroupList",
-        through_fields=("group", "book_list"),
-    )
-
     members = models.ManyToManyField(
         "User",
         symmetrical=False,
@@ -32,12 +24,6 @@ class Group(BookWyrmModel):
         related_name="members"
     )
 
-class GroupList(BookWyrmModel):
-    """Lists that group members can edit"""
-
-    group = models.ForeignKey("Group", on_delete=models.CASCADE)
-    book_list = models.ForeignKey("List", on_delete=models.CASCADE)
-
 class GroupMember(models.Model):
     """Users who are members of a group"""
 
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 49fb53757..b73d77086 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -1,4 +1,5 @@
 """ make a list of books!! """
+from dataclasses import field
 from django.apps import apps
 from django.db import models
 from django.utils import timezone
@@ -16,6 +17,7 @@ CurationType = models.TextChoices(
         "closed",
         "open",
         "curated",
+        "group"
     ],
 )
 
@@ -32,6 +34,11 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     curation = fields.CharField(
         max_length=255, default="closed", choices=CurationType.choices
     )
+    group = models.ForeignKey(
+        "Group",
+        on_delete=models.CASCADE,
+        null=True
+    )
     books = models.ManyToManyField(
         "Edition",
         symmetrical=False,

From b921d666cffe8d8c993390525a73158a94444165 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 26 Sep 2021 15:55:16 +1000
Subject: [PATCH 023/193] add group field to ListForm

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

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 0987924ed..1f2221d34 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -293,7 +293,7 @@ class AnnouncementForm(CustomForm):
 class ListForm(CustomForm):
     class Meta:
         model = models.List
-        fields = ["user", "name", "description", "curation", "privacy"]
+        fields = ["user", "name", "description", "curation", "privacy", "group"]
 
 class GroupForm(CustomForm):
     class Meta:

From f3a3ba5f0105ec7f5ab84b19edc75bb3d3ead7ff Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 26 Sep 2021 15:56:02 +1000
Subject: [PATCH 024/193] pass group value to list views and vice-versa

---
 bookwyrm/views/group.py |  4 ++--
 bookwyrm/views/list.py  | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 4214908af..0ad0bd31d 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -26,10 +26,11 @@ class Group(View):
         # groups = privacy_filter(
         #     request.user, groups, privacy_levels=["public", "followers"]
         # )
-
+        lists = models.List.objects.filter(group=group).order_by("-updated_date")
 
         data = {
             "group": group,
+            "lists": lists,
             "list_form": forms.GroupForm(),
             "path": "/group",
         }
@@ -129,7 +130,6 @@ def add_member(request):
         )
 
     except IntegrityError:
-        print("no integrity")
         pass
 
     return redirect(user.local_path)
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 695302041..9ef027538 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -46,9 +46,12 @@ class Lists(View):
             request.user, lists, privacy_levels=["public", "followers"]
         )
 
+        user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
+
         paginated = Paginator(lists, 12)
         data = {
             "lists": paginated.get_page(request.GET.get("page")),
+            "user_groups": user_groups,
             "list_form": forms.ListForm(),
             "path": "/list",
         }
@@ -59,6 +62,10 @@ class Lists(View):
     def post(self, request):
         """create a book_list"""
         form = forms.ListForm(request.POST)
+        # TODO: here we need to take the value of the group (the group.id)
+        # and fetch the actual group to add to the DB
+        # but only if curation type is 'group' other wise the value of
+        # group is None
         if not form.is_valid():
             return redirect("lists")
         book_list = form.save()
@@ -93,12 +100,14 @@ class UserLists(View):
         user = get_user_from_username(request.user, username)
         lists = models.List.objects.filter(user=user)
         lists = privacy_filter(request.user, lists)
+        user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
         paginated = Paginator(lists, 12)
 
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
             "lists": paginated.get_page(request.GET.get("page")),
+            "user_groups": user_groups,
             "list_form": forms.ListForm(),
             "path": user.local_path + "/lists",
         }
@@ -171,6 +180,7 @@ class List(View):
                     ).order_by("-updated_date")
                 ][: 5 - len(suggestions)]
 
+        user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
         page = paginated.get_page(request.GET.get("page"))
         data = {
             "list": book_list,
@@ -185,6 +195,7 @@ class List(View):
             "sort_form": forms.SortListForm(
                 {"direction": direction, "sort_by": sort_by}
             ),
+            "user_groups": user_groups
         }
         return TemplateResponse(request, "lists/list.html", data)
 

From 8bfc71db6e37e4412b0b62191cddd6aa24dce771 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 26 Sep 2021 15:56:52 +1000
Subject: [PATCH 025/193] create group curated lists

---
 bookwyrm/templates/groups/group.html | 13 +++++-------
 bookwyrm/templates/lists/form.html   | 30 ++++++++++++++++++++++++++++
 bookwyrm/templates/lists/layout.html |  2 +-
 bookwyrm/templates/user/layout.html  |  1 +
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 4fea5a84e..abb241438 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -11,15 +11,13 @@
         {% include "groups/members.html" %}
 
         <h2 class="heading">Lists</h2>
-        {% if not group.lists.exists %}
+        {% if not lists %}
         <p>{% trans "This group has no lists" %}</p>
         {% else %}
-        <ul start="{{ lists.start_index }}" class="ordered-list">
-        {% for list in group.lists.all %}
-            <li class="block mb-5">
+
               <div class="columns is-multiline">
                 {% for list in lists %}
-                <div class="column is-one-quarter">
+                <div class="column is-one-third">
                     <div class="card is-stretchable">
                         <header class="card-header">
                             <h4 class="card-header-title">
@@ -55,9 +53,8 @@
                 </div>
                 {% endfor %}
             </div>
-            </li>
-        {% endfor %}
-        </ul>
+
+
         {% endif %}
         {% include "snippets/pagination.html" with page=items %}
     </section>
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index 9a000d3f5..0019520e8 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -1,5 +1,6 @@
 {% load i18n %}
 {% csrf_token %}
+{% load utilities %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
 
 <div class="columns">
@@ -31,6 +32,35 @@
                 <input type="radio" name="curation" value="open"{% if list.curation == 'open' %} checked{% endif %}> {% trans "Open" %}
                 <p class="help mb-2">{% trans "Anyone can add books to this list" %}</p>
             </label>
+
+            <label class="field">
+              <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %}> {% trans "Group" %}
+              <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
+          </label>
+
+          <!-- TODO: add a list picker on-select for group lists -->
+
+          <!-- TODO: change the submission url -->
+          <!-- <form name="list-add" method="post" action="{% url 'list-add-book' %}"> -->
+            {% if user_groups %}
+              {% csrf_token %}
+              <label class="label" for="id_group">{% trans "Select Group" %}</label>
+              <div class="field has-addons">
+                  <div class="select control">
+                      <select name="group" id="id_group">
+                          <option value="{{ group.id }}" disabled selected></option>
+                          {% for group in user_groups %}
+                          <option value="{{ group.id }}">{{ group.name }}</option>
+                          {% endfor %}
+                      </select>
+                  </div>
+              </div>
+              {% else %}
+              {% with user|username as username %}
+              {% url 'user-groups' user|username as url %}
+              <div>{% trans "You must create a " %}<a href="{{ url }}">{% trans "Group" %}</a>{% trans " before you can create Group lists!" %}</div>
+              {% endwith %}
+              {% endif %}
         </fieldset>
     </div>
 </div>
diff --git a/bookwyrm/templates/lists/layout.html b/bookwyrm/templates/lists/layout.html
index 68abafc09..914478abb 100644
--- a/bookwyrm/templates/lists/layout.html
+++ b/bookwyrm/templates/lists/layout.html
@@ -25,7 +25,7 @@
 </div>
 
 <div class="block">
-    {% include 'lists/edit_form.html' with controls_text="edit_list" %}
+    {% include 'lists/edit_form.html' with controls_text="edit_list" user_groups=user_groups %}
 </div>
 
 {% block panel %}{% endblock %}
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 22b8e2ce4..357ad4679 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -75,6 +75,7 @@
             <a href="{{ url }}">{% trans "Lists" %}</a>
         </li>
         {% endif %}
+        <!-- TODO: fix this: user.groups_set isn't what you think! -->
         {% if is_self or user.groups_set.exists %}
         {% url 'user-groups' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>

From 5fccb991a7a15da78ad2ed4d2ca1e753b14aae37 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 26 Sep 2021 18:28:16 +1000
Subject: [PATCH 026/193] remove list from group when changing curation

Allows 'group' to be blank when saving a list.
Removes the 'group' field when saving a list with curation other than 'group' - this stops the list "sticking" to a group after it is changed from group curation to something else.
---
 bookwyrm/models/list.py            | 3 ++-
 bookwyrm/templates/lists/form.html | 8 ++------
 bookwyrm/views/list.py             | 7 +++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index b73d77086..75f34b9e8 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -37,7 +37,8 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     group = models.ForeignKey(
         "Group",
         on_delete=models.CASCADE,
-        null=True
+        default=None,
+        blank=True
     )
     books = models.ManyToManyField(
         "Edition",
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index 0019520e8..d2f17d63b 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -37,20 +37,16 @@
               <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %}> {% trans "Group" %}
               <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
           </label>
-
           <!-- TODO: add a list picker on-select for group lists -->
-
-          <!-- TODO: change the submission url -->
-          <!-- <form name="list-add" method="post" action="{% url 'list-add-book' %}"> -->
             {% if user_groups %}
               {% csrf_token %}
               <label class="label" for="id_group">{% trans "Select Group" %}</label>
               <div class="field has-addons">
                   <div class="select control">
                       <select name="group" id="id_group">
-                          <option value="{{ group.id }}" disabled selected></option>
+                          <option value="">Select a list</option>
                           {% for group in user_groups %}
-                          <option value="{{ group.id }}">{{ group.name }}</option>
+                          <option value="{{ group.id }}" {% if list.group.id == group.id %} selected{% endif %}>{{ group.name }}</option>
                           {% endfor %}
                       </select>
                   </div>
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 9ef027538..fb224cdf5 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -62,10 +62,6 @@ class Lists(View):
     def post(self, request):
         """create a book_list"""
         form = forms.ListForm(request.POST)
-        # TODO: here we need to take the value of the group (the group.id)
-        # and fetch the actual group to add to the DB
-        # but only if curation type is 'group' other wise the value of
-        # group is None
         if not form.is_valid():
             return redirect("lists")
         book_list = form.save()
@@ -208,6 +204,9 @@ class List(View):
         if not form.is_valid():
             return redirect("list", book_list.id)
         book_list = form.save()
+        if not book_list.curation == "group":
+            book_list.group = None
+            book_list.save()
         return redirect(book_list.local_path)
 
 

From 0e2095bc5e981a6b39e88ef0fb6fa5132d32afbf Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 26 Sep 2021 20:52:44 +1000
Subject: [PATCH 027/193] refer to group in group lists created_text

---
 bookwyrm/templates/lists/created_text.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/created_text.html b/bookwyrm/templates/lists/created_text.html
index eee5a75f2..6c6247adc 100644
--- a/bookwyrm/templates/lists/created_text.html
+++ b/bookwyrm/templates/lists/created_text.html
@@ -1,7 +1,9 @@
 {% load i18n %}
 {% spaceless %}
 
-{% if list.curation != 'open' %}
+{% if list.curation == 'group' %}
+{% blocktrans with username=list.user.display_name userpath=list.user.local_path groupname=list.group.name grouppath=list.group.local_path %}Created by <a href="{{ userpath }}">{{ username }}</a> and managed by <a href="{{ path }}">{{ groupname }}</a>{% endblocktrans %}
+{% elif list.curation != 'open' %}
 {% blocktrans with username=list.user.display_name path=list.user.local_path %}Created and curated by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
 {% else %}
 {% blocktrans with username=list.user.display_name path=list.user.local_path %}Created by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}

From 762202c4b0b604c6e2d19b641fc10beb502641d7 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 11:03:41 +1000
Subject: [PATCH 028/193] fix UI for group curated list editing

When creating or editing a list, the group selection dropdown will only appear if the user selects "group" as the curation option (or it is already selected).

- fix typo in bookwyrm.js comments
- add data-hides trigger for hiding elements after they have been unhidden, where simple toggles are not the right approach
---
 bookwyrm/static/js/bookwyrm.js     | 30 ++++++++++++++---
 bookwyrm/templates/lists/form.html | 52 +++++++++++++++---------------
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index f000fd082..049de497c 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -28,6 +28,12 @@ let BookWyrm = new class {
                 this.revealForm.bind(this))
             );
 
+        document.querySelectorAll('[data-hides]')
+            .forEach(button => button.addEventListener(
+                'change',
+                this.hideForm.bind(this))
+            );
+
         document.querySelectorAll('[data-back]')
             .forEach(button => button.addEventListener(
                 'click',
@@ -119,7 +125,7 @@ let BookWyrm = new class {
     }
 
     /**
-     * Toggle form.
+     * Show form.
      *
      * @param  {Event} event
      * @return {undefined}
@@ -127,10 +133,26 @@ let BookWyrm = new class {
     revealForm(event) {
         let trigger = event.currentTarget;
         let hidden = trigger.closest('.hidden-form').querySelectorAll('.is-hidden')[0];
-
-        this.addRemoveClass(hidden, 'is-hidden', !hidden);
+        // if the form has already been revealed, there is no '.is-hidden' element
+        // so this doesn't really work as a toggle
+        if (hidden) {
+          this.addRemoveClass(hidden, 'is-hidden', !hidden);
+        }
     }
 
+    /**
+     * Hide form.
+     *
+     * @param  {Event} event
+     * @return {undefined}
+     */
+    hideForm(event) {
+        let trigger = event.currentTarget;
+        let targetId = trigger.dataset.hides
+        let visible = document.getElementById(targetId)
+        this.addRemoveClass(visible, 'is-hidden', true);
+  }
+
     /**
      * Execute actions on targets based on triggers.
      *
@@ -227,7 +249,7 @@ let BookWyrm = new class {
     }
 
     /**
-     * Check or uncheck a checbox.
+     * Check or uncheck a checkbox.
      *
      * @param  {string}  checkbox - id of the checkbox
      * @param  {boolean} pressed  - Is the trigger pressed?
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index d2f17d63b..a98cae94a 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -18,45 +18,45 @@
         <fieldset class="field">
             <legend class="label">{% trans "List curation:" %}</legend>
 
-            <label class="field">
+            <label class="field" data-hides="list_group_selector">
                 <input type="radio" name="curation" value="closed"{% if not list or list.curation == 'closed' %} checked{% endif %}> {% trans "Closed" %}
                 <p class="help mb-2">{% trans "Only you can add and remove books to this list" %}</p>
             </label>
 
-            <label class="field">
+            <label class="field" data-hides="list_group_selector">
                 <input type="radio" name="curation" value="curated"{% if list.curation == 'curated' %} checked{% endif %}> {% trans "Curated" %}
                 <p class="help mb-2">{% trans "Anyone can suggest books, subject to your approval" %}</p>
             </label>
 
-            <label class="field">
+            <label class="field" data-hides="list_group_selector">
                 <input type="radio" name="curation" value="open"{% if list.curation == 'open' %} checked{% endif %}> {% trans "Open" %}
                 <p class="help mb-2">{% trans "Anyone can add books to this list" %}</p>
             </label>
 
-            <label class="field">
-              <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %}> {% trans "Group" %}
-              <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
-          </label>
-          <!-- TODO: add a list picker on-select for group lists -->
-            {% if user_groups %}
-              {% csrf_token %}
-              <label class="label" for="id_group">{% trans "Select Group" %}</label>
-              <div class="field has-addons">
-                  <div class="select control">
-                      <select name="group" id="id_group">
-                          <option value="">Select a list</option>
-                          {% for group in user_groups %}
-                          <option value="{{ group.id }}" {% if list.group.id == group.id %} selected{% endif %}>{{ group.name }}</option>
-                          {% endfor %}
-                      </select>
-                  </div>
-              </div>
-              {% else %}
-              {% with user|username as username %}
-              {% url 'user-groups' user|username as url %}
-              <div>{% trans "You must create a " %}<a href="{{ url }}">{% trans "Group" %}</a>{% trans " before you can create Group lists!" %}</div>
-              {% endwith %}
+            <label class="field hidden-form">
+                <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %} > {% trans "Group" %}
+                <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
+                <fieldset class="{% if list.curation != 'group' %}is-hidden{% endif %}" id="list_group_selector">
+                  {% if user_groups %}
+                <label class="label" for="id_group" id="group">{% trans "Select Group" %}</label>
+                <div class="field has-addons">
+                    <div class="select control">
+                        <select name="group" id="id_group">
+                            <option value="" disabled {% if not list.group %} selected{% endif %}>{% trans "Select a list" %}</option>
+                            {% for group in user_groups %}
+                            <option value="{{ group.id }}" {% if list.group.id == group.id %} selected{% endif %}>{{ group.name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                {% else %}
+                {% with user|username as username %}
+                {% url 'user-groups' user|username as url %}
+                <div>{% trans "You must create a " %}<a href="{{ url }}">{% trans "Group" %}</a>{% trans " before you can create Group lists!" %}</div>
+                {% endwith %}
+              </fieldset>
               {% endif %}
+            </label>
         </fieldset>
     </div>
 </div>

From 2874e523098107c1b6dea0d7a6391b037aade0df Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 15:34:14 +1000
Subject: [PATCH 029/193] rationalise group creation and prep for group privacy

---
 bookwyrm/views/__init__.py |  2 +-
 bookwyrm/views/group.py    | 51 ++++++++++++++++++++++----------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 187897066..4d93c5973 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import Group, UserGroups, FindUsers, create_group, add_member, remove_member
+from .group import Group, UserGroups, FindUsers, add_member, remove_member
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 0ad0bd31d..694427606 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -15,6 +15,7 @@ from bookwyrm import forms, models
 from bookwyrm.suggested_users import suggested_users
 from .helpers import privacy_filter # TODO:
 from .helpers import get_user_from_username
+from bookwyrm.settings import DOMAIN
 
 class Group(View):
     """group page"""
@@ -23,11 +24,8 @@ class Group(View):
         """display a group"""
 
         group = models.Group.objects.get(id=group_id) 
-        # groups = privacy_filter(
-        #     request.user, groups, privacy_levels=["public", "followers"]
-        # )
         lists = models.List.objects.filter(group=group).order_by("-updated_date")
-
+        lists = privacy_filter(request.user, lists)
         data = {
             "group": group,
             "lists": lists,
@@ -36,6 +34,17 @@ class Group(View):
         }
         return TemplateResponse(request, "groups/group.html", data)
 
+    @method_decorator(login_required, name="dispatch")
+    # pylint: disable=unused-argument
+    def post(self, request, group_id):
+        """edit a group"""
+        user_group = get_object_or_404(models.Group, id=group_id)
+        form = forms.GroupForm(request.POST, instance=user_group)
+        if not form.is_valid():
+            return redirect("group", user_group.id)
+        user_group = form.save()
+        return redirect("group", user_group.id) 
+
 @method_decorator(login_required, name="dispatch")
 class UserGroups(View):
     """a user's groups page"""
@@ -44,6 +53,7 @@ class UserGroups(View):
         """display a group"""
         user = get_user_from_username(request.user, username)
         groups = models.Group.objects.filter(members=user).order_by("-updated_date")
+        groups = privacy_filter(request.user, groups)
         paginated = Paginator(groups, 12)
 
         data = {
@@ -55,6 +65,19 @@ class UserGroups(View):
         }
         return TemplateResponse(request, "user/groups.html", data)
 
+    @method_decorator(login_required, name="dispatch")
+    # pylint: disable=unused-argument
+    def post(self, request, username):
+        """create a user group"""
+        user = get_user_from_username(request.user, username)
+        form = forms.GroupForm(request.POST)
+        if not form.is_valid():
+            return redirect("user-groups")
+        group = form.save()
+        # add the creator as a group member
+        models.GroupMember.objects.create(group=group, user=request.user)
+        return redirect("group", group.id)
+
 @method_decorator(login_required, name="dispatch")
 class FindUsers(View):
     """find friends to add to your group"""
@@ -88,23 +111,9 @@ class FindUsers(View):
         data["suggested_users"] = user_results
         data["group"] = group
         data["query"] = query
-        data["requestor_is_manager"] = request.user == group.manager
+        data["requestor_is_manager"] = request.user == group.user
         return TemplateResponse(request, "groups/find_users.html", data)
 
-@login_required
-@require_POST
-def create_group(request):
-    """user groups"""
-    form = forms.GroupForm(request.POST)
-    if not form.is_valid():
-        print("invalid!")
-        return redirect(request.headers.get("Referer", "/"))
-
-    group = form.save()
-    # add the creator as a group member
-    models.GroupMember.objects.create(group=group, user=request.user)
-    return redirect(group.local_path)
-
 @require_POST
 @login_required
 def add_member(request):
@@ -120,7 +129,7 @@ def add_member(request):
     if not user:
         return HttpResponseBadRequest()
 
-    if not group.manager == request.user:
+    if not group.user == request.user:
         return HttpResponseBadRequest()
 
     try:
@@ -149,7 +158,7 @@ def remove_member(request):
     if not user:
         return HttpResponseBadRequest()
 
-    if not group.manager == request.user:
+    if not group.user == request.user:
         return HttpResponseBadRequest()
 
     try:

From f3181690a2121082d9d31d91322e1ab0cfd7849d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 15:36:41 +1000
Subject: [PATCH 030/193] change group owner from 'manager' to 'user'

This will allow privacy management to use existing code.
Some template updates also are for rationalising how
groups are created and edited.
---
 bookwyrm/models/base_model.py                        | 4 ++++
 bookwyrm/models/group.py                             | 2 +-
 bookwyrm/models/list.py                              | 5 +++--
 bookwyrm/templates/groups/created_text.html          | 2 +-
 bookwyrm/templates/groups/form.html                  | 6 +++---
 bookwyrm/templates/groups/layout.html                | 2 +-
 bookwyrm/templates/groups/members.html               | 2 +-
 bookwyrm/templates/groups/user_groups.html           | 2 +-
 bookwyrm/templates/snippets/add_to_group_button.html | 2 +-
 bookwyrm/templates/user/groups.html                  | 2 +-
 10 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index aa174a143..3a2d758b7 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -76,6 +76,10 @@ class BookWyrmModel(models.Model):
                 and self.mention_users.filter(id=viewer.id).first()
             ):
                 return True
+
+# TODO: if privacy is direct and the object is a group and viewer is a member of the group
+# then return True
+
         return False
 
 
diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index c1aa2d707..6810779cc 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -12,7 +12,7 @@ class Group(BookWyrmModel):
     """A group of users"""
 
     name = fields.CharField(max_length=100)
-    manager = fields.ForeignKey(
+    user = fields.ForeignKey(
         "User", on_delete=models.PROTECT)
     description = fields.TextField(blank=True, null=True)
     privacy = fields.PrivacyField()
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 75f34b9e8..7ea33a8b6 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -36,9 +36,10 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     )
     group = models.ForeignKey(
         "Group",
-        on_delete=models.CASCADE,
+        on_delete=models.PROTECT,
         default=None,
-        blank=True
+        blank=True,
+        null=True,
     )
     books = models.ManyToManyField(
         "Edition",
diff --git a/bookwyrm/templates/groups/created_text.html b/bookwyrm/templates/groups/created_text.html
index e7409942a..5e6ce513d 100644
--- a/bookwyrm/templates/groups/created_text.html
+++ b/bookwyrm/templates/groups/created_text.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% spaceless %}
 
-{% blocktrans with username=group.manager.display_name path=group.manager.local_path %}Managed by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
+{% blocktrans with username=group.user.display_name path=group.user.local_path %}Managed by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
 
 {% endspaceless %}
diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index f764db6f9..c47cbbc4d 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -5,7 +5,7 @@
 <div class="columns">
 
     <div class="column is-two-thirds">
-        <input type="hidden" name="manager" value="{{ request.user.id }}" />
+        <input type="hidden" name="user" value="{{ request.user.id }}" />
         <input type="hidden" name="privacy" value="public" />
         <div class="field">
             <label class="label" for="id_name">{% trans "Group Name:" %}</label>
@@ -20,9 +20,9 @@
 <div class="columns is-mobile">
     <div class="column">
         <div class="field has-addons">
-            <!-- <div class="control">
+            <div class="control">
                 {% include 'snippets/privacy_select.html' with current=group.privacy %}
-            </div> -->
+            </div>
             <div class="control">
                 <button type="submit" class="button is-primary">{% trans "Save" %}</button>
             </div>
diff --git a/bookwyrm/templates/groups/layout.html b/bookwyrm/templates/groups/layout.html
index 03a957d0a..f558f169a 100644
--- a/bookwyrm/templates/groups/layout.html
+++ b/bookwyrm/templates/groups/layout.html
@@ -12,7 +12,7 @@
         </p>
     </div>
     <div class="column is-narrow is-flex">
-        {% if request.user == group.manager %}
+        {% if request.user == group.user %}
             {% trans "Edit group" as button_text %}
             {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_group" focus="edit_group_header" %}
         {% endif %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 80dab21c9..df5f1602a 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -38,7 +38,7 @@
           <span title="{{ member.display_name }}" class="is-block is-6 has-text-weight-bold">{{ member.display_name|truncatechars:10 }}</span>
           <span title="@{{ member|username }}" class="is-block pb-3">@{{ member|username|truncatechars:8 }}</span>
       </a>
-      {% if group.manager == member %}
+      {% if group.user == member %}
       <span class="icon icon-star-full" title="Manager">
         <span class="is-sr-only">Manager</span>
       </span>
diff --git a/bookwyrm/templates/groups/user_groups.html b/bookwyrm/templates/groups/user_groups.html
index 9c48a8429..5239a3657 100644
--- a/bookwyrm/templates/groups/user_groups.html
+++ b/bookwyrm/templates/groups/user_groups.html
@@ -8,7 +8,7 @@
         <div class="card is-stretchable">
             <header class="card-header">
                 <h4 class="card-header-title">
-                    <a href="{{ group.local_path }}">{{ group.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=group %}</span>
+                    <a href="/group/{{ group.id }}">{{ group.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=group %}</span>
                 </h4>
                 {% if request.user.is_authenticated and request.user|saved:list %}
                 <div class="card-header-icon">
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index f533af6ea..cc394684c 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% if request.user == user or not request.user == group.manager or not request.user.is_authenticated %}
+{% if request.user == user or not request.user == group.user or not request.user.is_authenticated %}
 <!-- TODO: blocking is irrelevant here, but ...is it? -->
 {% elif user in request.user.blocks.all %}
 {% include 'snippets/block_button.html' with blocks=True %}
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index 912d5ec3d..1a5940728 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -24,7 +24,7 @@
 
 {% block panel %}
 <section class="block">
-    <form name="create-group" method="post" action="{% url 'create-group' %}" class="box is-hidden" id="create_group">
+    <form name="create-group" method="post" action="{% url 'user-groups' request.user.username %}" class="box is-hidden" id="create_group">
         <header class="columns">
             <h3 class="title column">{% trans "Create group" %}</h3>
             <div class="column is-narrow">

From 0ccd54b05ab40f8bd41734b8651f6fe0080efaec Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 15:38:05 +1000
Subject: [PATCH 031/193] better urls and views for group creation and editing

---
 bookwyrm/forms.py | 2 +-
 bookwyrm/urls.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 1f2221d34..ffb7581e5 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -298,7 +298,7 @@ class ListForm(CustomForm):
 class GroupForm(CustomForm):
     class Meta:
         model = models.Group
-        fields = ["manager", "privacy", "name", "description"]
+        fields = ["user", "privacy", "name", "description"]
 
 class ReportForm(CustomForm):
     class Meta:
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 0c7b19393..a8a0651a7 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -253,7 +253,7 @@ urlpatterns = [
     re_path(r"^hide-suggestions/?$", views.hide_suggestions, name="hide-suggestions"),
     # groups
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
-    re_path(r"^create-group/?$", views.create_group, name="create-group"),
+    # re_path(r"^create-group/?$", views.create_group, name="create-group"),
     re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
     re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindUsers.as_view(), name="group-find-users"),
     re_path(r"^add-group-member/?$", views.add_member, name="add-group-member"),

From 493ed14f3465eeb2c4495c2f1eb02e1b989131f7 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 16:39:12 +1000
Subject: [PATCH 032/193] better group creation form logic and placement

---
 bookwyrm/templates/user/groups.html | 2 +-
 bookwyrm/views/group.py             | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index 1a5940728..6b64e4b79 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -24,7 +24,7 @@
 
 {% block panel %}
 <section class="block">
-    <form name="create-group" method="post" action="{% url 'user-groups' request.user.username %}" class="box is-hidden" id="create_group">
+    <form name="create-group" method="post" action="{% url 'user-groups' 'empty_arg' %}" class="box is-hidden" id="create_group">
         <header class="columns">
             <h3 class="title column">{% trans "Create group" %}</h3>
             <div class="column is-narrow">
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 694427606..18e13eb5d 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -69,10 +69,9 @@ class UserGroups(View):
     # pylint: disable=unused-argument
     def post(self, request, username):
         """create a user group"""
-        user = get_user_from_username(request.user, username)
         form = forms.GroupForm(request.POST)
         if not form.is_valid():
-            return redirect("user-groups")
+            return redirect(request.user.local_path + "groups")
         group = form.save()
         # add the creator as a group member
         models.GroupMember.objects.create(group=group, user=request.user)

From e38d7b63f36763443fe53a0b5b42c573ed45b2e1 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 16:49:56 +1000
Subject: [PATCH 033/193] make groups actually editable

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

diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 18e13eb5d..9319b6599 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -29,7 +29,7 @@ class Group(View):
         data = {
             "group": group,
             "lists": lists,
-            "list_form": forms.GroupForm(),
+            "group_form": forms.GroupForm(instance=group),
             "path": "/group",
         }
         return TemplateResponse(request, "groups/group.html", data)

From e5ca377cd37151f52391ad3587ad5aa7ba0f1398 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 16:50:51 +1000
Subject: [PATCH 034/193] clean up stray code mess

---
 bookwyrm/templates/groups/form.html | 3 +--
 bookwyrm/urls.py                    | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index c47cbbc4d..f684dd010 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -1,9 +1,8 @@
 {% load i18n %}
 {% csrf_token %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
-{{ group_form.non_field_errors }}
-<div class="columns">
 
+<div class="columns">
     <div class="column is-two-thirds">
         <input type="hidden" name="user" value="{{ request.user.id }}" />
         <input type="hidden" name="privacy" value="public" />
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a8a0651a7..30ffc8689 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -253,7 +253,6 @@ urlpatterns = [
     re_path(r"^hide-suggestions/?$", views.hide_suggestions, name="hide-suggestions"),
     # groups
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
-    # re_path(r"^create-group/?$", views.create_group, name="create-group"),
     re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
     re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindUsers.as_view(), name="group-find-users"),
     re_path(r"^add-group-member/?$", views.add_member, name="add-group-member"),

From 277c033fda527a043d2ae219a517041869c975d3 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 17:50:38 +1000
Subject: [PATCH 035/193] show star if this user is the creator/manager of the
 group

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

diff --git a/bookwyrm/templates/groups/user_groups.html b/bookwyrm/templates/groups/user_groups.html
index 5239a3657..f99abc695 100644
--- a/bookwyrm/templates/groups/user_groups.html
+++ b/bookwyrm/templates/groups/user_groups.html
@@ -10,10 +10,10 @@
                 <h4 class="card-header-title">
                     <a href="/group/{{ group.id }}">{{ group.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=group %}</span>
                 </h4>
-                {% if request.user.is_authenticated and request.user|saved:list %}
+                {% if group.user == user %}
                 <div class="card-header-icon">
-                    {% trans "Saved" as text %}
-                    <span class="icon icon-bookmark has-text-grey" title="{{ text }}">
+                    {% trans "Manager" as text %}
+                    <span class="icon icon-star-full has-text-grey" title="{{ text }}">
                         <span class="is-sr-only">{{ text }}</span>
                     </span>
                 </div>

From 81e5ff5b76e087f301cff63193830b10a064985c Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 17:51:18 +1000
Subject: [PATCH 036/193] show groups on member pages if allowed

- display groups on user pages when not the logged in user
- restrict visibility of groups on user pages and group pages themselves according to privacy settings
---
 bookwyrm/templates/user/layout.html |  3 +--
 bookwyrm/views/group.py             | 10 +++++++++-
 bookwyrm/views/user.py              |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 357ad4679..0d07b199b 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -75,8 +75,7 @@
             <a href="{{ url }}">{% trans "Lists" %}</a>
         </li>
         {% endif %}
-        <!-- TODO: fix this: user.groups_set isn't what you think! -->
-        {% if is_self or user.groups_set.exists %}
+        {% if is_self or has_groups %}
         {% url 'user-groups' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
             <a href="{{ url }}">{% trans "Groups" %}</a>
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 9319b6599..dfb44a4c8 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -23,9 +23,17 @@ class Group(View):
     def get(self, request, group_id):
         """display a group"""
 
+        # TODO: use get_or_404?
+        # TODO: what is the difference between privacy filter and visible to user?
+        # get_object_or_404(models.Group, id=group_id)
         group = models.Group.objects.get(id=group_id) 
         lists = models.List.objects.filter(group=group).order_by("-updated_date")
         lists = privacy_filter(request.user, lists)
+
+        # don't show groups to users who shouldn't see them
+        if not group.visible_to_user(request.user):
+            return HttpResponseNotFound()
+
         data = {
             "group": group,
             "lists": lists,
@@ -58,7 +66,7 @@ class UserGroups(View):
 
         data = {
             "user": user,
-            "is_self": request.user.id == user.id, # CHECK is this relevant here?
+            "has_groups": models.GroupMember.objects.filter(user=user).exists(),
             "groups": paginated.get_page(request.GET.get("page")),
             "group_form": forms.GroupForm(),
             "path": user.local_path + "/group",
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 63194ceb7..d3f52e729 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -83,6 +83,7 @@ class User(View):
         data = {
             "user": user,
             "is_self": is_self,
+            "has_groups": models.GroupMember.objects.filter(user=user).exists(),
             "shelves": shelf_preview,
             "shelf_count": shelves.count(),
             "activities": paginated.get_page(request.GET.get("page", 1)),

From c87712c995de998e62b1725f224ba47c37d4537a Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 18:41:29 +1000
Subject: [PATCH 037/193] allow group members to add items to group lists
 directly

NOTE: this will be the case regardless of privacy settings of the list
---
 bookwyrm/templates/lists/list.html |  4 ++--
 bookwyrm/views/list.py             | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 35014a7b6..ea28bb77f 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -123,7 +123,7 @@
         </form>
     {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}
         <h2 class="title is-5 mt-6">
-            {% if list.curation == 'open' or request.user == list.user %}
+            {% if list.curation == 'open' or request.user == list.user or is_group_member %}
                 {% trans "Add Books" %}
             {% else %}
                 {% trans "Suggest Books" %}
@@ -176,7 +176,7 @@
                             {% csrf_token %}
                             <input type="hidden" name="book" value="{{ book.id }}">
                             <input type="hidden" name="list" value="{{ list.id }}">
-                            <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
+                            <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user or is_group_member %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
                         </form>
                     </div>
                 </div>
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index fb224cdf5..912c3cfdb 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -177,6 +177,7 @@ class List(View):
                 ][: 5 - len(suggestions)]
 
         user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
+        is_group_member = book_list.group in user_groups
         page = paginated.get_page(request.GET.get("page"))
         data = {
             "list": book_list,
@@ -191,7 +192,8 @@ class List(View):
             "sort_form": forms.SortListForm(
                 {"direction": direction, "sort_by": sort_by}
             ),
-            "user_groups": user_groups
+            "user_groups": user_groups,
+            "is_group_member": is_group_member
         }
         return TemplateResponse(request, "lists/list.html", data)
 
@@ -292,13 +294,17 @@ def delete_list(request, list_id):
 def add_book(request):
     """put a book on a list"""
     book_list = get_object_or_404(models.List, id=request.POST.get("list"))
+    is_group_member = False
+    if book_list.curation == "group":
+        user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
+        is_group_member = book_list.group in user_groups
     if not book_list.visible_to_user(request.user):
         return HttpResponseNotFound()
 
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     # do you have permission to add to the list?
     try:
-        if request.user == book_list.user or book_list.curation == "open":
+        if request.user == book_list.user or is_group_member or book_list.curation == "open":
             # add the book at the latest order of approved books, before pending books
             order_max = (
                 book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[

From df5a5f94a1e60fc0c2ad9169f0c57504f441afde Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 19:27:39 +1000
Subject: [PATCH 038/193] fix local_path for groups

---
 bookwyrm/models/group.py                   |  4 ++
 bookwyrm/templates/groups/group.html       | 78 +++++++++++-----------
 bookwyrm/templates/lists/created_text.html |  2 +-
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 6810779cc..4d9d28156 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -24,6 +24,10 @@ class Group(BookWyrmModel):
         related_name="members"
     )
 
+    def get_remote_id(self):
+        """don't want the user to be in there in this case"""
+        return f"https://{DOMAIN}/group/{self.id}"
+
 class GroupMember(models.Model):
     """Users who are members of a group"""
 
diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index abb241438..6c44e3b42 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -15,49 +15,47 @@
         <p>{% trans "This group has no lists" %}</p>
         {% else %}
 
-              <div class="columns is-multiline">
-                {% for list in lists %}
-                <div class="column is-one-third">
-                    <div class="card is-stretchable">
-                        <header class="card-header">
-                            <h4 class="card-header-title">
-                                <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>
-                            </h4>
-                        </header>
-            
-                        {% with list_books=list.listitem_set.all|slice:5 %}
-                            {% if list_books %}
-                                <div class="card-image columns is-mobile is-gapless is-clipped">
-                                    {% for book in list_books %}
-                                        <a class="column is-cover" href="{{ book.book.local_path }}">
-                                            {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' size='small' aria='show' %}
-                                        </a>
-                                    {% endfor %}
-                                </div>
-                            {% endif %}
-                        {% endwith %}
-            
-                        <div class="card-content is-flex-grow-0">
-                            <div class="is-clipped" {% if list.description %}title="{{ list.description }}"{% endif %}>
-                            {% if list.description %}
-                                {{ list.description|to_markdown|safe|truncatechars_html:30 }}
-                            {% else %}
-                            &nbsp;
-                            {% endif %}
-                            </div>
-                            <p class="subtitle help">
-                                {% include 'lists/created_text.html' with list=list %}
-                            </p>
-                        </div>
-                    </div>
-                </div>
-                {% endfor %}
-            </div>
-
+        <div class="columns is-multiline">
+          {% for list in lists %}
+          <div class="column is-one-third">
+              <div class="card is-stretchable">
+                  <header class="card-header">
+                      <h4 class="card-header-title">
+                          <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>
+                      </h4>
+                  </header>
+      
+                  {% with list_books=list.listitem_set.all|slice:5 %}
+                      {% if list_books %}
+                          <div class="card-image columns is-mobile is-gapless is-clipped">
+                              {% for book in list_books %}
+                                  <a class="column is-cover" href="{{ book.book.local_path }}">
+                                      {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' size='small' aria='show' %}
+                                  </a>
+                              {% endfor %}
+                          </div>
+                      {% endif %}
+                  {% endwith %}
+      
+                  <div class="card-content is-flex-grow-0">
+                      <div class="is-clipped" {% if list.description %}title="{{ list.description }}"{% endif %}>
+                      {% if list.description %}
+                          {{ list.description|to_markdown|safe|truncatechars_html:30 }}
+                      {% else %}
+                      &nbsp;
+                      {% endif %}
+                      </div>
+                      <p class="subtitle help">
+                          {% include 'lists/created_text.html' with list=list %}
+                      </p>
+                  </div>
+              </div>
+          </div>
+          {% endfor %}
+        </div>
 
         {% endif %}
         {% include "snippets/pagination.html" with page=items %}
     </section>
-
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/lists/created_text.html b/bookwyrm/templates/lists/created_text.html
index 6c6247adc..f5405b64a 100644
--- a/bookwyrm/templates/lists/created_text.html
+++ b/bookwyrm/templates/lists/created_text.html
@@ -2,7 +2,7 @@
 {% spaceless %}
 
 {% if list.curation == 'group' %}
-{% blocktrans with username=list.user.display_name userpath=list.user.local_path groupname=list.group.name grouppath=list.group.local_path %}Created by <a href="{{ userpath }}">{{ username }}</a> and managed by <a href="{{ path }}">{{ groupname }}</a>{% endblocktrans %}
+{% blocktrans with username=list.user.display_name userpath=list.user.local_path groupname=list.group.name grouppath=list.group.local_path %}Created by <a href="{{ userpath }}">{{ username }}</a> and managed by <a href="{{ grouppath }}">{{ groupname }}</a>{% endblocktrans %}
 {% elif list.curation != 'open' %}
 {% blocktrans with username=list.user.display_name path=list.user.local_path %}Created and curated by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
 {% else %}

From 1a02af145016b79fe2b14c6a93536b88e82d5b7c Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 20:24:25 +1000
Subject: [PATCH 039/193] allow members to see groups and their lists

- add additional logic to visible_to_user, for groups and their objects
- cleans up some queries in Group view

NOTE: I can't work out how to make group lists only visible
to users who should be able to see them, on user group listings.
They still can't access the actual group, but can see it on
user pages. This is potentialy problematic.
---
 bookwyrm/models/base_model.py | 13 +++++++++++--
 bookwyrm/views/group.py       | 13 ++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 3a2d758b7..1b4bae1a9 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -77,8 +77,17 @@ class BookWyrmModel(models.Model):
             ):
                 return True
 
-# TODO: if privacy is direct and the object is a group and viewer is a member of the group
-# then return True
+        # you can see groups of which you are a member
+        if hasattr(self, "members") and viewer in self.members.all():
+            return True
+
+        # you can see objects which have a group of which you are a member
+        if hasattr(self, "group"):
+            if (
+                hasattr(self.group, "members")
+                and viewer in self.group.members.all()
+            ):
+                return True
 
         return False
 
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index dfb44a4c8..b28aabeb3 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -13,7 +13,7 @@ from django.db.models.functions import Greatest
 
 from bookwyrm import forms, models
 from bookwyrm.suggested_users import suggested_users
-from .helpers import privacy_filter # TODO:
+from .helpers import privacy_filter
 from .helpers import get_user_from_username
 from bookwyrm.settings import DOMAIN
 
@@ -23,10 +23,7 @@ class Group(View):
     def get(self, request, group_id):
         """display a group"""
 
-        # TODO: use get_or_404?
-        # TODO: what is the difference between privacy filter and visible to user?
-        # get_object_or_404(models.Group, id=group_id)
-        group = models.Group.objects.get(id=group_id) 
+        group = get_object_or_404(models.Group, id=group_id)
         lists = models.List.objects.filter(group=group).order_by("-updated_date")
         lists = privacy_filter(request.user, lists)
 
@@ -43,7 +40,6 @@ class Group(View):
         return TemplateResponse(request, "groups/group.html", data)
 
     @method_decorator(login_required, name="dispatch")
-    # pylint: disable=unused-argument
     def post(self, request, group_id):
         """edit a group"""
         user_group = get_object_or_404(models.Group, id=group_id)
@@ -61,7 +57,7 @@ class UserGroups(View):
         """display a group"""
         user = get_user_from_username(request.user, username)
         groups = models.Group.objects.filter(members=user).order_by("-updated_date")
-        groups = privacy_filter(request.user, groups)
+        # groups = privacy_filter(request.user, groups)
         paginated = Paginator(groups, 12)
 
         data = {
@@ -127,8 +123,7 @@ def add_member(request):
     """add a member to the group"""
 
     # TODO: if groups become AP values we need something like get_group_from_group_fullname
-    # group = get_object_or_404(models.Group, id=request.POST.get("group"))
-    group = models.Group.objects.get(id=request.POST["group"])
+    group = get_object_or_404(models.Group, id=request.POST.get("group"))
     if not group:
         return HttpResponseBadRequest()
 

From e15eef16c54647dce53bcdc1f4f01fb73587752b Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 21:21:00 +1000
Subject: [PATCH 040/193] improve new group member adding

The add-members page now looks almost identical to the group
page and is clearer.
---
 bookwyrm/templates/groups/find_users.html     |  6 +++--
 bookwyrm/templates/groups/group.html          | 24 ++++++++++++++++-
 bookwyrm/templates/groups/members.html        | 26 +------------------
 .../templates/groups/suggested_users.html     | 15 +----------
 4 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/bookwyrm/templates/groups/find_users.html b/bookwyrm/templates/groups/find_users.html
index 9154a5275..99ec67bc4 100644
--- a/bookwyrm/templates/groups/find_users.html
+++ b/bookwyrm/templates/groups/find_users.html
@@ -1,6 +1,8 @@
 {% extends 'groups/group.html' %}
 
-{% block panel %}
-<h1 class="title">Add users to <a href="{{ group.local_path }}">{{ group.name }}</a></h1>
+{% block searchresults %}
+<h2 class="title is-5">
+    Add new members!
+</h2>
   {% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %}
 {% endblock %}
\ No newline at end of file
diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 6c44e3b42..9617e1332 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -8,9 +8,12 @@
 <div class="columns mt-3">
     <section class="column is-three-quarters">
 
+        {% block searchresults %}
+        {% endblock %}
+
         {% include "groups/members.html" %}
 
-        <h2 class="heading">Lists</h2>
+        <h2 class="title is-5">Lists</h2>
         {% if not lists %}
         <p>{% trans "This group has no lists" %}</p>
         {% else %}
@@ -57,5 +60,24 @@
         {% endif %}
         {% include "snippets/pagination.html" with page=items %}
     </section>
+
+    <section class="column is-one-quarter">
+      <div class="block">
+          <h2 class="title is-5">Find new members</h2>
+          <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
+              <div class="control">
+                  <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
+              </div>
+              <div class="control">
+                  <button class="button" type="submit">
+                      <span class="icon icon-search" title="{% trans 'Search' %}">
+                          <span class="is-sr-only">{% trans "Search" %}</span>
+                      </span>
+                  </button>
+              </div>
+          </form>
+      </div>
+    </section>
+
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index df5f1602a..a64d840e1 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -2,34 +2,10 @@
 {% load utilities %}
 {% load humanize %}
 {% load bookwyrm_tags %}
-<!-- TODO: do we need this? -->
-{% if request.GET.updated %}
-<div class="notification is-primary">
-    {% trans "You successfully added a user to this group!" %}
-</div>
-{% endif %}
 
-<h2 class="heading">Group Members</h2>
+<h2 class="title is-5">Group Members</h2>
 <p class="subtitle is-6">{% trans "Members can add and remove books on your group's book lists" %}</p>
 
-{% block panel %}
-<div class="block">
-    <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
-        <div class="control">
-            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
-        </div>
-        <div class="control">
-            <button class="button" type="submit">
-                <span class="icon icon-search" title="{% trans 'Search' %}">
-                    <span class="is-sr-only">{% trans "Search" %}</span>
-                </span>
-            </button>
-        </div>
-    </form>
-    {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %}
-</div>
-{% endblock %}
-
 <div class="column is-flex is-flex-grow-0">
   {% for member in group.members.all %}
   <div class="box has-text-centered is-shadowless has-background-white-bis my-0 mx-2">
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 40d32f3f3..91b3784de 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -1,20 +1,7 @@
 {% load i18n %}
 {% load utilities %}
 {% load humanize %}
-<div class="block">
-  <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
-      <div class="control">
-          <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
-      </div>
-      <div class="control">
-          <button class="button" type="submit">
-              <span class="icon icon-search" title="{% trans 'Search' %}">
-                  <span class="is-sr-only">{% trans "Search" %}</span>
-              </span>
-          </button>
-      </div>
-  </form>
-</div>
+
 {% if suggested_users %}
 <div class="columns is-mobile scroll-x mb-0">
     {% for user in suggested_users %}

From fb823189a01ab7d65a64e6cb9bf20ab8c65e2019 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 21:48:40 +1000
Subject: [PATCH 041/193] don't allow non-local users to join groups (yet)

Groups are not compatible with ActivityPub because I don't know what I'm doing.

NOTE: this is super hacky, fix ASAP
---
 bookwyrm/templates/snippets/add_to_group_button.html | 6 +++++-
 bookwyrm/views/group.py                              | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index cc394684c..fe1403c48 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -1,6 +1,5 @@
 {% load i18n %}
 {% if request.user == user or not request.user == group.user or not request.user.is_authenticated %}
-<!-- TODO: blocking is irrelevant here, but ...is it? -->
 {% elif user in request.user.blocks.all %}
 {% include 'snippets/block_button.html' with blocks=True %}
 {% else %}
@@ -11,6 +10,7 @@
             {% csrf_token %}
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
+            {% if user.local %}
             <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">
                 {% if show_username %}
                 {% blocktrans with username=user.localname %}Add @{{ username }}{% endblocktrans %}
@@ -18,6 +18,10 @@
                 {% trans "Add" %}
                 {% endif %}
             </button>
+            {% else %}
+            <!-- TODO: This is an incredibly ugly hack until group are AP enabled -->
+            <span><em>Remote User</em></span>
+            {% endif %}
         </form>
         <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if user not in group.members.all %}is-hidden{%endif %}" data-id="add_{{ user.id }}">
             {% csrf_token %}
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index b28aabeb3..4d91be67d 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -84,7 +84,7 @@ class UserGroups(View):
 @method_decorator(login_required, name="dispatch")
 class FindUsers(View):
     """find friends to add to your group"""
-    """this is mostly taken from the Get Started friend finder"""
+    """this is mostly borrowed from the Get Started friend finder"""
 
     def get(self, request, group_id):
         """basic profile info"""
@@ -99,6 +99,7 @@ class FindUsers(View):
             )
             .filter(
                 similarity__gt=0.5,
+                local=True
             )
             .order_by("-similarity")[:5]
         )

From 66494e7788aa194153d465c43efd2f6426de014d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 28 Sep 2021 18:53:11 +1000
Subject: [PATCH 042/193] fix reverse reference to user bookwyrm_groups

---
 bookwyrm/models/group.py                   |  2 +-
 bookwyrm/templates/groups/user_groups.html |  2 +-
 bookwyrm/templates/user/groups.html        |  2 +-
 bookwyrm/templates/user/layout.html        |  2 +-
 bookwyrm/templates/user/user.html          |  3 +++
 bookwyrm/views/group.py                    | 24 +++++++++++++++++++---
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 4d9d28156..ea162b2a4 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -21,7 +21,7 @@ class Group(BookWyrmModel):
         symmetrical=False,
         through="GroupMember",
         through_fields=("group", "user"),
-        related_name="members"
+        related_name="bookwyrm_groups"
     )
 
     def get_remote_id(self):
diff --git a/bookwyrm/templates/groups/user_groups.html b/bookwyrm/templates/groups/user_groups.html
index f99abc695..6b4cef1be 100644
--- a/bookwyrm/templates/groups/user_groups.html
+++ b/bookwyrm/templates/groups/user_groups.html
@@ -3,7 +3,7 @@
 {% load interaction %}
 
 <div class="columns is-multiline">
-    {% for group in groups %}
+    {% for group in user.bookwyrm_groups.all %}
     <div class="column is-one-quarter">
         <div class="card is-stretchable">
             <header class="card-header">
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index 6b64e4b79..36736e013 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -34,7 +34,7 @@
         {% include 'groups/form.html' %}
     </form>
 
-    {% include 'groups/user_groups.html' with groups=groups %}
+    {% include 'groups/user_groups.html' %}
 </section>
 <div>
     {% include 'snippets/pagination.html' with page=user_groups path=path %}
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 0d07b199b..a1a5289d5 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -75,7 +75,7 @@
             <a href="{{ url }}">{% trans "Lists" %}</a>
         </li>
         {% endif %}
-        {% if is_self or has_groups %}
+        {% if is_self or user.bookwyrm_groups %}
         {% url 'user-groups' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
             <a href="{{ url }}">{% trans "Groups" %}</a>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index f360a30af..676161d8e 100755
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -22,6 +22,9 @@
 
 {% block panel %}
 {% if user.bookwyrm_user %}
+{% for group in user.bookwyrm_groups.all %}
+<div>{{ group.name }}</div>
+{% endfor %}
 <div class="block">
     <h2 class="title">
         {% include 'user/shelf/books_header.html' %}
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 4d91be67d..3e1785cce 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -1,4 +1,5 @@
 """group views"""
+from django.apps import apps
 from django.contrib.auth.decorators import login_required
 from django.db import IntegrityError
 from django.core.paginator import Paginator
@@ -62,8 +63,6 @@ class UserGroups(View):
 
         data = {
             "user": user,
-            "has_groups": models.GroupMember.objects.filter(user=user).exists(),
-            "groups": paginated.get_page(request.GET.get("page")),
             "group_form": forms.GroupForm(),
             "path": user.local_path + "/group",
         }
@@ -144,6 +143,21 @@ def add_member(request):
     except IntegrityError:
         pass
 
+# TODO: actually this needs to be associated with the user ACCEPTING AN INVITE!!! DOH!
+
+    """create a notification too"""
+    # notify all team members when a user is added to the group
+    model = apps.get_model("bookwyrm.Notification", require_ready=True)
+    for team_member in group.members.all():
+        if team_member.local and team_member != request.user:
+            model.objects.create(
+                user=team_member,
+                related_user=request.user,
+                related_group_member=user,
+                related_group=group,
+                notification_type="ADD",
+            )
+
     return redirect(user.local_path)
 
 @require_POST
@@ -151,8 +165,12 @@ def add_member(request):
 def remove_member(request):
     """remove a member from the group"""
 
+    # TODO: send notification to user telling them they have been removed
+    # TODO: remove yourself from a group!!!! (except owner)
+    # FUTURE TODO: transfer ownership of group
+
     # TODO: if groups become AP values we need something like get_group_from_group_fullname
-    # group = get_object_or_404(models.Group, id=request.POST.get("group"))
+    # group = get_object_or_404(models.Group, id=request.POST.get("group")) # NOTE: does this not work?
     group = models.Group.objects.get(id=request.POST["group"])
     if not group:
         return HttpResponseBadRequest()

From 2f42161dda41dd647ef52c3cbc58044131a24d7a Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 10:10:37 +1000
Subject: [PATCH 043/193] disambiguate groups and prep for group invitations

- rename Group to BookwyrmGroup
- create group memberships and invitations
- adjust all model name references accordingly
---
 bookwyrm/forms.py               |   2 +-
 bookwyrm/models/__init__.py     |   2 +-
 bookwyrm/models/group.py        | 155 +++++++++++++++++++++++++++-----
 bookwyrm/models/list.py         |   5 +-
 bookwyrm/models/notification.py |  10 ++-
 bookwyrm/models/user.py         |   5 ++
 bookwyrm/urls.py                |   9 +-
 bookwyrm/views/__init__.py      |   2 +-
 bookwyrm/views/group.py         | 130 +++++++++++++++++++--------
 bookwyrm/views/user.py          |   4 +-
 10 files changed, 255 insertions(+), 69 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index ffb7581e5..290e01877 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -297,7 +297,7 @@ class ListForm(CustomForm):
 
 class GroupForm(CustomForm):
     class Meta:
-        model = models.Group
+        model = models.BookwyrmGroup
         fields = ["user", "privacy", "name", "description"]
 
 class ReportForm(CustomForm):
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index a4a06ebad..7ac41f1b9 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -21,7 +21,7 @@ from .relationship import UserFollows, UserFollowRequest, UserBlocks
 from .report import Report, ReportComment
 from .federated_server import FederatedServer
 
-from .group import Group, GroupMember
+from .group import BookwyrmGroup, BookwyrmGroupMember, GroupMemberInvitation
 
 from .import_job import ImportJob, ImportItem
 
diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index ea162b2a4..103764d2d 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -1,14 +1,14 @@
 """ do book related things with other users """
 from django.apps import apps
-from django.db import models
-from django.utils import timezone
-
+from django.db import models, IntegrityError, models, transaction
+from django.db.models import Q
 from bookwyrm.settings import DOMAIN
 from .base_model import BookWyrmModel
 from . import fields
+from .relationship import UserBlocks
+# from .user import User
 
-
-class Group(BookWyrmModel):
+class BookwyrmGroup(BookWyrmModel):
     """A group of users"""
 
     name = fields.CharField(max_length=100)
@@ -16,27 +16,138 @@ class Group(BookWyrmModel):
         "User", on_delete=models.PROTECT)
     description = fields.TextField(blank=True, null=True)
     privacy = fields.PrivacyField()
-    members = models.ManyToManyField(
-        "User",
-        symmetrical=False,
-        through="GroupMember",
-        through_fields=("group", "user"),
-        related_name="bookwyrm_groups"
-    )
 
-    def get_remote_id(self):
-        """don't want the user to be in there in this case"""
-        return f"https://{DOMAIN}/group/{self.id}"
-
-class GroupMember(models.Model):
+class BookwyrmGroupMember(models.Model):
     """Users who are members of a group"""
-
-    group = models.ForeignKey("Group", on_delete=models.CASCADE)
-    user = models.ForeignKey("User", on_delete=models.CASCADE)
+    created_date = models.DateTimeField(auto_now_add=True)
+    updated_date = models.DateTimeField(auto_now=True)
+    group = models.ForeignKey(
+        "BookwyrmGroup", 
+        on_delete=models.CASCADE,
+        related_name="memberships"
+    )
+    user = models.ForeignKey(
+        "User", 
+        on_delete=models.CASCADE,
+        related_name="memberships"
+        )
 
     class Meta:
         constraints = [
           models.UniqueConstraint(
-            fields=["group", "user"], name="unique_member"
+            fields=["group", "user"], name="unique_membership"
           )
-        ]
\ No newline at end of file
+        ]
+
+    def save(self, *args, **kwargs):
+        """don't let a user invite someone who blocked them"""
+        # blocking in either direction is a no-go
+        if UserBlocks.objects.filter(
+            Q(
+                user_subject=self.group.user,
+                user_object=self.user,
+            )
+            | Q(
+                user_subject=self.user,
+                user_object=self.group.user,
+            )
+        ).exists():
+            raise IntegrityError()
+        # accepts and requests are handled by the BookwyrmGroupInvitation model
+        super().save(*args, **kwargs)
+
+    @classmethod
+    def from_request(cls, join_request):
+        """converts a join request into a member relationship"""
+
+        # remove the invite
+        join_request.delete()
+
+        # make a group member
+        return cls.objects.create(
+            user=join_request.user,
+            group=join_request.group,
+        )
+
+
+class GroupMemberInvitation(models.Model):
+    """adding a user to a group requires manual confirmation"""
+    created_date = models.DateTimeField(auto_now_add=True)
+    group = models.ForeignKey(
+        "BookwyrmGroup", 
+        on_delete=models.CASCADE,
+        related_name="user_invitations"
+    )
+    user = models.ForeignKey(
+        "User", 
+        on_delete=models.CASCADE,
+        related_name="group_invitations"
+        )
+
+    class Meta:
+        constraints = [
+          models.UniqueConstraint(
+            fields=["group", "user"], name="unique_invitation"
+          )
+        ]
+    def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
+        """make sure the membership doesn't already exist"""
+        # if there's an invitation for a membership that already exists, accept it
+        # without changing the local database state
+        if BookwyrmGroupMember.objects.filter(
+            user=self.user,
+            group=self.group
+        ).exists():
+            self.accept()
+            return
+
+        # blocking in either direction is a no-go
+        if UserBlocks.objects.filter(
+            Q(
+                user_subject=self.group.user,
+                user_object=self.user,
+            )
+            | Q(
+                user_subject=self.user,
+                user_object=self.group.user,
+            )
+        ).exists():
+            raise IntegrityError()
+
+        # make an invitation
+        super().save(*args, **kwargs)
+
+        # now send the invite
+        model = apps.get_model("bookwyrm.Notification", require_ready=True)
+        notification_type = "INVITE"
+        model.objects.create(
+            user=self.user,
+            related_user=self.group.user,
+            related_group=self.group,
+            notification_type=notification_type,
+        )
+
+    def accept(self):
+        """turn this request into the real deal"""
+
+        with transaction.atomic():
+            BookwyrmGroupMember.from_request(self)
+            self.delete()
+
+            # let the other members know about it
+            model = apps.get_model("bookwyrm.Notification", require_ready=True)
+            for member in self.group.members.all:
+                if member != self.user:
+                    model.objects.create(
+                        user=member,
+                        related_user=self.user,
+                        related_group=self.group,
+                        notification_type="ACCEPT",
+                    )
+
+    def reject(self):
+        """generate a Reject for this membership request"""
+
+        self.delete()
+
+        # TODO: send notification
\ No newline at end of file
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 7ea33a8b6..498026326 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -35,7 +35,7 @@ class List(OrderedCollectionMixin, BookWyrmModel):
         max_length=255, default="closed", choices=CurationType.choices
     )
     group = models.ForeignKey(
-        "Group",
+        "BookwyrmGroup",
         on_delete=models.PROTECT,
         default=None,
         blank=True,
@@ -101,6 +101,9 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
                 notification_type="ADD",
             )
 
+        # TODO: send a notification to all team members except the one who added the book
+        # for team curated lists
+
     class Meta:
         """A book may only be placed into a list once,
         and each order in the list may be used only once"""
diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index a4968f61f..3632fa10f 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -7,7 +7,7 @@ from . import Boost, Favorite, ImportJob, Report, Status, User
 
 NotificationType = models.TextChoices(
     "NotificationType",
-    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD REPORT",
+    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD REPORT INVITE ACCEPT",
 )
 
 
@@ -19,6 +19,12 @@ class Notification(BookWyrmModel):
     related_user = models.ForeignKey(
         "User", on_delete=models.CASCADE, null=True, related_name="related_user"
     )
+    related_group_member = models.ForeignKey(
+        "User", on_delete=models.CASCADE, null=True, related_name="related_group_member"
+    )
+    related_group = models.ForeignKey(
+        "BookwyrmGroup", on_delete=models.CASCADE, null=True, related_name="notifications"
+    )
     related_status = models.ForeignKey("Status", on_delete=models.CASCADE, null=True)
     related_import = models.ForeignKey("ImportJob", on_delete=models.CASCADE, null=True)
     related_list_item = models.ForeignKey(
@@ -37,6 +43,8 @@ class Notification(BookWyrmModel):
             user=self.user,
             related_book=self.related_book,
             related_user=self.related_user,
+            related_group_member=self.related_group_member,
+            related_group=self.related_group,
             related_status=self.related_status,
             related_import=self.related_import,
             related_list_item=self.related_list_item,
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 637baa6ee..0e1397949 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -143,6 +143,11 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     property_fields = [("following_link", "following")]
     field_tracker = FieldTracker(fields=["name", "avatar"])
 
+    # @property
+    # def bookwyrm_groups(self):
+    #     group_ids = bookwyrm_group_membership.values_list("user", flat=True)
+    #     return BookwyrmGroup.objects.in_bulk(group_ids).values()
+
     @property
     def confirmation_link(self):
         """helper for generating confirmation links"""
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 30ffc8689..05f8ceffe 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -253,10 +253,13 @@ urlpatterns = [
     re_path(r"^hide-suggestions/?$", views.hide_suggestions, name="hide-suggestions"),
     # groups
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
-    re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
+    re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.BookwyrmGroup.as_view(), name="group"),
     re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindUsers.as_view(), name="group-find-users"),
-    re_path(r"^add-group-member/?$", views.add_member, name="add-group-member"),
-    re_path(r"^remove-group-member/?$", views.remove_member, name="remove-group-member"),
+    re_path(r"^add-group-member/?$", views.invite_member, name="invite-group-member"),
+    re_path(r"^add-group-member/?$", views.uninvite_member, name="uninvite-group-member"),
+    re_path(r"^add-group-member/?$", views.uninvite_member, name="uninvite-group-member"),
+    re_path(r"^accept-group-invitation/?$", views.accept_membership, name="accept-group-invitation"),
+    re_path(r"^reject-group-invitation/?$", views.reject_membership, name="reject-group-invitation"),
     # lists
     re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 4d93c5973..fb9e72bc2 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import Group, UserGroups, FindUsers, add_member, remove_member
+from .group import BookwyrmGroup, UserGroups, FindUsers, invite_member, remove_member, uninvite_member, accept_membership, reject_membership
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 3e1785cce..09bb0dcad 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -18,13 +18,13 @@ from .helpers import privacy_filter
 from .helpers import get_user_from_username
 from bookwyrm.settings import DOMAIN
 
-class Group(View):
+class BookwyrmGroup(View):
     """group page"""
 
     def get(self, request, group_id):
         """display a group"""
 
-        group = get_object_or_404(models.Group, id=group_id)
+        group = get_object_or_404(models.BookwyrmGroup, id=group_id)
         lists = models.List.objects.filter(group=group).order_by("-updated_date")
         lists = privacy_filter(request.user, lists)
 
@@ -43,7 +43,7 @@ class Group(View):
     @method_decorator(login_required, name="dispatch")
     def post(self, request, group_id):
         """edit a group"""
-        user_group = get_object_or_404(models.Group, id=group_id)
+        user_group = get_object_or_404(models.BookwyrmGroup, id=group_id)
         form = forms.GroupForm(request.POST, instance=user_group)
         if not form.is_valid():
             return redirect("group", user_group.id)
@@ -57,11 +57,12 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        groups = models.Group.objects.filter(members=user).order_by("-updated_date")
-        # groups = privacy_filter(request.user, groups)
+        groups = user.bookwyrmgroup_set.all() # follow the relationship backwards, nice
         paginated = Paginator(groups, 12)
 
         data = {
+            "groups": paginated.get_page(request.GET.get("page")),
+            "is_self": request.user.id == user.id,
             "user": user,
             "group_form": forms.GroupForm(),
             "path": user.local_path + "/group",
@@ -77,7 +78,7 @@ class UserGroups(View):
             return redirect(request.user.local_path + "groups")
         group = form.save()
         # add the creator as a group member
-        models.GroupMember.objects.create(group=group, user=request.user)
+        models.BookwyrmGroupMember.objects.create(group=group, user=request.user)
         return redirect("group", group.id)
 
 @method_decorator(login_required, name="dispatch")
@@ -109,21 +110,22 @@ class FindUsers(View):
                 request.user
             )
 
-        group = get_object_or_404(models.Group, id=group_id)
+        group = get_object_or_404(models.BookwyrmGroup, id=group_id)
 
-        data["suggested_users"] = user_results
-        data["group"] = group
-        data["query"] = query
-        data["requestor_is_manager"] = request.user == group.user
+        data = {
+          "suggested_users": user_results,
+          "group": group,
+          "query": query,
+          "requestor_is_manager": request.user == group.user
+        }
         return TemplateResponse(request, "groups/find_users.html", data)
 
 @require_POST
 @login_required
-def add_member(request):
-    """add a member to the group"""
+def invite_member(request):
+    """invite a member to the group"""
 
-    # TODO: if groups become AP values we need something like get_group_from_group_fullname
-    group = get_object_or_404(models.Group, id=request.POST.get("group"))
+    group = get_object_or_404(models.BookwyrmGroup, id=request.POST.get("group"))
     if not group:
         return HttpResponseBadRequest()
 
@@ -135,28 +137,42 @@ def add_member(request):
         return HttpResponseBadRequest()
 
     try:
-        models.GroupMember.objects.create(
-          group=group,
-          user=user
-        )
+        models.GroupMemberInvitation.objects.create(
+          user=user, 
+          group=group
+          )
 
     except IntegrityError:
         pass
 
-# TODO: actually this needs to be associated with the user ACCEPTING AN INVITE!!! DOH!
+    return redirect(user.local_path)
 
-    """create a notification too"""
-    # notify all team members when a user is added to the group
-    model = apps.get_model("bookwyrm.Notification", require_ready=True)
-    for team_member in group.members.all():
-        if team_member.local and team_member != request.user:
-            model.objects.create(
-                user=team_member,
-                related_user=request.user,
-                related_group_member=user,
-                related_group=group,
-                notification_type="ADD",
-            )
+@require_POST
+@login_required
+def uninvite_member(request):
+    """invite a member to the group"""
+
+    group = get_object_or_404(models.BookwyrmGroup, id=request.POST.get("group"))
+    if not group:
+        return HttpResponseBadRequest()
+
+    user = get_user_from_username(request.user, request.POST["user"])
+    if not user:
+        return HttpResponseBadRequest()
+
+    if not group.user == request.user:
+        return HttpResponseBadRequest()
+
+    try:
+        invitation = models.GroupMemberInvitation.objects.get(
+          user=user, 
+          group=group
+          )
+
+        invitation.reject()
+
+    except IntegrityError:
+        pass
 
     return redirect(user.local_path)
 
@@ -168,10 +184,11 @@ def remove_member(request):
     # TODO: send notification to user telling them they have been removed
     # TODO: remove yourself from a group!!!! (except owner)
     # FUTURE TODO: transfer ownership of group
+    # THIS LOGIC SHOULD BE IN MODEL
 
     # TODO: if groups become AP values we need something like get_group_from_group_fullname
     # group = get_object_or_404(models.Group, id=request.POST.get("group")) # NOTE: does this not work?
-    group = models.Group.objects.get(id=request.POST["group"])
+    group = models.BookwyrmGroup.objects.get(id=request.POST["group"])
     if not group:
         return HttpResponseBadRequest()
 
@@ -183,11 +200,52 @@ def remove_member(request):
         return HttpResponseBadRequest()
 
     try:
-        membership = models.GroupMember.objects.get(group=group,user=user)
+        membership = models.BookwyrmGroupMember.objects.get(group=group,user=user) # BUG: wrong
         membership.delete()
 
     except IntegrityError:
-        print("no integrity")
         pass
 
-    return redirect(user.local_path)
\ No newline at end of file
+    return redirect(user.local_path)
+
+@require_POST
+@login_required
+def accept_membership(request):
+    """accept an invitation to join a group"""
+
+    group = models.BookwyrmGroup.objects.get(id=request.POST["group"])
+    if not group:
+        return HttpResponseBadRequest()
+
+    invite = models.GroupMemberInvitation.objects.get(group=group,user=request.user)
+    if not invite:
+        return HttpResponseBadRequest()
+
+    try:
+        invite.accept()
+
+    except IntegrityError:
+        pass
+
+    return redirect(request.user.local_path)
+
+@require_POST
+@login_required
+def reject_membership(request):
+    """reject an invitation to join a group"""
+
+    group = models.BookwyrmGroup.objects.get(id=request.POST["group"])
+    if not group:
+        return HttpResponseBadRequest()
+
+    invite = models.GroupMemberInvitation.objects.get(group=group,user=request.user)
+    if not invite:
+        return HttpResponseBadRequest()
+
+    try:
+        invite.reject()
+
+    except IntegrityError:
+        pass
+
+    return redirect(request.user.local_path)
\ No newline at end of file
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index d3f52e729..562c49335 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -1,5 +1,4 @@
 """ non-interactive pages """
-from bookwyrm.models.group import GroupMember
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.shortcuts import redirect
@@ -83,7 +82,6 @@ class User(View):
         data = {
             "user": user,
             "is_self": is_self,
-            "has_groups": models.GroupMember.objects.filter(user=user).exists(),
             "shelves": shelf_preview,
             "shelf_count": shelves.count(),
             "activities": paginated.get_page(request.GET.get("page", 1)),
@@ -142,7 +140,7 @@ class Groups(View):
         user = get_user_from_username(request.user, username)
 
         paginated = Paginator(
-            GroupMember.objects.filter(user=user)
+            models.BookwyrmGroup.memberships.filter(user=user)
         )
         data = {
             "user": user,

From 0f3be40957e65e956b16dedb5c30c13942badb78 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 10:47:42 +1000
Subject: [PATCH 044/193] fix group references in templates

Let's do this the sensible way huh, by using backwards references to memberships etc

Also adds filters for is_member and is_invited so we don't have to do weird things in group Views
---
 bookwyrm/templates/groups/group.html          |  2 +-
 bookwyrm/templates/groups/members.html        |  6 ++++--
 .../templates/groups/suggested_users.html     |  2 +-
 bookwyrm/templates/groups/user_groups.html    |  2 +-
 .../snippets/add_to_group_button.html         | 20 ++++++++-----------
 bookwyrm/templates/user/groups.html           |  2 +-
 bookwyrm/templates/user/user.html             |  3 ---
 bookwyrm/templatetags/bookwyrm_group_tags.py  | 19 ++++++++++++++++++
 8 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 bookwyrm/templatetags/bookwyrm_group_tags.py

diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 9617e1332..1ea8f00dd 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -11,7 +11,7 @@
         {% block searchresults %}
         {% endblock %}
 
-        {% include "groups/members.html" %}
+        {% include "groups/members.html"  with group=group %}
 
         <h2 class="title is-5">Lists</h2>
         {% if not lists %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index a64d840e1..a08e73b92 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -7,7 +7,8 @@
 <p class="subtitle is-6">{% trans "Members can add and remove books on your group's book lists" %}</p>
 
 <div class="column is-flex is-flex-grow-0">
-  {% for member in group.members.all %}
+  {% for membership in group.memberships.all %}
+  {% with member=membership.user %}
   <div class="box has-text-centered is-shadowless has-background-white-bis my-0 mx-2">
       <a href="{{ member.local_path }}" class="has-text-black">
           {% include 'snippets/avatar.html' with user=member large=True %}
@@ -19,7 +20,7 @@
         <span class="is-sr-only">Manager</span>
       </span>
       {% endif %}
-      {% include 'snippets/add_to_group_button.html' with user=member minimal=True %}
+      {% include 'snippets/add_to_group_button.html' with user=member group=group minimal=True %}
       {% if member.mutuals %}
       <p class="help">
           {% blocktrans trimmed with mutuals=member.mutuals|intcomma count counter=member.mutuals %}
@@ -41,5 +42,6 @@
       </p>
       {% endif %}
     </div>
+    {% endwith %}
     {% endfor %}
   </div>
\ No newline at end of file
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 91b3784de..6323ffbe1 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -12,7 +12,7 @@
                 <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
                 <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
             </a>
-            {% include 'snippets/add_to_group_button.html' with user=user minimal=True %}
+            {% include 'snippets/add_to_group_button.html' with user=user group=group minimal=True %}
             {% if user.mutuals %}
             <p class="help">
                 {% blocktrans trimmed with mutuals=user.mutuals|intcomma count counter=user.mutuals %}
diff --git a/bookwyrm/templates/groups/user_groups.html b/bookwyrm/templates/groups/user_groups.html
index 6b4cef1be..f99abc695 100644
--- a/bookwyrm/templates/groups/user_groups.html
+++ b/bookwyrm/templates/groups/user_groups.html
@@ -3,7 +3,7 @@
 {% load interaction %}
 
 <div class="columns is-multiline">
-    {% for group in user.bookwyrm_groups.all %}
+    {% for group in groups %}
     <div class="column is-one-quarter">
         <div class="card is-stretchable">
             <header class="card-header">
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index fe1403c48..7febe2b17 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load bookwyrm_group_tags %}
 {% if request.user == user or not request.user == group.user or not request.user.is_authenticated %}
 {% elif user in request.user.blocks.all %}
 {% include 'snippets/block_button.html' with blocks=True %}
@@ -6,30 +7,30 @@
 
 <div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
     <div class="control">
-        <form action="{% url 'add-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if user in group.members.all %}is-hidden{%endif %}" data-id="add_{{ user.id }}">
+        <form action="{% url 'invite-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if group|is_member:user or group|is_invited:user %}is-hidden{%endif %}" data-id="add_{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
             {% if user.local %}
             <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">
                 {% if show_username %}
-                {% blocktrans with username=user.localname %}Add @{{ username }}{% endblocktrans %}
+                {% blocktrans with username=user.localname %}Invite @{{ username }}{% endblocktrans %}
                 {% else %}
-                {% trans "Add" %}
+                {% trans "Invite" %}
                 {% endif %}
             </button>
             {% else %}
-            <!-- TODO: This is an incredibly ugly hack until group are AP enabled -->
+            <!-- TODO: This is an incredibly ugly hack until groups are AP enabled -->
             <span><em>Remote User</em></span>
             {% endif %}
         </form>
-        <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if user not in group.members.all %}is-hidden{%endif %}" data-id="add_{{ user.id }}">
+        <form action="{% url 'uninvite-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if not group|is_member:user or not group|is_invited:user %}is-hidden{% endif %}" data-id="add_{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
-            {% if user.manually_approves_followers and request.user not in user.followers.all %}
+            {% if group|is_invited:user %}
             <button class="button is-small is-danger is-light" type="submit">
-                {% trans "Undo follow request" %}
+                {% trans "Undo Invitation" %}
             </button>
             {% else %}
             <button class="button is-small is-danger is-light" type="submit">
@@ -42,10 +43,5 @@
             {% endif %}
         </form>
     </div>
-    {% if not minimal %}
-    <div class="control">
-        {% include 'snippets/user_options.html' with user=user class="is-small" %}
-    </div>
-    {% endif %}
 </div>
 {% endif %}
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index 36736e013..2735a5b8e 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -24,7 +24,7 @@
 
 {% block panel %}
 <section class="block">
-    <form name="create-group" method="post" action="{% url 'user-groups' 'empty_arg' %}" class="box is-hidden" id="create_group">
+    <form name="create-group" method="post" action="{% url 'user-groups' request.user.name %}" class="box is-hidden" id="create_group">
         <header class="columns">
             <h3 class="title column">{% trans "Create group" %}</h3>
             <div class="column is-narrow">
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 676161d8e..f360a30af 100755
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -22,9 +22,6 @@
 
 {% block panel %}
 {% if user.bookwyrm_user %}
-{% for group in user.bookwyrm_groups.all %}
-<div>{{ group.name }}</div>
-{% endfor %}
 <div class="block">
     <h2 class="title">
         {% include 'user/shelf/books_header.html' %}
diff --git a/bookwyrm/templatetags/bookwyrm_group_tags.py b/bookwyrm/templatetags/bookwyrm_group_tags.py
new file mode 100644
index 000000000..2af15f061
--- /dev/null
+++ b/bookwyrm/templatetags/bookwyrm_group_tags.py
@@ -0,0 +1,19 @@
+""" template filters """
+from django import template
+
+from bookwyrm import models
+
+register = template.Library()
+
+
+@register.filter(name="is_member")
+def is_member(group, user):
+    """whether or not the user is a member of this group"""
+
+    return models.BookwyrmGroupMember.objects.filter(group=group,user=user).exists()
+
+@register.filter(name="is_invited")
+def is_invited(group, user):
+    """whether or not the user has a pending invitation to join this group"""
+
+    return models.GroupMemberInvitation.objects.filter(group=group,user=user).exists()
\ No newline at end of file

From 80fb37b55cec79b06e3fae6415463919ab47a514 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 12:12:59 +1000
Subject: [PATCH 045/193] add has_groups tag for use on user page

---
 bookwyrm/templatetags/bookwyrm_group_tags.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bookwyrm/templatetags/bookwyrm_group_tags.py b/bookwyrm/templatetags/bookwyrm_group_tags.py
index 2af15f061..81c4a4b94 100644
--- a/bookwyrm/templatetags/bookwyrm_group_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_group_tags.py
@@ -6,6 +6,12 @@ from bookwyrm import models
 register = template.Library()
 
 
+@register.filter(name="has_groups")
+def has_groups(user):
+    """whether or not the user has a pending invitation to join this group"""
+
+    return models.BookwyrmGroupMember.objects.filter(user=user).exists()
+
 @register.filter(name="is_member")
 def is_member(group, user):
     """whether or not the user is a member of this group"""

From 92906551168eedc3234741016b2493c0510744fb Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 12:13:34 +1000
Subject: [PATCH 046/193] fix urls for group invitations

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

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 05f8ceffe..3e1d35266 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -256,8 +256,7 @@ urlpatterns = [
     re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.BookwyrmGroup.as_view(), name="group"),
     re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindUsers.as_view(), name="group-find-users"),
     re_path(r"^add-group-member/?$", views.invite_member, name="invite-group-member"),
-    re_path(r"^add-group-member/?$", views.uninvite_member, name="uninvite-group-member"),
-    re_path(r"^add-group-member/?$", views.uninvite_member, name="uninvite-group-member"),
+    re_path(r"^remove-group-member/?$", views.remove_member, name="remove-group-member"),
     re_path(r"^accept-group-invitation/?$", views.accept_membership, name="accept-group-invitation"),
     re_path(r"^reject-group-invitation/?$", views.reject_membership, name="reject-group-invitation"),
     # lists

From 89dea4461407758e8d0a96a9b8d88a5ab22d955f Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 12:29:01 +1000
Subject: [PATCH 047/193] accepting membership fixes

- don't delete the invitation twice
- send membership information properly to notification
---
 bookwyrm/models/group.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 103764d2d..fdba04ea5 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -132,11 +132,11 @@ class GroupMemberInvitation(models.Model):
 
         with transaction.atomic():
             BookwyrmGroupMember.from_request(self)
-            self.delete()
 
             # let the other members know about it
             model = apps.get_model("bookwyrm.Notification", require_ready=True)
-            for member in self.group.members.all:
+            for membership in self.group.memberships.all():
+                member = membership.user 
                 if member != self.user:
                     model.objects.create(
                         user=member,

From 0984972b0509530c1ecf6887b3484c256862f64c Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 12:30:48 +1000
Subject: [PATCH 048/193] group membership invitations

- fix display of group information on user and group pages
- send, receive, accept and reject invitations
---
 bookwyrm/templates/groups/members.html        |  1 +
 .../templates/groups/suggested_users.html     |  2 +-
 bookwyrm/templates/groups/user_groups.html    |  4 +-
 bookwyrm/templates/notifications.html         | 13 +++-
 .../snippets/add_to_group_button.html         | 16 ++---
 .../snippets/join_invitation_buttons.html     | 16 +++++
 bookwyrm/templates/user/groups.html           |  6 +-
 bookwyrm/templates/user/layout.html           |  3 +-
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/group.py                       | 68 +++++++------------
 10 files changed, 72 insertions(+), 59 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/join_invitation_buttons.html

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index a08e73b92..3ee27db61 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -20,6 +20,7 @@
         <span class="is-sr-only">Manager</span>
       </span>
       {% endif %}
+      <!-- TODO: change this to a remove_from_group button -->
       {% include 'snippets/add_to_group_button.html' with user=member group=group minimal=True %}
       {% if member.mutuals %}
       <p class="help">
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 6323ffbe1..ce5eab6d8 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -37,7 +37,7 @@
     </div>
     {% endfor %}
     {% else %}
-    No users found for {{ query }}
+    No potential members found for "{{ query }}"
 {% endif %}
 </div>
 
diff --git a/bookwyrm/templates/groups/user_groups.html b/bookwyrm/templates/groups/user_groups.html
index f99abc695..ef69a5a4d 100644
--- a/bookwyrm/templates/groups/user_groups.html
+++ b/bookwyrm/templates/groups/user_groups.html
@@ -3,7 +3,8 @@
 {% load interaction %}
 
 <div class="columns is-multiline">
-    {% for group in groups %}
+    {% for membership in memberships %}
+    {% with group=membership.group %}
     <div class="column is-one-quarter">
         <div class="card is-stretchable">
             <header class="card-header">
@@ -31,5 +32,6 @@
             </div>
         </div>
     </div>
+    {% endwith %}
     {% endfor %}
 </div>
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index ae5cd67b1..8dba38c6e 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -42,7 +42,7 @@
                 <span class="icon icon-comment"></span>
                 {% elif notification.notification_type == 'REPLY' %}
                 <span class="icon icon-comments"></span>
-                {% elif notification.notification_type == 'FOLLOW' or notification.notification_type == 'FOLLOW_REQUEST' %}
+                {% elif notification.notification_type == 'FOLLOW' or notification.notification_type == 'FOLLOW_REQUEST' or notification.notification_type == 'INVITE' or notification.notification_type == 'ACCEPT' %}
                 <span class="icon icon-local"></span>
                 {% elif notification.notification_type == 'BOOST' %}
                 <span class="icon icon-boost"></span>
@@ -122,6 +122,17 @@
                                 {% else %}
                                 {% blocktrans with book_path=notification.related_list_item.book.local_path book_title=notification.related_list_item.book.title list_path=notification.related_list_item.book_list.local_path list_name=notification.related_list_item.book_list.name %} suggested adding <em><a href="{{ book_path }}">{{ book_title }}</a></em> to your list "<a href="{{ list_path }}/curate">{{ list_name }}</a>"{% endblocktrans %}
                                 {% endif %}
+                            {% elif notification.notification_type == 'INVITE' %}
+                                {% if notification.related_group %}
+                                {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} invited you to join the group <a href="{{ group_path }}">{{ group_name }}</a> {% endblocktrans %}
+                                <div class="row shrink">
+                                    {% include 'snippets/join_invitation_buttons.html' with group=notification.related_group %}
+                                </div>
+                                {% endif %}
+                            {% elif notification.notification_type == 'ACCEPT' %}
+                                {% if notification.related_group %}
+                                {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} accepted an invitation to join your group "<a href="{{ group_path }}">{{ group_name }}</a>"{% endblocktrans %}
+                                {% endif %}
                             {% endif %}
                         {% elif notification.related_import %}
                         {% url 'import-status' notification.related_import.id as url %}
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index 7febe2b17..dd3b93c3c 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -24,22 +24,22 @@
             <span><em>Remote User</em></span>
             {% endif %}
         </form>
-        <form action="{% url 'uninvite-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if not group|is_member:user or not group|is_invited:user %}is-hidden{% endif %}" data-id="add_{{ user.id }}">
+        <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if not group|is_member:user and not group|is_invited:user %}is-hidden{% endif %}" data-id="add_{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
-            {% if group|is_invited:user %}
+            {% if not group|is_member:user %}
             <button class="button is-small is-danger is-light" type="submit">
                 {% trans "Undo Invitation" %}
             </button>
             {% else %}
             <button class="button is-small is-danger is-light" type="submit">
-                {% if show_username %}
-                {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
-                {% else %}
-                {% trans "Remove" %}
-                {% endif %}
-            </button>
+              {% if show_username %}
+              {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
+              {% else %}
+              {% trans "Remove" %}
+              {% endif %}
+          </button>
             {% endif %}
         </form>
     </div>
diff --git a/bookwyrm/templates/snippets/join_invitation_buttons.html b/bookwyrm/templates/snippets/join_invitation_buttons.html
new file mode 100644
index 000000000..46c4071d4
--- /dev/null
+++ b/bookwyrm/templates/snippets/join_invitation_buttons.html
@@ -0,0 +1,16 @@
+{% load i18n %}
+{% load bookwyrm_group_tags %}
+{% if group|is_invited:request.user %}
+<div class="field is-grouped">
+    <form action="/accept-group-invitation/" method="POST">
+        {% csrf_token %}
+        <input type="hidden" name="group" value="{{ group.id }}">
+        <button class="button is-link is-small" type="submit">{% trans "Accept" %}</button>
+    </form>
+    <form action="/reject-group-invitation/" method="POST">
+        {% csrf_token %}
+        <input type="hidden" name="group" value="{{ group.id }}">
+        <button class="button is-danger is-light is-small" type="submit" class="warning">{% trans "Delete" %}</button>
+    </form>
+</div>
+{% endif %}
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index 2735a5b8e..9c91fb186 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -24,7 +24,7 @@
 
 {% block panel %}
 <section class="block">
-    <form name="create-group" method="post" action="{% url 'user-groups' request.user.name %}" class="box is-hidden" id="create_group">
+    <form name="create-group" method="post" action="{% url 'user-groups' request.user.username %}" class="box is-hidden" id="create_group">
         <header class="columns">
             <h3 class="title column">{% trans "Create group" %}</h3>
             <div class="column is-narrow">
@@ -34,9 +34,9 @@
         {% include 'groups/form.html' %}
     </form>
 
-    {% include 'groups/user_groups.html' %}
+    {% include 'groups/user_groups.html' with memberships=memberships %}
 </section>
 <div>
-    {% include 'snippets/pagination.html' with page=user_groups path=path %}
+    {% include 'snippets/pagination.html' with page=user.memberships path=path %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index a1a5289d5..c4ef2d8e5 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -4,6 +4,7 @@
 {% load utilities %}
 {% load markdown %}
 {% load layout %}
+{% load bookwyrm_group_tags %}
 
 {% block title %}{{ user.display_name }}{% endblock %}
 
@@ -75,7 +76,7 @@
             <a href="{{ url }}">{% trans "Lists" %}</a>
         </li>
         {% endif %}
-        {% if is_self or user.bookwyrm_groups %}
+        {% if is_self or user|has_groups %}
         {% url 'user-groups' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
             <a href="{{ url }}">{% trans "Groups" %}</a>
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index fb9e72bc2..930fdfcd9 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import BookwyrmGroup, UserGroups, FindUsers, invite_member, remove_member, uninvite_member, accept_membership, reject_membership
+from .group import BookwyrmGroup, UserGroups, FindUsers, invite_member, remove_member,  accept_membership, reject_membership
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 09bb0dcad..60ca8d21f 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -57,11 +57,11 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        groups = user.bookwyrmgroup_set.all() # follow the relationship backwards, nice
-        paginated = Paginator(groups, 12)
+        memberships = models.BookwyrmGroupMember.objects.filter(user=user).all()
+        paginated = Paginator(memberships, 12)
 
         data = {
-            "groups": paginated.get_page(request.GET.get("page")),
+            "memberships": paginated.get_page(request.GET.get("page")),
             "is_self": request.user.id == user.id,
             "user": user,
             "group_form": forms.GroupForm(),
@@ -89,8 +89,10 @@ class FindUsers(View):
     def get(self, request, group_id):
         """basic profile info"""
         query = request.GET.get("query")
+        group = models.BookwyrmGroup.objects.get(id=group_id)
         user_results = (
             models.User.viewer_aware_objects(request.user)
+            .exclude(memberships__in=group.memberships.all()) # don't suggest users who are already members
             .annotate(
                 similarity=Greatest(
                     TrigramSimilarity("username", query),
@@ -149,7 +151,7 @@ def invite_member(request):
 
 @require_POST
 @login_required
-def uninvite_member(request):
+def remove_member(request):
     """invite a member to the group"""
 
     group = get_object_or_404(models.BookwyrmGroup, id=request.POST.get("group"))
@@ -160,51 +162,31 @@ def uninvite_member(request):
     if not user:
         return HttpResponseBadRequest()
 
-    if not group.user == request.user:
-        return HttpResponseBadRequest()
+    is_member = models.BookwyrmGroupMember.objects.filter(group=group,user=user).exists()
+    is_invited = models.GroupMemberInvitation.objects.filter(group=group,user=user).exists()
 
-    try:
-        invitation = models.GroupMemberInvitation.objects.get(
-          user=user, 
-          group=group
-          )
+    if is_invited:
+        try:
+            invitation = models.GroupMemberInvitation.objects.get(
+              user=user, 
+              group=group
+              )
 
-        invitation.reject()
+            invitation.reject()
 
-    except IntegrityError:
-        pass
+        except IntegrityError:
+            pass
 
-    return redirect(user.local_path)
+    if is_member:
 
-@require_POST
-@login_required
-def remove_member(request):
-    """remove a member from the group"""
+        try:
+            membership = models.BookwyrmGroupMember.objects.get(group=group,user=user)
+            membership.delete()
 
-    # TODO: send notification to user telling them they have been removed
-    # TODO: remove yourself from a group!!!! (except owner)
-    # FUTURE TODO: transfer ownership of group
-    # THIS LOGIC SHOULD BE IN MODEL
+        except IntegrityError:
+            pass
 
-    # TODO: if groups become AP values we need something like get_group_from_group_fullname
-    # group = get_object_or_404(models.Group, id=request.POST.get("group")) # NOTE: does this not work?
-    group = models.BookwyrmGroup.objects.get(id=request.POST["group"])
-    if not group:
-        return HttpResponseBadRequest()
-
-    user = get_user_from_username(request.user, request.POST["user"])
-    if not user:
-        return HttpResponseBadRequest()
-
-    if not group.user == request.user:
-        return HttpResponseBadRequest()
-
-    try:
-        membership = models.BookwyrmGroupMember.objects.get(group=group,user=user) # BUG: wrong
-        membership.delete()
-
-    except IntegrityError:
-        pass
+        # TODO: should send notification to all members including the now ex-member that they have been removed.
 
     return redirect(user.local_path)
 
@@ -227,7 +209,7 @@ def accept_membership(request):
     except IntegrityError:
         pass
 
-    return redirect(request.user.local_path)
+    return redirect(group.local_path)
 
 @require_POST
 @login_required

From 5237e88abab9cce0f0120cfb3d67ebbb29c5ff30 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 13:48:53 +1000
Subject: [PATCH 049/193] remove user button for groups

---
 bookwyrm/templates/groups/members.html        | 20 ++--------------
 .../snippets/remove_from_group_button.html    | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/remove_from_group_button.html

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 3ee27db61..bd91b418c 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -20,24 +20,8 @@
         <span class="is-sr-only">Manager</span>
       </span>
       {% endif %}
-      <!-- TODO: change this to a remove_from_group button -->
-      {% include 'snippets/add_to_group_button.html' with user=member group=group minimal=True %}
-      {% if member.mutuals %}
-      <p class="help">
-          {% blocktrans trimmed with mutuals=member.mutuals|intcomma count counter=member.mutuals %}
-          {{ mutuals }} follower you follow
-          {% plural %}
-          {{ mutuals }} followers you follow{% endblocktrans %}
-      </p>
-      {% elif member.shared_books %}
-      <p class="help">
-          {% blocktrans trimmed with shared_books=member.shared_books|intcomma count counter=member.shared_books %}
-          {{ shared_books }} book on your shelves
-          {% plural %}
-          {{ shared_books }} books on your shelves
-          {% endblocktrans %}
-      </p>
-      {% elif request.user in member.following.all %}
+      {% include 'snippets/remove_from_group_button.html' with user=member group=group minimal=True %}
+      {% if request.user in member.following.all %}
       <p class="help">
           {% trans "Follows you" %}
       </p>
diff --git a/bookwyrm/templates/snippets/remove_from_group_button.html b/bookwyrm/templates/snippets/remove_from_group_button.html
new file mode 100644
index 000000000..938f48b25
--- /dev/null
+++ b/bookwyrm/templates/snippets/remove_from_group_button.html
@@ -0,0 +1,23 @@
+{% load i18n %}
+{% load bookwyrm_group_tags %}
+{% if request.user == user or not request.user == group.user or not request.user.is_authenticated %}
+{% elif user in request.user.blocks.all %}
+{% include 'snippets/block_button.html' with blocks=True %}
+{% else %}
+<div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
+    <div class="control">
+        <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }}" data-id="add_{{ user.id }}">
+            {% csrf_token %}
+            <input type="hidden" name="group" value="{{ group.id }}">
+            <input type="hidden" name="user" value="{{ user.username }}">
+            <button class="button is-small is-danger is-light" type="submit">
+              {% if show_username %}
+              {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
+              {% else %}
+              {% trans "Remove" %}
+              {% endif %}
+          </button>
+        </form>
+    </div>
+</div>
+{% endif %}

From 70e0128052944f03fdd5d718ef0d39dc71fbab11 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 14:41:23 +1000
Subject: [PATCH 050/193] non-owners can't add users to groups

- hide add-user pages from non-owners
- hide user searchbox from non-owners
- fix find-user searchbox being in wrong place where no results
---
 bookwyrm/templates/groups/group.html          |  2 ++
 .../templates/groups/suggested_users.html     |  7 +++----
 bookwyrm/views/group.py                       | 19 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 1ea8f00dd..4d1cdf79c 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -61,6 +61,7 @@
         {% include "snippets/pagination.html" with page=items %}
     </section>
 
+    {% if group.user == request.user %}
     <section class="column is-one-quarter">
       <div class="block">
           <h2 class="title is-5">Find new members</h2>
@@ -78,6 +79,7 @@
           </form>
       </div>
     </section>
+    {% endif %}
 
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index ce5eab6d8..75dfe491c 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -3,7 +3,6 @@
 {% load humanize %}
 
 {% if suggested_users %}
-<div class="columns is-mobile scroll-x mb-0">
     {% for user in suggested_users %}
     <div class="column is-flex is-flex-grow-0">
         <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
@@ -37,7 +36,7 @@
     </div>
     {% endfor %}
     {% else %}
-    No potential members found for "{{ query }}"
+    <div >
+      No potential members found for "{{ query }}"
+    </div>
 {% endif %}
-</div>
-
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 60ca8d21f..5ae2cecdb 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -114,6 +114,12 @@ class FindUsers(View):
 
         group = get_object_or_404(models.BookwyrmGroup, id=group_id)
 
+        if not group:
+            return HttpResponseBadRequest()
+
+        if not group.user == request.user:
+            return HttpResponseBadRequest()
+
         data = {
           "suggested_users": user_results,
           "group": group,
@@ -186,7 +192,18 @@ def remove_member(request):
         except IntegrityError:
             pass
 
-        # TODO: should send notification to all members including the now ex-member that they have been removed.
+        # let the other members know about it
+        model = apps.get_model("bookwyrm.Notification", require_ready=True)
+        memberships = models.BookwyrmGroupMember.objects.get(group=group)
+        for membership in memberships:
+            member = membership.user 
+            if member != request.user:
+                model.objects.create(
+                    user=member,
+                    related_user=request.user,
+                    related_group=request.group,
+                    notification_type="REMOVE",
+                )
 
     return redirect(user.local_path)
 

From f82af6382fb998f64ad319da90afd3db8e4d4be2 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 15:48:34 +1000
Subject: [PATCH 051/193] make message about group members more generic

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

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index bd91b418c..52d27f120 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -4,7 +4,7 @@
 {% load bookwyrm_tags %}
 
 <h2 class="title is-5">Group Members</h2>
-<p class="subtitle is-6">{% trans "Members can add and remove books on your group's book lists" %}</p>
+<p class="subtitle is-6">{% trans "Members can add and remove books on a group's book lists" %}</p>
 
 <div class="column is-flex is-flex-grow-0">
   {% for membership in group.memberships.all %}

From 21e6ed7388db16113b49807ab41bd04df913fe1f Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 15:48:55 +1000
Subject: [PATCH 052/193] complete group notifications

- notify group members when a new member accepts an invitation
- notify all group members when a member leaves or is removed
- notify ex-member when they are removed
---
 bookwyrm/models/group.py              | 16 +++++++++++-----
 bookwyrm/models/notification.py       |  2 +-
 bookwyrm/templates/notifications.html | 20 ++++++++++++++++++--
 bookwyrm/views/group.py               | 21 +++++++++++++++------
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index fdba04ea5..dbded1154 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -133,21 +133,27 @@ class GroupMemberInvitation(models.Model):
         with transaction.atomic():
             BookwyrmGroupMember.from_request(self)
 
-            # let the other members know about it
             model = apps.get_model("bookwyrm.Notification", require_ready=True)
+            # tell the group owner 
+            model.objects.create(
+                user=self.group.user,
+                related_user=self.user,
+                related_group=self.group,
+                notification_type="ACCEPT",
+            )
+
+            # let the other members know about it
             for membership in self.group.memberships.all():
                 member = membership.user 
-                if member != self.user:
+                if member != self.user and member != self.group.user:
                     model.objects.create(
                         user=member,
                         related_user=self.user,
                         related_group=self.group,
-                        notification_type="ACCEPT",
+                        notification_type="JOIN",
                     )
 
     def reject(self):
         """generate a Reject for this membership request"""
 
         self.delete()
-
-        # TODO: send notification
\ No newline at end of file
diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index 3632fa10f..a2ddb8747 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -7,7 +7,7 @@ from . import Boost, Favorite, ImportJob, Report, Status, User
 
 NotificationType = models.TextChoices(
     "NotificationType",
-    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD REPORT INVITE ACCEPT",
+    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD REPORT INVITE ACCEPT JOIN LEAVE REMOVE",
 )
 
 
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 8dba38c6e..8c076ccbd 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -42,7 +42,7 @@
                 <span class="icon icon-comment"></span>
                 {% elif notification.notification_type == 'REPLY' %}
                 <span class="icon icon-comments"></span>
-                {% elif notification.notification_type == 'FOLLOW' or notification.notification_type == 'FOLLOW_REQUEST' or notification.notification_type == 'INVITE' or notification.notification_type == 'ACCEPT' %}
+                {% elif notification.notification_type == 'FOLLOW' or notification.notification_type == 'FOLLOW_REQUEST' or notification.notification_type == 'INVITE' or notification.notification_type == 'ACCEPT' or notification.notification_type == 'JOIN' or notification.notification_type == 'LEAVE' or notification.notification_type == 'REMOVE'%}
                 <span class="icon icon-local"></span>
                 {% elif notification.notification_type == 'BOOST' %}
                 <span class="icon icon-boost"></span>
@@ -131,9 +131,25 @@
                                 {% endif %}
                             {% elif notification.notification_type == 'ACCEPT' %}
                                 {% if notification.related_group %}
-                                {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} accepted an invitation to join your group "<a href="{{ group_path }}">{{ group_name }}</a>"{% endblocktrans %}
+                                {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} accepted your invitation to join group "<a href="{{ group_path }}">{{ group_name }}</a>"{% endblocktrans %}
+                                {% endif %}
+                            {% elif notification.notification_type == 'JOIN' %}
+                                {% if notification.related_group %}
+                                {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} has joined your group "<a href="{{ group_path }}">{{ group_name }}</a>"{% endblocktrans %}
+                                {% endif %}
+                            {% elif notification.notification_type == 'LEAVE' %}
+                                {% if notification.related_group %}
+                                {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} has left your group "<a href="{{ group_path }}">{{ group_name }}</a>"{% endblocktrans %}
+                                {% endif %}
+                            {% elif notification.notification_type == 'REMOVE' %}
+                                {% if notification.related_group %}
+                                {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a>"{% endblocktrans %}
                                 {% endif %}
                             {% endif %}
+                        {% elif notification.notification_type == 'REMOVE' and notification.related_group %}
+                            {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+                            You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a> group"
+                            {% endblocktrans %}
                         {% elif notification.related_import %}
                         {% url 'import-status' notification.related_import.id as url %}
                         {% blocktrans %}Your <a href="{{ url }}">import</a> completed.{% endblocktrans %}
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 5ae2cecdb..b8c45a4da 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -158,7 +158,7 @@ def invite_member(request):
 @require_POST
 @login_required
 def remove_member(request):
-    """invite a member to the group"""
+    """remove a member from the group"""
 
     group = get_object_or_404(models.BookwyrmGroup, id=request.POST.get("group"))
     if not group:
@@ -192,19 +192,28 @@ def remove_member(request):
         except IntegrityError:
             pass
 
-        # let the other members know about it
+        memberships = models.BookwyrmGroupMember.objects.filter(group=group)
         model = apps.get_model("bookwyrm.Notification", require_ready=True)
-        memberships = models.BookwyrmGroupMember.objects.get(group=group)
+        notification_type = "LEAVE" if "self_removal" in request.POST and request.POST["self_removal"] else "REMOVE"
+        # let the other members know about it
         for membership in memberships:
             member = membership.user 
             if member != request.user:
                 model.objects.create(
                     user=member,
-                    related_user=request.user,
-                    related_group=request.group,
-                    notification_type="REMOVE",
+                    related_user=user,
+                    related_group=group,
+                    notification_type=notification_type,
                 )
 
+        # let the user (now ex-member) know as well, if they were removed
+        if notification_type == "REMOVE":
+            model.objects.create(
+                user=user,
+                related_group=group,
+                notification_type=notification_type,
+            )
+
     return redirect(user.local_path)
 
 @require_POST

From 52a083a9070142e980bd8cbd48d7e4370d9a002e Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 16:52:34 +1000
Subject: [PATCH 053/193] revert name change for Group, GroupMember

these were named as BookwyrmGroup and BookwyrmGroupMember due to a misunderstanding about related_name and a dodgy development environment. This naming makes more sense.
---
 bookwyrm/forms.py                             |  2 +-
 bookwyrm/models/__init__.py                   |  2 +-
 bookwyrm/models/group.py                      | 14 +++++-----
 bookwyrm/models/list.py                       |  2 +-
 bookwyrm/models/notification.py               |  2 +-
 bookwyrm/models/user.py                       |  5 ----
 .../templates/groups/suggested_users.html     |  2 +-
 bookwyrm/templatetags/bookwyrm_group_tags.py  |  4 +--
 bookwyrm/urls.py                              |  2 +-
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/group.py                       | 28 +++++++++----------
 bookwyrm/views/user.py                        |  2 +-
 12 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 290e01877..ffb7581e5 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -297,7 +297,7 @@ class ListForm(CustomForm):
 
 class GroupForm(CustomForm):
     class Meta:
-        model = models.BookwyrmGroup
+        model = models.Group
         fields = ["user", "privacy", "name", "description"]
 
 class ReportForm(CustomForm):
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 7ac41f1b9..c5ea44e0a 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -21,7 +21,7 @@ from .relationship import UserFollows, UserFollowRequest, UserBlocks
 from .report import Report, ReportComment
 from .federated_server import FederatedServer
 
-from .group import BookwyrmGroup, BookwyrmGroupMember, GroupMemberInvitation
+from .group import Group, GroupMember, GroupMemberInvitation
 
 from .import_job import ImportJob, ImportItem
 
diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index dbded1154..2d60ae2de 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -8,7 +8,7 @@ from . import fields
 from .relationship import UserBlocks
 # from .user import User
 
-class BookwyrmGroup(BookWyrmModel):
+class Group(BookWyrmModel):
     """A group of users"""
 
     name = fields.CharField(max_length=100)
@@ -17,12 +17,12 @@ class BookwyrmGroup(BookWyrmModel):
     description = fields.TextField(blank=True, null=True)
     privacy = fields.PrivacyField()
 
-class BookwyrmGroupMember(models.Model):
+class GroupMember(models.Model):
     """Users who are members of a group"""
     created_date = models.DateTimeField(auto_now_add=True)
     updated_date = models.DateTimeField(auto_now=True)
     group = models.ForeignKey(
-        "BookwyrmGroup", 
+        "Group", 
         on_delete=models.CASCADE,
         related_name="memberships"
     )
@@ -53,7 +53,7 @@ class BookwyrmGroupMember(models.Model):
             )
         ).exists():
             raise IntegrityError()
-        # accepts and requests are handled by the BookwyrmGroupInvitation model
+        # accepts and requests are handled by the GroupInvitation model
         super().save(*args, **kwargs)
 
     @classmethod
@@ -74,7 +74,7 @@ class GroupMemberInvitation(models.Model):
     """adding a user to a group requires manual confirmation"""
     created_date = models.DateTimeField(auto_now_add=True)
     group = models.ForeignKey(
-        "BookwyrmGroup", 
+        "Group", 
         on_delete=models.CASCADE,
         related_name="user_invitations"
     )
@@ -94,7 +94,7 @@ class GroupMemberInvitation(models.Model):
         """make sure the membership doesn't already exist"""
         # if there's an invitation for a membership that already exists, accept it
         # without changing the local database state
-        if BookwyrmGroupMember.objects.filter(
+        if GroupMember.objects.filter(
             user=self.user,
             group=self.group
         ).exists():
@@ -131,7 +131,7 @@ class GroupMemberInvitation(models.Model):
         """turn this request into the real deal"""
 
         with transaction.atomic():
-            BookwyrmGroupMember.from_request(self)
+            GroupMember.from_request(self)
 
             model = apps.get_model("bookwyrm.Notification", require_ready=True)
             # tell the group owner 
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 498026326..43f5265d0 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -35,7 +35,7 @@ class List(OrderedCollectionMixin, BookWyrmModel):
         max_length=255, default="closed", choices=CurationType.choices
     )
     group = models.ForeignKey(
-        "BookwyrmGroup",
+        "Group",
         on_delete=models.PROTECT,
         default=None,
         blank=True,
diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index a2ddb8747..0cae7790c 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -23,7 +23,7 @@ class Notification(BookWyrmModel):
         "User", on_delete=models.CASCADE, null=True, related_name="related_group_member"
     )
     related_group = models.ForeignKey(
-        "BookwyrmGroup", on_delete=models.CASCADE, null=True, related_name="notifications"
+        "Group", on_delete=models.CASCADE, null=True, related_name="notifications"
     )
     related_status = models.ForeignKey("Status", on_delete=models.CASCADE, null=True)
     related_import = models.ForeignKey("ImportJob", on_delete=models.CASCADE, null=True)
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 0e1397949..637baa6ee 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -143,11 +143,6 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     property_fields = [("following_link", "following")]
     field_tracker = FieldTracker(fields=["name", "avatar"])
 
-    # @property
-    # def bookwyrm_groups(self):
-    #     group_ids = bookwyrm_group_membership.values_list("user", flat=True)
-    #     return BookwyrmGroup.objects.in_bulk(group_ids).values()
-
     @property
     def confirmation_link(self):
         """helper for generating confirmation links"""
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 75dfe491c..54ec861db 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -37,6 +37,6 @@
     {% endfor %}
     {% else %}
     <div >
-      No potential members found for "{{ query }}"
+      <p>No potential members found for "{{ query }}"</p>
     </div>
 {% endif %}
diff --git a/bookwyrm/templatetags/bookwyrm_group_tags.py b/bookwyrm/templatetags/bookwyrm_group_tags.py
index 81c4a4b94..eabca2b41 100644
--- a/bookwyrm/templatetags/bookwyrm_group_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_group_tags.py
@@ -10,13 +10,13 @@ register = template.Library()
 def has_groups(user):
     """whether or not the user has a pending invitation to join this group"""
 
-    return models.BookwyrmGroupMember.objects.filter(user=user).exists()
+    return models.GroupMember.objects.filter(user=user).exists()
 
 @register.filter(name="is_member")
 def is_member(group, user):
     """whether or not the user is a member of this group"""
 
-    return models.BookwyrmGroupMember.objects.filter(group=group,user=user).exists()
+    return models.GroupMember.objects.filter(group=group,user=user).exists()
 
 @register.filter(name="is_invited")
 def is_invited(group, user):
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3e1d35266..834f95be9 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -253,7 +253,7 @@ urlpatterns = [
     re_path(r"^hide-suggestions/?$", views.hide_suggestions, name="hide-suggestions"),
     # groups
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
-    re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.BookwyrmGroup.as_view(), name="group"),
+    re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
     re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindUsers.as_view(), name="group-find-users"),
     re_path(r"^add-group-member/?$", views.invite_member, name="invite-group-member"),
     re_path(r"^remove-group-member/?$", views.remove_member, name="remove-group-member"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 930fdfcd9..4bdfb6ed6 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import BookwyrmGroup, UserGroups, FindUsers, invite_member, remove_member,  accept_membership, reject_membership
+from .group import Group, UserGroups, FindUsers, invite_member, remove_member,  accept_membership, reject_membership
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index b8c45a4da..373811655 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -18,13 +18,13 @@ from .helpers import privacy_filter
 from .helpers import get_user_from_username
 from bookwyrm.settings import DOMAIN
 
-class BookwyrmGroup(View):
+class Group(View):
     """group page"""
 
     def get(self, request, group_id):
         """display a group"""
 
-        group = get_object_or_404(models.BookwyrmGroup, id=group_id)
+        group = get_object_or_404(models.Group, id=group_id)
         lists = models.List.objects.filter(group=group).order_by("-updated_date")
         lists = privacy_filter(request.user, lists)
 
@@ -43,7 +43,7 @@ class BookwyrmGroup(View):
     @method_decorator(login_required, name="dispatch")
     def post(self, request, group_id):
         """edit a group"""
-        user_group = get_object_or_404(models.BookwyrmGroup, id=group_id)
+        user_group = get_object_or_404(models.Group, id=group_id)
         form = forms.GroupForm(request.POST, instance=user_group)
         if not form.is_valid():
             return redirect("group", user_group.id)
@@ -57,7 +57,7 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        memberships = models.BookwyrmGroupMember.objects.filter(user=user).all()
+        memberships = models.GroupMember.objects.filter(user=user).all()
         paginated = Paginator(memberships, 12)
 
         data = {
@@ -78,7 +78,7 @@ class UserGroups(View):
             return redirect(request.user.local_path + "groups")
         group = form.save()
         # add the creator as a group member
-        models.BookwyrmGroupMember.objects.create(group=group, user=request.user)
+        models.GroupMember.objects.create(group=group, user=request.user)
         return redirect("group", group.id)
 
 @method_decorator(login_required, name="dispatch")
@@ -89,7 +89,7 @@ class FindUsers(View):
     def get(self, request, group_id):
         """basic profile info"""
         query = request.GET.get("query")
-        group = models.BookwyrmGroup.objects.get(id=group_id)
+        group = models.Group.objects.get(id=group_id)
         user_results = (
             models.User.viewer_aware_objects(request.user)
             .exclude(memberships__in=group.memberships.all()) # don't suggest users who are already members
@@ -112,7 +112,7 @@ class FindUsers(View):
                 request.user
             )
 
-        group = get_object_or_404(models.BookwyrmGroup, id=group_id)
+        group = get_object_or_404(models.Group, id=group_id)
 
         if not group:
             return HttpResponseBadRequest()
@@ -133,7 +133,7 @@ class FindUsers(View):
 def invite_member(request):
     """invite a member to the group"""
 
-    group = get_object_or_404(models.BookwyrmGroup, id=request.POST.get("group"))
+    group = get_object_or_404(models.Group, id=request.POST.get("group"))
     if not group:
         return HttpResponseBadRequest()
 
@@ -160,7 +160,7 @@ def invite_member(request):
 def remove_member(request):
     """remove a member from the group"""
 
-    group = get_object_or_404(models.BookwyrmGroup, id=request.POST.get("group"))
+    group = get_object_or_404(models.Group, id=request.POST.get("group"))
     if not group:
         return HttpResponseBadRequest()
 
@@ -168,7 +168,7 @@ def remove_member(request):
     if not user:
         return HttpResponseBadRequest()
 
-    is_member = models.BookwyrmGroupMember.objects.filter(group=group,user=user).exists()
+    is_member = models.GroupMember.objects.filter(group=group,user=user).exists()
     is_invited = models.GroupMemberInvitation.objects.filter(group=group,user=user).exists()
 
     if is_invited:
@@ -186,13 +186,13 @@ def remove_member(request):
     if is_member:
 
         try:
-            membership = models.BookwyrmGroupMember.objects.get(group=group,user=user)
+            membership = models.GroupMember.objects.get(group=group,user=user)
             membership.delete()
 
         except IntegrityError:
             pass
 
-        memberships = models.BookwyrmGroupMember.objects.filter(group=group)
+        memberships = models.GroupMember.objects.filter(group=group)
         model = apps.get_model("bookwyrm.Notification", require_ready=True)
         notification_type = "LEAVE" if "self_removal" in request.POST and request.POST["self_removal"] else "REMOVE"
         # let the other members know about it
@@ -221,7 +221,7 @@ def remove_member(request):
 def accept_membership(request):
     """accept an invitation to join a group"""
 
-    group = models.BookwyrmGroup.objects.get(id=request.POST["group"])
+    group = models.Group.objects.get(id=request.POST["group"])
     if not group:
         return HttpResponseBadRequest()
 
@@ -242,7 +242,7 @@ def accept_membership(request):
 def reject_membership(request):
     """reject an invitation to join a group"""
 
-    group = models.BookwyrmGroup.objects.get(id=request.POST["group"])
+    group = models.Group.objects.get(id=request.POST["group"])
     if not group:
         return HttpResponseBadRequest()
 
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 562c49335..f711a7798 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -140,7 +140,7 @@ class Groups(View):
         user = get_user_from_username(request.user, username)
 
         paginated = Paginator(
-            models.BookwyrmGroup.memberships.filter(user=user)
+            models.Group.memberships.filter(user=user)
         )
         data = {
             "user": user,

From 832a9b9890a69095a7e521d69159c9ab7a4b6224 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 16:54:44 +1000
Subject: [PATCH 054/193] fix group local_path

as per Lists, we need to override get_remote_id to remove the user from the URL
---
 bookwyrm/models/group.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 2d60ae2de..3e76a6b7b 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -17,6 +17,10 @@ class Group(BookWyrmModel):
     description = fields.TextField(blank=True, null=True)
     privacy = fields.PrivacyField()
 
+    def get_remote_id(self):
+        """don't want the user to be in there in this case"""
+        return f"https://{DOMAIN}/group/{self.id}"
+
 class GroupMember(models.Model):
     """Users who are members of a group"""
     created_date = models.DateTimeField(auto_now_add=True)

From 8496f2403258eb13d10894ecfd1d94aa461d3aee Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 18:09:15 +1000
Subject: [PATCH 055/193] fix filters for group members to see and edit group
 lists

---
 bookwyrm/templates/lists/form.html |  6 +++---
 bookwyrm/templates/lists/list.html |  9 +++++----
 bookwyrm/views/list.py             | 19 ++++---------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index a98cae94a..492ccf62a 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -37,14 +37,14 @@
                 <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %} > {% trans "Group" %}
                 <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
                 <fieldset class="{% if list.curation != 'group' %}is-hidden{% endif %}" id="list_group_selector">
-                  {% if user_groups %}
+                  {% if user.memberships %}
                 <label class="label" for="id_group" id="group">{% trans "Select Group" %}</label>
                 <div class="field has-addons">
                     <div class="select control">
                         <select name="group" id="id_group">
                             <option value="" disabled {% if not list.group %} selected{% endif %}>{% trans "Select a list" %}</option>
-                            {% for group in user_groups %}
-                            <option value="{{ group.id }}" {% if list.group.id == group.id %} selected{% endif %}>{{ group.name }}</option>
+                            {% for membership in user.memberships.all %}
+                            <option value="{{ membership.group.id }}" {% if list.group.id == membership.group.id %} selected{% endif %}>{{ membership.group.name }}</option>
                             {% endfor %}
                         </select>
                     </div>
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index ea28bb77f..b1246b943 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,6 +1,7 @@
 {% extends 'lists/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+{% load bookwyrm_group_tags %}
 {% load markdown %}
 
 {% block panel %}
@@ -16,7 +17,7 @@
     <section class="column is-three-quarters">
         {% if request.GET.updated %}
         <div class="notification is-primary">
-            {% if list.curation != "open" and request.user != list.user %}
+            {% if list.curation != "open" and request.user != list.user and not list.group|is_member:request.user %}
             {% trans "You successfully suggested a book for this list!" %}
             {% else %}
             {% trans "You successfully added a book to this list!" %}
@@ -66,7 +67,7 @@
                             <p>{% blocktrans with username=item.user.display_name user_path=item.user.local_path %}Added by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
                             </div>
                         </div>
-                        {% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
+                        {% if list.user == request.user or list.curation == 'open' and item.user == request.user or list.group|is_member:request.user %}
                         <div class="card-footer-item">
                             <form name="set-position" method="post" action="{% url 'list-set-book-position' item.id %}">
                                 <div class="field has-addons mb-0">
@@ -123,7 +124,7 @@
         </form>
     {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}
         <h2 class="title is-5 mt-6">
-            {% if list.curation == 'open' or request.user == list.user or is_group_member %}
+            {% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
                 {% trans "Add Books" %}
             {% else %}
                 {% trans "Suggest Books" %}
@@ -176,7 +177,7 @@
                             {% csrf_token %}
                             <input type="hidden" name="book" value="{{ book.id }}">
                             <input type="hidden" name="list" value="{{ list.id }}">
-                            <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user or is_group_member %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
+                            <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
                         </form>
                     </div>
                 </div>
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 912c3cfdb..53f39b549 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -45,13 +45,9 @@ class Lists(View):
         lists = privacy_filter(
             request.user, lists, privacy_levels=["public", "followers"]
         )
-
-        user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
-
         paginated = Paginator(lists, 12)
         data = {
             "lists": paginated.get_page(request.GET.get("page")),
-            "user_groups": user_groups,
             "list_form": forms.ListForm(),
             "path": "/list",
         }
@@ -96,14 +92,12 @@ class UserLists(View):
         user = get_user_from_username(request.user, username)
         lists = models.List.objects.filter(user=user)
         lists = privacy_filter(request.user, lists)
-        user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
         paginated = Paginator(lists, 12)
 
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
             "lists": paginated.get_page(request.GET.get("page")),
-            "user_groups": user_groups,
             "list_form": forms.ListForm(),
             "path": user.local_path + "/lists",
         }
@@ -176,8 +170,6 @@ class List(View):
                     ).order_by("-updated_date")
                 ][: 5 - len(suggestions)]
 
-        user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
-        is_group_member = book_list.group in user_groups
         page = paginated.get_page(request.GET.get("page"))
         data = {
             "list": book_list,
@@ -191,9 +183,7 @@ class List(View):
             "query": query or "",
             "sort_form": forms.SortListForm(
                 {"direction": direction, "sort_by": sort_by}
-            ),
-            "user_groups": user_groups,
-            "is_group_member": is_group_member
+            )
         }
         return TemplateResponse(request, "lists/list.html", data)
 
@@ -296,8 +286,7 @@ def add_book(request):
     book_list = get_object_or_404(models.List, id=request.POST.get("list"))
     is_group_member = False
     if book_list.curation == "group":
-        user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
-        is_group_member = book_list.group in user_groups
+        is_group_member = models.GroupMember.objects.filter(group=book_list.group, user=request.user).exists()
     if not book_list.visible_to_user(request.user):
         return HttpResponseNotFound()
 
@@ -350,8 +339,8 @@ def remove_book(request, list_id):
     with transaction.atomic():
         book_list = get_object_or_404(models.List, id=list_id)
         item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
-
-        if not book_list.user == request.user and not item.user == request.user:
+        is_group_member = models.GroupMember.objects.filter(group=book_list.group, user=request.user).exists()
+        if not book_list.user == request.user and not item.user == request.user and not is_group_member:
             return HttpResponseNotFound()
 
         deleted_order = item.order

From 8708d71f4bd76454f8358902f0d024126ec4618d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 18:31:56 +1000
Subject: [PATCH 056/193] group members can see lists

- fix visible_to_user for group objects (like lists)
- temporarily disable privacy_filter on group lists
---
 bookwyrm/models/base_model.py | 4 ++--
 bookwyrm/views/group.py       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 1b4bae1a9..50119cc11 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -84,8 +84,8 @@ class BookWyrmModel(models.Model):
         # you can see objects which have a group of which you are a member
         if hasattr(self, "group"):
             if (
-                hasattr(self.group, "members")
-                and viewer in self.group.members.all()
+                hasattr(self.group, "memberships")
+                and self.group.memberships.filter(user=viewer).exists()
             ):
                 return True
 
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 373811655..718aa9eeb 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -26,7 +26,7 @@ class Group(View):
 
         group = get_object_or_404(models.Group, id=group_id)
         lists = models.List.objects.filter(group=group).order_by("-updated_date")
-        lists = privacy_filter(request.user, lists)
+        # lists = privacy_filter(request.user, lists)
 
         # don't show groups to users who shouldn't see them
         if not group.visible_to_user(request.user):

From 2c399fe1aa467c6b46a5c0d143ef317386fdc05e Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 19:35:08 +1000
Subject: [PATCH 057/193] fix suggested members all appearing in a column

---
 bookwyrm/templates/groups/suggested_users.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 54ec861db..a719c5fad 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -3,8 +3,8 @@
 {% load humanize %}
 
 {% if suggested_users %}
-    {% for user in suggested_users %}
     <div class="column is-flex is-flex-grow-0">
+        {% for user in suggested_users %}
         <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
             <a href="{{ user.local_path }}" class="has-text-black">
                 {% include 'snippets/avatar.html' with user=user large=True %}
@@ -33,10 +33,9 @@
             </p>
             {% endif %}
         </div>
+        {% endfor %}
     </div>
-    {% endfor %}
     {% else %}
-    <div >
-      <p>No potential members found for "{{ query }}"</p>
-    </div>
+      <p>No potential members found for "{{ query }}"</p><br/>
+
 {% endif %}

From 29f18ee123c79997834fbf9ada7b6021009b5ce8 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 19:35:57 +1000
Subject: [PATCH 058/193] only suggest local users as potential group members

---
 bookwyrm/suggested_users.py                   | 22 +++++++++++++++++++
 .../snippets/add_to_group_button.html         |  5 -----
 bookwyrm/views/group.py                       |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py
index e8f236324..06ce6db7b 100644
--- a/bookwyrm/suggested_users.py
+++ b/bookwyrm/suggested_users.py
@@ -103,6 +103,28 @@ class SuggestedUsers(RedisStore):
                 break
         return results
 
+    def get_group_suggestions(self, user):
+        """get suggestions for new group members"""
+        values = self.get_store(self.store_id(user), withscores=True)
+        results = []
+        # annotate users with mutuals and shared book counts
+        for user_id, rank in values:
+            counts = self.get_counts_from_rank(rank)
+            try:
+                user = models.User.objects.get(
+                    id=user_id, is_active=True, bookwyrm_user=True
+                )
+            except models.User.DoesNotExist as err:
+                # if this happens, the suggestions are janked way up
+                logger.exception(err)
+                continue
+            user.mutuals = counts["mutuals"]
+            # only suggest local users until Groups are ActivityPub compliant
+            if user.local:
+                results.append(user)
+            if len(results) >= 5:
+                break
+        return results
 
 def get_annotated_users(viewer, *args, **kwargs):
     """Users, annotated with things they have in common"""
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index dd3b93c3c..cf9ae15df 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -11,7 +11,6 @@
             {% csrf_token %}
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
-            {% if user.local %}
             <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">
                 {% if show_username %}
                 {% blocktrans with username=user.localname %}Invite @{{ username }}{% endblocktrans %}
@@ -19,10 +18,6 @@
                 {% trans "Invite" %}
                 {% endif %}
             </button>
-            {% else %}
-            <!-- TODO: This is an incredibly ugly hack until groups are AP enabled -->
-            <span><em>Remote User</em></span>
-            {% endif %}
         </form>
         <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if not group|is_member:user and not group|is_invited:user %}is-hidden{% endif %}" data-id="add_{{ user.id }}">
             {% csrf_token %}
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 718aa9eeb..17db93eda 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -108,7 +108,7 @@ class FindUsers(View):
         data = {"no_results": not user_results}
 
         if user_results.count() < 5:
-            user_results = list(user_results) + suggested_users.get_suggestions(
+            user_results = list(user_results) + suggested_users.get_group_suggestions(
                 request.user
             )
 

From 3a954ca6ae6d7519f4fe3b6e57741ed722a2e482 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 20:05:19 +1000
Subject: [PATCH 059/193] improve responsive layout for groups

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

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 52d27f120..e005aba65 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -6,10 +6,10 @@
 <h2 class="title is-5">Group Members</h2>
 <p class="subtitle is-6">{% trans "Members can add and remove books on a group's book lists" %}</p>
 
-<div class="column is-flex is-flex-grow-0">
+<div class="is-multiline is-flex is-flex-grow-0 is-flex-wrap-wrap">
   {% for membership in group.memberships.all %}
   {% with member=membership.user %}
-  <div class="box has-text-centered is-shadowless has-background-white-bis my-0 mx-2">
+  <div class="box has-text-centered is-shadowless has-background-white-bis my-2 mx-2">
       <a href="{{ member.local_path }}" class="has-text-black">
           {% include 'snippets/avatar.html' with user=member large=True %}
           <span title="{{ member.display_name }}" class="is-block is-6 has-text-weight-bold">{{ member.display_name|truncatechars:10 }}</span>

From 72e00f75c9cc53419f9c1c3c06877f4705da78e7 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 20:14:53 +1000
Subject: [PATCH 060/193] send notification when other group members add books
 to group lists

---
 bookwyrm/models/list.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 43f5265d0..b891a229d 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -91,9 +91,9 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
         self.book_list.save(broadcast=False)
 
         list_owner = self.book_list.user
+        model = apps.get_model("bookwyrm.Notification", require_ready=True)
         # create a notification if somoene ELSE added to a local user's list
         if created and list_owner.local and list_owner != self.user:
-            model = apps.get_model("bookwyrm.Notification", require_ready=True)
             model.objects.create(
                 user=list_owner,
                 related_user=self.user,
@@ -101,9 +101,15 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
                 notification_type="ADD",
             )
 
-        # TODO: send a notification to all team members except the one who added the book
-        # for team curated lists
-
+        if self.book_list.group:
+            for membership in self.book_list.group.memberships.all():
+                if membership.user != self.user:
+                    model.objects.create(
+                        user=membership.user,
+                        related_user=self.user,
+                        related_list_item=self,
+                        notification_type="ADD"
+            )
     class Meta:
         """A book may only be placed into a list once,
         and each order in the list may be used only once"""

From eed9d44cfdbbab0b343b4eb8c1f68c1c56d6bf8c Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 20:52:19 +1000
Subject: [PATCH 061/193] fix visible_to_user for groups user is a member of

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

diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 50119cc11..61652620e 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -78,7 +78,7 @@ class BookWyrmModel(models.Model):
                 return True
 
         # you can see groups of which you are a member
-        if hasattr(self, "members") and viewer in self.members.all():
+        if hasattr(self, "memberships") and self.memberships.filter(user=viewer).exists():
             return True
 
         # you can see objects which have a group of which you are a member

From 680e547c8b2285318cb3875337025741df1ee2e4 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 21:24:26 +1000
Subject: [PATCH 062/193] add button for non-owner members to leave group

---
 bookwyrm/templates/groups/group.html   |  5 +++--
 bookwyrm/templates/groups/members.html | 18 +++++++++++++++++-
 bookwyrm/views/group.py                |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 4d1cdf79c..f19e8ee4f 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -10,8 +10,9 @@
 
         {% block searchresults %}
         {% endblock %}
-
-        {% include "groups/members.html"  with group=group %}
+        <div class="mb-2">
+          {% include "groups/members.html"  with group=group %}
+        </div>
 
         <h2 class="title is-5">Lists</h2>
         {% if not lists %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index e005aba65..8c3dac7b4 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -2,6 +2,7 @@
 {% load utilities %}
 {% load humanize %}
 {% load bookwyrm_tags %}
+{% load bookwyrm_group_tags %}
 
 <h2 class="title is-5">Group Members</h2>
 <p class="subtitle is-6">{% trans "Members can add and remove books on a group's book lists" %}</p>
@@ -29,4 +30,19 @@
     </div>
     {% endwith %}
     {% endfor %}
-  </div>
\ No newline at end of file
+  </div>
+
+{% if group.user != request.user and group|is_member:request.user %}
+<form action="{% url 'remove-group-member' %}" method="POST" class="my-4">
+    {% csrf_token %}
+    <input type="hidden" name="group" value="{{ group.id }}">
+    <input type="hidden" name="user" value="{{ user.username }}">
+    <button class="button is-small is-danger is-light" type="submit">
+      {% if show_username %}
+      {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
+      {% else %}
+      {% trans "Remove self from group" %}
+      {% endif %}
+  </button>
+</form>
+{% endif %}
\ No newline at end of file
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 17db93eda..cb21842b7 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -194,7 +194,7 @@ def remove_member(request):
 
         memberships = models.GroupMember.objects.filter(group=group)
         model = apps.get_model("bookwyrm.Notification", require_ready=True)
-        notification_type = "LEAVE" if "self_removal" in request.POST and request.POST["self_removal"] else "REMOVE"
+        notification_type = "LEAVE" if user == request.user else "REMOVE"
         # let the other members know about it
         for membership in memberships:
             member = membership.user 

From 4ea99d17639e6084e03ecca66c359b1b15427427 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 09:06:06 +1100
Subject: [PATCH 063/193] don't assign a group when creating non-group curated
 lists

same as updating a list but for if a user changes their mind about curation when initially creating a list.
---
 bookwyrm/views/list.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 53f39b549..bed9ee9a4 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -61,6 +61,10 @@ class Lists(View):
         if not form.is_valid():
             return redirect("lists")
         book_list = form.save()
+        # list should not have a group if it is not group curated
+        if not book_list.curation == "group":
+            book_list.group = None
+            book_list.save()
 
         return redirect(book_list.local_path)
 

From a179de33bc135c657e29ae47af9a95a3ff12f31b Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 09:07:42 +1100
Subject: [PATCH 064/193] fix incorrect wording on group selection

select a group, not a list!
---
 bookwyrm/templates/lists/form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index 492ccf62a..9b74655cd 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -42,7 +42,7 @@
                 <div class="field has-addons">
                     <div class="select control">
                         <select name="group" id="id_group">
-                            <option value="" disabled {% if not list.group %} selected{% endif %}>{% trans "Select a list" %}</option>
+                            <option value="" disabled {% if not list.group %} selected{% endif %}>{% trans "Select a group" %}</option>
                             {% for membership in user.memberships.all %}
                             <option value="{{ membership.group.id }}" {% if list.group.id == membership.group.id %} selected{% endif %}>{{ membership.group.name }}</option>
                             {% endfor %}

From 1c5789f283506cbae9602386fb9cf60ac04b8b57 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 09:16:19 +1100
Subject: [PATCH 065/193] remove group-curated lists when user leaves group

---
 bookwyrm/views/group.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index cb21842b7..bdda76feb 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -189,6 +189,9 @@ def remove_member(request):
             membership = models.GroupMember.objects.get(group=group,user=user)
             membership.delete()
 
+            # remove this user's group-curated lists from the group
+            models.List.objects.filter(group=group,user=user).update(group=None,curation="closed")
+
         except IntegrityError:
             pass
 

From f39887cf7ff686db45c9a9d87dd240a7f6965e6d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 10:07:47 +1100
Subject: [PATCH 066/193] groups should appear before lists on user pages

---
 bookwyrm/templates/user/layout.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index c4ef2d8e5..d7557ae7b 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -70,18 +70,18 @@
             <a href="{{ url }}">{% trans "Reading Goal" %}</a>
         </li>
         {% endif %}
-        {% if is_self or user.list_set.exists %}
-        {% url 'user-lists' user|username as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Lists" %}</a>
-        </li>
-        {% endif %}
         {% if is_self or user|has_groups %}
         {% url 'user-groups' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
             <a href="{{ url }}">{% trans "Groups" %}</a>
         </li>
         {% endif %}
+        {% if is_self or user.list_set.exists %}
+        {% url 'user-lists' user|username as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Lists" %}</a>
+        </li>
+        {% endif %}
         {% if user.shelf_set.exists %}
         {% url 'user-shelves' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>

From 77ac8e0c04be0a5cb40fd10d86eb27371a018a99 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 11:45:53 +1100
Subject: [PATCH 067/193] add group membership to raise_not_deletable for lists

---
 bookwyrm/models/list.py | 7 ++++---
 bookwyrm/views/list.py  | 5 -----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index bb2a22d15..c801ec44a 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -101,7 +101,6 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
                 notification_type="ADD",
             )
 
-<<<<<<< HEAD
         if self.book_list.group:
             for membership in self.book_list.group.memberships.all():
                 if membership.user != self.user:
@@ -111,14 +110,16 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
                         related_list_item=self,
                         notification_type="ADD"
             )
-=======
     def raise_not_deletable(self, viewer):
         """the associated user OR the list owner can delete"""
         if self.book_list.user == viewer:
             return
+        # group members can delete items in group lists
+        is_group_member = models.GroupMember.objects.filter(group=self.book_list.group, user=viewer).exists()
+        if is_group_member:
+            return
         super().raise_not_deletable(viewer)
 
->>>>>>> main
     class Meta:
         """A book may only be placed into a list once,
         and each order in the list may be used only once"""
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 8c4bab288..88f4d6d82 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -341,11 +341,6 @@ def remove_book(request, list_id):
     book_list = get_object_or_404(models.List, id=list_id)
     item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
 
-        # TODO: put this logiv into raise_not_deletable
-        # is_group_member = models.GroupMember.objects.filter(group=book_list.group, user=request.user).exists()
-        # if not book_list.user == request.user and not item.user == request.user and not is_group_member:
-        #     return HttpResponseNotFound()
-
     item.raise_not_deletable(request.user)
 
     with transaction.atomic():

From f13223b8cae64dfd182e509a079924c7c1f65001 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 11:46:51 +1100
Subject: [PATCH 068/193] add notifications for groups

Moved into new structure after merge.
---
 bookwyrm/templates/notifications/item.html    | 10 +++++++
 .../templates/notifications/items/accept.html | 20 +++++++++++++
 .../templates/notifications/items/invite.html | 22 ++++++++++++++
 .../templates/notifications/items/join.html   | 23 +++++++++++++++
 .../templates/notifications/items/leave.html  | 20 +++++++++++++
 .../templates/notifications/items/remove.html | 29 +++++++++++++++++++
 6 files changed, 124 insertions(+)
 create mode 100644 bookwyrm/templates/notifications/items/accept.html
 create mode 100644 bookwyrm/templates/notifications/items/invite.html
 create mode 100644 bookwyrm/templates/notifications/items/join.html
 create mode 100644 bookwyrm/templates/notifications/items/leave.html
 create mode 100644 bookwyrm/templates/notifications/items/remove.html

diff --git a/bookwyrm/templates/notifications/item.html b/bookwyrm/templates/notifications/item.html
index 348d8950f..3ed43a96a 100644
--- a/bookwyrm/templates/notifications/item.html
+++ b/bookwyrm/templates/notifications/item.html
@@ -17,4 +17,14 @@
     {% include 'notifications/items/add.html' %}
 {% elif notification.notification_type == 'REPORT' %}
     {% include 'notifications/items/report.html' %}
+{% elif notification.notification_type == 'INVITE' %}
+    {% include 'notifications/items/invite.html' %}
+{% elif notification.notification_type == 'ACCEPT' %}
+    {% include 'notifications/items/accept.html' %}
+{% elif notification.notification_type == 'JOIN' %}
+    {% include 'notifications/items/join.html' %}
+{% elif notification.notification_type == 'LEAVE' %}
+    {% include 'notifications/items/leave.html' %}
+{% elif notification.notification_type == 'REMOVE' %}
+    {% include 'notifications/items/remove.html' %}
 {% endif %}
diff --git a/bookwyrm/templates/notifications/items/accept.html b/bookwyrm/templates/notifications/items/accept.html
new file mode 100644
index 000000000..3ad671201
--- /dev/null
+++ b/bookwyrm/templates/notifications/items/accept.html
@@ -0,0 +1,20 @@
+{% extends 'notifications/items/item_layout.html' %}
+
+{% load i18n %}
+{% load utilities %}
+
+{% block primary_link %}{% spaceless %}
+  {{ notification.related_group.local_path }}
+{% endspaceless %}{% endblock %}
+
+{% block icon %}
+<span class="icon icon-local"></span>
+{% endblock %}
+
+{% block description %}
+
+{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+accepted your invitation to join group "<a href="{{ group_path }}">{{ group_name }}</a>"
+{% endblocktrans %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/bookwyrm/templates/notifications/items/invite.html b/bookwyrm/templates/notifications/items/invite.html
new file mode 100644
index 000000000..c50dba06d
--- /dev/null
+++ b/bookwyrm/templates/notifications/items/invite.html
@@ -0,0 +1,22 @@
+{% extends 'notifications/items/item_layout.html' %}
+
+{% load i18n %}
+{% load utilities %}
+
+{% block primary_link %}{% spaceless %}
+  {{ notification.related_group.local_path }}
+{% endspaceless %}{% endblock %}
+
+{% block icon %}
+<span class="icon icon-local"></span>
+{% endblock %}
+
+{% block description %}
+{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} 
+invited you to join the group <a href="{{ group_path }}">{{ group_name }}</a>
+{% endblocktrans %}
+<div class="row shrink">
+    {% include 'snippets/join_invitation_buttons.html' with group=notification.related_group %}
+</div>
+{% endblock %}
+
diff --git a/bookwyrm/templates/notifications/items/join.html b/bookwyrm/templates/notifications/items/join.html
new file mode 100644
index 000000000..3dbc8159c
--- /dev/null
+++ b/bookwyrm/templates/notifications/items/join.html
@@ -0,0 +1,23 @@
+{% extends 'notifications/items/item_layout.html' %}
+
+{% load i18n %}
+{% load utilities %}
+
+{% block primary_link %}{% spaceless %}
+  {{ notification.related_group.local_path }}
+{% endspaceless %}{% endblock %}
+
+{% block icon %}
+<span class="icon icon-local"></span>
+{% endblock %}
+
+{% block description %}
+
+{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+has joined your group "<a href="{{ group_path }}">{{ group_name }}</a>"
+{% endblocktrans %}
+
+{% endblock %}
+
+
+
diff --git a/bookwyrm/templates/notifications/items/leave.html b/bookwyrm/templates/notifications/items/leave.html
new file mode 100644
index 000000000..a30241c52
--- /dev/null
+++ b/bookwyrm/templates/notifications/items/leave.html
@@ -0,0 +1,20 @@
+{% extends 'notifications/items/item_layout.html' %}
+
+{% load i18n %}
+{% load utilities %}
+
+{% block primary_link %}{% spaceless %}
+  {{ notification.related_group.local_path }}
+{% endspaceless %}{% endblock %}
+
+{% block icon %}
+<span class="icon icon-local"></span>
+{% endblock %}
+
+{% block description %}
+
+{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+has left your group "<a href="{{ group_path }}">{{ group_name }}</a>"
+{% endblocktrans %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/bookwyrm/templates/notifications/items/remove.html b/bookwyrm/templates/notifications/items/remove.html
new file mode 100644
index 000000000..784c0d00c
--- /dev/null
+++ b/bookwyrm/templates/notifications/items/remove.html
@@ -0,0 +1,29 @@
+{% extends 'notifications/items/item_layout.html' %}
+
+{% load i18n %}
+{% load utilities %}
+
+{% block primary_link %}{% spaceless %}
+  {{ notification.related_group.local_path }}
+{% endspaceless %}{% endblock %}
+
+{% block icon %}
+<span class="icon icon-local"></span>
+{% endblock %}
+
+{% block description %}
+{% if notification.related_user %}
+
+{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} 
+has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a>"
+{% endblocktrans %}
+
+{% else %}
+
+{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a> group"
+{% endblocktrans %}
+
+{% endif %}
+{% endblock %}
+

From 1ad8d87434716e0c70a28dacce0a8e3cf00f01aa Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 12:02:57 +1100
Subject: [PATCH 069/193] use raise_visible_to_user in group model

instead of if visible_to_user
---
 bookwyrm/views/group.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index bdda76feb..6a855abb7 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -29,8 +29,7 @@ class Group(View):
         # lists = privacy_filter(request.user, lists)
 
         # don't show groups to users who shouldn't see them
-        if not group.visible_to_user(request.user):
-            return HttpResponseNotFound()
+        group.raise_visible_to_user(request.user)
 
         data = {
             "group": group,

From 7db2af89dd5b6a471d4f938ac9e0b15a9c40c048 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 12:03:37 +1100
Subject: [PATCH 070/193] use group.local_path instead of harcoded url

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

diff --git a/bookwyrm/templates/groups/user_groups.html b/bookwyrm/templates/groups/user_groups.html
index ef69a5a4d..f68994dc1 100644
--- a/bookwyrm/templates/groups/user_groups.html
+++ b/bookwyrm/templates/groups/user_groups.html
@@ -9,7 +9,7 @@
         <div class="card is-stretchable">
             <header class="card-header">
                 <h4 class="card-header-title">
-                    <a href="/group/{{ group.id }}">{{ group.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=group %}</span>
+                    <a href="{{ group.local_path }}">{{ group.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=group %}</span>
                 </h4>
                 {% if group.user == user %}
                 <div class="card-header-icon">

From 603a9dc25cbe77822baf6723e9fd3638381181a0 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 12:22:03 +1100
Subject: [PATCH 071/193] fix group members not being able to delete items on
 group lists

---
 bookwyrm/models/list.py            | 5 +++--
 bookwyrm/templates/lists/list.html | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index c801ec44a..692405647 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -1,4 +1,5 @@
 """ make a list of books!! """
+from bookwyrm.models.group import GroupMember
 from dataclasses import field
 from django.apps import apps
 from django.db import models
@@ -9,7 +10,7 @@ from bookwyrm.settings import DOMAIN
 from .activitypub_mixin import CollectionItemMixin, OrderedCollectionMixin
 from .base_model import BookWyrmModel
 from . import fields
-
+from .group import GroupMember
 
 CurationType = models.TextChoices(
     "Curation",
@@ -115,7 +116,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
         if self.book_list.user == viewer:
             return
         # group members can delete items in group lists
-        is_group_member = models.GroupMember.objects.filter(group=self.book_list.group, user=viewer).exists()
+        is_group_member = GroupMember.objects.filter(group=self.book_list.group, user=viewer).exists()
         if is_group_member:
             return
         super().raise_not_deletable(viewer)
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 9f405b00e..61e31c06e 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -85,7 +85,7 @@
                             </form>
                         </div>
                         {% endif %}
-                        {% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
+                        {% if list.user == request.user or list.curation == 'open' and item.user == request.user or list.group|is_member:request.user %}
                         <form name="remove-book" method="post" action="{% url 'list-remove-book' list.id %}" class="card-footer-item">
                             {% csrf_token %}
                             <input type="hidden" name="item" value="{{ item.id }}">

From c04659984f0803ad39ae0857d059b07a2ac70919 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 13:45:19 +1100
Subject: [PATCH 072/193] fix raise_not_editable for group lists

---
 bookwyrm/models/list.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 692405647..19f9e4f56 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -64,6 +64,16 @@ class List(OrderedCollectionMixin, BookWyrmModel):
 
         ordering = ("-updated_date",)
 
+    def raise_not_editable(self, viewer):
+        """the associated user OR the list owner can edit"""
+        print("raising not editable")
+        if self.user == viewer:
+            return
+        # group members can edit items in group lists
+        is_group_member = GroupMember.objects.filter(group=self.group, user=viewer).exists()
+        if is_group_member:
+            return
+        super().raise_not_editable(viewer)
 
 class ListItem(CollectionItemMixin, BookWyrmModel):
     """ok"""

From 9d8e9786864df23a8ee4f763cad01f987fb58526 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 13:45:41 +1100
Subject: [PATCH 073/193] sort group members in UserGroups view

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

diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 6a855abb7..42ae5a128 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -56,7 +56,7 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        memberships = models.GroupMember.objects.filter(user=user).all()
+        memberships = models.GroupMember.objects.filter(user=user).all().order_by("-updated_date")
         paginated = Paginator(memberships, 12)
 
         data = {

From 0d5c20bcde2ea84e5fbff2b52d0dc20a320015df Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 3 Oct 2021 13:57:21 +1100
Subject: [PATCH 074/193] remove_from_group button updates

- enable blocked users to be removed
- make "remove" button more subtle
---
 bookwyrm/templates/snippets/remove_from_group_button.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/snippets/remove_from_group_button.html b/bookwyrm/templates/snippets/remove_from_group_button.html
index 938f48b25..05b17b594 100644
--- a/bookwyrm/templates/snippets/remove_from_group_button.html
+++ b/bookwyrm/templates/snippets/remove_from_group_button.html
@@ -1,16 +1,18 @@
 {% load i18n %}
 {% load bookwyrm_group_tags %}
 {% if request.user == user or not request.user == group.user or not request.user.is_authenticated %}
-{% elif user in request.user.blocks.all %}
-{% include 'snippets/block_button.html' with blocks=True %}
 {% else %}
+{% if user in request.user.blocks.all %}
+{% include 'snippets/block_button.html' with blocks=True %}
+<br/>
+{% endif %}
 <div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
     <div class="control">
         <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }}" data-id="add_{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
-            <button class="button is-small is-danger is-light" type="submit">
+            <button class="button is-small" type="submit">
               {% if show_username %}
               {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
               {% else %}

From 782512b2ce1ec3544fcbc91377fd29bc6b820b0a Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 4 Oct 2021 21:25:38 +1100
Subject: [PATCH 075/193] replace get_group_suggestions

- adds **filters argument to get_suggestions()
- passes local=True arg to get_suggestions() for group member suggestions
- removes get_group_suggestions()

Thanks to Mouse for the suggestion to keep the codebase DRY!
---
 bookwyrm/suggested_users.py | 31 ++++++-------------------------
 bookwyrm/views/group.py     |  5 +++--
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py
index 06ce6db7b..4b85f1f63 100644
--- a/bookwyrm/suggested_users.py
+++ b/bookwyrm/suggested_users.py
@@ -81,7 +81,7 @@ class SuggestedUsers(RedisStore):
         """take a user out of someone's suggestions"""
         self.bulk_remove_objects_from_store([suggested_user], self.store_id(user))
 
-    def get_suggestions(self, user):
+    def get_suggestions(self, user, **filters):
         """get suggestions"""
         values = self.get_store(self.store_id(user), withscores=True)
         results = []
@@ -97,35 +97,16 @@ class SuggestedUsers(RedisStore):
                 logger.exception(err)
                 continue
             user.mutuals = counts["mutuals"]
-            # user.shared_books = counts["shared_books"]
-            results.append(user)
-            if len(results) >= 5:
-                break
-        return results
-
-    def get_group_suggestions(self, user):
-        """get suggestions for new group members"""
-        values = self.get_store(self.store_id(user), withscores=True)
-        results = []
-        # annotate users with mutuals and shared book counts
-        for user_id, rank in values:
-            counts = self.get_counts_from_rank(rank)
-            try:
-                user = models.User.objects.get(
-                    id=user_id, is_active=True, bookwyrm_user=True
-                )
-            except models.User.DoesNotExist as err:
-                # if this happens, the suggestions are janked way up
-                logger.exception(err)
-                continue
-            user.mutuals = counts["mutuals"]
-            # only suggest local users until Groups are ActivityPub compliant
-            if user.local:
+            if filters.local:
+                if user.local:
+                    results.append(user)
+            else:
                 results.append(user)
             if len(results) >= 5:
                 break
         return results
 
+
 def get_annotated_users(viewer, *args, **kwargs):
     """Users, annotated with things they have in common"""
     return (
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 42ae5a128..c184e4957 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -107,8 +107,9 @@ class FindUsers(View):
         data = {"no_results": not user_results}
 
         if user_results.count() < 5:
-            user_results = list(user_results) + suggested_users.get_group_suggestions(
-                request.user
+            user_results = list(user_results) + suggested_users.get_suggestions(
+                request.user,
+                local=True
             )
 
         group = get_object_or_404(models.Group, id=group_id)

From dafda649f121e3f66c71def111371fd224338b17 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 4 Oct 2021 21:31:28 +1100
Subject: [PATCH 076/193] run Black on changed code

---
 bookwyrm/forms.py                            |  2 +
 bookwyrm/models/base_model.py                |  5 +-
 bookwyrm/models/group.py                     | 46 ++++++--------
 bookwyrm/models/list.py                      | 21 ++++---
 bookwyrm/templatetags/bookwyrm_group_tags.py |  6 +-
 bookwyrm/urls.py                             | 26 ++++++--
 bookwyrm/views/__init__.py                   | 10 ++-
 bookwyrm/views/group.py                      | 66 +++++++++++---------
 bookwyrm/views/list.py                       | 12 +++-
 bookwyrm/views/user.py                       |  6 +-
 10 files changed, 118 insertions(+), 82 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 7ab923fd8..2084b7665 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -294,11 +294,13 @@ class ListForm(CustomForm):
         model = models.List
         fields = ["user", "name", "description", "curation", "privacy", "group"]
 
+
 class GroupForm(CustomForm):
     class Meta:
         model = models.Group
         fields = ["user", "privacy", "name", "description"]
 
+
 class ReportForm(CustomForm):
     class Meta:
         model = models.Report
diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 5921d7731..d52c368ec 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -82,7 +82,10 @@ class BookWyrmModel(models.Model):
                 return True
 
         # you can see groups of which you are a member
-        if hasattr(self, "memberships") and self.memberships.filter(user=viewer).exists():
+        if (
+            hasattr(self, "memberships")
+            and self.memberships.filter(user=viewer).exists()
+        ):
             return True
 
         # you can see objects which have a group of which you are a member
diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 3e76a6b7b..9a5d3a6c1 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -6,14 +6,15 @@ from bookwyrm.settings import DOMAIN
 from .base_model import BookWyrmModel
 from . import fields
 from .relationship import UserBlocks
+
 # from .user import User
 
+
 class Group(BookWyrmModel):
     """A group of users"""
 
     name = fields.CharField(max_length=100)
-    user = fields.ForeignKey(
-        "User", on_delete=models.PROTECT)
+    user = fields.ForeignKey("User", on_delete=models.PROTECT)
     description = fields.TextField(blank=True, null=True)
     privacy = fields.PrivacyField()
 
@@ -21,26 +22,22 @@ class Group(BookWyrmModel):
         """don't want the user to be in there in this case"""
         return f"https://{DOMAIN}/group/{self.id}"
 
+
 class GroupMember(models.Model):
     """Users who are members of a group"""
+
     created_date = models.DateTimeField(auto_now_add=True)
     updated_date = models.DateTimeField(auto_now=True)
     group = models.ForeignKey(
-        "Group", 
-        on_delete=models.CASCADE,
-        related_name="memberships"
+        "Group", on_delete=models.CASCADE, related_name="memberships"
     )
     user = models.ForeignKey(
-        "User", 
-        on_delete=models.CASCADE,
-        related_name="memberships"
-        )
+        "User", on_delete=models.CASCADE, related_name="memberships"
+    )
 
     class Meta:
         constraints = [
-          models.UniqueConstraint(
-            fields=["group", "user"], name="unique_membership"
-          )
+            models.UniqueConstraint(fields=["group", "user"], name="unique_membership")
         ]
 
     def save(self, *args, **kwargs):
@@ -76,32 +73,25 @@ class GroupMember(models.Model):
 
 class GroupMemberInvitation(models.Model):
     """adding a user to a group requires manual confirmation"""
+
     created_date = models.DateTimeField(auto_now_add=True)
     group = models.ForeignKey(
-        "Group", 
-        on_delete=models.CASCADE,
-        related_name="user_invitations"
+        "Group", on_delete=models.CASCADE, related_name="user_invitations"
     )
     user = models.ForeignKey(
-        "User", 
-        on_delete=models.CASCADE,
-        related_name="group_invitations"
-        )
+        "User", on_delete=models.CASCADE, related_name="group_invitations"
+    )
 
     class Meta:
         constraints = [
-          models.UniqueConstraint(
-            fields=["group", "user"], name="unique_invitation"
-          )
+            models.UniqueConstraint(fields=["group", "user"], name="unique_invitation")
         ]
+
     def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
         """make sure the membership doesn't already exist"""
         # if there's an invitation for a membership that already exists, accept it
         # without changing the local database state
-        if GroupMember.objects.filter(
-            user=self.user,
-            group=self.group
-        ).exists():
+        if GroupMember.objects.filter(user=self.user, group=self.group).exists():
             self.accept()
             return
 
@@ -138,7 +128,7 @@ class GroupMemberInvitation(models.Model):
             GroupMember.from_request(self)
 
             model = apps.get_model("bookwyrm.Notification", require_ready=True)
-            # tell the group owner 
+            # tell the group owner
             model.objects.create(
                 user=self.group.user,
                 related_user=self.user,
@@ -148,7 +138,7 @@ class GroupMemberInvitation(models.Model):
 
             # let the other members know about it
             for membership in self.group.memberships.all():
-                member = membership.user 
+                member = membership.user
                 if member != self.user and member != self.group.user:
                     model.objects.create(
                         user=member,
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 19f9e4f56..46d57c2d0 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -14,12 +14,7 @@ from .group import GroupMember
 
 CurationType = models.TextChoices(
     "Curation",
-    [
-        "closed",
-        "open",
-        "curated",
-        "group"
-    ],
+    ["closed", "open", "curated", "group"],
 )
 
 
@@ -70,11 +65,14 @@ class List(OrderedCollectionMixin, BookWyrmModel):
         if self.user == viewer:
             return
         # group members can edit items in group lists
-        is_group_member = GroupMember.objects.filter(group=self.group, user=viewer).exists()
+        is_group_member = GroupMember.objects.filter(
+            group=self.group, user=viewer
+        ).exists()
         if is_group_member:
             return
         super().raise_not_editable(viewer)
 
+
 class ListItem(CollectionItemMixin, BookWyrmModel):
     """ok"""
 
@@ -119,14 +117,17 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
                         user=membership.user,
                         related_user=self.user,
                         related_list_item=self,
-                        notification_type="ADD"
-            )
+                        notification_type="ADD",
+                    )
+
     def raise_not_deletable(self, viewer):
         """the associated user OR the list owner can delete"""
         if self.book_list.user == viewer:
             return
         # group members can delete items in group lists
-        is_group_member = GroupMember.objects.filter(group=self.book_list.group, user=viewer).exists()
+        is_group_member = GroupMember.objects.filter(
+            group=self.book_list.group, user=viewer
+        ).exists()
         if is_group_member:
             return
         super().raise_not_deletable(viewer)
diff --git a/bookwyrm/templatetags/bookwyrm_group_tags.py b/bookwyrm/templatetags/bookwyrm_group_tags.py
index eabca2b41..fde7997e8 100644
--- a/bookwyrm/templatetags/bookwyrm_group_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_group_tags.py
@@ -12,14 +12,16 @@ def has_groups(user):
 
     return models.GroupMember.objects.filter(user=user).exists()
 
+
 @register.filter(name="is_member")
 def is_member(group, user):
     """whether or not the user is a member of this group"""
 
-    return models.GroupMember.objects.filter(group=group,user=user).exists()
+    return models.GroupMember.objects.filter(group=group, user=user).exists()
+
 
 @register.filter(name="is_invited")
 def is_invited(group, user):
     """whether or not the user has a pending invitation to join this group"""
 
-    return models.GroupMemberInvitation.objects.filter(group=group,user=user).exists()
\ No newline at end of file
+    return models.GroupMemberInvitation.objects.filter(group=group, user=user).exists()
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 4aea7907b..49c47ef5a 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -255,12 +255,28 @@ urlpatterns = [
     re_path(r"^hide-suggestions/?$", views.hide_suggestions, name="hide-suggestions"),
     # groups
     re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"),
-    re_path(r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"),
-    re_path(r"^group/(?P<group_id>\d+)/add-users/?$", views.FindUsers.as_view(), name="group-find-users"),
+    re_path(
+        r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"
+    ),
+    re_path(
+        r"^group/(?P<group_id>\d+)/add-users/?$",
+        views.FindUsers.as_view(),
+        name="group-find-users",
+    ),
     re_path(r"^add-group-member/?$", views.invite_member, name="invite-group-member"),
-    re_path(r"^remove-group-member/?$", views.remove_member, name="remove-group-member"),
-    re_path(r"^accept-group-invitation/?$", views.accept_membership, name="accept-group-invitation"),
-    re_path(r"^reject-group-invitation/?$", views.reject_membership, name="reject-group-invitation"),
+    re_path(
+        r"^remove-group-member/?$", views.remove_member, name="remove-group-member"
+    ),
+    re_path(
+        r"^accept-group-invitation/?$",
+        views.accept_membership,
+        name="accept-group-invitation",
+    ),
+    re_path(
+        r"^reject-group-invitation/?$",
+        views.reject_membership,
+        name="reject-group-invitation",
+    ),
     # lists
     re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 9aa88664c..08b846dc8 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -41,7 +41,15 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
-from .group import Group, UserGroups, FindUsers, invite_member, remove_member,  accept_membership, reject_membership
+from .group import (
+    Group,
+    UserGroups,
+    FindUsers,
+    invite_member,
+    remove_member,
+    accept_membership,
+    reject_membership,
+)
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index c184e4957..fc4b64041 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -18,6 +18,7 @@ from .helpers import privacy_filter
 from .helpers import get_user_from_username
 from bookwyrm.settings import DOMAIN
 
+
 class Group(View):
     """group page"""
 
@@ -47,7 +48,8 @@ class Group(View):
         if not form.is_valid():
             return redirect("group", user_group.id)
         user_group = form.save()
-        return redirect("group", user_group.id) 
+        return redirect("group", user_group.id)
+
 
 @method_decorator(login_required, name="dispatch")
 class UserGroups(View):
@@ -56,7 +58,9 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        memberships = models.GroupMember.objects.filter(user=user).all().order_by("-updated_date")
+        memberships = (
+            models.GroupMember.objects.filter(user=user).all().order_by("-updated_date")
+        )
         paginated = Paginator(memberships, 12)
 
         data = {
@@ -80,10 +84,12 @@ class UserGroups(View):
         models.GroupMember.objects.create(group=group, user=request.user)
         return redirect("group", group.id)
 
+
 @method_decorator(login_required, name="dispatch")
 class FindUsers(View):
     """find friends to add to your group"""
-    """this is mostly borrowed from the Get Started friend finder"""
+
+    #this is mostly borrowed from the Get Started friend finder
 
     def get(self, request, group_id):
         """basic profile info"""
@@ -91,25 +97,23 @@ class FindUsers(View):
         group = models.Group.objects.get(id=group_id)
         user_results = (
             models.User.viewer_aware_objects(request.user)
-            .exclude(memberships__in=group.memberships.all()) # don't suggest users who are already members
+            .exclude(
+                memberships__in=group.memberships.all()
+            )  # don't suggest users who are already members
             .annotate(
                 similarity=Greatest(
                     TrigramSimilarity("username", query),
                     TrigramSimilarity("localname", query),
                 )
             )
-            .filter(
-                similarity__gt=0.5,
-                local=True
-            )
+            .filter(similarity__gt=0.5, local=True)
             .order_by("-similarity")[:5]
         )
         data = {"no_results": not user_results}
 
         if user_results.count() < 5:
             user_results = list(user_results) + suggested_users.get_suggestions(
-                request.user,
-                local=True
+                request.user, local=True
             )
 
         group = get_object_or_404(models.Group, id=group_id)
@@ -121,13 +125,14 @@ class FindUsers(View):
             return HttpResponseBadRequest()
 
         data = {
-          "suggested_users": user_results,
-          "group": group,
-          "query": query,
-          "requestor_is_manager": request.user == group.user
+            "suggested_users": user_results,
+            "group": group,
+            "query": query,
+            "requestor_is_manager": request.user == group.user,
         }
         return TemplateResponse(request, "groups/find_users.html", data)
 
+
 @require_POST
 @login_required
 def invite_member(request):
@@ -145,16 +150,14 @@ def invite_member(request):
         return HttpResponseBadRequest()
 
     try:
-        models.GroupMemberInvitation.objects.create(
-          user=user, 
-          group=group
-          )
+        models.GroupMemberInvitation.objects.create(user=user, group=group)
 
     except IntegrityError:
         pass
 
     return redirect(user.local_path)
 
+
 @require_POST
 @login_required
 def remove_member(request):
@@ -168,15 +171,16 @@ def remove_member(request):
     if not user:
         return HttpResponseBadRequest()
 
-    is_member = models.GroupMember.objects.filter(group=group,user=user).exists()
-    is_invited = models.GroupMemberInvitation.objects.filter(group=group,user=user).exists()
+    is_member = models.GroupMember.objects.filter(group=group, user=user).exists()
+    is_invited = models.GroupMemberInvitation.objects.filter(
+        group=group, user=user
+    ).exists()
 
     if is_invited:
         try:
             invitation = models.GroupMemberInvitation.objects.get(
-              user=user, 
-              group=group
-              )
+                user=user, group=group
+            )
 
             invitation.reject()
 
@@ -186,11 +190,13 @@ def remove_member(request):
     if is_member:
 
         try:
-            membership = models.GroupMember.objects.get(group=group,user=user)
+            membership = models.GroupMember.objects.get(group=group, user=user)
             membership.delete()
 
             # remove this user's group-curated lists from the group
-            models.List.objects.filter(group=group,user=user).update(group=None,curation="closed")
+            models.List.objects.filter(group=group, user=user).update(
+                group=None, curation="closed"
+            )
 
         except IntegrityError:
             pass
@@ -200,7 +206,7 @@ def remove_member(request):
         notification_type = "LEAVE" if user == request.user else "REMOVE"
         # let the other members know about it
         for membership in memberships:
-            member = membership.user 
+            member = membership.user
             if member != request.user:
                 model.objects.create(
                     user=member,
@@ -219,6 +225,7 @@ def remove_member(request):
 
     return redirect(user.local_path)
 
+
 @require_POST
 @login_required
 def accept_membership(request):
@@ -228,7 +235,7 @@ def accept_membership(request):
     if not group:
         return HttpResponseBadRequest()
 
-    invite = models.GroupMemberInvitation.objects.get(group=group,user=request.user)
+    invite = models.GroupMemberInvitation.objects.get(group=group, user=request.user)
     if not invite:
         return HttpResponseBadRequest()
 
@@ -240,6 +247,7 @@ def accept_membership(request):
 
     return redirect(group.local_path)
 
+
 @require_POST
 @login_required
 def reject_membership(request):
@@ -249,7 +257,7 @@ def reject_membership(request):
     if not group:
         return HttpResponseBadRequest()
 
-    invite = models.GroupMemberInvitation.objects.get(group=group,user=request.user)
+    invite = models.GroupMemberInvitation.objects.get(group=group, user=request.user)
     if not invite:
         return HttpResponseBadRequest()
 
@@ -259,4 +267,4 @@ def reject_membership(request):
     except IntegrityError:
         pass
 
-    return redirect(request.user.local_path)
\ No newline at end of file
+    return redirect(request.user.local_path)
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 88f4d6d82..a312a755e 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -183,7 +183,7 @@ class List(View):
             "query": query or "",
             "sort_form": forms.SortListForm(
                 {"direction": direction, "sort_by": sort_by}
-            )
+            ),
         }
         return TemplateResponse(request, "lists/list.html", data)
 
@@ -287,14 +287,20 @@ def add_book(request):
     book_list = get_object_or_404(models.List, id=request.POST.get("list"))
     is_group_member = False
     if book_list.curation == "group":
-        is_group_member = models.GroupMember.objects.filter(group=book_list.group, user=request.user).exists()
+        is_group_member = models.GroupMember.objects.filter(
+            group=book_list.group, user=request.user
+        ).exists()
 
     book_list.raise_visible_to_user(request.user)
 
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     # do you have permission to add to the list?
     try:
-        if request.user == book_list.user or is_group_member or book_list.curation == "open":
+        if (
+            request.user == book_list.user
+            or is_group_member
+            or book_list.curation == "open"
+        ):
             # add the book at the latest order of approved books, before pending books
             order_max = (
                 book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index e85ed3158..808ca7385 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -137,6 +137,7 @@ class Following(View):
         }
         return TemplateResponse(request, "user/relationships/following.html", data)
 
+
 class Groups(View):
     """list of user's groups view"""
 
@@ -144,9 +145,7 @@ class Groups(View):
         """list of groups"""
         user = get_user_from_username(request.user, username)
 
-        paginated = Paginator(
-            models.Group.memberships.filter(user=user)
-        )
+        paginated = Paginator(models.Group.memberships.filter(user=user))
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
@@ -154,6 +153,7 @@ class Groups(View):
         }
         return TemplateResponse(request, "user/groups.html", data)
 
+
 @require_POST
 @login_required
 def hide_suggestions(request):

From 57b2c83c6449d869ae10bc13fb8e787d70a0a847 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 4 Oct 2021 21:34:54 +1100
Subject: [PATCH 077/193] disable pylint suppression

I don't know what this does so I removed it - maybe I'll find out!
---
 bookwyrm/models/group.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 9a5d3a6c1..c2dfcb062 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -87,7 +87,7 @@ class GroupMemberInvitation(models.Model):
             models.UniqueConstraint(fields=["group", "user"], name="unique_invitation")
         ]
 
-    def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
+    def save(self, *args, **kwargs):
         """make sure the membership doesn't already exist"""
         # if there's an invitation for a membership that already exists, accept it
         # without changing the local database state

From 05969c5311864e811e3ea2ec5bcc028a4b270c0d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 4 Oct 2021 22:18:51 +1100
Subject: [PATCH 078/193] improve group creation hint

- use help class
- hopefully make the linter happy
---
 bookwyrm/templates/lists/form.html | 39 +++++++++++++++++-------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index 9b74655cd..87bc9b025 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -37,25 +37,30 @@
                 <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %} > {% trans "Group" %}
                 <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
                 <fieldset class="{% if list.curation != 'group' %}is-hidden{% endif %}" id="list_group_selector">
-                  {% if user.memberships %}
-                <label class="label" for="id_group" id="group">{% trans "Select Group" %}</label>
-                <div class="field has-addons">
-                    <div class="select control">
-                        <select name="group" id="id_group">
-                            <option value="" disabled {% if not list.group %} selected{% endif %}>{% trans "Select a group" %}</option>
-                            {% for membership in user.memberships.all %}
-                            <option value="{{ membership.group.id }}" {% if list.group.id == membership.group.id %} selected{% endif %}>{{ membership.group.name }}</option>
-                            {% endfor %}
-                        </select>
+                {% if user.memberships %}
+                    <label class="label" for="id_group" id="group">{% trans "Select Group" %}</label>
+                    <div class="field has-addons">
+                        <div class="select control">
+                            <select name="group" id="id_group">
+                                <option value="" disabled {% if not list.group %} selected{% endif %}>{% trans "Select a group" %}</option>
+                                {% for membership in user.memberships.all %}
+                                <option value="{{ membership.group.id }}" {% if list.group.id == membership.group.id %} selected{% endif %}>{{ membership.group.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
                     </div>
-                </div>
                 {% else %}
-                {% with user|username as username %}
-                {% url 'user-groups' user|username as url %}
-                <div>{% trans "You must create a " %}<a href="{{ url }}">{% trans "Group" %}</a>{% trans " before you can create Group lists!" %}</div>
-                {% endwith %}
-              </fieldset>
-              {% endif %}
+                    {% with user|username as username %}
+                    {% url 'user-groups' user|username as url %}
+                    <div>
+                        <p>{% trans "You don't have any Groups yet!" %}</p>
+                        <p>
+                            <a class="help has-text-weight-normal" href="{{ url }}">{% trans "Create a Group" %}</a>
+                        </p>
+                    </div>
+                    {% endwith %}
+                {% endif %}
+                </fieldset>
             </label>
         </fieldset>
     </div>

From 3a9031112978b7e79eef228deb16d750d2b0ab2f Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 4 Oct 2021 22:20:02 +1100
Subject: [PATCH 079/193] update indenting for linter

---
 bookwyrm/static/js/bookwyrm.js                |  3 +
 .../templates/groups/delete_group_modal.html  | 18 ++---
 bookwyrm/templates/groups/find_users.html     |  8 +-
 bookwyrm/templates/groups/group.html          | 74 +++++++++----------
 bookwyrm/templates/groups/members.html        | 52 ++++++-------
 .../templates/groups/suggested_users.html     |  3 +-
 .../templates/notifications/items/accept.html | 10 +--
 .../templates/notifications/items/leave.html  | 10 +--
 .../templates/notifications/items/remove.html | 10 +--
 .../snippets/add_to_group_button.html         | 14 ++--
 .../snippets/remove_from_group_button.html    | 12 +--
 11 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 049de497c..5bf845a4e 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -133,8 +133,10 @@ let BookWyrm = new class {
     revealForm(event) {
         let trigger = event.currentTarget;
         let hidden = trigger.closest('.hidden-form').querySelectorAll('.is-hidden')[0];
+
         // if the form has already been revealed, there is no '.is-hidden' element
         // so this doesn't really work as a toggle
+
         if (hidden) {
           this.addRemoveClass(hidden, 'is-hidden', !hidden);
         }
@@ -150,6 +152,7 @@ let BookWyrm = new class {
         let trigger = event.currentTarget;
         let targetId = trigger.dataset.hides
         let visible = document.getElementById(targetId)
+
         this.addRemoveClass(visible, 'is-hidden', true);
   }
 
diff --git a/bookwyrm/templates/groups/delete_group_modal.html b/bookwyrm/templates/groups/delete_group_modal.html
index ff6593e50..fd6706157 100644
--- a/bookwyrm/templates/groups/delete_group_modal.html
+++ b/bookwyrm/templates/groups/delete_group_modal.html
@@ -8,14 +8,14 @@
 {% endblock %}
 
 {% block modal-footer %}
-<div >
-    {% csrf_token %}
-    <input type="hidden" name="id" value="{{ group.id }}">
-    <button class="button is-danger" type="submit">
-        {% trans "Delete" %}
-    </button>
-    {% trans "Cancel" as button_text %}
-    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete_list" controls_uid=list.id %}
-  </div>
+    <div>
+        {% csrf_token %}
+        <input type="hidden" name="id" value="{{ group.id }}">
+        <button class="button is-danger" type="submit">
+            {% trans "Delete" %}
+        </button>
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete_list" controls_uid=list.id %}
+    </div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/groups/find_users.html b/bookwyrm/templates/groups/find_users.html
index 99ec67bc4..ec890a93d 100644
--- a/bookwyrm/templates/groups/find_users.html
+++ b/bookwyrm/templates/groups/find_users.html
@@ -1,8 +1,8 @@
 {% extends 'groups/group.html' %}
 
 {% block searchresults %}
-<h2 class="title is-5">
-    Add new members!
-</h2>
-  {% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %}
+    <h2 class="title is-5">
+        Add new members!
+    </h2>
+    {% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %}
 {% endblock %}
\ No newline at end of file
diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index f19e8ee4f..408f1f945 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -11,7 +11,7 @@
         {% block searchresults %}
         {% endblock %}
         <div class="mb-2">
-          {% include "groups/members.html"  with group=group %}
+            {% include "groups/members.html"  with group=group %}
         </div>
 
         <h2 class="title is-5">Lists</h2>
@@ -20,42 +20,42 @@
         {% else %}
 
         <div class="columns is-multiline">
-          {% for list in lists %}
-          <div class="column is-one-third">
-              <div class="card is-stretchable">
-                  <header class="card-header">
-                      <h4 class="card-header-title">
-                          <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>
-                      </h4>
-                  </header>
-      
-                  {% with list_books=list.listitem_set.all|slice:5 %}
-                      {% if list_books %}
-                          <div class="card-image columns is-mobile is-gapless is-clipped">
-                              {% for book in list_books %}
-                                  <a class="column is-cover" href="{{ book.book.local_path }}">
-                                      {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' size='small' aria='show' %}
-                                  </a>
-                              {% endfor %}
-                          </div>
-                      {% endif %}
-                  {% endwith %}
-      
-                  <div class="card-content is-flex-grow-0">
-                      <div class="is-clipped" {% if list.description %}title="{{ list.description }}"{% endif %}>
-                      {% if list.description %}
-                          {{ list.description|to_markdown|safe|truncatechars_html:30 }}
-                      {% else %}
-                      &nbsp;
-                      {% endif %}
-                      </div>
-                      <p class="subtitle help">
-                          {% include 'lists/created_text.html' with list=list %}
-                      </p>
-                  </div>
-              </div>
-          </div>
-          {% endfor %}
+            {% for list in lists %}
+            <div class="column is-one-third">
+                <div class="card is-stretchable">
+                    <header class="card-header">
+                        <h4 class="card-header-title">
+                            <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>
+                        </h4>
+                    </header>
+        
+                    {% with list_books=list.listitem_set.all|slice:5 %}
+                        {% if list_books %}
+                            <div class="card-image columns is-mobile is-gapless is-clipped">
+                                {% for book in list_books %}
+                                    <a class="column is-cover" href="{{ book.book.local_path }}">
+                                        {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' size='small' aria='show' %}
+                                    </a>
+                                {% endfor %}
+                            </div>
+                        {% endif %}
+                    {% endwith %}
+        
+                    <div class="card-content is-flex-grow-0">
+                        <div class="is-clipped" {% if list.description %}title="{{ list.description }}"{% endif %}>
+                        {% if list.description %}
+                            {{ list.description|to_markdown|safe|truncatechars_html:30 }}
+                        {% else %}
+                        &nbsp;
+                        {% endif %}
+                        </div>
+                        <p class="subtitle help">
+                            {% include 'lists/created_text.html' with list=list %}
+                        </p>
+                    </div>
+                </div>
+            </div>
+            {% endfor %}
         </div>
 
         {% endif %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 8c3dac7b4..f8eefaff4 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -8,29 +8,29 @@
 <p class="subtitle is-6">{% trans "Members can add and remove books on a group's book lists" %}</p>
 
 <div class="is-multiline is-flex is-flex-grow-0 is-flex-wrap-wrap">
-  {% for membership in group.memberships.all %}
-  {% with member=membership.user %}
-  <div class="box has-text-centered is-shadowless has-background-white-bis my-2 mx-2">
-      <a href="{{ member.local_path }}" class="has-text-black">
-          {% include 'snippets/avatar.html' with user=member large=True %}
-          <span title="{{ member.display_name }}" class="is-block is-6 has-text-weight-bold">{{ member.display_name|truncatechars:10 }}</span>
-          <span title="@{{ member|username }}" class="is-block pb-3">@{{ member|username|truncatechars:8 }}</span>
-      </a>
-      {% if group.user == member %}
-      <span class="icon icon-star-full" title="Manager">
-        <span class="is-sr-only">Manager</span>
-      </span>
-      {% endif %}
-      {% include 'snippets/remove_from_group_button.html' with user=member group=group minimal=True %}
-      {% if request.user in member.following.all %}
-      <p class="help">
-          {% trans "Follows you" %}
-      </p>
-      {% endif %}
+    {% for membership in group.memberships.all %}
+    {% with member=membership.user %}
+    <div class="box has-text-centered is-shadowless has-background-white-bis my-2 mx-2">
+        <a href="{{ member.local_path }}" class="has-text-black">
+            {% include 'snippets/avatar.html' with user=member large=True %}
+            <span title="{{ member.display_name }}" class="is-block is-6 has-text-weight-bold">{{ member.display_name|truncatechars:10 }}</span>
+            <span title="@{{ member|username }}" class="is-block pb-3">@{{ member|username|truncatechars:8 }}</span>
+        </a>
+        {% if group.user == member %}
+        <span class="icon icon-star-full" title="Manager">
+            <span class="is-sr-only">Manager</span>
+        </span>
+        {% endif %}
+        {% include 'snippets/remove_from_group_button.html' with user=member group=group minimal=True %}
+        {% if request.user in member.following.all %}
+        <p class="help">
+            {% trans "Follows you" %}
+        </p>
+        {% endif %}
     </div>
     {% endwith %}
     {% endfor %}
-  </div>
+</div>
 
 {% if group.user != request.user and group|is_member:request.user %}
 <form action="{% url 'remove-group-member' %}" method="POST" class="my-4">
@@ -38,11 +38,11 @@
     <input type="hidden" name="group" value="{{ group.id }}">
     <input type="hidden" name="user" value="{{ user.username }}">
     <button class="button is-small is-danger is-light" type="submit">
-      {% if show_username %}
-      {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
-      {% else %}
-      {% trans "Remove self from group" %}
-      {% endif %}
-  </button>
+        {% if show_username %}
+        {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
+        {% else %}
+        {% trans "Remove self from group" %}
+        {% endif %}
+    </button>
 </form>
 {% endif %}
\ No newline at end of file
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index a719c5fad..212a1a76e 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -36,6 +36,7 @@
         {% endfor %}
     </div>
     {% else %}
-      <p>No potential members found for "{{ query }}"</p><br/>
+    <p>No potential members found for "{{ query }}"</p>
+    <br/>
 
 {% endif %}
diff --git a/bookwyrm/templates/notifications/items/accept.html b/bookwyrm/templates/notifications/items/accept.html
index 3ad671201..5aab79af0 100644
--- a/bookwyrm/templates/notifications/items/accept.html
+++ b/bookwyrm/templates/notifications/items/accept.html
@@ -4,17 +4,17 @@
 {% load utilities %}
 
 {% block primary_link %}{% spaceless %}
-  {{ notification.related_group.local_path }}
+    {{ notification.related_group.local_path }}
 {% endspaceless %}{% endblock %}
 
 {% block icon %}
-<span class="icon icon-local"></span>
+    <span class="icon icon-local"></span>
 {% endblock %}
 
 {% block description %}
 
-{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
-accepted your invitation to join group "<a href="{{ group_path }}">{{ group_name }}</a>"
-{% endblocktrans %}
+    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    accepted your invitation to join group "<a href="{{ group_path }}">{{ group_name }}</a>"
+    {% endblocktrans %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/bookwyrm/templates/notifications/items/leave.html b/bookwyrm/templates/notifications/items/leave.html
index a30241c52..e6fe72be9 100644
--- a/bookwyrm/templates/notifications/items/leave.html
+++ b/bookwyrm/templates/notifications/items/leave.html
@@ -4,17 +4,17 @@
 {% load utilities %}
 
 {% block primary_link %}{% spaceless %}
-  {{ notification.related_group.local_path }}
+    {{ notification.related_group.local_path }}
 {% endspaceless %}{% endblock %}
 
 {% block icon %}
-<span class="icon icon-local"></span>
+    <span class="icon icon-local"></span>
 {% endblock %}
 
 {% block description %}
 
-{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
-has left your group "<a href="{{ group_path }}">{{ group_name }}</a>"
-{% endblocktrans %}
+    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    has left your group "<a href="{{ group_path }}">{{ group_name }}</a>"
+    {% endblocktrans %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/bookwyrm/templates/notifications/items/remove.html b/bookwyrm/templates/notifications/items/remove.html
index 784c0d00c..7ee38b4a7 100644
--- a/bookwyrm/templates/notifications/items/remove.html
+++ b/bookwyrm/templates/notifications/items/remove.html
@@ -4,11 +4,11 @@
 {% load utilities %}
 
 {% block primary_link %}{% spaceless %}
-  {{ notification.related_group.local_path }}
+    {{ notification.related_group.local_path }}
 {% endspaceless %}{% endblock %}
 
 {% block icon %}
-<span class="icon icon-local"></span>
+    <span class="icon icon-local"></span>
 {% endblock %}
 
 {% block description %}
@@ -20,9 +20,9 @@ has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a
 
 {% else %}
 
-{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
-You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a> group"
-{% endblocktrans %}
+    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a> group"
+    {% endblocktrans %}
 
 {% endif %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index cf9ae15df..fd94f14d1 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -29,13 +29,13 @@
             </button>
             {% else %}
             <button class="button is-small is-danger is-light" type="submit">
-              {% if show_username %}
-              {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
-              {% else %}
-              {% trans "Remove" %}
-              {% endif %}
-          </button>
-            {% endif %}
+                {% if show_username %}
+                    {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
+                {% else %}
+                    {% trans "Remove" %}
+                {% endif %}
+            </button>
+                {% endif %}
         </form>
     </div>
 </div>
diff --git a/bookwyrm/templates/snippets/remove_from_group_button.html b/bookwyrm/templates/snippets/remove_from_group_button.html
index 05b17b594..809d1d1fe 100644
--- a/bookwyrm/templates/snippets/remove_from_group_button.html
+++ b/bookwyrm/templates/snippets/remove_from_group_button.html
@@ -13,12 +13,12 @@
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
             <button class="button is-small" type="submit">
-              {% if show_username %}
-              {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
-              {% else %}
-              {% trans "Remove" %}
-              {% endif %}
-          </button>
+                {% if show_username %}
+                    {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
+                {% else %}
+                    {% trans "Remove" %}
+                {% endif %}
+            </button>
         </form>
     </div>
 </div>

From da53bad0f50305ec982c6272b6eedb555247ed71 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 4 Oct 2021 22:22:00 +1100
Subject: [PATCH 080/193] make Black happy

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

diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index fc4b64041..b1f4a67ae 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -89,7 +89,7 @@ class UserGroups(View):
 class FindUsers(View):
     """find friends to add to your group"""
 
-    #this is mostly borrowed from the Get Started friend finder
+    # this is mostly borrowed from the Get Started friend finder
 
     def get(self, request, group_id):
         """basic profile info"""

From 78f50034079eb691c0122a8b0359ed72fea3d139 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 08:09:24 +1100
Subject: [PATCH 081/193] lint raise_visible_to_user

Don't return True unnecessarily
---
 bookwyrm/models/base_model.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index d52c368ec..058aa4788 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -79,14 +79,14 @@ class BookWyrmModel(models.Model):
                 and self.mention_users.filter(id=viewer.id).first()
             ):
 
-                return True
+                return
 
         # you can see groups of which you are a member
         if (
             hasattr(self, "memberships")
             and self.memberships.filter(user=viewer).exists()
         ):
-            return True
+            return
 
         # you can see objects which have a group of which you are a member
         if hasattr(self, "group"):
@@ -94,7 +94,7 @@ class BookWyrmModel(models.Model):
                 hasattr(self.group, "memberships")
                 and self.group.memberships.filter(user=viewer).exists()
             ):
-                return True
+                return
 
         raise Http404()
 

From 90d92edd7523e83e4611563ce51f0121c8042e68 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 08:10:23 +1100
Subject: [PATCH 082/193] disable pylint on NotificationType now being "too
 long"

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

diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index 0cae7790c..69ed784b9 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -4,7 +4,7 @@ from django.dispatch import receiver
 from .base_model import BookWyrmModel
 from . import Boost, Favorite, ImportJob, Report, Status, User
 
-
+# pylint: disable=line-too-long
 NotificationType = models.TextChoices(
     "NotificationType",
     "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD REPORT INVITE ACCEPT JOIN LEAVE REMOVE",

From 484e9ed959d9f5333e581e24133aec1c0791e74a Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 08:14:52 +1100
Subject: [PATCH 083/193] fix user Groups view pagination function

---
 bookwyrm/views/user.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 808ca7385..dd30b2b46 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -145,7 +145,9 @@ class Groups(View):
         """list of groups"""
         user = get_user_from_username(request.user, username)
 
-        paginated = Paginator(models.Group.memberships.filter(user=user))
+        paginated = Paginator(
+          models.Group.memberships.filter(user=user).order_by("-created_date"), PAGE_LENGTH
+        )
         data = {
             "user": user,
             "is_self": request.user.id == user.id,

From cc8db1c3533e16eddfc2124e788e98fde634ec24 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 09:05:20 +1100
Subject: [PATCH 084/193] linting fixes

- remove unused imports
- add class docstrings
---
 bookwyrm/models/group.py | 4 +++-
 bookwyrm/models/list.py  | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index c2dfcb062..8fab44726 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -1,6 +1,6 @@
 """ do book related things with other users """
 from django.apps import apps
-from django.db import models, IntegrityError, models, transaction
+from django.db import models, IntegrityError, transaction
 from django.db.models import Q
 from bookwyrm.settings import DOMAIN
 from .base_model import BookWyrmModel
@@ -36,6 +36,7 @@ class GroupMember(models.Model):
     )
 
     class Meta:
+        """Users can only have one membership per group"""
         constraints = [
             models.UniqueConstraint(fields=["group", "user"], name="unique_membership")
         ]
@@ -83,6 +84,7 @@ class GroupMemberInvitation(models.Model):
     )
 
     class Meta:
+        """Users can only have one outstanding invitation per group"""
         constraints = [
             models.UniqueConstraint(fields=["group", "user"], name="unique_invitation")
         ]
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 46d57c2d0..8a083b690 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -1,16 +1,15 @@
 """ make a list of books!! """
-from bookwyrm.models.group import GroupMember
-from dataclasses import field
 from django.apps import apps
 from django.db import models
 from django.utils import timezone
 
 from bookwyrm import activitypub
 from bookwyrm.settings import DOMAIN
+
 from .activitypub_mixin import CollectionItemMixin, OrderedCollectionMixin
 from .base_model import BookWyrmModel
-from . import fields
 from .group import GroupMember
+from . import fields
 
 CurationType = models.TextChoices(
     "Curation",

From b1bb43d1432de50c79f5f41d19b37e9bd21901c0 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 18:04:47 +1100
Subject: [PATCH 085/193] lint Group views file

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

diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index b1f4a67ae..4a6a80954 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -3,7 +3,7 @@ from django.apps import apps
 from django.contrib.auth.decorators import login_required
 from django.db import IntegrityError
 from django.core.paginator import Paginator
-from django.http import HttpResponseNotFound, HttpResponseBadRequest
+from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -14,11 +14,9 @@ from django.db.models.functions import Greatest
 
 from bookwyrm import forms, models
 from bookwyrm.suggested_users import suggested_users
-from .helpers import privacy_filter
 from .helpers import get_user_from_username
-from bookwyrm.settings import DOMAIN
-
 
+# pylint: disable=no-self-use
 class Group(View):
     """group page"""
 
@@ -94,7 +92,14 @@ class FindUsers(View):
     def get(self, request, group_id):
         """basic profile info"""
         query = request.GET.get("query")
-        group = models.Group.objects.get(id=group_id)
+        group = get_object_or_404(models.Group, id=group_id)
+
+        if not group:
+            return HttpResponseBadRequest()
+
+        if not group.user == request.user:
+            return HttpResponseBadRequest()
+
         user_results = (
             models.User.viewer_aware_objects(request.user)
             .exclude(
@@ -116,14 +121,6 @@ class FindUsers(View):
                 request.user, local=True
             )
 
-        group = get_object_or_404(models.Group, id=group_id)
-
-        if not group:
-            return HttpResponseBadRequest()
-
-        if not group.user == request.user:
-            return HttpResponseBadRequest()
-
         data = {
             "suggested_users": user_results,
             "group": group,

From fe87e815e6d1953a5105187fb5d1dba45f4de8ff Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 20:41:48 +1100
Subject: [PATCH 086/193] database migrations for Groups

---
 .../migrations/0106_auto_20211005_0935.py     | 117 ++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 bookwyrm/migrations/0106_auto_20211005_0935.py

diff --git a/bookwyrm/migrations/0106_auto_20211005_0935.py b/bookwyrm/migrations/0106_auto_20211005_0935.py
new file mode 100644
index 000000000..46e31c5f9
--- /dev/null
+++ b/bookwyrm/migrations/0106_auto_20211005_0935.py
@@ -0,0 +1,117 @@
+# Generated by Django 3.2.5 on 2021-10-05 09:35
+
+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', '0105_alter_connector_connector_file'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Group',
+            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])),
+                ('name', bookwyrm.models.fields.CharField(max_length=100)),
+                ('description', bookwyrm.models.fields.TextField(blank=True, null=True)),
+                ('privacy', bookwyrm.models.fields.PrivacyField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='GroupMember',
+            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)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='GroupMemberInvitation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_date', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+        migrations.RemoveConstraint(
+            model_name='notification',
+            name='notification_type_valid',
+        ),
+        migrations.AddField(
+            model_name='notification',
+            name='related_group_member',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='related_group_member', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='list',
+            name='curation',
+            field=bookwyrm.models.fields.CharField(choices=[('closed', 'Closed'), ('open', 'Open'), ('curated', 'Curated'), ('group', 'Group')], default='closed', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='notification',
+            name='notification_type',
+            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import'), ('ADD', 'Add'), ('REPORT', 'Report'), ('INVITE', 'Invite'), ('ACCEPT', 'Accept'), ('JOIN', 'Join'), ('LEAVE', 'Leave'), ('REMOVE', 'Remove')], max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='preferred_timezone',
+            field=models.CharField(choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Timbuktu', 'Africa/Timbuktu'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/ComodRivadavia', 'America/Argentina/ComodRivadavia'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Atka', 'America/Atka'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Ensenada', 'America/Ensenada'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fort_Wayne', 'America/Fort_Wayne'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Knox_IN', 'America/Knox_IN'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montreal', 'America/Montreal'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Acre', 'America/Porto_Acre'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Rosario', 'America/Rosario'), ('America/Santa_Isabel', 'America/Santa_Isabel'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Shiprock', 'America/Shiprock'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Virgin', 'America/Virgin'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/South_Pole', 'Antarctica/South_Pole'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Ashkhabad', 'Asia/Ashkhabad'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Chongqing', 'Asia/Chongqing'), ('Asia/Chungking', 'Asia/Chungking'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Dacca', 'Asia/Dacca'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Harbin', 'Asia/Harbin'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Istanbul', 'Asia/Istanbul'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kashgar', 'Asia/Kashgar'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macao', 'Asia/Macao'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Tel_Aviv', 'Asia/Tel_Aviv'), ('Asia/Thimbu', 'Asia/Thimbu'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ujung_Pandang', 'Asia/Ujung_Pandang'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Ulan_Bator', 'Asia/Ulan_Bator'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Jan_Mayen', 'Atlantic/Jan_Mayen'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/ACT', 'Australia/ACT'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Canberra', 'Australia/Canberra'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/LHI', 'Australia/LHI'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/NSW', 'Australia/NSW'), ('Australia/North', 'Australia/North'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Queensland', 'Australia/Queensland'), ('Australia/South', 'Australia/South'), ('Australia/Sydney', 'Australia/Sydney'), ('Australia/Tasmania', 'Australia/Tasmania'), ('Australia/Victoria', 'Australia/Victoria'), ('Australia/West', 'Australia/West'), ('Australia/Yancowinna', 'Australia/Yancowinna'), ('Brazil/Acre', 'Brazil/Acre'), ('Brazil/DeNoronha', 'Brazil/DeNoronha'), ('Brazil/East', 'Brazil/East'), ('Brazil/West', 'Brazil/West'), ('CET', 'CET'), ('CST6CDT', 'CST6CDT'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Canada/Saskatchewan', 'Canada/Saskatchewan'), ('Canada/Yukon', 'Canada/Yukon'), ('Chile/Continental', 'Chile/Continental'), ('Chile/EasterIsland', 'Chile/EasterIsland'), ('Cuba', 'Cuba'), ('EET', 'EET'), ('EST', 'EST'), ('EST5EDT', 'EST5EDT'), ('Egypt', 'Egypt'), ('Eire', 'Eire'), ('Etc/GMT', 'Etc/GMT'), ('Etc/GMT+0', 'Etc/GMT+0'), ('Etc/GMT+1', 'Etc/GMT+1'), ('Etc/GMT+10', 'Etc/GMT+10'), ('Etc/GMT+11', 'Etc/GMT+11'), ('Etc/GMT+12', 'Etc/GMT+12'), ('Etc/GMT+2', 'Etc/GMT+2'), ('Etc/GMT+3', 'Etc/GMT+3'), ('Etc/GMT+4', 'Etc/GMT+4'), ('Etc/GMT+5', 'Etc/GMT+5'), ('Etc/GMT+6', 'Etc/GMT+6'), ('Etc/GMT+7', 'Etc/GMT+7'), ('Etc/GMT+8', 'Etc/GMT+8'), ('Etc/GMT+9', 'Etc/GMT+9'), ('Etc/GMT-0', 'Etc/GMT-0'), ('Etc/GMT-1', 'Etc/GMT-1'), ('Etc/GMT-10', 'Etc/GMT-10'), ('Etc/GMT-11', 'Etc/GMT-11'), ('Etc/GMT-12', 'Etc/GMT-12'), ('Etc/GMT-13', 'Etc/GMT-13'), ('Etc/GMT-14', 'Etc/GMT-14'), ('Etc/GMT-2', 'Etc/GMT-2'), ('Etc/GMT-3', 'Etc/GMT-3'), ('Etc/GMT-4', 'Etc/GMT-4'), ('Etc/GMT-5', 'Etc/GMT-5'), ('Etc/GMT-6', 'Etc/GMT-6'), ('Etc/GMT-7', 'Etc/GMT-7'), ('Etc/GMT-8', 'Etc/GMT-8'), ('Etc/GMT-9', 'Etc/GMT-9'), ('Etc/GMT0', 'Etc/GMT0'), ('Etc/Greenwich', 'Etc/Greenwich'), ('Etc/UCT', 'Etc/UCT'), ('Etc/UTC', 'Etc/UTC'), ('Etc/Universal', 'Etc/Universal'), ('Etc/Zulu', 'Etc/Zulu'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belfast', 'Europe/Belfast'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Nicosia', 'Europe/Nicosia'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Tiraspol', 'Europe/Tiraspol'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GB', 'GB'), ('GB-Eire', 'GB-Eire'), ('GMT', 'GMT'), ('GMT+0', 'GMT+0'), ('GMT-0', 'GMT-0'), ('GMT0', 'GMT0'), ('Greenwich', 'Greenwich'), ('HST', 'HST'), ('Hongkong', 'Hongkong'), ('Iceland', 'Iceland'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Iran', 'Iran'), ('Israel', 'Israel'), ('Jamaica', 'Jamaica'), ('Japan', 'Japan'), ('Kwajalein', 'Kwajalein'), ('Libya', 'Libya'), ('MET', 'MET'), ('MST', 'MST'), ('MST7MDT', 'MST7MDT'), ('Mexico/BajaNorte', 'Mexico/BajaNorte'), ('Mexico/BajaSur', 'Mexico/BajaSur'), ('Mexico/General', 'Mexico/General'), ('NZ', 'NZ'), ('NZ-CHAT', 'NZ-CHAT'), ('Navajo', 'Navajo'), ('PRC', 'PRC'), ('PST8PDT', 'PST8PDT'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Johnston', 'Pacific/Johnston'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Samoa', 'Pacific/Samoa'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('Pacific/Yap', 'Pacific/Yap'), ('Poland', 'Poland'), ('Portugal', 'Portugal'), ('ROC', 'ROC'), ('ROK', 'ROK'), ('Singapore', 'Singapore'), ('Turkey', 'Turkey'), ('UCT', 'UCT'), ('US/Alaska', 'US/Alaska'), ('US/Aleutian', 'US/Aleutian'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/East-Indiana', 'US/East-Indiana'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Indiana-Starke', 'US/Indiana-Starke'), ('US/Michigan', 'US/Michigan'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('US/Samoa', 'US/Samoa'), ('UTC', 'UTC'), ('Universal', 'Universal'), ('W-SU', 'W-SU'), ('WET', 'WET'), ('Zulu', 'Zulu')], default='UTC', max_length=255),
+        ),
+        migrations.AddConstraint(
+            model_name='notification',
+            constraint=models.CheckConstraint(check=models.Q(('notification_type__in', ['FAVORITE', 'REPLY', 'MENTION', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT', 'ADD', 'REPORT', 'INVITE', 'ACCEPT', 'JOIN', 'LEAVE', 'REMOVE'])), name='notification_type_valid'),
+        ),
+        migrations.AddField(
+            model_name='groupmemberinvitation',
+            name='group',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_invitations', to='bookwyrm.group'),
+        ),
+        migrations.AddField(
+            model_name='groupmemberinvitation',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='group_invitations', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='groupmember',
+            name='group',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to='bookwyrm.group'),
+        ),
+        migrations.AddField(
+            model_name='groupmember',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='group',
+            name='user',
+            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='list',
+            name='group',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.group'),
+        ),
+        migrations.AddField(
+            model_name='notification',
+            name='related_group',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to='bookwyrm.group'),
+        ),
+        migrations.AddConstraint(
+            model_name='groupmemberinvitation',
+            constraint=models.UniqueConstraint(fields=('group', 'user'), name='unique_invitation'),
+        ),
+        migrations.AddConstraint(
+            model_name='groupmember',
+            constraint=models.UniqueConstraint(fields=('group', 'user'), name='unique_membership'),
+        ),
+    ]

From cdf7775e058402f0d1fddd1a53a549740ecd9b8b Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 21:06:09 +1100
Subject: [PATCH 087/193] add test for Group views

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

diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
new file mode 100644
index 000000000..1c3386094
--- /dev/null
+++ b/bookwyrm/tests/views/test_group.py
@@ -0,0 +1,94 @@
+""" test for app action functionality """
+from unittest.mock import patch
+
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+from bookwyrm.tests.validate_html import validate_html
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+class GroupViews(TestCase):
+    """view group and edit details"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse@local.com",
+                "mouse@mouse.mouse",
+                "password",
+                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",
+            )
+
+        with patch():
+            self.testgroup = models.Group.objects.create(
+              id=999,
+              name="Test Group",
+              user=self.local_user,
+              privacy="public"
+            )
+            self.membership = models.GroupMember.objects.create(
+                group=self.testgroup, user=self.local_user
+            )
+
+        models.SiteSettings.objects.create()
+
+    def test_group_get(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Group.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+    def test_usergroups_get(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.UserGroups.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+    def test_findusers_get(self, _):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.FindUsers.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+    def test_group_post(self, _):
+        """edit a "group" database entry"""
+        view = views.Group.as_view()
+        self.factory.post(
+          group_id=999,
+          name="Test Group",
+          user=self.local_user,
+          privacy="public",
+          description="Test description",
+        )
+
+        self.assertEqual("Test description", self.testgroup.description)
\ No newline at end of file

From 6fde19e9b195f3b30ae7938d45fea3836e620bac Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 21:29:33 +1100
Subject: [PATCH 088/193] lint fixes

---
 bookwyrm/models/group.py                          | 2 +-
 bookwyrm/templates/notifications/items/leave.html | 2 +-
 bookwyrm/views/user.py                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 8fab44726..f10cb3312 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -141,7 +141,7 @@ class GroupMemberInvitation(models.Model):
             # let the other members know about it
             for membership in self.group.memberships.all():
                 member = membership.user
-                if member != self.user and member != self.group.user:
+                if member not in (self.user, self.group.user):
                     model.objects.create(
                         user=member,
                         related_user=self.user,
diff --git a/bookwyrm/templates/notifications/items/leave.html b/bookwyrm/templates/notifications/items/leave.html
index e6fe72be9..9c7a71b61 100644
--- a/bookwyrm/templates/notifications/items/leave.html
+++ b/bookwyrm/templates/notifications/items/leave.html
@@ -17,4 +17,4 @@
     has left your group "<a href="{{ group_path }}">{{ group_name }}</a>"
     {% endblocktrans %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index dd30b2b46..bbc2edd40 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -146,7 +146,7 @@ class Groups(View):
         user = get_user_from_username(request.user, username)
 
         paginated = Paginator(
-          models.Group.memberships.filter(user=user).order_by("-created_date"), PAGE_LENGTH
+            models.Group.memberships.filter(user=user).order_by("-created_date"), PAGE_LENGTH
         )
         data = {
             "user": user,

From b3dc81dea0260acaba5d4d50bcf3013e4431664f Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 21:29:46 +1100
Subject: [PATCH 089/193] update tests

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

diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
index 1c3386094..ac09c22b3 100644
--- a/bookwyrm/tests/views/test_group.py
+++ b/bookwyrm/tests/views/test_group.py
@@ -37,7 +37,6 @@ class GroupViews(TestCase):
                 outbox="https://example.com/users/rat/outbox",
             )
 
-        with patch():
             self.testgroup = models.Group.objects.create(
               id=999,
               name="Test Group",
@@ -83,7 +82,7 @@ class GroupViews(TestCase):
     def test_group_post(self, _):
         """edit a "group" database entry"""
         view = views.Group.as_view()
-        self.factory.post(
+        view.post(
           group_id=999,
           name="Test Group",
           user=self.local_user,

From f8e0de1ea98fc70a52dc5caa5f39349eb1ea8378 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 21:32:48 +1100
Subject: [PATCH 090/193] run black for clean code

Godammit Hugh remember to do this before pushing new code.
---
 .../migrations/0106_auto_20211005_0935.py     | 863 ++++++++++++++++--
 bookwyrm/models/group.py                      |   2 +
 bookwyrm/tests/views/test_group.py            |  17 +-
 bookwyrm/views/user.py                        |   3 +-
 4 files changed, 816 insertions(+), 69 deletions(-)

diff --git a/bookwyrm/migrations/0106_auto_20211005_0935.py b/bookwyrm/migrations/0106_auto_20211005_0935.py
index 46e31c5f9..6030c9130 100644
--- a/bookwyrm/migrations/0106_auto_20211005_0935.py
+++ b/bookwyrm/migrations/0106_auto_20211005_0935.py
@@ -9,109 +9,856 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0105_alter_connector_connector_file'),
+        ("bookwyrm", "0105_alter_connector_connector_file"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Group',
+            name="Group",
             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])),
-                ('name', bookwyrm.models.fields.CharField(max_length=100)),
-                ('description', bookwyrm.models.fields.TextField(blank=True, null=True)),
-                ('privacy', bookwyrm.models.fields.PrivacyField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255)),
+                (
+                    "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],
+                    ),
+                ),
+                ("name", bookwyrm.models.fields.CharField(max_length=100)),
+                (
+                    "description",
+                    bookwyrm.models.fields.TextField(blank=True, null=True),
+                ),
+                (
+                    "privacy",
+                    bookwyrm.models.fields.PrivacyField(
+                        choices=[
+                            ("public", "Public"),
+                            ("unlisted", "Unlisted"),
+                            ("followers", "Followers"),
+                            ("direct", "Direct"),
+                        ],
+                        default="public",
+                        max_length=255,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='GroupMember',
+            name="GroupMember",
             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)),
+                (
+                    "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)),
             ],
         ),
         migrations.CreateModel(
-            name='GroupMemberInvitation',
+            name="GroupMemberInvitation",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
             ],
         ),
         migrations.RemoveConstraint(
-            model_name='notification',
-            name='notification_type_valid',
+            model_name="notification",
+            name="notification_type_valid",
         ),
         migrations.AddField(
-            model_name='notification',
-            name='related_group_member',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='related_group_member', to=settings.AUTH_USER_MODEL),
+            model_name="notification",
+            name="related_group_member",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="related_group_member",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='list',
-            name='curation',
-            field=bookwyrm.models.fields.CharField(choices=[('closed', 'Closed'), ('open', 'Open'), ('curated', 'Curated'), ('group', 'Group')], default='closed', max_length=255),
+            model_name="list",
+            name="curation",
+            field=bookwyrm.models.fields.CharField(
+                choices=[
+                    ("closed", "Closed"),
+                    ("open", "Open"),
+                    ("curated", "Curated"),
+                    ("group", "Group"),
+                ],
+                default="closed",
+                max_length=255,
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='notification_type',
-            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import'), ('ADD', 'Add'), ('REPORT', 'Report'), ('INVITE', 'Invite'), ('ACCEPT', 'Accept'), ('JOIN', 'Join'), ('LEAVE', 'Leave'), ('REMOVE', 'Remove')], max_length=255),
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("MENTION", "Mention"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                    ("BOOST", "Boost"),
+                    ("IMPORT", "Import"),
+                    ("ADD", "Add"),
+                    ("REPORT", "Report"),
+                    ("INVITE", "Invite"),
+                    ("ACCEPT", "Accept"),
+                    ("JOIN", "Join"),
+                    ("LEAVE", "Leave"),
+                    ("REMOVE", "Remove"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='preferred_timezone',
-            field=models.CharField(choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Timbuktu', 'Africa/Timbuktu'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/ComodRivadavia', 'America/Argentina/ComodRivadavia'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Atka', 'America/Atka'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Ensenada', 'America/Ensenada'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fort_Wayne', 'America/Fort_Wayne'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Knox_IN', 'America/Knox_IN'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montreal', 'America/Montreal'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Acre', 'America/Porto_Acre'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Rosario', 'America/Rosario'), ('America/Santa_Isabel', 'America/Santa_Isabel'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Shiprock', 'America/Shiprock'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Virgin', 'America/Virgin'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/South_Pole', 'Antarctica/South_Pole'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Ashkhabad', 'Asia/Ashkhabad'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Chongqing', 'Asia/Chongqing'), ('Asia/Chungking', 'Asia/Chungking'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Dacca', 'Asia/Dacca'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Harbin', 'Asia/Harbin'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Istanbul', 'Asia/Istanbul'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kashgar', 'Asia/Kashgar'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macao', 'Asia/Macao'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Tel_Aviv', 'Asia/Tel_Aviv'), ('Asia/Thimbu', 'Asia/Thimbu'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ujung_Pandang', 'Asia/Ujung_Pandang'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Ulan_Bator', 'Asia/Ulan_Bator'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Jan_Mayen', 'Atlantic/Jan_Mayen'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/ACT', 'Australia/ACT'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Canberra', 'Australia/Canberra'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/LHI', 'Australia/LHI'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/NSW', 'Australia/NSW'), ('Australia/North', 'Australia/North'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Queensland', 'Australia/Queensland'), ('Australia/South', 'Australia/South'), ('Australia/Sydney', 'Australia/Sydney'), ('Australia/Tasmania', 'Australia/Tasmania'), ('Australia/Victoria', 'Australia/Victoria'), ('Australia/West', 'Australia/West'), ('Australia/Yancowinna', 'Australia/Yancowinna'), ('Brazil/Acre', 'Brazil/Acre'), ('Brazil/DeNoronha', 'Brazil/DeNoronha'), ('Brazil/East', 'Brazil/East'), ('Brazil/West', 'Brazil/West'), ('CET', 'CET'), ('CST6CDT', 'CST6CDT'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Canada/Saskatchewan', 'Canada/Saskatchewan'), ('Canada/Yukon', 'Canada/Yukon'), ('Chile/Continental', 'Chile/Continental'), ('Chile/EasterIsland', 'Chile/EasterIsland'), ('Cuba', 'Cuba'), ('EET', 'EET'), ('EST', 'EST'), ('EST5EDT', 'EST5EDT'), ('Egypt', 'Egypt'), ('Eire', 'Eire'), ('Etc/GMT', 'Etc/GMT'), ('Etc/GMT+0', 'Etc/GMT+0'), ('Etc/GMT+1', 'Etc/GMT+1'), ('Etc/GMT+10', 'Etc/GMT+10'), ('Etc/GMT+11', 'Etc/GMT+11'), ('Etc/GMT+12', 'Etc/GMT+12'), ('Etc/GMT+2', 'Etc/GMT+2'), ('Etc/GMT+3', 'Etc/GMT+3'), ('Etc/GMT+4', 'Etc/GMT+4'), ('Etc/GMT+5', 'Etc/GMT+5'), ('Etc/GMT+6', 'Etc/GMT+6'), ('Etc/GMT+7', 'Etc/GMT+7'), ('Etc/GMT+8', 'Etc/GMT+8'), ('Etc/GMT+9', 'Etc/GMT+9'), ('Etc/GMT-0', 'Etc/GMT-0'), ('Etc/GMT-1', 'Etc/GMT-1'), ('Etc/GMT-10', 'Etc/GMT-10'), ('Etc/GMT-11', 'Etc/GMT-11'), ('Etc/GMT-12', 'Etc/GMT-12'), ('Etc/GMT-13', 'Etc/GMT-13'), ('Etc/GMT-14', 'Etc/GMT-14'), ('Etc/GMT-2', 'Etc/GMT-2'), ('Etc/GMT-3', 'Etc/GMT-3'), ('Etc/GMT-4', 'Etc/GMT-4'), ('Etc/GMT-5', 'Etc/GMT-5'), ('Etc/GMT-6', 'Etc/GMT-6'), ('Etc/GMT-7', 'Etc/GMT-7'), ('Etc/GMT-8', 'Etc/GMT-8'), ('Etc/GMT-9', 'Etc/GMT-9'), ('Etc/GMT0', 'Etc/GMT0'), ('Etc/Greenwich', 'Etc/Greenwich'), ('Etc/UCT', 'Etc/UCT'), ('Etc/UTC', 'Etc/UTC'), ('Etc/Universal', 'Etc/Universal'), ('Etc/Zulu', 'Etc/Zulu'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belfast', 'Europe/Belfast'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Nicosia', 'Europe/Nicosia'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Tiraspol', 'Europe/Tiraspol'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GB', 'GB'), ('GB-Eire', 'GB-Eire'), ('GMT', 'GMT'), ('GMT+0', 'GMT+0'), ('GMT-0', 'GMT-0'), ('GMT0', 'GMT0'), ('Greenwich', 'Greenwich'), ('HST', 'HST'), ('Hongkong', 'Hongkong'), ('Iceland', 'Iceland'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Iran', 'Iran'), ('Israel', 'Israel'), ('Jamaica', 'Jamaica'), ('Japan', 'Japan'), ('Kwajalein', 'Kwajalein'), ('Libya', 'Libya'), ('MET', 'MET'), ('MST', 'MST'), ('MST7MDT', 'MST7MDT'), ('Mexico/BajaNorte', 'Mexico/BajaNorte'), ('Mexico/BajaSur', 'Mexico/BajaSur'), ('Mexico/General', 'Mexico/General'), ('NZ', 'NZ'), ('NZ-CHAT', 'NZ-CHAT'), ('Navajo', 'Navajo'), ('PRC', 'PRC'), ('PST8PDT', 'PST8PDT'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Johnston', 'Pacific/Johnston'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Samoa', 'Pacific/Samoa'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('Pacific/Yap', 'Pacific/Yap'), ('Poland', 'Poland'), ('Portugal', 'Portugal'), ('ROC', 'ROC'), ('ROK', 'ROK'), ('Singapore', 'Singapore'), ('Turkey', 'Turkey'), ('UCT', 'UCT'), ('US/Alaska', 'US/Alaska'), ('US/Aleutian', 'US/Aleutian'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/East-Indiana', 'US/East-Indiana'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Indiana-Starke', 'US/Indiana-Starke'), ('US/Michigan', 'US/Michigan'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('US/Samoa', 'US/Samoa'), ('UTC', 'UTC'), ('Universal', 'Universal'), ('W-SU', 'W-SU'), ('WET', 'WET'), ('Zulu', 'Zulu')], default='UTC', max_length=255),
+            model_name="user",
+            name="preferred_timezone",
+            field=models.CharField(
+                choices=[
+                    ("Africa/Abidjan", "Africa/Abidjan"),
+                    ("Africa/Accra", "Africa/Accra"),
+                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+                    ("Africa/Algiers", "Africa/Algiers"),
+                    ("Africa/Asmara", "Africa/Asmara"),
+                    ("Africa/Asmera", "Africa/Asmera"),
+                    ("Africa/Bamako", "Africa/Bamako"),
+                    ("Africa/Bangui", "Africa/Bangui"),
+                    ("Africa/Banjul", "Africa/Banjul"),
+                    ("Africa/Bissau", "Africa/Bissau"),
+                    ("Africa/Blantyre", "Africa/Blantyre"),
+                    ("Africa/Brazzaville", "Africa/Brazzaville"),
+                    ("Africa/Bujumbura", "Africa/Bujumbura"),
+                    ("Africa/Cairo", "Africa/Cairo"),
+                    ("Africa/Casablanca", "Africa/Casablanca"),
+                    ("Africa/Ceuta", "Africa/Ceuta"),
+                    ("Africa/Conakry", "Africa/Conakry"),
+                    ("Africa/Dakar", "Africa/Dakar"),
+                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+                    ("Africa/Djibouti", "Africa/Djibouti"),
+                    ("Africa/Douala", "Africa/Douala"),
+                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+                    ("Africa/Freetown", "Africa/Freetown"),
+                    ("Africa/Gaborone", "Africa/Gaborone"),
+                    ("Africa/Harare", "Africa/Harare"),
+                    ("Africa/Johannesburg", "Africa/Johannesburg"),
+                    ("Africa/Juba", "Africa/Juba"),
+                    ("Africa/Kampala", "Africa/Kampala"),
+                    ("Africa/Khartoum", "Africa/Khartoum"),
+                    ("Africa/Kigali", "Africa/Kigali"),
+                    ("Africa/Kinshasa", "Africa/Kinshasa"),
+                    ("Africa/Lagos", "Africa/Lagos"),
+                    ("Africa/Libreville", "Africa/Libreville"),
+                    ("Africa/Lome", "Africa/Lome"),
+                    ("Africa/Luanda", "Africa/Luanda"),
+                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+                    ("Africa/Lusaka", "Africa/Lusaka"),
+                    ("Africa/Malabo", "Africa/Malabo"),
+                    ("Africa/Maputo", "Africa/Maputo"),
+                    ("Africa/Maseru", "Africa/Maseru"),
+                    ("Africa/Mbabane", "Africa/Mbabane"),
+                    ("Africa/Mogadishu", "Africa/Mogadishu"),
+                    ("Africa/Monrovia", "Africa/Monrovia"),
+                    ("Africa/Nairobi", "Africa/Nairobi"),
+                    ("Africa/Ndjamena", "Africa/Ndjamena"),
+                    ("Africa/Niamey", "Africa/Niamey"),
+                    ("Africa/Nouakchott", "Africa/Nouakchott"),
+                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+                    ("Africa/Timbuktu", "Africa/Timbuktu"),
+                    ("Africa/Tripoli", "Africa/Tripoli"),
+                    ("Africa/Tunis", "Africa/Tunis"),
+                    ("Africa/Windhoek", "Africa/Windhoek"),
+                    ("America/Adak", "America/Adak"),
+                    ("America/Anchorage", "America/Anchorage"),
+                    ("America/Anguilla", "America/Anguilla"),
+                    ("America/Antigua", "America/Antigua"),
+                    ("America/Araguaina", "America/Araguaina"),
+                    (
+                        "America/Argentina/Buenos_Aires",
+                        "America/Argentina/Buenos_Aires",
+                    ),
+                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+                    (
+                        "America/Argentina/ComodRivadavia",
+                        "America/Argentina/ComodRivadavia",
+                    ),
+                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+                    (
+                        "America/Argentina/Rio_Gallegos",
+                        "America/Argentina/Rio_Gallegos",
+                    ),
+                    ("America/Argentina/Salta", "America/Argentina/Salta"),
+                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+                    ("America/Aruba", "America/Aruba"),
+                    ("America/Asuncion", "America/Asuncion"),
+                    ("America/Atikokan", "America/Atikokan"),
+                    ("America/Atka", "America/Atka"),
+                    ("America/Bahia", "America/Bahia"),
+                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+                    ("America/Barbados", "America/Barbados"),
+                    ("America/Belem", "America/Belem"),
+                    ("America/Belize", "America/Belize"),
+                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+                    ("America/Boa_Vista", "America/Boa_Vista"),
+                    ("America/Bogota", "America/Bogota"),
+                    ("America/Boise", "America/Boise"),
+                    ("America/Buenos_Aires", "America/Buenos_Aires"),
+                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+                    ("America/Campo_Grande", "America/Campo_Grande"),
+                    ("America/Cancun", "America/Cancun"),
+                    ("America/Caracas", "America/Caracas"),
+                    ("America/Catamarca", "America/Catamarca"),
+                    ("America/Cayenne", "America/Cayenne"),
+                    ("America/Cayman", "America/Cayman"),
+                    ("America/Chicago", "America/Chicago"),
+                    ("America/Chihuahua", "America/Chihuahua"),
+                    ("America/Coral_Harbour", "America/Coral_Harbour"),
+                    ("America/Cordoba", "America/Cordoba"),
+                    ("America/Costa_Rica", "America/Costa_Rica"),
+                    ("America/Creston", "America/Creston"),
+                    ("America/Cuiaba", "America/Cuiaba"),
+                    ("America/Curacao", "America/Curacao"),
+                    ("America/Danmarkshavn", "America/Danmarkshavn"),
+                    ("America/Dawson", "America/Dawson"),
+                    ("America/Dawson_Creek", "America/Dawson_Creek"),
+                    ("America/Denver", "America/Denver"),
+                    ("America/Detroit", "America/Detroit"),
+                    ("America/Dominica", "America/Dominica"),
+                    ("America/Edmonton", "America/Edmonton"),
+                    ("America/Eirunepe", "America/Eirunepe"),
+                    ("America/El_Salvador", "America/El_Salvador"),
+                    ("America/Ensenada", "America/Ensenada"),
+                    ("America/Fort_Nelson", "America/Fort_Nelson"),
+                    ("America/Fort_Wayne", "America/Fort_Wayne"),
+                    ("America/Fortaleza", "America/Fortaleza"),
+                    ("America/Glace_Bay", "America/Glace_Bay"),
+                    ("America/Godthab", "America/Godthab"),
+                    ("America/Goose_Bay", "America/Goose_Bay"),
+                    ("America/Grand_Turk", "America/Grand_Turk"),
+                    ("America/Grenada", "America/Grenada"),
+                    ("America/Guadeloupe", "America/Guadeloupe"),
+                    ("America/Guatemala", "America/Guatemala"),
+                    ("America/Guayaquil", "America/Guayaquil"),
+                    ("America/Guyana", "America/Guyana"),
+                    ("America/Halifax", "America/Halifax"),
+                    ("America/Havana", "America/Havana"),
+                    ("America/Hermosillo", "America/Hermosillo"),
+                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+                    ("America/Indiana/Knox", "America/Indiana/Knox"),
+                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+                    ("America/Indianapolis", "America/Indianapolis"),
+                    ("America/Inuvik", "America/Inuvik"),
+                    ("America/Iqaluit", "America/Iqaluit"),
+                    ("America/Jamaica", "America/Jamaica"),
+                    ("America/Jujuy", "America/Jujuy"),
+                    ("America/Juneau", "America/Juneau"),
+                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+                    ("America/Knox_IN", "America/Knox_IN"),
+                    ("America/Kralendijk", "America/Kralendijk"),
+                    ("America/La_Paz", "America/La_Paz"),
+                    ("America/Lima", "America/Lima"),
+                    ("America/Los_Angeles", "America/Los_Angeles"),
+                    ("America/Louisville", "America/Louisville"),
+                    ("America/Lower_Princes", "America/Lower_Princes"),
+                    ("America/Maceio", "America/Maceio"),
+                    ("America/Managua", "America/Managua"),
+                    ("America/Manaus", "America/Manaus"),
+                    ("America/Marigot", "America/Marigot"),
+                    ("America/Martinique", "America/Martinique"),
+                    ("America/Matamoros", "America/Matamoros"),
+                    ("America/Mazatlan", "America/Mazatlan"),
+                    ("America/Mendoza", "America/Mendoza"),
+                    ("America/Menominee", "America/Menominee"),
+                    ("America/Merida", "America/Merida"),
+                    ("America/Metlakatla", "America/Metlakatla"),
+                    ("America/Mexico_City", "America/Mexico_City"),
+                    ("America/Miquelon", "America/Miquelon"),
+                    ("America/Moncton", "America/Moncton"),
+                    ("America/Monterrey", "America/Monterrey"),
+                    ("America/Montevideo", "America/Montevideo"),
+                    ("America/Montreal", "America/Montreal"),
+                    ("America/Montserrat", "America/Montserrat"),
+                    ("America/Nassau", "America/Nassau"),
+                    ("America/New_York", "America/New_York"),
+                    ("America/Nipigon", "America/Nipigon"),
+                    ("America/Nome", "America/Nome"),
+                    ("America/Noronha", "America/Noronha"),
+                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+                    (
+                        "America/North_Dakota/New_Salem",
+                        "America/North_Dakota/New_Salem",
+                    ),
+                    ("America/Nuuk", "America/Nuuk"),
+                    ("America/Ojinaga", "America/Ojinaga"),
+                    ("America/Panama", "America/Panama"),
+                    ("America/Pangnirtung", "America/Pangnirtung"),
+                    ("America/Paramaribo", "America/Paramaribo"),
+                    ("America/Phoenix", "America/Phoenix"),
+                    ("America/Port-au-Prince", "America/Port-au-Prince"),
+                    ("America/Port_of_Spain", "America/Port_of_Spain"),
+                    ("America/Porto_Acre", "America/Porto_Acre"),
+                    ("America/Porto_Velho", "America/Porto_Velho"),
+                    ("America/Puerto_Rico", "America/Puerto_Rico"),
+                    ("America/Punta_Arenas", "America/Punta_Arenas"),
+                    ("America/Rainy_River", "America/Rainy_River"),
+                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+                    ("America/Recife", "America/Recife"),
+                    ("America/Regina", "America/Regina"),
+                    ("America/Resolute", "America/Resolute"),
+                    ("America/Rio_Branco", "America/Rio_Branco"),
+                    ("America/Rosario", "America/Rosario"),
+                    ("America/Santa_Isabel", "America/Santa_Isabel"),
+                    ("America/Santarem", "America/Santarem"),
+                    ("America/Santiago", "America/Santiago"),
+                    ("America/Santo_Domingo", "America/Santo_Domingo"),
+                    ("America/Sao_Paulo", "America/Sao_Paulo"),
+                    ("America/Scoresbysund", "America/Scoresbysund"),
+                    ("America/Shiprock", "America/Shiprock"),
+                    ("America/Sitka", "America/Sitka"),
+                    ("America/St_Barthelemy", "America/St_Barthelemy"),
+                    ("America/St_Johns", "America/St_Johns"),
+                    ("America/St_Kitts", "America/St_Kitts"),
+                    ("America/St_Lucia", "America/St_Lucia"),
+                    ("America/St_Thomas", "America/St_Thomas"),
+                    ("America/St_Vincent", "America/St_Vincent"),
+                    ("America/Swift_Current", "America/Swift_Current"),
+                    ("America/Tegucigalpa", "America/Tegucigalpa"),
+                    ("America/Thule", "America/Thule"),
+                    ("America/Thunder_Bay", "America/Thunder_Bay"),
+                    ("America/Tijuana", "America/Tijuana"),
+                    ("America/Toronto", "America/Toronto"),
+                    ("America/Tortola", "America/Tortola"),
+                    ("America/Vancouver", "America/Vancouver"),
+                    ("America/Virgin", "America/Virgin"),
+                    ("America/Whitehorse", "America/Whitehorse"),
+                    ("America/Winnipeg", "America/Winnipeg"),
+                    ("America/Yakutat", "America/Yakutat"),
+                    ("America/Yellowknife", "America/Yellowknife"),
+                    ("Antarctica/Casey", "Antarctica/Casey"),
+                    ("Antarctica/Davis", "Antarctica/Davis"),
+                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+                    ("Antarctica/Mawson", "Antarctica/Mawson"),
+                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+                    ("Antarctica/Palmer", "Antarctica/Palmer"),
+                    ("Antarctica/Rothera", "Antarctica/Rothera"),
+                    ("Antarctica/South_Pole", "Antarctica/South_Pole"),
+                    ("Antarctica/Syowa", "Antarctica/Syowa"),
+                    ("Antarctica/Troll", "Antarctica/Troll"),
+                    ("Antarctica/Vostok", "Antarctica/Vostok"),
+                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
+                    ("Asia/Aden", "Asia/Aden"),
+                    ("Asia/Almaty", "Asia/Almaty"),
+                    ("Asia/Amman", "Asia/Amman"),
+                    ("Asia/Anadyr", "Asia/Anadyr"),
+                    ("Asia/Aqtau", "Asia/Aqtau"),
+                    ("Asia/Aqtobe", "Asia/Aqtobe"),
+                    ("Asia/Ashgabat", "Asia/Ashgabat"),
+                    ("Asia/Ashkhabad", "Asia/Ashkhabad"),
+                    ("Asia/Atyrau", "Asia/Atyrau"),
+                    ("Asia/Baghdad", "Asia/Baghdad"),
+                    ("Asia/Bahrain", "Asia/Bahrain"),
+                    ("Asia/Baku", "Asia/Baku"),
+                    ("Asia/Bangkok", "Asia/Bangkok"),
+                    ("Asia/Barnaul", "Asia/Barnaul"),
+                    ("Asia/Beirut", "Asia/Beirut"),
+                    ("Asia/Bishkek", "Asia/Bishkek"),
+                    ("Asia/Brunei", "Asia/Brunei"),
+                    ("Asia/Calcutta", "Asia/Calcutta"),
+                    ("Asia/Chita", "Asia/Chita"),
+                    ("Asia/Choibalsan", "Asia/Choibalsan"),
+                    ("Asia/Chongqing", "Asia/Chongqing"),
+                    ("Asia/Chungking", "Asia/Chungking"),
+                    ("Asia/Colombo", "Asia/Colombo"),
+                    ("Asia/Dacca", "Asia/Dacca"),
+                    ("Asia/Damascus", "Asia/Damascus"),
+                    ("Asia/Dhaka", "Asia/Dhaka"),
+                    ("Asia/Dili", "Asia/Dili"),
+                    ("Asia/Dubai", "Asia/Dubai"),
+                    ("Asia/Dushanbe", "Asia/Dushanbe"),
+                    ("Asia/Famagusta", "Asia/Famagusta"),
+                    ("Asia/Gaza", "Asia/Gaza"),
+                    ("Asia/Harbin", "Asia/Harbin"),
+                    ("Asia/Hebron", "Asia/Hebron"),
+                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+                    ("Asia/Hovd", "Asia/Hovd"),
+                    ("Asia/Irkutsk", "Asia/Irkutsk"),
+                    ("Asia/Istanbul", "Asia/Istanbul"),
+                    ("Asia/Jakarta", "Asia/Jakarta"),
+                    ("Asia/Jayapura", "Asia/Jayapura"),
+                    ("Asia/Jerusalem", "Asia/Jerusalem"),
+                    ("Asia/Kabul", "Asia/Kabul"),
+                    ("Asia/Kamchatka", "Asia/Kamchatka"),
+                    ("Asia/Karachi", "Asia/Karachi"),
+                    ("Asia/Kashgar", "Asia/Kashgar"),
+                    ("Asia/Kathmandu", "Asia/Kathmandu"),
+                    ("Asia/Katmandu", "Asia/Katmandu"),
+                    ("Asia/Khandyga", "Asia/Khandyga"),
+                    ("Asia/Kolkata", "Asia/Kolkata"),
+                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+                    ("Asia/Kuching", "Asia/Kuching"),
+                    ("Asia/Kuwait", "Asia/Kuwait"),
+                    ("Asia/Macao", "Asia/Macao"),
+                    ("Asia/Macau", "Asia/Macau"),
+                    ("Asia/Magadan", "Asia/Magadan"),
+                    ("Asia/Makassar", "Asia/Makassar"),
+                    ("Asia/Manila", "Asia/Manila"),
+                    ("Asia/Muscat", "Asia/Muscat"),
+                    ("Asia/Nicosia", "Asia/Nicosia"),
+                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+                    ("Asia/Omsk", "Asia/Omsk"),
+                    ("Asia/Oral", "Asia/Oral"),
+                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+                    ("Asia/Pontianak", "Asia/Pontianak"),
+                    ("Asia/Pyongyang", "Asia/Pyongyang"),
+                    ("Asia/Qatar", "Asia/Qatar"),
+                    ("Asia/Qostanay", "Asia/Qostanay"),
+                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+                    ("Asia/Rangoon", "Asia/Rangoon"),
+                    ("Asia/Riyadh", "Asia/Riyadh"),
+                    ("Asia/Saigon", "Asia/Saigon"),
+                    ("Asia/Sakhalin", "Asia/Sakhalin"),
+                    ("Asia/Samarkand", "Asia/Samarkand"),
+                    ("Asia/Seoul", "Asia/Seoul"),
+                    ("Asia/Shanghai", "Asia/Shanghai"),
+                    ("Asia/Singapore", "Asia/Singapore"),
+                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+                    ("Asia/Taipei", "Asia/Taipei"),
+                    ("Asia/Tashkent", "Asia/Tashkent"),
+                    ("Asia/Tbilisi", "Asia/Tbilisi"),
+                    ("Asia/Tehran", "Asia/Tehran"),
+                    ("Asia/Tel_Aviv", "Asia/Tel_Aviv"),
+                    ("Asia/Thimbu", "Asia/Thimbu"),
+                    ("Asia/Thimphu", "Asia/Thimphu"),
+                    ("Asia/Tokyo", "Asia/Tokyo"),
+                    ("Asia/Tomsk", "Asia/Tomsk"),
+                    ("Asia/Ujung_Pandang", "Asia/Ujung_Pandang"),
+                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+                    ("Asia/Ulan_Bator", "Asia/Ulan_Bator"),
+                    ("Asia/Urumqi", "Asia/Urumqi"),
+                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+                    ("Asia/Vientiane", "Asia/Vientiane"),
+                    ("Asia/Vladivostok", "Asia/Vladivostok"),
+                    ("Asia/Yakutsk", "Asia/Yakutsk"),
+                    ("Asia/Yangon", "Asia/Yangon"),
+                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+                    ("Asia/Yerevan", "Asia/Yerevan"),
+                    ("Atlantic/Azores", "Atlantic/Azores"),
+                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+                    ("Atlantic/Canary", "Atlantic/Canary"),
+                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+                    ("Atlantic/Faeroe", "Atlantic/Faeroe"),
+                    ("Atlantic/Faroe", "Atlantic/Faroe"),
+                    ("Atlantic/Jan_Mayen", "Atlantic/Jan_Mayen"),
+                    ("Atlantic/Madeira", "Atlantic/Madeira"),
+                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+                    ("Atlantic/Stanley", "Atlantic/Stanley"),
+                    ("Australia/ACT", "Australia/ACT"),
+                    ("Australia/Adelaide", "Australia/Adelaide"),
+                    ("Australia/Brisbane", "Australia/Brisbane"),
+                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+                    ("Australia/Canberra", "Australia/Canberra"),
+                    ("Australia/Currie", "Australia/Currie"),
+                    ("Australia/Darwin", "Australia/Darwin"),
+                    ("Australia/Eucla", "Australia/Eucla"),
+                    ("Australia/Hobart", "Australia/Hobart"),
+                    ("Australia/LHI", "Australia/LHI"),
+                    ("Australia/Lindeman", "Australia/Lindeman"),
+                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+                    ("Australia/Melbourne", "Australia/Melbourne"),
+                    ("Australia/NSW", "Australia/NSW"),
+                    ("Australia/North", "Australia/North"),
+                    ("Australia/Perth", "Australia/Perth"),
+                    ("Australia/Queensland", "Australia/Queensland"),
+                    ("Australia/South", "Australia/South"),
+                    ("Australia/Sydney", "Australia/Sydney"),
+                    ("Australia/Tasmania", "Australia/Tasmania"),
+                    ("Australia/Victoria", "Australia/Victoria"),
+                    ("Australia/West", "Australia/West"),
+                    ("Australia/Yancowinna", "Australia/Yancowinna"),
+                    ("Brazil/Acre", "Brazil/Acre"),
+                    ("Brazil/DeNoronha", "Brazil/DeNoronha"),
+                    ("Brazil/East", "Brazil/East"),
+                    ("Brazil/West", "Brazil/West"),
+                    ("CET", "CET"),
+                    ("CST6CDT", "CST6CDT"),
+                    ("Canada/Atlantic", "Canada/Atlantic"),
+                    ("Canada/Central", "Canada/Central"),
+                    ("Canada/Eastern", "Canada/Eastern"),
+                    ("Canada/Mountain", "Canada/Mountain"),
+                    ("Canada/Newfoundland", "Canada/Newfoundland"),
+                    ("Canada/Pacific", "Canada/Pacific"),
+                    ("Canada/Saskatchewan", "Canada/Saskatchewan"),
+                    ("Canada/Yukon", "Canada/Yukon"),
+                    ("Chile/Continental", "Chile/Continental"),
+                    ("Chile/EasterIsland", "Chile/EasterIsland"),
+                    ("Cuba", "Cuba"),
+                    ("EET", "EET"),
+                    ("EST", "EST"),
+                    ("EST5EDT", "EST5EDT"),
+                    ("Egypt", "Egypt"),
+                    ("Eire", "Eire"),
+                    ("Etc/GMT", "Etc/GMT"),
+                    ("Etc/GMT+0", "Etc/GMT+0"),
+                    ("Etc/GMT+1", "Etc/GMT+1"),
+                    ("Etc/GMT+10", "Etc/GMT+10"),
+                    ("Etc/GMT+11", "Etc/GMT+11"),
+                    ("Etc/GMT+12", "Etc/GMT+12"),
+                    ("Etc/GMT+2", "Etc/GMT+2"),
+                    ("Etc/GMT+3", "Etc/GMT+3"),
+                    ("Etc/GMT+4", "Etc/GMT+4"),
+                    ("Etc/GMT+5", "Etc/GMT+5"),
+                    ("Etc/GMT+6", "Etc/GMT+6"),
+                    ("Etc/GMT+7", "Etc/GMT+7"),
+                    ("Etc/GMT+8", "Etc/GMT+8"),
+                    ("Etc/GMT+9", "Etc/GMT+9"),
+                    ("Etc/GMT-0", "Etc/GMT-0"),
+                    ("Etc/GMT-1", "Etc/GMT-1"),
+                    ("Etc/GMT-10", "Etc/GMT-10"),
+                    ("Etc/GMT-11", "Etc/GMT-11"),
+                    ("Etc/GMT-12", "Etc/GMT-12"),
+                    ("Etc/GMT-13", "Etc/GMT-13"),
+                    ("Etc/GMT-14", "Etc/GMT-14"),
+                    ("Etc/GMT-2", "Etc/GMT-2"),
+                    ("Etc/GMT-3", "Etc/GMT-3"),
+                    ("Etc/GMT-4", "Etc/GMT-4"),
+                    ("Etc/GMT-5", "Etc/GMT-5"),
+                    ("Etc/GMT-6", "Etc/GMT-6"),
+                    ("Etc/GMT-7", "Etc/GMT-7"),
+                    ("Etc/GMT-8", "Etc/GMT-8"),
+                    ("Etc/GMT-9", "Etc/GMT-9"),
+                    ("Etc/GMT0", "Etc/GMT0"),
+                    ("Etc/Greenwich", "Etc/Greenwich"),
+                    ("Etc/UCT", "Etc/UCT"),
+                    ("Etc/UTC", "Etc/UTC"),
+                    ("Etc/Universal", "Etc/Universal"),
+                    ("Etc/Zulu", "Etc/Zulu"),
+                    ("Europe/Amsterdam", "Europe/Amsterdam"),
+                    ("Europe/Andorra", "Europe/Andorra"),
+                    ("Europe/Astrakhan", "Europe/Astrakhan"),
+                    ("Europe/Athens", "Europe/Athens"),
+                    ("Europe/Belfast", "Europe/Belfast"),
+                    ("Europe/Belgrade", "Europe/Belgrade"),
+                    ("Europe/Berlin", "Europe/Berlin"),
+                    ("Europe/Bratislava", "Europe/Bratislava"),
+                    ("Europe/Brussels", "Europe/Brussels"),
+                    ("Europe/Bucharest", "Europe/Bucharest"),
+                    ("Europe/Budapest", "Europe/Budapest"),
+                    ("Europe/Busingen", "Europe/Busingen"),
+                    ("Europe/Chisinau", "Europe/Chisinau"),
+                    ("Europe/Copenhagen", "Europe/Copenhagen"),
+                    ("Europe/Dublin", "Europe/Dublin"),
+                    ("Europe/Gibraltar", "Europe/Gibraltar"),
+                    ("Europe/Guernsey", "Europe/Guernsey"),
+                    ("Europe/Helsinki", "Europe/Helsinki"),
+                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
+                    ("Europe/Istanbul", "Europe/Istanbul"),
+                    ("Europe/Jersey", "Europe/Jersey"),
+                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+                    ("Europe/Kiev", "Europe/Kiev"),
+                    ("Europe/Kirov", "Europe/Kirov"),
+                    ("Europe/Lisbon", "Europe/Lisbon"),
+                    ("Europe/Ljubljana", "Europe/Ljubljana"),
+                    ("Europe/London", "Europe/London"),
+                    ("Europe/Luxembourg", "Europe/Luxembourg"),
+                    ("Europe/Madrid", "Europe/Madrid"),
+                    ("Europe/Malta", "Europe/Malta"),
+                    ("Europe/Mariehamn", "Europe/Mariehamn"),
+                    ("Europe/Minsk", "Europe/Minsk"),
+                    ("Europe/Monaco", "Europe/Monaco"),
+                    ("Europe/Moscow", "Europe/Moscow"),
+                    ("Europe/Nicosia", "Europe/Nicosia"),
+                    ("Europe/Oslo", "Europe/Oslo"),
+                    ("Europe/Paris", "Europe/Paris"),
+                    ("Europe/Podgorica", "Europe/Podgorica"),
+                    ("Europe/Prague", "Europe/Prague"),
+                    ("Europe/Riga", "Europe/Riga"),
+                    ("Europe/Rome", "Europe/Rome"),
+                    ("Europe/Samara", "Europe/Samara"),
+                    ("Europe/San_Marino", "Europe/San_Marino"),
+                    ("Europe/Sarajevo", "Europe/Sarajevo"),
+                    ("Europe/Saratov", "Europe/Saratov"),
+                    ("Europe/Simferopol", "Europe/Simferopol"),
+                    ("Europe/Skopje", "Europe/Skopje"),
+                    ("Europe/Sofia", "Europe/Sofia"),
+                    ("Europe/Stockholm", "Europe/Stockholm"),
+                    ("Europe/Tallinn", "Europe/Tallinn"),
+                    ("Europe/Tirane", "Europe/Tirane"),
+                    ("Europe/Tiraspol", "Europe/Tiraspol"),
+                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+                    ("Europe/Uzhgorod", "Europe/Uzhgorod"),
+                    ("Europe/Vaduz", "Europe/Vaduz"),
+                    ("Europe/Vatican", "Europe/Vatican"),
+                    ("Europe/Vienna", "Europe/Vienna"),
+                    ("Europe/Vilnius", "Europe/Vilnius"),
+                    ("Europe/Volgograd", "Europe/Volgograd"),
+                    ("Europe/Warsaw", "Europe/Warsaw"),
+                    ("Europe/Zagreb", "Europe/Zagreb"),
+                    ("Europe/Zaporozhye", "Europe/Zaporozhye"),
+                    ("Europe/Zurich", "Europe/Zurich"),
+                    ("GB", "GB"),
+                    ("GB-Eire", "GB-Eire"),
+                    ("GMT", "GMT"),
+                    ("GMT+0", "GMT+0"),
+                    ("GMT-0", "GMT-0"),
+                    ("GMT0", "GMT0"),
+                    ("Greenwich", "Greenwich"),
+                    ("HST", "HST"),
+                    ("Hongkong", "Hongkong"),
+                    ("Iceland", "Iceland"),
+                    ("Indian/Antananarivo", "Indian/Antananarivo"),
+                    ("Indian/Chagos", "Indian/Chagos"),
+                    ("Indian/Christmas", "Indian/Christmas"),
+                    ("Indian/Cocos", "Indian/Cocos"),
+                    ("Indian/Comoro", "Indian/Comoro"),
+                    ("Indian/Kerguelen", "Indian/Kerguelen"),
+                    ("Indian/Mahe", "Indian/Mahe"),
+                    ("Indian/Maldives", "Indian/Maldives"),
+                    ("Indian/Mauritius", "Indian/Mauritius"),
+                    ("Indian/Mayotte", "Indian/Mayotte"),
+                    ("Indian/Reunion", "Indian/Reunion"),
+                    ("Iran", "Iran"),
+                    ("Israel", "Israel"),
+                    ("Jamaica", "Jamaica"),
+                    ("Japan", "Japan"),
+                    ("Kwajalein", "Kwajalein"),
+                    ("Libya", "Libya"),
+                    ("MET", "MET"),
+                    ("MST", "MST"),
+                    ("MST7MDT", "MST7MDT"),
+                    ("Mexico/BajaNorte", "Mexico/BajaNorte"),
+                    ("Mexico/BajaSur", "Mexico/BajaSur"),
+                    ("Mexico/General", "Mexico/General"),
+                    ("NZ", "NZ"),
+                    ("NZ-CHAT", "NZ-CHAT"),
+                    ("Navajo", "Navajo"),
+                    ("PRC", "PRC"),
+                    ("PST8PDT", "PST8PDT"),
+                    ("Pacific/Apia", "Pacific/Apia"),
+                    ("Pacific/Auckland", "Pacific/Auckland"),
+                    ("Pacific/Bougainville", "Pacific/Bougainville"),
+                    ("Pacific/Chatham", "Pacific/Chatham"),
+                    ("Pacific/Chuuk", "Pacific/Chuuk"),
+                    ("Pacific/Easter", "Pacific/Easter"),
+                    ("Pacific/Efate", "Pacific/Efate"),
+                    ("Pacific/Enderbury", "Pacific/Enderbury"),
+                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+                    ("Pacific/Fiji", "Pacific/Fiji"),
+                    ("Pacific/Funafuti", "Pacific/Funafuti"),
+                    ("Pacific/Galapagos", "Pacific/Galapagos"),
+                    ("Pacific/Gambier", "Pacific/Gambier"),
+                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+                    ("Pacific/Guam", "Pacific/Guam"),
+                    ("Pacific/Honolulu", "Pacific/Honolulu"),
+                    ("Pacific/Johnston", "Pacific/Johnston"),
+                    ("Pacific/Kanton", "Pacific/Kanton"),
+                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+                    ("Pacific/Kosrae", "Pacific/Kosrae"),
+                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+                    ("Pacific/Majuro", "Pacific/Majuro"),
+                    ("Pacific/Marquesas", "Pacific/Marquesas"),
+                    ("Pacific/Midway", "Pacific/Midway"),
+                    ("Pacific/Nauru", "Pacific/Nauru"),
+                    ("Pacific/Niue", "Pacific/Niue"),
+                    ("Pacific/Norfolk", "Pacific/Norfolk"),
+                    ("Pacific/Noumea", "Pacific/Noumea"),
+                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+                    ("Pacific/Palau", "Pacific/Palau"),
+                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+                    ("Pacific/Ponape", "Pacific/Ponape"),
+                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+                    ("Pacific/Saipan", "Pacific/Saipan"),
+                    ("Pacific/Samoa", "Pacific/Samoa"),
+                    ("Pacific/Tahiti", "Pacific/Tahiti"),
+                    ("Pacific/Tarawa", "Pacific/Tarawa"),
+                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+                    ("Pacific/Truk", "Pacific/Truk"),
+                    ("Pacific/Wake", "Pacific/Wake"),
+                    ("Pacific/Wallis", "Pacific/Wallis"),
+                    ("Pacific/Yap", "Pacific/Yap"),
+                    ("Poland", "Poland"),
+                    ("Portugal", "Portugal"),
+                    ("ROC", "ROC"),
+                    ("ROK", "ROK"),
+                    ("Singapore", "Singapore"),
+                    ("Turkey", "Turkey"),
+                    ("UCT", "UCT"),
+                    ("US/Alaska", "US/Alaska"),
+                    ("US/Aleutian", "US/Aleutian"),
+                    ("US/Arizona", "US/Arizona"),
+                    ("US/Central", "US/Central"),
+                    ("US/East-Indiana", "US/East-Indiana"),
+                    ("US/Eastern", "US/Eastern"),
+                    ("US/Hawaii", "US/Hawaii"),
+                    ("US/Indiana-Starke", "US/Indiana-Starke"),
+                    ("US/Michigan", "US/Michigan"),
+                    ("US/Mountain", "US/Mountain"),
+                    ("US/Pacific", "US/Pacific"),
+                    ("US/Samoa", "US/Samoa"),
+                    ("UTC", "UTC"),
+                    ("Universal", "Universal"),
+                    ("W-SU", "W-SU"),
+                    ("WET", "WET"),
+                    ("Zulu", "Zulu"),
+                ],
+                default="UTC",
+                max_length=255,
+            ),
         ),
         migrations.AddConstraint(
-            model_name='notification',
-            constraint=models.CheckConstraint(check=models.Q(('notification_type__in', ['FAVORITE', 'REPLY', 'MENTION', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT', 'ADD', 'REPORT', 'INVITE', 'ACCEPT', 'JOIN', 'LEAVE', 'REMOVE'])), name='notification_type_valid'),
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    (
+                        "notification_type__in",
+                        [
+                            "FAVORITE",
+                            "REPLY",
+                            "MENTION",
+                            "TAG",
+                            "FOLLOW",
+                            "FOLLOW_REQUEST",
+                            "BOOST",
+                            "IMPORT",
+                            "ADD",
+                            "REPORT",
+                            "INVITE",
+                            "ACCEPT",
+                            "JOIN",
+                            "LEAVE",
+                            "REMOVE",
+                        ],
+                    )
+                ),
+                name="notification_type_valid",
+            ),
         ),
         migrations.AddField(
-            model_name='groupmemberinvitation',
-            name='group',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_invitations', to='bookwyrm.group'),
+            model_name="groupmemberinvitation",
+            name="group",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="user_invitations",
+                to="bookwyrm.group",
+            ),
         ),
         migrations.AddField(
-            model_name='groupmemberinvitation',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='group_invitations', to=settings.AUTH_USER_MODEL),
+            model_name="groupmemberinvitation",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="group_invitations",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AddField(
-            model_name='groupmember',
-            name='group',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to='bookwyrm.group'),
+            model_name="groupmember",
+            name="group",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="memberships",
+                to="bookwyrm.group",
+            ),
         ),
         migrations.AddField(
-            model_name='groupmember',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to=settings.AUTH_USER_MODEL),
+            model_name="groupmember",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="memberships",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AddField(
-            model_name='group',
-            name='user',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="group",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
-            model_name='list',
-            name='group',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.group'),
+            model_name="list",
+            name="group",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.group",
+            ),
         ),
         migrations.AddField(
-            model_name='notification',
-            name='related_group',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to='bookwyrm.group'),
+            model_name="notification",
+            name="related_group",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="notifications",
+                to="bookwyrm.group",
+            ),
         ),
         migrations.AddConstraint(
-            model_name='groupmemberinvitation',
-            constraint=models.UniqueConstraint(fields=('group', 'user'), name='unique_invitation'),
+            model_name="groupmemberinvitation",
+            constraint=models.UniqueConstraint(
+                fields=("group", "user"), name="unique_invitation"
+            ),
         ),
         migrations.AddConstraint(
-            model_name='groupmember',
-            constraint=models.UniqueConstraint(fields=('group', 'user'), name='unique_membership'),
+            model_name="groupmember",
+            constraint=models.UniqueConstraint(
+                fields=("group", "user"), name="unique_membership"
+            ),
         ),
     ]
diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index f10cb3312..49a7d754a 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -37,6 +37,7 @@ class GroupMember(models.Model):
 
     class Meta:
         """Users can only have one membership per group"""
+
         constraints = [
             models.UniqueConstraint(fields=["group", "user"], name="unique_membership")
         ]
@@ -85,6 +86,7 @@ class GroupMemberInvitation(models.Model):
 
     class Meta:
         """Users can only have one outstanding invitation per group"""
+
         constraints = [
             models.UniqueConstraint(fields=["group", "user"], name="unique_invitation")
         ]
diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
index ac09c22b3..571194d29 100644
--- a/bookwyrm/tests/views/test_group.py
+++ b/bookwyrm/tests/views/test_group.py
@@ -38,10 +38,7 @@ class GroupViews(TestCase):
             )
 
             self.testgroup = models.Group.objects.create(
-              id=999,
-              name="Test Group",
-              user=self.local_user,
-              privacy="public"
+                id=999, name="Test Group", user=self.local_user, privacy="public"
             )
             self.membership = models.GroupMember.objects.create(
                 group=self.testgroup, user=self.local_user
@@ -83,11 +80,11 @@ class GroupViews(TestCase):
         """edit a "group" database entry"""
         view = views.Group.as_view()
         view.post(
-          group_id=999,
-          name="Test Group",
-          user=self.local_user,
-          privacy="public",
-          description="Test description",
+            group_id=999,
+            name="Test Group",
+            user=self.local_user,
+            privacy="public",
+            description="Test description",
         )
 
-        self.assertEqual("Test description", self.testgroup.description)
\ No newline at end of file
+        self.assertEqual("Test description", self.testgroup.description)
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index bbc2edd40..b5a3f9e13 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -146,7 +146,8 @@ class Groups(View):
         user = get_user_from_username(request.user, username)
 
         paginated = Paginator(
-            models.Group.memberships.filter(user=user).order_by("-created_date"), PAGE_LENGTH
+            models.Group.memberships.filter(user=user).order_by("-created_date"),
+            PAGE_LENGTH,
         )
         data = {
             "user": user,

From ec7d0db8430bf447f714ef88ec679360721b89db Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 5 Oct 2021 21:48:59 +1100
Subject: [PATCH 091/193] linting fixes

---
 bookwyrm/static/js/bookwyrm.js                |  6 ++--
 bookwyrm/templates/groups/find_users.html     |  2 +-
 bookwyrm/templates/groups/group.html          | 30 +++++++++----------
 bookwyrm/templates/groups/members.html        |  2 +-
 .../templates/notifications/items/accept.html |  2 +-
 .../templates/notifications/items/invite.html |  2 +-
 .../templates/notifications/items/join.html   |  2 +-
 7 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 5bf845a4e..66fd5a615 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -134,8 +134,10 @@ let BookWyrm = new class {
         let trigger = event.currentTarget;
         let hidden = trigger.closest('.hidden-form').querySelectorAll('.is-hidden')[0];
 
-        // if the form has already been revealed, there is no '.is-hidden' element
-        // so this doesn't really work as a toggle
+        /**
+         * if the form has already been revealed, there is no '.is-hidden' element
+         * so this doesn't really work as a toggle 
+         */
 
         if (hidden) {
           this.addRemoveClass(hidden, 'is-hidden', !hidden);
diff --git a/bookwyrm/templates/groups/find_users.html b/bookwyrm/templates/groups/find_users.html
index ec890a93d..57d4277c1 100644
--- a/bookwyrm/templates/groups/find_users.html
+++ b/bookwyrm/templates/groups/find_users.html
@@ -5,4 +5,4 @@
         Add new members!
     </h2>
     {% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 408f1f945..03ccae18f 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -64,21 +64,21 @@
 
     {% if group.user == request.user %}
     <section class="column is-one-quarter">
-      <div class="block">
-          <h2 class="title is-5">Find new members</h2>
-          <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
-              <div class="control">
-                  <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
-              </div>
-              <div class="control">
-                  <button class="button" type="submit">
-                      <span class="icon icon-search" title="{% trans 'Search' %}">
-                          <span class="is-sr-only">{% trans "Search" %}</span>
-                      </span>
-                  </button>
-              </div>
-          </form>
-      </div>
+        <div class="block">
+            <h2 class="title is-5">Find new members</h2>
+            <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
+                <div class="control">
+                    <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
+                </div>
+                <div class="control">
+                    <button class="button" type="submit">
+                        <span class="icon icon-search" title="{% trans 'Search' %}">
+                            <span class="is-sr-only">{% trans "Search" %}</span>
+                        </span>
+                    </button>
+                </div>
+            </form>
+        </div>
     </section>
     {% endif %}
 
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index f8eefaff4..22eb0cb6a 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -45,4 +45,4 @@
         {% endif %}
     </button>
 </form>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/bookwyrm/templates/notifications/items/accept.html b/bookwyrm/templates/notifications/items/accept.html
index 5aab79af0..19acab15e 100644
--- a/bookwyrm/templates/notifications/items/accept.html
+++ b/bookwyrm/templates/notifications/items/accept.html
@@ -17,4 +17,4 @@
     accepted your invitation to join group "<a href="{{ group_path }}">{{ group_name }}</a>"
     {% endblocktrans %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/bookwyrm/templates/notifications/items/invite.html b/bookwyrm/templates/notifications/items/invite.html
index c50dba06d..63a462608 100644
--- a/bookwyrm/templates/notifications/items/invite.html
+++ b/bookwyrm/templates/notifications/items/invite.html
@@ -4,7 +4,7 @@
 {% load utilities %}
 
 {% block primary_link %}{% spaceless %}
-  {{ notification.related_group.local_path }}
+    {{ notification.related_group.local_path }}
 {% endspaceless %}{% endblock %}
 
 {% block icon %}
diff --git a/bookwyrm/templates/notifications/items/join.html b/bookwyrm/templates/notifications/items/join.html
index 3dbc8159c..9c766806f 100644
--- a/bookwyrm/templates/notifications/items/join.html
+++ b/bookwyrm/templates/notifications/items/join.html
@@ -4,7 +4,7 @@
 {% load utilities %}
 
 {% block primary_link %}{% spaceless %}
-  {{ notification.related_group.local_path }}
+    {{ notification.related_group.local_path }}
 {% endspaceless %}{% endblock %}
 
 {% block icon %}

From 3003b103e4797d29b4991768f69a8c6ac276c79a Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 8 Oct 2021 08:38:00 +1100
Subject: [PATCH 092/193] add group views tests

TODO: the POST test needs to test that the group was actually updated.
---
 bookwyrm/tests/views/test_group.py | 34 ++++++++++++++++++------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
index 571194d29..49d3b63f3 100644
--- a/bookwyrm/tests/views/test_group.py
+++ b/bookwyrm/tests/views/test_group.py
@@ -1,11 +1,12 @@
 """ test for app action functionality """
 from unittest.mock import patch
+from django.contrib.auth import decorators
 
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models, views
+from bookwyrm import models, views, forms
 from bookwyrm.tests.validate_html import validate_html
 
 
@@ -51,7 +52,7 @@ class GroupViews(TestCase):
         view = views.Group.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        result = view(request)
+        result = view(request, group_id=999)
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
@@ -61,7 +62,7 @@ class GroupViews(TestCase):
         view = views.UserGroups.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        result = view(request)
+        result = view(request, username="mouse@local.com")
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
@@ -71,20 +72,25 @@ class GroupViews(TestCase):
         view = views.FindUsers.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        result = view(request)
+        result = view(request,group_id=999)
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
     def test_group_post(self, _):
-        """edit a "group" database entry"""
-        view = views.Group.as_view()
-        view.post(
-            group_id=999,
-            name="Test Group",
-            user=self.local_user,
-            privacy="public",
-            description="Test description",
-        )
+        """test editing a "group" database entry"""
 
-        self.assertEqual("Test description", self.testgroup.description)
+        view = views.Group.as_view()
+        group_fields = {
+            "name": "Updated Group",
+            "privacy": "private",
+            "description": "Test description",
+            "user": self.local_user
+        }
+        request = self.factory.post("", group_fields)
+        request.user = self.local_user
+
+        result = view(request, group_id=999)
+        self.assertEqual(result.status_code, 302)
+
+        # TODO: test group was updated.

From 48fc85c7613b06bb64abddec317b0892282c8d50 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 8 Oct 2021 18:45:28 +1100
Subject: [PATCH 093/193] adjust commenting on js file

---
 bookwyrm/static/js/bookwyrm.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 66fd5a615..0eebc75b2 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -126,19 +126,14 @@ let BookWyrm = new class {
 
     /**
      * Show form.
-     *
+     * If the form has already been revealed, there is no '.is-hidden' element
+     * so this doesn't work as a toggle - use hideForm to hide it again
      * @param  {Event} event
      * @return {undefined}
      */
     revealForm(event) {
         let trigger = event.currentTarget;
         let hidden = trigger.closest('.hidden-form').querySelectorAll('.is-hidden')[0];
-
-        /**
-         * if the form has already been revealed, there is no '.is-hidden' element
-         * so this doesn't really work as a toggle 
-         */
-
         if (hidden) {
           this.addRemoveClass(hidden, 'is-hidden', !hidden);
         }

From 05bde27944e5b273421e38ca6bf336880723045d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 8 Oct 2021 18:46:30 +1100
Subject: [PATCH 094/193] remove commented out code

---
 bookwyrm/models/group.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 49a7d754a..febbc91d0 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -7,9 +7,6 @@ from .base_model import BookWyrmModel
 from . import fields
 from .relationship import UserBlocks
 
-# from .user import User
-
-
 class Group(BookWyrmModel):
     """A group of users"""
 

From 5a4026cda3bd7a73b99851cb8738770801fc1dec Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 8 Oct 2021 18:47:03 +1100
Subject: [PATCH 095/193] group views tests

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

diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
index 49d3b63f3..c8e6208a1 100644
--- a/bookwyrm/tests/views/test_group.py
+++ b/bookwyrm/tests/views/test_group.py
@@ -93,4 +93,4 @@ class GroupViews(TestCase):
         result = view(request, group_id=999)
         self.assertEqual(result.status_code, 302)
 
-        # TODO: test group was updated.
+        # TODO: test that group was updated.

From 056150d583a954c66e3c2c4d0978538dba779382 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 8 Oct 2021 21:21:19 +1100
Subject: [PATCH 096/193] CASCADE group.user

Delete groups when group.user is deleted.
---
 bookwyrm/models/group.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index febbc91d0..f1005d4cf 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -11,7 +11,7 @@ class Group(BookWyrmModel):
     """A group of users"""
 
     name = fields.CharField(max_length=100)
-    user = fields.ForeignKey("User", on_delete=models.PROTECT)
+    user = fields.ForeignKey("User", on_delete=models.CASCADE)
     description = fields.TextField(blank=True, null=True)
     privacy = fields.PrivacyField()
 

From 714a36924641b746402374371bb5072cd249c9a3 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 9 Oct 2021 16:10:00 +1100
Subject: [PATCH 097/193] only show list edit form to list.user

---
 bookwyrm/templates/lists/layout.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/layout.html b/bookwyrm/templates/lists/layout.html
index 914478abb..6e772221a 100644
--- a/bookwyrm/templates/lists/layout.html
+++ b/bookwyrm/templates/lists/layout.html
@@ -25,7 +25,9 @@
 </div>
 
 <div class="block">
-    {% include 'lists/edit_form.html' with controls_text="edit_list" user_groups=user_groups %}
+    {% if request.user == list.user %}
+        {% include 'lists/edit_form.html' with controls_text="edit_list" user_groups=user_groups %}
+    {% endif %}
 </div>
 
 {% block panel %}{% endblock %}

From 1bf5758e01b20c90baf1ba2b4f9085a3e61c8a9d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 9 Oct 2021 16:11:11 +1100
Subject: [PATCH 098/193] overide filters for groups and group lists

- use more sensible query for displaying groups on user page
- privacy_filter now allows group members to see followers_only and private lists and groups they would otherwise not see
---
 bookwyrm/models/group.py                   | 16 ++++++++++++++++
 bookwyrm/models/list.py                    | 17 +++++++++++++++++
 bookwyrm/templates/groups/user_groups.html |  4 +---
 bookwyrm/views/group.py                    | 13 ++++---------
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index f1005d4cf..89fb3a0e5 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -19,6 +19,22 @@ class Group(BookWyrmModel):
         """don't want the user to be in there in this case"""
         return f"https://{DOMAIN}/group/{self.id}"
 
+    @classmethod
+    def followers_filter(cls, queryset, viewer):
+        """Override filter for "followers" privacy level to allow non-following group members to see the existence of groups and group lists"""
+
+        return queryset.exclude(
+            ~Q(  # user isn't following and it isn't their own status and they are not a group member
+                Q(user__followers=viewer) | Q(user=viewer) | Q(memberships__user=viewer)
+            ),
+            privacy="followers",  # and the status of the group is followers only
+        )
+
+    @classmethod
+    def direct_filter(cls, queryset, viewer):
+        """Override filter for "direct" privacy level to allow group members to see the existence of groups and group lists"""
+
+        return queryset.exclude(~Q(memberships__user=viewer), privacy="direct")
 
 class GroupMember(models.Model):
     """Users who are members of a group"""
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 8a083b690..b0222cefa 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -1,6 +1,7 @@
 """ make a list of books!! """
 from django.apps import apps
 from django.db import models
+from django.db.models import Q
 from django.utils import timezone
 
 from bookwyrm import activitypub
@@ -71,6 +72,22 @@ class List(OrderedCollectionMixin, BookWyrmModel):
             return
         super().raise_not_editable(viewer)
 
+    @classmethod
+    def followers_filter(cls, queryset, viewer):
+        """Override filter for "followers" privacy level to allow non-following group members to see the existence of group lists"""
+
+        return queryset.exclude(
+            ~Q(  # user isn't following and it isn't their own status and they are not a group member
+                Q(user__followers=viewer) | Q(user=viewer) | Q(group__memberships__user=viewer)
+            ),
+            privacy="followers",  # and the status (of the list) is followers only
+        )
+
+    @classmethod
+    def direct_filter(cls, queryset, viewer):
+        """Override filter for "direct" privacy level to allow group members to see the existence of group lists"""
+
+        return queryset.exclude(~Q(group__memberships__user=viewer), privacy="direct")
 
 class ListItem(CollectionItemMixin, BookWyrmModel):
     """ok"""
diff --git a/bookwyrm/templates/groups/user_groups.html b/bookwyrm/templates/groups/user_groups.html
index f68994dc1..cc27ce42d 100644
--- a/bookwyrm/templates/groups/user_groups.html
+++ b/bookwyrm/templates/groups/user_groups.html
@@ -3,8 +3,7 @@
 {% load interaction %}
 
 <div class="columns is-multiline">
-    {% for membership in memberships %}
-    {% with group=membership.group %}
+    {% for group in groups %}
     <div class="column is-one-quarter">
         <div class="card is-stretchable">
             <header class="card-header">
@@ -32,6 +31,5 @@
             </div>
         </div>
     </div>
-    {% endwith %}
     {% endfor %}
 </div>
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 4a6a80954..c66dcdd05 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -24,11 +24,8 @@ class Group(View):
         """display a group"""
 
         group = get_object_or_404(models.Group, id=group_id)
-        lists = models.List.objects.filter(group=group).order_by("-updated_date")
-        # lists = privacy_filter(request.user, lists)
-
-        # don't show groups to users who shouldn't see them
         group.raise_visible_to_user(request.user)
+        lists = models.List.privacy_filter(request.user).filter(group=group).order_by("-updated_date")
 
         data = {
             "group": group,
@@ -56,13 +53,11 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        memberships = (
-            models.GroupMember.objects.filter(user=user).all().order_by("-updated_date")
-        )
-        paginated = Paginator(memberships, 12)
+        groups = models.Group.privacy_filter(request.user).filter(memberships__user=user).order_by("-updated_date")
+        paginated = Paginator(groups, 12)
 
         data = {
-            "memberships": paginated.get_page(request.GET.get("page")),
+            "groups": paginated.get_page(request.GET.get("page")),
             "is_self": request.user.id == user.id,
             "user": user,
             "group_form": forms.GroupForm(),

From 9940abfd81232dd4da3cd79eb72e45de11d43155 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 9 Oct 2021 22:11:46 +1100
Subject: [PATCH 099/193] refactor removing user from group

This is in preparation for removing a user and their lists when the group owner blocks them.
Remove the user via models.group
Remove the lists via models.list
---
 bookwyrm/models/group.py |  9 +++++++++
 bookwyrm/models/list.py  | 20 +++++++++++++++++++-
 bookwyrm/views/group.py  | 13 ++++++-------
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 89fb3a0e5..88320cf90 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -85,6 +85,15 @@ class GroupMember(models.Model):
             group=join_request.group,
         )
 
+    @classmethod
+    def remove(cls, owner, user):
+        """remove a user from a group"""
+
+        memberships = cls.objects.filter(group__user=owner, user=user).all()
+        for m in memberships:
+            # remove this user
+            m.delete()
+
 
 class GroupMemberInvitation(models.Model):
     """adding a user to a group requires manual confirmation"""
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index b0222cefa..295032f58 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -2,6 +2,7 @@
 from django.apps import apps
 from django.db import models
 from django.db.models import Q
+from django.db.models.fields import NullBooleanField
 from django.utils import timezone
 
 from bookwyrm import activitypub
@@ -87,7 +88,24 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     def direct_filter(cls, queryset, viewer):
         """Override filter for "direct" privacy level to allow group members to see the existence of group lists"""
 
-        return queryset.exclude(~Q(group__memberships__user=viewer), privacy="direct")
+        return queryset.exclude(
+          ~Q( # user not self and not in the group if this is a group list
+              Q(user=viewer) | Q(group__memberships__user=viewer)
+          ), 
+          privacy="direct"
+        )
+
+    @classmethod
+    def remove_from_group(cls, owner, user):
+        """remove a list from a group"""
+
+        memberships = GroupMember.objects.filter(group__user=owner, user=user).all()
+        for m in memberships:
+            # remove this user's group-curated lists from the group
+            cls.objects.filter(group=m.group, user=m.user).update(
+                group=None, curation="closed"
+            )
+
 
 class ListItem(CollectionItemMixin, BookWyrmModel):
     """ok"""
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index c66dcdd05..6ef215830 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -163,6 +163,10 @@ def remove_member(request):
     if not user:
         return HttpResponseBadRequest()
 
+    # you can't be removed from your own group
+    if request.POST["user"]== group.user:
+        return HttpResponseBadRequest()
+
     is_member = models.GroupMember.objects.filter(group=group, user=user).exists()
     is_invited = models.GroupMemberInvitation.objects.filter(
         group=group, user=user
@@ -182,13 +186,8 @@ def remove_member(request):
     if is_member:
 
         try:
-            membership = models.GroupMember.objects.get(group=group, user=user)
-            membership.delete()
-
-            # remove this user's group-curated lists from the group
-            models.List.objects.filter(group=group, user=user).update(
-                group=None, curation="closed"
-            )
+            models.List.remove_from_group(group.user, user)
+            models.GroupMember.remove(group.user, user)
 
         except IntegrityError:
             pass

From b3cc9e5b75917e7d514a8b7f9b911ace1f5e397d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 9 Oct 2021 22:13:12 +1100
Subject: [PATCH 100/193] remove user and their lists from group when
 group.user blocks them

Lists are changed to closed curation with no group.
---
 bookwyrm/views/preferences/block.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bookwyrm/views/preferences/block.py b/bookwyrm/views/preferences/block.py
index 1eccf4612..2ccd3c065 100644
--- a/bookwyrm/views/preferences/block.py
+++ b/bookwyrm/views/preferences/block.py
@@ -23,6 +23,10 @@ class Block(View):
         models.UserBlocks.objects.create(
             user_subject=request.user, user_object=to_block
         )
+        # remove the blocked users's lists from the groups
+        models.List.remove_from_group(request.user, to_block)
+        # remove the blocked user from all blocker's owned groups
+        models.GroupMember.remove(request.user, to_block)
         return redirect("prefs-block")
 
 

From 252ff0d689ed37e5bf744079e785c1ab0228f0be Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 9 Oct 2021 22:15:24 +1100
Subject: [PATCH 101/193] emblacken files

Wouldn't it be great if I just remembered to run Black before every commit?
---
 bookwyrm/models/group.py           |  2 ++
 bookwyrm/models/list.py            | 12 +++++++-----
 bookwyrm/tests/views/test_group.py |  4 ++--
 bookwyrm/views/group.py            | 14 +++++++++++---
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 88320cf90..907168699 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -7,6 +7,7 @@ from .base_model import BookWyrmModel
 from . import fields
 from .relationship import UserBlocks
 
+
 class Group(BookWyrmModel):
     """A group of users"""
 
@@ -36,6 +37,7 @@ class Group(BookWyrmModel):
 
         return queryset.exclude(~Q(memberships__user=viewer), privacy="direct")
 
+
 class GroupMember(models.Model):
     """Users who are members of a group"""
 
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 295032f58..202c830c1 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -79,7 +79,9 @@ class List(OrderedCollectionMixin, BookWyrmModel):
 
         return queryset.exclude(
             ~Q(  # user isn't following and it isn't their own status and they are not a group member
-                Q(user__followers=viewer) | Q(user=viewer) | Q(group__memberships__user=viewer)
+                Q(user__followers=viewer)
+                | Q(user=viewer)
+                | Q(group__memberships__user=viewer)
             ),
             privacy="followers",  # and the status (of the list) is followers only
         )
@@ -89,10 +91,10 @@ class List(OrderedCollectionMixin, BookWyrmModel):
         """Override filter for "direct" privacy level to allow group members to see the existence of group lists"""
 
         return queryset.exclude(
-          ~Q( # user not self and not in the group if this is a group list
-              Q(user=viewer) | Q(group__memberships__user=viewer)
-          ), 
-          privacy="direct"
+            ~Q(  # user not self and not in the group if this is a group list
+                Q(user=viewer) | Q(group__memberships__user=viewer)
+            ),
+            privacy="direct",
         )
 
     @classmethod
diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
index c8e6208a1..3b0aa236c 100644
--- a/bookwyrm/tests/views/test_group.py
+++ b/bookwyrm/tests/views/test_group.py
@@ -72,7 +72,7 @@ class GroupViews(TestCase):
         view = views.FindUsers.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        result = view(request,group_id=999)
+        result = view(request, group_id=999)
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
@@ -85,7 +85,7 @@ class GroupViews(TestCase):
             "name": "Updated Group",
             "privacy": "private",
             "description": "Test description",
-            "user": self.local_user
+            "user": self.local_user,
         }
         request = self.factory.post("", group_fields)
         request.user = self.local_user
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 6ef215830..3e510a4d4 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -25,7 +25,11 @@ class Group(View):
 
         group = get_object_or_404(models.Group, id=group_id)
         group.raise_visible_to_user(request.user)
-        lists = models.List.privacy_filter(request.user).filter(group=group).order_by("-updated_date")
+        lists = (
+            models.List.privacy_filter(request.user)
+            .filter(group=group)
+            .order_by("-updated_date")
+        )
 
         data = {
             "group": group,
@@ -53,7 +57,11 @@ class UserGroups(View):
     def get(self, request, username):
         """display a group"""
         user = get_user_from_username(request.user, username)
-        groups = models.Group.privacy_filter(request.user).filter(memberships__user=user).order_by("-updated_date")
+        groups = (
+            models.Group.privacy_filter(request.user)
+            .filter(memberships__user=user)
+            .order_by("-updated_date")
+        )
         paginated = Paginator(groups, 12)
 
         data = {
@@ -164,7 +172,7 @@ def remove_member(request):
         return HttpResponseBadRequest()
 
     # you can't be removed from your own group
-    if request.POST["user"]== group.user:
+    if request.POST["user"] == group.user:
         return HttpResponseBadRequest()
 
     is_member = models.GroupMember.objects.filter(group=group, user=user).exists()

From 83f46b6cdacb26aee0287f831685aaea73731d5b Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 12:01:21 +1100
Subject: [PATCH 102/193] remove print() statement

Whoops accidentally left this behind from manual troubleshooting
---
 bookwyrm/models/list.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 202c830c1..b06cdef8c 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -62,7 +62,6 @@ class List(OrderedCollectionMixin, BookWyrmModel):
 
     def raise_not_editable(self, viewer):
         """the associated user OR the list owner can edit"""
-        print("raising not editable")
         if self.user == viewer:
             return
         # group members can edit items in group lists

From d6a5794ac3039e37b4d0ae044f387cc3e921197e Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 12:02:27 +1100
Subject: [PATCH 103/193] do not load list edit form if viewer not
 authenticated

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

diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index d909f5e81..49091bcf0 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -22,10 +22,11 @@
     </div>
     {% endif %}
 </header>
-
+{% if request.user.is_authenticated %}
 <div class="block">
     {% include 'lists/create_form.html' with controls_text="create_list" %}
 </div>
+{% endif %}
 
 {% if request.user.is_authenticated %}
 <nav class="tabs">

From 18735bdd4228ab86323968d6ffa40dbf218e5ed4 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 12:04:03 +1100
Subject: [PATCH 104/193] use update() to remove orphaned groups on list edit

Using add() broadcasts the database change, which is unnecessary potentially broadcast AP messages twice.
---
 bookwyrm/views/list.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 21c5d4cd4..5dae128e6 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -58,8 +58,7 @@ class Lists(View):
         book_list = form.save()
         # list should not have a group if it is not group curated
         if not book_list.curation == "group":
-            book_list.group = None
-            book_list.save()
+            models.List.objects.filter(id=book_list.id).update(group=None)
 
         return redirect(book_list.local_path)
 
@@ -184,7 +183,6 @@ class List(View):
         return TemplateResponse(request, "lists/list.html", data)
 
     @method_decorator(login_required, name="dispatch")
-    # pylint: disable=unused-argument
     def post(self, request, list_id):
         """edit a list"""
         book_list = get_object_or_404(models.List, id=list_id)
@@ -195,8 +193,7 @@ class List(View):
             return redirect("list", book_list.id)
         book_list = form.save()
         if not book_list.curation == "group":
-            book_list.group = None
-            book_list.save()
+            models.List.objects.filter(id=book_list.id).update(group=None)
         return redirect(book_list.local_path)
 
 

From 8ae20928bb79341085de00c85bbf0492e649cd8e Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 12:06:54 +1100
Subject: [PATCH 105/193] add tests for groups

---
 bookwyrm/tests/models/test_group.py | 116 ++++++++++++++++++++++++++++
 bookwyrm/tests/views/test_group.py  |  56 ++++++++++----
 2 files changed, 158 insertions(+), 14 deletions(-)
 create mode 100644 bookwyrm/tests/models/test_group.py

diff --git a/bookwyrm/tests/models/test_group.py b/bookwyrm/tests/models/test_group.py
new file mode 100644
index 000000000..1e0d9fc0b
--- /dev/null
+++ b/bookwyrm/tests/models/test_group.py
@@ -0,0 +1,116 @@
+""" testing models """
+from unittest.mock import patch
+from django.test import TestCase
+
+from bookwyrm import models, settings
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+class Group(TestCase):
+    """some activitypub oddness ahead"""
+
+    def setUp(self):
+        """Set up for tests"""
+
+        self.owner_user = models.User.objects.create_user(
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
+
+        self.rat = models.User.objects.create_user(
+            "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
+        )
+
+        self.badger = models.User.objects.create_user(
+            "badger", "badger@badger.badger", "badgerword", local=True, localname="badger"
+        )
+
+        self.capybara = models.User.objects.create_user(
+            "capybara", "capybara@capybara.capybara", "capybaraword", local=True, localname="capybara"
+        )
+
+        self.public_group = models.Group.objects.create(
+            name="Public Group", 
+            description="Initial description",
+            user=self.owner_user, 
+            privacy="public"
+        )
+
+        self.private_group = models.Group.objects.create(
+            name="Private Group", 
+            description="Top secret",
+            user=self.owner_user, 
+            privacy="direct"
+        )
+
+        self.followers_only_group = models.Group.objects.create(
+            name="Followers Group", 
+            description="No strangers",
+            user=self.owner_user, 
+            privacy="followers"
+        )
+
+        self.followers_list = models.List.objects.create(
+            name="Followers List",
+            curation="group",
+            privacy="followers",
+            group=self.public_group,
+            user=self.owner_user
+        )
+
+        self.private_list = models.List.objects.create(
+            name="Private List",
+            privacy="direct",
+            curation="group",
+            group=self.public_group,
+            user=self.owner_user
+        )
+
+        models.GroupMember.objects.create(
+            group=self.private_group, user=self.badger
+        )
+        models.GroupMember.objects.create(
+            group=self.followers_only_group, user=self.badger
+        )
+        models.GroupMember.objects.create(
+            group=self.public_group, user=self.capybara
+        )
+
+    def test_group_members_can_see_followers_only_groups(self, _):
+        """follower-only group should not be excluded from group listings for group members viewing"""
+
+        rat_groups = models.Group.privacy_filter(self.rat).all()
+        badger_groups = models.Group.privacy_filter(self.badger).all()
+
+        self.assertFalse(self.followers_only_group in rat_groups)
+        self.assertTrue(self.followers_only_group in badger_groups)
+
+    def test_group_members_can_see_private_groups(self, _):
+        """direct privacy group should not be excluded from group listings for group members viewing"""
+
+        rat_groups = models.Group.privacy_filter(self.rat).all()
+        badger_groups = models.Group.privacy_filter(self.badger).all()
+
+        self.assertFalse(self.private_group in rat_groups)
+        self.assertTrue(self.private_group in badger_groups)
+
+    def test_group_members_can_see_followers_only_lists(self, _):
+        """follower-only group booklists should not be excluded from group booklist listing for group members who do not follower list owner"""
+
+        rat_lists = models.List.privacy_filter(self.rat).all()
+        badger_lists = models.List.privacy_filter(self.badger).all()
+        capybara_lists = models.List.privacy_filter(self.capybara).all()
+
+        self.assertFalse(self.followers_list in rat_lists)
+        self.assertFalse(self.followers_list in badger_lists)
+        self.assertTrue(self.followers_list in capybara_lists)
+        
+    def test_group_members_can_see_private_lists(self, _):
+        """private group booklists should not be excluded from group booklist listing for group members"""
+
+        rat_lists = models.List.privacy_filter(self.rat).all()
+        badger_lists = models.List.privacy_filter(self.badger).all()
+        capybara_lists = models.List.privacy_filter(self.capybara).all()
+
+        self.assertFalse(self.private_list in rat_lists)
+        self.assertFalse(self.private_list in badger_lists)
+        self.assertTrue(self.private_list in capybara_lists)
diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
index 3b0aa236c..e18fc7143 100644
--- a/bookwyrm/tests/views/test_group.py
+++ b/bookwyrm/tests/views/test_group.py
@@ -39,7 +39,10 @@ class GroupViews(TestCase):
             )
 
             self.testgroup = models.Group.objects.create(
-                id=999, name="Test Group", user=self.local_user, privacy="public"
+                name="Test Group", 
+                description="Initial description",
+                user=self.local_user, 
+                privacy="public"
             )
             self.membership = models.GroupMember.objects.create(
                 group=self.testgroup, user=self.local_user
@@ -52,7 +55,7 @@ class GroupViews(TestCase):
         view = views.Group.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        result = view(request, group_id=999)
+        result = view(request, group_id=self.testgroup.id)
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
@@ -72,25 +75,50 @@ class GroupViews(TestCase):
         view = views.FindUsers.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        result = view(request, group_id=999)
+        result = view(request, group_id=self.testgroup.id)
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
-    def test_group_post(self, _):
+    def test_group_create(self, _):
+        """create group view"""
+        view = views.UserGroups.as_view()
+        request = self.factory.post(
+            "",
+            {
+                "name": "A group",
+                "description": "wowzers",
+                "privacy": "unlisted",
+                "user": self.local_user.id,
+            },
+        )
+        request.user = self.local_user
+        result = view(request, "username")
+
+        self.assertEqual(result.status_code, 302)
+        new_group = models.Group.objects.filter(name="A group").get()
+        self.assertEqual(new_group.description, "wowzers")
+        self.assertEqual(new_group.privacy, "unlisted")
+        self.assertTrue(models.GroupMember.objects.filter(group=new_group, user=self.local_user).exists())
+
+    def test_group_edit(self, _):
         """test editing a "group" database entry"""
 
         view = views.Group.as_view()
-        group_fields = {
-            "name": "Updated Group",
-            "privacy": "private",
-            "description": "Test description",
-            "user": self.local_user,
-        }
-        request = self.factory.post("", group_fields)
+        request = self.factory.post(
+          "",
+          {
+              "name": "Updated Group name",
+              "description": "wow",
+              "privacy": "direct",
+              "user": self.local_user.id,
+          }
+        )
         request.user = self.local_user
 
-        result = view(request, group_id=999)
+        result = view(request, group_id=self.testgroup.id)
         self.assertEqual(result.status_code, 302)
-
-        # TODO: test that group was updated.
+        self.testgroup.refresh_from_db()
+        self.assertEqual(self.testgroup.name, "Updated Group name")
+        self.assertEqual(self.testgroup.description, "wow")
+        self.assertEqual(self.testgroup.privacy, "direct")

From 2a78c1221cc5c873a2c944aec6980ec072309170 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 12:33:11 +1100
Subject: [PATCH 106/193] style cleanup

Even tests must be formatted to please Black...
---
 bookwyrm/tests/models/test_group.py | 44 ++++++++++++++++-------------
 bookwyrm/tests/views/test_group.py  | 26 +++++++++--------
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/bookwyrm/tests/models/test_group.py b/bookwyrm/tests/models/test_group.py
index 1e0d9fc0b..910c342a7 100644
--- a/bookwyrm/tests/models/test_group.py
+++ b/bookwyrm/tests/models/test_group.py
@@ -21,32 +21,40 @@ class Group(TestCase):
         )
 
         self.badger = models.User.objects.create_user(
-            "badger", "badger@badger.badger", "badgerword", local=True, localname="badger"
+            "badger",
+            "badger@badger.badger",
+            "badgerword",
+            local=True,
+            localname="badger",
         )
 
         self.capybara = models.User.objects.create_user(
-            "capybara", "capybara@capybara.capybara", "capybaraword", local=True, localname="capybara"
+            "capybara",
+            "capybara@capybara.capybara",
+            "capybaraword",
+            local=True,
+            localname="capybara",
         )
 
         self.public_group = models.Group.objects.create(
-            name="Public Group", 
+            name="Public Group",
             description="Initial description",
-            user=self.owner_user, 
-            privacy="public"
+            user=self.owner_user,
+            privacy="public",
         )
 
         self.private_group = models.Group.objects.create(
-            name="Private Group", 
+            name="Private Group",
             description="Top secret",
-            user=self.owner_user, 
-            privacy="direct"
+            user=self.owner_user,
+            privacy="direct",
         )
 
         self.followers_only_group = models.Group.objects.create(
-            name="Followers Group", 
+            name="Followers Group",
             description="No strangers",
-            user=self.owner_user, 
-            privacy="followers"
+            user=self.owner_user,
+            privacy="followers",
         )
 
         self.followers_list = models.List.objects.create(
@@ -54,7 +62,7 @@ class Group(TestCase):
             curation="group",
             privacy="followers",
             group=self.public_group,
-            user=self.owner_user
+            user=self.owner_user,
         )
 
         self.private_list = models.List.objects.create(
@@ -62,18 +70,14 @@ class Group(TestCase):
             privacy="direct",
             curation="group",
             group=self.public_group,
-            user=self.owner_user
+            user=self.owner_user,
         )
 
-        models.GroupMember.objects.create(
-            group=self.private_group, user=self.badger
-        )
+        models.GroupMember.objects.create(group=self.private_group, user=self.badger)
         models.GroupMember.objects.create(
             group=self.followers_only_group, user=self.badger
         )
-        models.GroupMember.objects.create(
-            group=self.public_group, user=self.capybara
-        )
+        models.GroupMember.objects.create(group=self.public_group, user=self.capybara)
 
     def test_group_members_can_see_followers_only_groups(self, _):
         """follower-only group should not be excluded from group listings for group members viewing"""
@@ -103,7 +107,7 @@ class Group(TestCase):
         self.assertFalse(self.followers_list in rat_lists)
         self.assertFalse(self.followers_list in badger_lists)
         self.assertTrue(self.followers_list in capybara_lists)
-        
+
     def test_group_members_can_see_private_lists(self, _):
         """private group booklists should not be excluded from group booklist listing for group members"""
 
diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
index e18fc7143..e4084b525 100644
--- a/bookwyrm/tests/views/test_group.py
+++ b/bookwyrm/tests/views/test_group.py
@@ -39,10 +39,10 @@ class GroupViews(TestCase):
             )
 
             self.testgroup = models.Group.objects.create(
-                name="Test Group", 
+                name="Test Group",
                 description="Initial description",
-                user=self.local_user, 
-                privacy="public"
+                user=self.local_user,
+                privacy="public",
             )
             self.membership = models.GroupMember.objects.create(
                 group=self.testgroup, user=self.local_user
@@ -99,20 +99,24 @@ class GroupViews(TestCase):
         new_group = models.Group.objects.filter(name="A group").get()
         self.assertEqual(new_group.description, "wowzers")
         self.assertEqual(new_group.privacy, "unlisted")
-        self.assertTrue(models.GroupMember.objects.filter(group=new_group, user=self.local_user).exists())
+        self.assertTrue(
+            models.GroupMember.objects.filter(
+                group=new_group, user=self.local_user
+            ).exists()
+        )
 
     def test_group_edit(self, _):
         """test editing a "group" database entry"""
 
         view = views.Group.as_view()
         request = self.factory.post(
-          "",
-          {
-              "name": "Updated Group name",
-              "description": "wow",
-              "privacy": "direct",
-              "user": self.local_user.id,
-          }
+            "",
+            {
+                "name": "Updated Group name",
+                "description": "wow",
+                "privacy": "direct",
+                "user": self.local_user.id,
+            },
         )
         request.user = self.local_user
 

From 14d31588716660ef80edbb218ae767b2028615c2 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 12:33:51 +1100
Subject: [PATCH 107/193] add database migrations for Groups

---
 bookwyrm/migrations/0107_merge_20211010_0119.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bookwyrm/migrations/0107_merge_20211010_0119.py

diff --git a/bookwyrm/migrations/0107_merge_20211010_0119.py b/bookwyrm/migrations/0107_merge_20211010_0119.py
new file mode 100644
index 000000000..d774fbb20
--- /dev/null
+++ b/bookwyrm/migrations/0107_merge_20211010_0119.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.5 on 2021-10-10 01:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0106_auto_20211005_0935"),
+        ("bookwyrm", "0106_user_preferred_language"),
+    ]
+
+    operations = []

From 726217577f95a8cd74cbfc2e1dd2073f5b7a12d1 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 13:18:16 +1100
Subject: [PATCH 108/193] linting

---
 bookwyrm/models/group.py       | 13 +++++++------
 bookwyrm/models/list.py        | 14 ++++++++------
 bookwyrm/static/js/bookwyrm.js |  3 +--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 907168699..552e2c287 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -22,10 +22,11 @@ class Group(BookWyrmModel):
 
     @classmethod
     def followers_filter(cls, queryset, viewer):
-        """Override filter for "followers" privacy level to allow non-following group members to see the existence of groups and group lists"""
+        """Override filter for "followers" privacy level to allow non-following
+        group members to see the existence of groups and group lists"""
 
         return queryset.exclude(
-            ~Q(  # user isn't following and it isn't their own status and they are not a group member
+            ~Q(  # user is not a group member
                 Q(user__followers=viewer) | Q(user=viewer) | Q(memberships__user=viewer)
             ),
             privacy="followers",  # and the status of the group is followers only
@@ -33,7 +34,8 @@ class Group(BookWyrmModel):
 
     @classmethod
     def direct_filter(cls, queryset, viewer):
-        """Override filter for "direct" privacy level to allow group members to see the existence of groups and group lists"""
+        """Override filter for "direct" privacy level to allow group members
+        to see the existence of groups and group lists"""
 
         return queryset.exclude(~Q(memberships__user=viewer), privacy="direct")
 
@@ -92,9 +94,8 @@ class GroupMember(models.Model):
         """remove a user from a group"""
 
         memberships = cls.objects.filter(group__user=owner, user=user).all()
-        for m in memberships:
-            # remove this user
-            m.delete()
+        for member in memberships:
+            member.delete()
 
 
 class GroupMemberInvitation(models.Model):
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index b06cdef8c..9b05c81b5 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -2,7 +2,6 @@
 from django.apps import apps
 from django.db import models
 from django.db.models import Q
-from django.db.models.fields import NullBooleanField
 from django.utils import timezone
 
 from bookwyrm import activitypub
@@ -74,10 +73,11 @@ class List(OrderedCollectionMixin, BookWyrmModel):
 
     @classmethod
     def followers_filter(cls, queryset, viewer):
-        """Override filter for "followers" privacy level to allow non-following group members to see the existence of group lists"""
+        """Override filter for "followers" privacy level to allow non-following
+        group members to see the existence of group lists"""
 
         return queryset.exclude(
-            ~Q(  # user isn't following and it isn't their own status and they are not a group member
+            ~Q(  # user isn't following or group member
                 Q(user__followers=viewer)
                 | Q(user=viewer)
                 | Q(group__memberships__user=viewer)
@@ -87,7 +87,8 @@ class List(OrderedCollectionMixin, BookWyrmModel):
 
     @classmethod
     def direct_filter(cls, queryset, viewer):
-        """Override filter for "direct" privacy level to allow group members to see the existence of group lists"""
+        """Override filter for "direct" privacy level to allow
+        group members to see the existence of group lists"""
 
         return queryset.exclude(
             ~Q(  # user not self and not in the group if this is a group list
@@ -101,9 +102,10 @@ class List(OrderedCollectionMixin, BookWyrmModel):
         """remove a list from a group"""
 
         memberships = GroupMember.objects.filter(group__user=owner, user=user).all()
-        for m in memberships:
+
+        for membership in memberships:
             # remove this user's group-curated lists from the group
-            cls.objects.filter(group=m.group, user=m.user).update(
+            cls.objects.filter(group=membership.group, user=membership.user).update(
                 group=None, curation="closed"
             )
 
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 0eebc75b2..d1dae06ef 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -126,8 +126,7 @@ let BookWyrm = new class {
 
     /**
      * Show form.
-     * If the form has already been revealed, there is no '.is-hidden' element
-     * so this doesn't work as a toggle - use hideForm to hide it again
+     * 
      * @param  {Event} event
      * @return {undefined}
      */

From 3d74b10c5fa47d1d6f3e0956401c177262296981 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 13:55:18 +1100
Subject: [PATCH 109/193] eslinting

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

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index d1dae06ef..5ec7e27e4 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -134,7 +134,7 @@ let BookWyrm = new class {
         let trigger = event.currentTarget;
         let hidden = trigger.closest('.hidden-form').querySelectorAll('.is-hidden')[0];
         if (hidden) {
-          this.addRemoveClass(hidden, 'is-hidden', !hidden);
+            this.addRemoveClass(hidden, 'is-hidden', !hidden);
         }
     }
 
@@ -150,7 +150,7 @@ let BookWyrm = new class {
         let visible = document.getElementById(targetId)
 
         this.addRemoveClass(visible, 'is-hidden', true);
-  }
+    }
 
     /**
      * Execute actions on targets based on triggers.

From 5d7f77021b056ac1598b7dc6dbed3c8dc830487c Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 10 Oct 2021 14:02:55 +1100
Subject: [PATCH 110/193] dammit eslint

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

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 5ec7e27e4..2d5b88adc 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -133,6 +133,7 @@ let BookWyrm = new class {
     revealForm(event) {
         let trigger = event.currentTarget;
         let hidden = trigger.closest('.hidden-form').querySelectorAll('.is-hidden')[0];
+
         if (hidden) {
             this.addRemoveClass(hidden, 'is-hidden', !hidden);
         }

From 41f27a4a66a5452031f2840544a5c93524946f67 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 15 Oct 2021 17:56:23 +1100
Subject: [PATCH 111/193] clean up List db queries

- don't unnecessarily query DB in List views
- use more efficient query in remove_from_group List class method
---
 bookwyrm/models/list.py | 7 +------
 bookwyrm/views/list.py  | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 9b05c81b5..3d8c5ae14 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -101,15 +101,10 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     def remove_from_group(cls, owner, user):
         """remove a list from a group"""
 
-        memberships = GroupMember.objects.filter(group__user=owner, user=user).all()
-
-        for membership in memberships:
-            # remove this user's group-curated lists from the group
-            cls.objects.filter(group=membership.group, user=membership.user).update(
+        cls.objects.filter(group__user=owner, user=user).all().update(
                 group=None, curation="closed"
             )
 
-
 class ListItem(CollectionItemMixin, BookWyrmModel):
     """ok"""
 
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 5dae128e6..cc49f009c 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -58,7 +58,7 @@ class Lists(View):
         book_list = form.save()
         # list should not have a group if it is not group curated
         if not book_list.curation == "group":
-            models.List.objects.filter(id=book_list.id).update(group=None)
+            book_list.update(group=None)
 
         return redirect(book_list.local_path)
 
@@ -193,7 +193,7 @@ class List(View):
             return redirect("list", book_list.id)
         book_list = form.save()
         if not book_list.curation == "group":
-            models.List.objects.filter(id=book_list.id).update(group=None)
+            book_list.update(group=None)
         return redirect(book_list.local_path)
 
 

From 1634c8774e6d94cb956b9aacc45acfbc993f98ff Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 15 Oct 2021 17:59:39 +1100
Subject: [PATCH 112/193] remove useless field in Notifications model

---
 bookwyrm/models/notification.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index 69ed784b9..b15b95c2c 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -19,9 +19,6 @@ class Notification(BookWyrmModel):
     related_user = models.ForeignKey(
         "User", on_delete=models.CASCADE, null=True, related_name="related_user"
     )
-    related_group_member = models.ForeignKey(
-        "User", on_delete=models.CASCADE, null=True, related_name="related_group_member"
-    )
     related_group = models.ForeignKey(
         "Group", on_delete=models.CASCADE, null=True, related_name="notifications"
     )
@@ -43,7 +40,6 @@ class Notification(BookWyrmModel):
             user=self.user,
             related_book=self.related_book,
             related_user=self.related_user,
-            related_group_member=self.related_group_member,
             related_group=self.related_group,
             related_status=self.related_status,
             related_import=self.related_import,

From 2f38af4faa39916b6f963b42472c656dd87d8b4e Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 06:59:07 +1100
Subject: [PATCH 113/193] Revert "clean up List db queries"

This reverts commit 41f27a4a66a5452031f2840544a5c93524946f67.

I forgot that update() can only be done on a query result, not on an object, so we will need to go back to querying in order to update rather than saving.
---
 bookwyrm/models/list.py | 7 ++++++-
 bookwyrm/views/list.py  | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 3d8c5ae14..9b05c81b5 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -101,10 +101,15 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     def remove_from_group(cls, owner, user):
         """remove a list from a group"""
 
-        cls.objects.filter(group__user=owner, user=user).all().update(
+        memberships = GroupMember.objects.filter(group__user=owner, user=user).all()
+
+        for membership in memberships:
+            # remove this user's group-curated lists from the group
+            cls.objects.filter(group=membership.group, user=membership.user).update(
                 group=None, curation="closed"
             )
 
+
 class ListItem(CollectionItemMixin, BookWyrmModel):
     """ok"""
 
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index cc49f009c..5dae128e6 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -58,7 +58,7 @@ class Lists(View):
         book_list = form.save()
         # list should not have a group if it is not group curated
         if not book_list.curation == "group":
-            book_list.update(group=None)
+            models.List.objects.filter(id=book_list.id).update(group=None)
 
         return redirect(book_list.local_path)
 
@@ -193,7 +193,7 @@ class List(View):
             return redirect("list", book_list.id)
         book_list = form.save()
         if not book_list.curation == "group":
-            book_list.update(group=None)
+            models.List.objects.filter(id=book_list.id).update(group=None)
         return redirect(book_list.local_path)
 
 

From 145a31045afe44edb43f5da2572223a4c17f7c1b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 13:36:48 -0700
Subject: [PATCH 114/193] Use "like" consistently (instead of mixing in
 "favorite")

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

diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html
index d430598e9..afc18d73e 100644
--- a/bookwyrm/templates/notifications/items/fav.html
+++ b/bookwyrm/templates/notifications/items/fav.html
@@ -18,25 +18,25 @@
     {% if related_status.status_type == 'Review' %}
     {% blocktrans trimmed %}
 
-    favorited your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>
+    liked your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>
 
     {% endblocktrans %}
     {% elif related_status.status_type == 'Comment' %}
     {% blocktrans trimmed %}
 
-    favorited your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>
+    liked your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>
 
     {% endblocktrans %}
     {% elif related_status.status_type == 'Quotation' %}
     {% blocktrans trimmed %}
 
-    favorited your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>
+    liked your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>
 
     {% endblocktrans %}
     {% else %}
     {% blocktrans trimmed %}
 
-    favorited your <a href="{{ related_path }}">status</a>
+    liked your <a href="{{ related_path }}">status</a>
 
     {% endblocktrans %}
     {% endif %}

From 7f75cd329ac86dae4dd8f4dfaa516b1a6ac7bdb4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 13:42:32 -0700
Subject: [PATCH 115/193] Use instance name instead of the word "instance"
 where possible

trying to use less jargon
---
 bookwyrm/templates/email/invite/html_content.html | 2 +-
 bookwyrm/templates/email/invite/text_content.html | 2 +-
 bookwyrm/templates/layout.html                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/email/invite/html_content.html b/bookwyrm/templates/email/invite/html_content.html
index 358e23dc1..adc993b7b 100644
--- a/bookwyrm/templates/email/invite/html_content.html
+++ b/bookwyrm/templates/email/invite/html_content.html
@@ -12,6 +12,6 @@
 <p>
     {% url 'code-of-conduct' as coc_path %}
     {% url 'about' as about_path %}
-    {% blocktrans %}Learn more <a href="https://{{ domain }}{{ about_path }}">about this instance</a>.{% endblocktrans %}
+    {% blocktrans %}Learn more <a href="https://{{ domain }}{{ about_path }}">about {{ site_name }}</a>.{% endblocktrans %}
 </p>
 {% endblock %}
diff --git a/bookwyrm/templates/email/invite/text_content.html b/bookwyrm/templates/email/invite/text_content.html
index c3fcdc04e..26dcd1720 100644
--- a/bookwyrm/templates/email/invite/text_content.html
+++ b/bookwyrm/templates/email/invite/text_content.html
@@ -5,6 +5,6 @@
 
 {{ invite_link }}
 
-{% trans "Learn more about this instance:" %} https://{{ domain }}{% url 'about' %}
+{% blocktrans %}Learn more about {{ site_name }}:{% endblocktrans %} https://{{ domain }}{% url 'about' %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index ce3eee2ba..d475646e8 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -227,7 +227,7 @@
         <div class="columns">
             <div class="column is-one-fifth">
                 <p>
-                <a href="{% url 'about' %}">{% trans "About this instance" %}</a>
+                <a href="{% url 'about' %}">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</a>
                 </p>
                 {% if site.admin_email %}
                 <p>

From 032dedabb4f69cfe244a454840f280e627153830 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 13:47:28 -0700
Subject: [PATCH 116/193] Goodreads capitalization standardization

---
 bookwyrm/importers/goodreads_import.py | 4 ++--
 bookwyrm/importers/importer.py         | 2 +-
 bookwyrm/templates/import/import.html  | 4 ++--
 bookwyrm/templates/import/tooltip.html | 2 +-
 bookwyrm/views/import_data.py          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/importers/goodreads_import.py b/bookwyrm/importers/goodreads_import.py
index 7b577ea85..c62e65827 100644
--- a/bookwyrm/importers/goodreads_import.py
+++ b/bookwyrm/importers/goodreads_import.py
@@ -3,10 +3,10 @@ from . import Importer
 
 
 class GoodreadsImporter(Importer):
-    """GoodReads is the default importer, thus Importer follows its structure.
+    """Goodreads is the default importer, thus Importer follows its structure.
     For a more complete example of overriding see librarything_import.py"""
 
-    service = "GoodReads"
+    service = "Goodreads"
 
     def parse_fields(self, entry):
         """handle the specific fields in goodreads csvs"""
diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py
index a10b4060c..6d898a2a3 100644
--- a/bookwyrm/importers/importer.py
+++ b/bookwyrm/importers/importer.py
@@ -1,4 +1,4 @@
-""" handle reading a csv from an external service, defaults are from GoodReads """
+""" handle reading a csv from an external service, defaults are from Goodreads """
 import csv
 import logging
 
diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index cc296b75b..81f0daa54 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -22,8 +22,8 @@
 
             <div class="select block">
                 <select name="source" id="source">
-                    <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
-                        GoodReads (CSV)
+                    <option value="Goodreads" {% if current == 'Goodreads' %}selected{% endif %}>
+                        Goodreads (CSV)
                     </option>
                     <option value="Storygraph" {% if current == 'Storygraph' %}selected{% endif %}>
                         Storygraph (CSV)
diff --git a/bookwyrm/templates/import/tooltip.html b/bookwyrm/templates/import/tooltip.html
index 1cfe5a3b2..311cce82c 100644
--- a/bookwyrm/templates/import/tooltip.html
+++ b/bookwyrm/templates/import/tooltip.html
@@ -3,6 +3,6 @@
 
 {% block tooltip_content %}
 
-{% trans 'You can download your GoodReads data from the <a href="https://www.goodreads.com/review/import" target="_blank" rel="noopener">Import/Export page</a> of your GoodReads account.' %}
+{% trans 'You can download your Goodreads data from the <a href="https://www.goodreads.com/review/import" target="_blank" rel="noopener">Import/Export page</a> of your Goodreads account.' %}
 
 {% endblock %}
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index fe54c39a9..5e113be88 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -51,7 +51,7 @@ class Import(View):
             elif source == "Storygraph":
                 importer = StorygraphImporter()
             else:
-                # Default : GoodReads
+                # Default : Goodreads
                 importer = GoodreadsImporter()
 
             try:

From dede101d1720ab44d612bae4754161c6f75fc9fa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 13:58:59 -0700
Subject: [PATCH 117/193] Capitalize html and markdown

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

diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index da5b7705f..94a4dd454 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -34,7 +34,7 @@
             </div>
             <div class="field">
                 <label class="label mb-0" for="id_short_description">{% trans "Short description:" %}</label>
-                <p class="help">{% trans "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown." %}</p>
+                <p class="help">{% trans "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown." %}</p>
                 {{ site_form.instance_short_description }}
             </div>
             <div class="field">

From 362122407425b32ce55736359765092a7333a918 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 13:59:07 -0700
Subject: [PATCH 118/193] Properly localize book format

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

diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html
index e0711fa82..b39bcf5ce 100644
--- a/bookwyrm/templates/book/publisher_info.html
+++ b/bookwyrm/templates/book/publisher_info.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load humanize %}
 
-{% firstof book.physical_format_detail book.physical_format as format %}
+{% firstof book.physical_format_detail book.get_physical_format_display as format %}
 {% firstof book.physical_format book.physical_format_detail as format_property %}
 {% with pages=book.pages %}
 {% if format or pages %}
@@ -18,7 +18,7 @@
 
 <p>
     {% if format and not pages %}
-        {% blocktrans %}{{ format }}{% endblocktrans %}
+        {{ format }}
     {% elif format and pages %}
         {% blocktrans %}{{ format }}, {{ pages }} pages{% endblocktrans %}
     {% elif pages %}

From 4178d1f7f623590a4a4fe99297cc9c35b92388ca Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 14:10:34 -0700
Subject: [PATCH 119/193] Adds context to translation strings on discover page

---
 bookwyrm/templates/discover/card-header.html | 26 ++++++++++++++++++++
 bookwyrm/templates/discover/large-book.html  | 18 +-------------
 bookwyrm/templates/discover/small-book.html  | 18 +-------------
 3 files changed, 28 insertions(+), 34 deletions(-)
 create mode 100644 bookwyrm/templates/discover/card-header.html

diff --git a/bookwyrm/templates/discover/card-header.html b/bookwyrm/templates/discover/card-header.html
new file mode 100644
index 000000000..0eb9a678c
--- /dev/null
+++ b/bookwyrm/templates/discover/card-header.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+{% load utilities %}
+
+{% with user_path=status.user.local_path username=status.user.display_name book_path=status.book.local_poth book_title=book|book_title %}
+
+{% if status.status_type == 'GeneratedNote' %}
+    {{ status.content|safe }}
+{% elif status.status_type == 'Rating' %}
+    {% blocktrans trimmed %}
+    <a href="{{ user_path}}">{{ username }}</a> rated <a href="{{ book_path }}">{{ book_title }}</a>
+    {% endblocktrans %}
+{% elif status.status_type == 'Review' %}
+    {% blocktrans trimmed %}
+    <a href="{{ user_path}}">{{ username }}</a> reviewed <a href="{{ book_path }}">{{ book_title }}</a>
+    {% endblocktrans %}
+{% elif status.status_type == 'Comment' %}
+    {% blocktrans trimmed %}
+    <a href="{{ user_path}}">{{ username }}</a> commented on <a href="{{ book_path }}">{{ book_title }}</a>
+    {% endblocktrans %}
+{% elif status.status_type == 'Quotation' %}
+    {% blocktrans trimmed %}
+    <a href="{{ user_path}}">{{ username }}</a> quoted <a href="{{ book_path }}">{{ book_title }}</a>
+    {% endblocktrans %}
+{% endif %}
+
+{% endwith %}
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 6d80c3daf..1fa0afb92 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -36,23 +36,7 @@
                 </figure>
                 <div class="media-content">
                     <h3 class="title is-6">
-                        <a href="{{ status.user.local_path }}">
-                            <span>{{ status.user.display_name }}</span>
-                        </a>
-
-                        {% if status.status_type == 'GeneratedNote' %}
-                            {{ status.content|safe }}
-                        {% elif status.status_type == 'Rating' %}
-                            {% trans "rated" %}
-                        {% elif status.status_type == 'Review' %}
-                            {% trans "reviewed" %}
-                        {% elif status.status_type == 'Comment' %}
-                            {% trans "commented on" %}
-                        {% elif status.status_type == 'Quotation' %}
-                            {% trans "quoted" %}
-                        {% endif %}
-
-                        <a href="{{ book.local_path }}">{{ book.title }}</a>
+                        {% include "discover/card-header.html" %}
                     </h3>
                 </div>
             </div>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 5b2070188..76732ca14 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -22,23 +22,7 @@
 
         <div class="media-content">
             <h3 class="title is-6">
-                <a href="{{ status.user.local_path }}">
-                    <span>{{ status.user.display_name }}</span>
-                </a>
-
-                {% if status.status_type == 'GeneratedNote' %}
-                    {{ status.content|safe }}
-                {% elif status.status_type == 'Rating' %}
-                    {% trans "rated" %}
-                {% elif status.status_type == 'Review' %}
-                    {% trans "reviewed" %}
-                {% elif status.status_type == 'Comment' %}
-                    {% trans "commented on" %}
-                {% elif status.status_type == 'Quotation' %}
-                    {% trans "quoted" %}
-                {% endif %}
-
-                <a href="{{ book.local_path }}">{{ book.title }}</a>
+                {% include "discover/card-header.html" %}
             </h3>
             {% if status.rating %}
             <p class="subtitle is-6">

From 9e7b73a88442ea3ea7307f37094f3656c4a514ad Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 14:13:59 -0700
Subject: [PATCH 120/193] Compiles locales

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 46469 -> 44812 bytes
 locale/de_DE/LC_MESSAGES/django.po   | 176 +++++++++++++++-----------
 locale/en_US/LC_MESSAGES/django.po   | 136 ++++++++++----------
 locale/es_ES/LC_MESSAGES/django.mo   | Bin 54643 -> 53000 bytes
 locale/es_ES/LC_MESSAGES/django.po   | 180 +++++++++++++++-----------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 50945 -> 49178 bytes
 locale/fr_FR/LC_MESSAGES/django.po   | 183 ++++++++++++++++-----------
 locale/pt_BR/LC_MESSAGES/django.mo   | Bin 55740 -> 53886 bytes
 locale/pt_BR/LC_MESSAGES/django.po   | 181 +++++++++++++++-----------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 44690 -> 43607 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 179 +++++++++++++++-----------
 locale/zh_Hant/LC_MESSAGES/django.mo | Bin 39384 -> 38293 bytes
 locale/zh_Hant/LC_MESSAGES/django.po | 179 +++++++++++++++-----------
 13 files changed, 697 insertions(+), 517 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 682f599d5154491bfafc82fabdb123e380e9816a..342f07c9cb69640b62342f6fbe5d96b00ef4d927 100644
GIT binary patch
delta 13834
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
IsdN4Q9}zdBQ~&?~

delta 14981
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
F{u?*d0)+qo

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index de0fd4a48..eced88aea 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-06 23:57+0000\n"
+"POT-Creation-Date: 2021-10-15 21:13+0000\n"
 "PO-Revision-Date: 2021-10-13 13:32\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: German\n"
@@ -54,8 +54,8 @@ msgstr "Reihenfolge der Liste"
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:134
-#: bookwyrm/templates/shelf/shelf.html:165
+#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:136
+#: bookwyrm/templates/shelf/shelf.html:168
 #: bookwyrm/templates/snippets/create_status/review.html:33
 msgid "Rating"
 msgstr "Bewertung"
@@ -151,45 +151,49 @@ msgstr "Username"
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home Timeline"
 msgstr "Start-Zeitleiste"
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home"
 msgstr "Startseite"
 
-#: bookwyrm/settings.py:118
+#: bookwyrm/settings.py:119
 msgid "Books Timeline"
 msgstr "Bücher-Zeitachse"
 
-#: bookwyrm/settings.py:118 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "Bücher"
 
-#: bookwyrm/settings.py:164
+#: bookwyrm/settings.py:165
 msgid "English"
 msgstr "English (Englisch)"
 
-#: bookwyrm/settings.py:165
+#: bookwyrm/settings.py:166
 msgid "Deutsch (German)"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:167
 msgid "Español (Spanish)"
 msgstr "Español (Spanisch)"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:168
 msgid "Français (French)"
 msgstr "Français (Französisch)"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:169
+msgid "Português - Brasil (Brazilian Portuguese)"
+msgstr ""
+
+#: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
 msgstr "简体中文 (Vereinfachtes Chinesisch)"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:171
 msgid "繁體中文 (Traditional Chinese)"
 msgstr "繁體中文 (Chinesisch, traditionell)"
 
@@ -669,11 +673,6 @@ msgstr "Sprache"
 msgid "Search editions"
 msgstr "Ausgaben suchen"
 
-#: bookwyrm/templates/book/publisher_info.html:21
-#, python-format
-msgid "%(format)s"
-msgstr "Formate: %(format)s"
-
 #: bookwyrm/templates/book/publisher_info.html:23
 #, python-format
 msgid "%(format)s, %(pages)s pages"
@@ -888,6 +887,30 @@ msgstr "Bookwyrmnutzer*innen"
 msgid "All known users"
 msgstr "Alle bekannten Nutzer*innen"
 
+#: bookwyrm/templates/discover/card-header.html:9
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+
+#: bookwyrm/templates/discover/card-header.html:13
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+
+#: bookwyrm/templates/discover/card-header.html:17
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+
+#: bookwyrm/templates/discover/card-header.html:21
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
 #: bookwyrm/templates/layout.html:78
@@ -899,28 +922,8 @@ msgstr "Entdecken"
 msgid "See what's new in the local %(site_name)s community"
 msgstr "Schau, was in der %(site_name)s Community neu ist"
 
-#: bookwyrm/templates/discover/large-book.html:46
-#: bookwyrm/templates/discover/small-book.html:32
-msgid "rated"
-msgstr "bewertet"
-
-#: bookwyrm/templates/discover/large-book.html:48
-#: bookwyrm/templates/discover/small-book.html:34
-msgid "reviewed"
-msgstr "bewertete"
-
-#: bookwyrm/templates/discover/large-book.html:50
-#: bookwyrm/templates/discover/small-book.html:36
-msgid "commented on"
-msgstr "kommentierte"
-
 #: bookwyrm/templates/discover/large-book.html:52
-#: bookwyrm/templates/discover/small-book.html:38
-msgid "quoted"
-msgstr "zitierte"
-
-#: bookwyrm/templates/discover/large-book.html:68
-#: bookwyrm/templates/discover/small-book.html:52
+#: bookwyrm/templates/discover/small-book.html:36
 msgid "View status"
 msgstr "Status ansehen"
 
@@ -973,8 +976,9 @@ msgid "Join Now"
 msgstr "Tritt jetzt bei"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, fuzzy, python-format
+#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
 msgstr "Erfahre mehr <a href=\"https://%(domain)s%(about_path)s\">über diese Instanz</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
@@ -983,7 +987,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Du bist eingeladen, %(site_name)s beizutreten! Klicke auf den Link unten um einen Account zu erstellen."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-msgid "Learn more about this instance:"
+#, fuzzy, python-format
+#| msgid "Learn more about this instance:"
+msgid "Learn more about %(site_name)s:"
 msgstr "Lerne mehr über diese Instanz:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
@@ -1323,13 +1329,13 @@ msgstr "Buch"
 
 #: bookwyrm/templates/import/import_status.html:122
 #: bookwyrm/templates/shelf/shelf.html:128
-#: bookwyrm/templates/shelf/shelf.html:148
+#: bookwyrm/templates/shelf/shelf.html:150
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import/import_status.html:125
 #: bookwyrm/templates/shelf/shelf.html:129
-#: bookwyrm/templates/shelf/shelf.html:151
+#: bookwyrm/templates/shelf/shelf.html:153
 msgid "Author"
 msgstr "Autor*in"
 
@@ -1338,7 +1344,9 @@ msgid "Imported"
 msgstr "Importiert"
 
 #: bookwyrm/templates/import/tooltip.html:6
-msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+#, fuzzy
+#| msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr "Du kannst dir deine GoodReads Daten von <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> in deinem GoodReads Account runterladen."
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
@@ -1354,7 +1362,7 @@ msgstr "Zugiff verweigert"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Sorry! Dieser Einladecode ist mehr gültig."
 
-#: bookwyrm/templates/landing/about.html:7
+#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:230
 #, python-format
 msgid "About %(site_name)s"
 msgstr "Über %(site_name)s"
@@ -1485,10 +1493,6 @@ msgstr "Status erfolgreich veröffentlicht"
 msgid "Error posting status"
 msgstr "Fehler beim veröffentlichen des Status"
 
-#: bookwyrm/templates/layout.html:230
-msgid "About this instance"
-msgstr "Über diese Instanz"
-
 #: bookwyrm/templates/layout.html:234
 msgid "Contact site admin"
 msgstr "Admin kontaktieren"
@@ -1732,23 +1736,27 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> favorisiert"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "favorisierte deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> favorisiert"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
 #: bookwyrm/templates/notifications/items/follow.html:15
@@ -2297,6 +2305,7 @@ msgid "Notes"
 msgstr "Hinweise"
 
 #: bookwyrm/templates/settings/federation/instance.html:75
+#: bookwyrm/templates/snippets/status/status_options.html:24
 msgid "Edit"
 msgstr "Ändern"
 
@@ -2636,7 +2645,7 @@ msgid "Short description:"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:37
-msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:41
@@ -2811,7 +2820,7 @@ msgid "Permanently deleted"
 msgstr "Permanent gelöscht"
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:13
-#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/status/status_options.html:32
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr "Direktnachricht senden"
@@ -2864,22 +2873,22 @@ msgstr "Regal bearbeiten"
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
-#: bookwyrm/templates/shelf/shelf.html:130
-#: bookwyrm/templates/shelf/shelf.html:154
+#: bookwyrm/templates/shelf/shelf.html:132
+#: bookwyrm/templates/shelf/shelf.html:158
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/shelf/shelf.html:131
-#: bookwyrm/templates/shelf/shelf.html:158
+#: bookwyrm/templates/shelf/shelf.html:133
+#: bookwyrm/templates/shelf/shelf.html:161
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/shelf/shelf.html:132
-#: bookwyrm/templates/shelf/shelf.html:161
+#: bookwyrm/templates/shelf/shelf.html:134
+#: bookwyrm/templates/shelf/shelf.html:164
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/shelf/shelf.html:187
+#: bookwyrm/templates/shelf/shelf.html:190
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
@@ -2969,7 +2978,7 @@ msgstr "Spoileralarm!"
 msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:41
+#: bookwyrm/templates/snippets/create_status/layout.html:45
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Kommentar:"
@@ -3163,12 +3172,12 @@ msgstr "Du hast <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern<
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
 
-#: bookwyrm/templates/snippets/page_text.html:4
+#: bookwyrm/templates/snippets/page_text.html:8
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
 msgstr ""
 
-#: bookwyrm/templates/snippets/page_text.html:6
+#: bookwyrm/templates/snippets/page_text.html:14
 #, python-format
 msgid "page %(page)s"
 msgstr ""
@@ -3329,6 +3338,12 @@ msgstr "Bild in neuem Fenster öffnen"
 msgid "Hide status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/header.html:45
+#, fuzzy, python-format
+#| msgid "Joined %(date)s"
+msgid "edited %(date)s"
+msgstr "Beigetreten %(date)s"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3393,10 +3408,6 @@ msgstr "teilt"
 msgid "More options"
 msgstr "Mehr Optionen"
 
-#: bookwyrm/templates/snippets/status/status_options.html:26
-msgid "Delete & re-draft"
-msgstr ""
-
 #: bookwyrm/templates/snippets/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
@@ -3585,3 +3596,20 @@ msgstr "Ein Passwortwiederherstellungslinl wurde zu {email} gesendet"
 msgid "Status updates from {obj.display_name}"
 msgstr "Status updates von {obj.display_name}"
 
+#~ msgid "%(format)s"
+#~ msgstr "Formate: %(format)s"
+
+#~ msgid "rated"
+#~ msgstr "bewertet"
+
+#~ msgid "reviewed"
+#~ msgstr "bewertete"
+
+#~ msgid "commented on"
+#~ msgstr "kommentierte"
+
+#~ msgid "quoted"
+#~ msgstr "zitierte"
+
+#~ msgid "About this instance"
+#~ msgstr "Über diese Instanz"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index b67d50c53..156009bff 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-06 23:57+0000\n"
+"POT-Creation-Date: 2021-10-15 21:13+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -55,8 +55,8 @@ msgstr ""
 msgid "Book Title"
 msgstr ""
 
-#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:134
-#: bookwyrm/templates/shelf/shelf.html:165
+#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:136
+#: bookwyrm/templates/shelf/shelf.html:168
 #: bookwyrm/templates/snippets/create_status/review.html:33
 msgid "Rating"
 msgstr ""
@@ -152,45 +152,49 @@ msgstr ""
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/settings.py:118
+#: bookwyrm/settings.py:119
 msgid "Books Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:118 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr ""
 
-#: bookwyrm/settings.py:164
+#: bookwyrm/settings.py:165
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:165
+#: bookwyrm/settings.py:166
 msgid "Deutsch (German)"
 msgstr ""
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:167
 msgid "Español (Spanish)"
 msgstr ""
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:168
 msgid "Français (French)"
 msgstr ""
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:169
+msgid "Português - Brasil (Brazilian Portuguese)"
+msgstr ""
+
+#: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
 msgstr ""
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:171
 msgid "繁體中文 (Traditional Chinese)"
 msgstr ""
 
@@ -670,11 +674,6 @@ msgstr ""
 msgid "Search editions"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:21
-#, python-format
-msgid "%(format)s"
-msgstr ""
-
 #: bookwyrm/templates/book/publisher_info.html:23
 #, python-format
 msgid "%(format)s, %(pages)s pages"
@@ -889,6 +888,26 @@ msgstr ""
 msgid "All known users"
 msgstr ""
 
+#: bookwyrm/templates/discover/card-header.html:9
+#, python-format
+msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/discover/card-header.html:13
+#, python-format
+msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/discover/card-header.html:17
+#, python-format
+msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/discover/card-header.html:21
+#, python-format
+msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr ""
+
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
 #: bookwyrm/templates/layout.html:78
@@ -900,28 +919,8 @@ msgstr ""
 msgid "See what's new in the local %(site_name)s community"
 msgstr ""
 
-#: bookwyrm/templates/discover/large-book.html:46
-#: bookwyrm/templates/discover/small-book.html:32
-msgid "rated"
-msgstr ""
-
-#: bookwyrm/templates/discover/large-book.html:48
-#: bookwyrm/templates/discover/small-book.html:34
-msgid "reviewed"
-msgstr ""
-
-#: bookwyrm/templates/discover/large-book.html:50
-#: bookwyrm/templates/discover/small-book.html:36
-msgid "commented on"
-msgstr ""
-
 #: bookwyrm/templates/discover/large-book.html:52
-#: bookwyrm/templates/discover/small-book.html:38
-msgid "quoted"
-msgstr ""
-
-#: bookwyrm/templates/discover/large-book.html:68
-#: bookwyrm/templates/discover/small-book.html:52
+#: bookwyrm/templates/discover/small-book.html:36
 msgid "View status"
 msgstr ""
 
@@ -975,7 +974,7 @@ msgstr ""
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:4
@@ -984,7 +983,8 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-msgid "Learn more about this instance:"
+#, python-format
+msgid "Learn more about %(site_name)s:"
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
@@ -1324,13 +1324,13 @@ msgstr ""
 
 #: bookwyrm/templates/import/import_status.html:122
 #: bookwyrm/templates/shelf/shelf.html:128
-#: bookwyrm/templates/shelf/shelf.html:148
+#: bookwyrm/templates/shelf/shelf.html:150
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import/import_status.html:125
 #: bookwyrm/templates/shelf/shelf.html:129
-#: bookwyrm/templates/shelf/shelf.html:151
+#: bookwyrm/templates/shelf/shelf.html:153
 msgid "Author"
 msgstr ""
 
@@ -1339,7 +1339,7 @@ msgid "Imported"
 msgstr ""
 
 #: bookwyrm/templates/import/tooltip.html:6
-msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr ""
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
-#: bookwyrm/templates/landing/about.html:7
+#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:230
 #, python-format
 msgid "About %(site_name)s"
 msgstr ""
@@ -1486,10 +1486,6 @@ msgstr ""
 msgid "Error posting status"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:230
-msgid "About this instance"
-msgstr ""
-
 #: bookwyrm/templates/layout.html:234
 msgid "Contact site admin"
 msgstr ""
@@ -1734,22 +1730,22 @@ msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:19
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:25
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:31
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:37
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/follow.html:15
@@ -2298,6 +2294,7 @@ msgid "Notes"
 msgstr ""
 
 #: bookwyrm/templates/settings/federation/instance.html:75
+#: bookwyrm/templates/snippets/status/status_options.html:24
 msgid "Edit"
 msgstr ""
 
@@ -2637,7 +2634,7 @@ msgid "Short description:"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:37
-msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:41
@@ -2812,7 +2809,7 @@ msgid "Permanently deleted"
 msgstr ""
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:13
-#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/status/status_options.html:32
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr ""
@@ -2865,22 +2862,22 @@ msgstr ""
 msgid "Delete shelf"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:130
-#: bookwyrm/templates/shelf/shelf.html:154
+#: bookwyrm/templates/shelf/shelf.html:132
+#: bookwyrm/templates/shelf/shelf.html:158
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:131
-#: bookwyrm/templates/shelf/shelf.html:158
+#: bookwyrm/templates/shelf/shelf.html:133
+#: bookwyrm/templates/shelf/shelf.html:161
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:132
-#: bookwyrm/templates/shelf/shelf.html:161
+#: bookwyrm/templates/shelf/shelf.html:134
+#: bookwyrm/templates/shelf/shelf.html:164
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:187
+#: bookwyrm/templates/shelf/shelf.html:190
 msgid "This shelf is empty."
 msgstr ""
 
@@ -2970,7 +2967,7 @@ msgstr ""
 msgid "Include spoiler alert"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/layout.html:41
+#: bookwyrm/templates/snippets/create_status/layout.html:45
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr ""
@@ -3164,12 +3161,12 @@ msgstr ""
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
 
-#: bookwyrm/templates/snippets/page_text.html:4
+#: bookwyrm/templates/snippets/page_text.html:8
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
 msgstr ""
 
-#: bookwyrm/templates/snippets/page_text.html:6
+#: bookwyrm/templates/snippets/page_text.html:14
 #, python-format
 msgid "page %(page)s"
 msgstr ""
@@ -3330,6 +3327,11 @@ msgstr ""
 msgid "Hide status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/header.html:45
+#, python-format
+msgid "edited %(date)s"
+msgstr ""
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3394,10 +3396,6 @@ msgstr ""
 msgid "More options"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_options.html:26
-msgid "Delete & re-draft"
-msgstr ""
-
 #: bookwyrm/templates/snippets/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo
index 93c9caed14164e79fc60c1a4624c47facb4ffc6d..699c286fa1210f1643813b0628d3f068b84391de 100644
GIT binary patch
delta 15865
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

delta 17029
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
A6951J

diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po
index d066ed1a9..681fec246 100644
--- a/locale/es_ES/LC_MESSAGES/django.po
+++ b/locale/es_ES/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-06 23:57+0000\n"
+"POT-Creation-Date: 2021-10-15 21:13+0000\n"
 "PO-Revision-Date: 2021-10-08 00:04\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Spanish\n"
@@ -54,8 +54,8 @@ msgstr "Orden de la lista"
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:134
-#: bookwyrm/templates/shelf/shelf.html:165
+#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:136
+#: bookwyrm/templates/shelf/shelf.html:168
 #: bookwyrm/templates/snippets/create_status/review.html:33
 msgid "Rating"
 msgstr "Calificación"
@@ -151,45 +151,49 @@ msgstr "nombre de usuario"
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home Timeline"
 msgstr "Línea temporal de hogar"
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home"
 msgstr "Hogar"
 
-#: bookwyrm/settings.py:118
+#: bookwyrm/settings.py:119
 msgid "Books Timeline"
 msgstr "Línea temporal de libros"
 
-#: bookwyrm/settings.py:118 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "Libros"
 
-#: bookwyrm/settings.py:164
+#: bookwyrm/settings.py:165
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:165
+#: bookwyrm/settings.py:166
 msgid "Deutsch (German)"
 msgstr "Deutsch (Alemán)"
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:167
 msgid "Español (Spanish)"
 msgstr "Español"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:168
 msgid "Français (French)"
 msgstr "Français (Francés)"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:169
+msgid "Português - Brasil (Brazilian Portuguese)"
+msgstr ""
+
+#: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
 msgstr "简体中文 (Chino simplificado)"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:171
 msgid "繁體中文 (Traditional Chinese)"
 msgstr "繁體中文 (Chino tradicional)"
 
@@ -669,11 +673,6 @@ msgstr "Idioma:"
 msgid "Search editions"
 msgstr "Buscar ediciones"
 
-#: bookwyrm/templates/book/publisher_info.html:21
-#, python-format
-msgid "%(format)s"
-msgstr ""
-
 #: bookwyrm/templates/book/publisher_info.html:23
 #, python-format
 msgid "%(format)s, %(pages)s pages"
@@ -888,6 +887,30 @@ msgstr "Usuarios de BookWyrm"
 msgid "All known users"
 msgstr "Todos los usuarios conocidos"
 
+#: bookwyrm/templates/discover/card-header.html:9
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:13
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:17
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:21
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
 #: bookwyrm/templates/layout.html:78
@@ -899,28 +922,8 @@ msgstr "Descubrir"
 msgid "See what's new in the local %(site_name)s community"
 msgstr "Ver que es nuevo en la comunidad local de %(site_name)s"
 
-#: bookwyrm/templates/discover/large-book.html:46
-#: bookwyrm/templates/discover/small-book.html:32
-msgid "rated"
-msgstr "calificó"
-
-#: bookwyrm/templates/discover/large-book.html:48
-#: bookwyrm/templates/discover/small-book.html:34
-msgid "reviewed"
-msgstr "reseñó"
-
-#: bookwyrm/templates/discover/large-book.html:50
-#: bookwyrm/templates/discover/small-book.html:36
-msgid "commented on"
-msgstr "comentó en"
-
 #: bookwyrm/templates/discover/large-book.html:52
-#: bookwyrm/templates/discover/small-book.html:38
-msgid "quoted"
-msgstr "citó"
-
-#: bookwyrm/templates/discover/large-book.html:68
-#: bookwyrm/templates/discover/small-book.html:52
+#: bookwyrm/templates/discover/small-book.html:36
 msgid "View status"
 msgstr "Ver status"
 
@@ -973,8 +976,9 @@ msgid "Join Now"
 msgstr "Únete ahora"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, fuzzy, python-format
+#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
 msgstr "Aprenda más <a href=\"https://%(domain)s%(about_path)s\">sobre esta instancia</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
@@ -983,7 +987,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Estás invitado a unirte con %(site_name)s! Haz clic en el enlace a continuación para crear una cuenta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-msgid "Learn more about this instance:"
+#, fuzzy, python-format
+#| msgid "Learn more about this instance:"
+msgid "Learn more about %(site_name)s:"
 msgstr "Aprende más sobre esta intancia:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
@@ -1323,13 +1329,13 @@ msgstr "Libro"
 
 #: bookwyrm/templates/import/import_status.html:122
 #: bookwyrm/templates/shelf/shelf.html:128
-#: bookwyrm/templates/shelf/shelf.html:148
+#: bookwyrm/templates/shelf/shelf.html:150
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import/import_status.html:125
 #: bookwyrm/templates/shelf/shelf.html:129
-#: bookwyrm/templates/shelf/shelf.html:151
+#: bookwyrm/templates/shelf/shelf.html:153
 msgid "Author"
 msgstr "Autor/Autora"
 
@@ -1338,7 +1344,9 @@ msgid "Imported"
 msgstr "Importado"
 
 #: bookwyrm/templates/import/tooltip.html:6
-msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+#, fuzzy
+#| msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr "Puedes descargar tus datos de GoodReads de la <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Página de Exportación/Importación</a> de tu cuenta de GoodReads."
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
@@ -1354,7 +1362,7 @@ msgstr "Permiso denegado"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "¡Disculpa! Este código de invitación no queda válido."
 
-#: bookwyrm/templates/landing/about.html:7
+#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:230
 #, python-format
 msgid "About %(site_name)s"
 msgstr "Sobre %(site_name)s"
@@ -1485,10 +1493,6 @@ msgstr "Status publicado exitosamente"
 msgid "Error posting status"
 msgstr "Error en publicar status"
 
-#: bookwyrm/templates/layout.html:230
-msgid "About this instance"
-msgstr "Sobre esta instancia"
-
 #: bookwyrm/templates/layout.html:234
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
@@ -1732,23 +1736,27 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr ""
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications/items/follow.html:15
@@ -2297,6 +2305,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #: bookwyrm/templates/settings/federation/instance.html:75
+#: bookwyrm/templates/snippets/status/status_options.html:24
 msgid "Edit"
 msgstr "Editar"
 
@@ -2636,7 +2645,9 @@ msgid "Short description:"
 msgstr "Descripción corta:"
 
 #: bookwyrm/templates/settings/site.html:37
-msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+#, fuzzy
+#| msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
 msgstr "Utilizado cuando la instancia se ve de una vista previa en joinbookwyrm.com. No es compatible con html o markdown."
 
 #: bookwyrm/templates/settings/site.html:41
@@ -2811,7 +2822,7 @@ msgid "Permanently deleted"
 msgstr "Eliminado permanentemente"
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:13
-#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/status/status_options.html:32
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr "Enviar mensaje directo"
@@ -2864,22 +2875,22 @@ msgstr "Editar estante"
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
-#: bookwyrm/templates/shelf/shelf.html:130
-#: bookwyrm/templates/shelf/shelf.html:154
+#: bookwyrm/templates/shelf/shelf.html:132
+#: bookwyrm/templates/shelf/shelf.html:158
 msgid "Shelved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/shelf/shelf.html:131
-#: bookwyrm/templates/shelf/shelf.html:158
+#: bookwyrm/templates/shelf/shelf.html:133
+#: bookwyrm/templates/shelf/shelf.html:161
 msgid "Started"
 msgstr "Empezado"
 
-#: bookwyrm/templates/shelf/shelf.html:132
-#: bookwyrm/templates/shelf/shelf.html:161
+#: bookwyrm/templates/shelf/shelf.html:134
+#: bookwyrm/templates/shelf/shelf.html:164
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/shelf/shelf.html:187
+#: bookwyrm/templates/shelf/shelf.html:190
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
@@ -2969,7 +2980,7 @@ msgstr "¡Advertencia, ya vienen spoilers!"
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:41
+#: bookwyrm/templates/snippets/create_status/layout.html:45
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Comentario:"
@@ -3163,12 +3174,12 @@ msgstr "Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros<
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
-#: bookwyrm/templates/snippets/page_text.html:4
+#: bookwyrm/templates/snippets/page_text.html:8
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
-#: bookwyrm/templates/snippets/page_text.html:6
+#: bookwyrm/templates/snippets/page_text.html:14
 #, python-format
 msgid "page %(page)s"
 msgstr "página %(page)s"
@@ -3329,6 +3340,12 @@ msgstr "Abrir imagen en una nueva ventana"
 msgid "Hide status"
 msgstr "Ocultar status"
 
+#: bookwyrm/templates/snippets/status/header.html:45
+#, fuzzy, python-format
+#| msgid "Joined %(date)s"
+msgid "edited %(date)s"
+msgstr "Unido %(date)s"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3393,10 +3410,6 @@ msgstr "respaldó"
 msgid "More options"
 msgstr "Más opciones"
 
-#: bookwyrm/templates/snippets/status/status_options.html:26
-msgid "Delete & re-draft"
-msgstr "Eliminar y recomponer"
-
 #: bookwyrm/templates/snippets/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
@@ -3585,3 +3598,20 @@ msgstr "Un enlace para reestablecer tu contraseña se envió a {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr "Actualizaciones de status de {obj.display_name}"
 
+#~ msgid "rated"
+#~ msgstr "calificó"
+
+#~ msgid "reviewed"
+#~ msgstr "reseñó"
+
+#~ msgid "commented on"
+#~ msgstr "comentó en"
+
+#~ msgid "quoted"
+#~ msgstr "citó"
+
+#~ msgid "About this instance"
+#~ msgstr "Sobre esta instancia"
+
+#~ msgid "Delete & re-draft"
+#~ msgstr "Eliminar y recomponer"
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index a0d40fae6373c235965fcd1fa45a4bbdc09b864c..d74dcac25e50afe49aa7d1b2b155ae9f7058b8f3 100644
GIT binary patch
delta 14655
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
I-z(t%0M=DWf&c&j

delta 15929
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
P^!yTCg)f~MUgEz1<h1p%

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 699f8e8ba..3ced0667d 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-06 23:57+0000\n"
+"POT-Creation-Date: 2021-10-15 21:13+0000\n"
 "PO-Revision-Date: 2021-10-08 10:19\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: French\n"
@@ -54,8 +54,8 @@ msgstr "Ordre de la liste"
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:134
-#: bookwyrm/templates/shelf/shelf.html:165
+#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:136
+#: bookwyrm/templates/shelf/shelf.html:168
 #: bookwyrm/templates/snippets/create_status/review.html:33
 msgid "Rating"
 msgstr "Note"
@@ -151,45 +151,49 @@ msgstr "nom du compte :"
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home Timeline"
 msgstr "Mon fil d’actualité"
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home"
 msgstr "Accueil"
 
-#: bookwyrm/settings.py:118
+#: bookwyrm/settings.py:119
 msgid "Books Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:118 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "Livres"
 
-#: bookwyrm/settings.py:164
+#: bookwyrm/settings.py:165
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:165
+#: bookwyrm/settings.py:166
 msgid "Deutsch (German)"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:167
 msgid "Español (Spanish)"
 msgstr "Español"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:168
 msgid "Français (French)"
 msgstr "Français"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:169
+msgid "Português - Brasil (Brazilian Portuguese)"
+msgstr ""
+
+#: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
 msgstr "简化字"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:171
 msgid "繁體中文 (Traditional Chinese)"
 msgstr "Infos supplémentaires :"
 
@@ -669,11 +673,6 @@ msgstr "Langue :"
 msgid "Search editions"
 msgstr "Rechercher des éditions"
 
-#: bookwyrm/templates/book/publisher_info.html:21
-#, python-format
-msgid "%(format)s"
-msgstr "%(format)s"
-
 #: bookwyrm/templates/book/publisher_info.html:23
 #, python-format
 msgid "%(format)s, %(pages)s pages"
@@ -888,6 +887,30 @@ msgstr "Comptes BookWyrm"
 msgid "All known users"
 msgstr "Tous les comptes connus"
 
+#: bookwyrm/templates/discover/card-header.html:9
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:13
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:17
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:21
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
 #: bookwyrm/templates/layout.html:78
@@ -899,28 +922,8 @@ msgstr "Découvrir"
 msgid "See what's new in the local %(site_name)s community"
 msgstr "Voir les nouveautés de la communauté locale %(site_name)s"
 
-#: bookwyrm/templates/discover/large-book.html:46
-#: bookwyrm/templates/discover/small-book.html:32
-msgid "rated"
-msgstr "a noté"
-
-#: bookwyrm/templates/discover/large-book.html:48
-#: bookwyrm/templates/discover/small-book.html:34
-msgid "reviewed"
-msgstr "a écrit une critique de"
-
-#: bookwyrm/templates/discover/large-book.html:50
-#: bookwyrm/templates/discover/small-book.html:36
-msgid "commented on"
-msgstr "a commenté"
-
 #: bookwyrm/templates/discover/large-book.html:52
-#: bookwyrm/templates/discover/small-book.html:38
-msgid "quoted"
-msgstr "a cité"
-
-#: bookwyrm/templates/discover/large-book.html:68
-#: bookwyrm/templates/discover/small-book.html:52
+#: bookwyrm/templates/discover/small-book.html:36
 msgid "View status"
 msgstr "Afficher tous les status"
 
@@ -973,8 +976,9 @@ msgid "Join Now"
 msgstr "S’enregistrer maintenant"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, fuzzy, python-format
+#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
 msgstr "En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette instance</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
@@ -983,7 +987,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-msgid "Learn more about this instance:"
+#, fuzzy, python-format
+#| msgid "Learn more about this instance:"
+msgid "Learn more about %(site_name)s:"
 msgstr "En savoir plus sur cete instance :"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
@@ -1323,13 +1329,13 @@ msgstr "Livre"
 
 #: bookwyrm/templates/import/import_status.html:122
 #: bookwyrm/templates/shelf/shelf.html:128
-#: bookwyrm/templates/shelf/shelf.html:148
+#: bookwyrm/templates/shelf/shelf.html:150
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import/import_status.html:125
 #: bookwyrm/templates/shelf/shelf.html:129
-#: bookwyrm/templates/shelf/shelf.html:151
+#: bookwyrm/templates/shelf/shelf.html:153
 msgid "Author"
 msgstr "Auteur/autrice"
 
@@ -1338,7 +1344,9 @@ msgid "Imported"
 msgstr "Importé"
 
 #: bookwyrm/templates/import/tooltip.html:6
-msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+#, fuzzy
+#| msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr "Vous pouvez télécharger vos données GoodReads depuis la page <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Importation/Exportation</a> de votre compte GoodRead."
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
@@ -1354,7 +1362,7 @@ msgstr "Autorisation refusée"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
-#: bookwyrm/templates/landing/about.html:7
+#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:230
 #, python-format
 msgid "About %(site_name)s"
 msgstr "À propos de %(site_name)s"
@@ -1485,10 +1493,6 @@ msgstr "Publié !"
 msgid "Error posting status"
 msgstr "Erreur lors de la publication"
 
-#: bookwyrm/templates/layout.html:230
-msgid "About this instance"
-msgstr "À propos de cette instance"
-
 #: bookwyrm/templates/layout.html:234
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
@@ -1732,23 +1736,27 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr ""
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications/items/follow.html:15
@@ -2297,6 +2305,7 @@ msgid "Notes"
 msgstr "Remarques"
 
 #: bookwyrm/templates/settings/federation/instance.html:75
+#: bookwyrm/templates/snippets/status/status_options.html:24
 msgid "Edit"
 msgstr "Modifier"
 
@@ -2636,7 +2645,9 @@ msgid "Short description:"
 msgstr "Description courte :"
 
 #: bookwyrm/templates/settings/site.html:37
-msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+#, fuzzy
+#| msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
 msgstr "Utilisé lorsque l'instance est prévisualisée sur joinbookwyrm.com. Ne supporte pas html ou markdown."
 
 #: bookwyrm/templates/settings/site.html:41
@@ -2811,7 +2822,7 @@ msgid "Permanently deleted"
 msgstr "Supprimé définitivement"
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:13
-#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/status/status_options.html:32
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr "Envoyer un message direct"
@@ -2864,22 +2875,22 @@ msgstr "Modifier l’étagère"
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
-#: bookwyrm/templates/shelf/shelf.html:130
-#: bookwyrm/templates/shelf/shelf.html:154
+#: bookwyrm/templates/shelf/shelf.html:132
+#: bookwyrm/templates/shelf/shelf.html:158
 msgid "Shelved"
 msgstr "Date d’ajout"
 
-#: bookwyrm/templates/shelf/shelf.html:131
-#: bookwyrm/templates/shelf/shelf.html:158
+#: bookwyrm/templates/shelf/shelf.html:133
+#: bookwyrm/templates/shelf/shelf.html:161
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/shelf/shelf.html:132
-#: bookwyrm/templates/shelf/shelf.html:161
+#: bookwyrm/templates/shelf/shelf.html:134
+#: bookwyrm/templates/shelf/shelf.html:164
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/shelf/shelf.html:187
+#: bookwyrm/templates/shelf/shelf.html:190
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
@@ -2969,7 +2980,7 @@ msgstr "Attention spoilers !"
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:41
+#: bookwyrm/templates/snippets/create_status/layout.html:45
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Commentaire :"
@@ -3163,12 +3174,12 @@ msgstr "Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livr
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
-#: bookwyrm/templates/snippets/page_text.html:4
+#: bookwyrm/templates/snippets/page_text.html:8
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
 msgstr "page %(page)s sur %(total_pages)s pages"
 
-#: bookwyrm/templates/snippets/page_text.html:6
+#: bookwyrm/templates/snippets/page_text.html:14
 #, python-format
 msgid "page %(page)s"
 msgstr "page %(page)s"
@@ -3329,6 +3340,12 @@ msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 msgid "Hide status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/header.html:45
+#, fuzzy, python-format
+#| msgid "Joined %(date)s"
+msgid "edited %(date)s"
+msgstr "A rejoint ce serveur %(date)s"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3393,10 +3410,6 @@ msgstr "a partagé"
 msgid "More options"
 msgstr "Plus d’options"
 
-#: bookwyrm/templates/snippets/status/status_options.html:26
-msgid "Delete & re-draft"
-msgstr "Supprimer & recommencer la rédaction"
-
 #: bookwyrm/templates/snippets/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
@@ -3585,3 +3598,23 @@ msgstr "Un lien de réinitialisation a été envoyé à {email}."
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "%(format)s"
+#~ msgstr "%(format)s"
+
+#~ msgid "rated"
+#~ msgstr "a noté"
+
+#~ msgid "reviewed"
+#~ msgstr "a écrit une critique de"
+
+#~ msgid "commented on"
+#~ msgstr "a commenté"
+
+#~ msgid "quoted"
+#~ msgstr "a cité"
+
+#~ msgid "About this instance"
+#~ msgstr "À propos de cette instance"
+
+#~ msgid "Delete & re-draft"
+#~ msgstr "Supprimer & recommencer la rédaction"
diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo
index 1942ada36c313bdc50534b0d2cc852963fc82337..6c78e5a6bddb18cd3942469ea848650fb8b15b3a 100644
GIT binary patch
delta 16380
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

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

diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
index d3add60c7..9b044d967 100644
--- a/locale/pt_BR/LC_MESSAGES/django.po
+++ b/locale/pt_BR/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-06 23:57+0000\n"
+"POT-Creation-Date: 2021-10-15 21:13+0000\n"
 "PO-Revision-Date: 2021-10-13 16:42\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Portuguese, Brazilian\n"
@@ -54,8 +54,8 @@ msgstr "Ordem da lista"
 msgid "Book Title"
 msgstr "Título do livro"
 
-#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:134
-#: bookwyrm/templates/shelf/shelf.html:165
+#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:136
+#: bookwyrm/templates/shelf/shelf.html:168
 #: bookwyrm/templates/snippets/create_status/review.html:33
 msgid "Rating"
 msgstr "Avaliação"
@@ -151,45 +151,49 @@ msgstr "nome de usuário"
 msgid "A user with that username already exists."
 msgstr "Já existe um usuário com este nome."
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home Timeline"
 msgstr "Linha do tempo"
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home"
 msgstr "Página inicial"
 
-#: bookwyrm/settings.py:118
+#: bookwyrm/settings.py:119
 msgid "Books Timeline"
 msgstr "Linha do tempo dos livros"
 
-#: bookwyrm/settings.py:118 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "Livros"
 
-#: bookwyrm/settings.py:164
+#: bookwyrm/settings.py:165
 msgid "English"
 msgstr "English (Inglês)"
 
-#: bookwyrm/settings.py:165
+#: bookwyrm/settings.py:166
 msgid "Deutsch (German)"
 msgstr "Deutsch (Alemão)"
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:167
 msgid "Español (Spanish)"
 msgstr "Español (Espanhol)"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:168
 msgid "Français (French)"
 msgstr "Français (Francês)"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:169
+msgid "Português - Brasil (Brazilian Portuguese)"
+msgstr ""
+
+#: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
 msgstr "简体中文 (Chinês simplificado)"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:171
 msgid "繁體中文 (Traditional Chinese)"
 msgstr "繁體中文 (Chinês tradicional)"
 
@@ -669,11 +673,6 @@ msgstr "Idioma:"
 msgid "Search editions"
 msgstr "Procurar edições"
 
-#: bookwyrm/templates/book/publisher_info.html:21
-#, python-format
-msgid "%(format)s"
-msgstr "%(format)s"
-
 #: bookwyrm/templates/book/publisher_info.html:23
 #, python-format
 msgid "%(format)s, %(pages)s pages"
@@ -888,6 +887,30 @@ msgstr "Usuários da BookWyrm"
 msgid "All known users"
 msgstr "Todos os usuários conhecidos"
 
+#: bookwyrm/templates/discover/card-header.html:9
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quer ler <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:13
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quer ler <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:17
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quer ler <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:21
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> quer ler <a href=\"%(book_path)s\">%(book)s</a>"
+
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
 #: bookwyrm/templates/layout.html:78
@@ -899,28 +922,8 @@ msgstr "Explorar"
 msgid "See what's new in the local %(site_name)s community"
 msgstr "Veja as novidades da comunidade %(site_name)s local"
 
-#: bookwyrm/templates/discover/large-book.html:46
-#: bookwyrm/templates/discover/small-book.html:32
-msgid "rated"
-msgstr "avaliado"
-
-#: bookwyrm/templates/discover/large-book.html:48
-#: bookwyrm/templates/discover/small-book.html:34
-msgid "reviewed"
-msgstr "resenhado"
-
-#: bookwyrm/templates/discover/large-book.html:50
-#: bookwyrm/templates/discover/small-book.html:36
-msgid "commented on"
-msgstr "comentado"
-
 #: bookwyrm/templates/discover/large-book.html:52
-#: bookwyrm/templates/discover/small-book.html:38
-msgid "quoted"
-msgstr "citou"
-
-#: bookwyrm/templates/discover/large-book.html:68
-#: bookwyrm/templates/discover/small-book.html:52
+#: bookwyrm/templates/discover/small-book.html:36
 msgid "View status"
 msgstr "Ver publicação"
 
@@ -973,8 +976,9 @@ msgid "Join Now"
 msgstr "Inscreva-se"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, fuzzy, python-format
+#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
 msgstr "Saiba mais <a href=\"https://%(domain)s%(about_path)s\">sobre esta instância</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
@@ -983,7 +987,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Você recebeu um convite para juntar-se a %(site_name)s! Clique no link abaixo para criar uma conta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-msgid "Learn more about this instance:"
+#, fuzzy, python-format
+#| msgid "Learn more about this instance:"
+msgid "Learn more about %(site_name)s:"
 msgstr "Saiba mais sobre esta instância:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
@@ -1323,13 +1329,13 @@ msgstr "Livro"
 
 #: bookwyrm/templates/import/import_status.html:122
 #: bookwyrm/templates/shelf/shelf.html:128
-#: bookwyrm/templates/shelf/shelf.html:148
+#: bookwyrm/templates/shelf/shelf.html:150
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import/import_status.html:125
 #: bookwyrm/templates/shelf/shelf.html:129
-#: bookwyrm/templates/shelf/shelf.html:151
+#: bookwyrm/templates/shelf/shelf.html:153
 msgid "Author"
 msgstr "Autor"
 
@@ -1338,7 +1344,9 @@ msgid "Imported"
 msgstr "Importado"
 
 #: bookwyrm/templates/import/tooltip.html:6
-msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+#, fuzzy
+#| msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr "Você pode baixar seus dados do Goodreads na <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">página de Importar/Exportar</a> da sua conta."
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
@@ -1354,7 +1362,7 @@ msgstr "Permissão negada"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Desculpe! Este convite não é mais válido."
 
-#: bookwyrm/templates/landing/about.html:7
+#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:230
 #, python-format
 msgid "About %(site_name)s"
 msgstr "Sobre %(site_name)s"
@@ -1485,10 +1493,6 @@ msgstr "Publicação feita com sucesso"
 msgid "Error posting status"
 msgstr "Erro ao publicar"
 
-#: bookwyrm/templates/layout.html:230
-msgid "About this instance"
-msgstr "Sobre esta instância"
-
 #: bookwyrm/templates/layout.html:234
 msgid "Contact site admin"
 msgstr "Contatar administração"
@@ -1732,23 +1736,27 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "compartilhou sua <a href=\"%(related_path)s\">publicação</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "curtiu sua <a href=\"%(related_path)s\">resenha de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "curtiu seu <a href=\"%(related_path)s\">comentário sobre<em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "curtiu sua <a href=\"%(related_path)s\">citação de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr "curtiu sua <a href=\"%(related_path)s\">publicação</a>"
 
 #: bookwyrm/templates/notifications/items/follow.html:15
@@ -2297,6 +2305,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #: bookwyrm/templates/settings/federation/instance.html:75
+#: bookwyrm/templates/snippets/status/status_options.html:24
 msgid "Edit"
 msgstr "Editar"
 
@@ -2636,7 +2645,9 @@ msgid "Short description:"
 msgstr "Descrição curta:"
 
 #: bookwyrm/templates/settings/site.html:37
-msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+#, fuzzy
+#| msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
 msgstr "Mostrado quando a instância é vista em joinbookwyrm.com. Não compatível com HTML ou markdown."
 
 #: bookwyrm/templates/settings/site.html:41
@@ -2811,7 +2822,7 @@ msgid "Permanently deleted"
 msgstr "Excluído permanentemente"
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:13
-#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/status/status_options.html:32
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr "Enviar mensagem direta"
@@ -2864,22 +2875,22 @@ msgstr "Editar estante"
 msgid "Delete shelf"
 msgstr "Excluir estante"
 
-#: bookwyrm/templates/shelf/shelf.html:130
-#: bookwyrm/templates/shelf/shelf.html:154
+#: bookwyrm/templates/shelf/shelf.html:132
+#: bookwyrm/templates/shelf/shelf.html:158
 msgid "Shelved"
 msgstr "Adicionado"
 
-#: bookwyrm/templates/shelf/shelf.html:131
-#: bookwyrm/templates/shelf/shelf.html:158
+#: bookwyrm/templates/shelf/shelf.html:133
+#: bookwyrm/templates/shelf/shelf.html:161
 msgid "Started"
 msgstr "Iniciado"
 
-#: bookwyrm/templates/shelf/shelf.html:132
-#: bookwyrm/templates/shelf/shelf.html:161
+#: bookwyrm/templates/shelf/shelf.html:134
+#: bookwyrm/templates/shelf/shelf.html:164
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/shelf/shelf.html:187
+#: bookwyrm/templates/shelf/shelf.html:190
 msgid "This shelf is empty."
 msgstr "Esta estante está vazia."
 
@@ -2969,7 +2980,7 @@ msgstr "Alerta de spoiler!"
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:41
+#: bookwyrm/templates/snippets/create_status/layout.html:45
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Comentário:"
@@ -3163,12 +3174,12 @@ msgstr "Você leu <a href=\"%(path)s\">%(read_count)s de %(goal_count)s livros</
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s leu <a href=\"%(path)s\">%(read_count)s de %(goal_count)s livros</a>."
 
-#: bookwyrm/templates/snippets/page_text.html:4
+#: bookwyrm/templates/snippets/page_text.html:8
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
-#: bookwyrm/templates/snippets/page_text.html:6
+#: bookwyrm/templates/snippets/page_text.html:14
 #, python-format
 msgid "page %(page)s"
 msgstr "página %(page)s"
@@ -3329,6 +3340,12 @@ msgstr "Abrir imagem em nova janela"
 msgid "Hide status"
 msgstr "Esconder publicação"
 
+#: bookwyrm/templates/snippets/status/header.html:45
+#, fuzzy, python-format
+#| msgid "Joined %(date)s"
+msgid "edited %(date)s"
+msgstr "Membro desde %(date)s"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3393,10 +3410,6 @@ msgstr "compartilhado"
 msgid "More options"
 msgstr "Mais opções"
 
-#: bookwyrm/templates/snippets/status/status_options.html:26
-msgid "Delete & re-draft"
-msgstr "Excluir e rascunhar"
-
 #: bookwyrm/templates/snippets/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
@@ -3585,3 +3598,23 @@ msgstr "Um link para redefinição da senha foi enviado para {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr "Novas publicações de {obj.display_name}"
 
+#~ msgid "%(format)s"
+#~ msgstr "%(format)s"
+
+#~ msgid "rated"
+#~ msgstr "avaliado"
+
+#~ msgid "reviewed"
+#~ msgstr "resenhado"
+
+#~ msgid "commented on"
+#~ msgstr "comentado"
+
+#~ msgid "quoted"
+#~ msgstr "citou"
+
+#~ msgid "About this instance"
+#~ msgstr "Sobre esta instância"
+
+#~ msgid "Delete & re-draft"
+#~ msgstr "Excluir e rascunhar"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 9eaced00b9cab4a10af1164d968bf9fc4b967bdb..af48ebbb5faae15f051e4a816743309a861f8ba4 100644
GIT binary patch
delta 14158
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

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

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 7bbcbcc54..1075a1eea 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-06 23:57+0000\n"
+"POT-Creation-Date: 2021-10-15 21:13+0000\n"
 "PO-Revision-Date: 2021-10-08 00:03\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Chinese Simplified\n"
@@ -54,8 +54,8 @@ msgstr "列表顺序"
 msgid "Book Title"
 msgstr "书名"
 
-#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:134
-#: bookwyrm/templates/shelf/shelf.html:165
+#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:136
+#: bookwyrm/templates/shelf/shelf.html:168
 #: bookwyrm/templates/snippets/create_status/review.html:33
 msgid "Rating"
 msgstr "评价"
@@ -151,45 +151,49 @@ msgstr "用户名"
 msgid "A user with that username already exists."
 msgstr "已经存在使用该用户名的用户。"
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home Timeline"
 msgstr "主页时间线"
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home"
 msgstr "主页"
 
-#: bookwyrm/settings.py:118
+#: bookwyrm/settings.py:119
 msgid "Books Timeline"
 msgstr "书目时间线"
 
-#: bookwyrm/settings.py:118 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "书目"
 
-#: bookwyrm/settings.py:164
+#: bookwyrm/settings.py:165
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:165
+#: bookwyrm/settings.py:166
 msgid "Deutsch (German)"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:167
 msgid "Español (Spanish)"
 msgstr "Español（西班牙语）"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:168
 msgid "Français (French)"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:169
+msgid "Português - Brasil (Brazilian Portuguese)"
+msgstr ""
+
+#: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
 msgstr "简体中文"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:171
 msgid "繁體中文 (Traditional Chinese)"
 msgstr "繁體中文（繁体中文）"
 
@@ -668,11 +672,6 @@ msgstr "语言:"
 msgid "Search editions"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:21
-#, python-format
-msgid "%(format)s"
-msgstr "%(format)s"
-
 #: bookwyrm/templates/book/publisher_info.html:23
 #, python-format
 msgid "%(format)s, %(pages)s pages"
@@ -885,6 +884,30 @@ msgstr "BookWyrm 用户"
 msgid "All known users"
 msgstr "所有已知用户"
 
+#: bookwyrm/templates/discover/card-header.html:9
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:13
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:17
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
+
+#: bookwyrm/templates/discover/card-header.html:21
+#, fuzzy, python-format
+#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
+
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
 #: bookwyrm/templates/layout.html:78
@@ -896,28 +919,8 @@ msgstr "发现"
 msgid "See what's new in the local %(site_name)s community"
 msgstr "看看本地 %(site_name)s 社区的新消息"
 
-#: bookwyrm/templates/discover/large-book.html:46
-#: bookwyrm/templates/discover/small-book.html:32
-msgid "rated"
-msgstr "评价了"
-
-#: bookwyrm/templates/discover/large-book.html:48
-#: bookwyrm/templates/discover/small-book.html:34
-msgid "reviewed"
-msgstr "写了书评给"
-
-#: bookwyrm/templates/discover/large-book.html:50
-#: bookwyrm/templates/discover/small-book.html:36
-msgid "commented on"
-msgstr "评论了"
-
 #: bookwyrm/templates/discover/large-book.html:52
-#: bookwyrm/templates/discover/small-book.html:38
-msgid "quoted"
-msgstr "引用了"
-
-#: bookwyrm/templates/discover/large-book.html:68
-#: bookwyrm/templates/discover/small-book.html:52
+#: bookwyrm/templates/discover/small-book.html:36
 msgid "View status"
 msgstr "浏览状态"
 
@@ -970,8 +973,9 @@ msgid "Join Now"
 msgstr "立即加入"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, fuzzy, python-format
+#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
 msgstr "了解更多 <a href=\"https://%(domain)s%(about_path)s\">有关本实例的信息</a>。"
 
 #: bookwyrm/templates/email/invite/text_content.html:4
@@ -980,7 +984,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "你受邀请加入 %(site_name)s！点击下面的连接来创建帐号。"
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-msgid "Learn more about this instance:"
+#, fuzzy, python-format
+#| msgid "Learn more about this instance:"
+msgid "Learn more about %(site_name)s:"
 msgstr "了解更多有关本实例的信息:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
@@ -1320,13 +1326,13 @@ msgstr "书目"
 
 #: bookwyrm/templates/import/import_status.html:122
 #: bookwyrm/templates/shelf/shelf.html:128
-#: bookwyrm/templates/shelf/shelf.html:148
+#: bookwyrm/templates/shelf/shelf.html:150
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import/import_status.html:125
 #: bookwyrm/templates/shelf/shelf.html:129
-#: bookwyrm/templates/shelf/shelf.html:151
+#: bookwyrm/templates/shelf/shelf.html:153
 msgid "Author"
 msgstr "作者"
 
@@ -1335,7 +1341,7 @@ msgid "Imported"
 msgstr "已导入"
 
 #: bookwyrm/templates/import/tooltip.html:6
-msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr ""
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
@@ -1351,7 +1357,7 @@ msgstr "没有权限"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "抱歉！此邀请码已不再有效。"
 
-#: bookwyrm/templates/landing/about.html:7
+#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:230
 #, python-format
 msgid "About %(site_name)s"
 msgstr "关于 %(site_name)s"
@@ -1482,10 +1488,6 @@ msgstr ""
 msgid "Error posting status"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:230
-msgid "About this instance"
-msgstr "关于本实例"
-
 #: bookwyrm/templates/layout.html:234
 msgid "Contact site admin"
 msgstr "联系站点管理员"
@@ -1729,23 +1731,27 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "转发了你的 <a href=\"%(related_path)s\">状态</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr ""
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "转发了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">来自 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr "喜欢了你的 <a href=\"%(related_path)s\">状态</a>"
 
 #: bookwyrm/templates/notifications/items/follow.html:15
@@ -2291,6 +2297,7 @@ msgid "Notes"
 msgstr "备注"
 
 #: bookwyrm/templates/settings/federation/instance.html:75
+#: bookwyrm/templates/snippets/status/status_options.html:24
 msgid "Edit"
 msgstr "编辑"
 
@@ -2630,7 +2637,7 @@ msgid "Short description:"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:37
-msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:41
@@ -2805,7 +2812,7 @@ msgid "Permanently deleted"
 msgstr "已永久删除"
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:13
-#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/status/status_options.html:32
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr "发送私信"
@@ -2857,22 +2864,22 @@ msgstr "编辑书架"
 msgid "Delete shelf"
 msgstr "删除书架"
 
-#: bookwyrm/templates/shelf/shelf.html:130
-#: bookwyrm/templates/shelf/shelf.html:154
+#: bookwyrm/templates/shelf/shelf.html:132
+#: bookwyrm/templates/shelf/shelf.html:158
 msgid "Shelved"
 msgstr "上架时间"
 
-#: bookwyrm/templates/shelf/shelf.html:131
-#: bookwyrm/templates/shelf/shelf.html:158
+#: bookwyrm/templates/shelf/shelf.html:133
+#: bookwyrm/templates/shelf/shelf.html:161
 msgid "Started"
 msgstr "开始时间"
 
-#: bookwyrm/templates/shelf/shelf.html:132
-#: bookwyrm/templates/shelf/shelf.html:161
+#: bookwyrm/templates/shelf/shelf.html:134
+#: bookwyrm/templates/shelf/shelf.html:164
 msgid "Finished"
 msgstr "完成时间"
 
-#: bookwyrm/templates/shelf/shelf.html:187
+#: bookwyrm/templates/shelf/shelf.html:190
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
@@ -2961,7 +2968,7 @@ msgstr "前有剧透！"
 msgid "Include spoiler alert"
 msgstr "加入剧透警告"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:41
+#: bookwyrm/templates/snippets/create_status/layout.html:45
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "评论:"
@@ -3150,12 +3157,12 @@ msgstr "你已经阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(re
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s 已经阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
 
-#: bookwyrm/templates/snippets/page_text.html:4
+#: bookwyrm/templates/snippets/page_text.html:8
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
 msgstr "%(total_pages)s 页中的第 %(page)s 页"
 
-#: bookwyrm/templates/snippets/page_text.html:6
+#: bookwyrm/templates/snippets/page_text.html:14
 #, python-format
 msgid "page %(page)s"
 msgstr "第 %(page)s 页"
@@ -3316,6 +3323,12 @@ msgstr "在新窗口中打开图像"
 msgid "Hide status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/header.html:45
+#, fuzzy, python-format
+#| msgid "Joined %(date)s"
+msgid "edited %(date)s"
+msgstr "在 %(date)s 加入"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3380,10 +3393,6 @@ msgstr "转发了"
 msgid "More options"
 msgstr "更多选项"
 
-#: bookwyrm/templates/snippets/status/status_options.html:26
-msgid "Delete & re-draft"
-msgstr "删除并重新起草"
-
 #: bookwyrm/templates/snippets/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
@@ -3568,3 +3577,23 @@ msgstr "密码重置连接已发送给 {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "%(format)s"
+#~ msgstr "%(format)s"
+
+#~ msgid "rated"
+#~ msgstr "评价了"
+
+#~ msgid "reviewed"
+#~ msgstr "写了书评给"
+
+#~ msgid "commented on"
+#~ msgstr "评论了"
+
+#~ msgid "quoted"
+#~ msgstr "引用了"
+
+#~ msgid "About this instance"
+#~ msgstr "关于本实例"
+
+#~ msgid "Delete & re-draft"
+#~ msgstr "删除并重新起草"
diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo
index 97c0a9fb7d096aa52e6d74bbe29b415ac1f47899..10124a192f65211c889e04b2ce4debb16d452f24 100644
GIT binary patch
delta 12880
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
E2NDj=1poj5

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

diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index bcfcdf06b..980f6b5ec 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-06 23:57+0000\n"
+"POT-Creation-Date: 2021-10-15 21:13+0000\n"
 "PO-Revision-Date: 2021-10-08 00:03\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Chinese Traditional\n"
@@ -54,8 +54,8 @@ msgstr "列表順序"
 msgid "Book Title"
 msgstr "書名"
 
-#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:134
-#: bookwyrm/templates/shelf/shelf.html:165
+#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:136
+#: bookwyrm/templates/shelf/shelf.html:168
 #: bookwyrm/templates/snippets/create_status/review.html:33
 msgid "Rating"
 msgstr "評價"
@@ -151,45 +151,49 @@ msgstr "使用者名稱"
 msgid "A user with that username already exists."
 msgstr "已經存在使用該名稱的使用者。"
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home Timeline"
 msgstr "主頁時間線"
 
-#: bookwyrm/settings.py:117
+#: bookwyrm/settings.py:118
 msgid "Home"
 msgstr "主頁"
 
-#: bookwyrm/settings.py:118
+#: bookwyrm/settings.py:119
 msgid "Books Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:118 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "書目"
 
-#: bookwyrm/settings.py:164
+#: bookwyrm/settings.py:165
 msgid "English"
 msgstr "English（英語）"
 
-#: bookwyrm/settings.py:165
+#: bookwyrm/settings.py:166
 msgid "Deutsch (German)"
 msgstr "Deutsch（德語）"
 
-#: bookwyrm/settings.py:166
+#: bookwyrm/settings.py:167
 msgid "Español (Spanish)"
 msgstr "Español（西班牙語）"
 
-#: bookwyrm/settings.py:167
+#: bookwyrm/settings.py:168
 msgid "Français (French)"
 msgstr "Français（法語）"
 
-#: bookwyrm/settings.py:168
+#: bookwyrm/settings.py:169
+msgid "Português - Brasil (Brazilian Portuguese)"
+msgstr ""
+
+#: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
 msgstr "簡體中文"
 
-#: bookwyrm/settings.py:169
+#: bookwyrm/settings.py:171
 msgid "繁體中文 (Traditional Chinese)"
 msgstr "繁體中文"
 
@@ -668,11 +672,6 @@ msgstr "語言:"
 msgid "Search editions"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:21
-#, python-format
-msgid "%(format)s"
-msgstr "%(format)s"
-
 #: bookwyrm/templates/book/publisher_info.html:23
 #, python-format
 msgid "%(format)s, %(pages)s pages"
@@ -885,6 +884,30 @@ msgstr "BookWyrm 使用者"
 msgid "All known users"
 msgstr "所有已知使用者"
 
+#: bookwyrm/templates/discover/card-header.html:9
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+
+#: bookwyrm/templates/discover/card-header.html:13
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+
+#: bookwyrm/templates/discover/card-header.html:17
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+
+#: bookwyrm/templates/discover/card-header.html:21
+#, fuzzy, python-format
+#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
+msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
 #: bookwyrm/templates/layout.html:78
@@ -896,28 +919,8 @@ msgstr ""
 msgid "See what's new in the local %(site_name)s community"
 msgstr ""
 
-#: bookwyrm/templates/discover/large-book.html:46
-#: bookwyrm/templates/discover/small-book.html:32
-msgid "rated"
-msgstr "評價了"
-
-#: bookwyrm/templates/discover/large-book.html:48
-#: bookwyrm/templates/discover/small-book.html:34
-msgid "reviewed"
-msgstr "寫了書評給"
-
-#: bookwyrm/templates/discover/large-book.html:50
-#: bookwyrm/templates/discover/small-book.html:36
-msgid "commented on"
-msgstr "評論了"
-
 #: bookwyrm/templates/discover/large-book.html:52
-#: bookwyrm/templates/discover/small-book.html:38
-msgid "quoted"
-msgstr "引用了"
-
-#: bookwyrm/templates/discover/large-book.html:68
-#: bookwyrm/templates/discover/small-book.html:52
+#: bookwyrm/templates/discover/small-book.html:36
 msgid "View status"
 msgstr ""
 
@@ -970,8 +973,9 @@ msgid "Join Now"
 msgstr "立即加入"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, fuzzy, python-format
+#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
 msgstr "瞭解更多 <a href=\"https://%(domain)s%(about_path)s\">有關本實例的資訊</a>。"
 
 #: bookwyrm/templates/email/invite/text_content.html:4
@@ -980,7 +984,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "你受邀請加入 %(site_name)s！點選下面的連結來建立帳號。"
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-msgid "Learn more about this instance:"
+#, fuzzy, python-format
+#| msgid "Learn more about this instance:"
+msgid "Learn more about %(site_name)s:"
 msgstr "瞭解更多有關本實例的資訊:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
@@ -1320,13 +1326,13 @@ msgstr "書目"
 
 #: bookwyrm/templates/import/import_status.html:122
 #: bookwyrm/templates/shelf/shelf.html:128
-#: bookwyrm/templates/shelf/shelf.html:148
+#: bookwyrm/templates/shelf/shelf.html:150
 msgid "Title"
 msgstr "標題"
 
 #: bookwyrm/templates/import/import_status.html:125
 #: bookwyrm/templates/shelf/shelf.html:129
-#: bookwyrm/templates/shelf/shelf.html:151
+#: bookwyrm/templates/shelf/shelf.html:153
 msgid "Author"
 msgstr "作者"
 
@@ -1335,7 +1341,7 @@ msgid "Imported"
 msgstr "已匯入"
 
 #: bookwyrm/templates/import/tooltip.html:6
-msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr ""
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
@@ -1351,7 +1357,7 @@ msgstr "沒有權限"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "抱歉！此邀請碼已不再有效。"
 
-#: bookwyrm/templates/landing/about.html:7
+#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:230
 #, python-format
 msgid "About %(site_name)s"
 msgstr "關於 %(site_name)s"
@@ -1482,10 +1488,6 @@ msgstr ""
 msgid "Error posting status"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:230
-msgid "About this instance"
-msgstr "關於本實例"
-
 #: bookwyrm/templates/layout.html:234
 msgid "Contact site admin"
 msgstr "聯絡網站管理員"
@@ -1729,23 +1731,27 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "轉發了你的 <a href=\"%(related_path)s\">狀態</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "喜歡了你 <a href=\"%(related_path)s\">對 <em>%(book_title)s</em> 的書評</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr ""
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "轉發了你的 <a href=\"%(related_path)s\">對 <em>%(book_title)s</em> 的評論</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "喜歡了你 <a href=\"%(related_path)s\">來自 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr "喜歡了你的 <a href=\"%(related_path)s\">狀態</a>"
 
 #: bookwyrm/templates/notifications/items/follow.html:15
@@ -2291,6 +2297,7 @@ msgid "Notes"
 msgstr "備註"
 
 #: bookwyrm/templates/settings/federation/instance.html:75
+#: bookwyrm/templates/snippets/status/status_options.html:24
 msgid "Edit"
 msgstr "編輯"
 
@@ -2630,7 +2637,7 @@ msgid "Short description:"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:37
-msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:41
@@ -2805,7 +2812,7 @@ msgid "Permanently deleted"
 msgstr ""
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:13
-#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/status/status_options.html:32
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr "發送私信"
@@ -2857,22 +2864,22 @@ msgstr "編輯書架"
 msgid "Delete shelf"
 msgstr "刪除書架"
 
-#: bookwyrm/templates/shelf/shelf.html:130
-#: bookwyrm/templates/shelf/shelf.html:154
+#: bookwyrm/templates/shelf/shelf.html:132
+#: bookwyrm/templates/shelf/shelf.html:158
 msgid "Shelved"
 msgstr "上架時間"
 
-#: bookwyrm/templates/shelf/shelf.html:131
-#: bookwyrm/templates/shelf/shelf.html:158
+#: bookwyrm/templates/shelf/shelf.html:133
+#: bookwyrm/templates/shelf/shelf.html:161
 msgid "Started"
 msgstr "開始時間"
 
-#: bookwyrm/templates/shelf/shelf.html:132
-#: bookwyrm/templates/shelf/shelf.html:161
+#: bookwyrm/templates/shelf/shelf.html:134
+#: bookwyrm/templates/shelf/shelf.html:164
 msgid "Finished"
 msgstr "完成時間"
 
-#: bookwyrm/templates/shelf/shelf.html:187
+#: bookwyrm/templates/shelf/shelf.html:190
 msgid "This shelf is empty."
 msgstr "此書架是空的。"
 
@@ -2961,7 +2968,7 @@ msgstr "前有劇透！"
 msgid "Include spoiler alert"
 msgstr "加入劇透警告"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:41
+#: bookwyrm/templates/snippets/create_status/layout.html:45
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "評論:"
@@ -3150,12 +3157,12 @@ msgstr "你已經閱讀了 <a href=\"%(path)s\">%(goal_count)s 本書中的 %(re
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s 已經閱讀了 <a href=\"%(path)s\">%(goal_count)s 本書中的 %(read_count)s 本</a>。"
 
-#: bookwyrm/templates/snippets/page_text.html:4
+#: bookwyrm/templates/snippets/page_text.html:8
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
 msgstr "%(total_pages)s 頁中的第 %(page)s 頁"
 
-#: bookwyrm/templates/snippets/page_text.html:6
+#: bookwyrm/templates/snippets/page_text.html:14
 #, python-format
 msgid "page %(page)s"
 msgstr "第 %(page)s 頁"
@@ -3316,6 +3323,12 @@ msgstr "在新視窗中開啟圖片"
 msgid "Hide status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/header.html:45
+#, fuzzy, python-format
+#| msgid "Joined %(date)s"
+msgid "edited %(date)s"
+msgstr "在 %(date)s 加入"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -3380,10 +3393,6 @@ msgstr "轉發了"
 msgid "More options"
 msgstr "更多選項"
 
-#: bookwyrm/templates/snippets/status/status_options.html:26
-msgid "Delete & re-draft"
-msgstr "刪除並重新起草"
-
 #: bookwyrm/templates/snippets/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
@@ -3568,3 +3577,23 @@ msgstr "密碼重置連結已傳送給 {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "%(format)s"
+#~ msgstr "%(format)s"
+
+#~ msgid "rated"
+#~ msgstr "評價了"
+
+#~ msgid "reviewed"
+#~ msgstr "寫了書評給"
+
+#~ msgid "commented on"
+#~ msgstr "評論了"
+
+#~ msgid "quoted"
+#~ msgstr "引用了"
+
+#~ msgid "About this instance"
+#~ msgstr "關於本實例"
+
+#~ msgid "Delete & re-draft"
+#~ msgstr "刪除並重新起草"

From 97ea61dd7ef095c074f6fb079c72cb58803a9545 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 08:17:42 +1100
Subject: [PATCH 121/193] efficiency improvement to remove_from_group

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

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 9b05c81b5..7ce7f9227 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -101,11 +101,7 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     def remove_from_group(cls, owner, user):
         """remove a list from a group"""
 
-        memberships = GroupMember.objects.filter(group__user=owner, user=user).all()
-
-        for membership in memberships:
-            # remove this user's group-curated lists from the group
-            cls.objects.filter(group=membership.group, user=membership.user).update(
+        cls.objects.filter(group__user=owner, user=user).all().update(
                 group=None, curation="closed"
             )
 

From 864d8cea2b4d78c6f1db6fd9d32f7db91e250760 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 08:18:55 +1100
Subject: [PATCH 122/193] clean up templates

---
 bookwyrm/templates/groups/create_form.html         | 12 ++++++++++++
 bookwyrm/templates/groups/find_users.html          |  3 ++-
 bookwyrm/templates/groups/form.html                |  1 -
 bookwyrm/templates/lists/form.html                 |  2 +-
 bookwyrm/templates/notifications/items/invite.html |  2 +-
 bookwyrm/templates/user/groups.html                | 13 ++++---------
 6 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 bookwyrm/templates/groups/create_form.html

diff --git a/bookwyrm/templates/groups/create_form.html b/bookwyrm/templates/groups/create_form.html
new file mode 100644
index 000000000..dbb8ad88b
--- /dev/null
+++ b/bookwyrm/templates/groups/create_form.html
@@ -0,0 +1,12 @@
+{% extends 'components/inline_form.html' %}
+{% load i18n %}
+
+{% block header %}
+{% trans "Create Group" %}
+{% endblock %}
+
+{% block form %}
+<form name="create-group" method="post" action="{% url 'user-groups' request.user.username %}">
+    {% include 'groups/form.html' with group_form=group_form %}
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/groups/find_users.html b/bookwyrm/templates/groups/find_users.html
index 57d4277c1..684cadb14 100644
--- a/bookwyrm/templates/groups/find_users.html
+++ b/bookwyrm/templates/groups/find_users.html
@@ -1,8 +1,9 @@
 {% extends 'groups/group.html' %}
+{% load i18n %}
 
 {% block searchresults %}
     <h2 class="title is-5">
-        Add new members!
+        {% trans "Add new members!" %}
     </h2>
     {% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %}
 {% endblock %}
diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index f684dd010..c1281172b 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -1,6 +1,5 @@
 {% load i18n %}
 {% csrf_token %}
-<input type="hidden" name="user" value="{{ request.user.id }}">
 
 <div class="columns">
     <div class="column is-two-thirds">
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index 3e4841b15..25dc01e63 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -37,7 +37,7 @@
                 <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %} > {% trans "Group" %}
                 <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
                 <fieldset class="{% if list.curation != 'group' %}is-hidden{% endif %}" id="list_group_selector">
-                {% if user.memberships %}
+                {% if user.memberships.exists %}
                     <label class="label" for="id_group" id="group">{% trans "Select Group" %}</label>
                     <div class="field has-addons">
                         <div class="select control">
diff --git a/bookwyrm/templates/notifications/items/invite.html b/bookwyrm/templates/notifications/items/invite.html
index 63a462608..ddfa3b345 100644
--- a/bookwyrm/templates/notifications/items/invite.html
+++ b/bookwyrm/templates/notifications/items/invite.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block description %}
-{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} 
+{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %} 
 invited you to join the group <a href="{{ group_path }}">{{ group_name }}</a>
 {% endblocktrans %}
 <div class="row shrink">
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html
index 9c91fb186..6f3619fd3 100644
--- a/bookwyrm/templates/user/groups.html
+++ b/bookwyrm/templates/user/groups.html
@@ -24,15 +24,10 @@
 
 {% block panel %}
 <section class="block">
-    <form name="create-group" method="post" action="{% url 'user-groups' request.user.username %}" class="box is-hidden" id="create_group">
-        <header class="columns">
-            <h3 class="title column">{% trans "Create group" %}</h3>
-            <div class="column is-narrow">
-                {% include 'snippets/toggle/toggle_button.html' with controls_text="create_group" label="close" class="delete" nonbutton=True %}
-            </div>
-        </header>
-        {% include 'groups/form.html' %}
-    </form>
+
+    <div class="block">
+        {% include 'groups/create_form.html' with controls_text="create_group" %}
+    </div>
 
     {% include 'groups/user_groups.html' with memberships=memberships %}
 </section>

From e261bfdb6a62e82c09568caf499144e00371fe06 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 08:20:12 +1100
Subject: [PATCH 123/193] fix local filter for suggested users

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

diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py
index f5ede190e..86c181a28 100644
--- a/bookwyrm/suggested_users.py
+++ b/bookwyrm/suggested_users.py
@@ -81,7 +81,7 @@ class SuggestedUsers(RedisStore):
         """take a user out of someone's suggestions"""
         self.bulk_remove_objects_from_store([suggested_user], self.store_id(user))
 
-    def get_suggestions(self, user, **filters):
+    def get_suggestions(self, user, local=False):
         """get suggestions"""
         values = self.get_store(self.store_id(user), withscores=True)
         results = []
@@ -97,10 +97,7 @@ class SuggestedUsers(RedisStore):
                 logger.exception(err)
                 continue
             user.mutuals = counts["mutuals"]
-            if filters.local:
-                if user.local:
-                    results.append(user)
-            else:
+            if (local and user.local) or not local:
                 results.append(user)
             if len(results) >= 5:
                 break

From 931f78d7c23648b06ccb1403e4d0ec222ace7882 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 14:26:07 -0700
Subject: [PATCH 124/193] Validate author page html

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

diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py
index 7a0065c9e..03c027fae 100644
--- a/bookwyrm/tests/views/test_author.py
+++ b/bookwyrm/tests/views/test_author.py
@@ -9,6 +9,7 @@ from django.test.client import RequestFactory
 
 from bookwyrm import forms, models, views
 from bookwyrm.activitypub import ActivitypubResponse
+from bookwyrm.tests.validate_html import validate_html
 
 
 class AuthorViews(TestCase):
@@ -54,7 +55,7 @@ class AuthorViews(TestCase):
             is_api.return_value = False
             result = view(request, author.id)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
         self.assertEqual(result.status_code, 200)
 
@@ -75,7 +76,7 @@ class AuthorViews(TestCase):
 
         result = view(request, author.id)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
         self.assertEqual(result.status_code, 200)
 

From 1e7b56cdb0a7dfc8aae28436b249e6f153050d8c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 14:26:16 -0700
Subject: [PATCH 125/193] Don't show last edited by link if it's not set

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

diff --git a/bookwyrm/templates/author/edit_author.html b/bookwyrm/templates/author/edit_author.html
index 103341bfd..54d7f4f1c 100644
--- a/bookwyrm/templates/author/edit_author.html
+++ b/bookwyrm/templates/author/edit_author.html
@@ -12,7 +12,9 @@
     <div>
         <p>{% trans "Added:" %} {{ author.created_date | naturaltime }}</p>
         <p>{% trans "Updated:" %} {{ author.updated_date | naturaltime }}</p>
+        {% if author.last_edited_by %}
         <p>{% trans "Last edited by:" %} <a href="{{ author.last_edited_by.remote_id }}">{{ author.last_edited_by.display_name }}</a></p>
+        {% endif %}
     </div>
 </header>
 

From 3b817adf973898f293d37483d77c9e7370c3e9f0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 15 Oct 2021 15:04:19 -0700
Subject: [PATCH 126/193] Updates locales with edit page change

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 44812 -> 44764 bytes
 locale/de_DE/LC_MESSAGES/django.po   |  21 +++++++++++++--------
 locale/en_US/LC_MESSAGES/django.po   |  14 +++++++-------
 locale/es_ES/LC_MESSAGES/django.mo   | Bin 53000 -> 52929 bytes
 locale/es_ES/LC_MESSAGES/django.po   |  21 +++++++++++++--------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 49178 -> 49128 bytes
 locale/fr_FR/LC_MESSAGES/django.po   |  21 +++++++++++++--------
 locale/pt_BR/LC_MESSAGES/django.mo   | Bin 53886 -> 53833 bytes
 locale/pt_BR/LC_MESSAGES/django.po   |  21 +++++++++++++--------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 43607 -> 43563 bytes
 locale/zh_Hans/LC_MESSAGES/django.po |  21 +++++++++++++--------
 locale/zh_Hant/LC_MESSAGES/django.mo | Bin 38293 -> 38249 bytes
 locale/zh_Hant/LC_MESSAGES/django.po |  21 +++++++++++++--------
 13 files changed, 85 insertions(+), 55 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 342f07c9cb69640b62342f6fbe5d96b00ef4d927..0907655a21ebb14477d0e72251c2130be347e7b2 100644
GIT binary patch
delta 13675
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
MSZB}jDPt=CAN>M$Bme*a

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

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index eced88aea..a143a313d 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-15 21:13+0000\n"
+"POT-Creation-Date: 2021-10-15 22:03+0000\n"
 "PO-Revision-Date: 2021-10-13 13:32\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: German\n"
@@ -752,8 +752,10 @@ msgid "Help"
 msgstr "Hilfe"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-msgid "Compose status"
-msgstr "Status verfassen"
+#, fuzzy
+#| msgid "View status"
+msgid "Edit status"
+msgstr "Status ansehen"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -2935,22 +2937,22 @@ msgstr "Zitieren"
 msgid "Some thoughts on the book"
 msgstr "Ein paar Gedanken zum Buch"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:26
+#: bookwyrm/templates/snippets/create_status/comment.html:27
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:15
 msgid "Progress:"
 msgstr "Fortschritt:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/progress_field.html:18
 msgid "pages"
 msgstr "Seiten"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/create_status/comment.html:59
 #: bookwyrm/templates/snippets/progress_field.html:23
 msgid "percent"
 msgstr "Prozent"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/create_status/comment.html:66
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "von %(pages)s Seiten"
@@ -2978,7 +2980,7 @@ msgstr "Spoileralarm!"
 msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:45
+#: bookwyrm/templates/snippets/create_status/layout.html:48
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Kommentar:"
@@ -3596,6 +3598,9 @@ msgstr "Ein Passwortwiederherstellungslinl wurde zu {email} gesendet"
 msgid "Status updates from {obj.display_name}"
 msgstr "Status updates von {obj.display_name}"
 
+#~ msgid "Compose status"
+#~ msgstr "Status verfassen"
+
 #~ msgid "%(format)s"
 #~ msgstr "Formate: %(format)s"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 156009bff..3f04e5c5c 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-15 21:13+0000\n"
+"POT-Creation-Date: 2021-10-15 22:03+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -753,7 +753,7 @@ msgid "Help"
 msgstr ""
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-msgid "Compose status"
+msgid "Edit status"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
@@ -2924,22 +2924,22 @@ msgstr ""
 msgid "Some thoughts on the book"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:26
+#: bookwyrm/templates/snippets/create_status/comment.html:27
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:15
 msgid "Progress:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/progress_field.html:18
 msgid "pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/create_status/comment.html:59
 #: bookwyrm/templates/snippets/progress_field.html:23
 msgid "percent"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/create_status/comment.html:66
 #, python-format
 msgid "of %(pages)s pages"
 msgstr ""
@@ -2967,7 +2967,7 @@ msgstr ""
 msgid "Include spoiler alert"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/layout.html:45
+#: bookwyrm/templates/snippets/create_status/layout.html:48
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr ""
diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo
index 699c286fa1210f1643813b0628d3f068b84391de..35ccb7f0598696b8d7d23e944253fed54f02d6d4 100644
GIT binary patch
delta 15702
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
IonQI?0Pn2c#sB~S

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

diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po
index 681fec246..4f1ed8d21 100644
--- a/locale/es_ES/LC_MESSAGES/django.po
+++ b/locale/es_ES/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-15 21:13+0000\n"
+"POT-Creation-Date: 2021-10-15 22:03+0000\n"
 "PO-Revision-Date: 2021-10-08 00:04\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Spanish\n"
@@ -752,8 +752,10 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-msgid "Compose status"
-msgstr "Componer status"
+#, fuzzy
+#| msgid "View status"
+msgid "Edit status"
+msgstr "Ver status"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -2937,22 +2939,22 @@ msgstr "Cita"
 msgid "Some thoughts on the book"
 msgstr "Algunos pensamientos sobre el libro"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:26
+#: bookwyrm/templates/snippets/create_status/comment.html:27
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:15
 msgid "Progress:"
 msgstr "Progreso:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/progress_field.html:18
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/create_status/comment.html:59
 #: bookwyrm/templates/snippets/progress_field.html:23
 msgid "percent"
 msgstr "por ciento"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/create_status/comment.html:66
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
@@ -2980,7 +2982,7 @@ msgstr "¡Advertencia, ya vienen spoilers!"
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:45
+#: bookwyrm/templates/snippets/create_status/layout.html:48
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Comentario:"
@@ -3598,6 +3600,9 @@ msgstr "Un enlace para reestablecer tu contraseña se envió a {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr "Actualizaciones de status de {obj.display_name}"
 
+#~ msgid "Compose status"
+#~ msgstr "Componer status"
+
 #~ msgid "rated"
 #~ msgstr "calificó"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index d74dcac25e50afe49aa7d1b2b155ae9f7058b8f3..a1fbfd2cb5de46916399e1041b265435163bc70b 100644
GIT binary patch
delta 14426
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
X)ooYr>Sc28TG60F!me9WYt{TeUdare

delta 14487
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
F{{Y+&C~p7&

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 3ced0667d..6330db793 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-15 21:13+0000\n"
+"POT-Creation-Date: 2021-10-15 22:03+0000\n"
 "PO-Revision-Date: 2021-10-08 10:19\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: French\n"
@@ -752,8 +752,10 @@ msgid "Help"
 msgstr "Aide"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-msgid "Compose status"
-msgstr "Rédiger un statut"
+#, fuzzy
+#| msgid "View status"
+msgid "Edit status"
+msgstr "Afficher tous les status"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -2937,22 +2939,22 @@ msgstr "Citation"
 msgid "Some thoughts on the book"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:26
+#: bookwyrm/templates/snippets/create_status/comment.html:27
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:15
 msgid "Progress:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/progress_field.html:18
 msgid "pages"
 msgstr "pages"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/create_status/comment.html:59
 #: bookwyrm/templates/snippets/progress_field.html:23
 msgid "percent"
 msgstr "pourcent"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/create_status/comment.html:66
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "sur %(pages)s pages"
@@ -2980,7 +2982,7 @@ msgstr "Attention spoilers !"
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:45
+#: bookwyrm/templates/snippets/create_status/layout.html:48
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Commentaire :"
@@ -3598,6 +3600,9 @@ msgstr "Un lien de réinitialisation a été envoyé à {email}."
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "Compose status"
+#~ msgstr "Rédiger un statut"
+
 #~ msgid "%(format)s"
 #~ msgstr "%(format)s"
 
diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo
index 6c78e5a6bddb18cd3942469ea848650fb8b15b3a..33fbeac246359d545462d897fd2305945c61c161 100644
GIT binary patch
delta 16070
zcmYk@1$>uf-}mv8(Hk&Ejgcb;NHaR51Q{SD9nzD|i<0_-sFc89bazUPMnbw90Z9pI
zkg!0+`}6%DzdeuV>;CyZ>OA_~cIoSWzck^or3rmE(<GYa@w^Q1yezmhlypMRD_BIO
zp7)}n=jF$jm>#oK^1P}Ti50Lv7RETtjJGio|3ST1w6f=Az?R7Wd42guecXgaJ<sPQ
zs^WRsDJY4-*ch3E7meXK3_rp7m=2$y>NSh3kP#bUDa?c8tvn9Z{w(IiUoZzI`^YUM
zKZY^BSDAzcZh<ARD{6oR7>L`fem_Q#KaZ*KFVu>YR`a}Em<zS?8rTa5n~$+4`4-hZ
zuOS}8mYDTp&kJFE?+X%xaXdE1BsJVtwMA{+A}op9@dJErW{h$xu8N5%?}BNu7bd|`
zm<-2ZN{q#%xCm9h3VkZrU<KPTg#2Dq`8iC6KVd?=gDLR7mA}U1<lmuoFiB0fGZ|3j
z5oQt8PL@TzUk$Z`4QjIgK_uEzPz<}HW;P#F<1*AlwxU+J2i3trR0roU8UBo#;3G_q
z&&)qj6H8Fby%&NSCmZUh>epibb*o2FkOpUAIDUs3=oD(}uA&Bfh#Kfm?1q1%E>)-6
zuEVjY_PbCMKaPv>JZfV7Kk@tv_M!6QmC%Z(p(ZdF)!}-~i04opJvLuqBJyuhEBhC<
zfZ#fA!V#$VB2o3VF(tM{z1IbUuqSFqeS=A8fDxDy$Dr=ObkvGhqF&sFI+9%&h^J7O
z^$Mz8WL?jT!78YZ&!ft(p!$1Y<!>+r`F~yB=cTCUR*(j@6ZudxFM=tt66%FIsE%8p
z+O@@C?1Y-wK-5CUpzcHrYKv!C`4ZGb)}Z>`?U(aEVHH1NCMuqwjv`5YXBevEf*6b?
zFf~>~4b&L3V{6m|hodI=73y;wj~Z|RYU|gc7PJHX-~VB&xMCIeP%pm3a+tV*`w?3i
zHBc|qgeGAK&Oohn73yd<p$6Dv`4gxKT(bN<Ohx`z^yzHhlhBXKgrB+@W<<S^8+ExN
zQ7ei<y;u*mlGdpAx}pa3q2Buz^%Hb9>N3V*2%bRw#Jqvg_~ui-f6cfJKNr<OSJcV|
zVrulEwloH{_0zEoE=R5SmiY+v-fPs6{EeDOqDJn$G^l(|Op8S=U#$`6uZ};ZKr3vI
znn)K^hXYV|VmNB2W}$XuK59jqQ9E%M_1<~(Pt1H|zP9>*Pzw%h?AoXIk<bKkqADU$
z1Ad5FX*1LgOh&bvfjWW}s2$phn)nga%1@&va2d6L+n5F)VLE(g`H&`V;=bG@)Uc>o
z1~ous)C={jyd!EN-BAPeMGZ6rwWVL1vrs#=7Ij(U(7!XNiQYopjr$nR348BJXu#}E
zUB`t{D=UrZF$(o!Yt)3IQ9Cghbp+!qKNmHj?@;}1wfrH}5uLH}Yp8x7W3Ybzd(GSq
zq(*I3M$`%mpjK7_bu>|^OVkiGKs(F#Mh!e1^#{oq)DA4S@-?U(*n*nKeycx?DK-8D
z5?a}9Yw!nZ0s;Jdl|iVjPlr*M3AG~~FciC5{!4Q#Y6oLb1201D*gDh#_Mmp|B>FU?
zn^y1`)$kpLVTu-R0(s0LsQNPKKN?g=tx+BKM(xaSE1!UBw*WPvEvR;fQ9E|A1^chW
zO$zklL(~9&qIM)He<$g3W<mW{%#C^RV^n=l)K-r|bvy>OW7ARnEI|IxThBi<PEad%
zl<83m4{yc(YXt=<&<hn&6RC?T{|q%iFVqYDundl{@*SwVu?O|uG1Nq^ppNW5>JB|c
zP1yU){V|#zRbR$OLLFB`bx;d+w#_jcwngoL+UbSSsP+>qKMU3I0xXT2QD^=XwSYI6
z8G~B8KkxIRcBq=^t7C~KsFk!qeFa_3VW<IO%w?E`{7%$Bm(6>qEq;lb=-;TFNYKXZ
zU@+<k)1f9-3K_@eMUlurK}*yQ^u=sA5)0u%)QnG~{*J$ly7g~S6HU|Bbr^w~KxxZY
zF&m<GEE>bH4{AYEFhApaD@bUI&Z7o?j_N37JJ&E2bp!=bD=UFIqH?GeRzdAVJ=8>7
zq1s2I`srci1F<Xl5m*?XU}DDiGPQSG6pk6mN1*>QqCT6ts1Dm;aqNVZaSm$0>!=C+
zf*SCt`3LGfuY;RtGR#Ca18N70p-;E7CJCL%XQ+HHREMKbKL^I4Cbkqcz;4u6aRjyU
zljcttN&Y@+i^Dp)2^2<6w3J!N%A-26|2p&f6lle5Famp7gK6eGR0qpY6J3Xz$PcKA
z9!H(=In<rFfw}Po>S)tPyZ(!zE_oG9jGsia|LWjV3N%1-OoZ)G<(*Jl*b_C;0apJt
zYUSflcVLF)m!aClp%%2y%Fm&8@+PYNUuF{D=Wd{Ms24I@zJTQ;QCnFR6Jt}W{|s}H
z?`ZX7un75is2w_mn)of$!XBW`{sn%3L7m)>W?xAX+RECP2OFc#dMIj3r=eD~$lQQA
z$nV9ZcpEjqBUJlWm;~SBL`>Y7F9)Y$Qru@ALw4Hdog<-3cL}w^$Ec28pgMYo+L?r1
z+{)5oIQa<6e~dbcW~ld~QC~?P)LAb>ZTSY&ID1g-&SN5d|2IiQP;eKu(&T)knrTK<
z$KjX|3t<l|hRJY&xf0cWBkJ<)Kz+6+QSaZt<oMY94Yh;sF-YHkcsF+z1yK{Jit4a4
zYUaIB6B~{icmk@!>8MM!5cA?rEP!_~C#LG|`YDELUluj7k5G4{5&E>XpOes!-~pH&
zCtx71#UR{{n#e)a#LlDMyNWuZ$CiJI`oWTbZPHx|L$$Arns^lIy#|(V*Mt362VE)9
z4EtEc5Y!fZh57?xxw#8<i_fDveugRWchvg{d%6KqVhZwEQ3L14=2#rnegdY#IX&5b
zHC#=Bc3>N7#ivm(Ud8-)7YkvkUi^y23g&1mO#VD(#RR?i)r#3spKV9fo%jOvTk~72
zimR;tsgH!VIzb<I`%|EHBn@hXVOE|4HL<*?A5g_n6D(s^LG3^-)O(H0Rv1jaBkK0|
zL%lZ!wP4?55_)l^Rm7oQ_}=m-P#s=GZQXS|gpW}Z-_X~Ue~;S9W9B8)4%|ic{}*cD
zfd9G68HAMkyuu{(-IqbFydvhs>Zlibm;*3`ybn|1WOE_vj;u#b@DQrq1x$m#peFJc
zrp1)~+)n1e5PkoJNNAu+s56X0-QLepE1H0s;B3@REJS^FD^UaQ$4PhvHG$6k-HHdG
zc5(#P#~3V$w^4U0bO67A^!-;Q!Cy<>B#gx8sLwFRK=<zjt6%~0yRaxe#Pk?8$PG{g
z^>d>VYM^M;CEbczae^=0kKpvE1yw~IT|M+E(SiiW<3%HXDSKC}L5aa`MU_xnUI%pv
zTcIY<88y-2sE+5Oj&KdCzc~B^BZjyY_eJgGJk(Au8N&Y8A+d&ny7&f_j~eQBVmbzp
zKZeEdB<f7xqdE#1=8i5DwYA}>i8R4{*um<*MNNDf>hoNLjqv_3_Fswe!`;7|jlnYH
z@1X|DO1;jsD28K2)WB^}cSe6dXeIhNqVfT#qZ(?i#3|%2qS|*F!ER%3EQBX~B(!C3
zFbuts{LK%UP#q7!5;zK(w6`7AQK>JTl`seSD9njnF(80Ti<(HxSMK)j!YK0Rum)!O
znm*9io<uehvrq$VM_saKm=3dj!!HahjxBK@>ctC~8v{qXohpK%<f~#HY=Jt`k*G^}
z*6QzJIQe(TW%YSk$GC!?s1;1Y3>b&%=oo6NUSMX-HrBN-hx)u)q9)W0v*2RXrQVA=
z!sD19Z(wRnHqL$KVVFzbe`ylMsc4COS>7b<i%G|GPB<8KW>2sQe*CTLcpi=*zX6+J
zu?gG{9EaMuV^|(<Vg<}J(S4>(Q9C^h{eS<*k<b=x$E0`?li)?vPqJ&67@t}BYgD_p
zRvy4lAOFfw?}cG<3^((mcA^9ZV+~aMrs(s3$0T(5hGQ_!#8kKv_2M?vijHF@yk+HY
zu{8OVG4AuKj_RiYY69I*6Yr0DZwLnCbWDlMW7vN+*lZO$&EuGr@~fx`{Dm4QXtF!&
zk5G4IFlvY9q1vxU^>+%j6BkeeUd14MjM4Z97RFXnIDdWb<EOZW2T@yl5x>LhsFjS3
zb@j0rNPY=wpmmrLH)A-SLS4e=sD6T`x(TL5O(+7@z98zWtL`JA8Fs{6*bj9iGcg^m
zLk)NU)8c7NhIddCdxGikchr#uPILJ%)C3Eo1}uT8u@1Jv)|eiB-;-EH;v8y*L#Dek
z{1VfUpNlDQy_N4mZRI7)-$7029qLRI&u|k-i&|JtRKJm^9Vv_Iw+gZ#pVx?lI_!)Z
zs2^&@BT*~-7Q=Bms>5xll^ijzSp6f^<qMqYR-7C4{)eamYoK<p1*-p^m|Nff7bFr<
zFdwyLOHdP9g<8=T%O9}(8Oz@=A6fbDs0k*V<t}Sl)FrEp*>NyxCuXA-ut<5v_u@!|
z;0~)eVfpK*89zr&Bw)5Xv(%^w=fR9v0Co1&P!ni~d9VX&%g3SKpJFb=4CL3L|L^}p
zBy@>>MBU2As9T(Tj+;Op%uBu;4#M`R9lC}(vInR;@Ed9&|DaYHJlEwjU|I6{P)E`p
zbp+k#vi~X=NP#*SiJI9s)R`?p?Z9T#Z9R%w=}puGo}u1*gIYkqJU2inhLg{Mnn+a)
z#hR!Iw=;XrWB;`^L#$vds^jUFUyQ0>j~aNl<xiqIylUmIFf;iC^W93bq6Th?S+F%~
zf<sUXj6ogE3Lgn=#d_4hJ5gJB7}f9!>azTb+6ixgJL7bymFGsiR|xf9S=3I|Mh(yo
zb*a0c+V?UCq1yRIl2FGpP?u^A>hf$rU8c*ZBYJ>g_!9M_H)x@&FN~_MX!$72M!p$p
z2L_^6J{&V)Eb3_2Artm_`$%X9F1P~kCTgZHP%C?b>LBqVx57-Qd_h#ZDweN>nn)Ye
z09{b;54HL+sGXdLI?{ERT;KmL5?a||)K>j$-bcOg6tz|VpmrqfVs{sEp+3JzRJ+=!
z3AHk#QT_GA>evspBReq%?!%;v@7*P#7oVWE=r`0r!Aso4vZL-oSyX*})Mf03n!sSI
zkG1;MsGT^3x&voW6TFOC=tI=y4Oq(l>(*u>p*v6tvtljOK%G$ok3wzfY}A&nMIG4=
z)I<)VI=+C}@fm7CDVMpslmQEn{}6Ly7t{nNE@S^S@JtHS@pq`L-j2=iG-?HTm%9#&
zpl*2?)C6mxCLE1=ZxpJ(S(pUZT7EN@C4UqXVZaJE@uVx*f4z`_0<ADV>ctOHm#i9U
zhniyq_Q%9H2eqY(P)8MqTEKoRjHgip{e$W+V5Pfs$x-izq9&fzN1`E#@~DYSLJhbC
zwUv8Om*o~}paiSj)`ggvQ3FSy-YbSWvO1_U?uc5*P|SyuQMZ4m={rh79b7`q?2hFh
zVlwi-p(geZs-uwA?$YH!4N%E!iW;DoITQ8%KFo#3Q44yGT6wB9{-2CKuOJDntfnjQ
znxh&FK%MDSEQqU79bCo_@K4ko$nl-KToq9LbVmIE8iZQu4AjDwp^jn=>e9yf>pA~@
zB!Vb7V-2ohQu22&5FcYV{2fbSyS46YXQDcuhyEi&O<*tTE}cQ`z#S})PcRDeu5;t{
z#^j9e4OIfaLCr7*_2LZFC0mHvk&PIRXHcKp3)I&TxZdql7SzNeQSHm2em*oqEu;^s
z-=U}pe~mu>EheFr#i2TWggWzt8{C<PqFyYB+NqMLj;o;Bx4<&k4>izQ)IzqS7Pc2P
z;4!QJ1=Zh+4SfG8NW7syXPsoDyF^(~zc#C*%G;w}7=+sLk*I-2Tlo~!%IBaaxWw}7
zF*W&ZsL$~z2IDC!zp;`1SHW`%^x3>eon87kH()-@L%tYlCCyL+w@0n82Zmrj)C9gk
z4LA|Cg9}jaZ8CSG`a6R9dY=18M3P9d$!%p>)Bp`pD`|~7%dS`u$Djt>f@*gJ^Wu5b
zt$&LtF>JG2SYER<>PK%4)J}Fsz3=N!LNgv=6_ar~`Po<qi*0c)v@tuQR^A7-V}npf
zG6^;CG}MZhU>aPD+TkBCC!R$u;I)(g{kPRkAQX#Jk<aq2P#yNb3^)W+;S|(XFT(V=
z3N_GPD?g7~&{fMn!H(o#qwZR>ZEix*7^vU>{Yj{U5ttogt-&VL1P-8HJcrtmo0tw$
zY_~r$F+cgLsCGRt6bGaFor2o(WvHE5hq~O`F-+h8k0f-qzhVSt+2IDRYSu@6X01`5
z(I8aEQ>}ajYHRnQw)!4w2Yy5CSmK>-0_jlstf+|=M4whzmV{<h13$oys4bp|s-KQp
z@lw=EcA)OSe$*vBX5~L(0rEF70|tKYjwlD}a+XH*+XOX{*59-L>aYg|n(+YC%to72
zQD?Wv>XYnppH(Po2MS;qR<!bFs0npPEo2bp!^Kz`PheF{vD@9Xdb`<wZQUpeYT|O#
zXYm3xp}$cpNwLTM2ZUUx0f(WsdIoAmD^Lqrk2>S+sIOu_YNAI`{a!;&@ILDOS3VM2
zall^pVz3#8`b=`6CRh?Rp=Ov3yPyUdgL;1oro{!Q0XCtwc(2u;#wX;jp)Ti<AKcOS
zZjsOoe@C5hvVCr5Sy2NPGAp8ffYd_`+|L}2TG<#ZfU&5Z*lYDiQJ?8~)C3=*CiV`q
zaR0oZ{jMM%YQWN{l}DjoXn~qwPpcn^I+7`<iLAm*xC!-##%U{mg*uvds2xgl!0lWJ
zW+Yz}r|A2yNkUt89kr5&sDWQ&G$uXh{tajktVDhzs{AGP!={Jazu!BFx*N$4YgtSN
zBXJ29$4jVw1CO`~Wy5l6Sb#)F{2XiI3Dg;-Kk9xh7ecMHBWj{O&B6FT^50-9d~4-R
zkGUP}fLc(0)MXoiT6qj+$5rV6{*RGJOu=OwfHyD-8y$Cl&CbIl<WHi09$diYcpDpG
z`4jvXbd13YcozdO{G?lXF4X%?&DNNleDp~+ssxE%R<IPcRqHS*-a*}k$JhYhVN0xg
ziq3E~HpYO{?r55!F567hU0R2^a4#mqyQqaewfw8o?7vp@HwF1I`5E^!z68!C-yU`O
z{>2WM=B%q9fLg&))K{|(JL3V=Kn2gag_OkM<hx*Me2A)lgPK@?@4WlI^I!rBmauQ1
z5^KraBCm7hUiqK=l=Y{sy&CdtByRds91S+7POH04sPi)9FX4RR4(X2eUIEhih$G~E
ztE_N1ZliDjagX#})U%2hPi&&Bj<sE9bt5T1Kv`zXll2Z;`Y!24q%&E*1P-OFAO4Ol
zU0*)05{WKE8Z{vJO8kF-fd7f2Yy_d_s(Z<6i|wt<)o}4Bt3||7P#(t+mua)X8hl53
zDv^`&vqTxn=O^I&(^6QDs9+8AP^l+3mc-RWJ1e_NJDq!REJDOTO)Z_Cb`MFvq2gcC
zi-;QbE?>1*#a{T<tmperC)^4DzjWR}*(EFA!pkeH1AV(|DBni@xs~bbnM%3}F^ecf
z=%Otq^z5L0Kgu!_F+@r0S9POEvwnVyse;fm$ed)VtRU$~8Yjbggnn4*nQWbvp{y_I
zaYU@E^8cE>Nq#<&o%+9tfuwt&p0~tBPSLAMVL{?!tN5O@p28--`u$Hu{<+rD<7hjb
z`sJ1nC7qvmPCg-ZZHN|xKJBxy6Cy)>%c-qQ==qdbN^BxNq-;DbXOn(JIv0_G^pBM3
z`3~z7zYv`z_0dFs>OLgDpV0G<!y8LJmzDiO**>CG0RK7mCWYI{9O32O*0>AlJ(N!&
zpOCbkA;cYjieJ{&QGnH{I7w`e;-S9ZNL?XPQj?1KmvnV}Z*Qb0y_@uC;xcuY@d{<t
zF(om9C`3N~IZpnz<<nT9eh}+P@Sk=ENpBC}UvbPJ5k%ysK{X7<v#2MS&YGZpE9)0x
z*4SbtGW!}*`jDKS7qpyhtxw}*%8F6nn9$P{gRMR>>1~t+`D@r9E4Qpy#NJW<PtsM1
zio}!ulv5S^YlXzIXG^5^wf;|eand7*A~bkUG$INSTZpoZGaB{OC8p4>3T0hLH^w={
zcI#^sX?;mgaW-XxNym|ne~$hCwEu(i7Ey4UhBIlAjTlD$59_Qpwjket7(%*+^|G4u
z@787zW%?7LD{b^6WFL`-$V-$W!ihsf1KNB;d`A39gat5uUJ~)oP8!{!)AJNGBi)_!
z4@6NS1^EzMWQ~(z9C<zY%m=iIe{PUILHQaAKC|*x)-JwH#`qt2KhfYzN^22wX|#jj
zm$3h-NnKL%S*(-Fq<<wHWA*VIC2^m+$;46WBglV(pOf#6FYz&DeeH#>$osNWv69f!
z$xK4UT+*2-J4HMoV#wD<J>!U%#K%N6+AgJTCdNN2NvyWMRJMTFWBEiX;CVruN#N!5
zUh!fDDkoY8sqh2x$%r3`uCc>Phx)pciht@@A_FbIqWlE0gR;MgN<=SW8D%Z)opQ9>
zOngng04^c25N&DqIT8OnCGiDqmf!??cLwSD0sQ}+>?P5im`TM&;x%cHPOcMM$p1+8
z5$Ox0Lr8ZbekSI{_9>G#BpWrksp&@vc>7iA+e)e~*>1!)D&`5KWhqQYtS2TC8z{R)
zz5Y}xLAn;{i>N0L@vA@O{xN{^Xsc664%*fx?i2A(a_WZ%@V`4^N$eupP+223q-<K>
z>HoZ{=2ytCv$FlPDn{fWKM8-JJ_GTW)qjG&5uZ>thVVbM+e+C0%N|7it$fbjQSn6D
zv?X|a-bN}8_|yCkX|n@mfuyezU5V5*j>a3-NgL89T?bwS=Ct%IoJN~SA`wxSctTq}
zcS-NUdDw?2MP$_9KSxPiqhc(vllX&pNLg9jNQXU17sb-}1@RMcfjT`0DDOr7Bh+((
z=tcTd%Jj6h^5l4i7)4oU986?a1IG7;S>wFek&5v|T6IcY7B%9z=lFmB97CHC<PO@q
zrO9t5f64NT@i_Tq#9-0|unB%(_0KQ`p`Z5tXD^vV>V(j<l6({~m-IA$3I8cNwods_
zU#zvbLv224vXP%cEFeCktb^6hvA51srYF$KpO|&9yrq*+--mQFYrBH<1JXZH9!?}A
z9uXrGuwxNaG$Ixdoro}^8<hd5rz!D@cxj!t!zM&;>KkGu;vSKdNI==Q_TC!&hA7Cp
z6NoRVUqxi1tQ`64q)YoxjLbYT@elu!#0w$6lZN$455=^23=b10iFDL2Bx;iW9H&yh
zhp0y^B;ubJ)XyPC(xxxwr($4yCBBZmT_LUSf7I-yMRiKXVgvHsh{dG!G<10D$=@J7
z4SN#jh-bvtw0%R&qOP&EJx;lv?<v<a5VKm@4>+CtE|(AVu8~+vd>lLM!%$y;s><4H
z>F^Xa?dYPi`r#?>@c%P4^;@aGZ)NH68F7K~x5Q}bnqy&NJ@Jmv^A~Z*(&uUOrKJZ2
za3oo&45y$dhFZmPTx#iM=0|2{+UYq%^z^6r6PCJ##0txcNaC@*qkInH6#2wVpa*Fm
z>52hdzULHVAikpTXZ#=Wn0QBC&u-FsZWH@>DgGHnx(9V>Fv!Y(Hiy&b3*ssHU#)E2
Wrhh7KPrd12y$3Zm?VGW?-2VZAOJfKC

delta 16134
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
U-8&`hTfJ{Z-_2jm*;VfU01U%xvj6}9

diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
index 9b044d967..6d7750b75 100644
--- a/locale/pt_BR/LC_MESSAGES/django.po
+++ b/locale/pt_BR/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-15 21:13+0000\n"
+"POT-Creation-Date: 2021-10-15 22:03+0000\n"
 "PO-Revision-Date: 2021-10-13 16:42\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Portuguese, Brazilian\n"
@@ -752,8 +752,10 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-msgid "Compose status"
-msgstr "Escrever publicação"
+#, fuzzy
+#| msgid "View status"
+msgid "Edit status"
+msgstr "Ver publicação"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -2937,22 +2939,22 @@ msgstr "Citar"
 msgid "Some thoughts on the book"
 msgstr "Algumas ideias sobre o livro"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:26
+#: bookwyrm/templates/snippets/create_status/comment.html:27
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:15
 msgid "Progress:"
 msgstr "Progresso:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/progress_field.html:18
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/create_status/comment.html:59
 #: bookwyrm/templates/snippets/progress_field.html:23
 msgid "percent"
 msgstr "porcento"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/create_status/comment.html:66
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
@@ -2980,7 +2982,7 @@ msgstr "Alerta de spoiler!"
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:45
+#: bookwyrm/templates/snippets/create_status/layout.html:48
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Comentário:"
@@ -3598,6 +3600,9 @@ msgstr "Um link para redefinição da senha foi enviado para {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr "Novas publicações de {obj.display_name}"
 
+#~ msgid "Compose status"
+#~ msgstr "Escrever publicação"
+
 #~ msgid "%(format)s"
 #~ msgstr "%(format)s"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index af48ebbb5faae15f051e4a816743309a861f8ba4..1b4f013091128de18fd04ec9b9922fd77e7869cc 100644
GIT binary patch
delta 13964
zcmZA637k&VAII@)Y%^oV&S1ten`Ml#@5=}yH1>VV&REC3g~yUDvV=mEB_xtvB1_hY
zBxOnZM+hO6D9Qixea>%QFR$*aGw<{JopaAU=iGarXGZ7G1#CDM;JcDD!y=F4wE)kH
zzyY~EZ(w@Q+gn^&&l_CH^Wty_=D}qcj$1J=p2pgE9h+g%%AQvSM`1R6AH(otEP`h+
z86UX3&#P6%^9qt^gRO8l7RApk|0^;lFKboLi^6D(#QLZSrC@%XfE92t>Vl^*7O!J8
zW~t_R<*+oSVt2nj&pS(H5Q#d~J+CEh!H$@*hUbmNZrC0#V{NQd)2)0IRwSN-CGfC$
z54C`NwHN~vF&8FbCTx#^*cC&$zSoyZW*lW5d=^i$c#g%3P$w=&?vS?@L+}I3@4_JB
z1E{S(VeuvNCshA?m=&L(FAJ66M9(XWc~LWLfZ4GrY6V?UC-z32I1DwB$*76ULS1++
z>cUG<{nw+$-HF=zpHa6gyte1%#Im(LpZ}q#M?xp`!cZKFy3j<_1?Hme`2y5HJ5c?8
zM(y06s0sXwT0r0n?gH6R=S5*YtcU8~+3fX#&+{^n7)U}hABvjcWYmNfqfT67?fXy{
zK8-r>GHM5ZMD5gF)CGP=^?QO^NKhTuKObsm3t})P_^9aNs*38k0O#Q<)PUvdx_nj4
zLEHe9?|_<MSBnRtCO!<c12a(znunUm3RM41sPp%r`uPr0QODz`nO#7w;1=p0KR|8m
z-<Ho%&rKu*HE<y_-tyJ30QqFpJ?>+UMUDG9Y66Rp3HZFXsp$1sg&J@tYD*8JW_$*<
z^6xEw-||mT=LIHt9&fN0feF|a3*$7@1=pg^--O!o1E_IN`eW|@1uDAmHS6#Ibu0cs
zO(aWw*B*x2;#g$nUUgKzI;an*=BR;tqsAMC`XHKwdWM#u|C1AY5ue6juJ2WN(Vdux
znsGAfR<y#5*b8-w`Xe8P-YckEvfbQ=nTe01ZrK@B|BI-J+%g|oK4Sy-Fy=v@R#bqB
zwx|qh#dT0CX@a^?N3)liYVBiCTRP3+`KSxOWBE;}XJI#L;^$Bc3T^0iE>}bDzg8MW
zA`r`?E?5IIV|~;^)WqU$W?$6S4?%7HM9VKiU0^wCyww<l8&S{7PV)q2AimO&{nx{C
zjf7U5zLC4P*-`f{42xiC)CHTN2JV8IcnWF<$6zL$i<;1zsGZn=+Sxr8pTZ#G?@{C3
z^jYFh)Yf}1xrPwbz~QK!D2v*Os;CJhqgK=!gRw8_UJpkNJQ)k(eAER$LM?DNYUM{!
z{e35?Xuyl+Rn!*V!3OvMwX$l-Zbx1~#qG_msGaD8AvhYf@~Nl`EJE$TYRrN=EIx?z
z^LbxW$xp*I)I^?|nHsx+vY~dOFlxYxs1?>l4cr3N-V-&Eu^5W8P%B@8>c1K_v8|{b
z{R|_yzITF3F%rL^?p^LCZi`A_C~*R6Vl_|$B%yvkXpOqS7St`+gIeKHRKK&B6|bTu
z`T(`{>6^NKfmlWFe{L#jXp9=D1?t4ks0j=}-IB4Wdp;30(S;a=>#h9@)CA6=&cA}X
zRd=xv{()L~u4Zn$aP)uwM_Qs3YT)u%85>{-PDHKXb<`)=yQm%6V;(k7p&rt2QRCdg
z2>cf{PIz-?an#OLY|j2`Wr-xT(j?SQw8R|P4mDsu)QZNVRx%q);Re)1E}~x7tC$1-
zMqMDJg^Tl=#Zfy{4U1s?7VN)f+J{6Ojzg_*9qK}dPy<~>_4@_2h3Q(lEet|!aW>Qf
z@}gE6gX&inb$(UUMC)QdOvVJ<<)fk<xPe;vFQ_kz2bc|mTe+vY0G1~%iM6o{YQPn!
z39Lt5XftXepP)W^k7F*phT54&76-L<=lKd!(d!q3x^OMjMB1WO(#h<L<%maOZd{LA
z;Xc$vj-qbSm#B$f!C1V9>X*BXGXm8=2APo0D@8>!PeiSxA?Czp7=t}fw`2xt;P+5(
z$#&Gv?MIz=1U2v%s0Dmu`Aet?{D_+1Eo*;_A$tFxQqh(Lw{<Jdhw2!Mx?ly%*F)`8
zb5#HS);<O`fteQ1L+#KC)C6}}`yPxY{><8MU}?SoPpIhLlx*i_S`)RBB-A}@f+eso
z=D`K19b1n@aU15tOQ@&&chmx&nOXS-Gm^L<Y9|s=<G+ah_rDnxt)LUm!5$cozoAYj
z+`(B4wY8;D4^;)!c@0ntXliytJv+lt6Pk#6cxR(--2v43Cp)nJ>hJ>z4SWan(EN&8
zL0&#*HGx>vfTb`!R>Of<3$>Ds<_=W<eV84OqRu;y+OeO^d#LL??#TY@ghHL%JuQm5
za0S%Bbx|iKV}5Ld#c(i|#KowO;KQhKZle0%M@`@_)XoHVcF$4-<|U5D!dTZwMO)GX
zwG)F-57$`KfHP1J;XKq<ufQ-|XYKn@6Fp|_XHXM3Z}}fl_x?8O*$H{s8HF0(SA~i$
zSQ~X>6VwIUp|&msb%7Dc<KRs|^}m4HsT-(%4^b-%=;9WVA9Y?V#$f`M!uHq*r#pS#
zSt<!63U=l1GfYOkKJ!tZ18Xq?cO!okdEcVi^LKMQmw<ZBs-ku%5w)`VsAsAPY9cMo
zPN;?U!pwUAQ>kdhqfk%fbkqrNqgM1D>V!R(KZ5Fi+TttdzxSw}xsSS~Pc07Y?sh1z
z8I2mR3<h$2uNsvotZNOuQ7amZTG2=>hT~BaTVrlQJzTp`x8ifuJ-&dN$USTS2ep$~
zd$^s8L@l%u`rrRXR5VZ<)CE$oAP&KzI2Uz~ccNB$2=z9cL|yPY>Vi*DD+}uBb|@F}
z)$c`PMI4UF_yO{`c#nFr|K+H(>E&LBnK+hsJ?iy}>Fxe8sTt}*lTcg#7RKT_)CEqV
z9;!lp+{*f5Jn?wc#6LjYl3nI!IF$HQANHTm0<U(8>#z*9l69!paR=(c2eB}oM-BK0
zGhv3lZbexzj<_9W#3`5=XJTWVk4^9gixc{}Z_{x;DgiWngk^Cn2I5bsExU`lV03@a
zD~@GQ?d?$$?2h$t5Vpc?X5aw#k6E3u3i&OlXW%w!flsjr`mzjkGmb|MTn;t!>XxsI
zC5aoFBk&F4m8kv|2Jw#(SQAU(V${wYMLi>@uq)m~joToVbFdk5zR#OVC6dG(jKa<M
zIGyKxjroYb7~%%HZazc*`_Bz5MtcI5#x|&dr(r1W!EpQ>v*LABzdump#thTv3irPz
z6`nV*1L~nVfYEpZ_5KGBcX1?Yf=Q@nBE_75`hZ%9F}MW_;kT#>KE(1^a0K6o*xWoK
z_5N2K>F(W!sI3eb#h+2w8I$l^OvDJ1nt3Ozj3clpeu!~+4t2q2sE4rF7`IcUP`9KG
z24O?g4z)y|8oF7B6f@NviMnUwEuL!5Mh&n4LvW?J$=qWeH@`8jVov(s$7~odmi^b(
z<m9Cf#`>s%o1<ph1@$%B7d6qbs0mH7cqVEB^H2jXw|Fy_A^sFA;XP}QeZ}>!g1W^?
zudx3bxGxDg7<J)M7Ei)b#4}J6-HDp{ZEOGAOgGM*ABdW8Hq=911oL4XYww6!KzED#
z`KV|GLr^Q2VDWs^iSJmv%RG!4;49QlT|`a%CTimMP!oKNxiE0NYmY$Xqb)9v9f*C^
ztYH!IpSOk|8Zdf-J0TABv{ysro1rG$7B!KcsEH1+_NmrB8+E}Y7O%JVov4X^>heDC
z7!|GLoOQU08u*sQ56s7?9eReEKu&I*EQ~ro9`j>0i(8>4-W@gZ(WcLwhW_9GU-wr$
zZ>hP?+-@E;Pn+MNR{S&SHB2|r{Q^@J_4$y3y5KDH4b%jenCr|P7{VCdAxoT5g7}KX
zcP#!3buTkbaswAY^@}tU%<5(X)C5~&AsmF-iPy0eu0~DpG5WOC&n%I7vb#`LR6YvT
zF%A>3ti@f;KIR~E1ZraAP%EBk`L`_pj>Q|W0PR~R^Zx6EQ`X@U>cpECKQsfTxPh~w
zo`DF9OIuvSY-;)L7*4-btckNw3;7&1{u%V|^c1_NcdX$t`nUR3H^Ty`6Dy*2qz3B5
zdZ>vsM}2Vh#Ppbo`c@o<I&U1R{}gkc<(Fe5`S*O*aMT*UMs3X{jK+u7o`0$vs3_{S
zDvw%8UDSn|V{UARy5K<6LdKeNP_Nx8Yu{-4c2m(xj#}cP#WzqZ{tNZ+q?_h06o%?w
z2z8;dsEO1<ea$9g6n3=s38)Fr!c6$K#jDW&{lC>!ygita4u`Q0p1@2PI^8|ZxlwT`
zvjS=&)lm~^Vs<oBtbK&VGf)#<WUltNbN{zc(bgPBUEnloz;FB=__rU6ADRI(TzfXu
zfDsnQnUyg!`FiNz5zBW(jh}-0x=zJXdjFSFQOD!f;XG=~uAnAz4|Ok};7gcorn^8#
zvj?hQf7F-HXp3iJ4&paa7k=OJAE9=5FZ#d#pIJku*W8M7nUSayOQRmHN|+a4LcLzy
zt$hM&0#i{Ff5Y;tP*3@Ki%*(oQ9F0>HQs-1)lCvQ@jmK(eTEva<}7!Q8=)@T+2Y}-
ziA~2KoP#=lG3pcVee)P<oEzrvrZ?N|VCZc2KbQ`ANNB(!sE4YUS<P&WdaAo(JWjz7
z+>F|ZPf_PxwEQm?|7C`}?)n$Tc>2YoKBC+Es1&0z6tz`LQ5V{aTG<b%&x2bQXPDzA
zniaKkc`Po7>K|iqg2fdrPQ-S!*T?esuC@EVwhrH;R`L^SE4{hyVakrWC6U+&yI=@@
zfSSNAb3bYaj+vJ*8}VIK|EFf~Jhy-_<a5R66{4aQR<MSqs1w?_4qgw`jK^Sh{1A1k
z_L)ae{lCCayog%JO>0j--?ay$&I?2JD}?^P|KqKp0_ruZjxpF2!*Dq2gxRQPWhrW)
zHK-lfXl}RsUh@!YVkb~LbKdf|E&l*R_5S~BiI6wkmgPsCSORsSN~np|w75BHYuj0z
zVsR>}pU?6O%%!OBl9kqe1QUoaqAw?vzy<C?;iwfwp?;N$!{S&EHKBp1hiokBHG38H
z6t6~&vlrFxOY<^nCvTz7%ev5+57jSfA@^S^EKTAitc0a;GHN1QQSG0Y2Qe4%af>gb
z2D)bcYCbiC7r9^G!%*WSq53DA?H95CnptlW#c(j{UN1&XU@dB^H=zdDhb{03YM^{?
zx_m4ujz{f8Rn&ROmhWWt#aQwqQR6N1S;K1737f6q0BQoqFb{r-n&5Ra^eq=xL|wSE
z+0PthzKR-mKI$!7iFy|HTD$LmRJ7u|mUv<YE_Ns8LCrK4wX%5B#1bw4qS*xXcC<$A
zXjjw+T0hhTW}C}U<84GH?(?=$(Fq5v!wJ{mT|!;xCU(O6sEH;oadtqhJOwqe5f;xt
zU0@NG!DXnOJB1DKA?n+&)>1ti-2X{bl1O}n`P2dR0h0A?7sp{Dab47{n1Wi-64Zs(
zqb9o9;*U|k3+_iv@Q``N{NB8c`Xk1BqzVQvb0-wU0>p8sok=pAT6=rcR`*6tU<hhw
zMw`=67hZ@OccsPK&4Z|MPopoK$^|MK@DJ30&rmDMwA{V_Sy6Fi)WC_DACplR=#AQ$
zG1fj8a}zJK{1yx&K8AVm2h=!!E@%I><>}vX7l^<j#4%U`lTaN~Q4<@71#t@Mf-6xI
z*oEqM0`>WD9$Vratcr>6x^KTRm`Z#WOJSWA?7t>3c!g`2iE+e#nK3I}dsEasPeHvt
zqp=Y#!;W|pwX(Xa+(Xv^HKAGNVsj0qkl%`}G2FM>bsS<&FlV7wwiu&vgXO<O?Zjo&
z4qZd_3w_V!i=ggpF>Hlp&1vR$Sdo00HLky}Hx+#u3`Cu{49ntL)Cw-3w)#5i!cQz8
zu-5&<V>WC@zLoi*nQ5Kd`YxzvVF_l(O{j_Q$4q+vZ@G&1D{2CdEKc{nn^+*0Ctn$x
zVt-V>J*cfef>khby_;YM)I;43tK)bK!riEa9kTc#hG=h}Q7J@2$OrtDgJlEULzIu;
zJn^>+ek>mD3n$t|6pZ2YNIM>-Rm_sK&!r3@9!+UY-zpS-t@0*O=F?W>x$|q0Ye0ES
z(eWznI=;uruIhc5j(yT5>xiLYD@9YTjX{)g3^)mOG&ifF9@!q4gw^SDi+Td3Fy&K9
ztWD%)+IJCmBfddhM{eTj#QI?Pi|c#MNKB@DP0{f)PNDGIi~m?f{Sc)WQ2|bDOno#y
zz>Jjo)-OeM@;dfY!ie9cyh+jV8wSzdoO&zj3n&?VBzW??>jXn_03|Ou?wPlboQ^LX
zUUlLzv^AmBr2dF9m3kEIV<_7w|B!o`+<%X6$giVZqfE5+Sn58H-~%f9IO%Q;`jzGR
z<D>;|&~Gh8M`?%uXHk9*u)GpI8Ru2Xa&py(%TvFr29Ad0UT{^fj_&`LBuY^l+Qq-8
zF_C&c+-Mz-)BfM%Eld2*?7}(Qsn@l*Jm)0ZdA(@Uhe6u0p8P#ZrvUDMODb{JQ5{ZG
z&w?2&x0!kg2FOmS_*_5r?MBH$?oV8d=_vaAjH7Qy>hDl$Q6GkBM=F(?l&h2?J{mev
z##2sG-XWO@o8djmCzRuq-Q@nD)S<594)wjR>hZ1Pts&OIwY;+weIf)Z;E1K%wRXh~
zEU!B2=V>Id0)M9P+2swg&UtVualhwI4xn!zioUMWj{L+U>GLN=pNYAMyHX!c38eg+
z))7-_>qu!!zL@U+UsTeLtJIfJ^#4hQ&}lHGB1Ol$ls71!Q#x4g8uc9X-A>s_(UE~N
zjP{0jlX8Y~j*@nKN98hQoIer9KOa)LNNK|Wb11DT|11bf2=^_e7UA#4?*urF@;Nzu
z-v5p5xJ)SO_>6MV>WitrNEuFhTS`I8>tkL=67dbnOSEmlx5>TcZ*f2Bk}H?aTd+DI
zzwaRRF_fzG{qHfAd>Hwrlup+8BDrAV8K~m`WfE~t$}Q@>@e=C6OQ2qml6G7mcZ%Q)
zrY9d7;GPffsP)kA9{p+HtI5m#+=<UPA=3K1V)?BWXU1P?*D(w8(B7H)IqDDmS@%6S
zlKdXx3gkyo%1~ZP$MbofijJ?4-wOOk8#*teHWRm4?i1RJQg#y8qr5=dMB+u1uGF7D
zek0Jg|0&wq(^eegvCMz^4b=NFfaD#VhKKN9I_o%1dD-fv@f+fB%0}w#E#K(50sC04
zFu7)w?)1%o{jmx~M;FR7f6e^}8gId@1qaK7`5rRFP@Rf7DX-G{)P_Bbd#zrZK7FZI
zz!?-B@su7`KR{bH>#Mfk_2ao?6K%OD$H?g`D#@Ma^H!0#PMJVCMu%uhB#kGOquzj0
zl6rmAG1?qOpPtm;BzGTMP%cw0_<Ok@V~HaueV@zyL0x|{1d#WCT2=8^_*BIy%GuGz
z%*usy(}qz>s1GqOx%UI*Eb*tf8mD7_oJ{*|>hDw6k%Rbu)I(h8|2tpRWb&_Rb~?VL
zG@?Eae?<MxJ$u2Ba=CmTQ>#tMPj&>Syobq@!sK#LmQvD=;#BI=XGdBBH`8|}r75K|
z<q5eGlz8f|QzlZMLD@!q4`n3v0@#6)POobSl|+&{Zc^8g6%S)?N@p&3l(+}=^pt&+
z+r+&n`Kec;OrXyzsADB%Fm0vC9i(0ebu6Hi^Vj$+#NX+2MLWNN;A=`>I*!1%X-GTL
zQ{VqwyvZ6e({~~HerX-CG`S-dSEg;Q)g#D%M*Q7#<20dOhW4&p-+z3`&n$GTL&-#`
zLHW?yQZO&231uE9&c^kW%+$x(pi$-%JYn@A*pG2iaj4~f;=Ci&e?=X>vIGMuT__(>
zqBvm#>UfR%d#>vL*^PV+$_i^=NcKlcQTpkqX89E2j>I`Bl_@L9FG3wb4*%ao#dQC_
zBGH@^22m<fZ-Lb)*(e`#;t!Ncl&7?{rwk-tl2V9VIqZ!(ic_zEA5k(=mRY_M`I*Fn
zDbF9j(7r<-*CBLBJ6<7q#ZFAiO((8yK|bpnN$wYNHHrJ+5=u1nILvG3zlG7nIx5rl
z0&xxM4=I<ZuSNYYPX952L`ynl$F$=o>bnW*rR8ueecEAT>l8!WmU?5npLQa?NIZ>x
lUr+`S_oUP#H=Z(zdIyS*ZR08}4c!)7@3(5(VtnOG{vS(do8JHc

delta 14006
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
Vj>~gaU7i2_m1)y=J)BxK>i;l7rZWHl

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 1075a1eea..23e19dd05 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-15 21:13+0000\n"
+"POT-Creation-Date: 2021-10-15 22:03+0000\n"
 "PO-Revision-Date: 2021-10-08 00:03\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Chinese Simplified\n"
@@ -751,8 +751,10 @@ msgid "Help"
 msgstr ""
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-msgid "Compose status"
-msgstr "撰写状态"
+#, fuzzy
+#| msgid "View status"
+msgid "Edit status"
+msgstr "浏览状态"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -2925,22 +2927,22 @@ msgstr "引用"
 msgid "Some thoughts on the book"
 msgstr "对书的一些看法"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:26
+#: bookwyrm/templates/snippets/create_status/comment.html:27
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:15
 msgid "Progress:"
 msgstr "进度:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/progress_field.html:18
 msgid "pages"
 msgstr "页数"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/create_status/comment.html:59
 #: bookwyrm/templates/snippets/progress_field.html:23
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/create_status/comment.html:66
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全书 %(pages)s 页"
@@ -2968,7 +2970,7 @@ msgstr "前有剧透！"
 msgid "Include spoiler alert"
 msgstr "加入剧透警告"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:45
+#: bookwyrm/templates/snippets/create_status/layout.html:48
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "评论:"
@@ -3577,6 +3579,9 @@ msgstr "密码重置连接已发送给 {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "Compose status"
+#~ msgstr "撰写状态"
+
 #~ msgid "%(format)s"
 #~ msgstr "%(format)s"
 
diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo
index 10124a192f65211c889e04b2ce4debb16d452f24..9cfc176eb2f8441c795fd9488c814b2bea6351df 100644
GIT binary patch
delta 12722
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

delta 12764
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
bp+d;5`5SJoU-RRPaknPV*xYV#M9lvIaz)0X

diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index 980f6b5ec..d95f0655a 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-15 21:13+0000\n"
+"POT-Creation-Date: 2021-10-15 22:03+0000\n"
 "PO-Revision-Date: 2021-10-08 00:03\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Chinese Traditional\n"
@@ -751,8 +751,10 @@ msgid "Help"
 msgstr ""
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-msgid "Compose status"
-msgstr "撰寫狀態"
+#, fuzzy
+#| msgid "Like status"
+msgid "Edit status"
+msgstr "喜歡狀態"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -2925,22 +2927,22 @@ msgstr "引用"
 msgid "Some thoughts on the book"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:26
+#: bookwyrm/templates/snippets/create_status/comment.html:27
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:15
 msgid "Progress:"
 msgstr "進度:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/create_status/comment.html:53
 #: bookwyrm/templates/snippets/progress_field.html:18
 msgid "pages"
 msgstr "頁數"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/create_status/comment.html:59
 #: bookwyrm/templates/snippets/progress_field.html:23
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/create_status/comment.html:66
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全書 %(pages)s 頁"
@@ -2968,7 +2970,7 @@ msgstr "前有劇透！"
 msgid "Include spoiler alert"
 msgstr "加入劇透警告"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:45
+#: bookwyrm/templates/snippets/create_status/layout.html:48
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "評論:"
@@ -3577,6 +3579,9 @@ msgstr "密碼重置連結已傳送給 {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "Compose status"
+#~ msgstr "撰寫狀態"
+
 #~ msgid "%(format)s"
 #~ msgstr "%(format)s"
 

From 6f13c0d8087b1918e2bf2f9d8eb010ae5c53cf3d Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 16:09:03 +1100
Subject: [PATCH 127/193] formatting fix

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

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 7ce7f9227..66ec4eee4 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -102,8 +102,8 @@ class List(OrderedCollectionMixin, BookWyrmModel):
         """remove a list from a group"""
 
         cls.objects.filter(group__user=owner, user=user).all().update(
-                group=None, curation="closed"
-            )
+            group=None, curation="closed"
+        )
 
 
 class ListItem(CollectionItemMixin, BookWyrmModel):

From afd00cc67a3649b6725e5955d2f0d8c7a1a8b8f9 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 16:38:02 +1100
Subject: [PATCH 128/193] improve group removal flow

Use .save() twice, but with broadcast=False on the second update. This is more efficient than doing a query and update() and avoids the duplicate AP broadcast.
---
 bookwyrm/views/list.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 5dae128e6..97eaf9d6f 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -58,7 +58,8 @@ class Lists(View):
         book_list = form.save()
         # list should not have a group if it is not group curated
         if not book_list.curation == "group":
-            models.List.objects.filter(id=book_list.id).update(group=None)
+            book_list.group = None
+            book_list.save(broadcast=False)
 
         return redirect(book_list.local_path)
 
@@ -193,7 +194,9 @@ class List(View):
             return redirect("list", book_list.id)
         book_list = form.save()
         if not book_list.curation == "group":
-            models.List.objects.filter(id=book_list.id).update(group=None)
+            book_list.group = None
+            book_list.save(broadcast=False)
+
         return redirect(book_list.local_path)
 
 

From 91534aff827361dea1b99af02fa4015cec2aa3d1 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 16:39:50 +1100
Subject: [PATCH 129/193] group view fixes

- fix form details not appearing in group member search view
- fix query term appearing in main search box when searching for new members
- direct request user back to the group rather than the user when adding a user to a group
---
 bookwyrm/views/group.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 3e510a4d4..2623361d7 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -94,7 +94,7 @@ class FindUsers(View):
 
     def get(self, request, group_id):
         """basic profile info"""
-        query = request.GET.get("query")
+        user_query = request.GET.get("user_query")
         group = get_object_or_404(models.Group, id=group_id)
 
         if not group:
@@ -110,8 +110,8 @@ class FindUsers(View):
             )  # don't suggest users who are already members
             .annotate(
                 similarity=Greatest(
-                    TrigramSimilarity("username", query),
-                    TrigramSimilarity("localname", query),
+                    TrigramSimilarity("username", user_query),
+                    TrigramSimilarity("localname", user_query),
                 )
             )
             .filter(similarity__gt=0.5, local=True)
@@ -127,7 +127,8 @@ class FindUsers(View):
         data = {
             "suggested_users": user_results,
             "group": group,
-            "query": query,
+            "group_form": forms.GroupForm(instance=group),
+            "user_query": user_query,
             "requestor_is_manager": request.user == group.user,
         }
         return TemplateResponse(request, "groups/find_users.html", data)
@@ -222,7 +223,7 @@ def remove_member(request):
                 notification_type=notification_type,
             )
 
-    return redirect(user.local_path)
+    return redirect(group.local_path)
 
 
 @require_POST

From 17364195389567aa3e2b0159d90653ebc9b325dc Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 16:42:08 +1100
Subject: [PATCH 130/193] (hopefully) fix group tests

---
 bookwyrm/tests/models/test_group.py | 52 ++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/bookwyrm/tests/models/test_group.py b/bookwyrm/tests/models/test_group.py
index 910c342a7..59a0c018a 100644
--- a/bookwyrm/tests/models/test_group.py
+++ b/bookwyrm/tests/models/test_group.py
@@ -12,29 +12,41 @@ class Group(TestCase):
     def setUp(self):
         """Set up for tests"""
 
-        self.owner_user = models.User.objects.create_user(
-            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
-        )
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.owner_user = models.User.objects.create_user(
+                "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+            )
 
-        self.rat = models.User.objects.create_user(
-            "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
-        )
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.rat = models.User.objects.create_user(
+                "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
+            )
 
-        self.badger = models.User.objects.create_user(
-            "badger",
-            "badger@badger.badger",
-            "badgerword",
-            local=True,
-            localname="badger",
-        )
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.badger = models.User.objects.create_user(
+                "badger",
+                "badger@badger.badger",
+                "badgerword",
+                local=True,
+                localname="badger",
+            )
 
-        self.capybara = models.User.objects.create_user(
-            "capybara",
-            "capybara@capybara.capybara",
-            "capybaraword",
-            local=True,
-            localname="capybara",
-        )
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.capybara = models.User.objects.create_user(
+                "capybara",
+                "capybara@capybara.capybara",
+                "capybaraword",
+                local=True,
+                localname="capybara",
+            )
 
         self.public_group = models.Group.objects.create(
             name="Public Group",

From 85784f07d24bcd3d54df0b480e42eeed0c436361 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 16:43:09 +1100
Subject: [PATCH 131/193] groups templates improvements

- require confirmation before removing a member
- require confirmation before removing self
- make button text less verbose
- use more standardised formatting for group editing form
- improve button colours
- add missing trans tags
- reload group page when removing member
---
 bookwyrm/templates/groups/find_users.html     |  2 +-
 bookwyrm/templates/groups/group.html          | 38 +++++++++----------
 bookwyrm/templates/groups/members.html        | 33 ++++++++--------
 .../templates/groups/suggested_users.html     |  6 +--
 .../snippets/add_to_group_button.html         | 18 +++------
 .../snippets/remove_from_group_button.html    | 15 ++++----
 6 files changed, 49 insertions(+), 63 deletions(-)

diff --git a/bookwyrm/templates/groups/find_users.html b/bookwyrm/templates/groups/find_users.html
index 684cadb14..377e3a0b3 100644
--- a/bookwyrm/templates/groups/find_users.html
+++ b/bookwyrm/templates/groups/find_users.html
@@ -5,5 +5,5 @@
     <h2 class="title is-5">
         {% trans "Add new members!" %}
     </h2>
-    {% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %}
+    {% include 'groups/suggested_users.html' with suggested_users=suggested_users %}
 {% endblock %}
diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 03ccae18f..f25a1f270 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -8,6 +8,23 @@
 <div class="columns mt-3">
     <section class="column is-three-quarters">
 
+        {% if group.user == request.user %}
+        <div class="block">
+            <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
+                <div class="control">
+                    <input type="text" name="user_query" value="{{ request.GET.user_query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
+                </div>
+                <div class="control">
+                    <button class="button" type="submit">
+                        <span class="icon icon-search" title="{% trans 'Search' %}">
+                            <span class="is-sr-only">{% trans "Search" %}</span>
+                        </span>
+                    </button>
+                </div>
+            </form>
+        </div>
+        {% endif %}
+
         {% block searchresults %}
         {% endblock %}
         <div class="mb-2">
@@ -61,26 +78,5 @@
         {% endif %}
         {% include "snippets/pagination.html" with page=items %}
     </section>
-
-    {% if group.user == request.user %}
-    <section class="column is-one-quarter">
-        <div class="block">
-            <h2 class="title is-5">Find new members</h2>
-            <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
-                <div class="control">
-                    <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
-                </div>
-                <div class="control">
-                    <button class="button" type="submit">
-                        <span class="icon icon-search" title="{% trans 'Search' %}">
-                            <span class="is-sr-only">{% trans "Search" %}</span>
-                        </span>
-                    </button>
-                </div>
-            </form>
-        </div>
-    </section>
-    {% endif %}
-
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 22eb0cb6a..88e3c1ebb 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -7,10 +7,24 @@
 <h2 class="title is-5">Group Members</h2>
 <p class="subtitle is-6">{% trans "Members can add and remove books on a group's book lists" %}</p>
 
+{% if group.user != request.user and group|is_member:request.user %}
+<form action="{% url 'remove-group-member' %}" method="POST" class="my-4">
+    {% csrf_token %}
+    <input type="hidden" name="group" value="{{ group.id }}">
+    <input type="hidden" name="user" value="{{ user.username }}">
+    <button id="remove_self_button" class="button is-small is-danger is-light is-hidden" type="submit">
+        {% trans "Confirm" %}
+    </button>
+    <button id="hide_remove_self_button" data-controls="remove_self_button" class="button is-small" type="button" aria-pressed="false">
+      {% trans "Leave group" %}
+  </button>
+</form>
+{% endif %}
+
 <div class="is-multiline is-flex is-flex-grow-0 is-flex-wrap-wrap">
     {% for membership in group.memberships.all %}
     {% with member=membership.user %}
-    <div class="box has-text-centered is-shadowless has-background-white-bis my-2 mx-2">
+    <div class="box has-text-centered is-shadowless has-background-white-bis my-2 mx-2 member_{{ member.id }}">
         <a href="{{ member.local_path }}" class="has-text-black">
             {% include 'snippets/avatar.html' with user=member large=True %}
             <span title="{{ member.display_name }}" class="is-block is-6 has-text-weight-bold">{{ member.display_name|truncatechars:10 }}</span>
@@ -21,7 +35,7 @@
             <span class="is-sr-only">Manager</span>
         </span>
         {% endif %}
-        {% include 'snippets/remove_from_group_button.html' with user=member group=group minimal=True %}
+        {% include 'snippets/remove_from_group_button.html' with user=member group=group %}
         {% if request.user in member.following.all %}
         <p class="help">
             {% trans "Follows you" %}
@@ -31,18 +45,3 @@
     {% endwith %}
     {% endfor %}
 </div>
-
-{% if group.user != request.user and group|is_member:request.user %}
-<form action="{% url 'remove-group-member' %}" method="POST" class="my-4">
-    {% csrf_token %}
-    <input type="hidden" name="group" value="{{ group.id }}">
-    <input type="hidden" name="user" value="{{ user.username }}">
-    <button class="button is-small is-danger is-light" type="submit">
-        {% if show_username %}
-        {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
-        {% else %}
-        {% trans "Remove self from group" %}
-        {% endif %}
-    </button>
-</form>
-{% endif %}
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 212a1a76e..951e7bf05 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -5,13 +5,13 @@
 {% if suggested_users %}
     <div class="column is-flex is-flex-grow-0">
         {% for user in suggested_users %}
-        <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
+        <div class="box has-text-centered is-shadowless has-background-white-bis m-2">
             <a href="{{ user.local_path }}" class="has-text-black">
                 {% include 'snippets/avatar.html' with user=user large=True %}
                 <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
                 <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
             </a>
-            {% include 'snippets/add_to_group_button.html' with user=user group=group minimal=True %}
+            {% include 'snippets/add_to_group_button.html' with user=user group=group %}
             {% if user.mutuals %}
             <p class="help">
                 {% blocktrans trimmed with mutuals=user.mutuals|intcomma count counter=user.mutuals %}
@@ -36,7 +36,7 @@
         {% endfor %}
     </div>
     {% else %}
-    <p>No potential members found for "{{ query }}"</p>
+    <p>No potential members found for "{{ user_query }}"</p>
     <br/>
 
 {% endif %}
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index fd94f14d1..2785d7c01 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -5,18 +5,14 @@
 {% include 'snippets/block_button.html' with blocks=True %}
 {% else %}
 
-<div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
+<div class="field mb-0">
     <div class="control">
         <form action="{% url 'invite-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if group|is_member:user or group|is_invited:user %}is-hidden{%endif %}" data-id="add_{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
-            <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">
-                {% if show_username %}
-                {% blocktrans with username=user.localname %}Invite @{{ username }}{% endblocktrans %}
-                {% else %}
+            <button class="button is-small" type="submit">
                 {% trans "Invite" %}
-                {% endif %}
             </button>
         </form>
         <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }} {% if not group|is_member:user and not group|is_invited:user %}is-hidden{% endif %}" data-id="add_{{ user.id }}">
@@ -25,17 +21,13 @@
             <input type="hidden" name="user" value="{{ user.username }}">
             {% if not group|is_member:user %}
             <button class="button is-small is-danger is-light" type="submit">
-                {% trans "Undo Invitation" %}
+                {% trans "Uninvite" %}
             </button>
             {% else %}
             <button class="button is-small is-danger is-light" type="submit">
-                {% if show_username %}
-                    {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
-                {% else %}
-                    {% trans "Remove" %}
-                {% endif %}
+                {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
             </button>
-                {% endif %}
+            {% endif %}
         </form>
     </div>
 </div>
diff --git a/bookwyrm/templates/snippets/remove_from_group_button.html b/bookwyrm/templates/snippets/remove_from_group_button.html
index 809d1d1fe..d5fa29a9d 100644
--- a/bookwyrm/templates/snippets/remove_from_group_button.html
+++ b/bookwyrm/templates/snippets/remove_from_group_button.html
@@ -6,18 +6,17 @@
 {% include 'snippets/block_button.html' with blocks=True %}
 <br/>
 {% endif %}
-<div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
+<div class="fieldmb-0">
     <div class="control">
-        <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }}" data-id="add_{{ user.id }}">
+        <form action="{% url 'remove-group-member' %}" method="POST" class="has-text-centered">
             {% csrf_token %}
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
-            <button class="button is-small" type="submit">
-                {% if show_username %}
-                    {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
-                {% else %}
-                    {% trans "Remove" %}
-                {% endif %}
+            <button id="submit_button" class="button is-small is-danger is-light is-hidden" type="submit" data-id="member_{{ member.id }}">
+              {% blocktrans with username=user.localname %} Confirm {% endblocktrans %}
+            </button>
+            <button id="hide_submit_button" data-controls="submit_button" class="button is-small" type="button" aria-pressed="false">
+                {% blocktrans with username=user.localname %} Remove {% endblocktrans %}
             </button>
         </form>
     </div>

From 2a31bf2f0c7d8d5f3031be04a62601b3879516eb Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 17:35:36 +1100
Subject: [PATCH 132/193] delete groups

Whoops, forgot to add this functionality earlier.

- allow owner to delete a group
- change all group lists to closed curation with group=False when group deleted
---
 bookwyrm/models/list.py                       |  2 +-
 .../templates/groups/delete_group_modal.html  | 18 +++++++++---------
 bookwyrm/urls.py                              |  1 +
 bookwyrm/views/__init__.py                    |  1 +
 bookwyrm/views/group.py                       | 19 ++++++++++++++++++-
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 66ec4eee4..978a7a9b3 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -32,7 +32,7 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     )
     group = models.ForeignKey(
         "Group",
-        on_delete=models.PROTECT,
+        on_delete=models.SET_NULL,
         default=None,
         blank=True,
         null=True,
diff --git a/bookwyrm/templates/groups/delete_group_modal.html b/bookwyrm/templates/groups/delete_group_modal.html
index fd6706157..4bb87ed9b 100644
--- a/bookwyrm/templates/groups/delete_group_modal.html
+++ b/bookwyrm/templates/groups/delete_group_modal.html
@@ -8,14 +8,14 @@
 {% endblock %}
 
 {% block modal-footer %}
-    <div>
-        {% csrf_token %}
-        <input type="hidden" name="id" value="{{ group.id }}">
-        <button class="button is-danger" type="submit">
-            {% trans "Delete" %}
-        </button>
-        {% trans "Cancel" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete_list" controls_uid=list.id %}
-    </div>
+<form name="delete-group-{{ group.id }}" action="{% url 'delete-group' group.id %}" method="POST">
+    {% csrf_token %}
+    <input type="hidden" name="id" value="{{ group.id }}">
+    <button class="button is-danger" type="submit">
+        {% trans "Delete" %}
+    </button>
+    {% trans "Cancel" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete_group" controls_uid=group.id %}
+</form>
 {% endblock %}
 
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 49c47ef5a..c81a930b1 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -258,6 +258,7 @@ urlpatterns = [
     re_path(
         r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"
     ),
+    re_path(r"^group/delete/(?P<group_id>\d+)/?$", views.delete_group, name="delete-group"),
     re_path(
         r"^group/(?P<group_id>\d+)/add-users/?$",
         views.FindUsers.as_view(),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 08b846dc8..1e525cb38 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -45,6 +45,7 @@ from .group import (
     Group,
     UserGroups,
     FindUsers,
+    delete_group,
     invite_member,
     remove_member,
     accept_membership,
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 2623361d7..07eabda73 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -79,7 +79,7 @@ class UserGroups(View):
         """create a user group"""
         form = forms.GroupForm(request.POST)
         if not form.is_valid():
-            return redirect(request.user.local_path + "groups")
+            return redirect(request.user.local_path + "/groups")
         group = form.save()
         # add the creator as a group member
         models.GroupMember.objects.create(group=group, user=request.user)
@@ -134,6 +134,22 @@ class FindUsers(View):
         return TemplateResponse(request, "groups/find_users.html", data)
 
 
+@require_POST
+@login_required
+def delete_group(request, group_id):
+    """delete a group"""
+    group = get_object_or_404(models.Group, id=group_id)
+
+    # only the owner can delete a group
+    group.raise_not_deletable(request.user)
+
+    # deal with any group lists
+    models.List.objects.filter(group=group).update(curation="closed", group=None)
+
+    group.delete()
+    return redirect(request.user.local_path + "/groups")
+
+
 @require_POST
 @login_required
 def invite_member(request):
@@ -268,3 +284,4 @@ def reject_membership(request):
         pass
 
     return redirect(request.user.local_path)
+

From a476b52f868e7fcd92e113d66d46cc367be409e4 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 17:45:21 +1100
Subject: [PATCH 133/193] database migrations for groups

---
 ...005_0935.py => 0107_auto_20211016_0639.py} | 35 +++++++++++--------
 .../migrations/0107_merge_20211010_0119.py    | 13 -------
 2 files changed, 21 insertions(+), 27 deletions(-)
 rename bookwyrm/migrations/{0106_auto_20211005_0935.py => 0107_auto_20211016_0639.py} (98%)
 delete mode 100644 bookwyrm/migrations/0107_merge_20211010_0119.py

diff --git a/bookwyrm/migrations/0106_auto_20211005_0935.py b/bookwyrm/migrations/0107_auto_20211016_0639.py
similarity index 98%
rename from bookwyrm/migrations/0106_auto_20211005_0935.py
rename to bookwyrm/migrations/0107_auto_20211016_0639.py
index 6030c9130..61dffca34 100644
--- a/bookwyrm/migrations/0106_auto_20211005_0935.py
+++ b/bookwyrm/migrations/0107_auto_20211016_0639.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.5 on 2021-10-05 09:35
+# Generated by Django 3.2.5 on 2021-10-16 06:39
 
 import bookwyrm.models.fields
 from django.conf import settings
@@ -9,7 +9,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("bookwyrm", "0105_alter_connector_connector_file"),
+        ("bookwyrm", "0106_user_preferred_language"),
     ]
 
     operations = [
@@ -93,16 +93,6 @@ class Migration(migrations.Migration):
             model_name="notification",
             name="notification_type_valid",
         ),
-        migrations.AddField(
-            model_name="notification",
-            name="related_group_member",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="related_group_member",
-                to=settings.AUTH_USER_MODEL,
-            ),
-        ),
         migrations.AlterField(
             model_name="list",
             name="curation",
@@ -141,6 +131,23 @@ class Migration(migrations.Migration):
                 max_length=255,
             ),
         ),
+        migrations.AlterField(
+            model_name="user",
+            name="preferred_language",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("en-us", "English"),
+                    ("de-de", "Deutsch (German)"),
+                    ("es", "Español (Spanish)"),
+                    ("fr-fr", "Français (French)"),
+                    ("zh-hans", "简体中文 (Simplified Chinese)"),
+                    ("zh-hant", "繁體中文 (Traditional Chinese)"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
         migrations.AlterField(
             model_name="user",
             name="preferred_timezone",
@@ -825,7 +832,7 @@ class Migration(migrations.Migration):
             model_name="group",
             name="user",
             field=bookwyrm.models.fields.ForeignKey(
-                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+                on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
             ),
         ),
         migrations.AddField(
@@ -835,7 +842,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 default=None,
                 null=True,
-                on_delete=django.db.models.deletion.PROTECT,
+                on_delete=django.db.models.deletion.SET_NULL,
                 to="bookwyrm.group",
             ),
         ),
diff --git a/bookwyrm/migrations/0107_merge_20211010_0119.py b/bookwyrm/migrations/0107_merge_20211010_0119.py
deleted file mode 100644
index d774fbb20..000000000
--- a/bookwyrm/migrations/0107_merge_20211010_0119.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by Django 3.2.5 on 2021-10-10 01:19
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookwyrm", "0106_auto_20211005_0935"),
-        ("bookwyrm", "0106_user_preferred_language"),
-    ]
-
-    operations = []

From 0cd8ece474ba5c6fc4b859269e020d2a1019bcd0 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 17:45:39 +1100
Subject: [PATCH 134/193] code formatting

---
 bookwyrm/templates/groups/members.html    | 4 ++--
 bookwyrm/templates/lists/create_form.html | 2 +-
 bookwyrm/urls.py                          | 4 +++-
 bookwyrm/views/group.py                   | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 88e3c1ebb..719674d89 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -16,8 +16,8 @@
         {% trans "Confirm" %}
     </button>
     <button id="hide_remove_self_button" data-controls="remove_self_button" class="button is-small" type="button" aria-pressed="false">
-      {% trans "Leave group" %}
-  </button>
+        {% trans "Leave group" %}
+    </button>
 </form>
 {% endif %}
 
diff --git a/bookwyrm/templates/lists/create_form.html b/bookwyrm/templates/lists/create_form.html
index 6a42a90a5..447c0f6bf 100644
--- a/bookwyrm/templates/lists/create_form.html
+++ b/bookwyrm/templates/lists/create_form.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block form %}
-    <form name="create-list" method="post" action="{% url 'lists' %}">
+<form name="create-list" method="post" action="{% url 'lists' %}">
     {% include 'lists/form.html' %}
 </form>
 {% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index c81a930b1..90709e0cc 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -258,7 +258,9 @@ urlpatterns = [
     re_path(
         r"^group/(?P<group_id>\d+)(.json)?/?$", views.Group.as_view(), name="group"
     ),
-    re_path(r"^group/delete/(?P<group_id>\d+)/?$", views.delete_group, name="delete-group"),
+    re_path(
+        r"^group/delete/(?P<group_id>\d+)/?$", views.delete_group, name="delete-group"
+    ),
     re_path(
         r"^group/(?P<group_id>\d+)/add-users/?$",
         views.FindUsers.as_view(),
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 07eabda73..1c0a28486 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -284,4 +284,3 @@ def reject_membership(request):
         pass
 
     return redirect(request.user.local_path)
-

From 8192d6ad10671ae8d0e89394fba9440f6af9cfe3 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 16 Oct 2021 18:00:55 +1100
Subject: [PATCH 135/193] code indenting fix

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

diff --git a/bookwyrm/templates/snippets/remove_from_group_button.html b/bookwyrm/templates/snippets/remove_from_group_button.html
index d5fa29a9d..6d1de0dd3 100644
--- a/bookwyrm/templates/snippets/remove_from_group_button.html
+++ b/bookwyrm/templates/snippets/remove_from_group_button.html
@@ -13,7 +13,7 @@
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
             <button id="submit_button" class="button is-small is-danger is-light is-hidden" type="submit" data-id="member_{{ member.id }}">
-              {% blocktrans with username=user.localname %} Confirm {% endblocktrans %}
+                {% blocktrans with username=user.localname %} Confirm {% endblocktrans %}
             </button>
             <button id="hide_submit_button" data-controls="submit_button" class="button is-small" type="button" aria-pressed="false">
                 {% blocktrans with username=user.localname %} Remove {% endblocktrans %}

From 584e0a54af12559841b382c2f157a54e87f27397 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 07:06:49 -0700
Subject: [PATCH 136/193] Adds test to catch invalid link

---
 bookwyrm/tests/views/books/test_edit_book.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py
index 85bbc032c..7bf5708f8 100644
--- a/bookwyrm/tests/views/books/test_edit_book.py
+++ b/bookwyrm/tests/views/books/test_edit_book.py
@@ -58,6 +58,17 @@ class EditBookViews(TestCase):
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
+    def test_edit_book_create_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.EditBook.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
     def test_edit_book(self):
         """lets a user edit a book"""
         view = views.EditBook.as_view()

From 94bce7fd839b2c0231ef17d0ef9b3bcc067a75c4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 07:11:12 -0700
Subject: [PATCH 137/193] Use javascript back button on create book page

---
 bookwyrm/templates/book/edit/edit_book.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bookwyrm/templates/book/edit/edit_book.html b/bookwyrm/templates/book/edit/edit_book.html
index ec7b08586..fc11208fd 100644
--- a/bookwyrm/templates/book/edit/edit_book.html
+++ b/bookwyrm/templates/book/edit/edit_book.html
@@ -108,7 +108,13 @@
     {% if not confirm_mode %}
     <div class="block">
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
+        {% if book %}
         <a class="button" href="{{ book.local_path }}">{% trans "Cancel" %}</a>
+        {% else %}
+        <a href="/" class="button" data-back>
+            <span>{% trans "Cancel" %}</span>
+        </a>
+        {% endif %}
     </div>
     {% endif %}
 </form>

From 8cb91acb93a4de92e9603b82167a2fc9e13bf318 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:00:31 -0700
Subject: [PATCH 138/193] Move logged out templates into a directory

---
 bookwyrm/templates/{ => landing}/invite.html       |  0
 bookwyrm/templates/{ => landing}/login.html        |  0
 .../templates/{ => landing}/password_reset.html    |  0
 .../{ => landing}/password_reset_request.html      |  0
 bookwyrm/views/login.py                            |  4 ++--
 bookwyrm/views/password.py                         | 14 ++++++++------
 bookwyrm/views/register.py                         |  4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)
 rename bookwyrm/templates/{ => landing}/invite.html (100%)
 rename bookwyrm/templates/{ => landing}/login.html (100%)
 rename bookwyrm/templates/{ => landing}/password_reset.html (100%)
 rename bookwyrm/templates/{ => landing}/password_reset_request.html (100%)

diff --git a/bookwyrm/templates/invite.html b/bookwyrm/templates/landing/invite.html
similarity index 100%
rename from bookwyrm/templates/invite.html
rename to bookwyrm/templates/landing/invite.html
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/landing/login.html
similarity index 100%
rename from bookwyrm/templates/login.html
rename to bookwyrm/templates/landing/login.html
diff --git a/bookwyrm/templates/password_reset.html b/bookwyrm/templates/landing/password_reset.html
similarity index 100%
rename from bookwyrm/templates/password_reset.html
rename to bookwyrm/templates/landing/password_reset.html
diff --git a/bookwyrm/templates/password_reset_request.html b/bookwyrm/templates/landing/password_reset_request.html
similarity index 100%
rename from bookwyrm/templates/password_reset_request.html
rename to bookwyrm/templates/landing/password_reset_request.html
diff --git a/bookwyrm/views/login.py b/bookwyrm/views/login.py
index 91fda35a3..5c25e30e2 100644
--- a/bookwyrm/views/login.py
+++ b/bookwyrm/views/login.py
@@ -29,7 +29,7 @@ class Login(View):
             "login_form": forms.LoginForm(),
             "register_form": forms.RegisterForm(),
         }
-        return TemplateResponse(request, "login.html", data)
+        return TemplateResponse(request, "landing/login.html", data)
 
     @sensitive_variables("password")
     @method_decorator(sensitive_post_parameters("password"))
@@ -69,7 +69,7 @@ class Login(View):
         login_form.non_field_errors = _("Username or password are incorrect")
         register_form = forms.RegisterForm()
         data = {"login_form": login_form, "register_form": register_form}
-        return TemplateResponse(request, "login.html", data)
+        return TemplateResponse(request, "landing/login.html", data)
 
 
 @method_decorator(login_required, name="dispatch")
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index d3104ad46..90713e29d 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -18,7 +18,7 @@ class PasswordResetRequest(View):
         """password reset page"""
         return TemplateResponse(
             request,
-            "password_reset_request.html",
+            "landing/password_reset_request.html",
         )
 
     def post(self, request):
@@ -30,7 +30,9 @@ class PasswordResetRequest(View):
             )
         except models.User.DoesNotExist:
             data = {"error": _("No user with that email address was found.")}
-            return TemplateResponse(request, "password_reset_request.html", data)
+            return TemplateResponse(
+                request, "landing/password_reset_request.html", data
+            )
 
         # remove any existing password reset cods for this user
         models.PasswordReset.objects.filter(user=user).all().delete()
@@ -39,7 +41,7 @@ class PasswordResetRequest(View):
         code = models.PasswordReset.objects.create(user=user)
         password_reset_email(code)
         data = {"message": _(f"A password reset link was sent to {email}")}
-        return TemplateResponse(request, "password_reset_request.html", data)
+        return TemplateResponse(request, "landing/password_reset_request.html", data)
 
 
 class PasswordReset(View):
@@ -56,7 +58,7 @@ class PasswordReset(View):
         except models.PasswordReset.DoesNotExist:
             raise PermissionDenied()
 
-        return TemplateResponse(request, "password_reset.html", {"code": code})
+        return TemplateResponse(request, "landing/password_reset.html", {"code": code})
 
     def post(self, request, code):
         """allow a user to change their password through an emailed token"""
@@ -64,7 +66,7 @@ class PasswordReset(View):
             reset_code = models.PasswordReset.objects.get(code=code)
         except models.PasswordReset.DoesNotExist:
             data = {"errors": ["Invalid password reset link"]}
-            return TemplateResponse(request, "password_reset.html", data)
+            return TemplateResponse(request, "landing/password_reset.html", data)
 
         user = reset_code.user
 
@@ -73,7 +75,7 @@ class PasswordReset(View):
 
         if new_password != confirm_password:
             data = {"errors": ["Passwords do not match"]}
-            return TemplateResponse(request, "password_reset.html", data)
+            return TemplateResponse(request, "landing/password_reset.html", data)
 
         user.set_password(new_password)
         user.save(broadcast=False, update_fields=["password"])
diff --git a/bookwyrm/views/register.py b/bookwyrm/views/register.py
index dd8249203..b91d1b5a9 100644
--- a/bookwyrm/views/register.py
+++ b/bookwyrm/views/register.py
@@ -65,8 +65,8 @@ class Register(View):
                 "valid": invite.valid() if invite else True,
             }
             if invite:
-                return TemplateResponse(request, "invite.html", data)
-            return TemplateResponse(request, "login.html", data)
+                return TemplateResponse(request, "landing/invite.html", data)
+            return TemplateResponse(request, "landing/login.html", data)
 
         username = f"{localname}@{DOMAIN}"
         user = models.User.objects.create_user(

From b56147d70c0744bbbbf3a789b4520a2626559b02 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:09:25 -0700
Subject: [PATCH 139/193] Use validate html in landing views tests

---
 bookwyrm/tests/views/test_invite.py   | 15 ++++++++-------
 bookwyrm/tests/views/test_landing.py  |  7 ++++---
 bookwyrm/tests/views/test_password.py |  5 +++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py
index c1e425c8c..a93821a9e 100644
--- a/bookwyrm/tests/views/test_invite.py
+++ b/bookwyrm/tests/views/test_invite.py
@@ -8,6 +8,7 @@ from django.test.client import RequestFactory
 
 from bookwyrm import forms, models
 from bookwyrm import views
+from bookwyrm.tests.validate_html import validate_html
 
 
 class InviteViews(TestCase):
@@ -40,7 +41,7 @@ class InviteViews(TestCase):
             invite.return_value = True
             result = view(request, "hi")
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
     def test_manage_invites(self):
@@ -51,7 +52,7 @@ class InviteViews(TestCase):
         request.user.is_superuser = True
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
     def test_manage_invites_post(self):
@@ -67,7 +68,7 @@ class InviteViews(TestCase):
         result = view(request)
 
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
         invite = models.SiteInvite.objects.get()
@@ -83,7 +84,7 @@ class InviteViews(TestCase):
         request = self.factory.post("", form.data)
 
         result = view(request)
-        result.render()
+        validate_html(result.render())
 
         req = models.InviteRequest.objects.get()
         self.assertEqual(req.email, "new@user.email")
@@ -97,7 +98,7 @@ class InviteViews(TestCase):
         request = self.factory.post("", form.data)
 
         result = view(request)
-        result.render()
+        validate_html(result.render())
 
         # no request created
         self.assertFalse(models.InviteRequest.objects.exists())
@@ -110,14 +111,14 @@ class InviteViews(TestCase):
         request.user.is_superuser = True
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
         # now with data
         models.InviteRequest.objects.create(email="fish@example.com")
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
     def test_manage_invite_requests_send(self):
diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py
index f3a50fbc2..829919177 100644
--- a/bookwyrm/tests/views/test_landing.py
+++ b/bookwyrm/tests/views/test_landing.py
@@ -7,6 +7,7 @@ from django.test.client import RequestFactory
 
 from bookwyrm import models
 from bookwyrm import views
+from bookwyrm.tests.validate_html import validate_html
 
 
 class LandingViews(TestCase):
@@ -38,13 +39,13 @@ class LandingViews(TestCase):
         with patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream"):
             result = view(request)
         self.assertEqual(result.status_code, 200)
-        result.render()
+        validate_html(result.render())
 
         request.user = self.anonymous_user
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
         self.assertEqual(result.status_code, 200)
-        result.render()
+        validate_html(result.render())
 
     def test_about_page(self):
         """there are so many views, this just makes sure it LOADS"""
@@ -53,7 +54,7 @@ class LandingViews(TestCase):
         request.user = self.local_user
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
     def test_landing(self):
diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py
index 47d8bb27b..852f03c3c 100644
--- a/bookwyrm/tests/views/test_password.py
+++ b/bookwyrm/tests/views/test_password.py
@@ -7,6 +7,7 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 
 from bookwyrm import models, views
+from bookwyrm.tests.validate_html import validate_html
 
 
 class PasswordViews(TestCase):
@@ -37,7 +38,7 @@ class PasswordViews(TestCase):
 
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
     def test_password_reset_request_post(self):
@@ -65,7 +66,7 @@ class PasswordViews(TestCase):
         request.user = self.anonymous_user
         result = view(request, code.code)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
     def test_password_reset_post(self):

From 974c05dedb9f6a1198e38b3aff130a17ff32a0a5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:14:53 -0700
Subject: [PATCH 140/193] Adds more password view tests

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

diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py
index 852f03c3c..1f271045c 100644
--- a/bookwyrm/tests/views/test_password.py
+++ b/bookwyrm/tests/views/test_password.py
@@ -1,10 +1,13 @@
 """ test for app action functionality """
+from datetime import timedelta
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
+from django.core.exceptions import PermissionDenied
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.utils import timezone
 
 from bookwyrm import models, views
 from bookwyrm.tests.validate_html import validate_html
@@ -69,6 +72,35 @@ class PasswordViews(TestCase):
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
+    def test_password_reset_nonexistant_code(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.PasswordReset.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+        with self.assertRaises(PermissionDenied):
+            view(request, "beep")
+
+    def test_password_reset_invalid_code(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.PasswordReset.as_view()
+        code = models.PasswordReset.objects.create(
+            user=self.local_user,
+            expiry=timezone.now() - timedelta(days=2)
+        )
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+        with self.assertRaises(PermissionDenied):
+            view(request, code.code)
+
+    def test_password_reset_logged_in(self):
+        """redirect logged in users"""
+        view = views.PasswordReset.as_view()
+        code = models.PasswordReset.objects.create(user=self.local_user)
+        request = self.factory.get("")
+        request.user = self.local_user
+        result = view(request, code.code)
+        self.assertEqual(result.status_code, 302)
+
     def test_password_reset_post(self):
         """reset from code"""
         view = views.PasswordReset.as_view()

From bec56180f01b5c0fa0e79497c753c611f32401b3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:20:06 -0700
Subject: [PATCH 141/193] Fixes label on layout login form

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

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index d475646e8..f2d04f961 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -171,7 +171,7 @@
                                         <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="{% trans 'username' %}">
                                     </div>
                                     <div class="column">
-                                        <label class="is-sr-only" for="id_password">{% trans "Username:" %}</label>
+                                        <label class="is-sr-only" for="id_password">{% trans "Password:" %}</label>
                                         <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="{% trans 'password' %}">
                                         <p class="help"><a href="{% url 'password-reset' %}">{% trans "Forgot your password?" %}</a></p>
                                     </div>

From dce0c85602bb31b28008d19563f4e457e5e342f8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:28:38 -0700
Subject: [PATCH 142/193] Fixes clashing input ids on reset password form

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

diff --git a/bookwyrm/templates/landing/password_reset.html b/bookwyrm/templates/landing/password_reset.html
index 57add722a..be1dccf81 100644
--- a/bookwyrm/templates/landing/password_reset.html
+++ b/bookwyrm/templates/landing/password_reset.html
@@ -14,9 +14,9 @@
             <form name="password-reset" method="post" action="/password-reset/{{ code }}">
                 {% csrf_token %}
                 <div class="field">
-                    <label class="label" for="id_password">{% trans "Password:" %}</label>
+                    <label class="label" for="id_new_password">{% trans "Password:" %}</label>
                     <div class="control">
-                        <input type="password" name="password" maxlength="128" class="input" required="" id="id_password">
+                        <input type="password" name="password" maxlength="128" class="input" required="" id="id_new_password">
                     </div>
                 </div>
                 <div class="field">

From 68cbea60a9e82f3703bded290fa9007ee1b6bfc0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:34:41 -0700
Subject: [PATCH 143/193] Updates registration tests with html validation

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

diff --git a/bookwyrm/tests/views/test_register.py b/bookwyrm/tests/views/test_register.py
index 764081ef9..e2255c916 100644
--- a/bookwyrm/tests/views/test_register.py
+++ b/bookwyrm/tests/views/test_register.py
@@ -10,6 +10,7 @@ from django.test.client import RequestFactory
 
 from bookwyrm import models, views
 from bookwyrm.settings import DOMAIN
+from bookwyrm.tests.validate_html import validate_html
 
 
 # pylint: disable=too-many-public-methods
@@ -55,7 +56,7 @@ class RegisterViews(TestCase):
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
         nutria = models.User.objects.last()
-        self.assertEqual(nutria.username, "nutria-user.user_nutria@%s" % DOMAIN)
+        self.assertEqual(nutria.username, f"nutria-user.user_nutria@{DOMAIN}")
         self.assertEqual(nutria.localname, "nutria-user.user_nutria")
         self.assertEqual(nutria.local, True)
 
@@ -79,7 +80,7 @@ class RegisterViews(TestCase):
             response = view(request)
         self.assertEqual(response.status_code, 302)
         nutria = models.User.objects.get(localname="nutria")
-        self.assertEqual(nutria.username, "nutria@%s" % DOMAIN)
+        self.assertEqual(nutria.username, f"nutria@{DOMAIN}")
         self.assertEqual(nutria.local, True)
 
         self.assertFalse(nutria.is_active)
@@ -98,7 +99,7 @@ class RegisterViews(TestCase):
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
         nutria = models.User.objects.last()
-        self.assertEqual(nutria.username, "nutria@%s" % DOMAIN)
+        self.assertEqual(nutria.username, f"nutria@{DOMAIN}")
         self.assertEqual(nutria.localname, "nutria")
         self.assertEqual(nutria.local, True)
 
@@ -277,7 +278,7 @@ class RegisterViews(TestCase):
 
         result = view(request, "abcde")
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
         self.assertFalse(self.local_user.is_active)
         self.assertEqual(self.local_user.deactivation_reason, "pending")
@@ -293,7 +294,7 @@ class RegisterViews(TestCase):
 
         result = login(request)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
         request.user = self.local_user

From ea268449fade41bd8be33094447813571c8b8bcc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:38:45 -0700
Subject: [PATCH 144/193] Python formatting

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

diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py
index 1f271045c..dbfea2079 100644
--- a/bookwyrm/tests/views/test_password.py
+++ b/bookwyrm/tests/views/test_password.py
@@ -84,8 +84,7 @@ class PasswordViews(TestCase):
         """there are so many views, this just makes sure it LOADS"""
         view = views.PasswordReset.as_view()
         code = models.PasswordReset.objects.create(
-            user=self.local_user,
-            expiry=timezone.now() - timedelta(days=2)
+            user=self.local_user, expiry=timezone.now() - timedelta(days=2)
         )
         request = self.factory.get("")
         request.user = self.anonymous_user

From 5e9cc5eec5d3d89dcb1035db652ac0af681cdd3b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:46:05 -0700
Subject: [PATCH 145/193] Validate remaining templates

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

diff --git a/bookwyrm/tests/views/test_register.py b/bookwyrm/tests/views/test_register.py
index e2255c916..133b56423 100644
--- a/bookwyrm/tests/views/test_register.py
+++ b/bookwyrm/tests/views/test_register.py
@@ -39,6 +39,13 @@ class RegisterViews(TestCase):
             id=1, require_confirm_email=False
         )
 
+    def test_get_redirect(self, *_):
+        """there's no dedicated registration page"""
+        view = views.Register.as_view()
+        request = self.factory.get("register/")
+        response = view(request)
+        self.assertEqual(response.status_code, 302)
+
     def test_register(self, *_):
         """create a user"""
         view = views.Register.as_view()
@@ -112,7 +119,7 @@ class RegisterViews(TestCase):
         )
         response = view(request)
         self.assertEqual(models.User.objects.count(), 1)
-        response.render()
+        validate_html(response.render())
 
     def test_register_invalid_username(self, *_):
         """gotta have an email"""
@@ -124,7 +131,7 @@ class RegisterViews(TestCase):
         )
         response = view(request)
         self.assertEqual(models.User.objects.count(), 1)
-        response.render()
+        validate_html(response.render())
 
         request = self.factory.post(
             "register/",
@@ -132,7 +139,7 @@ class RegisterViews(TestCase):
         )
         response = view(request)
         self.assertEqual(models.User.objects.count(), 1)
-        response.render()
+        validate_html(response.render())
 
         request = self.factory.post(
             "register/",
@@ -140,7 +147,7 @@ class RegisterViews(TestCase):
         )
         response = view(request)
         self.assertEqual(models.User.objects.count(), 1)
-        response.render()
+        validate_html(response.render())
 
     def test_register_closed_instance(self, *_):
         """you can't just register"""

From 7ec573bf508e52ab1717b07217585c95d04fd974 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:55:51 -0700
Subject: [PATCH 146/193] Fixes duplicate form ids in login form

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

diff --git a/bookwyrm/templates/landing/login.html b/bookwyrm/templates/landing/login.html
index 31e9cebb4..8cce2ee72 100644
--- a/bookwyrm/templates/landing/login.html
+++ b/bookwyrm/templates/landing/login.html
@@ -18,15 +18,15 @@
             {% csrf_token %}
             {% if show_confirmed_email %}<input type="hidden" name="first_login" value="true">{% endif %}
             <div class="field">
-                <label class="label" for="id_localname">{% trans "Username:" %}</label>
+                <label class="label" for="id_localname_confirm">{% trans "Username:" %}</label>
                 <div class="control">
-                    {{ login_form.localname }}
+                    <input type="text" name="localname" maxlength="255" class="input" required="" id="id_localname_confirm" value="{{ login_form.localname.value|default:'' }}">
                 </div>
             </div>
             <div class="field">
-                <label class="label" for="id_password">{% trans "Password:" %}</label>
+                <label class="label" for="id_password_confirm">{% trans "Password:" %}</label>
                 <div class="control">
-                    {{ login_form.password }}
+                    <input type="password" name="password" maxlength="128" class="input" required="" id="id_password_confirm">
                 </div>
                 {% for error in login_form.password.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>

From 3118cdfbb6f262d15d49d7879dc61323084d821c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 10:56:22 -0700
Subject: [PATCH 147/193] Adds another register test

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

diff --git a/bookwyrm/tests/views/test_register.py b/bookwyrm/tests/views/test_register.py
index 133b56423..c5138a81a 100644
--- a/bookwyrm/tests/views/test_register.py
+++ b/bookwyrm/tests/views/test_register.py
@@ -121,6 +121,18 @@ class RegisterViews(TestCase):
         self.assertEqual(models.User.objects.count(), 1)
         validate_html(response.render())
 
+    def test_register_username_in_use(self, *_):
+        """that username is taken"""
+        view = views.Register.as_view()
+        self.assertEqual(models.User.objects.count(), 1)
+        request = self.factory.post(
+            "register/",
+            {"localname": "mouse", "password": "mouseword", "email": "aa@bb.ccc"},
+        )
+        response = view(request)
+        self.assertEqual(models.User.objects.count(), 1)
+        validate_html(response.render())
+
     def test_register_invalid_username(self, *_):
         """gotta have an email"""
         view = views.Register.as_view()

From ad26e6510915e82c6ecd858a570a49ffdeee048c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 11:15:38 -0700
Subject: [PATCH 148/193] Fixes clashing identifier and attr with no quotes

---
 bookwyrm/templates/landing/invite.html | 2 +-
 bookwyrm/templates/landing/login.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/landing/invite.html b/bookwyrm/templates/landing/invite.html
index fcd379e26..d56cad38c 100644
--- a/bookwyrm/templates/landing/invite.html
+++ b/bookwyrm/templates/landing/invite.html
@@ -12,7 +12,7 @@
             {% if valid %}
             <div>
                 <form name="register" method="post" action="/register">
-                    <input type=hidden name="invite_code" value="{{ invite.code }}">
+                    <input type="hidden" name="invite_code" value="{{ invite.code }}">
                     {% include 'snippets/register_form.html' %}
                 </form>
             </div>
diff --git a/bookwyrm/templates/landing/login.html b/bookwyrm/templates/landing/login.html
index 8cce2ee72..95baa06de 100644
--- a/bookwyrm/templates/landing/login.html
+++ b/bookwyrm/templates/landing/login.html
@@ -14,7 +14,7 @@
         {% if show_confirmed_email %}
         <p class="notification is-success">{% trans "Success! Email address confirmed." %}</p>
         {% endif %}
-        <form name="login" method="post" action="/login">
+        <form name="login-confirm" method="post" action="/login">
             {% csrf_token %}
             {% if show_confirmed_email %}<input type="hidden" name="first_login" value="true">{% endif %}
             <div class="field">

From 851a8f695869c7a6aabf7d16f1fb8f76586d8fc3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 11:15:57 -0700
Subject: [PATCH 149/193] More registration tests

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

diff --git a/bookwyrm/tests/views/test_register.py b/bookwyrm/tests/views/test_register.py
index c5138a81a..2c4906e9b 100644
--- a/bookwyrm/tests/views/test_register.py
+++ b/bookwyrm/tests/views/test_register.py
@@ -121,6 +121,30 @@ class RegisterViews(TestCase):
         self.assertEqual(models.User.objects.count(), 1)
         validate_html(response.render())
 
+    def test_register_error_and_invite(self, *_):
+        """redirect to the invite page"""
+        view = views.Register.as_view()
+        self.settings.allow_registration = False
+        self.settings.save()
+        models.SiteInvite.objects.create(
+            code="testcode", user=self.local_user, use_limit=1
+        )
+        self.assertEqual(models.SiteInvite.objects.get().times_used, 0)
+
+        request = self.factory.post(
+            "register/",
+            {
+                "localname": "nutria",
+                "password": "mouseword",
+                "email": "",
+                "invite_code": "testcode",
+            },
+        )
+        with patch("bookwyrm.views.register.login"):
+            response = view(request)
+        response = view(request)
+        validate_html(response.render())
+
     def test_register_username_in_use(self, *_):
         """that username is taken"""
         view = views.Register.as_view()
@@ -320,3 +344,25 @@ class RegisterViews(TestCase):
         result = login(request)
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
+
+    def test_confirm_email_post(self, *_):
+        """ send the email """
+        self.settings.require_confirm_email = True
+        self.settings.save()
+        view = views.ConfirmEmail.as_view()
+        models.SiteInvite.objects.create(
+            code="testcode", user=self.local_user, use_limit=1
+        )
+        request = self.factory.post("", {"code": "testcode"})
+        request.user = self.anonymous_user
+
+        result = view(request)
+        validate_html(result.render())
+
+    def test_resend_link(self, *_):
+        """ try again """
+        request = self.factory.post("", {"email": "mouse@mouse.com"})
+        request.user = self.anonymous_user
+        with patch("bookwyrm.emailing.send_email.delay") as mock:
+            views.resend_link(request)
+        self.assertEqual(mock.call_count, 1)

From 4a695ce61204af6121f40c2bff9ab3ac65069f33 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 11:17:34 -0700
Subject: [PATCH 150/193] Update environs to fix zillions of warnings

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

diff --git a/requirements.txt b/requirements.txt
index 2d79a475b..7cf1c68a0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ colorthief==0.2.1
 Django==3.2.5
 django-imagekit==4.0.2
 django-model-utils==4.0.0
-environs==7.2.0
+environs==9.3.4
 flower==0.9.4
 Markdown==3.3.3
 Pillow>=8.2.0

From 63163ca0fff29899b941162fe0f9f6cb039481c1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 11:23:45 -0700
Subject: [PATCH 151/193] Python formatting

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

diff --git a/bookwyrm/tests/views/test_register.py b/bookwyrm/tests/views/test_register.py
index 2c4906e9b..356d58693 100644
--- a/bookwyrm/tests/views/test_register.py
+++ b/bookwyrm/tests/views/test_register.py
@@ -346,7 +346,7 @@ class RegisterViews(TestCase):
         self.assertEqual(result.status_code, 302)
 
     def test_confirm_email_post(self, *_):
-        """ send the email """
+        """send the email"""
         self.settings.require_confirm_email = True
         self.settings.save()
         view = views.ConfirmEmail.as_view()
@@ -360,7 +360,7 @@ class RegisterViews(TestCase):
         validate_html(result.render())
 
     def test_resend_link(self, *_):
-        """ try again """
+        """try again"""
         request = self.factory.post("", {"email": "mouse@mouse.com"})
         request.user = self.anonymous_user
         with patch("bookwyrm.emailing.send_email.delay") as mock:

From 86824ff1cb0453650b8a9a346257c28e74572f8f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 11:32:51 -0700
Subject: [PATCH 152/193] Fixes path to invite page in admin view

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

diff --git a/bookwyrm/views/admin/invite.py b/bookwyrm/views/admin/invite.py
index 8a3db61a9..8fd68b705 100644
--- a/bookwyrm/views/admin/invite.py
+++ b/bookwyrm/views/admin/invite.py
@@ -81,7 +81,7 @@ class Invite(View):
             "invite": invite,
             "valid": invite.valid() if invite else True,
         }
-        return TemplateResponse(request, "invite.html", data)
+        return TemplateResponse(request, "landing/invite.html", data)
 
     # post handling is in views.register.Register
 

From 290039ac661a5095f6def3a88b39561e11e9ae5e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 11:45:55 -0700
Subject: [PATCH 153/193] Moves landing views into directory

---
 bookwyrm/views/__init__.py               | 10 ++++++----
 bookwyrm/views/landing/__init__.py       |  0
 bookwyrm/views/{ => landing}/landing.py  |  4 ++--
 bookwyrm/views/{ => landing}/login.py    |  0
 bookwyrm/views/{ => landing}/password.py |  0
 bookwyrm/views/{ => landing}/register.py |  0
 6 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/views/landing/__init__.py
 rename bookwyrm/views/{ => landing}/landing.py (93%)
 rename bookwyrm/views/{ => landing}/login.py (100%)
 rename bookwyrm/views/{ => landing}/password.py (100%)
 rename bookwyrm/views/{ => landing}/register.py (100%)

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 0ac231996..eeba88732 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,6 +32,12 @@ from .books.books import Book, upload_cover, add_description, resolve_book
 from .books.edit_book import EditBook, ConfirmEditBook
 from .books.editions import Editions, switch_edition
 
+# landing
+from .landing.landing import About, Home, Landing
+from .landing.login import Login, Logout
+from .landing.register import Register, ConfirmEmail, ConfirmEmailCode, resend_link
+from .landing.password import PasswordResetRequest, PasswordReset
+
 # misc views
 from .author import Author, EditAuthor
 from .directory import Directory
@@ -45,17 +51,13 @@ from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
 from .isbn import Isbn
-from .landing import About, Home, Landing
 from .list import Lists, SavedLists, List, Curate, UserLists
 from .list import save_list, unsave_list, delete_list
-from .login import Login, Logout
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import create_readthrough, delete_readthrough, delete_progressupdate
 from .reading import ReadingStatus
-from .register import Register, ConfirmEmail, ConfirmEmailCode, resend_link
 from .rss_feed import RssFeed
-from .password import PasswordResetRequest, PasswordReset
 from .search import Search
 from .shelf import Shelf
 from .shelf import create_shelf, delete_shelf
diff --git a/bookwyrm/views/landing/__init__.py b/bookwyrm/views/landing/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing/landing.py
similarity index 93%
rename from bookwyrm/views/landing.py
rename to bookwyrm/views/landing/landing.py
index 6f480b70f..c8bba0664 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing/landing.py
@@ -3,8 +3,8 @@ from django.template.response import TemplateResponse
 from django.views import View
 
 from bookwyrm import forms
-from .feed import Feed
-from . import helpers
+from bookwyrm.views import helpers
+from bookwyrm.views.feed import Feed
 
 
 # pylint: disable= no-self-use
diff --git a/bookwyrm/views/login.py b/bookwyrm/views/landing/login.py
similarity index 100%
rename from bookwyrm/views/login.py
rename to bookwyrm/views/landing/login.py
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/landing/password.py
similarity index 100%
rename from bookwyrm/views/password.py
rename to bookwyrm/views/landing/password.py
diff --git a/bookwyrm/views/register.py b/bookwyrm/views/landing/register.py
similarity index 100%
rename from bookwyrm/views/register.py
rename to bookwyrm/views/landing/register.py

From d735d03b5993712b262e4fff051ab6f1deb106f2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 11:58:51 -0700
Subject: [PATCH 154/193] Moves tests into subdirectory

---
 bookwyrm/tests/views/landing/__init__.py            | 1 +
 bookwyrm/tests/views/{ => landing}/test_landing.py  | 0
 bookwyrm/tests/views/{ => landing}/test_login.py    | 0
 bookwyrm/tests/views/{ => landing}/test_password.py | 0
 bookwyrm/tests/views/{ => landing}/test_register.py | 0
 5 files changed, 1 insertion(+)
 create mode 100644 bookwyrm/tests/views/landing/__init__.py
 rename bookwyrm/tests/views/{ => landing}/test_landing.py (100%)
 rename bookwyrm/tests/views/{ => landing}/test_login.py (100%)
 rename bookwyrm/tests/views/{ => landing}/test_password.py (100%)
 rename bookwyrm/tests/views/{ => landing}/test_register.py (100%)

diff --git a/bookwyrm/tests/views/landing/__init__.py b/bookwyrm/tests/views/landing/__init__.py
new file mode 100644
index 000000000..b6e690fd5
--- /dev/null
+++ b/bookwyrm/tests/views/landing/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/landing/test_landing.py
similarity index 100%
rename from bookwyrm/tests/views/test_landing.py
rename to bookwyrm/tests/views/landing/test_landing.py
diff --git a/bookwyrm/tests/views/test_login.py b/bookwyrm/tests/views/landing/test_login.py
similarity index 100%
rename from bookwyrm/tests/views/test_login.py
rename to bookwyrm/tests/views/landing/test_login.py
diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/landing/test_password.py
similarity index 100%
rename from bookwyrm/tests/views/test_password.py
rename to bookwyrm/tests/views/landing/test_password.py
diff --git a/bookwyrm/tests/views/test_register.py b/bookwyrm/tests/views/landing/test_register.py
similarity index 100%
rename from bookwyrm/tests/views/test_register.py
rename to bookwyrm/tests/views/landing/test_register.py

From 5b22cf8c462cce23575b492153b3c31b955c569b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 12:00:06 -0700
Subject: [PATCH 155/193] Updates mocks for new view locations

---
 bookwyrm/tests/views/landing/test_login.py    |  8 ++++----
 bookwyrm/tests/views/landing/test_password.py |  2 +-
 bookwyrm/tests/views/landing/test_register.py | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/tests/views/landing/test_login.py b/bookwyrm/tests/views/landing/test_login.py
index c37eaa514..b4261326a 100644
--- a/bookwyrm/tests/views/landing/test_login.py
+++ b/bookwyrm/tests/views/landing/test_login.py
@@ -58,7 +58,7 @@ class LoginViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.anonymous_user
 
-        with patch("bookwyrm.views.login.login"):
+        with patch("bookwyrm.views.landing.login.login"):
             result = view(request)
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
@@ -72,7 +72,7 @@ class LoginViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.anonymous_user
 
-        with patch("bookwyrm.views.login.login"):
+        with patch("bookwyrm.views.landing.login.login"):
             result = view(request)
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
@@ -86,7 +86,7 @@ class LoginViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.anonymous_user
 
-        with patch("bookwyrm.views.login.login"):
+        with patch("bookwyrm.views.landing.login.login"):
             result = view(request)
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
@@ -100,7 +100,7 @@ class LoginViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.anonymous_user
 
-        with patch("bookwyrm.views.login.login"):
+        with patch("bookwyrm.views.landing.login.login"):
             result = view(request)
         result.render()
         self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py
index dbfea2079..3ab8b1214 100644
--- a/bookwyrm/tests/views/landing/test_password.py
+++ b/bookwyrm/tests/views/landing/test_password.py
@@ -105,7 +105,7 @@ class PasswordViews(TestCase):
         view = views.PasswordReset.as_view()
         code = models.PasswordReset.objects.create(user=self.local_user)
         request = self.factory.post("", {"password": "hi", "confirm-password": "hi"})
-        with patch("bookwyrm.views.password.login"):
+        with patch("bookwyrm.views.landing.password.login"):
             resp = view(request, code.code)
         self.assertEqual(resp.status_code, 302)
         self.assertFalse(models.PasswordReset.objects.exists())
diff --git a/bookwyrm/tests/views/landing/test_register.py b/bookwyrm/tests/views/landing/test_register.py
index 356d58693..99f38da21 100644
--- a/bookwyrm/tests/views/landing/test_register.py
+++ b/bookwyrm/tests/views/landing/test_register.py
@@ -58,7 +58,7 @@ class RegisterViews(TestCase):
                 "email": "aa@bb.cccc",
             },
         )
-        with patch("bookwyrm.views.register.login"):
+        with patch("bookwyrm.views.landing.register.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
@@ -83,7 +83,7 @@ class RegisterViews(TestCase):
                 "email": "aa@bb.cccc",
             },
         )
-        with patch("bookwyrm.views.register.login"):
+        with patch("bookwyrm.views.landing.register.login"):
             response = view(request)
         self.assertEqual(response.status_code, 302)
         nutria = models.User.objects.get(localname="nutria")
@@ -101,7 +101,7 @@ class RegisterViews(TestCase):
             "register/",
             {"localname": "nutria ", "password": "mouseword", "email": "aa@bb.ccc"},
         )
-        with patch("bookwyrm.views.register.login"):
+        with patch("bookwyrm.views.landing.register.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
@@ -140,7 +140,7 @@ class RegisterViews(TestCase):
                 "invite_code": "testcode",
             },
         )
-        with patch("bookwyrm.views.register.login"):
+        with patch("bookwyrm.views.landing.register.login"):
             response = view(request)
         response = view(request)
         validate_html(response.render())
@@ -216,7 +216,7 @@ class RegisterViews(TestCase):
             "register/",
             {"localname": "nutria ", "password": "mouseword", "email": "aa@bleep.com"},
         )
-        with patch("bookwyrm.views.register.login"):
+        with patch("bookwyrm.views.landing.register.login"):
             result = view(request)
         self.assertEqual(result.status_code, 302)
         self.assertTrue(models.User.objects.filter(email="aa@bleep.com").exists())
@@ -240,7 +240,7 @@ class RegisterViews(TestCase):
                 "invite_code": "testcode",
             },
         )
-        with patch("bookwyrm.views.register.login"):
+        with patch("bookwyrm.views.landing.register.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)

From c852405e427c37b2a2ea743249a5f5b50b939e26 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 12:01:24 -0700
Subject: [PATCH 156/193] Moves invite tests

---
 bookwyrm/tests/views/{ => landing}/test_invite.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename bookwyrm/tests/views/{ => landing}/test_invite.py (100%)

diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/landing/test_invite.py
similarity index 100%
rename from bookwyrm/tests/views/test_invite.py
rename to bookwyrm/tests/views/landing/test_invite.py

From 8bdedc93044a18dc11365441a45db1786969c1cb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 12:03:42 -0700
Subject: [PATCH 157/193] Catches some stray unvalidated html in landing tests

---
 bookwyrm/tests/views/landing/test_login.py    | 5 +++--
 bookwyrm/tests/views/landing/test_password.py | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/tests/views/landing/test_login.py b/bookwyrm/tests/views/landing/test_login.py
index b4261326a..0f86fb791 100644
--- a/bookwyrm/tests/views/landing/test_login.py
+++ b/bookwyrm/tests/views/landing/test_login.py
@@ -7,6 +7,7 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 
 from bookwyrm import forms, models, views
+from bookwyrm.tests.validate_html import validate_html
 
 
 # pylint: disable=too-many-public-methods
@@ -41,7 +42,7 @@ class LoginViews(TestCase):
 
         result = login(request)
         self.assertIsInstance(result, TemplateResponse)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
         request.user = self.local_user
@@ -102,7 +103,7 @@ class LoginViews(TestCase):
 
         with patch("bookwyrm.views.landing.login.login"):
             result = view(request)
-        result.render()
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
         self.assertEqual(
             result.context_data["login_form"].non_field_errors,
diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py
index 3ab8b1214..f01565ef7 100644
--- a/bookwyrm/tests/views/landing/test_password.py
+++ b/bookwyrm/tests/views/landing/test_password.py
@@ -51,13 +51,13 @@ class PasswordViews(TestCase):
         view = views.PasswordResetRequest.as_view()
         resp = view(request)
         self.assertEqual(resp.status_code, 200)
-        resp.render()
+        validate_html(resp.render())
 
         request = self.factory.post("", {"email": "mouse@mouse.com"})
         request.user = self.anonymous_user
         with patch("bookwyrm.emailing.send_email.delay"):
             resp = view(request)
-        resp.render()
+        validate_html(resp.render())
 
         self.assertEqual(models.PasswordReset.objects.get().user, self.local_user)
 
@@ -116,7 +116,7 @@ class PasswordViews(TestCase):
         models.PasswordReset.objects.create(user=self.local_user)
         request = self.factory.post("", {"password": "hi", "confirm-password": "hi"})
         resp = view(request, "jhgdkfjgdf")
-        resp.render()
+        validate_html(resp.render())
         self.assertTrue(models.PasswordReset.objects.exists())
 
     def test_password_reset_mismatch(self):
@@ -125,5 +125,5 @@ class PasswordViews(TestCase):
         code = models.PasswordReset.objects.create(user=self.local_user)
         request = self.factory.post("", {"password": "hi", "confirm-password": "hihi"})
         resp = view(request, code.code)
-        resp.render()
+        validate_html(resp.render())
         self.assertTrue(models.PasswordReset.objects.exists())

From 5c29d646669f6a00e75ceadb47c2067bb530f365 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Oct 2021 12:24:39 -0700
Subject: [PATCH 158/193] Updates for Portuguese and Simplified Chinese locales

---
 locale/pt_BR/LC_MESSAGES/django.mo   | Bin 53833 -> 56440 bytes
 locale/pt_BR/LC_MESSAGES/django.po   | 114 ++++-------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 43563 -> 50813 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 294 ++++++++++++---------------
 4 files changed, 166 insertions(+), 242 deletions(-)

diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo
index 33fbeac246359d545462d897fd2305945c61c161..8dc869921a8dbc5749de6859d2bb30bf5dbdcac9 100644
GIT binary patch
delta 17901
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
OHM^;f@9#5R0{;swvYBuI

delta 16485
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
Al>h($

diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
index 6d7750b75..c02168e6f 100644
--- a/locale/pt_BR/LC_MESSAGES/django.po
+++ b/locale/pt_BR/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-15 22:03+0000\n"
-"PO-Revision-Date: 2021-10-13 16:42\n"
+"PO-Revision-Date: 2021-10-16 15:36\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt\n"
@@ -187,7 +187,7 @@ msgstr "Français (Francês)"
 
 #: bookwyrm/settings.py:169
 msgid "Português - Brasil (Brazilian Portuguese)"
-msgstr ""
+msgstr "Português - Brasil (Brazilian Portuguese)"
 
 #: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
@@ -752,10 +752,8 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#, fuzzy
-#| msgid "View status"
 msgid "Edit status"
-msgstr "Ver publicação"
+msgstr "Editar publicação"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -890,28 +888,24 @@ msgid "All known users"
 msgstr "Todos os usuários conhecidos"
 
 #: bookwyrm/templates/discover/card-header.html:9
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> quer ler <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> avaliou <a href=\"%(book_path)s\">%(book_title)s</a>"
 
 #: bookwyrm/templates/discover/card-header.html:13
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> quer ler <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> resenhou <a href=\"%(book_path)s\">%(book_title)s</a>"
 
 #: bookwyrm/templates/discover/card-header.html:17
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> quer ler <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> comentou sobre <a href=\"%(book_path)s\">%(book_title)s</a>"
 
 #: bookwyrm/templates/discover/card-header.html:21
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> quer ler <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> citou <a href=\"%(book_path)s\">%(book_title)s</a>"
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
@@ -942,7 +936,7 @@ msgstr "Confirmar email"
 #: bookwyrm/templates/email/confirm/html_content.html:15
 #, python-format
 msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
-msgstr "Ou insira o código \"<code>%(confirmation_code)s</code>\" ao fazer login."
+msgstr "Ou insira o código \"<code>%(confirmation_code)s</code>\" quando entrar."
 
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
@@ -951,7 +945,7 @@ msgstr "Por favor, confirme seu email"
 #: bookwyrm/templates/email/confirm/text_content.html:10
 #, python-format
 msgid "Or enter the code \"%(confirmation_code)s\" at login."
-msgstr "Ou insira o código \"%(confirmation_code)s\" ao fazer login."
+msgstr "Ou insira o código \"%(confirmation_code)s\" quando entrar."
 
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
@@ -978,10 +972,9 @@ msgid "Join Now"
 msgstr "Inscreva-se"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, fuzzy, python-format
-#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
-msgstr "Saiba mais <a href=\"https://%(domain)s%(about_path)s\">sobre esta instância</a>."
+msgstr "Saiba mais <a href=\"https://%(domain)s%(about_path)s\">sobre %(site_name)s</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
@@ -989,16 +982,15 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Você recebeu um convite para juntar-se a %(site_name)s! Clique no link abaixo para criar uma conta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy, python-format
-#| msgid "Learn more about this instance:"
+#, python-format
 msgid "Learn more about %(site_name)s:"
-msgstr "Saiba mais sobre esta instância:"
+msgstr "Saiba mais sobre %(site_name)s:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
 msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr "Você solicitou a redefinição de sua senha no %(site_name)s. Clique no link abaixo para definir uma nova senha e fazer login."
+msgstr "Você solicitou a redefinição de sua senha no %(site_name)s. Clique no link abaixo para definir uma nova senha e entrar no site."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -1346,8 +1338,6 @@ msgid "Imported"
 msgstr "Importado"
 
 #: bookwyrm/templates/import/tooltip.html:6
-#, fuzzy
-#| msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
 msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr "Você pode baixar seus dados do Goodreads na <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">página de Importar/Exportar</a> da sua conta."
 
@@ -1432,7 +1422,7 @@ msgstr "Menu de navegação principal"
 
 #: bookwyrm/templates/layout.html:72
 msgid "Feed"
-msgstr "Feed"
+msgstr "Novidades"
 
 #: bookwyrm/templates/layout.html:106
 msgid "Your Books"
@@ -1476,12 +1466,12 @@ msgstr "senha"
 
 #: bookwyrm/templates/layout.html:176 bookwyrm/templates/login.html:40
 msgid "Forgot your password?"
-msgstr "Esqueceu a senha?"
+msgstr "Esqueceu sua senha?"
 
 #: bookwyrm/templates/layout.html:179 bookwyrm/templates/login.html:7
 #: bookwyrm/templates/login.html:37
 msgid "Log in"
-msgstr "Fazer login"
+msgstr "Entrar"
 
 #: bookwyrm/templates/layout.html:187
 msgid "Join"
@@ -1738,26 +1728,22 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "compartilhou sua <a href=\"%(related_path)s\">publicação</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "curtiu sua <a href=\"%(related_path)s\">resenha de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "curtiu seu <a href=\"%(related_path)s\">comentário sobre<em>%(book_title)s</em></a>"
+msgstr "curtiu seu <a href=\"%(related_path)s\">comentário sobre <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "curtiu sua <a href=\"%(related_path)s\">citação de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr "curtiu sua <a href=\"%(related_path)s\">publicação</a>"
 
@@ -1910,7 +1896,7 @@ msgstr "Privacidade"
 
 #: bookwyrm/templates/preferences/edit_user.html:72
 msgid "Show reading goal prompt in feed:"
-msgstr "Mostrar sugestão de meta de leitura no feed:"
+msgstr "Mostrar sugestão de meta de leitura:"
 
 #: bookwyrm/templates/preferences/edit_user.html:76
 msgid "Show suggested users:"
@@ -1972,7 +1958,7 @@ msgstr "Adicionar livro manualmente"
 
 #: bookwyrm/templates/search/book.html:116
 msgid "Log in to import or add books."
-msgstr "Faça login para importar ou adicionar livros."
+msgstr "Entre para importar ou adicionar livros."
 
 #: bookwyrm/templates/search/layout.html:16
 msgid "Search query"
@@ -2125,7 +2111,7 @@ msgstr "Publicações"
 #: bookwyrm/templates/settings/dashboard/dashboard.html:33
 #: bookwyrm/templates/settings/dashboard/works_chart.html:11
 msgid "Works"
-msgstr ""
+msgstr "Obras"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:43
 #, python-format
@@ -2167,7 +2153,7 @@ msgstr "Publicações"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:118
 msgid "Works created"
-msgstr ""
+msgstr "Obras criadas"
 
 #: bookwyrm/templates/settings/dashboard/registration_chart.html:10
 msgid "Registrations"
@@ -2561,7 +2547,7 @@ msgstr "Comentários da moderação"
 #: bookwyrm/templates/settings/reports/report.html:41
 #: bookwyrm/templates/snippets/create_status.html:28
 msgid "Comment"
-msgstr "Comentário"
+msgstr "Comentar"
 
 #: bookwyrm/templates/settings/reports/report.html:46
 msgid "Reported statuses"
@@ -2647,10 +2633,8 @@ msgid "Short description:"
 msgstr "Descrição curta:"
 
 #: bookwyrm/templates/settings/site.html:37
-#, fuzzy
-#| msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
 msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
-msgstr "Mostrado quando a instância é vista em joinbookwyrm.com. Não compatível com HTML ou markdown."
+msgstr "Mostrado quando a instância é vista em joinbookwyrm.com. Não é compatível com HTML ou Markdown."
 
 #: bookwyrm/templates/settings/site.html:41
 msgid "Code of conduct:"
@@ -3155,7 +3139,7 @@ msgstr "Privacidade da meta:"
 #: bookwyrm/templates/snippets/goal_form.html:33
 #: bookwyrm/templates/snippets/reading_modals/layout.html:13
 msgid "Post to feed"
-msgstr "Publicar no feed"
+msgstr "Publicar"
 
 #: bookwyrm/templates/snippets/goal_form.html:37
 msgid "Set goal"
@@ -3164,7 +3148,7 @@ msgstr "Definir meta"
 #: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
-msgstr "%(percent)s%% completo!"
+msgstr "%(percent)s%% lá!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
@@ -3269,7 +3253,7 @@ msgstr "Progresso"
 
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
-msgstr "Se cadastrar"
+msgstr "Cadastrar"
 
 #: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
@@ -3343,10 +3327,9 @@ msgid "Hide status"
 msgstr "Esconder publicação"
 
 #: bookwyrm/templates/snippets/status/header.html:45
-#, fuzzy, python-format
-#| msgid "Joined %(date)s"
+#, python-format
 msgid "edited %(date)s"
-msgstr "Membro desde %(date)s"
+msgstr "editado em %(date)s"
 
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
@@ -3600,26 +3583,3 @@ msgstr "Um link para redefinição da senha foi enviado para {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr "Novas publicações de {obj.display_name}"
 
-#~ msgid "Compose status"
-#~ msgstr "Escrever publicação"
-
-#~ msgid "%(format)s"
-#~ msgstr "%(format)s"
-
-#~ msgid "rated"
-#~ msgstr "avaliado"
-
-#~ msgid "reviewed"
-#~ msgstr "resenhado"
-
-#~ msgid "commented on"
-#~ msgstr "comentado"
-
-#~ msgid "quoted"
-#~ msgstr "citou"
-
-#~ msgid "About this instance"
-#~ msgstr "Sobre esta instância"
-
-#~ msgid "Delete & re-draft"
-#~ msgstr "Excluir e rascunhar"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 1b4f013091128de18fd04ec9b9922fd77e7869cc..e245fa536cb6e94cf153492b07f0e101ed301a8d 100644
GIT binary patch
literal 50813
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
HFaQ4lBmQE#

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

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 23e19dd05..2a0707359 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-15 22:03+0000\n"
-"PO-Revision-Date: 2021-10-08 00:03\n"
+"PO-Revision-Date: 2021-10-16 14:36\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh\n"
@@ -40,7 +40,7 @@ msgstr "永不失效"
 #: bookwyrm/forms.py:263
 #, python-brace-format
 msgid "{i} uses"
-msgstr ""
+msgstr "{i} 次使用"
 
 #: bookwyrm/forms.py:264
 msgid "Unlimited"
@@ -74,51 +74,51 @@ msgstr "降序"
 
 #: bookwyrm/importers/importer.py:75
 msgid "Error loading book"
-msgstr ""
+msgstr "加载书籍时出错"
 
 #: bookwyrm/importers/importer.py:88
 msgid "Could not find a match for book"
-msgstr ""
+msgstr "找不到匹配的书"
 
 #: bookwyrm/models/base_model.py:17
 msgid "Pending"
-msgstr ""
+msgstr "待处理"
 
 #: bookwyrm/models/base_model.py:18
 msgid "Self deletion"
-msgstr ""
+msgstr "自我删除"
 
 #: bookwyrm/models/base_model.py:19
 msgid "Moderator suspension"
-msgstr ""
+msgstr "仲裁员停用"
 
 #: bookwyrm/models/base_model.py:20
 msgid "Moderator deletion"
-msgstr ""
+msgstr "仲裁员删除"
 
 #: bookwyrm/models/base_model.py:21
 msgid "Domain block"
-msgstr ""
+msgstr "域名屏蔽"
 
 #: bookwyrm/models/book.py:232
 msgid "Audiobook"
-msgstr ""
+msgstr "有声书籍"
 
 #: bookwyrm/models/book.py:233
 msgid "eBook"
-msgstr ""
+msgstr "电子书"
 
 #: bookwyrm/models/book.py:234
 msgid "Graphic novel"
-msgstr ""
+msgstr "图像小说"
 
 #: bookwyrm/models/book.py:235
 msgid "Hardcover"
-msgstr ""
+msgstr "硬封面"
 
 #: bookwyrm/models/book.py:236
 msgid "Paperback"
-msgstr ""
+msgstr "平装"
 
 #: bookwyrm/models/federated_server.py:11
 #: bookwyrm/templates/settings/federation/edit_instance.html:42
@@ -574,7 +574,7 @@ msgstr "语言:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:74
 msgid "Publication"
-msgstr ""
+msgstr "出版"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:77
 msgid "Publisher:"
@@ -626,7 +626,7 @@ msgstr "格式:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:177
 msgid "Format details:"
-msgstr ""
+msgstr "装订细节:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:187
 msgid "Pages:"
@@ -670,7 +670,7 @@ msgstr "语言:"
 
 #: bookwyrm/templates/book/editions/search_filter.html:5
 msgid "Search editions"
-msgstr ""
+msgstr "搜索版本"
 
 #: bookwyrm/templates/book/publisher_info.html:23
 #, python-format
@@ -748,13 +748,11 @@ msgstr "关闭"
 
 #: bookwyrm/templates/components/tooltip.html:3
 msgid "Help"
-msgstr ""
+msgstr "帮助"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#, fuzzy
-#| msgid "View status"
 msgid "Edit status"
-msgstr "浏览状态"
+msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -887,28 +885,24 @@ msgid "All known users"
 msgstr "所有已知用户"
 
 #: bookwyrm/templates/discover/card-header.html:9
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:13
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:17
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:21
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> 想要阅读 <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
@@ -975,10 +969,9 @@ msgid "Join Now"
 msgstr "立即加入"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, fuzzy, python-format
-#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
-msgstr "了解更多 <a href=\"https://%(domain)s%(about_path)s\">有关本实例的信息</a>。"
+msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
@@ -986,10 +979,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "你受邀请加入 %(site_name)s！点击下面的连接来创建帐号。"
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy, python-format
-#| msgid "Learn more about this instance:"
+#, python-format
 msgid "Learn more about %(site_name)s:"
-msgstr "了解更多有关本实例的信息:"
+msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
@@ -1091,11 +1083,11 @@ msgstr "可以关注的人"
 
 #: bookwyrm/templates/feed/suggested_users.html:9
 msgid "Don't show suggested users"
-msgstr ""
+msgstr "不显示推荐用户"
 
 #: bookwyrm/templates/feed/suggested_users.html:14
 msgid "View directory"
-msgstr ""
+msgstr "查看目录"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
@@ -1402,7 +1394,7 @@ msgstr "请求邀请"
 #: bookwyrm/templates/landing/layout.html:49
 #, python-format
 msgid "%(name)s registration is closed"
-msgstr ""
+msgstr "%(name)s 注册已关闭"
 
 #: bookwyrm/templates/landing/layout.html:60
 msgid "Thank you! Your request has been received."
@@ -1415,11 +1407,11 @@ msgstr "你的帐号"
 #: bookwyrm/templates/layout.html:13
 #, python-format
 msgid "%(site_name)s search"
-msgstr ""
+msgstr "%(site_name)s 搜索"
 
 #: bookwyrm/templates/layout.html:43
 msgid "Search for a book, user, or list"
-msgstr ""
+msgstr "搜索书籍、用户或列表"
 
 #: bookwyrm/templates/layout.html:61 bookwyrm/templates/layout.html:62
 msgid "Main navigation menu"
@@ -1484,11 +1476,11 @@ msgstr "加入"
 
 #: bookwyrm/templates/layout.html:221
 msgid "Successfully posted status"
-msgstr ""
+msgstr "成功发布的状态"
 
 #: bookwyrm/templates/layout.html:222
 msgid "Error posting status"
-msgstr ""
+msgstr "发布状态时出错"
 
 #: bookwyrm/templates/layout.html:234
 msgid "Contact site admin"
@@ -1509,7 +1501,7 @@ msgstr "BookWyrm 是开源软件。你可以在 <a href=\"https://github.com/mou
 
 #: bookwyrm/templates/lists/bookmark_button.html:30
 msgid "Un-save"
-msgstr ""
+msgstr "取消保存"
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
@@ -1552,11 +1544,11 @@ msgstr "削除"
 
 #: bookwyrm/templates/lists/delete_list_modal.html:4
 msgid "Delete this list?"
-msgstr ""
+msgstr "删除此列表？"
 
 #: bookwyrm/templates/lists/delete_list_modal.html:7
 msgid "This action cannot be un-done"
-msgstr ""
+msgstr "此操作无法被撤销"
 
 #: bookwyrm/templates/lists/delete_list_modal.html:15
 #: bookwyrm/templates/settings/announcements/announcement.html:20
@@ -1595,7 +1587,7 @@ msgstr "任何人都可以推荐书目、主题让你批准"
 #: bookwyrm/templates/lists/form.html:31
 msgctxt "curation type"
 msgid "Open"
-msgstr ""
+msgstr "开放"
 
 #: bookwyrm/templates/lists/form.html:32
 msgid "Anyone can add books to this list"
@@ -1603,7 +1595,7 @@ msgstr "任何人都可以向此列表中添加书目"
 
 #: bookwyrm/templates/lists/form.html:50
 msgid "Delete list"
-msgstr ""
+msgstr "删除列表"
 
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
@@ -1671,7 +1663,7 @@ msgstr "推荐"
 
 #: bookwyrm/templates/lists/list_items.html:15
 msgid "Saved"
-msgstr ""
+msgstr "已保存"
 
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
@@ -1679,11 +1671,11 @@ msgstr "你的列表"
 
 #: bookwyrm/templates/lists/lists.html:35
 msgid "All Lists"
-msgstr ""
+msgstr "所有列表"
 
 #: bookwyrm/templates/lists/lists.html:39
 msgid "Saved Lists"
-msgstr ""
+msgstr "保存的列表"
 
 #: bookwyrm/templates/login.html:4
 msgid "Login"
@@ -1705,12 +1697,12 @@ msgstr "更多关于本站点的信息"
 #: bookwyrm/templates/notifications/items/add.html:24
 #, python-format
 msgid "added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
+msgstr "添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 “<a href=\"%(list_path)s\">%(list_name)s</a>”"
 
 #: bookwyrm/templates/notifications/items/add.html:31
 #, python-format
 msgid "suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
+msgstr "建议了添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 “<a href=\"%(list_path)s\">%(list_name)s</a>” 中"
 
 #: bookwyrm/templates/notifications/items/boost.html:19
 #, python-format
@@ -1733,28 +1725,24 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "转发了你的 <a href=\"%(related_path)s\">状态</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "转发了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "喜欢了你 <a href=\"%(related_path)s\">来自 <em>%(book_title)s</em> 的引用</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">status</a>"
-msgstr "喜欢了你的 <a href=\"%(related_path)s\">状态</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/follow.html:15
 msgid "followed you"
@@ -1896,20 +1884,20 @@ msgstr "个人资料"
 #: bookwyrm/templates/preferences/edit_user.html:13
 #: bookwyrm/templates/preferences/edit_user.html:68
 msgid "Display preferences"
-msgstr ""
+msgstr "显示偏好"
 
 #: bookwyrm/templates/preferences/edit_user.html:14
 #: bookwyrm/templates/preferences/edit_user.html:106
 msgid "Privacy"
-msgstr ""
+msgstr "隐私"
 
 #: bookwyrm/templates/preferences/edit_user.html:72
 msgid "Show reading goal prompt in feed:"
-msgstr ""
+msgstr "在状态流中显示阅读目标提示:"
 
 #: bookwyrm/templates/preferences/edit_user.html:76
 msgid "Show suggested users:"
-msgstr ""
+msgstr "显示推荐用户:"
 
 #: bookwyrm/templates/preferences/edit_user.html:85
 #, python-format
@@ -2043,15 +2031,15 @@ msgstr "创建公告"
 
 #: bookwyrm/templates/settings/announcements/announcement_form.html:16
 msgid "Preview:"
-msgstr ""
+msgstr "预览:"
 
 #: bookwyrm/templates/settings/announcements/announcement_form.html:23
 msgid "Content:"
-msgstr ""
+msgstr "内容:"
 
 #: bookwyrm/templates/settings/announcements/announcement_form.html:30
 msgid "Event date:"
-msgstr ""
+msgstr "事件日期:"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:3
 #: bookwyrm/templates/settings/announcements/announcements.html:5
@@ -2095,122 +2083,122 @@ msgstr "停用"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:52
 msgid "No announcements found"
-msgstr ""
+msgstr "未找到公告"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:6
 #: bookwyrm/templates/settings/dashboard/dashboard.html:8
 #: bookwyrm/templates/settings/layout.html:26
 msgid "Dashboard"
-msgstr ""
+msgstr "仪表盘"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:15
 #: bookwyrm/templates/settings/dashboard/dashboard.html:100
 msgid "Total users"
-msgstr ""
+msgstr "用户总数"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:21
 #: bookwyrm/templates/settings/dashboard/user_chart.html:16
 msgid "Active this month"
-msgstr ""
+msgstr "今月活跃"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:27
 msgid "Statuses"
-msgstr ""
+msgstr "状态"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:33
 #: bookwyrm/templates/settings/dashboard/works_chart.html:11
 msgid "Works"
-msgstr ""
+msgstr "作品"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:43
 #, python-format
 msgid "%(display_count)s open report"
 msgid_plural "%(display_count)s open reports"
-msgstr[0] ""
+msgstr[0] "%(display_count)s 条待处理报告"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:54
 #, python-format
 msgid "%(display_count)s invite request"
 msgid_plural "%(display_count)s invite requests"
-msgstr[0] ""
+msgstr[0] "%(display_count)s 条邀请请求"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:65
 msgid "Instance Activity"
-msgstr ""
+msgstr "实例活动"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:83
 msgid "Interval:"
-msgstr ""
+msgstr "区段:"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:87
 msgid "Days"
-msgstr ""
+msgstr "天"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:88
 msgid "Weeks"
-msgstr ""
+msgstr "周"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:106
 msgid "User signup activity"
-msgstr ""
+msgstr "用户注册活动"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:112
 msgid "Status activity"
-msgstr ""
+msgstr "状态动态"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:118
 msgid "Works created"
-msgstr ""
+msgstr "创建的作品"
 
 #: bookwyrm/templates/settings/dashboard/registration_chart.html:10
 msgid "Registrations"
-msgstr ""
+msgstr "注册"
 
 #: bookwyrm/templates/settings/dashboard/status_chart.html:11
 msgid "Statuses posted"
-msgstr ""
+msgstr "发布的状态"
 
 #: bookwyrm/templates/settings/dashboard/user_chart.html:11
 msgid "Total"
-msgstr ""
+msgstr "总数"
 
 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10
 msgid "Add domain"
-msgstr ""
+msgstr "添加域名"
 
 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:11
 msgid "Domain:"
-msgstr ""
+msgstr "域名:"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7
 #: bookwyrm/templates/settings/layout.html:59
 msgid "Email Blocklist"
-msgstr ""
+msgstr "邮件屏蔽列表"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:18
 msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
-msgstr ""
+msgstr "当有人试图使用此域名的电子邮件注册时，帐户将不会被创建，但注册过程看起来会像是成功了的样子。"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:25
 msgid "Domain"
-msgstr ""
+msgstr "域名"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:29
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:27
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:38
 #, python-format
 msgid "%(display_count)s user"
 msgid_plural "%(display_count)s users"
-msgstr[0] ""
+msgstr[0] "%(display_count)s 名用户"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:59
 msgid "No email domains currently blocked"
-msgstr ""
+msgstr "目前没有屏蔽邮件域名"
 
 #: bookwyrm/templates/settings/federation/edit_instance.html:3
 #: bookwyrm/templates/settings/federation/edit_instance.html:6
@@ -2305,7 +2293,7 @@ msgstr "编辑"
 
 #: bookwyrm/templates/settings/federation/instance.html:79
 msgid "<em>No notes</em>"
-msgstr ""
+msgstr "<em>没有备注</em>"
 
 #: bookwyrm/templates/settings/federation/instance.html:94
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:8
@@ -2364,7 +2352,7 @@ msgstr "软件"
 
 #: bookwyrm/templates/settings/federation/instance_list.html:63
 msgid "No instances found"
-msgstr ""
+msgstr "未找到实例"
 
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11
@@ -2475,37 +2463,37 @@ msgstr "无有效的邀请"
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:5
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:10
 msgid "Add IP address"
-msgstr ""
+msgstr "添加 IP 地址"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:11
 msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
-msgstr ""
+msgstr "请谨慎使用 IP 地址屏蔽，并尽可能只使用暂时的屏蔽，因为 IP 地址常常被共享或变更。 如果您屏蔽了自己的 IP，您将无法访问此页面。"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:18
 msgid "IP Address:"
-msgstr ""
+msgstr "IP 地址:"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7
 #: bookwyrm/templates/settings/layout.html:63
 msgid "IP Address Blocklist"
-msgstr ""
+msgstr "IP 地址屏蔽列表"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:18
 msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
-msgstr ""
+msgstr "从此 IP 地址的所有尝试访问此应用的流量都将会收到 404 的答复。"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:24
 msgid "Address"
-msgstr ""
+msgstr "地址"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:46
 msgid "No IP addresses currently blocked"
-msgstr ""
+msgstr "目前没有屏蔽 IP 地址"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html:6
 msgid "You can block IP ranges using CIDR syntax."
-msgstr ""
+msgstr "你可以使用 CIDR 语法来进行 IP 段的屏蔽。"
 
 #: bookwyrm/templates/settings/layout.html:4
 msgid "Administration"
@@ -2517,7 +2505,7 @@ msgstr "管理用户"
 
 #: bookwyrm/templates/settings/layout.html:51
 msgid "Moderation"
-msgstr ""
+msgstr "仲裁"
 
 #: bookwyrm/templates/settings/layout.html:55
 #: bookwyrm/templates/settings/reports/reports.html:8
@@ -2636,7 +2624,7 @@ msgstr "实例描述:"
 
 #: bookwyrm/templates/settings/site.html:36
 msgid "Short description:"
-msgstr ""
+msgstr "简要描述:"
 
 #: bookwyrm/templates/settings/site.html:37
 msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
@@ -2700,21 +2688,21 @@ msgstr "注册关闭文字:"
 
 #: bookwyrm/templates/settings/site.html:124
 msgid "Invite request text:"
-msgstr ""
+msgstr "邀请请求文本:"
 
 #: bookwyrm/templates/settings/users/delete_user_form.html:5
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:31
 msgid "Permanently delete user"
-msgstr ""
+msgstr "永久删除用户"
 
 #: bookwyrm/templates/settings/users/delete_user_form.html:12
 #, python-format
 msgid "Are you sure you want to delete <strong>%(username)s</strong>'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion."
-msgstr ""
+msgstr "你确定要删除 <strong>%(username)s</strong> 的帐号吗？此操作不能被撤销。请输入你的密码确认删除操作以继续。"
 
 #: bookwyrm/templates/settings/users/delete_user_form.html:17
 msgid "Your password:"
-msgstr ""
+msgstr "你的密码:"
 
 #: bookwyrm/templates/settings/users/user.html:7
 msgid "Back to users"
@@ -2767,7 +2755,7 @@ msgstr "本站"
 
 #: bookwyrm/templates/settings/users/user_info.html:38
 msgid "Remote"
-msgstr ""
+msgstr "远端"
 
 #: bookwyrm/templates/settings/users/user_info.html:47
 msgid "User details"
@@ -2775,31 +2763,31 @@ msgstr "用户详情"
 
 #: bookwyrm/templates/settings/users/user_info.html:51
 msgid "Email:"
-msgstr ""
+msgstr "邮箱:"
 
 #: bookwyrm/templates/settings/users/user_info.html:61
 msgid "(View reports)"
-msgstr ""
+msgstr "（查看报告）"
 
 #: bookwyrm/templates/settings/users/user_info.html:67
 msgid "Blocked by count:"
-msgstr ""
+msgstr "被屏蔽次数:"
 
 #: bookwyrm/templates/settings/users/user_info.html:70
 msgid "Last active date:"
-msgstr ""
+msgstr "最后活跃日期:"
 
 #: bookwyrm/templates/settings/users/user_info.html:73
 msgid "Manually approved followers:"
-msgstr ""
+msgstr "手动批准关注者:"
 
 #: bookwyrm/templates/settings/users/user_info.html:76
 msgid "Discoverable:"
-msgstr ""
+msgstr "可发现:"
 
 #: bookwyrm/templates/settings/users/user_info.html:80
 msgid "Deactivation reason:"
-msgstr ""
+msgstr "停用原因:"
 
 #: bookwyrm/templates/settings/users/user_info.html:95
 msgid "Instance details"
@@ -2851,12 +2839,12 @@ msgstr "创建书架"
 #, python-format
 msgid "%(formatted_count)s book"
 msgid_plural "%(formatted_count)s books"
-msgstr[0] ""
+msgstr[0] "%(formatted_count)s 本书籍"
 
 #: bookwyrm/templates/shelf/shelf.html:84
 #, python-format
 msgid "(showing %(start)s-%(end)s)"
-msgstr ""
+msgstr "（正在显示 %(start)s 到 %(end)s）"
 
 #: bookwyrm/templates/shelf/shelf.html:96
 msgid "Edit shelf"
@@ -2960,7 +2948,7 @@ msgstr "内容"
 
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
 msgid "Content warning:"
-msgstr ""
+msgstr "内容警告:"
 
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
 msgid "Spoilers ahead!"
@@ -2997,15 +2985,15 @@ msgstr "摘自《%(book_title)s》的节录"
 
 #: bookwyrm/templates/snippets/create_status/quotation.html:32
 msgid "Position:"
-msgstr ""
+msgstr "位置:"
 
 #: bookwyrm/templates/snippets/create_status/quotation.html:45
 msgid "On page:"
-msgstr ""
+msgstr "页码:"
 
 #: bookwyrm/templates/snippets/create_status/quotation.html:51
 msgid "At percent:"
-msgstr ""
+msgstr "百分比:"
 
 #: bookwyrm/templates/snippets/create_status/review.html:25
 #, python-format
@@ -3086,7 +3074,7 @@ msgstr "没有评价"
 #, python-format
 msgid "%(half_rating)s star"
 msgid_plural "%(half_rating)s stars"
-msgstr[0] ""
+msgstr[0] "%(half_rating)s 星"
 
 #: bookwyrm/templates/snippets/form_rate_stars.html:64
 #: bookwyrm/templates/snippets/stars.html:7
@@ -3229,7 +3217,7 @@ msgstr "已完成阅读"
 
 #: bookwyrm/templates/snippets/reading_modals/form.html:9
 msgid "(Optional)"
-msgstr ""
+msgstr "(可选)"
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:50
@@ -3301,21 +3289,21 @@ msgstr "完成阅读"
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
 msgid "Content warning"
-msgstr ""
+msgstr "内容警告"
 
 #: bookwyrm/templates/snippets/status/content_status.html:79
 msgid "Show status"
-msgstr ""
+msgstr "显示状态"
 
 #: bookwyrm/templates/snippets/status/content_status.html:101
 #, python-format
 msgid "(Page %(page)s)"
-msgstr ""
+msgstr "（第 %(page)s 页）"
 
 #: bookwyrm/templates/snippets/status/content_status.html:103
 #, python-format
 msgid "(%(percent)s%%)"
-msgstr ""
+msgstr "（%(percent)s%%）"
 
 #: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
@@ -3323,13 +3311,12 @@ msgstr "在新窗口中打开图像"
 
 #: bookwyrm/templates/snippets/status/content_status.html:144
 msgid "Hide status"
-msgstr ""
+msgstr "隐藏状态"
 
 #: bookwyrm/templates/snippets/status/header.html:45
-#, fuzzy, python-format
-#| msgid "Joined %(date)s"
+#, python-format
 msgid "edited %(date)s"
-msgstr "在 %(date)s 加入"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
@@ -3577,28 +3564,5 @@ msgstr "密码重置连接已发送给 {email}"
 #: bookwyrm/views/rss_feed.py:35
 #, python-brace-format
 msgid "Status updates from {obj.display_name}"
-msgstr ""
+msgstr "{obj.display_name} 的状态更新"
 
-#~ msgid "Compose status"
-#~ msgstr "撰写状态"
-
-#~ msgid "%(format)s"
-#~ msgstr "%(format)s"
-
-#~ msgid "rated"
-#~ msgstr "评价了"
-
-#~ msgid "reviewed"
-#~ msgstr "写了书评给"
-
-#~ msgid "commented on"
-#~ msgstr "评论了"
-
-#~ msgid "quoted"
-#~ msgstr "引用了"
-
-#~ msgid "About this instance"
-#~ msgstr "关于本实例"
-
-#~ msgid "Delete & re-draft"
-#~ msgstr "删除并重新起草"

From 9116af1b3f9342c67a4d0c9c3c13af25eef2691f Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 17 Oct 2021 06:33:11 +1100
Subject: [PATCH 159/193] add makemigrations merge file

---
 ...07_auto_20211016_0639_0110_auto_20211015_1734.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bookwyrm/migrations/0111_merge_0107_auto_20211016_0639_0110_auto_20211015_1734.py

diff --git a/bookwyrm/migrations/0111_merge_0107_auto_20211016_0639_0110_auto_20211015_1734.py b/bookwyrm/migrations/0111_merge_0107_auto_20211016_0639_0110_auto_20211015_1734.py
new file mode 100644
index 000000000..f5f316c13
--- /dev/null
+++ b/bookwyrm/migrations/0111_merge_0107_auto_20211016_0639_0110_auto_20211015_1734.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.5 on 2021-10-16 19:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0107_auto_20211016_0639"),
+        ("bookwyrm", "0110_auto_20211015_1734"),
+    ]
+
+    operations = []

From ca47f836d12652ae2fe0c95f65a66db50c9372ef Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 17 Oct 2021 07:21:47 +1100
Subject: [PATCH 160/193] adjust Group test mocks

---
 bookwyrm/tests/models/test_group.py | 47 +++++++++++++++--------------
 bookwyrm/tests/views/test_group.py  | 13 ++------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/bookwyrm/tests/models/test_group.py b/bookwyrm/tests/models/test_group.py
index 59a0c018a..275fce196 100644
--- a/bookwyrm/tests/models/test_group.py
+++ b/bookwyrm/tests/models/test_group.py
@@ -69,22 +69,6 @@ class Group(TestCase):
             privacy="followers",
         )
 
-        self.followers_list = models.List.objects.create(
-            name="Followers List",
-            curation="group",
-            privacy="followers",
-            group=self.public_group,
-            user=self.owner_user,
-        )
-
-        self.private_list = models.List.objects.create(
-            name="Private List",
-            privacy="direct",
-            curation="group",
-            group=self.public_group,
-            user=self.owner_user,
-        )
-
         models.GroupMember.objects.create(group=self.private_group, user=self.badger)
         models.GroupMember.objects.create(
             group=self.followers_only_group, user=self.badger
@@ -112,21 +96,40 @@ class Group(TestCase):
     def test_group_members_can_see_followers_only_lists(self, _):
         """follower-only group booklists should not be excluded from group booklist listing for group members who do not follower list owner"""
 
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            followers_list = models.List.objects.create(
+                name="Followers List",
+                curation="group",
+                privacy="followers",
+                group=self.public_group,
+                user=self.owner_user,
+            )
+
         rat_lists = models.List.privacy_filter(self.rat).all()
         badger_lists = models.List.privacy_filter(self.badger).all()
         capybara_lists = models.List.privacy_filter(self.capybara).all()
 
-        self.assertFalse(self.followers_list in rat_lists)
-        self.assertFalse(self.followers_list in badger_lists)
-        self.assertTrue(self.followers_list in capybara_lists)
+        self.assertFalse(followers_list in rat_lists)
+        self.assertFalse(followers_list in badger_lists)
+        self.assertTrue(followers_list in capybara_lists)
 
     def test_group_members_can_see_private_lists(self, _):
         """private group booklists should not be excluded from group booklist listing for group members"""
 
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+
+            private_list = models.List.objects.create(
+                name="Private List",
+                privacy="direct",
+                curation="group",
+                group=self.public_group,
+                user=self.owner_user,
+            )
+
         rat_lists = models.List.privacy_filter(self.rat).all()
         badger_lists = models.List.privacy_filter(self.badger).all()
         capybara_lists = models.List.privacy_filter(self.capybara).all()
 
-        self.assertFalse(self.private_list in rat_lists)
-        self.assertFalse(self.private_list in badger_lists)
-        self.assertTrue(self.private_list in capybara_lists)
+        self.assertFalse(private_list in rat_lists)
+        self.assertFalse(private_list in badger_lists)
+        self.assertTrue(private_list in capybara_lists)
diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py
index e4084b525..c7e0a0f76 100644
--- a/bookwyrm/tests/views/test_group.py
+++ b/bookwyrm/tests/views/test_group.py
@@ -27,16 +27,6 @@ class GroupViews(TestCase):
                 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.testgroup = models.Group.objects.create(
                 name="Test Group",
@@ -70,7 +60,8 @@ class GroupViews(TestCase):
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
-    def test_findusers_get(self, _):
+    @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions")
+    def test_findusers_get(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.FindUsers.as_view()
         request = self.factory.get("")

From 9080cf1a6df4948fe26e4c06efb7cae5e194d36f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 10:22:15 -0700
Subject: [PATCH 161/193] Updates German locale

---
 locale/de_DE/LC_MESSAGES/django.mo | Bin 44764 -> 57128 bytes
 locale/de_DE/LC_MESSAGES/django.po | 467 +++++++++++++----------------
 2 files changed, 216 insertions(+), 251 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 0907655a21ebb14477d0e72251c2130be347e7b2..cff3c02e0f08cfd668de4985bdba3f4c87608ffb 100644
GIT binary patch
literal 57128
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
S=94M>zcK~?z_C=C9Q{Aby!7Y*

delta 15809
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
I^y3--59h<ZJpcdz

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index a143a313d..0d2861fb2 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-15 22:03+0000\n"
-"PO-Revision-Date: 2021-10-13 13:32\n"
+"PO-Revision-Date: 2021-10-20 16:40\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -90,11 +90,11 @@ msgstr "Selbstlöschung"
 
 #: bookwyrm/models/base_model.py:19
 msgid "Moderator suspension"
-msgstr "Moderator suspendieren"
+msgstr "Moderator*in suspendieren"
 
 #: bookwyrm/models/base_model.py:20
 msgid "Moderator deletion"
-msgstr "Moderatoren löschen"
+msgstr "Moderator*in löschen"
 
 #: bookwyrm/models/base_model.py:21
 msgid "Domain block"
@@ -187,7 +187,7 @@ msgstr "Français (Französisch)"
 
 #: bookwyrm/settings.py:169
 msgid "Português - Brasil (Brazilian Portuguese)"
-msgstr ""
+msgstr "Português (Portugiesisch)"
 
 #: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
@@ -296,7 +296,7 @@ msgstr "Name:"
 #: bookwyrm/templates/book/edit/edit_book_form.html:79
 #: bookwyrm/templates/book/edit/edit_book_form.html:124
 msgid "Separate multiple values with commas."
-msgstr "Geben Sie mehrere Werte durch Kommas getrennt ein."
+msgstr "Mehrere Werte durch Kommas getrennt eingeben."
 
 #: bookwyrm/templates/author/edit_author.html:50
 msgid "Bio:"
@@ -320,20 +320,20 @@ msgstr "Autor*innenidentifikatoren"
 
 #: bookwyrm/templates/author/edit_author.html:81
 msgid "Openlibrary key:"
-msgstr "Openlibrary Schlüssel:"
+msgstr "Openlibrary-Schlüssel:"
 
 #: bookwyrm/templates/author/edit_author.html:89
 #: bookwyrm/templates/book/edit/edit_book_form.html:224
 msgid "Inventaire ID:"
-msgstr "Inventaire ID:"
+msgstr "Inventaire-ID:"
 
 #: bookwyrm/templates/author/edit_author.html:97
 msgid "Librarything key:"
-msgstr "Librarything Schlüssel:"
+msgstr "Librarything-Schlüssel:"
 
 #: bookwyrm/templates/author/edit_author.html:105
 msgid "Goodreads key:"
-msgstr "Goodreads Schlüssel:"
+msgstr "Goodreads-Schlüssel:"
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:140
@@ -382,7 +382,7 @@ msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
-msgstr "Fehler beim Laden des Covers"
+msgstr "Fehler beim Laden des Titelbilds"
 
 #: bookwyrm/templates/book/book.html:117
 #, python-format
@@ -434,11 +434,11 @@ msgstr "Du hast keine Leseaktivität für dieses Buch."
 
 #: bookwyrm/templates/book/book.html:218
 msgid "Reviews"
-msgstr "Rezensionen"
+msgstr "Besprechungen"
 
 #: bookwyrm/templates/book/book.html:223
 msgid "Your reviews"
-msgstr "Deine Rezensionen"
+msgstr "Deine Besprechungen"
 
 #: bookwyrm/templates/book/book.html:229
 msgid "Your comments"
@@ -523,7 +523,7 @@ msgstr "Existiert \"%(name)s\" bereits als Autor:in?"
 #: bookwyrm/templates/book/edit/edit_book.html:64
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
-msgstr "Autor von <em>%(book_title)s</em>"
+msgstr "Autor*in von <em>%(book_title)s</em>"
 
 #: bookwyrm/templates/book/edit/edit_book.html:68
 msgid "This is a new author"
@@ -591,7 +591,7 @@ msgstr "Veröffentlichungsdatum:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:104
 msgid "Authors"
-msgstr "Autoren"
+msgstr "Autor*innen"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:112
 #, python-format
@@ -601,11 +601,11 @@ msgstr "%(name)s entfernen"
 #: bookwyrm/templates/book/edit/edit_book_form.html:115
 #, python-format
 msgid "Author page for %(name)s"
-msgstr "Autorenseite für %(name)s"
+msgstr "Autor*innenseite für %(name)s"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:122
 msgid "Add Authors:"
-msgstr "Autoren hinzufügen:"
+msgstr "Autor*innen hinzufügen:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:123
 msgid "John Doe, Jane Smith"
@@ -614,7 +614,7 @@ msgstr "Max Mustermann, Maria Musterfrau"
 #: bookwyrm/templates/book/edit/edit_book_form.html:132
 #: bookwyrm/templates/shelf/shelf.html:127
 msgid "Cover"
-msgstr "Einband"
+msgstr "Titelbild"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:161
 msgid "Physical Properties"
@@ -647,7 +647,7 @@ msgstr "ISBN 10:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:216
 msgid "Openlibrary ID:"
-msgstr "OpenLibrary ID:"
+msgstr "OpenLibrary-ID:"
 
 #: bookwyrm/templates/book/editions/editions.html:4
 #, python-format
@@ -686,7 +686,7 @@ msgstr "%(pages)s Seiten"
 #: bookwyrm/templates/book/publisher_info.html:38
 #, python-format
 msgid "%(languages)s language"
-msgstr "%(languages)s Sprache"
+msgstr "%(languages)s-sprachig"
 
 #: bookwyrm/templates/book/publisher_info.html:65
 #, python-format
@@ -696,7 +696,7 @@ msgstr "Am %(date)s von %(publisher)s veröffentlicht."
 #: bookwyrm/templates/book/publisher_info.html:67
 #, python-format
 msgid "Published %(date)s"
-msgstr "Erscheinungsdatum %(date)s"
+msgstr "Erschienen am %(date)s"
 
 #: bookwyrm/templates/book/publisher_info.html:69
 #, python-format
@@ -752,10 +752,8 @@ msgid "Help"
 msgstr "Hilfe"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#, fuzzy
-#| msgid "View status"
 msgid "Edit status"
-msgstr "Status ansehen"
+msgstr "Status bearbeiten"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -763,7 +761,7 @@ msgstr "E-Mail bestätigen"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:7
 msgid "Confirm your email address"
-msgstr "Bestätigen Sie Ihre E-Mail-Adresse"
+msgstr "Bestätige deine E-Mail-Adresse"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:13
 msgid "A confirmation code has been sent to the email address you used to register your account."
@@ -855,13 +853,13 @@ msgstr "Empfohlen"
 #: bookwyrm/templates/user/user_preview.html:16
 #: bookwyrm/templates/user/user_preview.html:17
 msgid "Locked account"
-msgstr "Gesperrter Account"
+msgstr "Gesperrtes Benutzer*inkonto"
 
 #: bookwyrm/templates/directory/user_card.html:40
 msgid "follower you follow"
 msgid_plural "followers you follow"
-msgstr[0] "gegenseitiger Follower"
-msgstr[1] "gegenseitige Followers"
+msgstr[0] "gegenseitige Follower*innen"
+msgstr[1] "gegenseitige Follower*innen"
 
 #: bookwyrm/templates/directory/user_card.html:47
 msgid "book on your shelves"
@@ -879,7 +877,7 @@ msgstr "zuletzt aktiv"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
 msgid "User type"
-msgstr "Art der Benutzer*innen"
+msgstr "Benutzer*in-Typ"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
 msgid "BookWyrm users"
@@ -890,28 +888,24 @@ msgid "All known users"
 msgstr "Alle bekannten Nutzer*innen"
 
 #: bookwyrm/templates/discover/card-header.html:9
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> hat <a href=\"%(book_path)s\">%(book_title)s bewertet</a>"
 
 #: bookwyrm/templates/discover/card-header.html:13
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> hat <a href=\"%(book_path)s\">%(book_title)s besprochen</a>"
 
 #: bookwyrm/templates/discover/card-header.html:17
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> hat <a href=\"%(book_path)s\">%(book_title)s kommentiert</a>"
 
 #: bookwyrm/templates/discover/card-header.html:21
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> hat <a href=\"%(book_path)s\">%(book_title)s zitiert</a>"
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
@@ -937,7 +931,7 @@ msgstr "Als letzten Schritt bevor du %(site_name)s beitrittst - bestätige bitte
 
 #: bookwyrm/templates/email/confirm/html_content.html:11
 msgid "Confirm Email"
-msgstr "E-Mail bestätigen"
+msgstr "E-Mail-Adresse bestätigen"
 
 #: bookwyrm/templates/email/confirm/html_content.html:15
 #, python-format
@@ -971,17 +965,16 @@ msgstr "E-Mail Einstellungen"
 #: bookwyrm/templates/email/invite/subject.html:2
 #, python-format
 msgid "You're invited to join %(site_name)s!"
-msgstr "Du bist eingeladen %(site_name)s beizutreten!"
+msgstr "Du bist eingeladen, %(site_name)s beizutreten!"
 
 #: bookwyrm/templates/email/invite/html_content.html:9
 msgid "Join Now"
 msgstr "Tritt jetzt bei"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, fuzzy, python-format
-#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
-msgstr "Erfahre mehr <a href=\"https://%(domain)s%(about_path)s\">über diese Instanz</a>."
+msgstr "Erfahre mehr <a href=\"https://%(domain)s%(about_path)s\">über %(site_name)s</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
@@ -989,10 +982,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Du bist eingeladen, %(site_name)s beizutreten! Klicke auf den Link unten um einen Account zu erstellen."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy, python-format
-#| msgid "Learn more about this instance:"
+#, python-format
 msgid "Learn more about %(site_name)s:"
-msgstr "Lerne mehr über diese Instanz:"
+msgstr "Erfahre mehr über %(site_name)s:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
@@ -1078,7 +1070,7 @@ msgstr "Zu lesen"
 #: bookwyrm/templates/feed/layout.html:26
 #: bookwyrm/templates/shelf/shelf.html:40
 msgid "Currently Reading"
-msgstr "Gegenwärtiger Lesestoff"
+msgstr "Lese ich gerade"
 
 #: bookwyrm/templates/feed/layout.html:27
 #: bookwyrm/templates/shelf/shelf.html:42
@@ -1142,7 +1134,7 @@ msgstr "Empfohlene Bücher"
 #: bookwyrm/templates/get_started/books.html:46
 #, python-format
 msgid "Popular on %(site_name)s"
-msgstr "Beliebt auf %(site_name)s"
+msgstr "Auf %(site_name)s beliebt"
 
 #: bookwyrm/templates/get_started/books.html:58
 #: bookwyrm/templates/lists/list.html:154
@@ -1187,7 +1179,7 @@ msgstr "Schritt überspringen"
 
 #: bookwyrm/templates/get_started/layout.html:49
 msgid "Finish"
-msgstr "Fertig stellen"
+msgstr "Fertigstellen"
 
 #: bookwyrm/templates/get_started/profile.html:15
 #: bookwyrm/templates/preferences/edit_user.html:42
@@ -1224,7 +1216,7 @@ msgstr "Dein Account wird im Verzeichnis gezeigt und möglicherweise anderen Use
 
 #: bookwyrm/templates/get_started/users.html:11
 msgid "Search for a user"
-msgstr "Nach Benutzer*in suchen"
+msgstr "Benutzer*in suchen"
 
 #: bookwyrm/templates/get_started/users.html:13
 #, python-format
@@ -1273,7 +1265,7 @@ msgstr "Importstatus"
 
 #: bookwyrm/templates/import/import_status.html:11
 msgid "Back to imports"
-msgstr ""
+msgstr "Zurück zu Importen"
 
 #: bookwyrm/templates/import/import_status.html:15
 msgid "Import started:"
@@ -1307,7 +1299,7 @@ msgstr "Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Im
 #: bookwyrm/templates/import/import_status.html:62
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
-msgstr ""
+msgstr "Zeile %(index)s: <strong>%(title)s</strong> von %(author)s"
 
 #: bookwyrm/templates/import/import_status.html:82
 msgid "Select all"
@@ -1323,7 +1315,7 @@ msgstr "Erfolgreich importiert"
 
 #: bookwyrm/templates/import/import_status.html:114
 msgid "Import Progress"
-msgstr ""
+msgstr "Import-Fortschritt"
 
 #: bookwyrm/templates/import/import_status.html:119
 msgid "Book"
@@ -1346,10 +1338,8 @@ msgid "Imported"
 msgstr "Importiert"
 
 #: bookwyrm/templates/import/tooltip.html:6
-#, fuzzy
-#| msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
 msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
-msgstr "Du kannst dir deine GoodReads Daten von <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> in deinem GoodReads Account runterladen."
+msgstr "Du kannst deine Goodreads-Daten von der <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export-Seite</a> deines Goodreads-Kontos downloaden."
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
 #: bookwyrm/templates/login.html:49
@@ -1393,7 +1383,7 @@ msgstr "Freundlich"
 
 #: bookwyrm/templates/landing/layout.html:29
 msgid "Anti-Corporate"
-msgstr "Unkommerziell"
+msgstr "Nichtkommerziell"
 
 #: bookwyrm/templates/landing/layout.html:45
 #, python-format
@@ -1407,7 +1397,7 @@ msgstr "Einladung beantragen"
 #: bookwyrm/templates/landing/layout.html:49
 #, python-format
 msgid "%(name)s registration is closed"
-msgstr "%(name)s Registrierung ist geschlossen"
+msgstr "%(name)s erlaubt keine Selbtregistrierung"
 
 #: bookwyrm/templates/landing/layout.html:60
 msgid "Thank you! Your request has been received."
@@ -1420,11 +1410,11 @@ msgstr "Dein Account"
 #: bookwyrm/templates/layout.html:13
 #, python-format
 msgid "%(site_name)s search"
-msgstr "%(site_name)s Suche"
+msgstr "%(site_name)s-Suche"
 
 #: bookwyrm/templates/layout.html:43
 msgid "Search for a book, user, or list"
-msgstr "Nach einem Buch, einem Benutzer oder einer Liste suchen"
+msgstr "Nach einem Buch, einem*r Benutzer*in oder einer Liste suchen"
 
 #: bookwyrm/templates/layout.html:61 bookwyrm/templates/layout.html:62
 msgid "Main navigation menu"
@@ -1452,7 +1442,7 @@ msgstr "Einladungen"
 
 #: bookwyrm/templates/layout.html:132
 msgid "Admin"
-msgstr "Administrator"
+msgstr "Administration"
 
 #: bookwyrm/templates/layout.html:139
 msgid "Log out"
@@ -1468,7 +1458,7 @@ msgstr "Benachrichtigungen"
 #: bookwyrm/templates/login.html:21
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
-msgstr "Benutzername:"
+msgstr "Benutzer*inname:"
 
 #: bookwyrm/templates/layout.html:175
 msgid "password"
@@ -1489,7 +1479,7 @@ msgstr "Beitreten"
 
 #: bookwyrm/templates/layout.html:221
 msgid "Successfully posted status"
-msgstr "Status erfolgreich veröffentlicht"
+msgstr "Status veröffentlicht"
 
 #: bookwyrm/templates/layout.html:222
 msgid "Error posting status"
@@ -1715,7 +1705,7 @@ msgstr "<em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"
 #: bookwyrm/templates/notifications/items/add.html:31
 #, python-format
 msgid "suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr "<em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" vorgeschlagen"
+msgstr "hat vorgeschlagen, <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste „<a href=\"%(list_path)s\">%(list_name)s</a>“ hinzuzufügen"
 
 #: bookwyrm/templates/notifications/items/boost.html:19
 #, python-format
@@ -1738,26 +1728,22 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> favorisiert"
+msgstr "hat deine <a href=\"%(related_path)s\">Besprechung von <em>%(book_title)s</em> favorisiert</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "favorisierte deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></a>"
+msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em> favorisiert</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> favorisiert"
+msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em> favorisiert</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
@@ -1825,7 +1811,7 @@ msgstr "Benachrichtigungen löschen"
 
 #: bookwyrm/templates/notifications/notifications_page.html:29
 msgid "All"
-msgstr "Alle"
+msgstr "Alle(s)"
 
 #: bookwyrm/templates/notifications/notifications_page.html:33
 msgid "Mentions"
@@ -1876,7 +1862,7 @@ msgstr "Neues Passwort:"
 #: bookwyrm/templates/preferences/layout.html:24
 #: bookwyrm/templates/settings/users/delete_user_form.html:23
 msgid "Delete Account"
-msgstr "Account löschen"
+msgstr "Benutzer*inkonto löschen"
 
 #: bookwyrm/templates/preferences/delete_user.html:12
 msgid "Permanently delete account"
@@ -1910,7 +1896,7 @@ msgstr "Privatsphäre"
 
 #: bookwyrm/templates/preferences/edit_user.html:72
 msgid "Show reading goal prompt in feed:"
-msgstr "Zeige Lesezielabfrage im Feed:"
+msgstr "Zeige Leseziel-Abfrage im Feed:"
 
 #: bookwyrm/templates/preferences/edit_user.html:76
 msgid "Show suggested users:"
@@ -1931,7 +1917,7 @@ msgstr "Voreinstellung für Beitragssichtbarkeit:"
 
 #: bookwyrm/templates/preferences/layout.html:11
 msgid "Account"
-msgstr "Account"
+msgstr "Benutzer*inkonto"
 
 #: bookwyrm/templates/preferences/layout.html:27
 msgid "Relationships"
@@ -1950,7 +1936,7 @@ msgstr "\"%(book_title)s\" beginnen"
 #: bookwyrm/templates/reading_progress/want.html:5
 #, python-format
 msgid "Want to Read \"%(book_title)s\""
-msgstr ""
+msgstr "\"%(book_title)s\" auf Leseliste setzen"
 
 #: bookwyrm/templates/search/book.html:47
 #: bookwyrm/templates/settings/reports/reports.html:25
@@ -1964,7 +1950,7 @@ msgstr "Buch importieren"
 
 #: bookwyrm/templates/search/book.html:107
 msgid "Load results from other catalogues"
-msgstr ""
+msgstr "Ergebnisse aus anderen Katalogen laden"
 
 #: bookwyrm/templates/search/book.html:111
 msgid "Manually add book"
@@ -1980,7 +1966,7 @@ msgstr "Suchanfrage"
 
 #: bookwyrm/templates/search/layout.html:19
 msgid "Search type"
-msgstr ""
+msgstr "Suchart"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
@@ -1995,7 +1981,7 @@ msgstr "Benutzer*innen"
 #: bookwyrm/templates/search/layout.html:58
 #, python-format
 msgid "No results found for \"%(query)s\""
-msgstr "Für \"%(query)s\" wurden keine Ergebnisse gefunden"
+msgstr "Keine Ergebnisse für „%(query)s“ gefunden"
 
 #: bookwyrm/templates/settings/announcements/announcement.html:3
 #: bookwyrm/templates/settings/announcements/announcement.html:6
@@ -2028,18 +2014,18 @@ msgstr "Nein"
 #: bookwyrm/templates/settings/announcements/announcement_form.html:40
 #: bookwyrm/templates/settings/dashboard/dashboard.html:71
 msgid "Start date:"
-msgstr ""
+msgstr "Startdatum:"
 
 #: bookwyrm/templates/settings/announcements/announcement.html:54
 #: bookwyrm/templates/settings/announcements/announcement_form.html:49
 #: bookwyrm/templates/settings/dashboard/dashboard.html:77
 msgid "End date:"
-msgstr ""
+msgstr "Enddatum:"
 
 #: bookwyrm/templates/settings/announcements/announcement.html:60
 #: bookwyrm/templates/settings/announcements/announcement_form.html:58
 msgid "Active:"
-msgstr ""
+msgstr "Aktiv:"
 
 #: bookwyrm/templates/settings/announcements/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements/announcements.html:8
@@ -2056,7 +2042,7 @@ msgstr "Inhalt:"
 
 #: bookwyrm/templates/settings/announcements/announcement_form.html:30
 msgid "Event date:"
-msgstr ""
+msgstr "Ereignisdatum:"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:3
 #: bookwyrm/templates/settings/announcements/announcements.html:5
@@ -2075,11 +2061,11 @@ msgstr "Vorschau"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:30
 msgid "Start date"
-msgstr ""
+msgstr "Startdatum"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:34
 msgid "End date"
-msgstr ""
+msgstr "Enddatum"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:38
 #: bookwyrm/templates/settings/federation/instance_list.html:46
@@ -2092,11 +2078,11 @@ msgstr "Status"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:48
 msgid "active"
-msgstr ""
+msgstr "aktiv"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:48
 msgid "inactive"
-msgstr ""
+msgstr "inaktiv"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:52
 msgid "No announcements found"
@@ -2111,7 +2097,7 @@ msgstr "Übersicht"
 #: bookwyrm/templates/settings/dashboard/dashboard.html:15
 #: bookwyrm/templates/settings/dashboard/dashboard.html:100
 msgid "Total users"
-msgstr ""
+msgstr "Benutzer*innen insgesamt"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:21
 #: bookwyrm/templates/settings/dashboard/user_chart.html:16
@@ -2120,12 +2106,12 @@ msgstr "Diesen Monat aktiv"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:27
 msgid "Statuses"
-msgstr "Statusse"
+msgstr "Statusmeldungen"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:33
 #: bookwyrm/templates/settings/dashboard/works_chart.html:11
 msgid "Works"
-msgstr ""
+msgstr "Werke"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:43
 #, python-format
@@ -2159,11 +2145,11 @@ msgstr "Wochen"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:106
 msgid "User signup activity"
-msgstr ""
+msgstr "Neuanmeldungen"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:112
 msgid "Status activity"
-msgstr ""
+msgstr "Statusaktivitäten"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:118
 msgid "Works created"
@@ -2171,15 +2157,15 @@ msgstr "Erstellte Werke"
 
 #: bookwyrm/templates/settings/dashboard/registration_chart.html:10
 msgid "Registrations"
-msgstr "Anmeldungen"
+msgstr "Registrierungen"
 
 #: bookwyrm/templates/settings/dashboard/status_chart.html:11
 msgid "Statuses posted"
-msgstr "Statusse veröffentlicht"
+msgstr "Statusmeldungen veröffentlicht"
 
 #: bookwyrm/templates/settings/dashboard/user_chart.html:11
 msgid "Total"
-msgstr ""
+msgstr "Gesamt"
 
 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10
@@ -2188,13 +2174,13 @@ msgstr "Domain hinzufügen"
 
 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:11
 msgid "Domain:"
-msgstr ""
+msgstr "Domain:"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7
 #: bookwyrm/templates/settings/layout.html:59
 msgid "Email Blocklist"
-msgstr "E-Mail-Blockliste"
+msgstr "E-Mail-Sperrliste"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:18
 msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
@@ -2202,12 +2188,12 @@ msgstr "Wenn sich jemand mit einer E-Mail-Adresse von dieser Domain zu registrie
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:25
 msgid "Domain"
-msgstr ""
+msgstr "Domain"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:29
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:27
 msgid "Options"
-msgstr ""
+msgstr "Optionen"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:38
 #, python-format
@@ -2218,7 +2204,7 @@ msgstr[1] "%(display_count)s Benutzer*innen"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:59
 msgid "No email domains currently blocked"
-msgstr ""
+msgstr "Derzeit sind keine E-Mail-Domains gesperrt"
 
 #: bookwyrm/templates/settings/federation/edit_instance.html:3
 #: bookwyrm/templates/settings/federation/edit_instance.html:6
@@ -2233,12 +2219,12 @@ msgstr "Instanz hinzufügen"
 #: bookwyrm/templates/settings/federation/edit_instance.html:7
 #: bookwyrm/templates/settings/federation/instance_blocklist.html:7
 msgid "Back to instance list"
-msgstr "Zurück zur Instanzliste"
+msgstr "Zurück zur Instanzenliste"
 
 #: bookwyrm/templates/settings/federation/edit_instance.html:16
 #: bookwyrm/templates/settings/federation/instance_blocklist.html:16
 msgid "Import block list"
-msgstr "Blockliste importieren"
+msgstr "Sperrliste importieren"
 
 #: bookwyrm/templates/settings/federation/edit_instance.html:30
 msgid "Instance:"
@@ -2264,7 +2250,7 @@ msgstr "Version:"
 
 #: bookwyrm/templates/settings/federation/edit_instance.html:70
 msgid "Notes:"
-msgstr "Hinweise:"
+msgstr "Anmerkungen:"
 
 #: bookwyrm/templates/settings/federation/instance.html:19
 msgid "Details"
@@ -2277,7 +2263,7 @@ msgstr "Aktivität"
 
 #: bookwyrm/templates/settings/federation/instance.html:38
 msgid "Users:"
-msgstr "Benutzer:"
+msgstr "Benutzer*innen:"
 
 #: bookwyrm/templates/settings/federation/instance.html:41
 #: bookwyrm/templates/settings/federation/instance.html:47
@@ -2291,20 +2277,20 @@ msgstr "Meldungen:"
 
 #: bookwyrm/templates/settings/federation/instance.html:50
 msgid "Followed by us:"
-msgstr ""
+msgstr "Folgen wir:"
 
 #: bookwyrm/templates/settings/federation/instance.html:55
 msgid "Followed by them:"
-msgstr ""
+msgstr "Folgen:"
 
 #: bookwyrm/templates/settings/federation/instance.html:60
 msgid "Blocked by us:"
-msgstr ""
+msgstr "Von uns gesperrt:"
 
 #: bookwyrm/templates/settings/federation/instance.html:72
 #: bookwyrm/templates/settings/users/user_info.html:110
 msgid "Notes"
-msgstr "Hinweise"
+msgstr "Anmerkungen"
 
 #: bookwyrm/templates/settings/federation/instance.html:75
 #: bookwyrm/templates/snippets/status/status_options.html:24
@@ -2313,34 +2299,34 @@ msgstr "Ändern"
 
 #: bookwyrm/templates/settings/federation/instance.html:79
 msgid "<em>No notes</em>"
-msgstr ""
+msgstr "<em>Keine Anmerkungen</em>"
 
 #: bookwyrm/templates/settings/federation/instance.html:94
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:8
 msgid "Actions"
-msgstr ""
+msgstr "Aktionen"
 
 #: bookwyrm/templates/settings/federation/instance.html:98
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
-msgstr "Blockieren"
+msgstr "Sperren"
 
 #: bookwyrm/templates/settings/federation/instance.html:99
 msgid "All users from this instance will be deactivated."
-msgstr "Alle Benutzer dieser Instanz werden deaktiviert."
+msgstr "Alle Benutzer*innen dieser Instanz werden deaktiviert."
 
 #: bookwyrm/templates/settings/federation/instance.html:104
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
-msgstr "Entblocken"
+msgstr "Entsperren"
 
 #: bookwyrm/templates/settings/federation/instance.html:105
 msgid "All users from this instance will be re-activated."
-msgstr "Alle Benutzer dieser Instanz werden wieder aktiviert."
+msgstr "Alle Benutzer*innen dieser Instanz werden wieder aktiviert."
 
 #: bookwyrm/templates/settings/federation/instance_blocklist.html:6
 msgid "Import Blocklist"
-msgstr "Blockliste importieren"
+msgstr "Sperrliste importieren"
 
 #: bookwyrm/templates/settings/federation/instance_blocklist.html:26
 #: bookwyrm/templates/snippets/goal_progress.html:7
@@ -2349,7 +2335,7 @@ msgstr "Erfolg!"
 
 #: bookwyrm/templates/settings/federation/instance_blocklist.html:30
 msgid "Successfully blocked:"
-msgstr "Erfolgreich blockiert:"
+msgstr "Erfolgreich gesperrt:"
 
 #: bookwyrm/templates/settings/federation/instance_blocklist.html:32
 msgid "Failed:"
@@ -2391,7 +2377,7 @@ msgstr "Datum der Anfrage"
 
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:39
 msgid "Date accepted"
-msgstr "Datum der Annahme"
+msgstr "Datum der Bestätigung"
 
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:42
 msgid "Email"
@@ -2408,7 +2394,7 @@ msgstr "Keine Anfragen"
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/invites/status_filter.html:16
 msgid "Accepted"
-msgstr "Akzeptiert"
+msgstr "Bestätigt"
 
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:61
 #: bookwyrm/templates/settings/invites/status_filter.html:12
@@ -2438,7 +2424,7 @@ msgstr "Un-ignorieren"
 
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:108
 msgid "Back to pending requests"
-msgstr "Keine ausstehenden Anfragen"
+msgstr "Zurück zu ausstehenden Anfragen"
 
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:110
 msgid "View ignored requests"
@@ -2487,7 +2473,7 @@ msgstr "IP-Adresse hinzufügen"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:11
 msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
-msgstr ""
+msgstr "Lass bei der Sperrung von IP-Adressen Vorsicht walten. Erwäge, IP-Adressen nur vorübergehend zu sperren, da sie oft geteilt werden oder neu zugeordnet werden. Wenn du deine eigene IP blockierst, kannst du nicht mehr auf diese Seite zugreifen."
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:18
 msgid "IP Address:"
@@ -2497,27 +2483,27 @@ msgstr "IP-Adresse:"
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7
 #: bookwyrm/templates/settings/layout.html:63
 msgid "IP Address Blocklist"
-msgstr ""
+msgstr "IP-Addressen-Sperrliste"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:18
 msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
-msgstr ""
+msgstr "Jeder Datenverkehr von dieser IP-Adresse erhält eine 404-Antwort, wenn versucht wird, auf einen beliebigen Teil der Anwendung zuzugreifen."
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:24
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:46
 msgid "No IP addresses currently blocked"
-msgstr ""
+msgstr "Derzeit sind keine IP-Adressen gesperrt"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html:6
 msgid "You can block IP ranges using CIDR syntax."
-msgstr ""
+msgstr "Du kannst IP-Bereiche mittels CIDR-Syntax blockieren."
 
 #: bookwyrm/templates/settings/layout.html:4
 msgid "Administration"
-msgstr ""
+msgstr "Administration"
 
 #: bookwyrm/templates/settings/layout.html:29
 msgid "Manage Users"
@@ -2525,7 +2511,7 @@ msgstr "Nutzer*innen verwalten"
 
 #: bookwyrm/templates/settings/layout.html:51
 msgid "Moderation"
-msgstr ""
+msgstr "Moderation"
 
 #: bookwyrm/templates/settings/layout.html:55
 #: bookwyrm/templates/settings/reports/reports.html:8
@@ -2565,7 +2551,7 @@ msgstr "Kommentieren"
 
 #: bookwyrm/templates/settings/reports/report.html:46
 msgid "Reported statuses"
-msgstr ""
+msgstr "Gemeldete Statusmeldungen"
 
 #: bookwyrm/templates/settings/reports/report.html:48
 msgid "No statuses reported"
@@ -2573,7 +2559,7 @@ msgstr "Keine Beiträge gemeldet"
 
 #: bookwyrm/templates/settings/reports/report.html:54
 msgid "Status has been deleted"
-msgstr ""
+msgstr "Statusmeldung gelöscht"
 
 #: bookwyrm/templates/settings/reports/report_preview.html:13
 msgid "No notes provided"
@@ -2604,11 +2590,11 @@ msgstr "Meldungen: <small>%(instance_name)s</small>"
 
 #: bookwyrm/templates/settings/reports/reports.html:28
 msgid "Resolved"
-msgstr ""
+msgstr "Behoben"
 
 #: bookwyrm/templates/settings/reports/reports.html:37
 msgid "No reports found."
-msgstr ""
+msgstr "Keine Meldungen gefunden."
 
 #: bookwyrm/templates/settings/site.html:10
 #: bookwyrm/templates/settings/site.html:21
@@ -2636,7 +2622,7 @@ msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/site.html:28
 msgid "Tagline:"
-msgstr ""
+msgstr "Motto:"
 
 #: bookwyrm/templates/settings/site.html:32
 msgid "Instance description:"
@@ -2644,15 +2630,15 @@ msgstr "Instanzbeschreibung"
 
 #: bookwyrm/templates/settings/site.html:36
 msgid "Short description:"
-msgstr ""
+msgstr "Kurzbeschreibung:"
 
 #: bookwyrm/templates/settings/site.html:37
 msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
-msgstr ""
+msgstr "Wird verwendet, wenn die Instanz auf joinbookwyrm.com in der Vorschau angezeigt wird. Unterstützt weder HTML noch Markdown."
 
 #: bookwyrm/templates/settings/site.html:41
 msgid "Code of conduct:"
-msgstr ""
+msgstr "Verhaltenskodex:"
 
 #: bookwyrm/templates/settings/site.html:45
 msgid "Privacy Policy:"
@@ -2680,7 +2666,7 @@ msgstr "Unterstützungstitel"
 
 #: bookwyrm/templates/settings/site.html:85
 msgid "Admin email:"
-msgstr ""
+msgstr "E-Mail-Adresse des*r Administrator*in:"
 
 #: bookwyrm/templates/settings/site.html:89
 msgid "Additional info:"
@@ -2688,11 +2674,11 @@ msgstr "Zusätzliche Info:"
 
 #: bookwyrm/templates/settings/site.html:103
 msgid "Allow registration"
-msgstr ""
+msgstr "Selbstregistrierung zulassen"
 
 #: bookwyrm/templates/settings/site.html:109
 msgid "Allow invite requests"
-msgstr ""
+msgstr "Einladungsanfragen zulassen"
 
 #: bookwyrm/templates/settings/site.html:115
 msgid "Require users to confirm email address"
@@ -2708,7 +2694,7 @@ msgstr "Registrierungen geschlossen text"
 
 #: bookwyrm/templates/settings/site.html:124
 msgid "Invite request text:"
-msgstr ""
+msgstr "Hinweis für Einladungsanfragen:"
 
 #: bookwyrm/templates/settings/users/delete_user_form.html:5
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:31
@@ -2726,21 +2712,21 @@ msgstr "Dein Passwort:"
 
 #: bookwyrm/templates/settings/users/user.html:7
 msgid "Back to users"
-msgstr ""
+msgstr "Zurück zu Benutzer*innen"
 
 #: bookwyrm/templates/settings/users/user_admin.html:7
 #, python-format
 msgid "Users: <small>%(instance_name)s</small>"
-msgstr ""
+msgstr "Benutzer*innen: <small>%(instance_name)s</small>"
 
 #: bookwyrm/templates/settings/users/user_admin.html:22
 #: bookwyrm/templates/settings/users/username_filter.html:5
 msgid "Username"
-msgstr "Benutzername"
+msgstr "Benutzer*inname"
 
 #: bookwyrm/templates/settings/users/user_admin.html:26
 msgid "Date Added"
-msgstr ""
+msgstr "Hinzugefügt am"
 
 #: bookwyrm/templates/settings/users/user_admin.html:30
 msgid "Last Active"
@@ -2748,12 +2734,12 @@ msgstr "Zuletzt aktiv"
 
 #: bookwyrm/templates/settings/users/user_admin.html:38
 msgid "Remote instance"
-msgstr ""
+msgstr "Entfernte Instanz"
 
 #: bookwyrm/templates/settings/users/user_admin.html:47
 #: bookwyrm/templates/settings/users/user_info.html:24
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #: bookwyrm/templates/settings/users/user_admin.html:47
 #: bookwyrm/templates/settings/users/user_info.html:28
@@ -2767,7 +2753,7 @@ msgstr "Nicht gesetzt"
 
 #: bookwyrm/templates/settings/users/user_info.html:16
 msgid "View user profile"
-msgstr ""
+msgstr "Benutzer*inprofil anzeigen"
 
 #: bookwyrm/templates/settings/users/user_info.html:36
 msgid "Local"
@@ -2775,11 +2761,11 @@ msgstr "Lokal"
 
 #: bookwyrm/templates/settings/users/user_info.html:38
 msgid "Remote"
-msgstr ""
+msgstr "Entfernt"
 
 #: bookwyrm/templates/settings/users/user_info.html:47
 msgid "User details"
-msgstr "Benutzerdetails"
+msgstr "Benutzer*indetails"
 
 #: bookwyrm/templates/settings/users/user_info.html:51
 msgid "Email:"
@@ -2787,19 +2773,19 @@ msgstr "E-Mail:"
 
 #: bookwyrm/templates/settings/users/user_info.html:61
 msgid "(View reports)"
-msgstr ""
+msgstr "(Meldungen anzeigen)"
 
 #: bookwyrm/templates/settings/users/user_info.html:67
 msgid "Blocked by count:"
-msgstr ""
+msgstr "Gesperrt durch (Anzahl):"
 
 #: bookwyrm/templates/settings/users/user_info.html:70
 msgid "Last active date:"
-msgstr ""
+msgstr "Zuletzt aktiv:"
 
 #: bookwyrm/templates/settings/users/user_info.html:73
 msgid "Manually approved followers:"
-msgstr ""
+msgstr "Manuell zugelassene Follower*innen:"
 
 #: bookwyrm/templates/settings/users/user_info.html:76
 msgid "Discoverable:"
@@ -2807,11 +2793,11 @@ msgstr "Entdeckbar:"
 
 #: bookwyrm/templates/settings/users/user_info.html:80
 msgid "Deactivation reason:"
-msgstr ""
+msgstr "Grund der Deaktivierung:"
 
 #: bookwyrm/templates/settings/users/user_info.html:95
 msgid "Instance details"
-msgstr ""
+msgstr "Instanzdetails"
 
 #: bookwyrm/templates/settings/users/user_info.html:117
 msgid "View instance"
@@ -2829,15 +2815,15 @@ msgstr "Direktnachricht senden"
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:20
 msgid "Suspend user"
-msgstr ""
+msgstr "Benutzer*in vorläufig sperren"
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:25
 msgid "Un-suspend user"
-msgstr ""
+msgstr "Vorläufige Sperre für Benutzer*in aufheben"
 
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:47
 msgid "Access level:"
-msgstr ""
+msgstr "Zugriffsstufe:"
 
 #: bookwyrm/templates/shelf/create_shelf_form.html:5
 msgid "Create Shelf"
@@ -2897,14 +2883,14 @@ msgstr "Dieses Regal ist leer."
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr ""
+msgstr "Von <a href=\"%(user_path)s\">%(username)s</a> veröffentlicht"
 
 #: bookwyrm/templates/snippets/authors.html:22
 #, python-format
 msgid "and %(remainder_count_display)s other"
 msgid_plural "and %(remainder_count_display)s others"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "und %(remainder_count_display)s Andere*r"
+msgstr[1] "und %(remainder_count_display)s Andere"
 
 #: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
@@ -2913,17 +2899,17 @@ msgstr "Kein Titelbild"
 #: bookwyrm/templates/snippets/book_titleby.html:6
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by"
-msgstr ""
+msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
 #: bookwyrm/templates/snippets/boost_button.html:20
 #: bookwyrm/templates/snippets/boost_button.html:21
 msgid "Boost"
-msgstr ""
+msgstr "Teilen"
 
 #: bookwyrm/templates/snippets/boost_button.html:33
 #: bookwyrm/templates/snippets/boost_button.html:34
 msgid "Un-boost"
-msgstr ""
+msgstr "Teilen zurücknehmen"
 
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
@@ -2966,11 +2952,11 @@ msgstr "Antwort"
 
 #: bookwyrm/templates/snippets/create_status/content_field.html:17
 msgid "Content"
-msgstr ""
+msgstr "Inhalt"
 
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
 msgid "Content warning:"
-msgstr ""
+msgstr "Inhaltswarnung:"
 
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
 msgid "Spoilers ahead!"
@@ -3003,11 +2989,11 @@ msgstr "Zitat:"
 #: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, python-format
 msgid "An excerpt from '%(book_title)s'"
-msgstr ""
+msgstr "Ein Auszug aus „%(book_title)s“"
 
 #: bookwyrm/templates/snippets/create_status/quotation.html:32
 msgid "Position:"
-msgstr ""
+msgstr "Position:"
 
 #: bookwyrm/templates/snippets/create_status/quotation.html:45
 msgid "On page:"
@@ -3015,16 +3001,16 @@ msgstr "Auf Seite:"
 
 #: bookwyrm/templates/snippets/create_status/quotation.html:51
 msgid "At percent:"
-msgstr ""
+msgstr "Bei Prozentsatz:"
 
 #: bookwyrm/templates/snippets/create_status/review.html:25
 #, python-format
 msgid "Your review of '%(book_title)s'"
-msgstr "Deine Rezension von '%(book_title)s'"
+msgstr "Deine Besprechung von „%(book_title)s“"
 
 #: bookwyrm/templates/snippets/create_status/review.html:40
 msgid "Review:"
-msgstr ""
+msgstr "Besprechung:"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
@@ -3043,7 +3029,7 @@ msgstr "Favorisieren"
 #: bookwyrm/templates/snippets/fav_button.html:30
 #: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
-msgstr ""
+msgstr "Favorisierung zurücknehmen"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
 msgid "Show filters"
@@ -3059,12 +3045,12 @@ msgstr "Filter anwenden"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 msgid "Clear filters"
-msgstr ""
+msgstr "Filter zurücksetzen"
 
 #: bookwyrm/templates/snippets/follow_button.html:14
 #, python-format
 msgid "Follow @%(username)s"
-msgstr ""
+msgstr "@%(username)s folgen"
 
 #: bookwyrm/templates/snippets/follow_button.html:16
 msgid "Follow"
@@ -3072,12 +3058,12 @@ msgstr "Folgen"
 
 #: bookwyrm/templates/snippets/follow_button.html:25
 msgid "Undo follow request"
-msgstr ""
+msgstr "Folgeanfrage zurücknehmen"
 
 #: bookwyrm/templates/snippets/follow_button.html:30
 #, python-format
 msgid "Unfollow @%(username)s"
-msgstr ""
+msgstr "@%(username)s entfolgen"
 
 #: bookwyrm/templates/snippets/follow_button.html:32
 msgid "Unfollow"
@@ -3096,16 +3082,16 @@ msgstr "Kein Rating"
 #, python-format
 msgid "%(half_rating)s star"
 msgid_plural "%(half_rating)s stars"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(half_rating)s Stern"
+msgstr[1] "%(half_rating)s Sterne"
 
 #: bookwyrm/templates/snippets/form_rate_stars.html:64
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
 msgid_plural "%(rating)s stars"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(rating)s Stern"
+msgstr[1] "%(rating)s Sterne"
 
 #: bookwyrm/templates/snippets/generated_status/goal.html:2
 #, python-format
@@ -3118,15 +3104,15 @@ msgstr[1] "Setze das Ziel, %(year)s %(counter)s Bücher zu lesen"
 #, python-format
 msgid "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "hat <em><a href=\"%(path)s\">%(title)s</a></em> mit %(display_rating)s Stern bewertet"
+msgstr[1] "hat <em><a href=\"%(path)s\">%(title)s</a></em> mit %(display_rating)s Sternen bewertet"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
 msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
 msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Besprechung von „%(book_title)s“ (%(display_rating)s Stern): %(review_title)s"
+msgstr[1] "Besprechung von „%(book_title)s“ (%(display_rating)s Sterne): %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -3177,12 +3163,12 @@ msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s
 #: bookwyrm/templates/snippets/page_text.html:8
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
-msgstr ""
+msgstr "Seite %(page)s von %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:14
 #, python-format
 msgid "page %(page)s"
-msgstr ""
+msgstr "Seite %(page)s"
 
 #: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
@@ -3224,7 +3210,7 @@ msgstr "Raten"
 
 #: bookwyrm/templates/snippets/rate_action.html:19
 msgid "Rate"
-msgstr ""
+msgstr "Bewerten"
 
 #: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6
 #, python-format
@@ -3244,12 +3230,12 @@ msgstr "Zu Ende gelesen"
 
 #: bookwyrm/templates/snippets/reading_modals/form.html:9
 msgid "(Optional)"
-msgstr ""
+msgstr "(Optional)"
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:50
 msgid "Update progress"
-msgstr ""
+msgstr "Update-Fortschritt"
 
 #: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6
 #, python-format
@@ -3271,12 +3257,12 @@ msgstr "Registrieren"
 
 #: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
-msgstr ""
+msgstr "Melden"
 
 #: bookwyrm/templates/snippets/report_modal.html:6
 #, python-format
 msgid "Report @%(username)s"
-msgstr ""
+msgstr "@%(username)s melden"
 
 #: bookwyrm/templates/snippets/report_modal.html:23
 #, python-format
@@ -3285,11 +3271,11 @@ msgstr "Diese Meldung wird an die Moderator:innen von %(site_name)s weitergeleti
 
 #: bookwyrm/templates/snippets/report_modal.html:24
 msgid "More info about this report:"
-msgstr ""
+msgstr "Weitere Angeben zu dieser Meldung:"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
 msgid "Move book"
-msgstr ""
+msgstr "Buch verschieben"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
@@ -3308,7 +3294,7 @@ msgstr "Auf Leseliste setzen"
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62
 #, python-format
 msgid "Remove from %(name)s"
-msgstr ""
+msgstr "Aus %(name)s entfernen"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:30
 msgid "Finish reading"
@@ -3316,21 +3302,21 @@ msgstr "Lesen abschließen"
 
 #: bookwyrm/templates/snippets/status/content_status.html:72
 msgid "Content warning"
-msgstr ""
+msgstr "Inhaltswarnung"
 
 #: bookwyrm/templates/snippets/status/content_status.html:79
 msgid "Show status"
-msgstr ""
+msgstr "Status anzeigen"
 
 #: bookwyrm/templates/snippets/status/content_status.html:101
 #, python-format
 msgid "(Page %(page)s)"
-msgstr ""
+msgstr "(Seite %(page)s)"
 
 #: bookwyrm/templates/snippets/status/content_status.html:103
 #, python-format
 msgid "(%(percent)s%%)"
-msgstr ""
+msgstr "(%(percent)s%%)"
 
 #: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
@@ -3338,53 +3324,52 @@ msgstr "Bild in neuem Fenster öffnen"
 
 #: bookwyrm/templates/snippets/status/content_status.html:144
 msgid "Hide status"
-msgstr ""
+msgstr "Status ausblenden"
 
 #: bookwyrm/templates/snippets/status/header.html:45
-#, fuzzy, python-format
-#| msgid "Joined %(date)s"
+#, python-format
 msgid "edited %(date)s"
-msgstr "Beigetreten %(date)s"
+msgstr "%(date)s bearbeitet"
 
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "hat <a href=\"%(book_path)s\">%(book)s</a> kommentiert"
 
 #: bookwyrm/templates/snippets/status/headers/note.html:15
 #, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
-msgstr ""
+msgstr "hat auf die <a href=\"%(status_path)s\">Statusmeldung</a> von <a href=\"%(user_path)s\">%(username)s</a> geantwortet"
 
 #: bookwyrm/templates/snippets/status/headers/quotation.html:2
 #, python-format
 msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "hat <a href=\"%(book_path)s\">%(book)s</a> zitiert"
 
 #: bookwyrm/templates/snippets/status/headers/rating.html:3
 #, python-format
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
-msgstr ""
+msgstr "hat <a href=\"%(book_path)s\">%(book)s</a> bewertet:"
 
 #: bookwyrm/templates/snippets/status/headers/read.html:7
 #, python-format
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "hat <a href=\"%(book_path)s\">%(book)s</a> ausgelesen"
 
 #: bookwyrm/templates/snippets/status/headers/reading.html:7
 #, python-format
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "hat angefangen, <a href=\"%(book_path)s\">%(book)s</a> zu lesen"
 
 #: bookwyrm/templates/snippets/status/headers/review.html:3
 #, python-format
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "hat <a href=\"%(book_path)s\">%(book)s</a> besprochen"
 
 #: bookwyrm/templates/snippets/status/headers/to_read.html:7
 #, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> hat <a href=\"%(book_path)s\">%(book)s auf die Leseliste gesetzt</a>"
 
 #: bookwyrm/templates/snippets/status/layout.html:24
 #: bookwyrm/templates/snippets/status/status_options.html:17
@@ -3414,20 +3399,20 @@ msgstr "Mehr Optionen"
 #, python-format
 msgid "%(mutuals)s follower you follow"
 msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(mutuals)s Follower*in, der*die du folgst"
+msgstr[1] "%(mutuals)s Follower*innen, denen du folgst"
 
 #: bookwyrm/templates/snippets/suggested_users.html:23
 #, python-format
 msgid "%(shared_books)s book on your shelves"
 msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(shared_books)s Buch in deinen Regalen"
+msgstr[1] "%(shared_books)s Bücher in deinen Regalen"
 
 #: bookwyrm/templates/snippets/suggested_users.html:31
 #: bookwyrm/templates/user/user_preview.html:36
 msgid "Follows you"
-msgstr ""
+msgstr "Folgt dir"
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
@@ -3435,11 +3420,11 @@ msgstr "Zu dieser Edition wechseln"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
 msgid "Sorted ascending"
-msgstr ""
+msgstr "Aufsteigend sortiert"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10
 msgid "Sorted descending"
-msgstr ""
+msgstr "Absteigend sortiert"
 
 #: bookwyrm/templates/snippets/trimmed_text.html:17
 msgid "Show more"
@@ -3452,7 +3437,7 @@ msgstr "Weniger anzeigen"
 #: bookwyrm/templates/user/books_header.html:5
 #, python-format
 msgid "%(username)s's books"
-msgstr ""
+msgstr "Bücher von %(username)s"
 
 #: bookwyrm/templates/user/goal.html:8
 #, python-format
@@ -3521,7 +3506,7 @@ msgstr "Profil bearbeiten"
 #: bookwyrm/templates/user/user.html:33
 #, python-format
 msgid "View all %(size)s"
-msgstr ""
+msgstr "Alle %(size)s anzeigen"
 
 #: bookwyrm/templates/user/user.html:46
 msgid "View all books"
@@ -3533,7 +3518,7 @@ msgstr "Nutzer*innenaktivität"
 
 #: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
-msgstr ""
+msgstr "RSS-Feed"
 
 #: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
@@ -3560,21 +3545,21 @@ msgstr "Folgt %(counter)s"
 #, python-format
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(mutuals_display)s Follower*in, der*die du folgst"
+msgstr[1] "%(mutuals_display)s Follower*in, der*die du folgst"
 
 #: bookwyrm/templates/user/user_preview.html:38
 msgid "No followers you follow"
-msgstr ""
+msgstr "Keine Follower*innen, denen du folgst"
 
 #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
-msgstr ""
+msgstr "Datei überschreitet die maximale Größe von 10MB"
 
 #: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
-msgstr ""
+msgstr "%(title)s: %(subtitle)s"
 
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
@@ -3586,7 +3571,7 @@ msgstr "Username oder Passwort sind falsch"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
-msgstr ""
+msgstr "Es wurde kein*e Benutzer*in mit dieser E-Mail-Adresse gefunden."
 
 #: bookwyrm/views/password.py:41
 #, python-brace-format
@@ -3598,23 +3583,3 @@ msgstr "Ein Passwortwiederherstellungslinl wurde zu {email} gesendet"
 msgid "Status updates from {obj.display_name}"
 msgstr "Status updates von {obj.display_name}"
 
-#~ msgid "Compose status"
-#~ msgstr "Status verfassen"
-
-#~ msgid "%(format)s"
-#~ msgstr "Formate: %(format)s"
-
-#~ msgid "rated"
-#~ msgstr "bewertet"
-
-#~ msgid "reviewed"
-#~ msgstr "bewertete"
-
-#~ msgid "commented on"
-#~ msgstr "kommentierte"
-
-#~ msgid "quoted"
-#~ msgstr "zitierte"
-
-#~ msgid "About this instance"
-#~ msgstr "Über diese Instanz"

From baba2e2057a4e675a178cc21cc32882c1a12bbbb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 13:08:33 -0700
Subject: [PATCH 162/193] Move shelf views into directory

---
 bookwyrm/views/__init__.py          | 8 +++++---
 bookwyrm/views/shelf/__init__.py    | 0
 bookwyrm/views/{ => shelf}/shelf.py | 0
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/views/shelf/__init__.py
 rename bookwyrm/views/{ => shelf}/shelf.py (100%)

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index b502bd8d5..ba83b5320 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -38,6 +38,11 @@ from .landing.login import Login, Logout
 from .landing.register import Register, ConfirmEmail, ConfirmEmailCode, resend_link
 from .landing.password import PasswordResetRequest, PasswordReset
 
+# shelves
+from .shelf.shelf import Shelf
+from .shelf.shelf import create_shelf, delete_shelf
+from .shelf.shelf import shelve, unshelve
+
 # misc views
 from .author import Author, EditAuthor
 from .directory import Directory
@@ -69,9 +74,6 @@ from .reading import create_readthrough, delete_readthrough, delete_progressupda
 from .reading import ReadingStatus
 from .rss_feed import RssFeed
 from .search import Search
-from .shelf import Shelf
-from .shelf import create_shelf, delete_shelf
-from .shelf import shelve, unshelve
 from .status import CreateStatus, EditStatus, DeleteStatus, update_progress
 from .status import edit_readthrough
 from .updates import get_notification_count, get_unread_status_count
diff --git a/bookwyrm/views/shelf/__init__.py b/bookwyrm/views/shelf/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf/shelf.py
similarity index 100%
rename from bookwyrm/views/shelf.py
rename to bookwyrm/views/shelf/shelf.py

From 6a2f962f8db0314849e8b9b3908d8347e24116a3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 13:15:43 -0700
Subject: [PATCH 163/193] Split shelf view into multiple files

---
 bookwyrm/views/__init__.py            |   4 +-
 bookwyrm/views/shelf/shelf.py         | 100 +------------------------
 bookwyrm/views/shelf/shelf_actions.py | 103 ++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 101 deletions(-)
 create mode 100644 bookwyrm/views/shelf/shelf_actions.py

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index ba83b5320..e1dd83557 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -40,8 +40,8 @@ from .landing.password import PasswordResetRequest, PasswordReset
 
 # shelves
 from .shelf.shelf import Shelf
-from .shelf.shelf import create_shelf, delete_shelf
-from .shelf.shelf import shelve, unshelve
+from .shelf.shelf_actions import create_shelf, delete_shelf
+from .shelf.shelf_actions import shelve, unshelve
 
 # misc views
 from .author import Author, EditAuthor
diff --git a/bookwyrm/views/shelf/shelf.py b/bookwyrm/views/shelf/shelf.py
index 0b830d906..f8cffe93f 100644
--- a/bookwyrm/views/shelf/shelf.py
+++ b/bookwyrm/views/shelf/shelf.py
@@ -1,7 +1,6 @@
 """ shelf views """
 from collections import namedtuple
 
-from django.db import IntegrityError, transaction
 from django.db.models import OuterRef, Subquery, F
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
@@ -11,12 +10,11 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
 from django.views import View
-from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
-from .helpers import is_api_request, get_user_from_username
+from bookwyrm.views.helpers import is_api_request, get_user_from_username
 
 
 # pylint: disable=no-self-use
@@ -128,102 +126,6 @@ class Shelf(View):
         return redirect(shelf.local_path)
 
 
-@login_required
-@require_POST
-def create_shelf(request):
-    """user generated shelves"""
-    form = forms.ShelfForm(request.POST)
-    if not form.is_valid():
-        return redirect(request.headers.get("Referer", "/"))
-
-    shelf = form.save()
-    return redirect(shelf.local_path)
-
-
-@login_required
-@require_POST
-def delete_shelf(request, shelf_id):
-    """user generated shelves"""
-    shelf = get_object_or_404(models.Shelf, id=shelf_id)
-    shelf.raise_not_deletable(request.user)
-
-    shelf.delete()
-    return redirect("user-shelves", request.user.localname)
-
-
-@login_required
-@require_POST
-@transaction.atomic
-def shelve(request):
-    """put a book on a user's shelf"""
-    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
-    desired_shelf = get_object_or_404(
-        request.user.shelf_set, identifier=request.POST.get("shelf")
-    )
-
-    # first we need to remove from the specified shelf
-    change_from_current_identifier = request.POST.get("change-shelf-from")
-    if change_from_current_identifier:
-        # find the shelfbook obj and delete it
-        get_object_or_404(
-            models.ShelfBook,
-            book=book,
-            user=request.user,
-            shelf__identifier=change_from_current_identifier,
-        ).delete()
-
-    # A book can be on multiple shelves, but only on one read status shelf at a time
-    if desired_shelf.identifier in models.Shelf.READ_STATUS_IDENTIFIERS:
-        # figure out where state shelf it's currently on (if any)
-        current_read_status_shelfbook = (
-            models.ShelfBook.objects.select_related("shelf")
-            .filter(
-                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
-                user=request.user,
-                book=book,
-            )
-            .first()
-        )
-        if current_read_status_shelfbook is not None:
-            if (
-                current_read_status_shelfbook.shelf.identifier
-                != desired_shelf.identifier
-            ):
-                current_read_status_shelfbook.delete()
-            else:  # It is already on the shelf
-                return redirect(request.headers.get("Referer", "/"))
-
-        # create the new shelf-book entry
-        models.ShelfBook.objects.create(
-            book=book, shelf=desired_shelf, user=request.user
-        )
-    else:
-        # we're putting it on a custom shelf
-        try:
-            models.ShelfBook.objects.create(
-                book=book, shelf=desired_shelf, user=request.user
-            )
-        # The book is already on this shelf.
-        # Might be good to alert, or reject the action?
-        except IntegrityError:
-            pass
-    return redirect(request.headers.get("Referer", "/"))
-
-
-@login_required
-@require_POST
-def unshelve(request):
-    """put a on a user's shelf"""
-    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
-    shelf_book = get_object_or_404(
-        models.ShelfBook, book=book, shelf__id=request.POST["shelf"]
-    )
-    shelf_book.raise_not_deletable(request.user)
-
-    shelf_book.delete()
-    return redirect(request.headers.get("Referer", "/"))
-
-
 def sort_books(books, sort):
     """Books in shelf sorting"""
     sort_fields = [
diff --git a/bookwyrm/views/shelf/shelf_actions.py b/bookwyrm/views/shelf/shelf_actions.py
new file mode 100644
index 000000000..470b2d3d3
--- /dev/null
+++ b/bookwyrm/views/shelf/shelf_actions.py
@@ -0,0 +1,103 @@
+""" shelf views """
+from django.db import IntegrityError, transaction
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import get_object_or_404, redirect
+from django.views.decorators.http import require_POST
+
+from bookwyrm import forms, models
+
+
+@login_required
+@require_POST
+def create_shelf(request):
+    """user generated shelves"""
+    form = forms.ShelfForm(request.POST)
+    if not form.is_valid():
+        return redirect(request.headers.get("Referer", "/"))
+
+    shelf = form.save()
+    return redirect(shelf.local_path)
+
+
+@login_required
+@require_POST
+def delete_shelf(request, shelf_id):
+    """user generated shelves"""
+    shelf = get_object_or_404(models.Shelf, id=shelf_id)
+    shelf.raise_not_deletable(request.user)
+
+    shelf.delete()
+    return redirect("user-shelves", request.user.localname)
+
+
+@login_required
+@require_POST
+@transaction.atomic
+def shelve(request):
+    """put a book on a user's shelf"""
+    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
+    desired_shelf = get_object_or_404(
+        request.user.shelf_set, identifier=request.POST.get("shelf")
+    )
+
+    # first we need to remove from the specified shelf
+    change_from_current_identifier = request.POST.get("change-shelf-from")
+    if change_from_current_identifier:
+        # find the shelfbook obj and delete it
+        get_object_or_404(
+            models.ShelfBook,
+            book=book,
+            user=request.user,
+            shelf__identifier=change_from_current_identifier,
+        ).delete()
+
+    # A book can be on multiple shelves, but only on one read status shelf at a time
+    if desired_shelf.identifier in models.Shelf.READ_STATUS_IDENTIFIERS:
+        # figure out where state shelf it's currently on (if any)
+        current_read_status_shelfbook = (
+            models.ShelfBook.objects.select_related("shelf")
+            .filter(
+                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+                user=request.user,
+                book=book,
+            )
+            .first()
+        )
+        if current_read_status_shelfbook is not None:
+            if (
+                current_read_status_shelfbook.shelf.identifier
+                != desired_shelf.identifier
+            ):
+                current_read_status_shelfbook.delete()
+            else:  # It is already on the shelf
+                return redirect(request.headers.get("Referer", "/"))
+
+        # create the new shelf-book entry
+        models.ShelfBook.objects.create(
+            book=book, shelf=desired_shelf, user=request.user
+        )
+    else:
+        # we're putting it on a custom shelf
+        try:
+            models.ShelfBook.objects.create(
+                book=book, shelf=desired_shelf, user=request.user
+            )
+        # The book is already on this shelf.
+        # Might be good to alert, or reject the action?
+        except IntegrityError:
+            pass
+    return redirect(request.headers.get("Referer", "/"))
+
+
+@login_required
+@require_POST
+def unshelve(request):
+    """put a on a user's shelf"""
+    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
+    shelf_book = get_object_or_404(
+        models.ShelfBook, book=book, shelf__id=request.POST["shelf"]
+    )
+    shelf_book.raise_not_deletable(request.user)
+
+    shelf_book.delete()
+    return redirect(request.headers.get("Referer", "/"))

From d86ffc47a71763f63c4f3de0f2278c4dcbb521bc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 13:16:29 -0700
Subject: [PATCH 164/193] Fixes incorrect method comment

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

diff --git a/bookwyrm/views/shelf/shelf_actions.py b/bookwyrm/views/shelf/shelf_actions.py
index 470b2d3d3..702b72c13 100644
--- a/bookwyrm/views/shelf/shelf_actions.py
+++ b/bookwyrm/views/shelf/shelf_actions.py
@@ -92,7 +92,7 @@ def shelve(request):
 @login_required
 @require_POST
 def unshelve(request):
-    """put a on a user's shelf"""
+    """remove a book from a user's shelf"""
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     shelf_book = get_object_or_404(
         models.ShelfBook, book=book, shelf__id=request.POST["shelf"]

From 87deac17f9f23fef0a95c1417530d9d29dfe9bd2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 13:31:18 -0700
Subject: [PATCH 165/193] Make import link a link not a button

---
 bookwyrm/templates/shelf/shelf.html | 67 +++++++++++++++++------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html
index fa1e91f98..662d75073 100644
--- a/bookwyrm/templates/shelf/shelf.html
+++ b/bookwyrm/templates/shelf/shelf.html
@@ -19,45 +19,58 @@
     </h1>
 </header>
 
-<div class="block columns">
-    <div class="column">
+<nav class="block columns is-mobile scroll-x">
+    <div class="column pr-0">
         <div class="tabs">
             <ul>
-            <li class="{% if shelf.identifier == 'all' %}is-active{% endif %}">
-                <a href="{% url 'user-shelves' user|username %}"{% if shelf.identifier == 'all' %} aria-current="page"{% endif %}>
-                    {% trans "All books" %}
-                </a>
-            </li>
-            {% for shelf_tab in shelves %}
-            <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
-                <a
-                    href="{{ shelf_tab.local_path }}"
-                    {% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}
-                >
-                    {% if shelf_tab.identifier == 'to-read' %}
-                        {% trans "To Read" %}
-                    {% elif shelf_tab.identifier == 'reading' %}
-                        {% trans "Currently Reading" %}
-                    {% elif shelf_tab.identifier == 'read' %}
-                        {% trans "Read" %}
-                    {% else %}
-                        {{ shelf_tab.name }}
-                    {% endif %}
-                </a>
-            </li>
-            {% endfor %}
+                <li class="{% if shelf.identifier == 'all' %}is-active{% endif %}">
+                    <a href="{% url 'user-shelves' user|username %}"{% if shelf.identifier == 'all' %} aria-current="page"{% endif %}>
+                        {% trans "All books" %}
+                    </a>
+                </li>
+                {% for shelf_tab in shelves %}
+                <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
+                    <a
+                        href="{{ shelf_tab.local_path }}"
+                        {% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}
+                    >
+                        {% if shelf_tab.identifier == 'to-read' %}
+                            {% trans "To Read" %}
+                        {% elif shelf_tab.identifier == 'reading' %}
+                            {% trans "Currently Reading" %}
+                        {% elif shelf_tab.identifier == 'read' %}
+                            {% trans "Read" %}
+                        {% else %}
+                            {{ shelf_tab.name }}
+                        {% endif %}
+                    </a>
+                </li>
+                {% endfor %}
+
             </ul>
         </div>
     </div>
 
     {% if is_self %}
+    <div class="column is-narrow pl-0">
+        <div class="tabs">
+            <ul>
+                <li>
+                    <a href="{% url 'import' %}">
+                        <span class="icon icon-list" aria-hidden="true"></span>
+                        <span>{% trans "Import Books" %}</span>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+
     <div class="column is-narrow">
         {% trans "Create shelf" as button_text %}
         {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" controls_text="create_shelf_form" focus="create_shelf_form_header" %}
-        <a class="button" href="{% url 'import' %}">{% trans "Import Books" %}</a>
     </div>
     {% endif %}
-</div>
+</nav>
 
 <div class="block">
     {% include 'shelf/create_shelf_form.html' with controls_text='create_shelf_form' %}

From b64a616ff94859ae9c5f2071fb4de068c639bb35 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 13:56:55 -0700
Subject: [PATCH 166/193] Fixes mock in test

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

diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index b78e241cc..35cc63f21 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -52,7 +52,7 @@ class ShelfViews(TestCase):
         shelf = self.local_user.shelf_set.first()
         request = self.factory.get("")
         request.user = self.local_user
-        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, self.local_user.username, shelf.identifier)
         self.assertIsInstance(result, TemplateResponse)

From 1bb23a8edf1d916a7f315cf127f8566678df8bd9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 14:15:05 -0700
Subject: [PATCH 167/193] Adds more tests of shelf views

---
 bookwyrm/tests/views/test_shelf.py | 45 ++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index 35cc63f21..914f73973 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -2,6 +2,7 @@
 import json
 from unittest.mock import patch
 
+from django.contrib.auth.models import AnonymousUser
 from django.core.exceptions import PermissionDenied
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -46,6 +47,46 @@ class ShelfViews(TestCase):
             )
         models.SiteSettings.objects.create()
 
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+
+    def test_shelf_page_all_books(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Shelf.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.local_user.username)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+    def test_shelf_page_all_books_anonymous(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Shelf.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.local_user.username)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+    def test_shelf_page_sorted(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Shelf.as_view()
+        shelf = self.local_user.shelf_set.first()
+        request = self.factory.get("", {"sort": "author"})
+        request.user = self.local_user
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.local_user.username, shelf.identifier)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
     def test_shelf_page(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Shelf.as_view()
@@ -59,7 +100,7 @@ class ShelfViews(TestCase):
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
-        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.local_user.username, shelf.identifier)
         self.assertIsInstance(result, ActivitypubResponse)
@@ -67,7 +108,7 @@ class ShelfViews(TestCase):
 
         request = self.factory.get("/?page=1")
         request.user = self.local_user
-        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.local_user.username, shelf.identifier)
         self.assertIsInstance(result, ActivitypubResponse)

From 3d92afdf280231a4d07a57bf6770f7c532ca929d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 14:16:13 -0700
Subject: [PATCH 168/193] Moves shelf tests into subdirectory

---
 bookwyrm/tests/views/shelf/__init__.py         | 1 +
 bookwyrm/tests/views/{ => shelf}/test_shelf.py | 0
 2 files changed, 1 insertion(+)
 create mode 100644 bookwyrm/tests/views/shelf/__init__.py
 rename bookwyrm/tests/views/{ => shelf}/test_shelf.py (100%)

diff --git a/bookwyrm/tests/views/shelf/__init__.py b/bookwyrm/tests/views/shelf/__init__.py
new file mode 100644
index 000000000..b6e690fd5
--- /dev/null
+++ b/bookwyrm/tests/views/shelf/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/shelf/test_shelf.py
similarity index 100%
rename from bookwyrm/tests/views/test_shelf.py
rename to bookwyrm/tests/views/shelf/test_shelf.py

From 5c2d6e651029ca597f4b3a5de9fc3801b9cf46b5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 14:30:11 -0700
Subject: [PATCH 169/193] Separate out test files and add more tests

---
 bookwyrm/tests/views/shelf/test_shelf.py      | 153 +------------
 .../tests/views/shelf/test_shelf_actions.py   | 216 ++++++++++++++++++
 2 files changed, 217 insertions(+), 152 deletions(-)
 create mode 100644 bookwyrm/tests/views/shelf/test_shelf_actions.py

diff --git a/bookwyrm/tests/views/shelf/test_shelf.py b/bookwyrm/tests/views/shelf/test_shelf.py
index 914f73973..71df3631f 100644
--- a/bookwyrm/tests/views/shelf/test_shelf.py
+++ b/bookwyrm/tests/views/shelf/test_shelf.py
@@ -1,14 +1,12 @@
 """ test for app action functionality """
-import json
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
-from django.core.exceptions import PermissionDenied
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import forms, models, views
+from bookwyrm import models, views
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.tests.validate_html import validate_html
 
@@ -165,152 +163,3 @@ class ShelfViews(TestCase):
             view(request, request.user.username, shelf.identifier)
 
         self.assertEqual(shelf.name, "To Read")
-
-    def test_shelve(self, *_):
-        """shelve a book"""
-        request = self.factory.post(
-            "", {"book": self.book.id, "shelf": self.shelf.identifier}
-        )
-        request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.shelve(request)
-
-        self.assertEqual(mock.call_count, 1)
-        activity = json.loads(mock.call_args[0][1])
-        self.assertEqual(activity["type"], "Add")
-
-        item = models.ShelfBook.objects.get()
-        self.assertEqual(activity["object"]["id"], item.remote_id)
-        # make sure the book is on the shelf
-        self.assertEqual(self.shelf.books.get(), self.book)
-
-    def test_shelve_to_read(self, *_):
-        """special behavior for the to-read shelf"""
-        shelf = models.Shelf.objects.get(identifier="to-read")
-        request = self.factory.post(
-            "", {"book": self.book.id, "shelf": shelf.identifier}
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.shelve(request)
-        # make sure the book is on the shelf
-        self.assertEqual(shelf.books.get(), self.book)
-
-    def test_shelve_reading(self, *_):
-        """special behavior for the reading shelf"""
-        shelf = models.Shelf.objects.get(identifier="reading")
-        request = self.factory.post(
-            "", {"book": self.book.id, "shelf": shelf.identifier}
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.shelve(request)
-        # make sure the book is on the shelf
-        self.assertEqual(shelf.books.get(), self.book)
-
-    def test_shelve_read(self, *_):
-        """special behavior for the read shelf"""
-        shelf = models.Shelf.objects.get(identifier="read")
-        request = self.factory.post(
-            "", {"book": self.book.id, "shelf": shelf.identifier}
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.shelve(request)
-        # make sure the book is on the shelf
-        self.assertEqual(shelf.books.get(), self.book)
-
-    def test_unshelve(self, *_):
-        """remove a book from a shelf"""
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.ShelfBook.objects.create(
-                book=self.book, user=self.local_user, shelf=self.shelf
-            )
-        item = models.ShelfBook.objects.get()
-
-        self.shelf.save()
-        self.assertEqual(self.shelf.books.count(), 1)
-        request = self.factory.post("", {"book": self.book.id, "shelf": self.shelf.id})
-        request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.unshelve(request)
-        activity = json.loads(mock.call_args[0][1])
-        self.assertEqual(activity["type"], "Remove")
-        self.assertEqual(activity["object"]["id"], item.remote_id)
-        self.assertEqual(self.shelf.books.count(), 0)
-
-    def test_create_shelf(self, *_):
-        """a brand new custom shelf"""
-        form = forms.ShelfForm()
-        form.data["user"] = self.local_user.id
-        form.data["name"] = "new shelf name"
-        form.data["description"] = "desc"
-        form.data["privacy"] = "unlisted"
-        request = self.factory.post("", form.data)
-        request.user = self.local_user
-
-        views.create_shelf(request)
-
-        shelf = models.Shelf.objects.get(name="new shelf name")
-        self.assertEqual(shelf.privacy, "unlisted")
-        self.assertEqual(shelf.description, "desc")
-        self.assertEqual(shelf.user, self.local_user)
-
-    def test_delete_shelf(self, *_):
-        """delete a brand new custom shelf"""
-        request = self.factory.post("")
-        request.user = self.local_user
-        shelf_id = self.shelf.id
-
-        views.delete_shelf(request, shelf_id)
-
-        self.assertFalse(models.Shelf.objects.filter(id=shelf_id).exists())
-
-    def test_delete_shelf_unauthorized(self, *_):
-        """delete a brand new custom shelf"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
-            "bookwyrm.activitystreams.populate_stream_task.delay"
-        ):
-            rat = models.User.objects.create_user(
-                "rat@local.com",
-                "rat@mouse.mouse",
-                "password",
-                local=True,
-                localname="rat",
-            )
-        request = self.factory.post("")
-        request.user = rat
-
-        with self.assertRaises(PermissionDenied):
-            views.delete_shelf(request, self.shelf.id)
-
-        self.assertTrue(models.Shelf.objects.filter(id=self.shelf.id).exists())
-
-    def test_delete_shelf_has_book(self, *_):
-        """delete a brand new custom shelf"""
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.ShelfBook.objects.create(
-                book=self.book, user=self.local_user, shelf=self.shelf
-            )
-        request = self.factory.post("")
-        request.user = self.local_user
-
-        with self.assertRaises(PermissionDenied):
-            views.delete_shelf(request, self.shelf.id)
-
-        self.assertTrue(models.Shelf.objects.filter(id=self.shelf.id).exists())
-
-    def test_delete_shelf_not_editable(self, *_):
-        """delete a brand new custom shelf"""
-        shelf = self.local_user.shelf_set.first()
-        self.assertFalse(shelf.editable)
-        request = self.factory.post("")
-        request.user = self.local_user
-
-        with self.assertRaises(PermissionDenied):
-            views.delete_shelf(request, shelf.id)
-
-        self.assertTrue(models.Shelf.objects.filter(id=shelf.id).exists())
diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py
new file mode 100644
index 000000000..50b319d0e
--- /dev/null
+++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py
@@ -0,0 +1,216 @@
+""" test for app action functionality """
+import json
+from unittest.mock import patch
+
+from django.core.exceptions import PermissionDenied
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import forms, models, views
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
+class ShelfActionViews(TestCase):
+    """tag views"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse@local.com",
+                "mouse@mouse.com",
+                "mouseword",
+                local=True,
+                localname="mouse",
+                remote_id="https://example.com/users/mouse",
+            )
+        self.work = models.Work.objects.create(title="Test Work")
+        self.book = models.Edition.objects.create(
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
+        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            self.shelf = models.Shelf.objects.create(
+                name="Test Shelf", identifier="test-shelf", user=self.local_user
+            )
+        models.SiteSettings.objects.create()
+
+    def test_shelve(self, *_):
+        """shelve a book"""
+        request = self.factory.post(
+            "", {"book": self.book.id, "shelf": self.shelf.identifier}
+        )
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.shelve(request)
+
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Add")
+
+        item = models.ShelfBook.objects.get()
+        self.assertEqual(activity["object"]["id"], item.remote_id)
+        # make sure the book is on the shelf
+        self.assertEqual(self.shelf.books.get(), self.book)
+
+    def test_shelve_to_read(self, *_):
+        """special behavior for the to-read shelf"""
+        shelf = models.Shelf.objects.get(identifier="to-read")
+        request = self.factory.post(
+            "", {"book": self.book.id, "shelf": shelf.identifier}
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.shelve(request)
+        # make sure the book is on the shelf
+        self.assertEqual(shelf.books.get(), self.book)
+
+    def test_shelve_reading(self, *_):
+        """special behavior for the reading shelf"""
+        shelf = models.Shelf.objects.get(identifier="reading")
+        request = self.factory.post(
+            "", {"book": self.book.id, "shelf": shelf.identifier}
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.shelve(request)
+        # make sure the book is on the shelf
+        self.assertEqual(shelf.books.get(), self.book)
+
+    def test_shelve_read(self, *_):
+        """special behavior for the read shelf"""
+        shelf = models.Shelf.objects.get(identifier="read")
+        request = self.factory.post(
+            "", {"book": self.book.id, "shelf": shelf.identifier}
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.shelve(request)
+        # make sure the book is on the shelf
+        self.assertEqual(shelf.books.get(), self.book)
+
+    def test_shelve_read_with_change_shelf(self, *_):
+        """special behavior for the read shelf"""
+        previous_shelf = models.Shelf.objects.get(identifier="reading")
+        models.ShelfBook.objects.create(
+            shelf=previous_shelf, user=self.local_user, book=self.book
+        )
+        shelf = models.Shelf.objects.get(identifier="read")
+
+        request = self.factory.post(
+            "", {
+                "book": self.book.id,
+                "shelf": shelf.identifier,
+                "change-shelf-from": previous_shelf.identifier,
+            }
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.shelve(request)
+        # make sure the book is on the shelf
+        self.assertEqual(shelf.books.get(), self.book)
+        self.assertEqual(list(previous_shelf.books.all()), [])
+
+    def test_unshelve(self, *_):
+        """remove a book from a shelf"""
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ShelfBook.objects.create(
+                book=self.book, user=self.local_user, shelf=self.shelf
+            )
+        item = models.ShelfBook.objects.get()
+
+        self.shelf.save()
+        self.assertEqual(self.shelf.books.count(), 1)
+        request = self.factory.post("", {"book": self.book.id, "shelf": self.shelf.id})
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.unshelve(request)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Remove")
+        self.assertEqual(activity["object"]["id"], item.remote_id)
+        self.assertEqual(self.shelf.books.count(), 0)
+
+    def test_create_shelf(self, *_):
+        """a brand new custom shelf"""
+        form = forms.ShelfForm()
+        form.data["user"] = self.local_user.id
+        form.data["name"] = "new shelf name"
+        form.data["description"] = "desc"
+        form.data["privacy"] = "unlisted"
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        views.create_shelf(request)
+
+        shelf = models.Shelf.objects.get(name="new shelf name")
+        self.assertEqual(shelf.privacy, "unlisted")
+        self.assertEqual(shelf.description, "desc")
+        self.assertEqual(shelf.user, self.local_user)
+
+    def test_delete_shelf(self, *_):
+        """delete a brand new custom shelf"""
+        request = self.factory.post("")
+        request.user = self.local_user
+        shelf_id = self.shelf.id
+
+        views.delete_shelf(request, shelf_id)
+
+        self.assertFalse(models.Shelf.objects.filter(id=shelf_id).exists())
+
+    def test_delete_shelf_unauthorized(self, *_):
+        """delete a brand new custom shelf"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            rat = models.User.objects.create_user(
+                "rat@local.com",
+                "rat@mouse.mouse",
+                "password",
+                local=True,
+                localname="rat",
+            )
+        request = self.factory.post("")
+        request.user = rat
+
+        with self.assertRaises(PermissionDenied):
+            views.delete_shelf(request, self.shelf.id)
+
+        self.assertTrue(models.Shelf.objects.filter(id=self.shelf.id).exists())
+
+    def test_delete_shelf_has_book(self, *_):
+        """delete a brand new custom shelf"""
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ShelfBook.objects.create(
+                book=self.book, user=self.local_user, shelf=self.shelf
+            )
+        request = self.factory.post("")
+        request.user = self.local_user
+
+        with self.assertRaises(PermissionDenied):
+            views.delete_shelf(request, self.shelf.id)
+
+        self.assertTrue(models.Shelf.objects.filter(id=self.shelf.id).exists())
+
+    def test_delete_shelf_not_editable(self, *_):
+        """delete a brand new custom shelf"""
+        shelf = self.local_user.shelf_set.first()
+        self.assertFalse(shelf.editable)
+        request = self.factory.post("")
+        request.user = self.local_user
+
+        with self.assertRaises(PermissionDenied):
+            views.delete_shelf(request, shelf.id)
+
+        self.assertTrue(models.Shelf.objects.filter(id=shelf.id).exists())

From f65a54eb4abe8b5f0b089f1801fb598faa96e2ed Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 14:34:42 -0700
Subject: [PATCH 170/193] Python formatting

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

diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py
index 50b319d0e..3efae0f45 100644
--- a/bookwyrm/tests/views/shelf/test_shelf_actions.py
+++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py
@@ -109,11 +109,12 @@ class ShelfActionViews(TestCase):
         shelf = models.Shelf.objects.get(identifier="read")
 
         request = self.factory.post(
-            "", {
+            "",
+            {
                 "book": self.book.id,
                 "shelf": shelf.identifier,
                 "change-shelf-from": previous_shelf.identifier,
-            }
+            },
         )
         request.user = self.local_user
 

From 89a385da0a96eece560aa569f4cb95c98b6e8dfe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 17:36:52 -0700
Subject: [PATCH 171/193] Paginate books on author page

---
 bookwyrm/views/author.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index e1e9247de..1265ad689 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -1,6 +1,7 @@
 """ the good people stuff! the authors! """
 from django.contrib.auth.decorators import login_required, permission_required
-from django.db.models import Q
+from django.core.paginator import Paginator
+from django.db.models import OuterRef, Subquery, F, Q
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -8,7 +9,8 @@ from django.views import View
 
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
-from .helpers import is_api_request
+from bookwyrm.settings import PAGE_LENGTH
+from bookwyrm.views.helpers import is_api_request
 
 
 # pylint: disable= no-self-use
@@ -22,12 +24,26 @@ class Author(View):
         if is_api_request(request):
             return ActivitypubResponse(author.to_activity())
 
-        books = models.Work.objects.filter(
-            Q(authors=author) | Q(editions__authors=author)
-        ).distinct()
+        default_editions = models.Edition.objects.filter(
+            parent_work=OuterRef("parent_work")
+        ).order_by("-edition_rank")
+
+        books = (
+            models.Edition.objects.filter(
+                Q(authors=author) | Q(parent_work__authors=author)
+            )
+            .annotate(default_id=Subquery(default_editions.values("id")[:1]))
+            .filter(default_id=F("id"))
+        )
+
+        paginated = Paginator(books, PAGE_LENGTH)
+        page = paginated.get_page(request.GET.get("page"))
         data = {
             "author": author,
-            "books": [b.default_edition for b in books],
+            "books": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
         }
         return TemplateResponse(request, "author/author.html", data)
 

From 3eb3225d2c629abe72ca82f2ac09fa7413c9d6e5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 17:42:19 -0700
Subject: [PATCH 172/193] Adds pagination to the template

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

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 8a15cd0f0..5310f0df8 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -114,4 +114,9 @@
     {% endfor %}
     </div>
 </div>
+
+<div>
+    {% include 'snippets/pagination.html' with page=books %}
+</div>
+
 {% endblock %}

From de93beca84e5f2dcee9922486d99b6cc662a4525 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 17:51:42 -0700
Subject: [PATCH 173/193] Adds shelve buttons to books on author page

---
 bookwyrm/templates/author/author.html | 1 +
 bookwyrm/views/author.py              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 5310f0df8..6a67b50b3 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -110,6 +110,7 @@
     {% for book in books %}
         <div class="column is-one-fifth">
             {% include 'landing/small-book.html' with book=book %}
+            {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
         </div>
     {% endfor %}
     </div>
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index 1265ad689..9a3d582d6 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -29,7 +29,7 @@ class Author(View):
         ).order_by("-edition_rank")
 
         books = (
-            models.Edition.objects.filter(
+            models.Edition.viewer_aware_objects(request.user).filter(
                 Q(authors=author) | Q(parent_work__authors=author)
             )
             .annotate(default_id=Subquery(default_editions.values("id")[:1]))

From 14682ed8c687590b3ebb5be299a9399419fec0db Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 18:04:29 -0700
Subject: [PATCH 174/193] Prefect related data in author view

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

diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index 9a3d582d6..4f29e2af6 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -34,7 +34,7 @@ class Author(View):
             )
             .annotate(default_id=Subquery(default_editions.values("id")[:1]))
             .filter(default_id=F("id"))
-        )
+        ).prefetch_related("authors")
 
         paginated = Paginator(books, PAGE_LENGTH)
         page = paginated.get_page(request.GET.get("page"))

From d706b26ac98b3fbb0b2e82d1d2423defbe3168e4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 18:11:31 -0700
Subject: [PATCH 175/193] Python formatting

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

diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index 4f29e2af6..4cb7ac2b5 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -29,9 +29,8 @@ class Author(View):
         ).order_by("-edition_rank")
 
         books = (
-            models.Edition.viewer_aware_objects(request.user).filter(
-                Q(authors=author) | Q(parent_work__authors=author)
-            )
+            models.Edition.viewer_aware_objects(request.user)
+            .filter(Q(authors=author) | Q(parent_work__authors=author))
             .annotate(default_id=Subquery(default_editions.values("id")[:1]))
             .filter(default_id=F("id"))
         ).prefetch_related("authors")

From 72dc21e82ab7c076eda0b984ea9f9ad57c687a4b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 18:27:19 -0700
Subject: [PATCH 176/193] Adds tests and fixes unset ordering warnings

---
 bookwyrm/tests/views/test_author.py | 27 +++++++++++++++++++++++++--
 bookwyrm/views/author.py            |  4 +++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py
index 03c027fae..75c7433fe 100644
--- a/bookwyrm/tests/views/test_author.py
+++ b/bookwyrm/tests/views/test_author.py
@@ -1,6 +1,7 @@
 """ test for app action functionality """
 from unittest.mock import patch
-from django.contrib.auth.models import Group, Permission
+
+from django.contrib.auth.models import AnonymousUser, Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.template.response import TemplateResponse
@@ -44,6 +45,8 @@ class AuthorViews(TestCase):
             parent_work=self.work,
         )
 
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
         models.SiteSettings.objects.create()
 
     def test_author_page(self):
@@ -51,6 +54,7 @@ class AuthorViews(TestCase):
         view = views.Author.as_view()
         author = models.Author.objects.create(name="Jessica")
         request = self.factory.get("")
+        request.user = self.local_user
         with patch("bookwyrm.views.author.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, author.id)
@@ -59,7 +63,26 @@ class AuthorViews(TestCase):
         self.assertEqual(result.status_code, 200)
         self.assertEqual(result.status_code, 200)
 
+    def test_author_page_logged_out(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Author.as_view()
+        author = models.Author.objects.create(name="Jessica")
         request = self.factory.get("")
+        request.user = self.anonymous_user
+        with patch("bookwyrm.views.author.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, author.id)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(result.status_code, 200)
+
+    def test_author_page_api_response(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Author.as_view()
+        author = models.Author.objects.create(name="Jessica")
+        request = self.factory.get("")
+        request.user = self.local_user
         with patch("bookwyrm.views.author.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, author.id)
@@ -126,5 +149,5 @@ class AuthorViews(TestCase):
         resp = view(request, author.id)
         author.refresh_from_db()
         self.assertEqual(author.name, "Test Author")
-        resp.render()
+        validate_html(resp.render())
         self.assertEqual(resp.status_code, 200)
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index 4cb7ac2b5..6c3ee36ff 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -33,7 +33,9 @@ class Author(View):
             .filter(Q(authors=author) | Q(parent_work__authors=author))
             .annotate(default_id=Subquery(default_editions.values("id")[:1]))
             .filter(default_id=F("id"))
-        ).prefetch_related("authors")
+            .order_by("-first_published_date", "-published_date", "-created_date")
+            .prefetch_related("authors")
+        )
 
         paginated = Paginator(books, PAGE_LENGTH)
         page = paginated.get_page(request.GET.get("page"))

From 278a9de673b54638342a31ea94f0fa5b0a08ae87 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 20 Oct 2021 18:29:00 -0700
Subject: [PATCH 177/193] Removes duplicate assertions in author view test

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

diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py
index 75c7433fe..ccbfe5493 100644
--- a/bookwyrm/tests/views/test_author.py
+++ b/bookwyrm/tests/views/test_author.py
@@ -61,7 +61,6 @@ class AuthorViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.status_code, 200)
 
     def test_author_page_logged_out(self):
         """there are so many views, this just makes sure it LOADS"""
@@ -75,7 +74,6 @@ class AuthorViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.status_code, 200)
 
     def test_author_page_api_response(self):
         """there are so many views, this just makes sure it LOADS"""
@@ -101,7 +99,6 @@ class AuthorViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.status_code, 200)
 
     def test_edit_author(self):
         """edit an author"""

From 19c7e43f50decbd848fc307be39a71aeb496a423 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 22 Oct 2021 18:40:55 +1100
Subject: [PATCH 178/193] remove followers privacy option from group form

---
 bookwyrm/templates/groups/form.html           |  2 +-
 .../snippets/privacy_select_no_followers.html | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/templates/snippets/privacy_select_no_followers.html

diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index c1281172b..949a6e967 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -19,7 +19,7 @@
     <div class="column">
         <div class="field has-addons">
             <div class="control">
-                {% include 'snippets/privacy_select.html' with current=group.privacy %}
+                {% include 'snippets/privacy_select_no_followers.html' with current=group.privacy %}
             </div>
             <div class="control">
                 <button type="submit" class="button is-primary">{% trans "Save" %}</button>
diff --git a/bookwyrm/templates/snippets/privacy_select_no_followers.html b/bookwyrm/templates/snippets/privacy_select_no_followers.html
new file mode 100644
index 000000000..2c601e7ff
--- /dev/null
+++ b/bookwyrm/templates/snippets/privacy_select_no_followers.html
@@ -0,0 +1,21 @@
+{% load i18n %}
+{% load utilities %}
+<div class="select {{ class }}">
+    {% firstof privacy_uuid 0|uuid as uuid %}
+    {% if not no_label %}
+    <label class="is-sr-only" for="privacy_{{ uuid }}">{% trans "Post privacy" %}</label>
+    {% endif %}
+    {% firstof current user.default_post_privacy "public" as privacy %}
+    <select name="privacy" id="privacy_{{ uuid }}">
+        <option value="public" {% if privacy == 'public' %}selected{% endif %}>
+            {% trans "Public" %}
+        </option>
+        <option value="unlisted" {% if privacy == 'unlisted' %}selected{% endif %}>
+            {% trans "Unlisted" %}
+        </option>
+        <option value="direct" {% if privacy == 'direct' %}selected{% endif %}>
+            {% trans "Private" %}
+        </option>
+    </select>
+</div>
+

From bd20c9ce2c37ff582241ea030e8f155bfab86b5c Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 22 Oct 2021 18:42:18 +1100
Subject: [PATCH 179/193] remove followers group visibility test

Also updates description of group.followers_filter() override
---
 bookwyrm/models/group.py            | 2 +-
 bookwyrm/tests/models/test_group.py | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py
index 552e2c287..bd5b8d410 100644
--- a/bookwyrm/models/group.py
+++ b/bookwyrm/models/group.py
@@ -23,7 +23,7 @@ class Group(BookWyrmModel):
     @classmethod
     def followers_filter(cls, queryset, viewer):
         """Override filter for "followers" privacy level to allow non-following
-        group members to see the existence of groups and group lists"""
+        group members to see the existence of group-curated lists"""
 
         return queryset.exclude(
             ~Q(  # user is not a group member
diff --git a/bookwyrm/tests/models/test_group.py b/bookwyrm/tests/models/test_group.py
index 275fce196..33341d192 100644
--- a/bookwyrm/tests/models/test_group.py
+++ b/bookwyrm/tests/models/test_group.py
@@ -75,15 +75,6 @@ class Group(TestCase):
         )
         models.GroupMember.objects.create(group=self.public_group, user=self.capybara)
 
-    def test_group_members_can_see_followers_only_groups(self, _):
-        """follower-only group should not be excluded from group listings for group members viewing"""
-
-        rat_groups = models.Group.privacy_filter(self.rat).all()
-        badger_groups = models.Group.privacy_filter(self.badger).all()
-
-        self.assertFalse(self.followers_only_group in rat_groups)
-        self.assertTrue(self.followers_only_group in badger_groups)
-
     def test_group_members_can_see_private_groups(self, _):
         """direct privacy group should not be excluded from group listings for group members viewing"""
 

From 80edc1e95e70cf14d88c6d5acbad1f0b0f88f1b8 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 22 Oct 2021 20:16:48 +1100
Subject: [PATCH 180/193] remove trailing spaces

---
 bookwyrm/templates/notifications/items/join.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bookwyrm/templates/notifications/items/join.html b/bookwyrm/templates/notifications/items/join.html
index 9c766806f..93b356424 100644
--- a/bookwyrm/templates/notifications/items/join.html
+++ b/bookwyrm/templates/notifications/items/join.html
@@ -18,6 +18,3 @@ has joined your group "<a href="{{ group_path }}">{{ group_name }}</a>"
 {% endblocktrans %}
 
 {% endblock %}
-
-
-

From c9deda8fdd8a63203b55aa803126a35e6633fb6e Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 22 Oct 2021 20:21:55 +1100
Subject: [PATCH 181/193] remove superfluous field

---
 bookwyrm/templates/groups/form.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index 949a6e967..21c525ee0 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -4,7 +4,6 @@
 <div class="columns">
     <div class="column is-two-thirds">
         <input type="hidden" name="user" value="{{ request.user.id }}" />
-        <input type="hidden" name="privacy" value="public" />
         <div class="field">
             <label class="label" for="id_name">{% trans "Group Name:" %}</label>
             {{ group_form.name }}

From 6bc86f189fdc898fe8baeaf22f8bcdc0739636bf Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 22 Oct 2021 20:23:45 +1100
Subject: [PATCH 182/193] notify group members of group changes

Send a notification to all group members when group name, description, or privacy are changed.
---
 bookwyrm/models/notification.py               |  2 +-
 bookwyrm/templates/notifications/item.html    |  6 ++++
 .../templates/notifications/items/update.html | 28 +++++++++++++++++++
 bookwyrm/views/group.py                       | 25 +++++++++++++++++
 4 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/templates/notifications/items/update.html

diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index b15b95c2c..2f1aae4f3 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -7,7 +7,7 @@ from . import Boost, Favorite, ImportJob, Report, Status, User
 # pylint: disable=line-too-long
 NotificationType = models.TextChoices(
     "NotificationType",
-    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD REPORT INVITE ACCEPT JOIN LEAVE REMOVE",
+    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD REPORT INVITE ACCEPT JOIN LEAVE REMOVE GROUP_PRIVACY GROUP_NAME GROUP_DESCRIPTION",
 )
 
 
diff --git a/bookwyrm/templates/notifications/item.html b/bookwyrm/templates/notifications/item.html
index 3ed43a96a..e8e2dcb26 100644
--- a/bookwyrm/templates/notifications/item.html
+++ b/bookwyrm/templates/notifications/item.html
@@ -27,4 +27,10 @@
     {% include 'notifications/items/leave.html' %}
 {% elif notification.notification_type == 'REMOVE' %}
     {% include 'notifications/items/remove.html' %}
+{% elif notification.notification_type == 'GROUP_PRIVACY' %}
+    {% include 'notifications/items/update.html' %}
+{% elif notification.notification_type == 'GROUP_NAME' %}
+    {% include 'notifications/items/update.html' %}
+{% elif notification.notification_type == 'GROUP_DESCRIPTION' %}
+    {% include 'notifications/items/update.html' %}
 {% endif %}
diff --git a/bookwyrm/templates/notifications/items/update.html b/bookwyrm/templates/notifications/items/update.html
new file mode 100644
index 000000000..5c60e5a24
--- /dev/null
+++ b/bookwyrm/templates/notifications/items/update.html
@@ -0,0 +1,28 @@
+{% extends 'notifications/items/item_layout.html' %}
+
+{% load i18n %}
+{% load utilities %}
+
+{% block primary_link %}{% spaceless %}
+    {{ notification.related_group.local_path }}
+{% endspaceless %}{% endblock %}
+
+{% block icon %}
+<span class="icon icon-local"></span>
+{% endblock %}
+
+{% block description %}
+    {% if notification.notification_type == 'GROUP_PRIVACY' %}
+        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        has changed the privacy level for <a href="{{ group_path }}">{{ group_name }}</a>
+        {% endblocktrans %}
+    {% elif notification.notification_type == 'GROUP_NAME' %}
+        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        has changed the name of <a href="{{ group_path }}">{{ group_name }}</a>
+        {% endblocktrans %}
+      {% else %}
+        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        has changed the description of <a href="{{ group_path }}">{{ group_name }}</a>
+        {% endblocktrans %}
+    {% endif %}
+{% endblock %}
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index 1c0a28486..9ee99bffa 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -47,6 +47,31 @@ class Group(View):
         if not form.is_valid():
             return redirect("group", user_group.id)
         user_group = form.save()
+
+        # let the other members know something about the group changed
+        memberships = models.GroupMember.objects.filter(group=user_group)
+        model = apps.get_model("bookwyrm.Notification", require_ready=True)
+        for field in form.changed_data:
+            notification_type = (
+                "GROUP_PRIVACY"
+                if field == "privacy"
+                else "GROUP_NAME"
+                if field == "name"
+                else "GROUP_DESCRIPTION"
+                if field == "description"
+                else None
+            )
+            if notification_type:
+                for membership in memberships:
+                    member = membership.user
+                    if member != request.user:
+                        model.objects.create(
+                            user=member,
+                            related_user=request.user,
+                            related_group=user_group,
+                            notification_type=notification_type,
+                        )
+
         return redirect("group", user_group.id)
 
 

From 1d791d950f3a851ca75411ec67685231f6352639 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 22 Oct 2021 20:30:25 +1100
Subject: [PATCH 183/193] add migration for updated notification types

---
 .../migrations/0112_auto_20211022_0844.py     | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 bookwyrm/migrations/0112_auto_20211022_0844.py

diff --git a/bookwyrm/migrations/0112_auto_20211022_0844.py b/bookwyrm/migrations/0112_auto_20211022_0844.py
new file mode 100644
index 000000000..246480b3a
--- /dev/null
+++ b/bookwyrm/migrations/0112_auto_20211022_0844.py
@@ -0,0 +1,93 @@
+# Generated by Django 3.2.5 on 2021-10-22 08:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0111_merge_0107_auto_20211016_0639_0110_auto_20211015_1734"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="notification",
+            name="notification_type_valid",
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("MENTION", "Mention"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                    ("BOOST", "Boost"),
+                    ("IMPORT", "Import"),
+                    ("ADD", "Add"),
+                    ("REPORT", "Report"),
+                    ("INVITE", "Invite"),
+                    ("ACCEPT", "Accept"),
+                    ("JOIN", "Join"),
+                    ("LEAVE", "Leave"),
+                    ("REMOVE", "Remove"),
+                    ("GROUP_PRIVACY", "Group Privacy"),
+                    ("GROUP_NAME", "Group Name"),
+                    ("GROUP_DESCRIPTION", "Group Description"),
+                ],
+                max_length=255,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="preferred_language",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("en-us", "English"),
+                    ("de-de", "Deutsch (German)"),
+                    ("es-es", "Español (Spanish)"),
+                    ("fr-fr", "Français (French)"),
+                    ("pt-br", "Português - Brasil (Brazilian Portuguese)"),
+                    ("zh-hans", "简体中文 (Simplified Chinese)"),
+                    ("zh-hant", "繁體中文 (Traditional Chinese)"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    (
+                        "notification_type__in",
+                        [
+                            "FAVORITE",
+                            "REPLY",
+                            "MENTION",
+                            "TAG",
+                            "FOLLOW",
+                            "FOLLOW_REQUEST",
+                            "BOOST",
+                            "IMPORT",
+                            "ADD",
+                            "REPORT",
+                            "INVITE",
+                            "ACCEPT",
+                            "JOIN",
+                            "LEAVE",
+                            "REMOVE",
+                            "GROUP_PRIVACY",
+                            "GROUP_NAME",
+                            "GROUP_DESCRIPTION",
+                        ],
+                    )
+                ),
+                name="notification_type_valid",
+            ),
+        ),
+    ]

From bdb6e4c911b25bdf81f9c0d2da5dd4ddc9046e66 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Fri, 22 Oct 2021 21:15:48 +1100
Subject: [PATCH 184/193] fix template indenting

whoops
---
 bookwyrm/templates/notifications/items/update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/notifications/items/update.html b/bookwyrm/templates/notifications/items/update.html
index 5c60e5a24..f963fd3a9 100644
--- a/bookwyrm/templates/notifications/items/update.html
+++ b/bookwyrm/templates/notifications/items/update.html
@@ -20,7 +20,7 @@
         {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
         has changed the name of <a href="{{ group_path }}">{{ group_name }}</a>
         {% endblocktrans %}
-      {% else %}
+    {% else %}
         {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
         has changed the description of <a href="{{ group_path }}">{{ group_name }}</a>
         {% endblocktrans %}

From f39ff96a6417aad37b19607eb1711e0aac108318 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 22 Oct 2021 10:25:33 -0700
Subject: [PATCH 185/193] Adds a few more tests to the suggested users module

---
 bookwyrm/tests/test_suggested_users.py | 95 ++++++++++++++++++++++----
 1 file changed, 82 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py
index 6b794b5dc..f625ac10c 100644
--- a/bookwyrm/tests/test_suggested_users.py
+++ b/bookwyrm/tests/test_suggested_users.py
@@ -35,11 +35,18 @@ class SuggestedUsers(TestCase):
         rank = suggested_users.get_rank(annotated_user_mock)
         self.assertEqual(rank, 3)  # 3.9642857142857144)
 
-    def test_store_id(self, *_):
-        """redis key generation"""
+    def test_store_id_from_obj(self, *_):
+        """redis key generation by user obj"""
         self.assertEqual(
             suggested_users.store_id(self.local_user),
-            "{:d}-suggestions".format(self.local_user.id),
+            f"{self.local_user.id}-suggestions",
+        )
+
+    def test_store_id_from_id(self, *_):
+        """redis key generation by user id"""
+        self.assertEqual(
+            suggested_users.store_id(self.local_user.id),
+            f"{self.local_user.id}-suggestions",
         )
 
     def test_get_counts_from_rank(self, *_):
@@ -69,21 +76,74 @@ class SuggestedUsers(TestCase):
         suggestable_user.followers.add(mutual_user)
 
         results = suggested_users.get_objects_for_store(
-            "{:d}-suggestions".format(self.local_user.id)
+            f"{self.local_user.id}-suggestions"
         )
         self.assertEqual(results.count(), 1)
         match = results.first()
         self.assertEqual(match.id, suggestable_user.id)
         self.assertEqual(match.mutuals, 1)
 
-    def test_create_user_signal(self, *_):
-        """build suggestions for new users"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") as mock:
-            models.User.objects.create_user(
-                "nutria", "nutria@nu.tria", "password", local=True, localname="nutria"
-            )
+    def test_get_stores_for_object(self, *_):
+        """possible follows"""
+        mutual_user = models.User.objects.create_user(
+            "rat", "rat@local.rat", "password", local=True, localname="rat"
+        )
+        suggestable_user = models.User.objects.create_user(
+            "nutria",
+            "nutria@nutria.nutria",
+            "password",
+            local=True,
+            localname="nutria",
+            discoverable=True,
+        )
 
-        self.assertEqual(mock.call_count, 1)
+        # you follow rat
+        mutual_user.followers.add(self.local_user)
+        # rat follows the suggested user
+        suggestable_user.followers.add(mutual_user)
+
+        results = suggested_users.get_stores_for_object(self.local_user)
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0], f"{suggestable_user.id}-suggestions")
+
+    def test_get_users_for_object(self, *_):
+        """given a user, who might want to follow them"""
+        mutual_user = models.User.objects.create_user(
+            "rat", "rat@local.rat", "password", local=True, localname="rat"
+        )
+        suggestable_user = models.User.objects.create_user(
+            "nutria",
+            "nutria@nutria.nutria",
+            "password",
+            local=True,
+            localname="nutria",
+            discoverable=True,
+        )
+        # you follow rat
+        mutual_user.followers.add(self.local_user)
+        # rat follows the suggested user
+        suggestable_user.followers.add(mutual_user)
+
+        results = suggested_users.get_users_for_object(self.local_user)
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0], suggestable_user)
+
+    def test_rerank_user_suggestions(self, *_):
+        """does it call the populate store function correctly"""
+        with patch(
+            "bookwyrm.suggested_users.SuggestedUsers.populate_store"
+        ) as store_mock:
+            suggested_users.rerank_user_suggestions(self.local_user)
+        args = store_mock.call_args[0]
+        self.assertEqual(args[0], f"{self.local_user.id}-suggestions")
+
+    def test_get_suggestions(self, *_):
+        """load from store"""
+        with patch("bookwyrm.suggested_users.SuggestedUsers.get_store") as mock:
+            mock.return_value = [(self.local_user.id, 7.9)]
+            results = suggested_users.get_suggestions(self.local_user)
+        self.assertEqual(results[0], self.local_user)
+        self.assertEqual(results[0].mutuals, 7)
 
     def test_get_annotated_users(self, *_):
         """list of people you might know"""
@@ -144,8 +204,8 @@ class SuggestedUsers(TestCase):
         )
         for i in range(3):
             user = models.User.objects.create_user(
-                "{:d}@local.com".format(i),
-                "{:d}@nutria.com".format(i),
+                f"{i}@local.com",
+                f"{i}@nutria.com",
                 "password",
                 local=True,
                 localname=i,
@@ -175,3 +235,12 @@ class SuggestedUsers(TestCase):
         )
         user_1_annotated = result.get(id=user_1.id)
         self.assertEqual(user_1_annotated.mutuals, 3)
+
+    def test_create_user_signal(self, *_):
+        """build suggestions for new users"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") as mock:
+            models.User.objects.create_user(
+                "nutria", "nutria@nu.tria", "password", local=True, localname="nutria"
+            )
+
+        self.assertEqual(mock.call_count, 1)

From 230c6f679893a15c9d0f64ecde7835273ab6fe18 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 22 Oct 2021 10:46:56 -0700
Subject: [PATCH 186/193] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 57128 -> 57136 bytes
 locale/de_DE/LC_MESSAGES/django.po   |   8 +-
 locale/es_ES/LC_MESSAGES/django.mo   | Bin 52929 -> 57328 bytes
 locale/es_ES/LC_MESSAGES/django.po   | 145 +++++++++---------------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 49128 -> 52510 bytes
 locale/fr_FR/LC_MESSAGES/django.po   | 160 ++++++++++-----------------
 locale/pt_BR/LC_MESSAGES/django.mo   | Bin 56440 -> 56435 bytes
 locale/pt_BR/LC_MESSAGES/django.po   |  14 +--
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 50813 -> 44096 bytes
 locale/zh_Hant/LC_MESSAGES/django.mo | Bin 38249 -> 38249 bytes
 locale/zh_Hant/LC_MESSAGES/django.po |  84 ++++----------
 11 files changed, 149 insertions(+), 262 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index cff3c02e0f08cfd668de4985bdba3f4c87608ffb..516685a0ec3dd82a26bd6b98ded4e934ba7e7bc8 100644
GIT binary patch
delta 6191
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
Wk&!ub+MK!0s*ZUP6<scRdi@{J@e{cK

delta 6211
zcmaLbd3aA(9>?*kB8z6R1X+-b2oklVV&5`qsilLASc=s4vlL;FVF;H}v`hq{wKEB=
zB_>3eR>Ur~?`!ce<soD0vDefX^Zq#J@BZ~V=iak?zu$B2Pae62CBH2!nL8`Q^*D~x
za=zm<!YquzYgh)o{^~fDumV=YI+%#vusmkj_q#Bh{%P!s53n+JNOzp7I0Qp*Cf2}}
z7>x(h9oH#Kqu363g+cU#7dTFHtd0>l088U^RABS49<Ib-Jb|Hj8>{0hd><n-948I`
zh!gP)PQ?!wI!-bkS?D^>U>ebj9Oo1K0ta9*4#G~09cLuwU>JsGI?h~-$NsnnyJGkf
z6WB;>O+O7=U;);`|DY18w$yP-VKS<MLtGlZG$x@koPmKjAC>6}^u{fyae1f(3a}g=
zu<tLT=3mEm@gAz=Pf_dme`PkTf_ff@718ZvUkpSYMJj6HIrjN-tU!OO^$<3te+>gL
z_-ix18v4+0h)SR(>a4ri{&>{7pP|MrK>~H1RW$s0un~2McA_FahmG(jRO!N&nfE<W
zmunnG;R4kBJk-YfQ1eftDs~I!VKGKx>T-g^r5MEi&IKAO*&WQsN4CFVg;{7jYN3PH
z6BtJSBI>d|Lf!HTE6qCbs0<UVAEM5>8*1JVRHa>vWPfKNjS$?9p?Dk>&|OrCAEOq0
zgMR3<%6yh(QS)L@3${To?19>_4{H2q9F7xFU&}4bz~|^{;n}Or0_ms$Yf+aj9~D3W
zYTPl@r8$RMxENLHr>J>eYs^uEqAp_%R3dR0ge_6yKSCW@@*3)|fg|mMKcgnhL@l@g
zRkCc<<=Kn6jOQ={@7w3TYt8#`RN!?{ccCF_<F=>-dSD&whf3hfwXSJo@<5rbMwKof
zHSwtRD(Zc)?K|tt`!cAEBC!R=VSP+N-HkP<jSivKJB3R4CMwWkmxfC5$PRdo+9=>}
zW<qt;*~X*Jwms_1JEJN!1hv6fjKRsM%bJb4OF5`Y6k#}Cvi&EhqjgJUnFWJT6KbJK
z+y<**Z=8TrP?0}EO?-tasb99SEGm#tRKQW#6dR%f9b=t>3UCfG-gPqUi{+@&Z$MS#
zd(<5$LQS}iD)n7d>0Y2RdyNXjf4%uV2uAgrU}a3eO4uKDhf-1N&c#6XcUIBR*=#{=
zP=FeE()MqmGJ1@fSaO3I7lL{ogH^COHp4#XjhU$TD^P*vpyn5#0z8Yp?C)Hqq0;>m
zwei1Ek-x#3Sos@MnYO5fdZUhF7;4@))WT^Pi3?HVwxbvBM^*3$YTjwo5nn@Bm+27=
z4fOlg{IeN|THyDnv+jn<Fd1uL8Y<8%`+g^?f`?FnUqEksj0)@}YMp?MCi8IAoru~<
z{e5ZF<AF-m#180$e)JPj8}&oojWMXeW}*)+LM5;qm02F@tP9Z(FQLAsTd0hG!MA~I
zGVjATQU3^DMDw5&wzGCd1=QU-7)#SnMct9<sErn)GTDeqB;Q(yTCWKE;z=xxF`G>#
z<53k#bZKaTKB!1Ns7%vPnP;HBhAjI&7ZpGeDx)i?Kp&#!Ia|y|!KeyFpaQLFZH*e=
z3w1Q^2paFwm}Vb*iCSn4s?>R?4G*9)Jdeucx_y5S73d3$M86!fUM$AaZ-jMmAnJVv
z>S(qh^IT^)jkiCIsEBUjP<)EY;Nz`k!XONwKMDhJGAgq#up6$!-{BKf>4X1n?nW5;
z({F%EECKbI_CPOv{|jiSl$oeZHen#{L7mYFRAA?=_pt{3*QkxE=bHJksGrybRHgc1
zbM)B$I#lMHP!-&PrS$#prJ(>0<9qlc>Mr<hGZ{pnKC31eg-NJ@{({OZ9kuWZ)WYjg
zKjpcob&uKpE!4WdqJG-TZm0e#X*><xfi_qM|A5Nu6AVHRsuHPK6Vp%|WTQU6Le%fW
zWz+`GQRDpc%%AD;sEQ6j-HGuSjjQvhzZN*e19<}#$P3ijzO%z@6oy(L9_!)<sPW^l
zHO@mF$#GN#pP<G^<ePDIQHgdyt)GOd+`xS5UyeqKeJ}%6!gSQ-TZSs_I{SPxrqbVu
z_3^!(=9jZSs$zpsl^Bky+-y`LOHp@XD|WzL);BH<McQGP*{~-n!erFOpP~YqfECb1
z{YA6{D`75{#~-jPUPoQRhp3<Q(*H1}4niGSL)84PsP)}XX(+M@7>rX<XT1np;4=IC
z5^CH7)Wm0~3jGgNTJP^nfWg*SY{2sb)Or)FQ&0(hhV17$=`?f}S@uOPDw6`Nh^J6z
zeiwCXgTFUt+87l;H&kG~Q5y}k{o&R>p#q+aI+9sf2{X}0-~SdGT3`oi;2zYG6rsL`
zOQ;O*S)XGh{gS)Qg4IzO#iQ0qKqb%-wO(J;9rK_PnuH2`0eb8E|B6O+T#Y({gQ&}O
z1w+xVz$_Gnx(ju%GB&~5n1q@)1GV8&)K{<;Bk&|DfS*yBJ9|tZA?T{K^=PPc$*9OY
zsDYzV8GVk~n2vR@L81M8P?bqRZJdT-I2%=wb*RgkgZeu5qmG~mRf)@m)V~FdhdfY(
zwfCBdtx$n<!Z=LCw`XU~L@khwI-=dEKu@3oyod^{<UW&FS=1d1K?N3#<1lWYYaV3t
zKofFNffS<7@T~3sgbLsVYD4e+W_%@#pdXET-wt(@NvO(BMs2(iRf(Ob&-fTB;9D*Y
zm97|7x~HgH9(cf<Z5+nX?~l5ab5I*CMV<Ku)WW+_37kgVnHyLQe?i@uu!A;pRAO<c
zeccaeXn~LL?dOB4z;M(Zn1a!`7<DAyp#s>C%KR*9-eXioFHt2famb7hz#8-`pfYcP
zI=V!o>x`hG3DZ%5%tuAG78S@QRK$DG3s2(!ynq_t@UW>wN32Re8CA)tsP|u^0^EYp
zn1`+KDt6KLA9BR}BjQ1QcI&YLUcy8yU1T!uk0JC&V-=i@oiQ7g(IZqMK0lb-ULL*a
zhoUMIY5Os#b?W0g?C*4>p)=}&I@4aLvmAxtI2pC!Qq*_71C`-zRHgolIx6p@W}T|m
z7*qx0QR{U;A522+(;wYuG{(_TsfHcn8^$T9j9#KHUC?o}P*qev4s{0-tldzTZ2;=)
zn28#fY2Rm|Dw~JCcn1~G&&R31HhRSaMOyBJIqPWDEpCijusiDV3_@i($-d7(&EJID
za6hUtXHXkGK%MzBtczhM?Oj0~P4Y?VuhM&Xpc0R@1JZFD{VY@fNvBMyhoUwbi>1&-
zRpN8(ic7F1-o=I(b(-VCKG+Kb&+u0e4#m27+@%pk<5x__s%On#r#Yx!#`~yS9evJh
z)D|_d2M)uTn1~Nhm1uR|`~oJSzusd2X4w8}97=yP_CdGY1$)`B3=bw_AkITAupEQ&
z8;r#QERXk46?lcZGbJvX3QWWL^iQEK+Z)t4pG#B`1F$;|#-8l&<kM)v1OLnXUSm6q
z$Bw9p(@<wM3$^h)R7PvC0p_3|-p0oG0JU+{6*I0jeoVh9Du7JvhyTJB`u;my<v)mc
zFbk9MDE7r#*UbM3&%y-ycQ6>Ee>4?phPw3~Q2~xZUApn80Mbx_%|cZq9pA^jxDlVA
zuP(#N>s%;YkIJax4YOb;)ZOTg!!Z?gS#M%XEXGW%dDCoMfaT~P#+rD=>f|-8pVHf_
zQM35^d7J0nDY^Ldyoz}n=C|+Mc$jCHCuO{6#Do#UJdy3kj2bm&qGw#}h?Ephit`)q
K@?x)e`}`kww;i_t

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 0d2861fb2..8fd930fee 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-15 22:03+0000\n"
-"PO-Revision-Date: 2021-10-20 16:40\n"
+"PO-Revision-Date: 2021-10-20 17:38\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -858,8 +858,8 @@ msgstr "Gesperrtes Benutzer*inkonto"
 #: bookwyrm/templates/directory/user_card.html:40
 msgid "follower you follow"
 msgid_plural "followers you follow"
-msgstr[0] "gegenseitige Follower*innen"
-msgstr[1] "gegenseitige Follower*innen"
+msgstr[0] "Follower*in, dem*der du folgst"
+msgstr[1] "Follower*innen, denen du folgst"
 
 #: bookwyrm/templates/directory/user_card.html:47
 msgid "book on your shelves"
@@ -3546,7 +3546,7 @@ msgstr "Folgt %(counter)s"
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] "%(mutuals_display)s Follower*in, der*die du folgst"
-msgstr[1] "%(mutuals_display)s Follower*in, der*die du folgst"
+msgstr[1] "%(mutuals_display)s Follower*innen, denen du folgst"
 
 #: bookwyrm/templates/user/user_preview.html:38
 msgid "No followers you follow"
diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo
index 35ccb7f0598696b8d7d23e944253fed54f02d6d4..7df75031089d13dd2d6ea34634e0f135c306dd86 100644
GIT binary patch
delta 19206
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
S|JCy^AJ_lim<7k59s57^$Y+@V

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

diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po
index 4f1ed8d21..ab71feb8a 100644
--- a/locale/es_ES/LC_MESSAGES/django.po
+++ b/locale/es_ES/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-15 22:03+0000\n"
-"PO-Revision-Date: 2021-10-08 00:04\n"
+"PO-Revision-Date: 2021-10-21 21:00\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -187,7 +187,7 @@ msgstr "Français (Francés)"
 
 #: bookwyrm/settings.py:169
 msgid "Português - Brasil (Brazilian Portuguese)"
-msgstr ""
+msgstr "Português - Brasil (Portugués Brasileño)"
 
 #: bookwyrm/settings.py:170
 msgid "简体中文 (Simplified Chinese)"
@@ -225,7 +225,7 @@ msgstr "Editar Autor/Autora"
 #: bookwyrm/templates/author/author.html:34
 #: bookwyrm/templates/author/edit_author.html:41
 msgid "Aliases:"
-msgstr ""
+msgstr "Alias:"
 
 #: bookwyrm/templates/author/author.html:45
 msgid "Born:"
@@ -237,7 +237,7 @@ msgstr "Muerto:"
 
 #: bookwyrm/templates/author/author.html:61
 msgid "Wikipedia"
-msgstr ""
+msgstr "Wikipedia"
 
 #: bookwyrm/templates/author/author.html:69
 #: bookwyrm/templates/book/book.html:94
@@ -300,7 +300,7 @@ msgstr "Separar varios valores con comas."
 
 #: bookwyrm/templates/author/edit_author.html:50
 msgid "Bio:"
-msgstr ""
+msgstr "Biografía:"
 
 #: bookwyrm/templates/author/edit_author.html:57
 msgid "Wikipedia link:"
@@ -488,7 +488,7 @@ msgstr "Número OCLC:"
 #: bookwyrm/templates/book/book_identifiers.html:22
 #: bookwyrm/templates/book/edit/edit_book_form.html:240
 msgid "ASIN:"
-msgstr ""
+msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
 #: bookwyrm/templates/book/edit/edit_book_form.html:143
@@ -575,7 +575,7 @@ msgstr "Idiomas:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:74
 msgid "Publication"
-msgstr ""
+msgstr "Publicación"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:77
 msgid "Publisher:"
@@ -639,11 +639,11 @@ msgstr "Identificadores de libro"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:200
 msgid "ISBN 13:"
-msgstr ""
+msgstr "ISBN 13:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:208
 msgid "ISBN 10:"
-msgstr ""
+msgstr "ISBN 10:"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:216
 msgid "Openlibrary ID:"
@@ -752,10 +752,8 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#, fuzzy
-#| msgid "View status"
 msgid "Edit status"
-msgstr "Ver status"
+msgstr "Editar estado"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -890,28 +888,24 @@ msgid "All known users"
 msgstr "Todos los usuarios conocidos"
 
 #: bookwyrm/templates/discover/card-header.html:9
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> calificó <a href=\"%(book_path)s\">%(book_title)s</a>"
 
 #: bookwyrm/templates/discover/card-header.html:13
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> reseñó <a href=\"%(book_path)s\">%(book_title)s</a>"
 
 #: bookwyrm/templates/discover/card-header.html:17
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> comentó en <a href=\"%(book_path)s\">%(book_title)s</a>"
 
 #: bookwyrm/templates/discover/card-header.html:21
-#, fuzzy, python-format
-#| msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "<a href=\"%(user_path)s\">%(username)s</a> quiere leer <a href=\"%(book_path)s\">%(book)s</a>"
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> citó <a href=\"%(book_path)s\">%(book_title)s</a>"
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
@@ -978,10 +972,9 @@ msgid "Join Now"
 msgstr "Únete ahora"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, fuzzy, python-format
-#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
-msgstr "Aprenda más <a href=\"https://%(domain)s%(about_path)s\">sobre esta instancia</a>."
+msgstr "Más información <a href=\"https://%(domain)s%(about_path)s\">sobre %(site_name)s</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
@@ -989,10 +982,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Estás invitado a unirte con %(site_name)s! Haz clic en el enlace a continuación para crear una cuenta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy, python-format
-#| msgid "Learn more about this instance:"
+#, python-format
 msgid "Learn more about %(site_name)s:"
-msgstr "Aprende más sobre esta intancia:"
+msgstr "Más información sobre %(site_name)s:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
@@ -1206,7 +1198,7 @@ msgstr "Un poco sobre ti"
 #: bookwyrm/templates/get_started/profile.html:32
 #: bookwyrm/templates/preferences/edit_user.html:27
 msgid "Avatar:"
-msgstr ""
+msgstr "Avatar:"
 
 #: bookwyrm/templates/get_started/profile.html:42
 #: bookwyrm/templates/preferences/edit_user.html:110
@@ -1346,10 +1338,8 @@ msgid "Imported"
 msgstr "Importado"
 
 #: bookwyrm/templates/import/tooltip.html:6
-#, fuzzy
-#| msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
 msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
-msgstr "Puedes descargar tus datos de GoodReads de la <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Página de Exportación/Importación</a> de tu cuenta de GoodReads."
+msgstr "Puede descargar sus datos de Goodreads desde la <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">página de Importación/Exportación</a> de su cuenta de Goodreads."
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
 #: bookwyrm/templates/login.html:49
@@ -1452,7 +1442,7 @@ msgstr "Invitaciones"
 
 #: bookwyrm/templates/layout.html:132
 msgid "Admin"
-msgstr ""
+msgstr "Administrador"
 
 #: bookwyrm/templates/layout.html:139
 msgid "Log out"
@@ -1600,7 +1590,7 @@ msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
 #: bookwyrm/templates/lists/form.html:31
 msgctxt "curation type"
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #: bookwyrm/templates/lists/form.html:32
 msgid "Anyone can add books to this list"
@@ -1710,12 +1700,12 @@ msgstr "Más sobre este sitio"
 #: bookwyrm/templates/notifications/items/add.html:24
 #, python-format
 msgid "added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
+msgstr "agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a su lista «<a href=\"%(list_path)s\">%(list_name)s</a>»"
 
 #: bookwyrm/templates/notifications/items/add.html:31
 #, python-format
 msgid "suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
+msgstr "sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a su lista «<a href=\"%(list_path)s\">%(list_name)s</a>»"
 
 #: bookwyrm/templates/notifications/items/boost.html:19
 #, python-format
@@ -1738,28 +1728,24 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</em></a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">comentario sobre <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">status</a>"
-msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">estado</a>"
 
 #: bookwyrm/templates/notifications/items/follow.html:15
 msgid "followed you"
@@ -2014,7 +2000,7 @@ msgstr "Editar anuncio"
 
 #: bookwyrm/templates/settings/announcements/announcement.html:35
 msgid "Visible:"
-msgstr ""
+msgstr "Visible:"
 
 #: bookwyrm/templates/settings/announcements/announcement.html:38
 msgid "True"
@@ -2088,7 +2074,7 @@ msgstr "Fecha final"
 #: bookwyrm/templates/settings/users/user_admin.html:34
 #: bookwyrm/templates/settings/users/user_info.html:20
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #: bookwyrm/templates/settings/announcements/announcements.html:48
 msgid "active"
@@ -2120,7 +2106,7 @@ msgstr "Activos este mes"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:27
 msgid "Statuses"
-msgstr ""
+msgstr "Estados"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:33
 #: bookwyrm/templates/settings/dashboard/works_chart.html:11
@@ -2167,11 +2153,11 @@ msgstr "Actividad de status"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:118
 msgid "Works created"
-msgstr ""
+msgstr "Obras creadas"
 
 #: bookwyrm/templates/settings/dashboard/registration_chart.html:10
 msgid "Registrations"
-msgstr ""
+msgstr "Inscripciones"
 
 #: bookwyrm/templates/settings/dashboard/status_chart.html:11
 msgid "Statuses posted"
@@ -2248,13 +2234,13 @@ msgstr "Instancia:"
 #: bookwyrm/templates/settings/federation/instance.html:28
 #: bookwyrm/templates/settings/users/user_info.html:106
 msgid "Status:"
-msgstr ""
+msgstr "Estado:"
 
 #: bookwyrm/templates/settings/federation/edit_instance.html:52
 #: bookwyrm/templates/settings/federation/instance.html:22
 #: bookwyrm/templates/settings/users/user_info.html:100
 msgid "Software:"
-msgstr ""
+msgstr "Software:"
 
 #: bookwyrm/templates/settings/federation/edit_instance.html:61
 #: bookwyrm/templates/settings/federation/instance.html:25
@@ -2368,7 +2354,7 @@ msgstr "Nombre de instancia"
 
 #: bookwyrm/templates/settings/federation/instance_list.html:40
 msgid "Software"
-msgstr ""
+msgstr "Software"
 
 #: bookwyrm/templates/settings/federation/instance_list.html:63
 msgid "No instances found"
@@ -2647,10 +2633,8 @@ msgid "Short description:"
 msgstr "Descripción corta:"
 
 #: bookwyrm/templates/settings/site.html:37
-#, fuzzy
-#| msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
 msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
-msgstr "Utilizado cuando la instancia se ve de una vista previa en joinbookwyrm.com. No es compatible con html o markdown."
+msgstr "Se utiliza cuando se obtiene una vista previa de la instancia en joinbookwyrm.com. No es compatible con HTML ni Markdown."
 
 #: bookwyrm/templates/settings/site.html:41
 msgid "Code of conduct:"
@@ -2662,7 +2646,7 @@ msgstr "Política de privacidad:"
 
 #: bookwyrm/templates/settings/site.html:57
 msgid "Logo:"
-msgstr ""
+msgstr "Logo:"
 
 #: bookwyrm/templates/settings/site.html:61
 msgid "Logo small:"
@@ -2670,7 +2654,7 @@ msgstr "Logo pequeño:"
 
 #: bookwyrm/templates/settings/site.html:65
 msgid "Favicon:"
-msgstr ""
+msgstr "Favicon:"
 
 #: bookwyrm/templates/settings/site.html:77
 msgid "Support link:"
@@ -2773,7 +2757,7 @@ msgstr "Ver perfil de usuario"
 
 #: bookwyrm/templates/settings/users/user_info.html:36
 msgid "Local"
-msgstr ""
+msgstr "Local"
 
 #: bookwyrm/templates/settings/users/user_info.html:38
 msgid "Remote"
@@ -2861,8 +2845,8 @@ msgstr "Crear estante"
 #, python-format
 msgid "%(formatted_count)s book"
 msgid_plural "%(formatted_count)s books"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(formatted_count)s libro"
+msgstr[1] "%(formatted_count)s libros"
 
 #: bookwyrm/templates/shelf/shelf.html:84
 #, python-format
@@ -2905,8 +2889,8 @@ msgstr "Publicado por <a href=\"%(user_path)s\">%(username)s</a>"
 #, python-format
 msgid "and %(remainder_count_display)s other"
 msgid_plural "and %(remainder_count_display)s others"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "y %(remainder_count_display)s otro"
+msgstr[1] "y %(remainder_count_display)s otros"
 
 #: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
@@ -3332,7 +3316,7 @@ msgstr "(Página %(page)s)"
 #: bookwyrm/templates/snippets/status/content_status.html:103
 #, python-format
 msgid "(%(percent)s%%)"
-msgstr ""
+msgstr "(%(percent)s%%)"
 
 #: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
@@ -3343,10 +3327,9 @@ msgid "Hide status"
 msgstr "Ocultar status"
 
 #: bookwyrm/templates/snippets/status/header.html:45
-#, fuzzy, python-format
-#| msgid "Joined %(date)s"
+#, python-format
 msgid "edited %(date)s"
-msgstr "Unido %(date)s"
+msgstr "editado %(date)s"
 
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
@@ -3576,7 +3559,7 @@ msgstr "Archivo excede el tamaño máximo: 10MB"
 #: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
-msgstr ""
+msgstr "%(title)s: %(subtitle)s"
 
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
@@ -3600,23 +3583,3 @@ msgstr "Un enlace para reestablecer tu contraseña se envió a {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr "Actualizaciones de status de {obj.display_name}"
 
-#~ msgid "Compose status"
-#~ msgstr "Componer status"
-
-#~ msgid "rated"
-#~ msgstr "calificó"
-
-#~ msgid "reviewed"
-#~ msgstr "reseñó"
-
-#~ msgid "commented on"
-#~ msgstr "comentó en"
-
-#~ msgid "quoted"
-#~ msgstr "citó"
-
-#~ msgid "About this instance"
-#~ msgstr "Sobre esta instancia"
-
-#~ msgid "Delete & re-draft"
-#~ msgstr "Eliminar y recomponer"
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index a1fbfd2cb5de46916399e1041b265435163bc70b..5e8dfa6646b38fbed1bbc9159b926c2d9839f176 100644
GIT binary patch
delta 17666
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
MEB-yu^vJ9K1)pp=kpKVy

delta 14847
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
BkAVOH

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 6330db793..141bd894b 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-15 22:03+0000\n"
-"PO-Revision-Date: 2021-10-08 10:19\n"
+"PO-Revision-Date: 2021-10-16 14:36\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: French\n"
 "Language: fr\n"
@@ -752,10 +752,8 @@ msgid "Help"
 msgstr "Aide"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#, fuzzy
-#| msgid "View status"
 msgid "Edit status"
-msgstr "Afficher tous les status"
+msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -890,28 +888,24 @@ msgid "All known users"
 msgstr "Tous les comptes connus"
 
 #: bookwyrm/templates/discover/card-header.html:9
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:13
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:17
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:21
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
@@ -978,10 +972,9 @@ msgid "Join Now"
 msgstr "S’enregistrer maintenant"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, fuzzy, python-format
-#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
-msgstr "En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette instance</a>."
+msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
@@ -989,10 +982,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy, python-format
-#| msgid "Learn more about this instance:"
+#, python-format
 msgid "Learn more about %(site_name)s:"
-msgstr "En savoir plus sur cete instance :"
+msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
@@ -1346,10 +1338,8 @@ msgid "Imported"
 msgstr "Importé"
 
 #: bookwyrm/templates/import/tooltip.html:6
-#, fuzzy
-#| msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
 msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
-msgstr "Vous pouvez télécharger vos données GoodReads depuis la page <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Importation/Exportation</a> de votre compte GoodRead."
+msgstr ""
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
 #: bookwyrm/templates/login.html:49
@@ -1738,28 +1728,24 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">status</a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/follow.html:15
 msgid "followed you"
@@ -1914,7 +1900,7 @@ msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:76
 msgid "Show suggested users:"
-msgstr ""
+msgstr "Afficher les utilisateurs suggérés :"
 
 #: bookwyrm/templates/preferences/edit_user.html:85
 #, python-format
@@ -1927,7 +1913,7 @@ msgstr "Fuseau horaire préféré"
 
 #: bookwyrm/templates/preferences/edit_user.html:116
 msgid "Default post privacy:"
-msgstr ""
+msgstr "Niveau de confidentialité des messages par défaut :"
 
 #: bookwyrm/templates/preferences/layout.html:11
 msgid "Account"
@@ -1940,12 +1926,12 @@ msgstr "Relations"
 #: bookwyrm/templates/reading_progress/finish.html:5
 #, python-format
 msgid "Finish \"%(book_title)s\""
-msgstr ""
+msgstr "Terminer \"%(book_title)s\""
 
 #: bookwyrm/templates/reading_progress/start.html:5
 #, python-format
 msgid "Start \"%(book_title)s\""
-msgstr ""
+msgstr "Commencer \"%(book_title)s\""
 
 #: bookwyrm/templates/reading_progress/want.html:5
 #, python-format
@@ -2048,11 +2034,11 @@ msgstr "Ajouter une annonce"
 
 #: bookwyrm/templates/settings/announcements/announcement_form.html:16
 msgid "Preview:"
-msgstr ""
+msgstr "Aperçu :"
 
 #: bookwyrm/templates/settings/announcements/announcement_form.html:23
 msgid "Content:"
-msgstr ""
+msgstr "Contenu :"
 
 #: bookwyrm/templates/settings/announcements/announcement_form.html:30
 msgid "Event date:"
@@ -2151,11 +2137,11 @@ msgstr ""
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:87
 msgid "Days"
-msgstr ""
+msgstr "Jours"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:88
 msgid "Weeks"
-msgstr ""
+msgstr "Semaines"
 
 #: bookwyrm/templates/settings/dashboard/dashboard.html:106
 msgid "User signup activity"
@@ -2171,7 +2157,7 @@ msgstr ""
 
 #: bookwyrm/templates/settings/dashboard/registration_chart.html:10
 msgid "Registrations"
-msgstr ""
+msgstr "Inscriptions"
 
 #: bookwyrm/templates/settings/dashboard/status_chart.html:11
 msgid "Statuses posted"
@@ -2198,7 +2184,7 @@ msgstr ""
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:18
 msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
-msgstr ""
+msgstr "Quand quelqu'un essaiera de s'inscrire avec un e-mail de ce domaine, aucun compte ne sera créé. Le processus d'inscription semblera avoir fonctionné."
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:25
 msgid "Domain"
@@ -2207,14 +2193,14 @@ msgstr ""
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:29
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:27
 msgid "Options"
-msgstr ""
+msgstr "Options"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:38
 #, python-format
 msgid "%(display_count)s user"
 msgid_plural "%(display_count)s users"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(display_count)s utilisateur"
+msgstr[1] "%(display_count)s utilisateurs"
 
 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:59
 msgid "No email domains currently blocked"
@@ -2372,7 +2358,7 @@ msgstr "Logiciel"
 
 #: bookwyrm/templates/settings/federation/instance_list.html:63
 msgid "No instances found"
-msgstr ""
+msgstr "Aucune instance trouvée"
 
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11
@@ -2483,33 +2469,33 @@ msgstr "Aucune invitation active"
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:5
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:10
 msgid "Add IP address"
-msgstr ""
+msgstr "Ajouter une adresse IP"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:11
 msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
-msgstr ""
+msgstr "Bloquez des adresses IP avec précaution, voire de façon temporaire, car les adresses IP sont souvent partagées, ou changent de main. Si vous bloquez votre propre adresse IP, vous ne pourrez plus accéder à cette page."
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:18
 msgid "IP Address:"
-msgstr ""
+msgstr "Adresse IP :"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7
 #: bookwyrm/templates/settings/layout.html:63
 msgid "IP Address Blocklist"
-msgstr ""
+msgstr "Liste des adresses IP bloquées"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:18
 msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
-msgstr ""
+msgstr "Tout trafic provenant de cette adresse IP obtiendra une réponse 404 en essayant d'accéder à n'importe quelle partie de l'application."
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:24
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:46
 msgid "No IP addresses currently blocked"
-msgstr ""
+msgstr "Aucune adresse IP n'est actuellement bloquée"
 
 #: bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html:6
 msgid "You can block IP ranges using CIDR syntax."
@@ -2647,10 +2633,8 @@ msgid "Short description:"
 msgstr "Description courte :"
 
 #: bookwyrm/templates/settings/site.html:37
-#, fuzzy
-#| msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
 msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
-msgstr "Utilisé lorsque l'instance est prévisualisée sur joinbookwyrm.com. Ne supporte pas html ou markdown."
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:41
 msgid "Code of conduct:"
@@ -2785,7 +2769,7 @@ msgstr "Détails du compte"
 
 #: bookwyrm/templates/settings/users/user_info.html:51
 msgid "Email:"
-msgstr "Email:"
+msgstr "Email :"
 
 #: bookwyrm/templates/settings/users/user_info.html:61
 msgid "(View reports)"
@@ -2905,8 +2889,8 @@ msgstr "Publiée par <a href=\"%(user_path)s\">%(username)s</a>"
 #, python-format
 msgid "and %(remainder_count_display)s other"
 msgid_plural "and %(remainder_count_display)s others"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "et %(remainder_count_display)s autre"
+msgstr[1] "et %(remainder_count_display)s autres"
 
 #: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
@@ -3343,15 +3327,14 @@ msgid "Hide status"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/header.html:45
-#, fuzzy, python-format
-#| msgid "Joined %(date)s"
+#, python-format
 msgid "edited %(date)s"
-msgstr "A rejoint ce serveur %(date)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "a commenté <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/note.html:15
 #, python-format
@@ -3361,32 +3344,32 @@ msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user
 #: bookwyrm/templates/snippets/status/headers/quotation.html:2
 #, python-format
 msgid "quoted <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "a cité un passage de <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/rating.html:3
 #, python-format
 msgid "rated <a href=\"%(book_path)s\">%(book)s</a>:"
-msgstr ""
+msgstr "a noté <a href=\"%(book_path)s\">%(book)s</a> :"
 
 #: bookwyrm/templates/snippets/status/headers/read.html:7
 #, python-format
 msgid "finished reading <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "a terminé <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/reading.html:7
 #, python-format
 msgid "started reading <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "a commencé <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/review.html:3
 #, python-format
 msgid "reviewed <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "a critiqué <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/headers/to_read.html:7
 #, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> wants to read <a href=\"%(book_path)s\">%(book)s</a>"
-msgstr ""
+msgstr "<a href=\"%(user_path)s\">%(username)s</a> veut lire <a href=\"%(book_path)s\">%(book)s</a>"
 
 #: bookwyrm/templates/snippets/status/layout.html:24
 #: bookwyrm/templates/snippets/status/status_options.html:17
@@ -3429,7 +3412,7 @@ msgstr[1] "%(shared_books)s livres sur vos étagères"
 #: bookwyrm/templates/snippets/suggested_users.html:31
 #: bookwyrm/templates/user/user_preview.html:36
 msgid "Follows you"
-msgstr ""
+msgstr "Vous suit"
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
@@ -3567,7 +3550,7 @@ msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez"
 
 #: bookwyrm/templates/user/user_preview.html:38
 msgid "No followers you follow"
-msgstr ""
+msgstr "Aucun·e abonné·e que vous suivez"
 
 #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
@@ -3584,7 +3567,7 @@ msgstr "Fichier CSV non valide"
 
 #: bookwyrm/views/login.py:69
 msgid "Username or password are incorrect"
-msgstr ""
+msgstr "Identifiant ou mot de passe incorrect"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
@@ -3600,26 +3583,3 @@ msgstr "Un lien de réinitialisation a été envoyé à {email}."
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
-#~ msgid "Compose status"
-#~ msgstr "Rédiger un statut"
-
-#~ msgid "%(format)s"
-#~ msgstr "%(format)s"
-
-#~ msgid "rated"
-#~ msgstr "a noté"
-
-#~ msgid "reviewed"
-#~ msgstr "a écrit une critique de"
-
-#~ msgid "commented on"
-#~ msgstr "a commenté"
-
-#~ msgid "quoted"
-#~ msgstr "a cité"
-
-#~ msgid "About this instance"
-#~ msgstr "À propos de cette instance"
-
-#~ msgid "Delete & re-draft"
-#~ msgstr "Supprimer & recommencer la rédaction"
diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo
index 8dc869921a8dbc5749de6859d2bb30bf5dbdcac9..1ebe5280048618f0a5075466d95c52dd815070ec 100644
GIT binary patch
delta 3378
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

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

diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
index c02168e6f..2e729a2f2 100644
--- a/locale/pt_BR/LC_MESSAGES/django.po
+++ b/locale/pt_BR/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-15 22:03+0000\n"
-"PO-Revision-Date: 2021-10-16 15:36\n"
+"PO-Revision-Date: 2021-10-22 13:31\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt\n"
@@ -23,15 +23,15 @@ msgstr "Já existe um usuário com este endereço de e-mail."
 
 #: bookwyrm/forms.py:256
 msgid "One Day"
-msgstr "Um Dia"
+msgstr "Um dia"
 
 #: bookwyrm/forms.py:257
 msgid "One Week"
-msgstr "Uma Semana"
+msgstr "Uma semana"
 
 #: bookwyrm/forms.py:258
 msgid "One Month"
-msgstr "Um Mês"
+msgstr "Um mês"
 
 #: bookwyrm/forms.py:259
 msgid "Does Not Expire"
@@ -48,7 +48,7 @@ msgstr "Ilimitado"
 
 #: bookwyrm/forms.py:326
 msgid "List Order"
-msgstr "Ordem da lista"
+msgstr "Ordem de inserção"
 
 #: bookwyrm/forms.py:327
 msgid "Book Title"
@@ -1189,7 +1189,7 @@ msgstr "Nome de exibição:"
 #: bookwyrm/templates/get_started/profile.html:22
 #: bookwyrm/templates/preferences/edit_user.html:49
 msgid "Summary:"
-msgstr "Descrição:"
+msgstr "Bio:"
 
 #: bookwyrm/templates/get_started/profile.html:23
 msgid "A little bit about you"
@@ -1496,7 +1496,7 @@ msgstr "Documentação"
 #: bookwyrm/templates/layout.html:245
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr "Apoie a instância %(site_name)s em <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
+msgstr "Apoie a instância %(site_name)s: <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:249
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index e245fa536cb6e94cf153492b07f0e101ed301a8d..1d1227f8092b70c68bb692fb532759090142aa83 100644
GIT binary patch
delta 15805
zcmZ|W2UJwozQ^%12v`vndt($8H5Tkj?5MF<>=k5GqJRRHsL7yFv7<S5jlIRLV<pC(
zo|wcW*ECZF(G>5srD^iMzd76Yd|B_Ewf=l|JG-7UGx4tbXmP%Cp9OfoE)lrW;#wYH
zSru`6Ny|#gXIXV>snoK*ZE9Jy@jEPqMVeVwA*_lOur8LyF4z`FVQ<`mQFsSKF`~I;
zmBB{n#%|c%vb@#=Q*jC_QSlMR;%%&f9a=c$<B_>p3$Q9~#430mHL)MC9R7}tF)Z2{
zurpRCKMEso9yY{1n8NthHGjggdOU4e$yB_C{jg3;%NmLqI32&j!8ov$v(m$;mEXZ8
zSg^HaY17&m6HyDWF$l9U49^)q!C=O>@<<fG+ZcksVSWs5Lts%<zLd#VGWlw#`|2Pk
zW;MYg*us=|!h+;`p^jj%$tN1q(5oAsCs7m^Vqsj14R8l)0#~sZevMkmZPb1DQTGM3
zbtY0AHIeeDfh(g1u8C^j9Mx|})DcW=%l_-^_E1m)&!HPXM%{1^wIi-}&Oo840V-n^
ztcvQW1FGFr)K1MsO<)OX0jp8{Z^SBi7|Y_v?YzznKT)6??_nT5M9tjQ-g&r+qb3xI
zy0I~;z6WaH;i&t@qjqp2YNuwR`kjqxw-B{sYf$ZXc}Zw%_n}^^*H91HTd0OrV=QYK
zHb8ZF0agAM7RRfm{3dFGw@v;bYG(sFI6F`lHQ{j7MCzm3ds~rE$6Zld)f?4tAZlV`
zQ7f2+de|~hTe|=?5!=*nMNMcAYJk(mcTD+bSf27*sG|t#=+|qNC7}VHLQSL*Y9cLA
zuS;80hq0)wjYrKq88zSxQ@+HMuSMOr6M3_(Y^;a(F&wLPa>na`#r6JoC!wt$f$BKX
z<fotpo@Me`s1>h6P2?3*e+;$N7cm$=M@{ToRQo%q4=&d;PXDD*{YGFJ#<v=f&_mS)
z^^qEn9((~cvFqqRTg*@XAqHV!XXmI2VRQ23QAg9yI2_e}EEd2N)X`2uO<+EHl~`pe
zwqqdqqo@^~LapQj)QZ1DP2^|PKz|qmyEyrxsQR*~iB~uIDAd5MOnDE~voNR&`>&a&
zQJ@v=Lv7g+)Wdfk3*Z$jh+m>slw<rE)&4$eivznl_2p3gRYBb!i3KqV^=w2Ndv<02
zwc>aR^l*$ttsoP1mMc)-TI<n`KGcAppgR5mHPN3?JN5{5UsyM1Lgi5_uaDZvHYVQ(
zHK8~!33WK$6imm$<mZ_3WvGrfp;mqjHSlYwmArw4@C(#Y=Ain!i~2SV=<W>UMlGy1
zYQfD=?Y%8YsKc(teyFV*hMh4UwW7VKoj79h?-)Nq?Z9VP1aG2N`~WpTa1UqYC9yF1
z8YbTmY3H>%kkI#bENUXj#;HyND+9Fy%P<6YqE>hmwWSwP^`D|9@*{@eL(~=*>glvE
ziJDjhY9||E6}|sYlZd2XIO-vqi`t@fsE#(FCbl2d!Ew~@f;UhDRPE&)K^@czo1xmp
zAWf`(sAp>{7R3vwiGPHFjBouwLO152-iCXsz`DJijvJzGY=xRochnILK|KSbP!mtb
zs<^<^??d%_1a<!z)KR{VmGKkwYAf!NP=|k_ZgBN+@*${>!;qhGR!!6ykHX@Zg!;hp
zqIPJ#al3Ip>a+ehs-L&9B7TkP=g&UuzY+!dI$K!^HIZ=CN~@!Gq7fFy=2!x|qE<8<
zwUP-~7Z;%>atigZUO?UV1?s4NGWiF_0{z&3t+;$Y=l!mMn&~rG8;7A*n28!_8>*uV
zsCMt6cJMpY#BZXu_%><*4^RsXjCI--N8MizHPHw!iDyaF!FsqF)zKTMmA{AjZukg8
z@fH@tKd=!N?(h5<ZG-AC12usKsDYNDCbACok-Hni@FHqwyjM-ZP1KE#P_JX)0B7LJ
zsEIT~t)!)~3pOM_088Qm)J|+fO=KtPhz_DAeg>=KWmLO+j$Z2_3EdDl(3w#PYUbgn
z3Dv?97=_g^26ZIkP#w=feFCmP?c65ReLGP7?n5o$m?_UjP2fBh)%*XpY490ph1XD9
zcFW{{L#-rekTYOORJ&@Zooaw;-_6tyMol2m<R_wbC<8UYm8O0@M(F+DY8t$O^~ryU
zI-A1$5Y$X7p;l5Ib%yn@7Iwi>n1<T11y}=ZEQ{Hwhx=pH0=_Z+f>p>rLjU_8KExRy
z5_LlqY6UHEDaK$Oyn>q0-^ToW3~FmbQ4du~)O|Hk3#e~whuX1zsQyQx9^MH<*?*ng
zW(w57Uen+#s^fQ256y?D6+A#qAZVD=VF>0UUmlaNGHRz58&{&*Z$!N{J5dukf!eW4
z!`Oc%E>oa^K11E`7wSxdhdTq8M0Fg2YF`J-VN;C6-uM(wLwy8qNA>e2s{IG334D&)
znOmrb_o0_WX%a<7IA0PGs2zzxZB<XyM24U`9EZAbB5JEMuncCJ`c0^b?lSd<P!l*|
z%Fm<D{vFh_<Ne7b0!BImltm5bM%`EsHDGhp)^$b=&>wkztP!a8Cs9ZA2CChssD*ux
zTFCFH`+`O}pR7f(F5_D*NOYxQtnmoeBmW3HV4XPU^_hhF9GHg{aV_#6N!D>w|2t~u
zipD#ySvk}Wg`;+^2I`rrhnh$uzh0hl5?X0TRKs4V6%Rx`lw(mh%s{PZ4yyfnQ@#V$
z{(#A!LI2sKcIE@r#IBiq9%_dkNXEDFjdnULh8n0mR>cTY-U;==(Hpg*0T_wHQSIj%
zm!cl7)u^L*1$D+JQ4_gr>c2wm<S*#eCzC6|S!rq1S=B~$)D$&9XRL&Mum+}}R<H`S
z(ru`>VJ~XH*HHt0iQ1`~s2#eC{KT;Gd7OVSiS=;)-6>c|0nedz74@akbd2*hB;s`P
z3sA3D;8^D$m7-7s#i2T$iq$a_HNbw<GxZnh2)m4PKEQ^fCcY4LB&)}<|4MA7AQkr`
zpD~s@(J7yaT1h5qXI7#H-h$zH0@dMF494rI1^tM%vH7#k(T&FZ<P)(6PQspe)@uri
zj(1i*3<IdhLUsHSHo#4&m3@T0u<8WoU%67T0Qp_m1P@^m%*C2`7gb*|$yq>k>_EN&
z@)N@HPBDphu^$EQWamd{I_e?Wk0E#t-FO*;@HVRB`>2)uWy*t7oSi6wPf;F*YTw4>
zJK{^^Cn5KHt-y(Vx=|2<>Tn#^RRh$PZbCg=J8=}ALk(DElCuM~Q1^|%W-eY=)VJRz
z&QtfD#6oz*<gcL~`d=}U@vS0h&ev{ZY)nN0YQ<}@0`9`1coFO471RI$>COjH1?0K4
znxh`VjTnKKP@flhCjU43U+c-vGt^1y{U1g`pJ=IA4YRN^9>qxf7#rcA$k<l>DUREW
zWu`i3xd^qB-{LfUnm--!D7L{ruq;MD=lq=Shu#_#EFw`GkDvy;hB~t#-o27o7(>yG
zI+7?Xh|N$t)y|anG7c~fHzuHtY`n>*8K+NY|JA`P3iQ-w88;YTF&;NwG=7LBXnzeg
zv45j>$eQ7tbz@Y&ZBP^KfyHnjY60U=6H1xE{;Oar1)9JMsE!wz{6>r-zZaY0SEfE}
zrqjL#>Z}`~`Wa{(fg0Fj@+nxC{1ntgx1%Qhnb$PPGu}2nK+X6OR>7jrJ7*V#8mJ3u
z1-(sv5NZJ<Q45%0@?O-LFE;rd#v`cvy=O^itKLL){3&YYU!i80i(&Y{)E9ceDKCy{
zUj>I?O;i3N($um|eQ|bJ{glO0YG-!5H8NqZ)sci|(ib(;A*Ml^)4-aJ>LAnPSDX6n
zsEO`1<;PG9xnSx)MD=^s<iA1fP_D_}#S(h||1cFH8BT-psE#7B95yleUZ@oeN3A@~
zINdl4HNbr1O5;}JLE~xT+mf-Zf05A2f52w=5bI&%S<VN>Xw-o7j7v}xTw&a5JcOFS
z8Iyn4<Ucq0T$8_tI#Snc_Fo;BBB7O4M0L>6*v8o1I2bk2F<2SBsQWfzEFMMmSMWt=
z>x-fCWlcWZ<ReiFtoI`OuLi?SMS^j>F%>nT=TIx2XUbQY^7SUa8_QFF(3HPpyo$Q-
zy2;-${%tHW$Nvy;&U2iB>Y!eq7RK(Td?Z$&d;+$@`KXD%fg0d_)I`5D=9%*QsCN10
zIy+Jb)vg3;oNzA*eLFS8eAo*0ZPpHTV^`D-eT*Ya`FN~Cd8#R2Vam6lc49Y1;6+n^
z!*~z%Ho4|G6ZaM;p@G6tpY=6R13ry<NIDybp<cI%rhd9H6Sa~RCcn$%kD^|`H!&DL
zFy;S3^?wuDIj{AAguY$_Go7bB4Ar11YNjz5jQvc02x^C(HKt(@`I*=rXQSG`j(S+%
zGx;3jPpAps#UgtDgXcQ~h8f+c26auoE$WPW7>AnrMAVMVL=89(HSr~;ex1qhH)b2(
zMD_QH@_PTjHx;)rKlz8~-;o7oVyFS!sITcrtc!h7?J`V#7HY><p(e5ub%Z|bhHs+!
z4_oM10sa5`Ujzw#*+k($Y=_lxEvlolSRCI&P2_7+o`c%*JEpwJBBy;z)C#*82cqut
zpq{Y_s9#327P0?&t=5<ZM^OX5idxBAru;M1)BcUgyB0eg7C;RYidtDE)P2=auW1u3
zf@!ED%|H!ooBW=|I)4gYqo5#OLUnK%^$GX2@evjwUvY_JEn`#Ez%f_|yP^6UfEsYP
zaiZ}>tV;PRtb?b#B-C*(YA5cZZVX-OlvhRN>l@pf^8Tm};!#g|7DnQ3)J}bf8t4vc
zVWqO1&xLSQJ{mPqZwC@uK{r#-&omff@(CtC-sC6aAllEwM);|zFSyL<FbuVj@)(Lu
zu^4tj9mzoKiYt+Yd#!ItXaYYQ@1s`y$XIN-(@_L!ry3dCqE^rY^(7RG`s91ol+Q)A
zUu^2vq9%M0i{TF#toQ$(Kf%vy)C~bInTHCsl1iw7TA=FNntTroAs>rcK)fk`7WLXq
z!fH4d%itbV`wOUN<wNxU@Bd$tPzT=|Z>fU(9pmq)fi2tFnGjUH8&w{O>bSAVw?}P#
zFOwgMYCi$PFwNvM(W{0_O~FP~eg}r(F;o7w@k7*?%2f=*Kd~N$u5c#S8Z}TK)Pe?~
zenE}Gnm8Rb;ccjg@X!kOU$0p<1$v4<#}atQGz?nl+)x6wmEouxI~aSK`a!6HJ=hH=
zV0}D^nn<3h|F`j1)B^rmY2N=5tDJ$#8EY6D8QWrAZs>s;Xoe}DZOlSVYy(E(PSlZH
zMor)=)XrW<-G2}J;-6j;+LE5Dor<BTd^~C=QcyR}HsvoFH=#bF_n|txV#+^9wa+!>
z4^R_$grzWOjWfXtMsJKsj7JS@8#f#G8?#XzzlnOyuA-iWJEp$$T4%)(sD2t4Tchsl
zhMMS5)WYJCiFvKbrs8?y9MtQv2(_iFP@ia<Q5{_{UO{#EJ!-(4sP+#`y|vCMFNWHI
zN;nLwqmE{_U(SCS33ad$HM6}Ye+D(cyBLL6FcR~v=T{Lvh5GhOM?D)Sup{PRS=DcF
zK0i93@}sZ~K8HGrQy9wl)(0ds&^M@==9>I3sNaP5Q4{>#82qx64>P(^6R&G*Ys&j!
zdCEtjc4mfguBp#LueN#v2~A)ZYHJP{PooBY2Q|P|lfPyB71eRzMrWl(QT^3M_16To
zpq8ljzk|sqq57S?k@GJ{Vm1XDU;}Dv4w?q9V@dK?O!*BgL;ew##!{P{j_RPcxCLs!
zzUamwSPN&M2Hb&~*b%IRr#5+=0k2Y^3H*#|Xl-^rAVRPo*(%rqC*vSIh$&cLi*xqV
zP!rgRDnE<0vHn)aA*lMfsE2qX>g_q;CDE0{6&#9{wmB<%4)xG2Lrv(s@v`wt97lN`
z_QyWkop!s7M~&xE3%iUF_?;;a+TrYkw*(1oQ8`q@7*jC-b+*GX7RMS-8;kFB{=sn!
zYD+hu+HXUBC+tVv_Z9ZR2D_a0FQVF=!UlT(FOtv-@1xE>V7Jp@SyXvAcECEQt)FCk
z#~AU7b2Kwi&&qMs_xrn83%|l(4Bq1yf(6N!^yfMM%BG+?YUcG#egrlmKMs5022=hM
z>Zl%|&a&@b=U+_YQ3I{V3b+-Y#xtk^|3Fr31@3e5P0_{pR-*uC=4D;{gAn=8@bRS^
zCs40z3Q>W&Y%GM8Ou6cQ)t@J>y3{Wx(kPow45V!|!EYSvMZ%`8DtV3XzuNM*EAg8@
z$A8VxK-V`o*GXCjNe?mUYNU@6;pE$6L1H!?zKFUO7@tNRhX<d*R<!w%bd*!?wa$`=
zq)^u=;uQJO<Zq~et0ehl<O`Gjo#;z`4)G~5mbgXCC03|0*LKpc6JtqN<i1{{U%<N<
zM0BP+nf$X#2blF=ps)-DTZlD;u6tORhI;=8kX}jTC(rX_-5{Ng$wXPo4&XV;bba7p
zwIc7Ot~b$!^zXz{(s~VN5XXtXycCY2@SoRJ%3mRJi20_zI_Ut?`%n*7f+_FukDD)>
z{0iFbCUoh+dwfNbNHFF4?6Ahr(Gp@4g)PZ9A^nRgxVlkR$4OcpNPk4sC%T!zzoxDo
zX?=_zA|{f4$No>tFz-5Z*LTJ^YEF>uX!1?yr5&MbEOq+0dwlJs{NKa~%KKv-(@ymt
zlGX=9AVyK|BmESXAoM=~n9DiY(c}tK_yE_Ti|9_e4vmMC-b}P5JsBTglSs57ejwbG
zk05rDejm4BF!sgU#B0R6#H*COkNTw2^|RjWvrgLDjJs%{i?OVaiAF>rWw>e(w@tnB
zT}`>tx(1NnhBt})#6;7!6wW6<;fZ?#X`4t?cGgcVR|N{D(daiqpRuLL$CI8y6d?Zc
zw_=w_Po{1-F_?5M;!oo7b)EEj;tygfZKe>-2whu=mBf3*Fv|SnUnf(X#>a`1gsvds
zIU01sJQZ+#>frzT6@RZ0FPO4r_ysYD`<D>|iHD}Hrg5NAY@nVmcW3=QDOf<fOJQ+*
zh(j1W1a-Ymd}-3_Np~TpQ$LufWXk(crt2B<c|;HDe8`UwYl*+c`O}fI#zawnmhoqj
zs6s5{23;4aoIyNo@=mGqH<R*ml=mS<n2Iix6(PS6bzLMDkS|KyB0Ubj#97prBppsX
zzP`{W%ZKEyU=S6drt)pdRHrw85@q|a^b<F_NLQsy*DO<h%*p!y-R%zd>RN(js2@rC
zU!=oLc@y$8DfgZs(UijHh=xQD;&VdR$H)%@|22rln@sws@ig@{h*RV{5izuxO@1{I
zPx{I04jKIz{D8Wl)YZm%0i1use>6;?Q7UCWVHUoD{`V0+B1UmzZOR+qzsOf44yaQ?
zSNA9SOEhIwDC<ikP#=s*7_G+o2@nT=`!miT9tr=o)SlHm%wE<!(EBUhOyjmlEJ0*a
z|2OJ-1J9Urd)kaA-4ylz)X-Ir@R;-k>OxIh)!o&fC$2-(g%R&imdQQO5GmTD9Teme
z8N}N(h)_@&qcYN6iMpgaqps=rBK6M`V@R*1>^~Swd`*1rZ{_@%NxmX6{)w`Cq}drO
zfO7vk8ckv@owdbzDl?aU>gg&*-7K6;JVl$u<ja!&miUDHIoyE@F$ot@|0C%=q;-Xn
z|DJS+llA{cvywe2U##~)*HxlBX&ZmQ`nc58g_714OT0?7C(4<+o!FCbQ>Gu!FB6Zi
zS|mC$$jQeAc!ai#h(5$f!uuzMwTXIUvWVHF7ZJxuzeY?WT^@%K`RJ?&wxdkfP13rG
z;+r^*7)hJA$a_fVBhC{)k$(xx6U~Wvw0R!6yw-O9rqZB3g_lUXQP(P>u|LJ9J>I9y
zH+Ycvgcwh|srWMGkFR{B&p(krVk!#Kb`|9l9yi1Wl)Ys>qpcQH&M}phsklV`+7li1
zCf$(wcp{LPL7Nbw15tozO&m7&KZ|9E-b6C@W#N7zKj{}tpH+>IbpG#|Od2N9(IiYa
zWjWmVCh7m6u12I&h&bXfQH}Qd@$t3$aRNtE-kR8I>Q__tJyDZ;bhV`1|AFu<1;Z%_
zBU%vKs91x#3OQH<uomsEU_VSJnvsshmPBzPoBO^aniG$x8%m^6UYDp$Sz{cBx@uxm
zJ<I(_1XHllR5Yj2V)ChK^~CiH^(TmzOgmLQPx@Q`PrX*AWqIz_RfU?Lu?_h|+(1+(
z{S=lqJ*>rQ<aM>6E{1$-()Wq4NbkYDgs!RN`_rZvKE85EpC;4E_4vO@D9E7E5bR}I
z)gV8ZbT9n(<2$hn`T4ZFOiUy{hUi4u9O60B!wCOnhqQSn|Cp52q`352_TO#X_VaDO
zu&1_L<*V9$sLNgw)6KpcQ{5NSVL*VZo&BA+obUBc-?&P|r%X<Fr;kfab0;RJrN<?Y
z_SjoH$JoDijtPxVNg1DJwM$5Fk4~B5Nwr6JnQVXCrGc+P*L*H}VYkErX`?;K35m&L
zeMh^8xO^Y?xZ^64G%+R3<EEqZ$!Ye5UMqZ?dq3r}Kkd`iZqc_@p&IT~Pu+ynxH0K=
za^Euc^1fs2g8f$8hx<*jo5WVEm@;~Dk|&va6H}6{4k?~Ach8h`cgJZH6H`6Dld(ZA
z`~ChE3MVJH6XMc6R>$N7UzY*bT&`%l>!42d?m^)-6IqET)l<jnoS5Kok4c=6?nzCv
zI;SLg{D0iBiAkObiOC*cmBC|N_Szw1?LtE%eC>yZy2^SI64N~i?)c}Tt?r(<)MR&3
zN~*`*GS2?)rE<?yuNkL(8aXj8eO#@ys;&LG|GjH1>&LaO_vEerM;qUSVb@&tm=W&6
zDXH$5lq4-S&Av1u%^p0my1jCw#|~{*%GYsJ3zwZ4_q#nmeqR2xw5chn3DI`s=$7^j
z&gRzWN%>OP+LVM$Ux25qtMCN>Zl#S&oS5c|9`jK^874n^oYl{do5#T&=hi{mp2Q^k
z+r)?V?PnYN#*RPivTG)lVe2xI(tV-HWdiID6aTVfC)Kg%Pnu_clG@m=l(yUcBrVUr
zklx&0IJt&>X>ykDg((FB?UmE}+8Hyd`Cgc@)MfuYvr+JvxG5>AiFSjT-To(8&E7t<
z#uM2>&Lg2+@^yWFLV$hH+tBx=w~ovHE8~{}lhZt@$#F>@``qkOK~eP@)N5d0n_b@<
z)u?X6D0fs;bd#n}MR67C9+#G0H#RjcIgMqfq(-~D#U;nNTaKNaFnwam^tKZcr+Dg(
zPDyG_!{o7(<HmaG#(LtCqTM~%GLO5j$1{Z^?cSY+^-@yD{!g=L_w;ciV|o_q(WOVn
zx&wG-cmSi__QDq@+Nb6;ed47moA2h9WA^&FJM6*p5`9<aCA;jw^V{36&JVYv)|9d*
zW)$`{UC=q8VD5%}*H7)dv2Kq4MLWLeqAN6KuJ3yGQYvx|Y`lJEkv(lmOZ)tiKK5@*
zLhPueMeS}&r`T^TZDtqAx@QksHZ?eBNoG!VmT%^Am&>>GrGLAM<i2z$XWrTy3y<e!
z%(9<fvB1}6WjU7}zpAhO#;R5oP949Qxg>Yhp}b=!@|G;Ha^`QoxpsTb$z?fNC+t$I
z6Yb@zr`eU(46$dgsaRrFX6}}4R_>vb*H13V*?u^8<$T}mHMLx2ZX7tAv*A$A%Nfzu
z&DjT(o0XNb<2AeMx{AIJ)?ISt&)s}F=X6%IeP%;PyZp-$6|cXxnfjdN8MjX_wr;Ll
zmbW@9?`&r7tJ`zd?zWR&E@wv!F5^4%as!wBaAP04|E8+GMVpGb%HKG>D(}ql>)F}S
z*7fXpdAqjdu0NWyeVuvRV*mNJ<!)HO=Kc51v8&h5Zpoc>P!H1&8MFUaAOBxl-^tCt
zxa`-qMugs2zdYyQrkv$#@(#|)JCJRc-j-qewnf^vwxtB;9@#<%_LlRdecQM9ciFC;
zckMrSZVEm)@5bg?(e~k8k@k<f;_d#srv&Gm$;er-#Qt{oMBl(yO1pxY;SJxbzFB+b
z2887<+i>IPR?9)p!TJOC$o<3ZxA*^SUpmm%*YjYuE9}IPysdkkW3rq>jke<tkM(_X
zI4HpP$XC>5haYQYCmvg1?>gSj{`2@r``n2~_W6@7?fIvg*q@wQY5$R3)^{rVw|w^5
zGkttZ&)P1#%=rd|S8d4Mx0P+>Z0uPtR1D62c}HI69y@AbIeXf<qD6B4QE%735N>~X
zu5hqZVSjfn$~Wlz<beEE&gqpmR_wMbpRX0dR$YJf1f5#fPiFH-SGOx%x)8?GsBup1
ar259IYyZ10==FVtxHEVDiJWCitp5Ugi@+QJ

literal 50813
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
HFaQ4lBmQE#

diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo
index 9cfc176eb2f8441c795fd9488c814b2bea6351df..0bd0ad46e02da915244e3efe4ba13fe687a55bad 100644
GIT binary patch
delta 23
fcmaF4is|JlrVTHWI1J4c3{9+z%{G5Xsx$%sdqoLs

delta 23
fcmaF4is|JlrVTHWI1DTl3=FIcj5mKssx$%sdix1t

diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index d95f0655a..7b9d3b778 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-15 22:03+0000\n"
-"PO-Revision-Date: 2021-10-08 00:03\n"
+"PO-Revision-Date: 2021-10-16 14:36\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh\n"
@@ -751,10 +751,8 @@ msgid "Help"
 msgstr ""
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#, fuzzy
-#| msgid "Like status"
 msgid "Edit status"
-msgstr "喜歡狀態"
+msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:4
 msgid "Confirm email"
@@ -887,28 +885,24 @@ msgid "All known users"
 msgstr "所有已知使用者"
 
 #: bookwyrm/templates/discover/card-header.html:9
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> rated <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:13
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> reviewed <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:17
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> commented on <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/card-header.html:21
-#, fuzzy, python-format
-#| msgid "replied to <a href=\"%(user_path)s\">%(username)s</a>'s <a href=\"%(status_path)s\">status</a>"
+#, python-format
 msgid "<a href=\"%(user_path)s\">%(username)s</a> quoted <a href=\"%(book_path)s\">%(book_title)s</a>"
-msgstr "回覆了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">狀態</a>"
+msgstr ""
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
@@ -975,10 +969,9 @@ msgid "Join Now"
 msgstr "立即加入"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
-#, fuzzy, python-format
-#| msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+#, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about %(site_name)s</a>."
-msgstr "瞭解更多 <a href=\"https://%(domain)s%(about_path)s\">有關本實例的資訊</a>。"
+msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
@@ -986,10 +979,9 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "你受邀請加入 %(site_name)s！點選下面的連結來建立帳號。"
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy, python-format
-#| msgid "Learn more about this instance:"
+#, python-format
 msgid "Learn more about %(site_name)s:"
-msgstr "瞭解更多有關本實例的資訊:"
+msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
@@ -1733,28 +1725,24 @@ msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "轉發了你的 <a href=\"%(related_path)s\">狀態</a>"
 
 #: bookwyrm/templates/notifications/items/fav.html:19
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "喜歡了你 <a href=\"%(related_path)s\">對 <em>%(book_title)s</em> 的書評</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:25
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "轉發了你的 <a href=\"%(related_path)s\">對 <em>%(book_title)s</em> 的評論</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:31
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "喜歡了你 <a href=\"%(related_path)s\">來自 <em>%(book_title)s</em> 的引用</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:37
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+#, python-format
 msgid "liked your <a href=\"%(related_path)s\">status</a>"
-msgstr "喜歡了你的 <a href=\"%(related_path)s\">狀態</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications/items/follow.html:15
 msgid "followed you"
@@ -3326,10 +3314,9 @@ msgid "Hide status"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/header.html:45
-#, fuzzy, python-format
-#| msgid "Joined %(date)s"
+#, python-format
 msgid "edited %(date)s"
-msgstr "在 %(date)s 加入"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
@@ -3579,26 +3566,3 @@ msgstr "密碼重置連結已傳送給 {email}"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
-#~ msgid "Compose status"
-#~ msgstr "撰寫狀態"
-
-#~ msgid "%(format)s"
-#~ msgstr "%(format)s"
-
-#~ msgid "rated"
-#~ msgstr "評價了"
-
-#~ msgid "reviewed"
-#~ msgstr "寫了書評給"
-
-#~ msgid "commented on"
-#~ msgstr "評論了"
-
-#~ msgid "quoted"
-#~ msgstr "引用了"
-
-#~ msgid "About this instance"
-#~ msgstr "關於本實例"
-
-#~ msgid "Delete & re-draft"
-#~ msgstr "刪除並重新起草"

From 37ff68adb17c588e249cafd40611358c474d86d4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 22 Oct 2021 10:48:22 -0700
Subject: [PATCH 187/193] Updates with new translation strings

---
 locale/en_US/LC_MESSAGES/django.po | 576 ++++++++++++++++++++---------
 1 file changed, 393 insertions(+), 183 deletions(-)

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 3f04e5c5c..110eb7d16 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-15 22:03+0000\n"
+"POT-Creation-Date: 2021-10-22 17:47+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -47,29 +47,29 @@ msgstr ""
 msgid "Unlimited"
 msgstr ""
 
-#: bookwyrm/forms.py:326
+#: bookwyrm/forms.py:332
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:327
+#: bookwyrm/forms.py:333
 msgid "Book Title"
 msgstr ""
 
-#: bookwyrm/forms.py:328 bookwyrm/templates/shelf/shelf.html:136
-#: bookwyrm/templates/shelf/shelf.html:168
+#: bookwyrm/forms.py:334 bookwyrm/templates/shelf/shelf.html:149
+#: bookwyrm/templates/shelf/shelf.html:181
 #: bookwyrm/templates/snippets/create_status/review.html:33
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:330 bookwyrm/templates/lists/list.html:109
+#: bookwyrm/forms.py:336 bookwyrm/templates/lists/list.html:110
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:334
+#: bookwyrm/forms.py:340
 msgid "Ascending"
 msgstr ""
 
-#: bookwyrm/forms.py:335
+#: bookwyrm/forms.py:341
 msgid "Descending"
 msgstr ""
 
@@ -166,7 +166,7 @@ msgstr ""
 
 #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:81
+#: bookwyrm/templates/user/layout.html:88
 msgid "Books"
 msgstr ""
 
@@ -224,7 +224,7 @@ msgid "Edit Author"
 msgstr ""
 
 #: bookwyrm/templates/author/author.html:34
-#: bookwyrm/templates/author/edit_author.html:41
+#: bookwyrm/templates/author/edit_author.html:43
 msgid "Aliases:"
 msgstr ""
 
@@ -277,71 +277,72 @@ msgstr ""
 msgid "Updated:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:15
+#: bookwyrm/templates/author/edit_author.html:16
 #: bookwyrm/templates/book/edit/edit_book.html:25
 msgid "Last edited by:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:31
+#: bookwyrm/templates/author/edit_author.html:33
 #: bookwyrm/templates/book/edit/edit_book_form.html:15
 msgid "Metadata"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:33
-#: bookwyrm/templates/lists/form.html:8 bookwyrm/templates/shelf/form.html:9
+#: bookwyrm/templates/author/edit_author.html:35
+#: bookwyrm/templates/lists/form.html:9 bookwyrm/templates/shelf/form.html:9
 msgid "Name:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:43
+#: bookwyrm/templates/author/edit_author.html:45
 #: bookwyrm/templates/book/edit/edit_book_form.html:65
 #: bookwyrm/templates/book/edit/edit_book_form.html:79
 #: bookwyrm/templates/book/edit/edit_book_form.html:124
 msgid "Separate multiple values with commas."
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:50
+#: bookwyrm/templates/author/edit_author.html:52
 msgid "Bio:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:57
+#: bookwyrm/templates/author/edit_author.html:59
 msgid "Wikipedia link:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:63
+#: bookwyrm/templates/author/edit_author.html:65
 msgid "Birth date:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:71
+#: bookwyrm/templates/author/edit_author.html:73
 msgid "Death date:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:79
+#: bookwyrm/templates/author/edit_author.html:81
 msgid "Author Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:81
+#: bookwyrm/templates/author/edit_author.html:83
 msgid "Openlibrary key:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:89
+#: bookwyrm/templates/author/edit_author.html:91
 #: bookwyrm/templates/book/edit/edit_book_form.html:224
 msgid "Inventaire ID:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:97
+#: bookwyrm/templates/author/edit_author.html:99
 msgid "Librarything key:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:105
+#: bookwyrm/templates/author/edit_author.html:107
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:116
+#: bookwyrm/templates/author/edit_author.html:118
 #: bookwyrm/templates/book/book.html:140
 #: bookwyrm/templates/book/edit/edit_book.html:110
 #: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/groups/form.html:24
 #: bookwyrm/templates/lists/bookmark_button.html:15
-#: bookwyrm/templates/lists/form.html:44
+#: bookwyrm/templates/lists/form.html:75
 #: bookwyrm/templates/preferences/edit_user.html:124
 #: bookwyrm/templates/settings/announcements/announcement_form.html:69
 #: bookwyrm/templates/settings/federation/edit_instance.html:74
@@ -353,11 +354,13 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/author/edit_author.html:117
+#: bookwyrm/templates/author/edit_author.html:119
 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit/edit_book.html:111
+#: bookwyrm/templates/book/edit/edit_book.html:112
+#: bookwyrm/templates/book/edit/edit_book.html:115
 #: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/groups/delete_group_modal.html:17
 #: bookwyrm/templates/lists/delete_list_modal.html:17
 #: bookwyrm/templates/settings/federation/instance.html:88
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -398,7 +401,7 @@ msgstr ""
 
 #: bookwyrm/templates/book/book.html:136
 #: bookwyrm/templates/book/edit/edit_book_form.html:34
-#: bookwyrm/templates/lists/form.html:12 bookwyrm/templates/shelf/form.html:17
+#: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17
 msgid "Description:"
 msgstr ""
 
@@ -461,7 +464,7 @@ msgstr ""
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
-#: bookwyrm/templates/user/layout.html:75
+#: bookwyrm/templates/user/layout.html:82
 msgid "Lists"
 msgstr ""
 
@@ -471,7 +474,7 @@ msgstr ""
 
 #: bookwyrm/templates/book/book.html:315
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:181
+#: bookwyrm/templates/lists/list.html:182
 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:26
 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32
 msgid "Add"
@@ -544,7 +547,8 @@ msgid "This is a new work"
 msgstr ""
 
 #: bookwyrm/templates/book/edit/edit_book.html:97
-#: bookwyrm/templates/password_reset.html:30
+#: bookwyrm/templates/groups/members.html:16
+#: bookwyrm/templates/landing/password_reset.html:30
 msgid "Confirm"
 msgstr ""
 
@@ -613,7 +617,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:132
-#: bookwyrm/templates/shelf/shelf.html:127
+#: bookwyrm/templates/shelf/shelf.html:140
 msgid "Cover"
 msgstr ""
 
@@ -794,7 +798,7 @@ msgstr ""
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
 #: bookwyrm/templates/landing/layout.html:67
-#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/landing/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:56
 #: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
@@ -994,10 +998,10 @@ msgid "You requested to reset your %(site_name)s password. Click the link below
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
-#: bookwyrm/templates/password_reset.html:4
-#: bookwyrm/templates/password_reset.html:10
-#: bookwyrm/templates/password_reset_request.html:4
-#: bookwyrm/templates/password_reset_request.html:10
+#: bookwyrm/templates/landing/password_reset.html:4
+#: bookwyrm/templates/landing/password_reset.html:10
+#: bookwyrm/templates/landing/password_reset_request.html:4
+#: bookwyrm/templates/landing/password_reset_request.html:10
 msgid "Reset Password"
 msgstr ""
 
@@ -1103,7 +1107,7 @@ msgid "What are you reading?"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/layout.html:45 bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/layout.html:45 bookwyrm/templates/lists/list.html:138
 msgid "Search for a book"
 msgstr ""
 
@@ -1121,8 +1125,9 @@ msgstr ""
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:51 bookwyrm/templates/layout.html:52
-#: bookwyrm/templates/lists/list.html:141
+#: bookwyrm/templates/groups/group.html:19
+#: bookwyrm/templates/groups/group.html:20 bookwyrm/templates/layout.html:51
+#: bookwyrm/templates/layout.html:52 bookwyrm/templates/lists/list.html:142
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -1138,7 +1143,7 @@ msgid "Popular on %(site_name)s"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:154
+#: bookwyrm/templates/lists/list.html:155
 msgid "No books found"
 msgstr ""
 
@@ -1224,9 +1229,105 @@ msgstr ""
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
+#: bookwyrm/templates/groups/create_form.html:5
+msgid "Create Group"
+msgstr ""
+
+#: bookwyrm/templates/groups/created_text.html:4
+#, python-format
+msgid "Managed by <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/groups/delete_group_modal.html:4
+msgid "Delete this group?"
+msgstr ""
+
+#: bookwyrm/templates/groups/delete_group_modal.html:7
+#: bookwyrm/templates/lists/delete_list_modal.html:7
+msgid "This action cannot be un-done"
+msgstr ""
+
+#: bookwyrm/templates/groups/delete_group_modal.html:15
+#: bookwyrm/templates/lists/delete_list_modal.html:15
+#: bookwyrm/templates/settings/announcements/announcement.html:20
+#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49
+#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:36
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+#: bookwyrm/templates/snippets/join_invitation_buttons.html:13
+msgid "Delete"
+msgstr ""
+
+#: bookwyrm/templates/groups/edit_form.html:5
+msgid "Edit Group"
+msgstr ""
+
+#: bookwyrm/templates/groups/find_users.html:6
+msgid "Add new members!"
+msgstr ""
+
+#: bookwyrm/templates/groups/form.html:8
+msgid "Group Name:"
+msgstr ""
+
+#: bookwyrm/templates/groups/form.html:12
+msgid "Group Description:"
+msgstr ""
+
+#: bookwyrm/templates/groups/form.html:30
+msgid "Delete group"
+msgstr ""
+
+#: bookwyrm/templates/groups/group.html:15
+msgid "Search to add a user"
+msgstr ""
+
+#: bookwyrm/templates/groups/group.html:36
+msgid "This group has no lists"
+msgstr ""
+
+#: bookwyrm/templates/groups/layout.html:16
+msgid "Edit group"
+msgstr ""
+
+#: bookwyrm/templates/groups/members.html:8
+msgid "Members can add and remove books on a group's book lists"
+msgstr ""
+
+#: bookwyrm/templates/groups/members.html:19
+msgid "Leave group"
+msgstr ""
+
+#: bookwyrm/templates/groups/members.html:41
+#: bookwyrm/templates/groups/suggested_users.html:32
+#: bookwyrm/templates/snippets/suggested_users.html:31
+#: bookwyrm/templates/user/user_preview.html:36
+msgid "Follows you"
+msgstr ""
+
+#: bookwyrm/templates/groups/suggested_users.html:17
+#: bookwyrm/templates/snippets/suggested_users.html:16
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/groups/suggested_users.html:24
+#: bookwyrm/templates/snippets/suggested_users.html:23
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/groups/user_groups.html:15
+msgid "Manager"
+msgstr ""
+
 #: bookwyrm/templates/import/import.html:5
 #: bookwyrm/templates/import/import.html:9
-#: bookwyrm/templates/shelf/shelf.html:57
+#: bookwyrm/templates/shelf/shelf.html:61
 msgid "Import Books"
 msgstr ""
 
@@ -1323,14 +1424,14 @@ msgid "Book"
 msgstr ""
 
 #: bookwyrm/templates/import/import_status.html:122
-#: bookwyrm/templates/shelf/shelf.html:128
-#: bookwyrm/templates/shelf/shelf.html:150
+#: bookwyrm/templates/shelf/shelf.html:141
+#: bookwyrm/templates/shelf/shelf.html:163
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import/import_status.html:125
-#: bookwyrm/templates/shelf/shelf.html:129
-#: bookwyrm/templates/shelf/shelf.html:153
+#: bookwyrm/templates/shelf/shelf.html:142
+#: bookwyrm/templates/shelf/shelf.html:166
 msgid "Author"
 msgstr ""
 
@@ -1342,19 +1443,6 @@ msgstr ""
 msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your Goodreads account."
 msgstr ""
 
-#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
-#: bookwyrm/templates/login.html:49
-msgid "Create an Account"
-msgstr ""
-
-#: bookwyrm/templates/invite.html:21
-msgid "Permission Denied"
-msgstr ""
-
-#: bookwyrm/templates/invite.html:22
-msgid "Sorry! This invite code is no longer valid."
-msgstr ""
-
 #: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:230
 #, python-format
 msgid "About %(site_name)s"
@@ -1370,6 +1458,20 @@ msgstr ""
 msgid "Privacy Policy"
 msgstr ""
 
+#: bookwyrm/templates/landing/invite.html:4
+#: bookwyrm/templates/landing/invite.html:8
+#: bookwyrm/templates/landing/login.html:49
+msgid "Create an Account"
+msgstr ""
+
+#: bookwyrm/templates/landing/invite.html:21
+msgid "Permission Denied"
+msgstr ""
+
+#: bookwyrm/templates/landing/invite.html:22
+msgid "Sorry! This invite code is no longer valid."
+msgstr ""
+
 #: bookwyrm/templates/landing/landing.html:6
 msgid "Recent Books"
 msgstr ""
@@ -1408,6 +1510,53 @@ msgstr ""
 msgid "Your Account"
 msgstr ""
 
+#: bookwyrm/templates/landing/login.html:4
+msgid "Login"
+msgstr ""
+
+#: bookwyrm/templates/landing/login.html:7
+#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179
+msgid "Log in"
+msgstr ""
+
+#: bookwyrm/templates/landing/login.html:15
+msgid "Success! Email address confirmed."
+msgstr ""
+
+#: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170
+#: bookwyrm/templates/snippets/register_form.html:4
+msgid "Username:"
+msgstr ""
+
+#: bookwyrm/templates/landing/login.html:27
+#: bookwyrm/templates/landing/password_reset.html:17
+#: bookwyrm/templates/layout.html:174
+#: bookwyrm/templates/snippets/register_form.html:22
+msgid "Password:"
+msgstr ""
+
+#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176
+msgid "Forgot your password?"
+msgstr ""
+
+#: bookwyrm/templates/landing/login.html:62
+msgid "More about this site"
+msgstr ""
+
+#: bookwyrm/templates/landing/password_reset.html:23
+#: bookwyrm/templates/preferences/change_password.html:18
+#: bookwyrm/templates/preferences/delete_user.html:20
+msgid "Confirm password:"
+msgstr ""
+
+#: bookwyrm/templates/landing/password_reset_request.html:14
+msgid "A link to reset your password will be sent to your email address"
+msgstr ""
+
+#: bookwyrm/templates/landing/password_reset_request.html:28
+msgid "Reset password"
+msgstr ""
+
 #: bookwyrm/templates/layout.html:13
 #, python-format
 msgid "%(site_name)s search"
@@ -1455,25 +1604,10 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:170 bookwyrm/templates/layout.html:174
-#: bookwyrm/templates/login.html:21
-#: bookwyrm/templates/snippets/register_form.html:4
-msgid "Username:"
-msgstr ""
-
 #: bookwyrm/templates/layout.html:175
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:176 bookwyrm/templates/login.html:40
-msgid "Forgot your password?"
-msgstr ""
-
-#: bookwyrm/templates/layout.html:179 bookwyrm/templates/login.html:7
-#: bookwyrm/templates/login.html:37
-msgid "Log in"
-msgstr ""
-
 #: bookwyrm/templates/layout.html:187
 msgid "Join"
 msgstr ""
@@ -1514,11 +1648,16 @@ msgstr ""
 
 #: bookwyrm/templates/lists/created_text.html:5
 #, python-format
-msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
+msgid "Created by <a href=\"%(userpath)s\">%(username)s</a> and managed by <a href=\"%(grouppath)s\">%(groupname)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/lists/created_text.html:7
 #, python-format
+msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/lists/created_text.html:9
+#, python-format
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
@@ -1550,118 +1689,129 @@ msgstr ""
 msgid "Delete this list?"
 msgstr ""
 
-#: bookwyrm/templates/lists/delete_list_modal.html:7
-msgid "This action cannot be un-done"
-msgstr ""
-
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/settings/announcements/announcement.html:20
-#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49
-#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:36
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr ""
-
 #: bookwyrm/templates/lists/edit_form.html:5
 #: bookwyrm/templates/lists/layout.html:16
 msgid "Edit List"
 msgstr ""
 
-#: bookwyrm/templates/lists/form.html:18
+#: bookwyrm/templates/lists/form.html:19
 msgid "List curation:"
 msgstr ""
 
-#: bookwyrm/templates/lists/form.html:21
+#: bookwyrm/templates/lists/form.html:22
 msgid "Closed"
 msgstr ""
 
-#: bookwyrm/templates/lists/form.html:22
+#: bookwyrm/templates/lists/form.html:23
 msgid "Only you can add and remove books to this list"
 msgstr ""
 
-#: bookwyrm/templates/lists/form.html:26
+#: bookwyrm/templates/lists/form.html:27
 msgid "Curated"
 msgstr ""
 
-#: bookwyrm/templates/lists/form.html:27
+#: bookwyrm/templates/lists/form.html:28
 msgid "Anyone can suggest books, subject to your approval"
 msgstr ""
 
-#: bookwyrm/templates/lists/form.html:31
+#: bookwyrm/templates/lists/form.html:32
 msgctxt "curation type"
 msgid "Open"
 msgstr ""
 
-#: bookwyrm/templates/lists/form.html:32
+#: bookwyrm/templates/lists/form.html:33
 msgid "Anyone can add books to this list"
 msgstr ""
 
-#: bookwyrm/templates/lists/form.html:50
+#: bookwyrm/templates/lists/form.html:37
+msgid "Group"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:38
+msgid "Group members can add to and remove from this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:41
+msgid "Select Group"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:45
+msgid "Select a group"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:56
+msgid "You don't have any Groups yet!"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:58
+msgid "Create a Group"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:81
 msgid "Delete list"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:20
+#: bookwyrm/templates/lists/list.html:21
 msgid "You successfully suggested a book for this list!"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:22
+#: bookwyrm/templates/lists/list.html:23
 msgid "You successfully added a book to this list!"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:28
+#: bookwyrm/templates/lists/list.html:29
 msgid "This list is currently empty"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:66
+#: bookwyrm/templates/lists/list.html:67
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:75
+#: bookwyrm/templates/lists/list.html:76
 msgid "List position"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:81
+#: bookwyrm/templates/lists/list.html:82
 msgid "Set"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:91
+#: bookwyrm/templates/lists/list.html:92
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:105
-#: bookwyrm/templates/lists/list.html:122
+#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:123
 msgid "Sort List"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Direction"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:129
+#: bookwyrm/templates/lists/list.html:130
 msgid "Add Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:132
 msgid "Suggest Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:142
+#: bookwyrm/templates/lists/list.html:143
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:148
+#: bookwyrm/templates/lists/list.html:149
 msgid "Clear search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:153
+#: bookwyrm/templates/lists/list.html:154
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:181
+#: bookwyrm/templates/lists/list.html:182
 msgid "Suggest"
 msgstr ""
 
@@ -1673,29 +1823,20 @@ msgstr ""
 msgid "Your Lists"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:35
+#: bookwyrm/templates/lists/lists.html:36
 msgid "All Lists"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:39
+#: bookwyrm/templates/lists/lists.html:40
 msgid "Saved Lists"
 msgstr ""
 
-#: bookwyrm/templates/login.html:4
-msgid "Login"
-msgstr ""
-
-#: bookwyrm/templates/login.html:15
-msgid "Success! Email address confirmed."
-msgstr ""
-
-#: bookwyrm/templates/login.html:27 bookwyrm/templates/password_reset.html:17
-#: bookwyrm/templates/snippets/register_form.html:22
-msgid "Password:"
-msgstr ""
-
-#: bookwyrm/templates/login.html:62
-msgid "More about this site"
+#: bookwyrm/templates/notifications/items/accept.html:16
+#, python-format
+msgid ""
+"\n"
+"    accepted your invitation to join group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
+"    "
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/add.html:24
@@ -1761,6 +1902,26 @@ msgstr ""
 msgid "Your <a href=\"%(url)s\">import</a> completed."
 msgstr ""
 
+#: bookwyrm/templates/notifications/items/invite.html:15
+#, python-format
+msgid "invited you to join the group <a href=\"%(group_path)s\">%(group_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications/items/join.html:16
+#, python-format
+msgid ""
+"\n"
+"has joined your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
+msgstr ""
+
+#: bookwyrm/templates/notifications/items/leave.html:16
+#, python-format
+msgid ""
+"\n"
+"    has left your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
+"    "
+msgstr ""
+
 #: bookwyrm/templates/notifications/items/mention.html:20
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
@@ -1781,6 +1942,21 @@ msgstr ""
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
+#: bookwyrm/templates/notifications/items/remove.html:17
+#, python-format
+msgid ""
+" \n"
+"has been removed from your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
+msgstr ""
+
+#: bookwyrm/templates/notifications/items/remove.html:23
+#, python-format
+msgid ""
+"\n"
+"    You have been removed from the \"<a href=\"%(group_path)s\">%(group_name)s</a> group\"\n"
+"    "
+msgstr ""
+
 #: bookwyrm/templates/notifications/items/reply.html:21
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
@@ -1806,6 +1982,30 @@ msgstr ""
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
 msgstr ""
 
+#: bookwyrm/templates/notifications/items/update.html:16
+#, python-format
+msgid ""
+"\n"
+"        has changed the privacy level for <a href=\"%(group_path)s\">%(group_name)s</a>\n"
+"        "
+msgstr ""
+
+#: bookwyrm/templates/notifications/items/update.html:20
+#, python-format
+msgid ""
+"\n"
+"        has changed the name of <a href=\"%(group_path)s\">%(group_name)s</a>\n"
+"        "
+msgstr ""
+
+#: bookwyrm/templates/notifications/items/update.html:24
+#, python-format
+msgid ""
+"\n"
+"        has changed the description of <a href=\"%(group_path)s\">%(group_name)s</a>\n"
+"        "
+msgstr ""
+
 #: bookwyrm/templates/notifications/notifications_page.html:18
 msgid "Delete notifications"
 msgstr ""
@@ -1822,20 +2022,6 @@ msgstr ""
 msgid "You're all caught up!"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:23
-#: bookwyrm/templates/preferences/change_password.html:18
-#: bookwyrm/templates/preferences/delete_user.html:20
-msgid "Confirm password:"
-msgstr ""
-
-#: bookwyrm/templates/password_reset_request.html:14
-msgid "A link to reset your password will be sent to your email address"
-msgstr ""
-
-#: bookwyrm/templates/password_reset_request.html:28
-msgid "Reset password"
-msgstr ""
-
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
 #: bookwyrm/templates/preferences/layout.html:31
@@ -2258,7 +2444,7 @@ msgid "Details"
 msgstr ""
 
 #: bookwyrm/templates/settings/federation/instance.html:35
-#: bookwyrm/templates/user/layout.html:63
+#: bookwyrm/templates/user/layout.html:64
 msgid "Activity"
 msgstr ""
 
@@ -2834,53 +3020,66 @@ msgstr ""
 msgid "Edit Shelf"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:28 bookwyrm/views/shelf.py:55
+#: bookwyrm/templates/shelf/shelf.html:28 bookwyrm/views/shelf/shelf.py:53
 msgid "All books"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:55
+#: bookwyrm/templates/shelf/shelf.html:69
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:77
+#: bookwyrm/templates/shelf/shelf.html:90
 #, python-format
 msgid "%(formatted_count)s book"
 msgid_plural "%(formatted_count)s books"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/shelf/shelf.html:84
+#: bookwyrm/templates/shelf/shelf.html:97
 #, python-format
 msgid "(showing %(start)s-%(end)s)"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:96
+#: bookwyrm/templates/shelf/shelf.html:109
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:104
+#: bookwyrm/templates/shelf/shelf.html:117
 msgid "Delete shelf"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:132
-#: bookwyrm/templates/shelf/shelf.html:158
+#: bookwyrm/templates/shelf/shelf.html:145
+#: bookwyrm/templates/shelf/shelf.html:171
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:133
-#: bookwyrm/templates/shelf/shelf.html:161
+#: bookwyrm/templates/shelf/shelf.html:146
+#: bookwyrm/templates/shelf/shelf.html:174
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:134
-#: bookwyrm/templates/shelf/shelf.html:164
+#: bookwyrm/templates/shelf/shelf.html:147
+#: bookwyrm/templates/shelf/shelf.html:177
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/shelf/shelf.html:190
+#: bookwyrm/templates/shelf/shelf.html:203
 msgid "This shelf is empty."
 msgstr ""
 
+#: bookwyrm/templates/snippets/add_to_group_button.html:15
+msgid "Invite"
+msgstr ""
+
+#: bookwyrm/templates/snippets/add_to_group_button.html:24
+msgid "Uninvite"
+msgstr ""
+
+#: bookwyrm/templates/snippets/add_to_group_button.html:28
+#, python-format
+msgid "Remove @%(username)s"
+msgstr ""
+
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2976,6 +3175,7 @@ msgstr ""
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:20
+#: bookwyrm/templates/snippets/privacy_select_no_followers.html:17
 msgid "Private"
 msgstr ""
 
@@ -3071,6 +3271,7 @@ msgid "Unfollow"
 msgstr ""
 
 #: bookwyrm/templates/snippets/follow_request_buttons.html:7
+#: bookwyrm/templates/snippets/join_invitation_buttons.html:8
 msgid "Accept"
 msgstr ""
 
@@ -3182,12 +3383,14 @@ msgstr ""
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
 #: bookwyrm/templates/snippets/privacy_select.html:11
+#: bookwyrm/templates/snippets/privacy_select_no_followers.html:11
 msgid "Public"
 msgstr ""
 
 #: bookwyrm/templates/snippets/privacy-icons.html:7
 #: bookwyrm/templates/snippets/privacy-icons.html:8
 #: bookwyrm/templates/snippets/privacy_select.html:14
+#: bookwyrm/templates/snippets/privacy_select_no_followers.html:14
 msgid "Unlisted"
 msgstr ""
 
@@ -3196,6 +3399,7 @@ msgid "Followers-only"
 msgstr ""
 
 #: bookwyrm/templates/snippets/privacy_select.html:6
+#: bookwyrm/templates/snippets/privacy_select_no_followers.html:6
 msgid "Post privacy"
 msgstr ""
 
@@ -3256,6 +3460,14 @@ msgstr ""
 msgid "Sign Up"
 msgstr ""
 
+#: bookwyrm/templates/snippets/remove_from_group_button.html:16
+msgid " Confirm "
+msgstr ""
+
+#: bookwyrm/templates/snippets/remove_from_group_button.html:19
+msgid " Remove "
+msgstr ""
+
 #: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
 msgstr ""
@@ -3396,25 +3608,6 @@ msgstr ""
 msgid "More options"
 msgstr ""
 
-#: bookwyrm/templates/snippets/suggested_users.html:16
-#, python-format
-msgid "%(mutuals)s follower you follow"
-msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/snippets/suggested_users.html:23
-#, python-format
-msgid "%(shared_books)s book on your shelves"
-msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/snippets/suggested_users.html:31
-#: bookwyrm/templates/user/user_preview.html:36
-msgid "Follows you"
-msgstr ""
-
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr ""
@@ -3464,18 +3657,35 @@ msgstr ""
 msgid "%(username)s's %(year)s Books"
 msgstr ""
 
-#: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/groups.html:9
+msgid "Your Groups"
+msgstr ""
+
+#: bookwyrm/templates/user/groups.html:11
+#, python-format
+msgid "Groups: %(username)s"
+msgstr ""
+
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
+msgstr ""
+
+#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr ""
 
-#: bookwyrm/templates/user/layout.html:44
+#: bookwyrm/templates/user/layout.html:45
 msgid "Follow Requests"
 msgstr ""
 
-#: bookwyrm/templates/user/layout.html:69
+#: bookwyrm/templates/user/layout.html:70
 msgid "Reading Goal"
 msgstr ""
 
+#: bookwyrm/templates/user/layout.html:76
+msgid "Groups"
+msgstr ""
+
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
@@ -3566,15 +3776,15 @@ msgstr ""
 msgid "Not a valid csv file"
 msgstr ""
 
-#: bookwyrm/views/login.py:69
+#: bookwyrm/views/landing/login.py:69
 msgid "Username or password are incorrect"
 msgstr ""
 
-#: bookwyrm/views/password.py:32
+#: bookwyrm/views/landing/password.py:32
 msgid "No user with that email address was found."
 msgstr ""
 
-#: bookwyrm/views/password.py:41
+#: bookwyrm/views/landing/password.py:43
 #, python-brace-format
 msgid "A password reset link was sent to {email}"
 msgstr ""

From 1e6390a405f343a3076e869727e002ffccb9dd8c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 23 Oct 2021 06:59:06 -0700
Subject: [PATCH 188/193] Fixes whitespace in translation strings

---
 bookwyrm/templates/groups/suggested_users.html          | 6 +++++-
 bookwyrm/templates/notifications/items/accept.html      | 2 +-
 bookwyrm/templates/notifications/items/fav.html         | 2 +-
 bookwyrm/templates/notifications/items/invite.html      | 2 +-
 bookwyrm/templates/notifications/items/item_layout.html | 7 ++-----
 bookwyrm/templates/notifications/items/join.html        | 2 +-
 bookwyrm/templates/notifications/items/leave.html       | 2 +-
 bookwyrm/templates/notifications/items/remove.html      | 8 ++++----
 bookwyrm/templates/notifications/items/update.html      | 6 +++---
 9 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 951e7bf05..64498eb85 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -36,7 +36,11 @@
         {% endfor %}
     </div>
     {% else %}
-    <p>No potential members found for "{{ user_query }}"</p>
+    <p>
+        {% blocktrans trimmed %}
+        No potential members found for "{{ user_query }}"
+        {% endblocktrans %}
+    </p>
     <br/>
 
 {% endif %}
diff --git a/bookwyrm/templates/notifications/items/accept.html b/bookwyrm/templates/notifications/items/accept.html
index 19acab15e..045e23266 100644
--- a/bookwyrm/templates/notifications/items/accept.html
+++ b/bookwyrm/templates/notifications/items/accept.html
@@ -13,7 +13,7 @@
 
 {% block description %}
 
-    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
     accepted your invitation to join group "<a href="{{ group_path }}">{{ group_name }}</a>"
     {% endblocktrans %}
 
diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html
index afc18d73e..fbb865e4f 100644
--- a/bookwyrm/templates/notifications/items/fav.html
+++ b/bookwyrm/templates/notifications/items/fav.html
@@ -24,7 +24,7 @@
     {% elif related_status.status_type == 'Comment' %}
     {% blocktrans trimmed %}
 
-    liked your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>
+    liked your <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>
 
     {% endblocktrans %}
     {% elif related_status.status_type == 'Quotation' %}
diff --git a/bookwyrm/templates/notifications/items/invite.html b/bookwyrm/templates/notifications/items/invite.html
index ddfa3b345..de3b89e42 100644
--- a/bookwyrm/templates/notifications/items/invite.html
+++ b/bookwyrm/templates/notifications/items/invite.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block description %}
-{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %} 
+{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
 invited you to join the group <a href="{{ group_path }}">{{ group_name }}</a>
 {% endblocktrans %}
 <div class="row shrink">
diff --git a/bookwyrm/templates/notifications/items/item_layout.html b/bookwyrm/templates/notifications/items/item_layout.html
index 382978d47..8db68dafb 100644
--- a/bookwyrm/templates/notifications/items/item_layout.html
+++ b/bookwyrm/templates/notifications/items/item_layout.html
@@ -1,4 +1,3 @@
-{% load humanize %}
 {% load bookwyrm_tags %}
 {% related_status notification as related_status %}
 <div class="notification is-clickable {% if notification.id in unread %} is-primary{% endif %}" data-href="{% block primary_link %}{% endblock %}">
@@ -10,10 +9,8 @@
             <div class="block">
                 <p>
                     {% if notification.related_user %}
-                        <a href="{{ notification.related_user.local_path }}">
-                            {% include 'snippets/avatar.html' with user=notification.related_user %}
-                            {{ notification.related_user.display_name }}
-                        </a>
+                        <a href="{{ notification.related_user.local_path }}">{% include 'snippets/avatar.html' with user=notification.related_user %}
+                            {{ notification.related_user.display_name }}</a>
                     {% endif %}
                     {% block description %}{% endblock %}
                 </p>
diff --git a/bookwyrm/templates/notifications/items/join.html b/bookwyrm/templates/notifications/items/join.html
index 93b356424..c10def456 100644
--- a/bookwyrm/templates/notifications/items/join.html
+++ b/bookwyrm/templates/notifications/items/join.html
@@ -13,7 +13,7 @@
 
 {% block description %}
 
-{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
 has joined your group "<a href="{{ group_path }}">{{ group_name }}</a>"
 {% endblocktrans %}
 
diff --git a/bookwyrm/templates/notifications/items/leave.html b/bookwyrm/templates/notifications/items/leave.html
index 9c7a71b61..422a31dea 100644
--- a/bookwyrm/templates/notifications/items/leave.html
+++ b/bookwyrm/templates/notifications/items/leave.html
@@ -13,7 +13,7 @@
 
 {% block description %}
 
-    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
     has left your group "<a href="{{ group_path }}">{{ group_name }}</a>"
     {% endblocktrans %}
 
diff --git a/bookwyrm/templates/notifications/items/remove.html b/bookwyrm/templates/notifications/items/remove.html
index 7ee38b4a7..18a0cf178 100644
--- a/bookwyrm/templates/notifications/items/remove.html
+++ b/bookwyrm/templates/notifications/items/remove.html
@@ -14,13 +14,13 @@
 {% block description %}
 {% if notification.related_user %}
 
-{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} 
-has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a>"
-{% endblocktrans %}
+    {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a>"
+    {% endblocktrans %}
 
 {% else %}
 
-    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
     You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a> group"
     {% endblocktrans %}
 
diff --git a/bookwyrm/templates/notifications/items/update.html b/bookwyrm/templates/notifications/items/update.html
index f963fd3a9..be796b785 100644
--- a/bookwyrm/templates/notifications/items/update.html
+++ b/bookwyrm/templates/notifications/items/update.html
@@ -13,15 +13,15 @@
 
 {% block description %}
     {% if notification.notification_type == 'GROUP_PRIVACY' %}
-        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
         has changed the privacy level for <a href="{{ group_path }}">{{ group_name }}</a>
         {% endblocktrans %}
     {% elif notification.notification_type == 'GROUP_NAME' %}
-        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
         has changed the name of <a href="{{ group_path }}">{{ group_name }}</a>
         {% endblocktrans %}
     {% else %}
-        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
         has changed the description of <a href="{{ group_path }}">{{ group_name }}</a>
         {% endblocktrans %}
     {% endif %}

From 353ccc1d7d05d5063a92aaf959fcd8a799b624cf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 23 Oct 2021 07:11:38 -0700
Subject: [PATCH 189/193] Updates references locale

---
 bw-dev                             |  5 +---
 locale/en_US/LC_MESSAGES/django.po | 47 ++++++++++--------------------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/bw-dev b/bw-dev
index c9c2115ce..6c9def8ff 100755
--- a/bw-dev
+++ b/bw-dev
@@ -105,11 +105,8 @@ case "$CMD" in
     collectstatic)
         runweb python manage.py collectstatic --no-input
         ;;
-    add_locale)
-        runweb django-admin makemessages --no-wrap --ignore=venv -l $@
-        ;;
     makemessages)
-        runweb django-admin makemessages --no-wrap --ignore=venv --all $@
+        runweb django-admin makemessages --no-wrap --ignore=venv -l en_US $@
         ;;
     compilemessages)
         runweb django-admin compilemessages --ignore venv $@
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 110eb7d16..0d2cb22bf 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-22 17:47+0000\n"
+"POT-Creation-Date: 2021-10-23 14:06+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -1321,6 +1321,11 @@ msgid_plural "%(shared_books)s books on your shelves"
 msgstr[0] ""
 msgstr[1] ""
 
+#: bookwyrm/templates/groups/suggested_users.html:40
+#, python-format
+msgid "No potential members found for \"%(user_query)s\""
+msgstr ""
+
 #: bookwyrm/templates/groups/user_groups.html:15
 msgid "Manager"
 msgstr ""
@@ -1833,10 +1838,7 @@ msgstr ""
 
 #: bookwyrm/templates/notifications/items/accept.html:16
 #, python-format
-msgid ""
-"\n"
-"    accepted your invitation to join group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
-"    "
+msgid "accepted your invitation to join group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/add.html:24
@@ -1876,7 +1878,7 @@ msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:25
 #, python-format
-msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "liked your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/fav.html:31
@@ -1909,17 +1911,12 @@ msgstr ""
 
 #: bookwyrm/templates/notifications/items/join.html:16
 #, python-format
-msgid ""
-"\n"
-"has joined your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
+msgid "has joined your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/leave.html:16
 #, python-format
-msgid ""
-"\n"
-"    has left your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
-"    "
+msgid "has left your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/mention.html:20
@@ -1944,17 +1941,12 @@ msgstr ""
 
 #: bookwyrm/templates/notifications/items/remove.html:17
 #, python-format
-msgid ""
-" \n"
-"has been removed from your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
+msgid "has been removed from your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/remove.html:23
 #, python-format
-msgid ""
-"\n"
-"    You have been removed from the \"<a href=\"%(group_path)s\">%(group_name)s</a> group\"\n"
-"    "
+msgid "You have been removed from the \"<a href=\"%(group_path)s\">%(group_name)s</a> group\""
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/reply.html:21
@@ -1984,26 +1976,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications/items/update.html:16
 #, python-format
-msgid ""
-"\n"
-"        has changed the privacy level for <a href=\"%(group_path)s\">%(group_name)s</a>\n"
-"        "
+msgid "has changed the privacy level for <a href=\"%(group_path)s\">%(group_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/update.html:20
 #, python-format
-msgid ""
-"\n"
-"        has changed the name of <a href=\"%(group_path)s\">%(group_name)s</a>\n"
-"        "
+msgid "has changed the name of <a href=\"%(group_path)s\">%(group_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/update.html:24
 #, python-format
-msgid ""
-"\n"
-"        has changed the description of <a href=\"%(group_path)s\">%(group_name)s</a>\n"
-"        "
+msgid "has changed the description of <a href=\"%(group_path)s\">%(group_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications/notifications_page.html:18

From d80a28e12899c3f9d000840a6576d4a163373c0e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 23 Oct 2021 08:00:45 -0700
Subject: [PATCH 190/193] Consistent quotes around group names in notifications

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

diff --git a/bookwyrm/templates/notifications/items/invite.html b/bookwyrm/templates/notifications/items/invite.html
index de3b89e42..abb8cd02f 100644
--- a/bookwyrm/templates/notifications/items/invite.html
+++ b/bookwyrm/templates/notifications/items/invite.html
@@ -13,7 +13,7 @@
 
 {% block description %}
 {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
-invited you to join the group <a href="{{ group_path }}">{{ group_name }}</a>
+invited you to join the group "<a href="{{ group_path }}">{{ group_name }}</a>"
 {% endblocktrans %}
 <div class="row shrink">
     {% include 'snippets/join_invitation_buttons.html' with group=notification.related_group %}

From 0f9c363b00be6a89b52a62d063aed6857f93ab95 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 23 Oct 2021 08:13:07 -0700
Subject: [PATCH 191/193] Updates locale file for quotes fix

---
 locale/en_US/LC_MESSAGES/django.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 0d2cb22bf..0521e64ba 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-23 14:06+0000\n"
+"POT-Creation-Date: 2021-10-23 15:11+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -1906,7 +1906,7 @@ msgstr ""
 
 #: bookwyrm/templates/notifications/items/invite.html:15
 #, python-format
-msgid "invited you to join the group <a href=\"%(group_path)s\">%(group_name)s</a>"
+msgid "invited you to join the group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/join.html:16

From 9a07c11b19818bc8133009765db7cd2306359973 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 24 Oct 2021 06:43:31 -0700
Subject: [PATCH 192/193] Fixes group quotes and button whitespace

---
 bookwyrm/templates/notifications/items/remove.html        | 2 +-
 bookwyrm/templates/snippets/remove_from_group_button.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/notifications/items/remove.html b/bookwyrm/templates/notifications/items/remove.html
index 18a0cf178..eba18fd89 100644
--- a/bookwyrm/templates/notifications/items/remove.html
+++ b/bookwyrm/templates/notifications/items/remove.html
@@ -21,7 +21,7 @@
 {% else %}
 
     {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
-    You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a> group"
+    You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a>" group
     {% endblocktrans %}
 
 {% endif %}
diff --git a/bookwyrm/templates/snippets/remove_from_group_button.html b/bookwyrm/templates/snippets/remove_from_group_button.html
index 6d1de0dd3..1672e0388 100644
--- a/bookwyrm/templates/snippets/remove_from_group_button.html
+++ b/bookwyrm/templates/snippets/remove_from_group_button.html
@@ -13,10 +13,10 @@
             <input type="hidden" name="group" value="{{ group.id }}">
             <input type="hidden" name="user" value="{{ user.username }}">
             <button id="submit_button" class="button is-small is-danger is-light is-hidden" type="submit" data-id="member_{{ member.id }}">
-                {% blocktrans with username=user.localname %} Confirm {% endblocktrans %}
+                {% trans "Confirm" %}
             </button>
             <button id="hide_submit_button" data-controls="submit_button" class="button is-small" type="button" aria-pressed="false">
-                {% blocktrans with username=user.localname %} Remove {% endblocktrans %}
+                {% trans "Remove" %}
             </button>
         </form>
     </div>

From 7502158e58c9ac9e068e294e96bf2faddd3f13cb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 24 Oct 2021 07:10:20 -0700
Subject: [PATCH 193/193] Builds latest changes

---
 locale/en_US/LC_MESSAGES/django.po | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 0521e64ba..7d8fc801a 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-23 15:11+0000\n"
+"POT-Creation-Date: 2021-10-24 14:09+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -549,6 +549,7 @@ msgstr ""
 #: bookwyrm/templates/book/edit/edit_book.html:97
 #: bookwyrm/templates/groups/members.html:16
 #: bookwyrm/templates/landing/password_reset.html:30
+#: bookwyrm/templates/snippets/remove_from_group_button.html:16
 msgid "Confirm"
 msgstr ""
 
@@ -1782,6 +1783,7 @@ msgid "Set"
 msgstr ""
 
 #: bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/snippets/remove_from_group_button.html:19
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr ""
@@ -1946,7 +1948,7 @@ msgstr ""
 
 #: bookwyrm/templates/notifications/items/remove.html:23
 #, python-format
-msgid "You have been removed from the \"<a href=\"%(group_path)s\">%(group_name)s</a> group\""
+msgid "You have been removed from the \"<a href=\"%(group_path)s\">%(group_name)s</a>\" group"
 msgstr ""
 
 #: bookwyrm/templates/notifications/items/reply.html:21
@@ -3443,14 +3445,6 @@ msgstr ""
 msgid "Sign Up"
 msgstr ""
 
-#: bookwyrm/templates/snippets/remove_from_group_button.html:16
-msgid " Confirm "
-msgstr ""
-
-#: bookwyrm/templates/snippets/remove_from_group_button.html:19
-msgid " Remove "
-msgstr ""
-
 #: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
 msgstr ""