indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Show svg images if they have been rendered harmless

main
Bob Mottram 2022-05-26 12:02:03 +01:00
parent bedb68f705
commit 4a3e0f5cf1
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blog.py
View File

@ -259,7 +259,7 @@ def _html_blog_post_content(debug: bool, session, authorized: bool,
mute_str = '' mute_str = ''
is_muted = False is_muted = False
attachment_str, _ = \ attachment_str, _ = \
get_post_attachments_as_html(post_json_object, get_post_attachments_as_html(base_dir, post_json_object,
'tlblogs', translate, 'tlblogs', translate,
is_muted, avatar_link, is_muted, avatar_link,
reply_str, announce_str, reply_str, announce_str,

3
webapp_post.py
View File

@ -1962,7 +1962,8 @@ def individual_post_as_html(signing_priv_key_pem: str,
_log_post_timing(enable_timing_log, post_start_time, '14') _log_post_timing(enable_timing_log, post_start_time, '14')
attachment_str, gallery_str = \ attachment_str, gallery_str = \
get_post_attachments_as_html(post_json_object, box_name, translate, get_post_attachments_as_html(base_dir, post_json_object,
box_name, translate,
is_muted, avatar_link, is_muted, avatar_link,
reply_str, announce_str, like_str, reply_str, announce_str, like_str,
bookmark_str, delete_str, mute_str) bookmark_str, delete_str, mute_str)

25
webapp_utils.py
View File

@ -11,6 +11,7 @@ import os
from shutil import copyfile from shutil import copyfile
from collections import OrderedDict from collections import OrderedDict
from session import get_json from session import get_json
from utils import remove_id_ending
from utils import get_attachment_property_value from utils import get_attachment_property_value
from utils import is_account_dir from utils import is_account_dir
from utils import remove_html from utils import remove_html
@ -1096,7 +1097,8 @@ def _is_attached_video(attachment_filename: str) -> bool:
return False return False
def get_post_attachments_as_html(post_json_object: {}, box_name: str, def get_post_attachments_as_html(base_dir: str,
post_json_object: {}, box_name: str,
translate: {}, translate: {},
is_muted: bool, avatar_link: str, is_muted: bool, avatar_link: str,
reply_str: str, announce_str: str, reply_str: str, announce_str: str,
@ -1116,6 +1118,10 @@ def get_post_attachments_as_html(post_json_object: {}, box_name: str,
attachment_ctr = 0 attachment_ctr = 0
attachment_str = '' attachment_str = ''
media_style_added = False media_style_added = False
post_id = None
if post_json_object['object'].get('id'):
post_id = post_json_object['object']['id']
post_id = remove_id_ending(post_id).replace('/', '--')
for attach in post_json_object['object']['attachment']: for attach in post_json_object['object']['attachment']:
if not (attach.get('mediaType') and attach.get('url')): if not (attach.get('mediaType') and attach.get('url')):
continue continue
@ -1126,7 +1132,22 @@ def get_post_attachments_as_html(post_json_object: {}, box_name: str,
image_description = attach['name'].replace('"', "'") image_description = attach['name'].replace('"', "'")
if _is_image_mime_type(media_type): if _is_image_mime_type(media_type):
image_url = attach['url'] image_url = attach['url']
if _is_attached_image(attach['url']) and 'svg' not in media_type:
# display svg images if they have first been rendered harmless
svg_harmless = True
if 'svg' in media_type:
svg_harmless = False
if post_id:
if '/' in image_url:
im_filename = image_url.split('/')[-1]
else:
im_filename = image_url
cached_svg_filename = \
base_dir + '/media/' + post_id + '_' + im_filename
if os.path.isfile(cached_svg_filename):
svg_harmless = True
if _is_attached_image(attach['url']) and svg_harmless:
if not attachment_str: if not attachment_str:
attachment_str += '<div class="media">\n' attachment_str += '<div class="media">\n'
media_style_added = True media_style_added = True