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

Tidying

main
Bob Mottram 2020-12-06 15:40:23 +00:00
parent 2887fb2661
commit fa4f278610
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
webapp_post.py
View File

@ -202,6 +202,14 @@ def getAvatarImageUrl(session,
return avatarUrl return avatarUrl
def getBrokenLinkSubstitute(iconsPath: str) -> str:
"""Returns html used to show a default image if the link to
an image is broken
"""
return " onerror=\"this.onerror=null; this.src='" + \
iconsPath + "/avatar_default.png'\""
def getAvatarImageHtml(showAvatarOptions: bool, def getAvatarImageHtml(showAvatarOptions: bool,
nickname: str, domainFull: str, nickname: str, domainFull: str,
avatarUrl: str, postActor: str, avatarUrl: str, postActor: str,
@ -210,18 +218,13 @@ def getAvatarImageHtml(showAvatarOptions: bool,
iconsPath: str) -> str: iconsPath: str) -> str:
"""Get html for the avatar image """Get html for the avatar image
""" """
# if the image link is broken then this provides a local substitute
brokenLinkSubstitute = \
" onerror=\"this.onerror=null; this.src='" + \
iconsPath + "/avatar_default.png'\""
avatarLink = '' avatarLink = ''
if '/users/news/' not in avatarUrl: if '/users/news/' not in avatarUrl:
avatarLink = ' <a class="imageAnchor" href="' + postActor + '">' avatarLink = ' <a class="imageAnchor" href="' + postActor + '">'
avatarLink += \ avatarLink += \
' <img loading="lazy" src="' + avatarUrl + '" title="' + \ ' <img loading="lazy" src="' + avatarUrl + '" title="' + \
translate['Show profile'] + '" alt=" "' + avatarPosition + \ translate['Show profile'] + '" alt=" "' + avatarPosition + \
brokenLinkSubstitute + '/></a>\n' getBrokenLinkSubstitute(iconsPath) + '/></a>\n'
if showAvatarOptions and \ if showAvatarOptions and \
domainFull + '/users/' + nickname not in postActor: domainFull + '/users/' + nickname not in postActor:
@ -234,14 +237,14 @@ def getAvatarImageHtml(showAvatarOptions: bool,
' <img loading="lazy" title="' + \ ' <img loading="lazy" title="' + \
translate['Show options for this person'] + \ translate['Show options for this person'] + \
'" src="' + avatarUrl + '" ' + avatarPosition + \ '" src="' + avatarUrl + '" ' + avatarPosition + \
brokenLinkSubstitute + '/></a>\n' getBrokenLinkSubstitute(iconsPath) + '/></a>\n'
else: else:
# don't link to the person options for the news account # don't link to the person options for the news account
avatarLink += \ avatarLink += \
' <img loading="lazy" title="' + \ ' <img loading="lazy" title="' + \
translate['Show options for this person'] + \ translate['Show options for this person'] + \
'" src="' + avatarUrl + '" ' + avatarPosition + \ '" src="' + avatarUrl + '" ' + avatarPosition + \
brokenLinkSubstitute + '/>\n' getBrokenLinkSubstitute(iconsPath) + '/>\n'
return avatarLink.strip() return avatarLink.strip()
@ -772,10 +775,6 @@ def getPostTitleAnnounceHtml(baseDir: str,
if announceAvatarUrl: if announceAvatarUrl:
idx = 'Show options for this person' idx = 'Show options for this person'
if '/users/news/' not in announceAvatarUrl: if '/users/news/' not in announceAvatarUrl:
brokenLinkSubstitute = \
" onerror=\"this.onerror=null; this.src='" + \
iconsPath + "/avatar_default.png'\""
replyAvatarImageInPost = \ replyAvatarImageInPost = \
' ' \ ' ' \
'<div class=' + \ '<div class=' + \
@ -792,7 +791,7 @@ def getPostTitleAnnounceHtml(baseDir: str,
announceAvatarUrl + '" ' + \ announceAvatarUrl + '" ' + \
'title="' + translate[idx] + \ 'title="' + translate[idx] + \
'" alt=" "' + avatarPosition + \ '" alt=" "' + avatarPosition + \
brokenLinkSubstitute + \ getBrokenLinkSubstitute(iconsPath) + \
'/></a>\n </div>\n' '/></a>\n </div>\n'
else: else:
titleStr += \ titleStr += \
@ -964,10 +963,6 @@ def getPostTitleReplyHtml(baseDir: str,
logPostTiming(enableTimingLog, postStartTime, '13.8') logPostTiming(enableTimingLog, postStartTime, '13.8')
if replyAvatarUrl: if replyAvatarUrl:
brokenLinkSubstitute = \
" onerror=\"this.onerror=null; this.src='" + \
iconsPath + "/avatar_default.png'\""
replyAvatarImageInPost = \ replyAvatarImageInPost = \
' <div class=' + \ ' <div class=' + \
'"timeline-avatar-reply">\n' '"timeline-avatar-reply">\n'
@ -988,7 +983,8 @@ def getPostTitleReplyHtml(baseDir: str,
translate['Show profile'] translate['Show profile']
replyAvatarImageInPost += \ replyAvatarImageInPost += \
'" alt=" "' + \ '" alt=" "' + \
avatarPosition + brokenLinkSubstitute + \ avatarPosition + \
getBrokenLinkSubstitute(iconsPath) + \
'/></a>\n </div>\n' '/></a>\n </div>\n'
else: else:
inReplyTo = \ inReplyTo = \