From 5297b9d796ab61a3c17d4a18534b1c201bd3f502 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 08:17:48 -0700
Subject: [PATCH] Ignore request flow

---
 bookwyrm/templates/settings/admin_layout.html |  3 ++-
 .../settings/manage_invite_requests.html      | 27 +++++++++++++++----
 .../templates/settings/manage_invites.html    |  8 +++---
 bookwyrm/views/invite.py                      |  9 ++++++-
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index a34fe6389..397df473d 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -16,7 +16,8 @@
         <ul class="menu-list">
             <li>
                 {% url 'settings-invites' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
+                {% url 'settings-invite-requests' as alt_url %}
+                <a href="{{ url }}"{% if url in request.path or request.path in alt_url %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
             <li>
                 {% url 'settings-reports' as url %}
diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 2441ed804..538ffccf4 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -6,19 +6,25 @@
 
 <div class="tabs">
     <ul>
-        {% url 'settings-invites' as url %}
-        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
-            <a href="{{ url }}">{% trans "Invites" %}</a>
-        </li>
         {% url 'settings-invite-requests' as url %}
         <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
             <a href="{{ url }}">{% trans "Invite Requests" %}</a>
         </li>
+        {% url 'settings-invites' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Invites" %}</a>
+        </li>
     </ul>
 </div>
 
 <section class="block">
-    <h2 class="title is-4">{% trans "Invite Requests" %}</h2>
+    <h2 class="title is-4">
+        {% if ignored %}
+        {% trans "Ignored Invite Requests" %}
+        {% else %}
+        {% trans "Invite Requests" %}
+        {% endif %}
+    </h2>
 
     <table class="table is-striped">
         <tr>
@@ -55,8 +61,13 @@
                     </form>
 
                     <form name="ignore-request" method="post" action="{% url 'settings-invite-requests-ignore' %}">
+                        {% csrf_token %}
                         <input type="hidden" name="invite-request" value="{{ req.id }}">
+                        {% if not req.ignored %}
                         <button type="submit" class="button is-danger is-light is-small">{% trans "Ignore" %}</button>
+                        {% else %}
+                        <button type="submit" class="button is-danger is-light is-small">{% trans "Un-gnore" %}</button>
+                        {% endif %}
                     </form>
                 </div>
                 {% endif %}
@@ -65,5 +76,11 @@
         {% endfor %}
     </table>
     {% include 'snippets/pagination.html' with page=requests path=request.path %}
+
+    {% if ignored %}
+    <p><a href="{% url 'settings-invite-requests' %}">{% trans "Back to pending requests" %}</a></p>
+    {% else %}
+    <p><a href="{% url 'settings-invite-requests' %}?ignored=True">{% trans "View ignored requests" %}</a></p>
+    {% endif %}
 </section>
 {% endblock %}
diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html
index 7ce609086..5b075114e 100644
--- a/bookwyrm/templates/settings/manage_invites.html
+++ b/bookwyrm/templates/settings/manage_invites.html
@@ -6,14 +6,14 @@
 
 <div class="tabs">
     <ul>
-        {% url 'settings-invites' as url %}
-        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
-            <a href="{{ url }}">{% trans "Invites" %}</a>
-        </li>
         {% url 'settings-invite-requests' as url %}
         <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
             <a href="{{ url }}">{% trans "Invite Requests" %}</a>
         </li>
+        {% url 'settings-invites' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Invites" %}</a>
+        </li>
     </ul>
 </div>
 
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index cec0458af..dea377cf0 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -130,4 +130,11 @@ class InviteRequest(View):
 
 @require_POST
 def ignore_invite_request(request):
-    """ ok """
+    """ hide an invite request """
+    invite_request = get_object_or_404(
+        models.InviteRequest, id=request.POST.get("invite-request")
+    )
+
+    invite_request.ignored = not invite_request.ignored
+    invite_request.save()
+    return redirect("settings-invite-requests")