From 8842db3c1b18359908f00fce4b6021e074a01667 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 10 Feb 2021 13:46:56 -0800
Subject: [PATCH] Create notification when adding or suggesting a book to a
 list

---
 bookwyrm/models/list.py               | 17 +++++++++
 bookwyrm/templates/lists/list.html    |  4 +-
 bookwyrm/templates/notifications.html | 53 ++++++++++++++-------------
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 5004a9b09..db8c1af6e 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -1,4 +1,5 @@
 ''' make a list of books!! '''
+from django.apps import apps
 from django.db import models
 
 from bookwyrm import activitypub
@@ -71,6 +72,22 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     object_field = 'book'
     collection_field = 'book_list'
 
+    def save(self, *args, **kwargs):
+        ''' create a notification too '''
+        created = not bool(self.id)
+        super().save(*args, **kwargs)
+        list_owner = self.book_list.user
+        # create a notification if somoene ELSE added to a local user's list
+        if created and list_owner.local and list_owner != self.user:
+            model = apps.get_model('bookwyrm.Notification', require_ready=True)
+            model.objects.create(
+                user=list_owner,
+                related_user=self.user,
+                related_list_item=self,
+                notification_type='ADD',
+            )
+
+
     class Meta:
         ''' an opinionated constraint! you can't put a book on a list twice '''
         unique_together = ('book', 'book_list')
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 7899d5932..4bd712846 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -26,7 +26,7 @@
                         <div class="column is-flex-direction-column is-align-items-self-start">
                             <span>{% include 'snippets/book_titleby.html' with book=item.book %}</span>
                             {% include 'snippets/stars.html' with rating=item.book|rating:request.user %}
-                            {% include 'snippets/shelve_button.html' with book=item.book %}
+                            {% include 'snippets/shelve_button/shelve_button.html' with book=item.book %}
                         </div>
                     </div>
                     <div class="card-footer has-background-white-bis">
@@ -72,6 +72,7 @@
         <p>No books found{% if query %} matching the query "{{ query }}"{% endif %}</p>
         {% endif %}
         {% for book in suggested_books %}
+        {% if book %}
         <div class="block columns">
             <div class="column is-narrow">
                 <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
@@ -85,6 +86,7 @@
                 </form>
             </div>
         </div>
+        {% endif %}
         {% endfor %}
     </section>
     {% endif %}
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index b594251fb..8e7412a27 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -29,6 +29,8 @@
                 <span class="icon icon-heart"></span>
                 {% elif notification.notification_type == 'IMPORT' %}
                 <span class="icon icon-list"></span>
+                {% elif notification.notification_type == 'ADD' %}
+                <span class="icon icon-plus"></span>
                 {% endif %}
             </div>
             <div class="column">
@@ -36,33 +38,34 @@
                     <p>
                         {# DESCRIPTION #}
                         {% if notification.related_user %}
-                        {% include 'snippets/avatar.html' with user=notification.related_user %}
-                        {% include 'snippets/username.html' with user=notification.related_user %}
-                        {% if notification.notification_type == 'FAVORITE' %}
-                            favorited your
-                            <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
+                            {% include 'snippets/avatar.html' with user=notification.related_user %}
+                            {% include 'snippets/username.html' with user=notification.related_user %}
+                            {% if notification.notification_type == 'FAVORITE' %}
+                                favorited your
+                                <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
 
-                        {% elif notification.notification_type == 'MENTION' %}
-                            mentioned you in a
-                            <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
+                            {% elif notification.notification_type == 'MENTION' %}
+                                mentioned you in a
+                                <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
 
-                        {% elif notification.notification_type == 'REPLY' %}
-                            <a href="{{ related_status.local_path }}">replied</a>
-                            to your
-                            <a href="{{ related_status.reply_parent.local_path }}">{{ related_status | status_preview_name|safe }}</a>
-                        {% elif notification.notification_type == 'FOLLOW' %}
-                            followed you
-                            {% include 'snippets/follow_button.html' with user=notification.related_user %}
-                        {% elif notification.notification_type == 'FOLLOW_REQUEST' %}
-                            sent you a follow request
-                            <div class="row shrink">
-                                {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
-                            </div>
-
-                        {% elif notification.notification_type == 'BOOST' %}
-                            boosted your <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
-                        {% endif %}
-                        {% else %}
+                            {% elif notification.notification_type == 'REPLY' %}
+                                <a href="{{ related_status.local_path }}">replied</a>
+                                to your
+                                <a href="{{ related_status.reply_parent.local_path }}">{{ related_status | status_preview_name|safe }}</a>
+                            {% elif notification.notification_type == 'FOLLOW' %}
+                                followed you
+                                {% include 'snippets/follow_button.html' with user=notification.related_user %}
+                            {% elif notification.notification_type == 'FOLLOW_REQUEST' %}
+                                sent you a follow request
+                                <div class="row shrink">
+                                    {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
+                                </div>
+                            {% elif notification.notification_type == 'BOOST' %}
+                                boosted your <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
+                            {% elif notification.notification_type == 'ADD' %}
+                            {% if notification.related_list_item.approved %}added{% else %}suggested adding{% endif %} {% include 'snippets/book_titleby.html' with book=notification.related_list_item.book %} to your list "<a href="{{ notification.related_list_item.book_list.local_path }}{% if not notification.related_list_item.approved %}/curate{% endif %}">{{ notification.related_list_item.book_list.name }}</a>"
+                            {% endif %}
+                        {% elif notification.related_import %}
                             your <a href="/import/{{ notification.related_import.id }}">import</a> completed.
                         {% endif %}
                     </p>