From db426d71eed978fdb80a692a22a5feef5ec795fd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Mar 2021 09:22:45 -0700
Subject: [PATCH 1/9] Fixes failed serialization of empty avatar field

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

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 170bdfb9f..791502d01 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -75,7 +75,7 @@ class ActivityObject:
         for field in fields(self):
             try:
                 value = kwargs[field.name]
-                if value in (None, MISSING):
+                if value in (None, MISSING, {}):
                     raise KeyError()
                 try:
                     is_subclass = issubclass(field.type, ActivityObject)

From 0d8e1f0ae26dee88c180a1ea12634d2af7232ffa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Mar 2021 09:34:20 -0700
Subject: [PATCH 2/9] Makes endponts a default field

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

diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index ba86b036c..f2cacc15f 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -24,7 +24,7 @@ class Person(ActivityObject):
     outbox: str
     followers: str
     publicKey: PublicKey
-    endpoints: Dict
+    endpoints: Dict = field(default_factory=lambda: {})
     name: str = None
     summary: str = None
     icon: Image = field(default_factory=lambda: {})

From ba09377041b8a772c86f9a71b045dac68755cff0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Mar 2021 13:59:16 -0700
Subject: [PATCH 3/9] Use None instead of empty dict for endpoint default value

---
 bookwyrm/activitypub/person.py | 2 +-
 bookwyrm/models/fields.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index f2cacc15f..f1298b927 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -24,7 +24,7 @@ class Person(ActivityObject):
     outbox: str
     followers: str
     publicKey: PublicKey
-    endpoints: Dict = field(default_factory=lambda: {})
+    endpoints: Dict = None
     name: str = None
     summary: str = None
     icon: Image = field(default_factory=lambda: {})
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 1ca0b377b..1bdc6c456 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -73,7 +73,7 @@ class ActivitypubFieldMixin:
                 raise
             value = getattr(data, "actor")
         formatted = self.field_from_activity(value)
-        if formatted is None or formatted is MISSING:
+        if formatted is None or formatted is MISSING or formatted == {}:
             return
         setattr(instance, self.name, formatted)
 
@@ -101,7 +101,7 @@ class ActivitypubFieldMixin:
 
     def field_from_activity(self, value):
         """ formatter to convert activitypub into a model value """
-        if hasattr(self, "activitypub_wrapper"):
+        if value and hasattr(self, "activitypub_wrapper"):
             value = value.get(self.activitypub_wrapper)
         return value
 

From 9a20b5dbd5d31d216c7f7456359edba2cca601f7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:00:25 -0700
Subject: [PATCH 4/9] Hide goal using database field instead of localstorage

---
 bookwyrm/migrations/0052_user_show_goal.py | 18 ++++++++++++++++++
 bookwyrm/models/user.py                    |  1 +
 bookwyrm/templates/feed/feed.html          |  4 ++--
 bookwyrm/templates/snippets/goal_card.html |  7 ++++---
 bookwyrm/urls.py                           |  2 ++
 bookwyrm/views/__init__.py                 |  2 +-
 bookwyrm/views/goal.py                     | 10 ++++++++++
 7 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/migrations/0052_user_show_goal.py

diff --git a/bookwyrm/migrations/0052_user_show_goal.py b/bookwyrm/migrations/0052_user_show_goal.py
new file mode 100644
index 000000000..4455e0483
--- /dev/null
+++ b/bookwyrm/migrations/0052_user_show_goal.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2021-03-18 15:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0051_auto_20210316_1950'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='show_goal',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 440b65d3d..46f08509f 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -102,6 +102,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     updated_date = models.DateTimeField(auto_now=True)
     last_active_date = models.DateTimeField(auto_now=True)
     manually_approves_followers = fields.BooleanField(default=False)
