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] 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 00000000..4455e048
--- /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 440b65d3..46f08509 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 4eb363e4..13533f72 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 084a5ad0..329fea54 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 199827ae..688c8a77 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 2c32bc9d..e98cb24a 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 4e3a9534..9c4e117c 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", "/"))