From 8e645c619010c2c87060604b592bd3cff04e1835 Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Sun, 3 Jun 2018 23:36:16 +0200
Subject: [PATCH] Also display boost/announce actors

---
 app.py               | 10 +++++++++-
 templates/note.html  |  2 +-
 templates/utils.html | 33 +++++++++++++++++++++++++--------
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/app.py b/app.py
index c7993f5..e9a0bf5 100644
--- a/app.py
+++ b/app.py
@@ -474,7 +474,15 @@ def note_by_id(note_id):
     }))
     likes = [ACTOR_SERVICE.get(doc['activity']['actor']) for doc in likes]          
 
-    return render_template('note.html', likes=likes, me=ME, thread=thread, note=data)
+    shares = list(DB.inbox.find({
+        'meta.undo': False,
+        'type': ActivityType.ANNOUNCE.value,
+        '$or': [{'activity.object.id': data['activity']['object']['id']},
+                {'activity.object': data['activity']['object']['id']}],
+    }))
+    shares = [ACTOR_SERVICE.get(doc['activity']['actor']) for doc in shares]          
+
+    return render_template('note.html', likes=likes, shares=shares, me=ME, thread=thread, note=data)
 
 
 @app.route('/nodeinfo')
diff --git a/templates/note.html b/templates/note.html
index 0ff83ed..8599778 100644
--- a/templates/note.html
+++ b/templates/note.html
@@ -16,6 +16,6 @@
 {% block content %}
 <div id="container">
 {% include "header.html" %}
-{{ utils.display_thread(thread, likes) }}
+{{ utils.display_thread(thread, likes=likes, shares=shares) }}
 </div>
 {% endblock %}
diff --git a/templates/utils.html b/templates/utils.html
index 07fb19e..2535e9c 100644
--- a/templates/utils.html
+++ b/templates/utils.html
@@ -32,7 +32,7 @@
 </a>
 {%- endmacro %}
 
-{% macro display_note(item, perma=False, ui=False, likes=[]) -%}
+{% macro display_note(item, perma=False, ui=False, likes=[], shares=[]) -%}
 {% set actor = item.activity.object.attributedTo | get_actor  %}
 <div class="note h-entry" id="activity-{{ item['_id'].__str__() }}">
 
@@ -76,12 +76,14 @@
 	{% endif %}
 
 <div class="bottom-bar">
-{% if perma %}<span class="perma-item">{{ item.activity.object.published | format_time }}</span> {% endif %}	
+{% if perma %}<span class="perma-item">{{ item.activity.object.published | format_time }}</span>
+{% else %}	
 <a class ="bar-item" href="{{ item.activity.object.url }}">permalink</a> 
 
 {% if item.meta.count_reply %}<a class ="bar-item" href="{{ item.activity.object.url }}">{{ item.meta.count_reply }} replies</a>{% endif %}
 {% if item.meta.count_boost %}<a class ="bar-item" href="{{ item.activity.object.url }}">{{ item.meta.count_boost }} boosts</a>{% endif %}
 {% if item.meta.count_like %}<a class ="bar-item" href="{{ item.activity.object.url }}">{{ item.meta.count_like }} likes</a>{% endif %}
+{% endif %}
 
 {% if ui and session.logged_in %}
 
@@ -124,23 +126,38 @@
 
 {% endif %}
 </div>
-</div>
 
-</div>                       
+{% if likes or shares %}
+<div style="padding-top:20px;" class="pure-g">
 {% if likes %}
-<div style="padding-bottom:40px;">
-<h4 style="font-weight:normal">Liked by</h4>{% for like in likes %}
+<div class="pure-u-1-2">
+<h4 style="font-weight:normal"><strong>{{ item.meta.count_like }}</strong> likes</h4>{% for like in likes %}
 {{ display_actor_inline(like) }}
 {% endfor %}
 </div>
 {% endif %}
+{% if shares %}
+<div class="pure-u-1-2">
+<h4 style="font-weight:normal"><strong>{{ item.meta.count_boost }}</strong> boosts</h4>{% for boost in shares %}
+{{ display_actor_inline(boost) }}
+{% endfor %}
+</div>
+{% endif %}
+</div>
+{% endif %}
+
+
+
+</div>
+
+</div>                       
 
 {%- endmacro %}
 
-{% macro display_thread(thread, likes=[]) -%}
+{% macro display_thread(thread, likes=[], shares=[]) -%}
 {% for reply in thread %}
 {% if reply._requested %}
-{{ display_note(reply, perma=True, ui=False, likes=likes) }}
+{{ display_note(reply, perma=True, ui=False, likes=likes, shares=shares) }}
 {% else %}
 {{ display_note(reply, perma=False, ui=True) }}
 {% endif %}