+    show_goal = models.BooleanField(default=True)
 
     name_field = "username"
 
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 4eb363e4a..13533f72d 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -19,9 +19,9 @@
 </div>
 
 {# announcements and system messages #}
-{% if not goal and tab == 'home' %}
+{% if request.user.show_goal and not goal and tab == 'home' %}
 {% now 'Y' as year %}
-<section class="block hidden" aria-title="{% trans 'Announcements' %}" data-hide="hide-{{ year }}-reading-goal">
+<section class="block" aria-title="{% trans 'Announcements' %}">
     {% include 'snippets/goal_card.html' with year=year %}
     <hr>
 </section>
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html
index 084a5ad0b..329fea542 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@@ -17,8 +17,9 @@
 {% endblock %}
 
 {% block card-footer %}
-<div class="card-footer-item is-flex-direction-column">
-    <button class="button is-danger is-light is-block set-display" data-id="hide-{{ year }}-reading-goal" data-value="true">{% trans "Dismiss message" %}</button>
+<form class="card-footer-item is-flex-direction-column" method="post" action="{% url 'hide-goal' %}">
+    {% csrf_token %}
+    <button type="submit" class="button is-danger is-light is-block set-display" >{% trans "Dismiss message" %}</button>
     <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
-</div>
+</form>
 {% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 199827aef..688c8a777 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -109,11 +109,13 @@ urlpatterns = [
     ),
     re_path(r"%s/shelves/?$" % user_path, views.user_shelves_page, name="user-shelves"),
     re_path(r"%s/lists/?$" % user_path, views.UserLists.as_view(), name="user-lists"),
+    # goals
     re_path(
         r"%s/goal/(?P<year>\d{4})/?$" % user_path,
         views.Goal.as_view(),
         name="user-goal",
     ),
+    re_path(r"^hide-goal/?$", views.hide_goal, name="hide-goal"),
     # lists
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 2c32bc9d6..e98cb24af 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -9,7 +9,7 @@ from .federation import Federation
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
-from .goal import Goal
+from .goal import Goal, hide_goal
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 4e3a9534c..9c4e117c6 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -6,6 +6,7 @@ from django.template.loader import get_template
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
+from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.status import create_generated_note
@@ -65,3 +66,12 @@ class Goal(View):
             )
 
         return redirect(request.headers.get("Referer", "/"))
+
+
+@require_POST
+@login_required
+def hide_goal(request):
+    """ don't keep bugging people to set a goal """
+    request.user.show_goal = False
+    request.user.save(broadcast=False)
+    return redirect(request.headers.get("Referer", "/"))

From baee0796cd9ca7cb803496dd181e3508548d4733 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:02:07 -0700
Subject: [PATCH 5/9] Moves localstorage handlers into its own file

---
 bookwyrm/static/js/localstorage.js | 27 +++++++++++++++++++++++++++
 bookwyrm/static/js/shared.js       | 26 --------------------------
 2 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 bookwyrm/static/js/localstorage.js

diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
new file mode 100644
index 000000000..ff4027e68
--- /dev/null
+++ b/bookwyrm/static/js/localstorage.js
@@ -0,0 +1,27 @@
+// set javascript listeners
+window.onload = function() {
+    // display based on localstorage vars
+    document.querySelectorAll('[data-hide]')
+        .forEach(t => setDisplay(t));
+
+    // update localstorage
+    Array.from(document.getElementsByClassName('set-display'))
+        .forEach(t => t.onclick = updateDisplay);
+};
+
+function updateDisplay(e) {
+    // used in set reading goal
+    var key = e.target.getAttribute('data-id');
+    var value = e.target.getAttribute('data-value');
+    window.localStorage.setItem(key, value);
+
+    document.querySelectorAll('[data-hide="' + key + '"]')
+        .forEach(t => setDisplay(t));
+}
+
+function setDisplay(el) {
+    // used in set reading goal
+    var key = el.getAttribute('data-hide');
+    var value = window.localStorage.getItem(key);
+    addRemoveClass(el, 'hidden', value);
+}
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 391efcc2c..a7f30660a 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -23,14 +23,6 @@ window.onload = function() {
     Array.from(document.getElementsByClassName('pulldown-menu'))
         .forEach(t => t.onclick = toggleMenu);
 
-    // display based on localstorage vars
-    document.querySelectorAll('[data-hide]')
-        .forEach(t => setDisplay(t));
-
-    // update localstorage
-    Array.from(document.getElementsByClassName('set-display'))
-        .forEach(t => t.onclick = updateDisplay);
-
     // hidden submit button in a form
     document.querySelectorAll('.hidden-form input')
         .forEach(t => t.onchange = revealForm);
@@ -78,24 +70,6 @@ function revealForm(e) {
 }
 
 
-function updateDisplay(e) {
-    // used in set reading goal
-    var key = e.target.getAttribute('data-id');
-    var value = e.target.getAttribute('data-value');
-    window.localStorage.setItem(key, value);
-
-    document.querySelectorAll('[data-hide="' + key + '"]')
-        .forEach(t => setDisplay(t));
-}
-
-function setDisplay(el) {
-    // used in set reading goal
-    var key = el.getAttribute('data-hide');
-    var value = window.localStorage.getItem(key);
-    addRemoveClass(el, 'hidden', value);
-}
-
-
 function toggleAction(e) {
     var el = e.currentTarget;
     var pressed = el.getAttribute('aria-pressed') == 'false';

From 91aaf704f5ac45fb5db2994cda5e35aebc29aed4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:05:18 -0700
Subject: [PATCH 6/9] Adds set reading goal display control in user settings

---
 bookwyrm/forms.py                             | 2 +-
 bookwyrm/templates/preferences/edit_user.html | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index c6dfa9fe1..f93816def 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -115,7 +115,7 @@ class StatusForm(CustomForm):
 class EditUserForm(CustomForm):
     class Meta:
         model = models.User
-        fields = ["avatar", "name", "email", "summary", "manually_approves_followers"]
+        fields = ["avatar", "name", "email", "summary", "manually_approves_followers", "show_goal"]
         help_texts = {f: None for f in fields}
 
 
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index b643f4ce3..ca0f81c28 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -41,6 +41,12 @@
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
+    <div class="block">
+        <label class="checkbox label" for="id_show_goal">
+            {% trans "Show set reading goal prompt in feed:" %}
+            {{ form.show_goal }}
+        </label>
+    </div>
     <div class="block">
         <label class="checkbox label" for="id_manually_approves_followers">
             {% trans "Manually approve followers:" %}

From 48a5232ebb0e4a47c29a70f0b77933db8fccae8f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:06:00 -0700
Subject: [PATCH 7/9] Formatting

---
 bookwyrm/forms.py                          | 9 ++++++++-
 bookwyrm/migrations/0052_user_show_goal.py | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index f93816def..edf1d9e45 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -115,7 +115,14 @@ class StatusForm(CustomForm):
 class EditUserForm(CustomForm):
     class Meta:
         model = models.User
-        fields = ["avatar", "name", "email", "summary", "manually_approves_followers", "show_goal"]
+        fields = [
+            "avatar",
+            "name",
+            "email",
+            "summary",
+            "manually_approves_followers",
+            "show_goal",
+        ]
         help_texts = {f: None for f in fields}
 
 
diff --git a/bookwyrm/migrations/0052_user_show_goal.py b/bookwyrm/migrations/0052_user_show_goal.py
index 4455e0483..3b72ee7ac 100644
--- a/bookwyrm/migrations/0052_user_show_goal.py
+++ b/bookwyrm/migrations/0052_user_show_goal.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0051_auto_20210316_1950'),
+        ("bookwyrm", "0051_auto_20210316_1950"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='user',
-            name='show_goal',
+            model_name="user",
+            name="show_goal",
             field=models.BooleanField(default=True),
         ),
     ]

From 77f11572f30e7fcf984f201709a1f94076350416 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:08:19 -0700
Subject: [PATCH 8/9] Remove invalid aria tag

thank you, bot
---
 bookwyrm/templates/feed/feed.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 13533f72d..b7ff6e253 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -21,7 +21,7 @@
 {# announcements and system messages #}
 {% if request.user.show_goal and not goal and tab == 'home' %}
 {% now 'Y' as year %}
-<section class="block" aria-title="{% trans 'Announcements' %}">
+<section class="block">
     {% include 'snippets/goal_card.html' with year=year %}
     <hr>
 </section>

From c2386bd3a18e91bfdfa3c2ceb78a6b553ce80b66 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:15:47 -0700
Subject: [PATCH 9/9] Remove a step when unfurling statuses with content
 warnings

---
 bookwyrm/templates/snippets/status/status_content.html | 2 +-
 bookwyrm/templates/snippets/trimmed_text.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 616e1e638..53ccc5ca7 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -35,7 +35,7 @@
         {% endif %}
 
         {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
-        {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
+        {% include 'snippets/trimmed_text.html' with full=status.content|safe no_trim=status.content_warning %}
         {% endif %}
         {% if status.attachments.exists %}
         <div class="block">
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index cac6e41b9..f91fe19b8 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -6,7 +6,7 @@
 {% with full|to_markdown|safe as full %}
 
 {% with full|to_markdown|safe|truncatewords_html:60 as trimmed %}
-{% if trimmed != full %}
+{% if not no_trim and trimmed != full %}
 <div id="hide-full-{{ uuid }}">
     <div class="content" id="trimmed-{{ uuid }}">
         <div dir="auto">{{ trimmed }}</div>