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

Remove full url

merge-requests/30/head
Bob Mottram 2021-12-17 13:23:19 +00:00
parent 856b8a1516
commit ad8426708e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webapp_column_right.py
View File

@ -197,7 +197,7 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
# show the newswire lines # show the newswire lines
newswireContentStr = \ newswireContentStr = \
_htmlNewswire(baseDir, newswire, nickname, moderator, translate, _htmlNewswire(baseDir, newswire, nickname, moderator, translate,
positiveVoting, httpPrefix, domainFull) positiveVoting)
htmlStr += newswireContentStr htmlStr += newswireContentStr
# show the rss icon at the bottom, typically on the right hand side # show the rss icon at the bottom, typically on the right hand side
@ -213,8 +213,7 @@ def _getBrokenFavSubstitute() -> str:
def _htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool, def _htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool,
translate: {}, positiveVoting: bool, translate: {}, positiveVoting: bool) -> str:
httpPrefix: str, domainFull: str) -> str:
"""Converts a newswire dict into html """Converts a newswire dict into html
""" """
separatorStr = htmlPostSeparator(baseDir, 'right') separatorStr = htmlPostSeparator(baseDir, 'right')
@ -245,7 +244,6 @@ def _htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool,
cachedFaviconFilename = getFavFilenameFromUrl(baseDir, faviconUrl) cachedFaviconFilename = getFavFilenameFromUrl(baseDir, faviconUrl)
if os.path.isfile(cachedFaviconFilename): if os.path.isfile(cachedFaviconFilename):
faviconUrl = \ faviconUrl = \
httpPrefix + '://' + domainFull + \
cachedFaviconFilename.replace(baseDir, '') cachedFaviconFilename.replace(baseDir, '')
else: else:
extensions = ('png', 'jpg', 'gif', 'avif', 'svg', 'webp') extensions = ('png', 'jpg', 'gif', 'avif', 'svg', 'webp')
@ -256,7 +254,6 @@ def _htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool,
cachedFaviconFilename.replace('.ico', '.' + ext) cachedFaviconFilename.replace('.ico', '.' + ext)
if os.path.isfile(cachedFaviconFilename): if os.path.isfile(cachedFaviconFilename):
faviconUrl = \ faviconUrl = \
httpPrefix + '://' + domainFull + \
cachedFaviconFilename.replace(baseDir, '') cachedFaviconFilename.replace(baseDir, '')
faviconLink = \ faviconLink = \