mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-27 12:01:14 +00:00
Code Issues Projects Releases Wiki Activity

Create notification when adding or suggesting a book to a list

Browse source
This commit is contained in:
Mouse Reeve 2021-02-10 13:46:56 -08:00
parent 2bf4b17113
commit 8842db3c1b
3 changed files with 48 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bookwyrm/models/list.py
View file

@ -1,4 +1,5 @@
''' make a list of books!! ''' ''' make a list of books!! '''
from django.apps import apps
from django.db import models from django.db import models
from bookwyrm import activitypub from bookwyrm import activitypub
@ -71,6 +72,22 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
object_field = 'book' object_field = 'book'
collection_field = 'book_list' 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: class Meta:
''' an opinionated constraint! you can't put a book on a list twice ''' ''' an opinionated constraint! you can't put a book on a list twice '''
unique_together = ('book', 'book_list') unique_together = ('book', 'book_list')

4
bookwyrm/templates/lists/list.html
View file

@ -26,7 +26,7 @@
<div class="column is-flex-direction-column is-align-items-self-start"> <div class="column is-flex-direction-column is-align-items-self-start">
<span>{% include 'snippets/book_titleby.html' with book=item.book %}</span> <span>{% include 'snippets/book_titleby.html' with book=item.book %}</span>
{% include 'snippets/stars.html' with rating=item.book|rating:request.user %} {% 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> </div>
<div class="card-footer has-background-white-bis"> <div class="card-footer has-background-white-bis">
@ -72,6 +72,7 @@
<p>No books found{% if query %} matching the query "{{ query }}"{% endif %}</p> <p>No books found{% if query %} matching the query "{{ query }}"{% endif %}</p>
{% endif %} {% endif %}
{% for book in suggested_books %} {% for book in suggested_books %}
{% if book %}
<div class="block columns"> <div class="block columns">
<div class="column is-narrow"> <div class="column is-narrow">
<a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a> <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
@ -85,6 +86,7 @@
</form> </form>
</div> </div>
</div> </div>
{% endif %}
{% endfor %} {% endfor %}
</section> </section>
{% endif %} {% endif %}

53
bookwyrm/templates/notifications.html
View file

@ -29,6 +29,8 @@
<span class="icon icon-heart"></span> <span class="icon icon-heart"></span>
{% elif notification.notification_type == 'IMPORT' %} {% elif notification.notification_type == 'IMPORT' %}
<span class="icon icon-list"></span> <span class="icon icon-list"></span>
{% elif notification.notification_type == 'ADD' %}
<span class="icon icon-plus"></span>
{% endif %} {% endif %}
</div> </div>
<div class="column"> <div class="column">
@ -36,33 +38,34 @@
<p> <p>
{# DESCRIPTION #} {# DESCRIPTION #}
{% if notification.related_user %} {% if notification.related_user %}
{% include 'snippets/avatar.html' with user=notification.related_user %} {% include 'snippets/avatar.html' with user=notification.related_user %}
{% include 'snippets/username.html' with user=notification.related_user %} {% include 'snippets/username.html' with user=notification.related_user %}
{% if notification.notification_type == 'FAVORITE' %} {% if notification.notification_type == 'FAVORITE' %}
favorited your favorited your
<a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a> <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
{% elif notification.notification_type == 'MENTION' %} {% elif notification.notification_type == 'MENTION' %}
mentioned you in a mentioned you in a
<a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a> <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
{% elif notification.notification_type == 'REPLY' %} {% elif notification.notification_type == 'REPLY' %}
<a href="{{ related_status.local_path }}">replied</a> <a href="{{ related_status.local_path }}">replied</a>
to your to your
<a href="{{ related_status.reply_parent.local_path }}">{{ related_status | status_preview_name|safe }}</a> <a href="{{ related_status.reply_parent.local_path }}">{{ related_status | status_preview_name|safe }}</a>
{% elif notification.notification_type == 'FOLLOW' %} {% elif notification.notification_type == 'FOLLOW' %}
followed you followed you
{% include 'snippets/follow_button.html' with user=notification.related_user %} {% include 'snippets/follow_button.html' with user=notification.related_user %}
{% elif notification.notification_type == 'FOLLOW_REQUEST' %} {% elif notification.notification_type == 'FOLLOW_REQUEST' %}
sent you a follow request sent you a follow request
<div class="row shrink"> <div class="row shrink">
{% include 'snippets/follow_request_buttons.html' with user=notification.related_user %} {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
</div> </div>
{% elif notification.notification_type == 'BOOST' %}
{% elif notification.notification_type == 'BOOST' %} boosted your <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
boosted your <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a> {% elif notification.notification_type == 'ADD' %}
{% endif %} {% 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>"
{% else %} {% endif %}
{% elif notification.related_import %}
your <a href="/import/{{ notification.related_import.id }}">import</a> completed. your <a href="/import/{{ notification.related_import.id }}">import</a> completed.
{% endif %} {% endif %}
</p> </p>