From ad8426708ea18638a95961a84056b0f9bcb9aca8 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 17 Dec 2021 13:23:19 +0000 Subject: [PATCH] Remove full url --- webapp_column_right.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/webapp_column_right.py b/webapp_column_right.py index 78f1e094e..8e476c34e 100644 --- a/webapp_column_right.py +++ b/webapp_column_right.py @@ -197,7 +197,7 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str, # show the newswire lines newswireContentStr = \ _htmlNewswire(baseDir, newswire, nickname, moderator, translate, - positiveVoting, httpPrefix, domainFull) + positiveVoting) htmlStr += newswireContentStr # 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, - translate: {}, positiveVoting: bool, - httpPrefix: str, domainFull: str) -> str: + translate: {}, positiveVoting: bool) -> str: """Converts a newswire dict into html """ separatorStr = htmlPostSeparator(baseDir, 'right') @@ -245,7 +244,6 @@ def _htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool, cachedFaviconFilename = getFavFilenameFromUrl(baseDir, faviconUrl) if os.path.isfile(cachedFaviconFilename): faviconUrl = \ - httpPrefix + '://' + domainFull + \ cachedFaviconFilename.replace(baseDir, '') else: extensions = ('png', 'jpg', 'gif', 'avif', 'svg', 'webp') @@ -256,7 +254,6 @@ def _htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool, cachedFaviconFilename.replace('.ico', '.' + ext) if os.path.isfile(cachedFaviconFilename): faviconUrl = \ - httpPrefix + '://' + domainFull + \ cachedFaviconFilename.replace(baseDir, '') faviconLink = \