From f1926ce76d79d5a9917f7e75ca7c4352e9af4176 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 16 Dec 2020 16:20:40 -0800
Subject: [PATCH] Avoid duplicate notifitions

And render html
---
 bookwyrm/incoming.py                  | 5 ++++-
 bookwyrm/templates/notifications.html | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/incoming.py b/bookwyrm/incoming.py
index 556c34a2..78e7b970 100644
--- a/bookwyrm/incoming.py
+++ b/bookwyrm/incoming.py
@@ -218,7 +218,9 @@ def handle_create(activity):
 
     status = activity.to_model(model)
     # create a notification if this is a reply
+    notified = []
     if status.reply_parent and status.reply_parent.user.local:
+        notified.append(status.reply_parent.user)
         status_builder.create_notification(
             status.reply_parent.user,
             'REPLY',
@@ -226,7 +228,8 @@ def handle_create(activity):
             related_status=status,
         )
     if status.mention_users.exists():
-        for mentioned_user in status.mention_users.all():
+        for mentioned_user in status.mention_users.all() and \
+                mentioned_user not in notified:
             if not mentioned_user.local:
                 continue
             status_builder.create_notification(
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index f31df76d..ddcbc0fd 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -54,7 +54,7 @@
             <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-white{% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %} has-text-black{% else %}-bis has-text-grey-dark{% endif %}{% endif %}">
                 <div class="columns">
                     <div class="column">
-                        <a href="{{ notification.related_status.remote_id }}">{{ notification.related_status.content | truncatewords_html:10 }}</a>
+                        <a href="{{ notification.related_status.remote_id }}">{{ notification.related_status.content | safe | truncatewords_html:10 }}</a>
                     </div>
                     <div class="column is-narrow {% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %}has-text-black{% else %}has-text-grey-dark{% endif %}">
                         {{ notification.related_status.published_date | post_date }}