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] 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