From 03b608565dcc12c199ce8f2c009cf4743475f207 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 8 Sep 2021 13:58:10 -0700
Subject: [PATCH 01/24] Save status drafts in localstorage

---
 bookwyrm/static/js/status_cache.js            | 40 +++++++++++++++++++
 bookwyrm/templates/layout.html                |  1 +
 .../snippets/create_status/content_field.html |  3 +-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/static/js/status_cache.js

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
new file mode 100644
index 000000000..9d86c313f
--- /dev/null
+++ b/bookwyrm/static/js/status_cache.js
@@ -0,0 +1,40 @@
+/* exported StatusCache */
+/* globals BookWyrm */
+
+let StatusCache = new class {
+    constructor() {
+        document.querySelectorAll('[data-cache-draft]')
+            .forEach(t => t.addEventListener('change', this.updateDraft.bind(this)));
+        document.querySelectorAll('[data-cache-draft]')
+            .forEach(t => this.populateDraft(t));
+    }
+
+    /**
+     * Update localStorage copy of drafted status
+     *
+     * @param  {Event} event
+     * @return {undefined}
+     */
+    updateDraft(event) {
+        // Used in set reading goal
+        let key = event.target.dataset.cacheDraft;
+        let value = event.target.value;
+
+        window.localStorage.setItem(key, value);
+    }
+
+    /**
+     * Toggle display of a DOM node based on its value in the localStorage.
+     *
+     * @param {object} node - DOM node to toggle.
+     * @return {undefined}
+     */
+    populateDraft(node) {
+        // Used in set reading goal
+        let key = node.dataset.cacheDraft;
+        let value = window.localStorage.getItem(key);
+
+        node.value = value;
+    }
+}();
+
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 43ca81c74..e855bf600 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -251,6 +251,7 @@
 </script>
 <script src="{% static "js/bookwyrm.js" %}"></script>
 <script src="{% static "js/localstorage.js" %}"></script>
