More caching

This commit is contained in:
Thomas Sileo
2018-07-20 10:56:39 +02:00
parent 610262d7b6
commit 3e7b09b7a8
6 changed files with 64 additions and 23 deletions

View File

@@ -24,7 +24,7 @@
{% for item in outbox_data %}
{% if item | has_type('Announce') %}
{% set boost_actor = item.activity.actor | get_actor %}
{% set boost_actor = item.meta.actor %}
{% if session.logged_in %}
<div style="margin-left:65px;padding-bottom:5px;margin-bottom:15px;">
<span class="bar-item-no-hover"><a style="color:#808080;" href="{{ boost_actor.url | get_url }}">{{ boost_actor.name }}</a> boosted</span>
@@ -41,7 +41,7 @@
</p>
{% endif %}
{% if item.meta.object %}
{{ utils.display_note(item.meta.object, ui=False) }}
{{ utils.display_note(item.meta.object, ui=False, meta={'actor': item.meta.object_actor}) }}
{% endif %}
{% elif item | has_type('Create') %}
{{ utils.display_note(item.activity.object, meta=item.meta, no_color=True) }}

View File

@@ -20,7 +20,7 @@
{% endif %}
{% if item.meta.object %}
{{ utils.display_note(item.meta.object) }}
{{ utils.display_note(item.meta.object, meta={'actor': item.meta.object_actor}) }}
{% endif %}
{% endfor %}

View File

@@ -1,6 +1,6 @@
{% extends "layout.html" %}
{% import 'utils.html' as utils %}
{% block title %}Stream - {{ config.NAME }}{% endblock %}
{% block title %}{% if request.path == url_for('admin_stream') %}Stream{% else %}Notifications{% endif %} - {{ config.NAME }}{% endblock %}
{% block content %}
<div class="h-feed" id="container">
{% include "header.html" %}
@@ -13,7 +13,7 @@
{% else %}
{% if item | has_type('Announce') %}
{% set boost_actor = item.activity.actor | get_actor %}
{% set boost_actor = item.meta.actor %}
<p style="margin-left:70px;padding-bottom:5px;"><span class="bar-item-no-hover"><a style="color:#808080;" href="{{ boost_actor.url | get_url }}">{{ boost_actor.name or boost_actor.preferredUsername }}</a> boosted</span></p>
{% if item.meta.object %}
{{ utils.display_note(item.meta.object, ui=True) }}
@@ -23,19 +23,19 @@
{% if item | has_type('Follow') %}
<p style="margin-left:70px;padding-bottom:5px;"><span class="bar-item-no-hover">new follower</span> <!-- <a href="" class="bar-item">follow back</a></p> -->
<div style="height: 100px;">
{{ utils.display_actor_inline(item.activity.actor | get_actor, size=50) }}
{{ utils.display_actor_inline(item.meta.actor, size=50) }}
</div>
{% elif item | has_type('Accept') %}
<p style="margin-left:70px;padding-bottom:5px;"><span class="bar-item-no-hover">you started following</span></p>
<div style="height: 100px;">
{{ utils.display_actor_inline(item.activity.actor | get_actor, size=50) }}
{{ utils.display_actor_inline(item.meta.actor, size=50) }}
</div>
{% elif item | has_type('Undo') %}
<p style="margin-left:70px;padding-bottom:5px;"><span class="bar-item-no-hover">unfollowed you</span></p>
<div style="height: 100px;">
{{ utils.display_actor_inline(item.activity.actor | get_actor, size=50) }}
{{ utils.display_actor_inline(item.meta.actor, size=50) }}
</div>
{% else %}