mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-09-23 20:10:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2221 from bookwyrm-social/notification_order

Browse source 
Notification order
This commit is contained in:
Mouse Reeve 2022-07-14 11:21:49 -07:00 committed by GitHub
commit 2def5ff2bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/models/notification.py
View file

@ -300,8 +300,10 @@ def notify_user_on_follow(sender, instance, created, *args, **kwargs):
notification.read = False notification.read = False
notification.save() notification.save()
else: else:
# Only group unread follows
Notification.notify( Notification.notify(
instance.user_object, instance.user_object,
instance.user_subject, instance.user_subject,
notification_type=Notification.FOLLOW, notification_type=Notification.FOLLOW,
read=False,
) )

11
bookwyrm/templates/notifications/items/layout.html
View file

@ -2,7 +2,7 @@
{% load humanize %} {% load humanize %}
{% related_status notification as related_status %} {% related_status notification as related_status %}
{% with related_users=notification.related_users.all.distinct %} {% get_related_users notification as related_users %}
{% with related_user_count=notification.related_users.count %} {% with related_user_count=notification.related_users.count %}
<div class="notification {% if notification.id in unread %}has-background-primary{% endif %}"> <div class="notification {% if notification.id in unread %}has-background-primary{% endif %}">
<div class="columns is-mobile {% if notification.id in unread %}has-text-white{% else %}has-text-more-muted{% endif %}"> <div class="columns is-mobile {% if notification.id in unread %}has-text-white{% else %}has-text-more-muted{% endif %}">
@ -16,7 +16,7 @@
{% if related_user_count > 1 %} {% if related_user_count > 1 %}
<div class="block"> <div class="block">
<ul class="is-flex"> <ul class="is-flex">
{% for user in related_users|slice:10 %} {% for user in related_users %}
<li class="mr-2"> <li class="mr-2">
<a href="{{ user.local_path }}"> <a href="{{ user.local_path }}">
{% include 'snippets/avatar.html' with user=user %} {% include 'snippets/avatar.html' with user=user %}
@ -28,7 +28,7 @@
{% endif %} {% endif %}
<div class="block content"> <div class="block content">
{% if related_user_count == 1 %} {% if related_user_count == 1 %}
{% with user=related_users.first %} {% with user=related_users.0 %}
{% spaceless %} {% spaceless %}
<a href="{{ user.local_path }}" class="mr-2"> <a href="{{ user.local_path }}" class="mr-2">
{% include 'snippets/avatar.html' with user=user %} {% include 'snippets/avatar.html' with user=user %}
@ -37,8 +37,8 @@
{% endwith %} {% endwith %}
{% endif %} {% endif %}
{% with related_user=related_users.first.display_name %} {% with related_user=related_users.0.display_name %}
{% with related_user_link=related_users.first.local_path %} {% with related_user_link=related_users.0.local_path %}
{% with second_user=related_users.1.display_name %} {% with second_user=related_users.1.display_name %}
{% with second_user_link=related_users.1.local_path %} {% with second_user_link=related_users.1.local_path %}
{% with other_user_count=related_user_count|add:"-1" %} {% with other_user_count=related_user_count|add:"-1" %}
@ -61,4 +61,3 @@
</div> </div>
</div> </div>
{% endwith %} {% endwith %}
{% endwith %}

6
bookwyrm/templatetags/notification_page_tags.py
View file

@ -12,3 +12,9 @@ def related_status(notification):
if not notification.related_status: if not notification.related_status:
return None return None
return load_subclass(notification.related_status) return load_subclass(notification.related_status)
@register.simple_tag(takes_context=False)
def get_related_users(notification):
"""Who actually was it who liked your post"""
return list(reversed(list(notification.related_users.distinct())))[:10]