+<script src="{% static "js/status_cache.js" %}"></script>
 {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html
index 907467362..c2b383b9a 100644
--- a/bookwyrm/templates/snippets/create_status/content_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_field.html
@@ -10,7 +10,8 @@ draft: an existing Status object that is providing default values for input fiel
 {% endcomment %}
 <textarea
     name="content"
-    class="textarea"
+    class="textarea save-draft"
+    data-cache-draft="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
     id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
     placeholder="{{ placeholder }}"
     aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"

From c007f44030fc498ea475cd38cf4ea87ab6c3be10 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 8 Sep 2021 17:54:50 -0700
Subject: [PATCH 02/24] Linter's have demands

---
 bookwyrm/static/js/status_cache.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 9d86c313f..c2445f7a2 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -1,5 +1,4 @@
 /* exported StatusCache */
-/* globals BookWyrm */
 
 let StatusCache = new class {
     constructor() {

From 71b2f91a73e7b871d6d1450ed7bdee7034fdfa25 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 8 Sep 2021 19:30:24 -0700
Subject: [PATCH 03/24] Ties draft functionality to more status fields

---
 .../templates/snippets/create_status/comment.html    |  7 ++++++-
 .../create_status/content_warning_field.html         |  4 +++-
 .../create_status/content_warning_toggle.html        | 10 +++++++++-
 .../templates/snippets/create_status/layout.html     |  2 +-
 .../templates/snippets/create_status/quotation.html  |  8 +++++++-
 .../templates/snippets/create_status/review.html     | 12 +++++++++++-
 6 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status/comment.html b/bookwyrm/templates/snippets/create_status/comment.html
index 8f3f5c2b6..4bf1fc243 100644
--- a/bookwyrm/templates/snippets/create_status/comment.html
+++ b/bookwyrm/templates/snippets/create_status/comment.html
@@ -35,11 +35,16 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
                         size="3"
                         value="{% firstof draft.progress readthrough.progress '' %}"
                         id="progress_{{ uuid }}"
+                        data-cache-draft="id_progress_comment_{{ book.id }}"
                     >
                 </div>
                 <div class="control">
                     <div class="select">
-                        <select name="progress_mode" aria-label="Progress mode">
+                        <select
+                            name="progress_mode"
+                            aria-label="Progress mode"
+                            data-cache-draft="id_progress_mode_comment_{{ book.id }}"
+                        >
                             <option
                                 value="PG"
                                 {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}
diff --git a/bookwyrm/templates/snippets/create_status/content_warning_field.html b/bookwyrm/templates/snippets/create_status/content_warning_field.html
index de637bcc6..86b40ae23 100644
--- a/bookwyrm/templates/snippets/create_status/content_warning_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_warning_field.html
@@ -8,5 +8,7 @@
         class="input"
         id="id_content_warning_{{ uuid }}"
         placeholder="{% trans 'Spoilers ahead!' %}"
-        value="{% firstof draft.content_warning parent_status.content_warning '' %}">
+        value="{% firstof draft.content_warning parent_status.content_warning '' %}"
+        data-cache-draft="id_content_warning_{{ book.id }}_{{ type }}"
+    >
 </div>
diff --git a/bookwyrm/templates/snippets/create_status/content_warning_toggle.html b/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
index 40668a424..1c7676db1 100644
--- a/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
+++ b/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
@@ -1,7 +1,15 @@
 {% load i18n %}
 
 <div class="control">
-    <input type="checkbox" class="is-hidden" name="sensitive" id="id_show_spoilers_{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
+    <input
+        type="checkbox"
+        class="is-hidden"
+        name="sensitive"
+        id="id_show_spoilers_{{ uuid }}"
+        {% if draft.content_warning or status.content_warning %}checked{% endif %}
+        aria-hidden="true"
+        data-cache-draft="id_sensitive_{{ book.id }}_{{ type }}{{ reply_parent.id }}"
+    >
     {% trans "Include spoiler alert" as button_text %}
     {% firstof draft.content_warning status.content_warning as pressed %}
     {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=pressed %}
diff --git a/bookwyrm/templates/snippets/create_status/layout.html b/bookwyrm/templates/snippets/create_status/layout.html
index 5b435f276..b4b11bb18 100644
--- a/bookwyrm/templates/snippets/create_status/layout.html
+++ b/bookwyrm/templates/snippets/create_status/layout.html
@@ -14,7 +14,7 @@ reply_parent: the Status object this post will be in reply to, if applicable
 
 {% block form_open %}
 {# default form tag syntax, can be overriddden #}
-<form class="is-flex-grow-1" name="{{ type }}" action="/post/{{ type }}" method="post" id="tab_{{ type }}_{{ book.id }}{{ reply_parent.id }}">
+<form class="is-flex-grow-1 submit-status" name="{{ type }}" action="/post/{{ type }}" method="post" id="tab_{{ type }}_{{ book.id }}{{ reply_parent.id }}">
 {% endblock %}
 
     {% csrf_token %}
diff --git a/bookwyrm/templates/snippets/create_status/quotation.html b/bookwyrm/templates/snippets/create_status/quotation.html
index c6f1f85fc..25f3199bf 100644
--- a/bookwyrm/templates/snippets/create_status/quotation.html
+++ b/bookwyrm/templates/snippets/create_status/quotation.html
@@ -24,6 +24,7 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
                 id="id_quote_{{ book.id }}_{{ type }}"
                 placeholder="{% blocktrans with book_title=book.title %}An excerpt from '{{ book_title }}'{% endblocktrans %}"
                 required
+                data-cache-draft="id_quote_{{ book.id }}_{{ type }}"
             >{{ draft.quote|default:'' }}</textarea>
         </div>
     </div>
@@ -32,7 +33,11 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
         <div class="field has-addons mb-0">
             <div class="control">
                 <div class="select">
-                    <select name="position_mode" aria-label="Position mode">
+                    <select
+                        name="position_mode"
+                        aria-label="Position mode"
+                        data-cache-draft="id_position_mode_{{ book.id }}_{{ type }}"
+                    >
                         <option
                             value="PG"
                             {% if draft.position_mode == 'PG' or not draft %}selected{% endif %}
@@ -58,6 +63,7 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
                     size="3"
                     value="{% firstof draft.position '' %}"
                     id="position_{{ uuid }}"
+                    data-cache-draft="id_position_{{ book.id }}_{{ type }}"
                 >
             </div>
         </div>
diff --git a/bookwyrm/templates/snippets/create_status/review.html b/bookwyrm/templates/snippets/create_status/review.html
index 714055a1c..67214f332 100644
--- a/bookwyrm/templates/snippets/create_status/review.html
+++ b/bookwyrm/templates/snippets/create_status/review.html
@@ -15,7 +15,17 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
     <div class="field">
         <label class="label" for="id_name_{{ book.id }}">{% trans "Title:" %}</label>
         <div class="control">
-            <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}" placeholder="{% blocktrans with book_title=book.title %}Your review of '{{ book_title }}'{% endblocktrans %}" value="{% firstof draft.name ''%}">
+            <input
+                type="text"
+                name="name"
+                maxlength="255"
+                class="input"
+                required=""
+                id="id_name_{{ book.id }}"
+                placeholder="{% blocktrans with book_title=book.title %}Your review of '{{ book_title }}'{% endblocktrans %}"
+                value="{% firstof draft.name ''%}"
+                data-cache-draft="id_name_{{ book.id }}_{{ type }}"
+            >
         </div>
     </div>
 

From b0e7a5e468355690af93f45efc3a877d4691b528 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 8 Sep 2021 19:30:45 -0700
Subject: [PATCH 04/24] Post statuses asynchronously

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

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 894b1fb69..9dab7a23d 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -22,6 +22,12 @@ let BookWyrm = new class {
                 this.interact.bind(this))
             );
 
+        document.querySelectorAll('.submit-status')
+            .forEach(button => button.addEventListener(
+                'submit',
+                this.submitStatus.bind(this))
+            );
+
         document.querySelectorAll('.hidden-form input')
             .forEach(button => button.addEventListener(
                 'change',
@@ -292,6 +298,27 @@ let BookWyrm = new class {
         });
     }
 
+    /**
+     * Post a status with ajax
+     *
+     * @param  {Event} event
+     * @return {undefined}
+     */
+    submitStatus(event) {
+        event.preventDefault();
+
+        const bookwyrm = this;
+        const form = event.currentTarget;
+
+        this.ajaxPost(form).catch(error => {
+            // @todo Display a notification in the UI instead.
+            console.warn('Request failed:', error);
+        });
+
+        // Clear form data
+        form.reset();
+    }
+
     /**
      * Submit a form using POST.
      *

From dfaf08584339bb7eafd9500d5297797b5d547e52 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 06:54:34 -0700
Subject: [PATCH 05/24] Move status code into the new file

---
 bookwyrm/static/js/bookwyrm.js     | 27 ---------------------------
 bookwyrm/static/js/status_cache.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 9dab7a23d..894b1fb69 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -22,12 +22,6 @@ let BookWyrm = new class {
                 this.interact.bind(this))
             );
 
-        document.querySelectorAll('.submit-status')
-            .forEach(button => button.addEventListener(
-                'submit',
-                this.submitStatus.bind(this))
-            );
-
         document.querySelectorAll('.hidden-form input')
             .forEach(button => button.addEventListener(
                 'change',
@@ -298,27 +292,6 @@ let BookWyrm = new class {
         });
     }
 
-    /**
-     * Post a status with ajax
-     *
-     * @param  {Event} event
-     * @return {undefined}
-     */
-    submitStatus(event) {
-        event.preventDefault();
-
-        const bookwyrm = this;
-        const form = event.currentTarget;
-
-        this.ajaxPost(form).catch(error => {
-            // @todo Display a notification in the UI instead.
-            console.warn('Request failed:', error);
-        });
-
-        // Clear form data
-        form.reset();
-    }
-
     /**
      * Submit a form using POST.
      *
diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index c2445f7a2..70c10e822 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -4,8 +4,15 @@ let StatusCache = new class {
     constructor() {
         document.querySelectorAll('[data-cache-draft]')
             .forEach(t => t.addEventListener('change', this.updateDraft.bind(this)));
+
         document.querySelectorAll('[data-cache-draft]')
             .forEach(t => this.populateDraft(t));
+
+        document.querySelectorAll('.submit-status')
+            .forEach(button => button.addEventListener(
+                'submit',
+                this.submitStatus.bind(this))
+            );
     }
 
     /**
@@ -35,5 +42,26 @@ let StatusCache = new class {
 
         node.value = value;
     }
+
+    /**
+     * Post a status with ajax
+     *
+     * @param  {Event} event
+     * @return {undefined}
+     */
+    submitStatus(event) {
+        event.preventDefault();
+
+        const bookwyrm = this;
+        const form = event.currentTarget;
+
+        this.ajaxPost(form).catch(error => {
+            // @todo Display a notification in the UI instead.
+            console.warn('Request failed:', error);
+        });
+
+        // Clear form data
+        form.reset();
+    }
 }();
 

From 053e2cea0dc6a0c5749dc6c4ca491882d9432009 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 07:39:38 -0700
Subject: [PATCH 06/24] Clear localstorage items

---
 bookwyrm/static/js/status_cache.js | 18 +++++++++++++++---
 bookwyrm/templates/layout.html     |  2 ++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 70c10e822..10ab18f9f 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -1,4 +1,5 @@
 /* exported StatusCache */
+/* globals BookWyrm */
 
 let StatusCache = new class {
     constructor() {
@@ -25,6 +26,10 @@ let StatusCache = new class {
         // Used in set reading goal
         let key = event.target.dataset.cacheDraft;
         let value = event.target.value;
+        if (!value) {
+            window.localStorage.removeItem(key);
+            return;
+        }
 
         window.localStorage.setItem(key, value);
     }
@@ -39,6 +44,9 @@ let StatusCache = new class {
         // Used in set reading goal
         let key = node.dataset.cacheDraft;
         let value = window.localStorage.getItem(key);
+        if (!value) {
+            return;
+        }
 
         node.value = value;
     }
@@ -51,17 +59,21 @@ let StatusCache = new class {
      */
     submitStatus(event) {
         event.preventDefault();
-
-        const bookwyrm = this;
         const form = event.currentTarget;
 
-        this.ajaxPost(form).catch(error => {
+        BookWyrm.ajaxPost(form).catch(error => {
             // @todo Display a notification in the UI instead.
             console.warn('Request failed:', error);
         });
 
         // Clear form data
         form.reset();
+
+        // Clear localstorage
+        form.querySelectorAll('[data-cache-draft]')
+            .forEach(node => window.localStorage.removeItem(node.dataset.cacheDraft));
+
+        // Close modals
     }
 }();
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index e855bf600..60480b717 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -249,9 +249,11 @@
 <script>
     var csrf_token = '{{ csrf_token }}';
 </script>
+
 <script src="{% static "js/bookwyrm.js" %}"></script>
 <script src="{% static "js/localstorage.js" %}"></script>
 <script src="{% static "js/status_cache.js" %}"></script>
+
 {% block scripts %}{% endblock %}
 </body>
 </html>

From 49f1226f3a62871f087ff77b0d7bda64c60033f1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 08:06:36 -0700
Subject: [PATCH 07/24] Close modals after submit

---
 bookwyrm/static/js/status_cache.js                          | 6 ++++++
 .../snippets/reading_modals/finish_reading_modal.html       | 2 +-
 .../snippets/reading_modals/progress_update_modal.html      | 2 +-
 .../snippets/reading_modals/start_reading_modal.html        | 2 +-
 .../snippets/reading_modals/want_to_read_modal.html         | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 10ab18f9f..ee563a153 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -74,6 +74,12 @@ let StatusCache = new class {
             .forEach(node => window.localStorage.removeItem(node.dataset.cacheDraft));
 
         // Close modals
+        let modal = form.closest(".modal.is-active");
+        if (!!modal) {
+            modal.getElementsByClassName("modal-close")[0].click();
+        }
+
+        // Update buttons
     }
 }();
 
diff --git a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
index 3a0346931..b041b70aa 100644
--- a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
@@ -9,7 +9,7 @@ Finish "<em>{{ book_title }}</em>"
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post">
+<form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post" class="submit-status">
 {% csrf_token %}
 <input type="hidden" name="reading_status" value="read">
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
index c766153af..b4ed8e0c6 100644
--- a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block modal-form-open %}
-<form action="{% url 'edit-readthrough' %}" method="POST">
+<form action="{% url 'edit-readthrough' %}" method="POST" class="submit-status">
 {% endblock %}
 
 {% block modal-body %}
diff --git a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
index 099fd9153..827c0a86d 100644
--- a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
@@ -9,7 +9,7 @@ Start "<em>{{ book_title }}</em>"
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post">
+<form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post" class="submit-status">
 <input type="hidden" name="reading_status" value="reading">
 {% csrf_token %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
index 1213b18e9..5dec637be 100644
--- a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
@@ -9,7 +9,7 @@ Want to Read "<em>{{ book_title }}</em>"
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post">
+<form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post" class="submit-status">
 <input type="hidden" name="reading_status" value="to-read">
 {% csrf_token %}
 {% endblock %}

From 055cced75b620f77b0bc7c1031f573a4d55191df Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 08:20:55 -0700
Subject: [PATCH 08/24] Close reply panel

---
 bookwyrm/static/js/status_cache.js             | 8 +++++++-
 bookwyrm/templates/snippets/status/layout.html | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index ee563a153..26b308ac0 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -79,7 +79,13 @@ let StatusCache = new class {
             modal.getElementsByClassName("modal-close")[0].click();
         }
 
-        // Update buttons
+        // Close reply panel
+        let reply = form.closest(".reply-panel");
+        if (!!reply) {
+            document.querySelector("[data-controls=" + reply.id + "]").click();
+        }
+
+        // Update shelve buttons
     }
 }();
 
diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 6ffdd0f72..39445d9c1 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -66,7 +66,7 @@
 {% block card-bonus %}
 {% if request.user.is_authenticated and not moderation_mode %}
 {% with status.id|uuid as uuid %}
-<section class="is-hidden" id="show_comment_{{ status.id }}">
+<section class="reply-panel is-hidden" id="show_comment_{{ status.id }}">
     <div class="card-footer">
         <div class="card-footer-item">
             {% include 'snippets/create_status/status.html' with type="reply" reply_parent=status book=None %}

From 5f584c1403f408e23cb065258f8888b09a86f396 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 08:24:36 -0700
Subject: [PATCH 09/24] Lints for the Linter god

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

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 26b308ac0..65583874a 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -26,8 +26,10 @@ let StatusCache = new class {
         // Used in set reading goal
         let key = event.target.dataset.cacheDraft;
         let value = event.target.value;
+
         if (!value) {
             window.localStorage.removeItem(key);
+
             return;
         }
 
@@ -44,6 +46,7 @@ let StatusCache = new class {
         // Used in set reading goal
         let key = node.dataset.cacheDraft;
         let value = window.localStorage.getItem(key);
+
         if (!value) {
             return;
         }
@@ -75,13 +78,15 @@ let StatusCache = new class {
 
         // Close modals
         let modal = form.closest(".modal.is-active");
-        if (!!modal) {
+
+        if (modal) {
             modal.getElementsByClassName("modal-close")[0].click();
         }
 
         // Close reply panel
         let reply = form.closest(".reply-panel");
-        if (!!reply) {
+
+        if (reply) {
             document.querySelector("[data-controls=" + reply.id + "]").click();
         }
 

From 9ee1a110a9e93b5862e47c8b63b770a71fa76bf1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 15:36:58 -0700
Subject: [PATCH 10/24] Update visible shelve buttons on read action

---
 bookwyrm/static/js/status_cache.js            |  31 ++++-
 .../snippets/shelve_button/shelve_button.html |   2 +-
 .../shelve_button/shelve_button_options.html  | 117 +++++++++++-------
 bookwyrm/templatetags/bookwyrm_tags.py        |   2 +-
 bookwyrm/templatetags/utilities.py            |   6 +-
 5 files changed, 105 insertions(+), 53 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 65583874a..8ef775581 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -57,7 +57,7 @@ let StatusCache = new class {
     /**
      * Post a status with ajax
      *
-     * @param  {Event} event
+     * @param  {} event
      * @return {undefined}
      */
     submitStatus(event) {
@@ -81,6 +81,11 @@ let StatusCache = new class {
 
         if (modal) {
             modal.getElementsByClassName("modal-close")[0].click();
+
+            // Update shelve buttons
+            document.querySelectorAll("[data-shelve-button-book='" + form.book.value +"']")
+                .forEach(button => this.cycleShelveButtons(button, form.reading_status.value));
+            return;
         }
 
         // Close reply panel
@@ -89,8 +94,30 @@ let StatusCache = new class {
         if (reply) {
             document.querySelector("[data-controls=" + reply.id + "]").click();
         }
+    }
 
-        // Update shelve buttons
+    /**
+     * Change which buttons are available for a shelf
+     *
+     * @param  {Object} html button dom element
+     * @param  {String} the identifier of the selected shelf
+     * @return {undefined}
+     */
+    cycleShelveButtons(button, identifier) {
+        // pressed button
+        let shelf = button.querySelector("[data-shelf-identifier='" + identifier + "']");
+
+        // set all buttons to hidden
+        button.querySelectorAll("[data-shelf-identifier]")
+            .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", true));
+
+        // button that should be visible now
+        let next = button.querySelector("[data-shelf-identifier=" + shelf.dataset.shelfNext + "]");
+
+        // show the desired button
+        BookWyrm.addRemoveClass(next, "is-hidden", false);
+
+        // dropdown buttons
     }
 }();
 
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index 189418122..0af16a935 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -6,7 +6,7 @@
 {% with book.id|uuid as uuid %}
 {% active_shelf book as active_shelf %}
 {% latest_read_through book request.user as readthrough %}
-<div class="field has-addons mb-0">
+<div class="field has-addons mb-0" data-shelve-button-book="{{ book.id }}">
     {% if switch_mode and active_shelf.book != book %}
     <div class="control">
         {% include 'snippets/switch_edition_button.html' with edition=book size='is-small' %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 5cce1477c..9cdf150ec 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -2,64 +2,89 @@
 {% load utilities %}
 {% load i18n %}
 
-{% for shelf in shelves %}
-{% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
-{% if dropdown %}<li role="menuitem" class="dropdown-item p-0">{% endif %}
-    <div class="{% if not dropdown and active_shelf.shelf.identifier|next_shelf != shelf.identifier %}is-hidden{% endif %}">
-    {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+{% with next_shelf_identifier=active_shelf.shelf.identifier|next_shelf %}
 
-        {% trans "Start reading" as button_text %}
-        {% url 'reading-status' 'start' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" disabled=is_current fallback_url=fallback_url %}
-
-    {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+{% if not dropdown %}
+<div
+    class="{% if next_shelf_identifier != 'complete' %}is-hidden{% endif %}"
+    data-shelf-identifier="complete"
+>
     <button type="button" class="button {{ class }}" disabled>
         <span>{% trans "Read" %}</span>
     </button>
-    {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+</div>
+{% endif %}
 
-        {% trans "Finish reading" as button_text %}
-        {% url 'reading-status' 'finish' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" disabled=is_current fallback_url=fallback_url %}
+{% for shelf in shelves %}
+{% comparison_bool shelf.identifier active_shelf.shelf.identifier boolean=dropdown as is_current %}
 
-    {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+    {% if dropdown %}<li role="menuitem" class="dropdown-item p-0">{% endif %}
 
-        {% trans "Want to read" as button_text %}
-        {% url 'reading-status' 'want' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" disabled=is_current fallback_url=fallback_url %}
+        <div
+            class="{% if not dropdown and next_shelf_identifier != shelf.identifier %}is-hidden{% endif %}"
+            data-shelf-identifier="{{ shelf.identifier }}"
+            data-shelf-next="{{ shelf.identifier|next_shelf }}"
+        >
+        {% if shelf.identifier == 'reading' %}
+            {% if not dropdown or next_shelf_identifier != shelf.identifier %}
 
-    {% endif %}{% elif shelf.editable %}
-        <form name="shelve" action="/shelve/" method="post">
+                {% trans "Start reading" as button_text %}
+                {% url 'reading-status' 'start' book.id as fallback_url %}
+                {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" disabled=is_current fallback_url=fallback_url %}
+
+            {% endif %}
+        {% elif shelf.identifier == 'read' %}
+            {% if not dropdown or next_shelf_identifier != shelf.identifier %}
+
+                {% trans "Finish reading" as button_text %}
+                {% url 'reading-status' 'finish' book.id as fallback_url %}
+                {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" disabled=is_current fallback_url=fallback_url %}
+
+            {% endif %}
+        {% elif shelf.identifier == 'to-read' %}
+            {% if not dropdown or next_shelf_identifier != shelf.identifier %}
+
+                {% trans "Want to read" as button_text %}
+                {% url 'reading-status' 'want' book.id as fallback_url %}
+                {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" disabled=is_current fallback_url=fallback_url %}
+
+            {% endif %}
+        {% elif shelf.editable %}
+
+            <form name="shelve" action="/shelve/" method="post">
+                {% csrf_token %}
+                <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+                <button class="button {{ class }}" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>
+                    <span>{{ shelf.name }}</span>
+                </button>
+            </form>
+
+        {% endif %}
+        </div>
+    {% if dropdown %}</li>{% endif %}
+{% endfor %}
+
+
+{% if dropdown %}
+    {% if readthrough and active_shelf.shelf.identifier != 'read' %}
+    <li role="menuitem" class="dropdown-item p-0">
+        {% trans "Update progress" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
+    </li>
+    {% endif %}
+
+    {% if active_shelf.shelf %}
+    <li role="menuitem" class="dropdown-item p-0">
+        <form  name="shelve" action="/unshelve/" method="post">
             {% csrf_token %}
             <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-            <button class="button {{ class }}" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>
-                <span>{{ shelf.name }}</span>
+            <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
+            <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
+                {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
             </button>
         </form>
+    </li>
     {% endif %}
-    </div>
-{% if dropdown %}</li>{% endif %}
-{% endfor %}
-{% if dropdown %}
-
-{% if readthrough and active_shelf.shelf.identifier != 'read' %}
-<li role="menuitem" class="dropdown-item p-0">
-    {% trans "Update progress" as button_text %}
-    {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
-</li>
 {% endif %}
 
-{% if active_shelf.shelf %}
-<li role="menuitem" class="dropdown-item p-0">
-    <form  name="shelve" action="/unshelve/" method="post">
-        {% csrf_token %}
-        <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-        <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
-        <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
-            {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
-        </button>
-    </form>
-</li>
-{% endif %}
-
-{% endif %}
+{% endwith %}
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 4811f4fd5..30a48e909 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -49,7 +49,7 @@ def get_next_shelf(current_shelf):
     if current_shelf == "reading":
         return "read"
     if current_shelf == "read":
-        return "read"
+        return "complete"
     return "to-read"
 
 
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index c8ebd17d3..173716d21 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -36,9 +36,9 @@ def get_title(book, too_short=5):
 
 
 @register.simple_tag(takes_context=False)
-def comparison_bool(str1, str2):
-    """idk why I need to write a tag for this, it reutrns a bool"""
-    return str1 == str2
+def comparison_bool(str1, str2, boolean=True):
+    """idk why I need to write a tag for this, it returns a bool"""
+    return boolean and str1 == str2
 
 
 @register.filter(is_safe=True)

From 79602f69d71e9f6199e03e2ce1898e511e7e4ae8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 16:32:21 -0700
Subject: [PATCH 11/24] Separate out shelve button options lists

---
 .../shelve_button/shelve_button_dropdown.html |  2 +-
 .../shelve_button_dropdown_options.html       | 72 ++++++++++++++++
 .../shelve_button/shelve_button_options.html  | 84 ++++++-------------
 bookwyrm/templatetags/utilities.py            |  4 +-
 4 files changed, 99 insertions(+), 63 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html

diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
index 353a37a1c..43e9591fb 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
@@ -7,5 +7,5 @@
 {% endblock %}
 
 {% block dropdown-list %}
-{% include 'snippets/shelve_button/shelve_button_options.html' with active_shelf=active_shelf shelves=user_shelves dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %}
+{% include 'snippets/shelve_button/shelve_button_dropdown_options.html' with active_shelf=active_shelf shelves=user_shelves dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
new file mode 100644
index 000000000..2162a596a
--- /dev/null
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
@@ -0,0 +1,72 @@
+{% load bookwyrm_tags %}
+{% load utilities %}
+{% load i18n %}
+
+{% with next_shelf_identifier=active_shelf.shelf.identifier|next_shelf %}
+
+{% for shelf in shelves %}
+{% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
+    <li role="menuitem" class="dropdown-item p-0">
+        <div
+            class="{% if next_shelf_identifier == shelf.identifier %}is-hidden{% endif %}"
+            data-shelf-dropdown-identifier="{{ shelf.identifier }}"
+            data-shelf-next="{{ shelf.identifier|next_shelf }}"
+        >
+        {% if shelf.identifier == 'reading' %}
+
+            {% trans "Start reading" as button_text %}
+            {% url 'reading-status' 'start' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" disabled=is_current fallback_url=fallback_url %}
+
+        {% elif shelf.identifier == 'read' %}
+
+            {% trans "Read" as button_text %}
+            {% url 'reading-status' 'finish' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" disabled=is_current fallback_url=fallback_url %}
+
+        {% elif shelf.identifier == 'to-read' %}
+
+            {% trans "Want to read" as button_text %}
+            {% url 'reading-status' 'want' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" disabled=is_current fallback_url=fallback_url %}
+
+        {% elif shelf.editable %}
+
+            <form name="shelve" action="/shelve/" method="post">
+                {% csrf_token %}
+                <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+                <button class="button {{ class }}" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>
+                    <span>{{ shelf.name }}</span>
+                </button>
+            </form>
+
+        {% endif %}
+        </div>
+    </li>
+{% endfor %}
+
+
+{% if dropdown %}
+    {% if readthrough and active_shelf.shelf.identifier != 'read' %}
+    <li role="menuitem" class="dropdown-item p-0">
+        {% trans "Update progress" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
+    </li>
+    {% endif %}
+
+    {% if active_shelf.shelf %}
+    <li role="menuitem" class="dropdown-item p-0">
+        <form  name="shelve" action="/unshelve/" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+            <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
+            <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
+                {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
+            </button>
+        </form>
+    </li>
+    {% endif %}
+{% endif %}
+
+{% endwith %}
+
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 9cdf150ec..393340922 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -4,7 +4,6 @@
 
 {% with next_shelf_identifier=active_shelf.shelf.identifier|next_shelf %}
 
-{% if not dropdown %}
 <div
     class="{% if next_shelf_identifier != 'complete' %}is-hidden{% endif %}"
     data-shelf-identifier="complete"
@@ -13,78 +12,43 @@
         <span>{% trans "Read" %}</span>
     </button>
 </div>
-{% endif %}
 
 {% for shelf in shelves %}
-{% comparison_bool shelf.identifier active_shelf.shelf.identifier boolean=dropdown as is_current %}
+    <div
+        class="{% if next_shelf_identifier != shelf.identifier %}is-hidden{% endif %}"
+        data-shelf-identifier="{{ shelf.identifier }}"
+        data-shelf-next="{{ shelf.identifier|next_shelf }}"
+    >
+    {% if shelf.identifier == 'reading' %}
 
-    {% if dropdown %}<li role="menuitem" class="dropdown-item p-0">{% endif %}
+            {% trans "Start reading" as button_text %}
+            {% url 'reading-status' 'start' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" fallback_url=fallback_url %}
 
-        <div
-            class="{% if not dropdown and next_shelf_identifier != shelf.identifier %}is-hidden{% endif %}"
-            data-shelf-identifier="{{ shelf.identifier }}"
-            data-shelf-next="{{ shelf.identifier|next_shelf }}"
-        >
-        {% if shelf.identifier == 'reading' %}
-            {% if not dropdown or next_shelf_identifier != shelf.identifier %}
+    {% elif shelf.identifier == 'read' %}
 
-                {% trans "Start reading" as button_text %}
-                {% url 'reading-status' 'start' book.id as fallback_url %}
-                {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" disabled=is_current fallback_url=fallback_url %}
+            {% trans "Finish reading" as button_text %}
+            {% url 'reading-status' 'finish' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" fallback_url=fallback_url %}
 
-            {% endif %}
-        {% elif shelf.identifier == 'read' %}
-            {% if not dropdown or next_shelf_identifier != shelf.identifier %}
+    {% elif shelf.identifier == 'to-read' %}
 
-                {% trans "Finish reading" as button_text %}
-                {% url 'reading-status' 'finish' book.id as fallback_url %}
-                {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" disabled=is_current fallback_url=fallback_url %}
+            {% trans "Want to read" as button_text %}
+            {% url 'reading-status' 'want' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" fallback_url=fallback_url %}
 
-            {% endif %}
-        {% elif shelf.identifier == 'to-read' %}
-            {% if not dropdown or next_shelf_identifier != shelf.identifier %}
+    {% elif shelf.editable %}
 
-                {% trans "Want to read" as button_text %}
-                {% url 'reading-status' 'want' book.id as fallback_url %}
-                {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" disabled=is_current fallback_url=fallback_url %}
-
-            {% endif %}
-        {% elif shelf.editable %}
-
-            <form name="shelve" action="/shelve/" method="post">
-                {% csrf_token %}
-                <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-                <button class="button {{ class }}" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>
-                    <span>{{ shelf.name }}</span>
-                </button>
-            </form>
-
-        {% endif %}
-        </div>
-    {% if dropdown %}</li>{% endif %}
-{% endfor %}
-
-
-{% if dropdown %}
-    {% if readthrough and active_shelf.shelf.identifier != 'read' %}
-    <li role="menuitem" class="dropdown-item p-0">
-        {% trans "Update progress" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
-    </li>
-    {% endif %}
-
-    {% if active_shelf.shelf %}
-    <li role="menuitem" class="dropdown-item p-0">
-        <form  name="shelve" action="/unshelve/" method="post">
+        <form name="shelve" action="/shelve/" method="post">
             {% csrf_token %}
             <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-            <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
-            <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
-                {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
+            <button class="button {{ class }}" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>
+                <span>{{ shelf.name }}</span>
             </button>
         </form>
-    </li>
+
     {% endif %}
-{% endif %}
+    </div>
+{% endfor %}
 
 {% endwith %}
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index 173716d21..fe83278ac 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -36,9 +36,9 @@ def get_title(book, too_short=5):
 
 
 @register.simple_tag(takes_context=False)
-def comparison_bool(str1, str2, boolean=True):
+def comparison_bool(str1, str2):
     """idk why I need to write a tag for this, it returns a bool"""
-    return boolean and str1 == str2
+    return str1 == str2
 
 
 @register.filter(is_safe=True)

From 06b0325c1bf51ec4702b32196559f11344ec002e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 16:43:47 -0700
Subject: [PATCH 12/24] Update dropdown options on shelve action

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

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 8ef775581..e8cda295e 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -106,18 +106,33 @@ let StatusCache = new class {
     cycleShelveButtons(button, identifier) {
         // pressed button
         let shelf = button.querySelector("[data-shelf-identifier='" + identifier + "']");
+        let next_identifier = shelf.dataset.shelfNext;
 
         // set all buttons to hidden
         button.querySelectorAll("[data-shelf-identifier]")
             .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", true));
 
         // button that should be visible now
-        let next = button.querySelector("[data-shelf-identifier=" + shelf.dataset.shelfNext + "]");
+        let next = button.querySelector("[data-shelf-identifier=" + next_identifier + "]");
 
         // show the desired button
         BookWyrm.addRemoveClass(next, "is-hidden", false);
 
-        // dropdown buttons
+        // ------ update the dropdown buttons
+        // remove existing hidden class
+        button.querySelectorAll("[data-shelf-dropdown-identifier]")
+            .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", false));
+
+        // remove existing disabled states
+        button.querySelectorAll("[data-shelf-dropdown-identifier] button")
+            .forEach(item => item.disabled = false);
+
+        // disable the current state
+        button.querySelector("[data-shelf-dropdown-identifier=" + identifier + "] button").disabled = true;
+        // hide the option that's shown as the main button
+        let main_button = button.querySelector("[data-shelf-dropdown-identifier=" + next_identifier + "]");
+        BookWyrm.addRemoveClass(main_button, "is-hidden", true);
+
     }
 }();
 

From 9ba066ad6d14ad89804b418079a232cffe98d41f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 17:03:31 -0700
Subject: [PATCH 13/24] Cleanup after submitting modal

---
 bookwyrm/static/js/status_cache.js            | 15 +++++++-
 .../shelve_button_dropdown_options.html       | 37 +++++++++----------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index e8cda295e..1554bf116 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -127,12 +127,25 @@ let StatusCache = new class {
         button.querySelectorAll("[data-shelf-dropdown-identifier] button")
             .forEach(item => item.disabled = false);
 
+        next_identifier = next_identifier == 'complete' ? 'read' : next_identifier;
         // disable the current state
         button.querySelector("[data-shelf-dropdown-identifier=" + identifier + "] button").disabled = true;
-        // hide the option that's shown as the main button
+
         let main_button = button.querySelector("[data-shelf-dropdown-identifier=" + next_identifier + "]");
+
+        // hide the option that's shown as the main button
         BookWyrm.addRemoveClass(main_button, "is-hidden", true);
 
+        // just hide the other two menu options, idk what to do with them
+        button.querySelectorAll("[data-extra-options]")
+            .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", true));
+
+        // close menu
+        let menu = button.querySelector(".dropdown-trigger[aria-expanded=true]");
+
+        if (menu) {
+            menu.click();
+        }
     }
 }();
 
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
index 2162a596a..32319f863 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
@@ -45,27 +45,24 @@
     </li>
 {% endfor %}
 
+{% if readthrough and active_shelf.shelf.identifier != 'read' %}
+<li role="menuitem" class="dropdown-item p-0" data-extra-options>
+    {% trans "Update progress" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
+</li>
+{% endif %}
 
-{% if dropdown %}
-    {% if readthrough and active_shelf.shelf.identifier != 'read' %}
-    <li role="menuitem" class="dropdown-item p-0">
-        {% trans "Update progress" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
-    </li>
-    {% endif %}
-
-    {% if active_shelf.shelf %}
-    <li role="menuitem" class="dropdown-item p-0">
-        <form  name="shelve" action="/unshelve/" method="post">
-            {% csrf_token %}
-            <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-            <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
-            <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
-                {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
-            </button>
-        </form>
-    </li>
-    {% endif %}
+{% if active_shelf.shelf %}
+<li role="menuitem" class="dropdown-item p-0" data-extra-options>
+    <form  name="shelve" action="/unshelve/" method="post">
+        {% csrf_token %}
+        <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+        <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
+        <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
+            {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
+        </button>
+    </form>
+</li>
 {% endif %}
 
 {% endwith %}

From f9b9a66224eadc23207d5c04ca8230c9b1606724 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 17:06:18 -0700
Subject: [PATCH 14/24] Linter appeasement

---
 bookwyrm/static/js/status_cache.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 1554bf116..1661c0ca6 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -85,6 +85,7 @@ let StatusCache = new class {
             // Update shelve buttons
             document.querySelectorAll("[data-shelve-button-book='" + form.book.value +"']")
                 .forEach(button => this.cycleShelveButtons(button, form.reading_status.value));
+
             return;
         }
 
@@ -104,43 +105,48 @@ let StatusCache = new class {
      * @return {undefined}
      */
     cycleShelveButtons(button, identifier) {
-        // pressed button
+        // Pressed button
         let shelf = button.querySelector("[data-shelf-identifier='" + identifier + "']");
         let next_identifier = shelf.dataset.shelfNext;
 
-        // set all buttons to hidden
+        // Set all buttons to hidden
         button.querySelectorAll("[data-shelf-identifier]")
             .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", true));
 
-        // button that should be visible now
+        // Button that should be visible now
         let next = button.querySelector("[data-shelf-identifier=" + next_identifier + "]");
 
-        // show the desired button
+        // Show the desired button
         BookWyrm.addRemoveClass(next, "is-hidden", false);
 
         // ------ update the dropdown buttons
-        // remove existing hidden class
+        // Remove existing hidden class
         button.querySelectorAll("[data-shelf-dropdown-identifier]")
             .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", false));
 
-        // remove existing disabled states
+        // Remove existing disabled states
         button.querySelectorAll("[data-shelf-dropdown-identifier] button")
             .forEach(item => item.disabled = false);
 
         next_identifier = next_identifier == 'complete' ? 'read' : next_identifier;
-        // disable the current state
-        button.querySelector("[data-shelf-dropdown-identifier=" + identifier + "] button").disabled = true;
 
-        let main_button = button.querySelector("[data-shelf-dropdown-identifier=" + next_identifier + "]");
+        // Disable the current state
+        button.querySelector(
+            "[data-shelf-dropdown-identifier=" + identifier + "] button"
+        ).disabled = true;
 
-        // hide the option that's shown as the main button
+        let main_button = button.querySelector(
+            "[data-shelf-dropdown-identifier=" + next_identifier + "]"
+        );
+
+        // Hide the option that's shown as the main button
         BookWyrm.addRemoveClass(main_button, "is-hidden", true);
 
-        // just hide the other two menu options, idk what to do with them
+        // Just hide the other two menu options, idk what to do with them
         button.querySelectorAll("[data-extra-options]")
             .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", true));
 
-        // close menu
+        // Close menu
         let menu = button.querySelector(".dropdown-trigger[aria-expanded=true]");
 
         if (menu) {

From ad9be9f3d13228340c3d1ff896d4a56879292f50 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 17:22:42 -0700
Subject: [PATCH 15/24] Updates test

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

diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index e13b50dcf..5954ce271 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -179,5 +179,5 @@ class TemplateTags(TestCase):
         """self progress helper"""
         self.assertEqual(bookwyrm_tags.get_next_shelf("to-read"), "reading")
         self.assertEqual(bookwyrm_tags.get_next_shelf("reading"), "read")
-        self.assertEqual(bookwyrm_tags.get_next_shelf("read"), "read")
+        self.assertEqual(bookwyrm_tags.get_next_shelf("read"), "complete")
         self.assertEqual(bookwyrm_tags.get_next_shelf("blooooga"), "to-read")

From 909293bbb06fc8aa71394d7e14ab21a2586618d2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 9 Sep 2021 19:19:44 -0700
Subject: [PATCH 16/24] Re-adds error handling code written a while back

Co-authored-by: Fabien Basmaison <contact@arkhi.org>
---
 bookwyrm/static/js/status_cache.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 1661c0ca6..19fa8d5c9 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -63,12 +63,28 @@ let StatusCache = new class {
     submitStatus(event) {
         event.preventDefault();
         const form = event.currentTarget;
+        const trigger = event.submitter;
 
-        BookWyrm.ajaxPost(form).catch(error => {
+        BookWyrm.addRemoveClass(form, 'is-processing', true);
+        trigger.setAttribute('disabled', null);
+
+        BookWyrm.ajaxPost(form).finally(() => {
+            // Change icon to remove ongoing activity on the current UI.
+            // Enable back the element used to submit the form.
+            BookWyrm.addRemoveClass(form, 'is-processing', false);
+            trigger.removeAttribute('disabled');
+        })
+        .then(this.submitStatusSuccess.bind(this, form))
+        .catch(error => {
             // @todo Display a notification in the UI instead.
+            //       For now, the absence of change will be enough.
             console.warn('Request failed:', error);
-        });
 
+            BookWyrm.addRemoveClass(form, 'has-error', form.className.indexOf('is-hidden') == -1);
+        });
+    }
+
+    submitStatusSuccess(form) {
         // Clear form data
         form.reset();
 

From 3c38a64a8114092351815c94886c5a9dff1ec598 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 10 Sep 2021 08:00:31 -0700
Subject: [PATCH 17/24] Return http responses for ajax requests

---
 bookwyrm/static/js/bookwyrm.js |  5 ++++-
 bookwyrm/views/interaction.py  | 11 ++++++++++-
 bookwyrm/views/reading.py      | 10 ++++++----
 bookwyrm/views/status.py       | 10 +++++++---
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 894b1fb69..f000fd082 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -301,7 +301,10 @@ let BookWyrm = new class {
     ajaxPost(form) {
         return fetch(form.action, {
             method : "POST",
-            body: new FormData(form)
+            body: new FormData(form),
+            headers: {
+                'Accept': 'application/json',
+            }
         });
     }
 
diff --git a/bookwyrm/views/interaction.py b/bookwyrm/views/interaction.py
index e138e41cf..910360d7a 100644
--- a/bookwyrm/views/interaction.py
+++ b/bookwyrm/views/interaction.py
@@ -1,12 +1,13 @@
 """ boosts and favs """
 from django.db import IntegrityError
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import redirect
 from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import models
+from .helpers import is_api_request
 
 
 # pylint: disable= no-self-use
@@ -23,6 +24,8 @@ class Favorite(View):
             # you already fav'ed that
             return HttpResponseBadRequest()
 
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(request.headers.get("Referer", "/"))
 
 
@@ -40,6 +43,8 @@ class Unfavorite(View):
             return HttpResponseNotFound()
 
         favorite.delete()
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(request.headers.get("Referer", "/"))
 
 
@@ -65,6 +70,8 @@ class Boost(View):
             privacy=status.privacy,
             user=request.user,
         )
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(request.headers.get("Referer", "/"))
 
 
@@ -80,4 +87,6 @@ class Unboost(View):
         ).first()
 
         boost.delete()
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 70dc21479..4c35db004 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -5,7 +5,7 @@ import dateutil.tz
 from dateutil.parser import ParserError
 
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -13,7 +13,7 @@ from django.views import View
 from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
-from .helpers import get_edition, handle_reading_status
+from .helpers import get_edition, handle_reading_status, is_api_request
 
 
 @method_decorator(login_required, name="dispatch")
@@ -61,8 +61,7 @@ class ReadingStatus(View):
         )
 
         referer = request.headers.get("Referer", "/")
-        if "reading-status" in referer:
-            referer = "/"
+        referer = "/" if "reading-status" in referer else referer
         if current_status_shelfbook is not None:
             if current_status_shelfbook.shelf.identifier != desired_shelf.identifier:
                 current_status_shelfbook.delete()
@@ -92,6 +91,9 @@ class ReadingStatus(View):
             else:
                 privacy = request.POST.get("privacy")
                 handle_reading_status(request.user, desired_shelf, book, privacy)
+
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(referer)
 
 
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index a864d4b75..119842cbf 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -5,7 +5,7 @@ from urllib.parse import urlparse
 from django.contrib.auth.decorators import login_required
 from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
-from django.http import HttpResponseBadRequest
+from django.http import HttpResponse, 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 +16,7 @@ from bookwyrm import forms, models
 from bookwyrm.sanitize_html import InputHtmlParser
 from bookwyrm.settings import DOMAIN
 from bookwyrm.utils import regex
-from .helpers import handle_remote_webfinger
+from .helpers import handle_remote_webfinger, is_api_request
 from .reading import edit_readthrough
 
 
@@ -26,7 +26,7 @@ class CreateStatus(View):
     """the view for *posting*"""
 
     def get(self, request, status_type):  # pylint: disable=unused-argument
-        """compose view (used for delete-and-redraft"""
+        """compose view (used for delete-and-redraft)"""
         book = get_object_or_404(models.Edition, id=request.GET.get("book"))
         data = {"book": book}
         return TemplateResponse(request, "compose.html", data)
@@ -40,6 +40,8 @@ class CreateStatus(View):
         except AttributeError:
             return HttpResponseBadRequest()
         if not form.is_valid():
+            if is_api_request(request):
+                return HttpResponse(status_code=500)
             return redirect(request.headers.get("Referer", "/"))
 
         status = form.save(commit=False)
@@ -79,6 +81,8 @@ class CreateStatus(View):
         # update a readthorugh, if needed
         edit_readthrough(request)
 
+        if is_api_request(request):
+            return HttpResponse()
         return redirect("/")
 
 

From 136cc1a6e9613e411438465623ea843f350e2c06 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 10 Sep 2021 08:07:46 -0700
Subject: [PATCH 18/24] Adds spinner icon

---
 bookwyrm/static/css/fonts/icomoon.eot  | Bin 10100 -> 10404 bytes
 bookwyrm/static/css/fonts/icomoon.svg  |   1 +
 bookwyrm/static/css/fonts/icomoon.ttf  | Bin 9936 -> 10240 bytes
 bookwyrm/static/css/fonts/icomoon.woff | Bin 10012 -> 10316 bytes
 bookwyrm/static/css/vendor/icons.css   |  13 ++++++++-----
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/static/css/fonts/icomoon.eot b/bookwyrm/static/css/fonts/icomoon.eot
index 12526617af79957878616604a812cd9e20ce02fc..8eba8692fa04b6c1de810e316dadb480c17c633a 100644
GIT binary patch
delta 666
zcmez3w<M5li3S4$gT_QQGnU6!1e+&1l-Dx>1@-`OLUL|m!Ct4mD;O9UWq|ye^u*!<
zAT0po&j8XK={c2Y?RG_tK>h*-24#zk)Wj4y%|15<29+B?d9w_l00%dVDFcHlP!EGj
zMs7*P96L^BAm0SYUz3xcoVbo_$21`S0gxY&n^;l6V4}wav`ozcD4>v+n43D&i}N>-
z9|5$atsuX+gn=0-!=U~ENGLEcGoPEB!dUH^0OW}P9mdSS!obL&@KW@p!po|cZ7*-V
z;`;yh|9_w?Q1wfOm*Qa2>rhd~|BuC4#F@obiOm=D7gLxl$0WYlm?=rVo`V5sJ@WzP
z0}R{@;ta|R`V3ACp$r)eB|t}*m>C<1iHfi(E2*&}vBi<t>_}`@3r0f-7svqXGF8PC
zVnz|F2N`b4jARO9gSV-vHwZHdz*rkprKMFtxIk4}N=;2lTJ_%tn9#ouAU;T3!BSnr
z!a_scGD1sEP78#Y9UvxoTSMvF5MxxoLUgEwsXzs!3!oxWObY6j5QF}GfS97Sd9vbB
zCYffzE05#(ZN4&avw#EnZlcOd5CcR{E>SUO)SkRXWiq41WCvA|$pNbVvUUP11a1hj
h2r3Dt3C;n=6$67dlN197STob)M0MfK=T(<70s#4dnqmL|

delta 369
zcmZ1y_{EQ{M4f@*g4#qjGnUGDKfQ?#<@JmV3=DgKI3YPVvEUW^ax(@7Mj0T#Bt5aX
z07we}`4fONM|w_W8kcatGLS!mfk8<mBQ-HaP9@5LfkAl<P~I#9D8RwZVglqp0rFKc
za!V>^*m1lDGC6?!6*>9IiEC~wlLPWM0Qq6Li4_G5#(GRZ%Tz%M6!H>tQ)hZ{{s!_j
zfR?ls<QJDPFau>6)Ib^(7?_#QPEKL0c8&n@gn$lXW?*7qWKei1`cmO#+sj+8xc>kB
z{~x3tD8}$o94K}jD#rN#u{eu3v)DW_KQVcrKE}xtHH0_YG9}1wKB#n<Nk-2vzA~QQ
z<|_j?3t0c%xUOd)28f=#K-HX4Yw``%$&-uK1SdDB`OAt4xCs;qOc1yt$OTjc3PCL<
SDF%=y7#NtqM*mk^$_M}ij$!`*

diff --git a/bookwyrm/static/css/fonts/icomoon.svg b/bookwyrm/static/css/fonts/icomoon.svg
index 765815843..82e413294 100644
--- a/bookwyrm/static/css/fonts/icomoon.svg
+++ b/bookwyrm/static/css/fonts/icomoon.svg
@@ -39,6 +39,7 @@
 <glyph unicode="&#xe91e;" glyph-name="graphic-heart" d="M934.176 791.52c-116.128 115.072-301.824 117.472-422.112 9.216-120.32 108.256-305.952 105.856-422.144-9.216-119.712-118.528-119.712-310.688 0-429.28 34.208-33.888 353.696-350.112 353.696-350.112 37.856-37.504 99.072-37.504 136.896 0 0 0 349.824 346.304 353.696 350.112 119.744 118.592 119.744 310.752-0.032 429.28zM888.576 407.424l-353.696-350.112c-12.576-12.512-33.088-12.512-45.6 0l-353.696 350.112c-94.4 93.44-94.4 245.472 0 338.912 91.008 90.080 237.312 93.248 333.088 7.104l43.392-39.040 43.36 39.040c95.808 86.144 242.112 83.008 333.12-7.104 94.4-93.408 94.4-245.44 0.032-338.912zM296.096 719.968c8.864 0 16-7.168 16-16s-7.168-16-16-16h-0.032c-57.408 0-103.968-46.56-103.968-103.968v-0.032c0-8.832-7.168-16-16-16s-16 7.168-16 16v0c0 75.072 60.832 135.904 135.872 135.968 0.064 0 0.064 0.032 0.128 0.032z" />
 <glyph unicode="&#xe91f;" glyph-name="graphic-paperplane" d="M1009.376 954.88c-5.312 3.424-11.36 5.12-17.376 5.12-6.176 0-12.384-1.76-17.76-5.376l-960-640c-9.888-6.56-15.328-18.112-14.048-29.952 1.216-11.808 8.896-22.016 19.936-26.368l250.368-100.192 117.728-206.016c5.632-9.888 16.096-16 27.424-16.128 0.128 0 0.224 0 0.352 0 11.232 0 21.664 5.952 27.424 15.552l66.464 110.816 310.24-124.064c3.808-1.536 7.808-2.272 11.872-2.272 5.44 0 10.816 1.376 15.68 4.128 8.448 4.736 14.24 13.056 15.872 22.624l160 960c2.080 12.576-3.488 25.184-14.176 32.128zM100.352 295.136l741.6 494.432-539.2-577.184c-2.848 1.696-5.376 3.936-8.512 5.184l-193.888 77.568zM326.048 189.888c-0.064 0.128-0.16 0.192-0.224 0.32l606.176 648.8-516.768-805.184-89.184 156.064zM806.944 12.512l-273.312 109.312c-6.496 2.56-13.248 3.424-19.936 3.808l420.864 652.416-127.616-765.536z" />
 <glyph unicode="&#xe920;" glyph-name="graphic-banknote" d="M1005.28 621.248l-320 320c-15.872 15.872-38.88 22.24-60.672 16.864-11.488-2.816-21.76-8.736-29.888-16.864-7.264-7.264-12.736-16.256-15.872-26.304-14.496-47.008-39.552-87.872-76.64-124.928-49.536-49.504-114.048-87.008-182.304-126.656-72.448-41.984-147.296-85.504-208.64-146.816-52.128-52.192-87.616-110.24-108.416-177.632-7.008-22.752-0.896-47.36 15.872-64.192l320-320c15.872-15.872 38.88-22.24 60.672-16.864 11.488 2.88 21.76 8.736 29.888 16.864 7.264 7.264 12.736 16.256 15.872 26.368 14.528 47.008 39.584 87.872 76.704 124.928 49.504 49.504 113.984 86.944 182.304 126.56 72.384 42.048 147.264 85.568 208.576 146.88 52.128 52.128 87.616 110.24 108.448 177.632 6.976 22.72 0.832 47.424-15.904 64.16zM384 0c-105.984 105.984-214.016 214.048-320 320 90.944 294.432 485.12 281.568 576 576 105.984-105.952 214.048-214.016 320.064-320-90.976-294.368-485.152-281.568-576.064-576zM625.984 483.2c-10.432 8.736-20.928 14.688-31.488 17.632-10.496 2.944-20.992 4.128-31.616 3.36-10.496-0.8-21.248-3.2-32-7.328-10.752-4.192-21.568-8.736-32.448-14.016-17.184 19.744-34.368 39.264-51.552 57.376 7.744 7.008 15.264 10.56 22.496 10.816 7.264 0.32 14.24-0.448 20.864-2.112 6.752-1.696 12.928-3.136 18.624-4.256 5.76-1.12 10.752 0.128 15.136 3.808 4.64 4 7.2 9.184 7.552 15.424 0.32 6.304-2.048 12.448-7.328 18.432-6.752 7.744-14.88 12.448-24.64 14.176-9.632 1.696-19.488 1.568-29.76-0.672-10.112-2.304-19.744-6.112-28.864-11.488s-16.448-10.88-21.888-16.256c-2.080 1.984-4.16 3.936-6.24 5.888-2.304 2.112-5.184 3.264-8.64 3.2-3.488 0-6.368-1.504-8.736-4.256-2.304-2.688-3.36-5.824-2.944-9.12 0.32-3.424 1.696-6.048 4.064-8.064 2.080-1.76 4.16-3.488 6.24-5.312-8.192-9.888-14.944-20.8-20.256-32.32-5.376-11.552-8.576-23.008-9.76-34.112-1.248-11.2-0.064-21.44 3.36-30.944 3.424-9.568 9.76-17.696 19.008-25.376 15.072-12.512 32.8-17.824 53.376-16.64 20.512 1.248 42.624 7.36 66.4 20.128 18.88-21.824 37.824-43.488 56.736-63.616-8-6.752-15.008-10.624-21.184-11.872-6.176-1.312-11.68-1.184-16.672 0.32-4.992 1.568-9.632 3.808-13.888 6.688-4.256 2.944-8.448 5.44-12.64 7.488-4.128 2.048-8.384 3.2-12.736 3.264s-8.992-2.048-14.112-6.432c-5.248-4.576-7.872-9.888-7.872-15.872 0-5.952 2.752-12 8.128-18.112 5.44-6.112 12.512-11.264 21.056-15.328s18.208-6.624 28.832-7.328c10.624-0.736 21.824 0.864 33.632 5.248 11.872 4.32 23.616 12.128 35.2 23.744 5.568-5.44 11.2-10.624 16.8-15.616 2.368-2.048 5.248-3.072 8.736-2.816 3.36 0.128 6.304 1.696 8.64 4.512 2.368 2.88 3.36 6.048 3.008 9.376-0.32 3.36-1.696 5.952-4 7.808-5.632 4.512-11.264 9.248-16.864 14.24 9.568 11.744 17.248 24.128 22.944 36.384 5.696 12.32 9.056 24.192 10.176 35.2 1.12 11.072-0.192 21.056-3.808 30.112-3.584 9.184-9.952 17.056-19.072 24.64zM447.072 461.504c-9.056-0.384-16.96 2.624-23.872 9.312-2.944 2.816-4.992 6.24-6.24 10.304-1.312 4.064-1.76 8.512-1.248 13.376 0.448 4.8 1.888 9.824 4.384 14.88 2.368 5.056 5.888 10.112 10.368 15.008 16.224-16.128 32.416-33.824 48.64-52.128-12.288-6.752-22.976-10.368-32.032-10.752zM598.016 397.44c-2.88-5.312-6.176-10.048-10.048-14.176-17.952 18.112-35.872 38.016-53.76 58.432 4.576 2.048 9.376 4.192 14.56 6.368s10.368 3.616 15.552 4.512c5.312 0.8 10.56 0.576 15.808-0.672 5.184-1.312 10.112-4.128 14.688-8.576 4.512-4.512 7.36-9.184 8.512-14.24 1.248-5.12 1.312-10.304 0.448-15.616-0.928-5.344-2.816-10.656-5.76-16.032zM470.944 250.24c6.304 5.088 15.584 4.832 21.376-1.056 6.272-6.24 6.272-16.448 0-22.688-0.512-0.512-1.056-0.864-1.632-1.312l0.064-0.064c-20.256-15.392-36.896-29.248-54.848-47.2-16.224-16.192-30.88-33.248-43.552-50.56l-20.448-28c-0.64-1.152-1.408-2.208-2.368-3.2-6.272-6.24-16.48-6.24-22.72 0-5.44 5.44-6.112 13.824-2.112 20.064l-0.064 0.064 21.888 29.888c13.664 18.688 29.376 36.992 46.752 54.368 18.080 18.144 37.6 34.336 57.6 49.696h0.064zM588.096 713.12c16.192 16.192 30.816 33.184 43.52 50.592l21.248 29.12c0.768 1.376 1.632 2.752 2.816 3.936 6.304 6.304 16.512 6.304 22.816 0 5.984-6.016 6.24-15.52 0.8-21.888l0.064-0.064-21.888-30.016c-13.696-18.688-29.376-36.928-46.752-54.304-18.080-18.080-37.568-34.336-57.568-49.696l-0.128 0.064c-6.368-5.856-16.256-5.728-22.368 0.448-6.304 6.304-6.304 16.576 0 22.88 1.12 1.184 2.432 2.016 3.744 2.752 18.816 14.368 36.96 29.44 53.696 46.176z" />
+<glyph unicode="&#xe97a;" glyph-name="spinner" d="M384 832c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM655.53 719.53c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM832 448c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM719.53 176.47c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM448.002 64c0 0 0 0 0 0 0 35.346 28.654 64 64 64s64-28.654 64-64c0 0 0 0 0 0 0-35.346-28.654-64-64-64s-64 28.654-64 64zM176.472 176.47c0 0 0 0 0 0 0 35.346 28.654 64 64 64s64-28.654 64-64c0 0 0 0 0 0 0-35.346-28.654-64-64-64s-64 28.654-64 64zM144.472 719.53c0 0 0 0 0 0 0 53.019 42.981 96 96 96s96-42.981 96-96c0 0 0 0 0 0 0-53.019-42.981-96-96-96s-96 42.981-96 96zM56 448c0 39.765 32.235 72 72 72s72-32.235 72-72c0-39.765-32.235-72-72-72s-72 32.235-72 72z" />
 <glyph unicode="&#xe986;" glyph-name="search" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256z" />
 <glyph unicode="&#xe9d7;" glyph-name="star-empty" d="M1024 562.95l-353.78 51.408-158.22 320.582-158.216-320.582-353.784-51.408 256-249.538-60.432-352.352 316.432 166.358 316.432-166.358-60.434 352.352 256.002 249.538zM512 206.502l-223.462-117.48 42.676 248.83-180.786 176.222 249.84 36.304 111.732 226.396 111.736-226.396 249.836-36.304-180.788-176.222 42.678-248.83-223.462 117.48z" />
 <glyph unicode="&#xe9d8;" glyph-name="star-half" d="M1024 562.95l-353.78 51.408-158.22 320.582-158.216-320.582-353.784-51.408 256-249.538-60.432-352.352 316.432 166.358 316.432-166.358-60.434 352.352 256.002 249.538zM512 206.502l-0.942-0.496 0.942 570.768 111.736-226.396 249.836-36.304-180.788-176.222 42.678-248.83-223.462 117.48z" />
diff --git a/bookwyrm/static/css/fonts/icomoon.ttf b/bookwyrm/static/css/fonts/icomoon.ttf
index b0567ff8f5a3cd3220af5691dd415f2bad1b0e6f..5bf90a0a7ee19d304097a5d19cec297eb296e1fa 100644
GIT binary patch
delta 650
zcmccM+YnICz{tSBz|GLWz|3IaAFOZ0FT~CS6xjpB3CX#M1$&+Lu3%tblmYT<(i4jd
zfV2RRKLbc}q~}zowc8an0{IIV7?dqCQWI0;H2d5b7*uWm<;^mH0vy~drVI?KKs^j9
z8M!4DbL=>kfqWAne@#w)vSZ>pt{u~W0uO)!5xI#K1q>!kK+DuDfP96##N5=GUYx&y
z{0N{WZ3X$oB|wJ)f%*d=p}@e*d~V`_YVQOfM+E3DW(F3Ze-vJdzEpTw^|I~dtyf(C
z|Nj3Elm#k&$?#GfEP5R(%J~1WIEy&5*ebF4V*X-4!+?4jHrFv0%hz)-0PSZ!z<dB0
zG~x`(4EhXC4517e3?)EUn3x$GiHVA^DJ!Y5BC*Ah*z8DbRtrW$2p7lz>oQfv6k<jZ
zss|Zv%8X<RV}rM;sW%8S3cy$!RHda=LAXFwT1rh#N?P^b2bj>m4<J5BT)|RZ!@@#C
z-7-Q;PEHGinH?Y|d0Rv2+Yn<^ze04Vg{eRVqzj-TQcMc!mJoyfeSnyvwfVimQ6`yY
z!7GpB`E9;3aI=7e`EH`hOArG@PrjgR&Zs?^LuE3f#pD?($-;I5D+F!`vIr^(rU}jg
Ng*JosW<J$Ji~zN)lnMX<

delta 331
zcmZn&xZqpQz{tSBz|GLWz|3IaAFOZ0FT@TK*#pE0$+?LIuh^HHF)%R70Qn{9iNys#
zS^&tO0Hit6b1Kugg!`3&{22@kN+KDli79d_Q4S0Y%4>k~W*I;M4sI3`ApZ%Fuac2l
zQZd7h<28`U0pzd9$xn7nTytZY98h2bP#`Qfv7&&%m<ec^DoBAsUSe+QOfSygK)wdh
zlD2~U;u4@kfj|wUUV(v``Rv34)xr@#ju6mY%nVFG|0ui^eW@@xfKgPu?dA1XT>t<6
z|Ifhq|FJlWIJ4M1F+VZ+$qkI+n`bg6$ZwWaI?N=a=NDfY&u{aUftv+nG{fDvu4gcM
q@*fp*My<&vs*@+5R!tBV6L1qK5||)xMUV@q0u)eMo9)yNF#-S>L{Rns

diff --git a/bookwyrm/static/css/fonts/icomoon.woff b/bookwyrm/static/css/fonts/icomoon.woff
index 60d1742c187d598066e7d52cd8f489b37caad36a..6ce6834d5addfd8b1a478d05ec802eded9a45b33 100644
GIT binary patch
delta 693
zcmbQ^cP2o%+~3WOfsp|SG<+Di!SrNCb;*f3!u3qaxrqe~42&5-(Haom>$G=8dSWq1
z><N(10mTC8IhAQZu{R71$`&BpZdcTpk(!voz@VxERAUCha+-Z^89+gxSPYO45?A5i
zW--mkEvW#CH30c*KzNQFr*ckyGEkkLnhsDP0)*Fb?U<IESOK(Htp&(e0Amv-nY_f@
zRG`=rpyh2KJkyKwcR_w}3D7ejy%2TGKo&Fexyd|?)t(7Jwg`g&12Y2)(9;SpMPDks
zta{n@^42S^|9}7g2g(9<y<~VP4i>!*6=nSYSe!+iS!|Wqd@+A91)y$5U>J#RzRQ>(
zU(dk+^fU7T<^#ac6K7Cn&}VRB2xZ7%06K!v#LU=8OjLwTSxJo*i7k%AW=CSPS}+<y
zxIhM2m#HeI5HpHUJ;-oVW+YP>8@x?Ty+N2!0LI#&DlM%F!Ud|*Qfg{a(yISHz=ZyN
z0P#WM3YO{`78V-nmJwQVa#|qF>;N&z+ZsyWh8Uyz6{15eOa&?+T>ur4Vp34Igc$Vi
z1H=@q&DM%XnPi#;uRM<DxB1Gz%>oYSyNN0<K@1Q*Sw_X2QG0TT%49~1$xl?0h3y1Z
Z2;2~45mXXP6PyE#D+UJb%~7g{7y&rvm%#u4

delta 393
zcmX>TFvm}%+~3WOfsp|S)MXgBLA2V1$%Yyd6Lo~^8IyAp3m6y}Gk~HcApDAbxmkK*
zF-YtVkk0|d0_i!GX+W_j3=B#lAj~D)ubh#Zn8LuI`~#@Q420!Wq8u`Sf(#5Q20*?F
z2y<|=m}KOZQ~;SFK>i94o?*xFIwwCFsLoI24^SWsgxB0yCYPI70kl{Zq)-8jjhSTf
z5_405VnD|+wt?_WFV5cu`NcrK8b~ih9W#){%zSn-4`a1+1duJnAi%)Pzy$QQ!b{PY
z3NPDU-g?FL|L_0*KslhEmkck(fnwL8VvPSEi?fI`i_H`B6O#w(W1M`EQF!xH#svAz
znM#M5Wc2*vE93cXzA|vLfc4*v>v{%afau8{s^*MZlN(egPZn285Ec_~6DSgxAaF&H
Q3#fn*h_yC%sU2bj06b4%`v3p{

diff --git a/bookwyrm/static/css/vendor/icons.css b/bookwyrm/static/css/vendor/icons.css
index e9216e240..b43224e34 100644
--- a/bookwyrm/static/css/vendor/icons.css
+++ b/bookwyrm/static/css/vendor/icons.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icomoon';
-  src:  url('../fonts/icomoon.eot?wjd7rd');
-  src:  url('../fonts/icomoon.eot?wjd7rd#iefix') format('embedded-opentype'),
-    url('../fonts/icomoon.ttf?wjd7rd') format('truetype'),
-    url('../fonts/icomoon.woff?wjd7rd') format('woff'),
-    url('../fonts/icomoon.svg?wjd7rd#icomoon') format('svg');
+  src:  url('../fonts/icomoon.eot?36x4a3');
+  src:  url('../fonts/icomoon.eot?36x4a3#iefix') format('embedded-opentype'),
+    url('../fonts/icomoon.ttf?36x4a3') format('truetype'),
+    url('../fonts/icomoon.woff?36x4a3') format('woff'),
+    url('../fonts/icomoon.svg?36x4a3#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -139,3 +139,6 @@
 .icon-question-circle:before {
   content: "\e900";
 }
+.icon-spinner:before {
+  content: "\e97a";
+}

From 718744a92d8d85d7237444d0e4a8dc3a822fe84a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 10 Sep 2021 08:30:28 -0700
Subject: [PATCH 19/24] Adds css animation for pending create status

Co-authored-by: Fabien Basmaison <contact@arkhi.org>
---
 bookwyrm/static/css/bookwyrm.css              | 26 +++++++++++++++++++
 .../create_status/post_options_block.html     |  5 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 3529afc2b..62191e5c4 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -302,6 +302,32 @@ body {
     right: 0;
 }
 
+/** Animations and transitions
+ ******************************************************************************/
+
+@keyframes turning {
+    from { transform: rotateZ(0deg); }
+    to { transform: rotateZ(360deg); }
+}
+
+.is-processing .icon-spinner::before {
+    animation: turning 1.5s infinite linear;
+}
+
+.icon-spinner {
+    display: none;
+}
+
+.is-processing .icon-spinner {
+    display: flex;
+}
+
+@media (prefers-reduced-motion: reduce) {
+    .is-processing .icon::before {
+        transition-duration: 0.001ms !important;
+    }
+}
+
 /* States
  ******************************************************************************/
 
diff --git a/bookwyrm/templates/snippets/create_status/post_options_block.html b/bookwyrm/templates/snippets/create_status/post_options_block.html
index 6cfb0c5c0..697614e19 100644
--- a/bookwyrm/templates/snippets/create_status/post_options_block.html
+++ b/bookwyrm/templates/snippets/create_status/post_options_block.html
@@ -16,7 +16,10 @@
         </div>
     </div>
     <div class="column is-narrow">
-        <button class="button is-link" type="submit">{% trans "Post" %}</button>
+        <button class="button is-link" type="submit">
+            <span class="icon icon-spinner" aria-hidden="true"></span>
+            <span>{% trans "Post" %}</span>
+        </button>
     </div>
 </div>
 

From 3a7717e22f36846efe7d2b6ec329f302f93884c6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 10 Sep 2021 08:59:18 -0700
Subject: [PATCH 20/24] Fixes status code variable in http response

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

diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 119842cbf..0ead2d014 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -41,7 +41,7 @@ class CreateStatus(View):
             return HttpResponseBadRequest()
         if not form.is_valid():
             if is_api_request(request):
-                return HttpResponse(status_code=500)
+                return HttpResponse(status=500)
             return redirect(request.headers.get("Referer", "/"))
 
         status = form.save(commit=False)

From e3ab5afcbdc257bba80d759678838e87fb5f8e10 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 10 Sep 2021 08:59:49 -0700
Subject: [PATCH 21/24] Catch error responses from API

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

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 19fa8d5c9..2da509c4a 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -74,11 +74,16 @@ let StatusCache = new class {
             BookWyrm.addRemoveClass(form, 'is-processing', false);
             trigger.removeAttribute('disabled');
         })
-        .then(this.submitStatusSuccess.bind(this, form))
+        .then(response => {
+            if (!response.ok) {
+                throw new Error();
+            }
+            this.submitStatusSuccess(form);
+        })
         .catch(error => {
             // @todo Display a notification in the UI instead.
             //       For now, the absence of change will be enough.
-            console.warn('Request failed:', error);
+            console.log('Request failed:', error);
 
             BookWyrm.addRemoveClass(form, 'has-error', form.className.indexOf('is-hidden') == -1);
         });

From 08d2bff7cacd60ffaa781233c09f70e256349acc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 10 Sep 2021 10:12:37 -0700
Subject: [PATCH 22/24] General function for displaying messages

---
 bookwyrm/static/css/bookwyrm.css   | 11 +++++++++-
 bookwyrm/static/js/status_cache.js | 33 +++++++++++++++++++++++++-----
 bookwyrm/templates/layout.html     |  5 +++++
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 62191e5c4..324e7df2f 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -328,7 +328,16 @@ body {
     }
 }
 
-/* States
+/** Transient notification
+ ******************************************************************************/
+
+#live-messages {
+    position: fixed;
+    bottom: 1em;
+    right: 1em;
+}
+
+/** States
  ******************************************************************************/
 
 /* "disabled" for non-buttons */
diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 2da509c4a..f22bac766 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -81,14 +81,35 @@ let StatusCache = new class {
             this.submitStatusSuccess(form);
         })
         .catch(error => {
-            // @todo Display a notification in the UI instead.
-            //       For now, the absence of change will be enough.
-            console.log('Request failed:', error);
-
-            BookWyrm.addRemoveClass(form, 'has-error', form.className.indexOf('is-hidden') == -1);
+            this.announceMessage('status-error-message');
         });
     }
 
+    /**
+     * Show a message in the live region
+     *
+     * @param  {String} the id of the message dom element
+     * @return {undefined}
+     */
+    announceMessage(message_id) {
+        const element = document.getElementById(message_id);
+        let copy = element.cloneNode(true)
+
+        copy.id = null;
+        element.insertAdjacentElement('beforebegin', copy);
+
+        BookWyrm.addRemoveClass(copy, 'is-hidden', false);
+        setTimeout(function() {
+            copy.remove()
+        }, 10000, copy);
+    }
+
+    /**
+     * Success state for a posted status
+     *
+     * @param  {Object} the html form that was submitted
+     * @return {undefined}
+     */
     submitStatusSuccess(form) {
         // Clear form data
         form.reset();
@@ -116,6 +137,8 @@ let StatusCache = new class {
         if (reply) {
             document.querySelector("[data-controls=" + reply.id + "]").click();
         }
+
+        this.announceMessage('status-success-message');
     }
 
     /**
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 60480b717..ddcbeb580 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -210,6 +210,11 @@
     </div>
 </div>
 
+<div role="region" aria-live="polite" id="live-messages">
+    <p id="status-success-message" class="live-message is-sr-only is-hidden">{% trans "Successfully posted status" %}</p>
+    <p id="status-error-message" class="live-message notification is-danger p-3 pr-5 pl-5 is-hidden">{% trans "Error posting status" %}</p>
+</div>
+
 <footer class="footer">
     <div class="container">
         <div class="columns">

From 5e9b8eb5711c8cf8e91565ae8fd9b7e72294aee3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 10 Sep 2021 10:20:40 -0700
Subject: [PATCH 23/24] Removes unused variable

---
 bookwyrm/static/js/status_cache.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index f22bac766..353a3b34d 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -80,7 +80,7 @@ let StatusCache = new class {
             }
             this.submitStatusSuccess(form);
         })
-        .catch(error => {
+        .catch(_ => {
             this.announceMessage('status-error-message');
         });
     }
@@ -93,14 +93,14 @@ let StatusCache = new class {
      */
     announceMessage(message_id) {
         const element = document.getElementById(message_id);
-        let copy = element.cloneNode(true)
+        let copy = element.cloneNode(true);
 
         copy.id = null;
         element.insertAdjacentElement('beforebegin', copy);
 
         BookWyrm.addRemoveClass(copy, 'is-hidden', false);
         setTimeout(function() {
-            copy.remove()
+            copy.remove();
         }, 10000, copy);
     }
 

From 5c329c35f0012e219a24d5d49d61c7b1af5671ac Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 10 Sep 2021 10:22:28 -0700
Subject: [PATCH 24/24] Warn http error

---
 bookwyrm/static/js/status_cache.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 353a3b34d..659011856 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -80,7 +80,8 @@ let StatusCache = new class {
             }
             this.submitStatusSuccess(form);
         })
-        .catch(_ => {
+        .catch(error => {
+            console.warn(error);
             this.announceMessage('status-error-message');
         });
     }