b1-66er/microblog.pub
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add get_text template filter

Browse Source 
returns object's `content` or `name`, the first is set, or an empty 
string.

some objects don't have `content`, don't let templates rely on it
This commit is contained in:
Fabio
2020-01-07 17:39:17 +01:00
parent a71bf46af5
commit 1f2a8f6da7
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/note.html
View File

@@ -1,14 +1,14 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% import 'utils.html' as utils %} {% import 'utils.html' as utils %}
{% block title %}{{ config.NAME }}: "{{ note.activity.object.content | html2plaintext | trim | truncate(50) }}"{% endblock %} {% block title %}{{ config.NAME }}{{ note.activity.object | get_text | html2plaintext | trim | truncate(50) }}"{% endblock %}
{% block header %} {% block header %}
<meta name="description" content="{{ note.activity.object.content | html2plaintext | trim | truncate(50) }}"> <meta name="description" content="{{ note.activity.object | get_text | html2plaintext | trim | truncate(50) }}">
<meta content="article" property="og:type" /> <meta content="article" property="og:type" />
<meta content="{{ note.activity.object.url }}" property="og:url" /> <meta content="{{ note.activity.object.url }}" property="og:url" />
<meta content="{{ config.USERNAME }} microblog" property="og:site_name" /> <meta content="{{ config.USERNAME }} microblog" property="og:site_name" />
<meta content="{{ config.USERNAME }}" property="og:title" /> <meta content="{{ config.USERNAME }}" property="og:title" />
<meta content="{{ note.activity.object.content | html2plaintext | trim | truncate(50) }}" property="og:description" /> <meta content="{{ note.activity.object | get_text | html2plaintext | trim | truncate(50) }}" property="og:description" />
<meta content="{{ me.icon.url }}" property="og:image" /> <meta content="{{ me.icon.url }}" property="og:image" />
<meta content="200" property="og:image:width" /> <meta content="200" property="og:image:width" />
<meta content="200" property="og:image:height" /> <meta content="200" property="og:image:height" />

2
templates/utils.html
View File

@@ -198,7 +198,7 @@
{% else %} {% else %}
{{ obj.content | update_inline_imgs | clean | replace_custom_emojis(obj) | code_highlight | safe }} {{ obj | get_text | update_inline_imgs | clean | replace_custom_emojis(obj) | code_highlight | safe }}
{% endif %} {% endif %}
{% if obj | has_place %} {% if obj | has_place %}

8
utils/template_filters.py
View File

@@ -403,6 +403,14 @@ def get_video_link(data):
return data return data
return None return None
@filters.app_template_filter()
def get_text(data):
"""return first in 'content', 'name' or ''"""
for _t in ("content", "name"):
if _t in data:
return data[_t]
return ""
@filters.app_template_filter() @filters.app_template_filter()
def has_type(doc, _types): def has_type(doc, _types):