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

Snake case

main
Bob Mottram 2021-12-25 17:15:52 +00:00
parent bfb3915407
commit 935bf87d30
15 changed files with 163 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
daemon.py
View File

@ -1293,7 +1293,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
self.server.proxyType, version, self.server.proxyType, version,
self.server.debug, self.server.debug,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.allowLocalNetworkAccess, self.server.allowLocalNetworkAccess,
@ -2720,7 +2720,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.port, self.server.port,
None, None,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -2854,7 +2854,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.port, self.server.port,
None, None,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -3303,7 +3303,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -3398,7 +3398,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
port, port,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -3466,7 +3466,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
port, port,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -3563,7 +3563,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
self.server.debug, self.server.debug,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -5129,7 +5129,7 @@ class PubServer(BaseHTTPRequestHandler):
# change YouTube alternate domain # change YouTube alternate domain
if fields.get('ytdomain'): if fields.get('ytdomain'):
currYTDomain = self.server.YTReplacementDomain currYTDomain = self.server.yt_replace_domain
if fields['ytdomain'] != currYTDomain: if fields['ytdomain'] != currYTDomain:
newYTDomain = fields['ytdomain'] newYTDomain = fields['ytdomain']
if '://' in newYTDomain: if '://' in newYTDomain:
@ -5140,12 +5140,12 @@ class PubServer(BaseHTTPRequestHandler):
setConfigParam(base_dir, setConfigParam(base_dir,
'youtubedomain', 'youtubedomain',
newYTDomain) newYTDomain)
self.server.YTReplacementDomain = \ self.server.yt_replace_domain = \
newYTDomain newYTDomain
else: else:
setConfigParam(base_dir, setConfigParam(base_dir,
'youtubedomain', '') 'youtubedomain', '')
self.server.YTReplacementDomain = None self.server.yt_replace_domain = None
# change twitter alternate domain # change twitter alternate domain
if fields.get('twitterdomain'): if fields.get('twitterdomain'):
@ -7538,7 +7538,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -7601,7 +7601,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.systemLanguage) self.server.systemLanguage)
if hashtagStr: if hashtagStr:
@ -7750,7 +7750,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, self.server.projectVersion, http_prefix, self.server.projectVersion,
timelineStr, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -8210,7 +8210,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
timelineStr, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -8364,7 +8364,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, http_prefix,
self.server.projectVersion, timelineStr, self.server.projectVersion, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -8548,7 +8548,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
timelineStr, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -8720,7 +8720,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, http_prefix,
self.server.projectVersion, timelineStr, self.server.projectVersion, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -8818,7 +8818,7 @@ class PubServer(BaseHTTPRequestHandler):
domain, port, postJsonObject, domain, port, postJsonObject,
self.server.http_prefix, self.server.http_prefix,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -8940,7 +8940,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, self.server.projectVersion, http_prefix, self.server.projectVersion,
timelineStr, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -9068,7 +9068,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, http_prefix,
self.server.projectVersion, timelineStr, self.server.projectVersion, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -9165,7 +9165,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.projectVersion, self.server.projectVersion,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, callingDomain, self.server.personCache, callingDomain,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -9270,7 +9270,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, http_prefix,
self.server.projectVersion, timelineStr, self.server.projectVersion, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -9380,7 +9380,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, http_prefix,
self.server.projectVersion, timelineStr, self.server.projectVersion, timelineStr,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -9483,7 +9483,7 @@ class PubServer(BaseHTTPRequestHandler):
cachedWebfingers = self.server.cachedWebfingers cachedWebfingers = self.server.cachedWebfingers
personCache = self.server.personCache personCache = self.server.personCache
projectVersion = self.server.projectVersion projectVersion = self.server.projectVersion
ytDomain = self.server.YTReplacementDomain ytDomain = self.server.yt_replace_domain
twitterReplacementDomain = \ twitterReplacementDomain = \
self.server.twitterReplacementDomain self.server.twitterReplacementDomain
peertubeInstances = self.server.peertubeInstances peertubeInstances = self.server.peertubeInstances
@ -9575,7 +9575,7 @@ class PubServer(BaseHTTPRequestHandler):
cachedWebfingers = self.server.cachedWebfingers cachedWebfingers = self.server.cachedWebfingers
personCache = self.server.personCache personCache = self.server.personCache
projectVersion = self.server.projectVersion projectVersion = self.server.projectVersion
ytDomain = self.server.YTReplacementDomain ytDomain = self.server.yt_replace_domain
twitterReplacementDomain = \ twitterReplacementDomain = \
self.server.twitterReplacementDomain self.server.twitterReplacementDomain
peertubeInstances = self.server.peertubeInstances peertubeInstances = self.server.peertubeInstances
@ -9667,8 +9667,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.recentPostsCache self.server.recentPostsCache
cachedWebfingers = \ cachedWebfingers = \
self.server.cachedWebfingers self.server.cachedWebfingers
YTReplacementDomain = \ yt_replace_domain = \
self.server.YTReplacementDomain self.server.yt_replace_domain
twitterReplacementDomain = \ twitterReplacementDomain = \
self.server.twitterReplacementDomain self.server.twitterReplacementDomain
iconsAsButtons = \ iconsAsButtons = \
@ -9697,7 +9697,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session, self.server.session,
cachedWebfingers, cachedWebfingers,
self.server.personCache, self.server.personCache,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -9772,8 +9772,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.recentPostsCache self.server.recentPostsCache
cachedWebfingers = \ cachedWebfingers = \
self.server.cachedWebfingers self.server.cachedWebfingers
YTReplacementDomain = \ yt_replace_domain = \
self.server.YTReplacementDomain self.server.yt_replace_domain
twitterReplacementDomain = \ twitterReplacementDomain = \
self.server.twitterReplacementDomain self.server.twitterReplacementDomain
showPublishedDateOnly = \ showPublishedDateOnly = \
@ -9813,7 +9813,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session, self.server.session,
cachedWebfingers, cachedWebfingers,
self.server.personCache, self.server.personCache,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -9984,7 +9984,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
likedBy, reactBy, reactEmoji, likedBy, reactBy, reactEmoji,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -10153,7 +10153,7 @@ class PubServer(BaseHTTPRequestHandler):
personCache: {}, personCache: {},
allowDeletion: bool, allowDeletion: bool,
projectVersion: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str) -> bool: twitterReplacementDomain: str) -> bool:
"""Shows the inbox timeline """Shows the inbox timeline
""" """
@ -10238,7 +10238,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
projectVersion, projectVersion,
minimalNick, minimalNick,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -10387,7 +10387,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
minimalNick, minimalNick,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -10528,7 +10528,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
minimalNick, minimalNick,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -10667,7 +10667,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
minimalNick, minimalNick,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -10807,7 +10807,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
minimalNick, minimalNick,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -10956,7 +10956,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
minimalNick, minimalNick,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -11104,7 +11104,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
minimalNick, minimalNick,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -11211,7 +11211,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -11295,7 +11295,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -11415,7 +11415,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
minimalNick, minimalNick,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -11553,7 +11553,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
minimalNick, minimalNick,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -11683,7 +11683,7 @@ class PubServer(BaseHTTPRequestHandler):
True, True,
http_prefix, http_prefix,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -11809,7 +11809,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session, self.server.session,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -11930,7 +11930,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session, self.server.session,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -12050,7 +12050,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session, self.server.session,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -12186,7 +12186,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session, self.server.session,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
@ -12953,7 +12953,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.port, self.server.port,
postJsonObject, postJsonObject,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -15883,7 +15883,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
self.server.allowDeletion, self.server.allowDeletion,
self.server.projectVersion, self.server.projectVersion,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain): self.server.twitterReplacementDomain):
self.server.GETbusy = False self.server.GETbusy = False
return return
@ -16775,7 +16775,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.content_license_url) self.server.content_license_url)
replaceYouTube(postJsonObject, replaceYouTube(postJsonObject,
self.server.YTReplacementDomain, self.server.yt_replace_domain,
self.server.systemLanguage) self.server.systemLanguage)
replaceTwitter(postJsonObject, replaceTwitter(postJsonObject,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
@ -18431,7 +18431,7 @@ def runDaemon(content_license_url: str,
instanceId: str, clientToServer: bool, instanceId: str, clientToServer: bool,
base_dir: str, domain: str, base_dir: str, domain: str,
onionDomain: str, i2pDomain: str, onionDomain: str, i2pDomain: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
port: int = 80, proxyPort: int = 80, port: int = 80, proxyPort: int = 80,
http_prefix: str = 'https', http_prefix: str = 'https',
@ -18559,7 +18559,7 @@ def runDaemon(content_license_url: str,
if unitTest: if unitTest:
# unit tests are run on the local network with LAN addresses # unit tests are run on the local network with LAN addresses
httpd.allowLocalNetworkAccess = True httpd.allowLocalNetworkAccess = True
httpd.YTReplacementDomain = YTReplacementDomain httpd.yt_replace_domain = yt_replace_domain
httpd.twitterReplacementDomain = twitterReplacementDomain httpd.twitterReplacementDomain = twitterReplacementDomain
# newswire storing rss feeds # newswire storing rss feeds
@ -18889,7 +18889,7 @@ def runDaemon(content_license_url: str,
domainMaxPostsPerDay, accountMaxPostsPerDay, domainMaxPostsPerDay, accountMaxPostsPerDay,
allowDeletion, debug, maxMentions, maxEmoji, allowDeletion, debug, maxMentions, maxEmoji,
httpd.translate, unitTest, httpd.translate, unitTest,
httpd.YTReplacementDomain, httpd.yt_replace_domain,
httpd.twitterReplacementDomain, httpd.twitterReplacementDomain,
httpd.showPublishedDateOnly, httpd.showPublishedDateOnly,
httpd.maxFollowers, httpd.maxFollowers,

8
desktop_client.py
View File

@ -697,7 +697,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str,
nameStr = getNicknameFromActor(actor) nameStr = getNicknameFromActor(actor)
recentPostsCache = {} recentPostsCache = {}
allowLocalNetworkAccess = False allowLocalNetworkAccess = False
YTReplacementDomain = None yt_replace_domain = None
twitterReplacementDomain = None twitterReplacementDomain = None
postJsonObject2 = \ postJsonObject2 = \
downloadAnnounce(session, base_dir, downloadAnnounce(session, base_dir,
@ -705,7 +705,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str,
nickname, domain, nickname, domain,
postJsonObject, postJsonObject,
__version__, translate, __version__, translate,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allowLocalNetworkAccess,
recentPostsCache, False, recentPostsCache, False,
@ -2395,7 +2395,7 @@ def runDesktopClient(base_dir: str, proxyType: str, http_prefix: str,
if postJsonObject['type'] == 'Announce': if postJsonObject['type'] == 'Announce':
recentPostsCache = {} recentPostsCache = {}
allowLocalNetworkAccess = False allowLocalNetworkAccess = False
YTReplacementDomain = None yt_replace_domain = None
twitterReplacementDomain = None twitterReplacementDomain = None
postJsonObject2 = \ postJsonObject2 = \
downloadAnnounce(session, base_dir, downloadAnnounce(session, base_dir,
@ -2403,7 +2403,7 @@ def runDesktopClient(base_dir: str, proxyType: str, http_prefix: str,
nickname, domain, nickname, domain,
postJsonObject, postJsonObject,
__version__, translate, __version__, translate,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allowLocalNetworkAccess,
recentPostsCache, False, recentPostsCache, False,

6
epicyon.py
View File

@ -231,7 +231,7 @@ parser.add_argument('--proxy', dest='proxyPort', type=int, default=None,
parser.add_argument('--path', dest='base_dir', parser.add_argument('--path', dest='base_dir',
type=str, default=os.getcwd(), type=str, default=os.getcwd(),
help='Directory in which to store posts') help='Directory in which to store posts')
parser.add_argument('--ytdomain', dest='YTReplacementDomain', parser.add_argument('--ytdomain', dest='yt_replace_domain',
type=str, default=None, type=str, default=None,
help='Domain used to replace youtube.com') help='Domain used to replace youtube.com')
parser.add_argument('--twitterdomain', dest='twitterReplacementDomain', parser.add_argument('--twitterdomain', dest='twitterReplacementDomain',
@ -3169,7 +3169,7 @@ if YTDomain:
if '/' in YTDomain: if '/' in YTDomain:
YTDomain = YTDomain.split('/')[0] YTDomain = YTDomain.split('/')[0]
if '.' in YTDomain: if '.' in YTDomain:
args.YTReplacementDomain = YTDomain args.yt_replace_domain = YTDomain
twitterDomain = getConfigParam(base_dir, 'twitterdomain') twitterDomain = getConfigParam(base_dir, 'twitterdomain')
if twitterDomain: if twitterDomain:
@ -3248,7 +3248,7 @@ if __name__ == "__main__":
registration, args.language, __version__, registration, args.language, __version__,
instanceId, args.client, base_dir, instanceId, args.client, base_dir,
domain, onionDomain, i2pDomain, domain, onionDomain, i2pDomain,
args.YTReplacementDomain, args.yt_replace_domain,
args.twitterReplacementDomain, args.twitterReplacementDomain,
port, proxyPort, http_prefix, port, proxyPort, http_prefix,
federationList, args.maxMentions, federationList, args.maxMentions,

64
inbox.py
View File

@ -302,7 +302,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
boxname = 'inbox' boxname = 'inbox'
notDM = not isDM(postJsonObject) notDM = not isDM(postJsonObject)
YTReplacementDomain = getConfigParam(base_dir, 'youtubedomain') yt_replace_domain = getConfigParam(base_dir, 'youtubedomain')
twitterReplacementDomain = getConfigParam(base_dir, 'twitterdomain') twitterReplacementDomain = getConfigParam(base_dir, 'twitterdomain')
individualPostAsHtml(signingPrivateKeyPem, individualPostAsHtml(signingPrivateKeyPem,
True, recentPostsCache, maxRecentPosts, True, recentPostsCache, maxRecentPosts,
@ -312,7 +312,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
avatarUrl, True, allowDeletion, avatarUrl, True, allowDeletion,
http_prefix, __version__, boxname, http_prefix, __version__, boxname,
YTReplacementDomain, twitterReplacementDomain, yt_replace_domain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, allowLocalNetworkAccess, peertubeInstances, allowLocalNetworkAccess,
themeName, systemLanguage, maxLikeCount, themeName, systemLanguage, maxLikeCount,
@ -999,7 +999,7 @@ def _receiveLike(recentPostsCache: {},
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
maxRecentPosts: int, translate: {}, maxRecentPosts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -1098,7 +1098,7 @@ def _receiveLike(recentPostsCache: {},
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1121,7 +1121,7 @@ def _receiveUndoLike(recentPostsCache: {},
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
maxRecentPosts: int, translate: {}, maxRecentPosts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -1209,7 +1209,7 @@ def _receiveUndoLike(recentPostsCache: {},
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1233,7 +1233,7 @@ def _receiveReaction(recentPostsCache: {},
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
maxRecentPosts: int, translate: {}, maxRecentPosts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -1357,7 +1357,7 @@ def _receiveReaction(recentPostsCache: {},
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1380,7 +1380,7 @@ def _receiveUndoReaction(recentPostsCache: {},
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
maxRecentPosts: int, translate: {}, maxRecentPosts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -1484,7 +1484,7 @@ def _receiveUndoReaction(recentPostsCache: {},
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1506,7 +1506,7 @@ def _receiveBookmark(recentPostsCache: {},
debug: bool, signingPrivateKeyPem: str, debug: bool, signingPrivateKeyPem: str,
maxRecentPosts: int, translate: {}, maxRecentPosts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -1594,7 +1594,7 @@ def _receiveBookmark(recentPostsCache: {},
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1616,7 +1616,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
debug: bool, signingPrivateKeyPem: str, debug: bool, signingPrivateKeyPem: str,
maxRecentPosts: int, translate: {}, maxRecentPosts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -1705,7 +1705,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1800,7 +1800,7 @@ def _receiveAnnounce(recentPostsCache: {},
sendThreads: [], postLog: [], cachedWebfingers: {}, sendThreads: [], postLog: [], cachedWebfingers: {},
personCache: {}, messageJson: {}, federationList: [], personCache: {}, messageJson: {}, federationList: [],
debug: bool, translate: {}, debug: bool, translate: {},
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -1912,7 +1912,7 @@ def _receiveAnnounce(recentPostsCache: {},
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1935,7 +1935,7 @@ def _receiveAnnounce(recentPostsCache: {},
nickname, domain, nickname, domain,
messageJson, messageJson,
__version__, translate, __version__, translate,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allowLocalNetworkAccess,
recentPostsCache, debug, recentPostsCache, debug,
@ -2980,7 +2980,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
maxRecentPosts: int, translate: {}, maxRecentPosts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -3024,7 +3024,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -3187,7 +3187,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
maxReplies: int, allowDeletion: bool, maxReplies: int, allowDeletion: bool,
maxMentions: int, maxEmoji: int, translate: {}, maxMentions: int, maxEmoji: int, translate: {},
unitTest: bool, unitTest: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -3223,7 +3223,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
debug, signingPrivateKeyPem, debug, signingPrivateKeyPem,
maxRecentPosts, translate, maxRecentPosts, translate,
allowDeletion, allowDeletion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allowLocalNetworkAccess,
@ -3245,7 +3245,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
debug, signingPrivateKeyPem, debug, signingPrivateKeyPem,
maxRecentPosts, translate, maxRecentPosts, translate,
allowDeletion, allowDeletion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allowLocalNetworkAccess,
@ -3268,7 +3268,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
debug, signingPrivateKeyPem, debug, signingPrivateKeyPem,
maxRecentPosts, translate, maxRecentPosts, translate,
allowDeletion, allowDeletion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allowLocalNetworkAccess,
@ -3290,7 +3290,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
debug, signingPrivateKeyPem, debug, signingPrivateKeyPem,
maxRecentPosts, translate, maxRecentPosts, translate,
allowDeletion, allowDeletion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allowLocalNetworkAccess,
@ -3312,7 +3312,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
debug, signingPrivateKeyPem, debug, signingPrivateKeyPem,
maxRecentPosts, translate, maxRecentPosts, translate,
allowDeletion, allowDeletion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allowLocalNetworkAccess,
@ -3334,7 +3334,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
debug, signingPrivateKeyPem, debug, signingPrivateKeyPem,
maxRecentPosts, translate, maxRecentPosts, translate,
allowDeletion, allowDeletion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allowLocalNetworkAccess,
@ -3357,7 +3357,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
messageJson, messageJson,
federationList, federationList,
debug, translate, debug, translate,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allowLocalNetworkAccess,
themeName, systemLanguage, themeName, systemLanguage,
@ -3436,7 +3436,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
return False return False
# replace YouTube links, so they get less tracking data # replace YouTube links, so they get less tracking data
replaceYouTube(postJsonObject, YTReplacementDomain, systemLanguage) replaceYouTube(postJsonObject, yt_replace_domain, systemLanguage)
# replace twitter link domains, so that you can view twitter posts # replace twitter link domains, so that you can view twitter posts
# without having an account # without having an account
replaceTwitter(postJsonObject, twitterReplacementDomain, replaceTwitter(postJsonObject, twitterReplacementDomain,
@ -3456,7 +3456,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
signingPrivateKeyPem, signingPrivateKeyPem,
maxRecentPosts, translate, maxRecentPosts, translate,
allowDeletion, allowDeletion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allowLocalNetworkAccess,
@ -3498,7 +3498,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
if isImageMedia(session, base_dir, http_prefix, if isImageMedia(session, base_dir, http_prefix,
nickname, domain, postJsonObject, nickname, domain, postJsonObject,
translate, translate,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allowLocalNetworkAccess,
recentPostsCache, debug, systemLanguage, recentPostsCache, debug, systemLanguage,
@ -4071,7 +4071,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
accountMaxPostsPerDay: int, accountMaxPostsPerDay: int,
allowDeletion: bool, debug: bool, maxMentions: int, allowDeletion: bool, debug: bool, maxMentions: int,
maxEmoji: int, translate: {}, unitTest: bool, maxEmoji: int, translate: {}, unitTest: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
maxFollowers: int, maxFollowers: int,
@ -4502,7 +4502,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
maxReplies, allowDeletion, maxReplies, allowDeletion,
maxMentions, maxEmoji, maxMentions, maxEmoji,
translate, unitTest, translate, unitTest,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
allowLocalNetworkAccess, allowLocalNetworkAccess,

8
outbox.py
View File

@ -187,7 +187,7 @@ def postMessageToOutbox(session, translate: {},
postLog: [], cachedWebfingers: {}, postLog: [], cachedWebfingers: {},
personCache: {}, allowDeletion: bool, personCache: {}, allowDeletion: bool,
proxyType: str, version: str, debug: bool, proxyType: str, version: str, debug: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
@ -286,7 +286,7 @@ def postMessageToOutbox(session, translate: {},
print('DEBUG: domain is blocked: ' + messageJson['actor']) print('DEBUG: domain is blocked: ' + messageJson['actor'])
return False return False
# replace youtube, so that google gets less tracking data # replace youtube, so that google gets less tracking data
replaceYouTube(messageJson, YTReplacementDomain, systemLanguage) replaceYouTube(messageJson, yt_replace_domain, systemLanguage)
# replace twitter, so that twitter posts can be shown without # replace twitter, so that twitter posts can be shown without
# having a twitter account # having a twitter account
replaceTwitter(messageJson, twitterReplacementDomain, systemLanguage) replaceTwitter(messageJson, twitterReplacementDomain, systemLanguage)
@ -423,7 +423,7 @@ def postMessageToOutbox(session, translate: {},
postToNickname, domain, postToNickname, domain,
messageJson, messageJson,
translate, translate,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allowLocalNetworkAccess,
recentPostsCache, debug, systemLanguage, recentPostsCache, debug, systemLanguage,
@ -464,7 +464,7 @@ def postMessageToOutbox(session, translate: {},
allowDeletion, allowDeletion,
http_prefix, __version__, http_prefix, __version__,
boxNameIndex, boxNameIndex,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,

8
posts.py
View File

@ -3453,7 +3453,7 @@ def createModeration(base_dir: str, nickname: str, domain: str, port: int,
def isImageMedia(session, base_dir: str, http_prefix: str, def isImageMedia(session, base_dir: str, http_prefix: str,
nickname: str, domain: str, nickname: str, domain: str,
postJsonObject: {}, translate: {}, postJsonObject: {}, translate: {},
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
recentPostsCache: {}, debug: bool, recentPostsCache: {}, debug: bool,
@ -3468,7 +3468,7 @@ def isImageMedia(session, base_dir: str, http_prefix: str,
downloadAnnounce(session, base_dir, http_prefix, downloadAnnounce(session, base_dir, http_prefix,
nickname, domain, postJsonObject, nickname, domain, postJsonObject,
__version__, translate, __version__, translate,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allowLocalNetworkAccess,
recentPostsCache, debug, recentPostsCache, debug,
@ -4504,7 +4504,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str,
nickname: str, domain: str, nickname: str, domain: str,
postJsonObject: {}, projectVersion: str, postJsonObject: {}, projectVersion: str,
translate: {}, translate: {},
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
allowLocalNetworkAccess: bool, allowLocalNetworkAccess: bool,
recentPostsCache: {}, debug: bool, recentPostsCache: {}, debug: bool,
@ -4722,7 +4722,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str,
recentPostsCache) recentPostsCache)
return None return None
postJsonObject = announcedJson postJsonObject = announcedJson
replaceYouTube(postJsonObject, YTReplacementDomain, systemLanguage) replaceYouTube(postJsonObject, yt_replace_domain, systemLanguage)
replaceTwitter(postJsonObject, twitterReplacementDomain, replaceTwitter(postJsonObject, twitterReplacementDomain,
systemLanguage) systemLanguage)
if saveJson(postJsonObject, announceFilename): if saveJson(postJsonObject, announceFilename):

2
schedule.py
View File

@ -114,7 +114,7 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd,
httpd.proxyType, httpd.proxyType,
httpd.projectVersion, httpd.projectVersion,
httpd.debug, httpd.debug,
httpd.YTReplacementDomain, httpd.yt_replace_domain,
httpd.twitterReplacementDomain, httpd.twitterReplacementDomain,
httpd.showPublishedDateOnly, httpd.showPublishedDateOnly,
httpd.allowLocalNetworkAccess, httpd.allowLocalNetworkAccess,

4
webapp_confirm.py
View File

@ -30,7 +30,7 @@ def htmlConfirmDelete(cssCache: {},
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
cachedWebfingers: {}, personCache: {}, cachedWebfingers: {}, personCache: {},
callingDomain: str, callingDomain: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -72,7 +72,7 @@ def htmlConfirmDelete(cssCache: {},
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
None, True, False, None, True, False,
http_prefix, projectVersion, 'outbox', http_prefix, projectVersion, 'outbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, allowLocalNetworkAccess, peertubeInstances, allowLocalNetworkAccess,

4
webapp_create_post.py
View File

@ -202,7 +202,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
personCache: {}, port: int, personCache: {}, port: int,
postJsonObject: {}, postJsonObject: {},
projectVersion: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -271,7 +271,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
None, True, False, None, True, False,
http_prefix, projectVersion, http_prefix, projectVersion,
boxName, boxName,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,

8
webapp_frontscreen.py
View File

@ -28,7 +28,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int,
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
projectVersion: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -74,7 +74,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int,
nickname, domain, port, item, nickname, domain, port, item,
None, True, False, None, True, False,
http_prefix, projectVersion, 'inbox', http_prefix, projectVersion, 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -102,7 +102,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str,
base_dir: str, http_prefix: str, authorized: bool, base_dir: str, http_prefix: str, authorized: bool,
profileJson: {}, selected: str, profileJson: {}, selected: str,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, theme: str, newswire: {}, theme: str,
@ -179,7 +179,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str,
nickname, domain, port, nickname, domain, port,
session, cachedWebfingers, personCache, session, cachedWebfingers, personCache,
projectVersion, projectVersion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,

4
webapp_moderation.py
View File

@ -37,7 +37,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
nickname: str, domain: str, port: int, inboxJson: {}, nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -67,7 +67,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
nickname, domain, port, inboxJson, 'moderation', nickname, domain, port, inboxJson, 'moderation',
allowDeletion, http_prefix, allowDeletion, http_prefix,
projectVersion, True, False, projectVersion, True, False,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, positiveVoting, newswire, False, False, artist, positiveVoting,

20
webapp_post.py
View File

@ -1331,7 +1331,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
boxName: str, boxName: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -1499,7 +1499,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
downloadAnnounce(session, base_dir, http_prefix, downloadAnnounce(session, base_dir, http_prefix,
nickname, domain, postJsonObject, nickname, domain, postJsonObject,
projectVersion, translate, projectVersion, translate,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allowLocalNetworkAccess,
recentPostsCache, False, recentPostsCache, False,
@ -1999,7 +1999,7 @@ def htmlIndividualPost(cssCache: {},
postJsonObject: {}, http_prefix: str, postJsonObject: {}, http_prefix: str,
projectVersion: str, likedBy: str, projectVersion: str, likedBy: str,
reactBy: str, reactEmoji: str, reactBy: str, reactEmoji: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -2064,7 +2064,7 @@ def htmlIndividualPost(cssCache: {},
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
None, True, False, None, True, False,
http_prefix, projectVersion, 'inbox', http_prefix, projectVersion, 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -2095,7 +2095,7 @@ def htmlIndividualPost(cssCache: {},
postJsonObject, postJsonObject,
None, True, False, None, True, False,
http_prefix, projectVersion, 'inbox', http_prefix, projectVersion, 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -2130,7 +2130,7 @@ def htmlIndividualPost(cssCache: {},
nickname, domain, port, item, nickname, domain, port, item,
None, True, False, None, True, False,
http_prefix, projectVersion, 'inbox', http_prefix, projectVersion, 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -2158,7 +2158,7 @@ def htmlPostReplies(cssCache: {},
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, repliesJson: {}, nickname: str, domain: str, port: int, repliesJson: {},
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -2182,7 +2182,7 @@ def htmlPostReplies(cssCache: {},
nickname, domain, port, item, nickname, domain, port, item,
None, True, False, None, True, False,
http_prefix, projectVersion, 'inbox', http_prefix, projectVersion, 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -2211,7 +2211,7 @@ def htmlEmojiReactionPicker(cssCache: {},
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
postJsonObject: {}, http_prefix: str, postJsonObject: {}, http_prefix: str,
projectVersion: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -2234,7 +2234,7 @@ def htmlEmojiReactionPicker(cssCache: {},
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
None, True, False, None, True, False,
http_prefix, projectVersion, 'inbox', http_prefix, projectVersion, 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,

22
webapp_profile.py
View File

@ -129,7 +129,7 @@ def htmlProfileAfterSearch(cssCache: {},
profileHandle: str, profileHandle: str,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
debug: bool, projectVersion: str, debug: bool, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
defaultTimeline: str, defaultTimeline: str,
@ -340,7 +340,7 @@ def htmlProfileAfterSearch(cssCache: {},
nickname, domain, port, nickname, domain, port,
postJsonObject, avatarUrl, False, False, postJsonObject, avatarUrl, False, False,
http_prefix, projectVersion, 'inbox', http_prefix, projectVersion, 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -547,7 +547,7 @@ def htmlProfile(signingPrivateKeyPem: str,
base_dir: str, http_prefix: str, authorized: bool, base_dir: str, http_prefix: str, authorized: bool,
profileJson: {}, selected: str, profileJson: {}, selected: str,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, theme: str, dormantMonths: int, newswire: {}, theme: str, dormantMonths: int,
@ -576,7 +576,7 @@ def htmlProfile(signingPrivateKeyPem: str,
base_dir, http_prefix, authorized, base_dir, http_prefix, authorized,
profileJson, selected, profileJson, selected,
session, cachedWebfingers, personCache, session, cachedWebfingers, personCache,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, theme, extraJson, newswire, theme, extraJson,
@ -958,7 +958,7 @@ def htmlProfile(signingPrivateKeyPem: str,
nickname, domain, port, nickname, domain, port,
session, cachedWebfingers, personCache, session, cachedWebfingers, personCache,
projectVersion, projectVersion,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1026,7 +1026,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int,
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
projectVersion: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -1071,7 +1071,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int,
nickname, domain, port, item, nickname, domain, port, item,
None, True, False, None, True, False,
http_prefix, projectVersion, 'inbox', http_prefix, projectVersion, 'inbox',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1461,12 +1461,12 @@ def _htmlEditProfileInstance(base_dir: str, translate: {},
peertubeInstancesStr, 200, '', False) peertubeInstancesStr, 200, '', False)
peertubeStr += \ peertubeStr += \
' <br>\n' ' <br>\n'
YTReplacementDomain = getConfigParam(base_dir, "youtubedomain") yt_replace_domain = getConfigParam(base_dir, "youtubedomain")
if not YTReplacementDomain: if not yt_replace_domain:
YTReplacementDomain = '' yt_replace_domain = ''
peertubeStr += \ peertubeStr += \
editTextField(translate['YouTube Replacement Domain'], editTextField(translate['YouTube Replacement Domain'],
'ytdomain', YTReplacementDomain) 'ytdomain', yt_replace_domain)
peertubeStr += endEditSection() peertubeStr += endEditSection()
libretranslateUrl = getConfigParam(base_dir, 'libretranslateUrl') libretranslateUrl = getConfigParam(base_dir, 'libretranslateUrl')

10
webapp_search.py
View File

@ -597,7 +597,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
cachedWebfingers, cachedWebfingers,
personCache: {}, personCache: {},
port: int, port: int,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -684,7 +684,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
None, True, allowDeletion, None, True, allowDeletion,
http_prefix, projectVersion, http_prefix, projectVersion,
'search', 'search',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -710,7 +710,7 @@ def htmlHashtagSearch(cssCache: {},
postsPerPage: int, postsPerPage: int,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
@ -867,7 +867,7 @@ def htmlHashtagSearch(cssCache: {},
allowDeletion, allowDeletion,
http_prefix, projectVersion, http_prefix, projectVersion,
'search', 'search',
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -903,7 +903,7 @@ def rssHashtagSearch(nickname: str, domain: str, port: int,
postsPerPage: int, postsPerPage: int,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
systemLanguage: str) -> str: systemLanguage: str) -> str:
"""Show an rss feed for a hashtag """Show an rss feed for a hashtag

48
webapp_timeline.py
View File

@ -427,7 +427,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
manuallyApproveFollowers: bool, manuallyApproveFollowers: bool,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, moderator: bool, newswire: {}, moderator: bool,
@ -905,7 +905,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
allowDeletion, allowDeletion,
http_prefix, projectVersion, http_prefix, projectVersion,
boxName, boxName,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
@ -1125,7 +1125,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1158,7 +1158,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
'tlshares', allowDeletion, 'tlshares', allowDeletion,
http_prefix, projectVersion, manuallyApproveFollowers, http_prefix, projectVersion, manuallyApproveFollowers,
False, False,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, newswire, False, False, artist,
@ -1180,7 +1180,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1213,7 +1213,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
'tlwanted', allowDeletion, 'tlwanted', allowDeletion,
http_prefix, projectVersion, manuallyApproveFollowers, http_prefix, projectVersion, manuallyApproveFollowers,
False, False,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, newswire, False, False, artist,
@ -1236,7 +1236,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1269,7 +1269,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
'inbox', allowDeletion, 'inbox', allowDeletion,
http_prefix, projectVersion, manuallyApproveFollowers, http_prefix, projectVersion, manuallyApproveFollowers,
minimal, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, newswire, False, False, artist,
@ -1292,7 +1292,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1325,7 +1325,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
'tlbookmarks', allowDeletion, 'tlbookmarks', allowDeletion,
http_prefix, projectVersion, manuallyApproveFollowers, http_prefix, projectVersion, manuallyApproveFollowers,
minimal, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, newswire, False, False, artist,
@ -1348,7 +1348,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1376,7 +1376,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
cachedWebfingers, personCache, cachedWebfingers, personCache,
nickname, domain, port, inboxJson, 'dm', allowDeletion, nickname, domain, port, inboxJson, 'dm', allowDeletion,
http_prefix, projectVersion, False, minimal, http_prefix, projectVersion, False, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, positiveVoting, newswire, False, False, artist, positiveVoting,
@ -1399,7 +1399,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1428,7 +1428,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
nickname, domain, port, inboxJson, 'tlreplies', nickname, domain, port, inboxJson, 'tlreplies',
allowDeletion, http_prefix, projectVersion, False, allowDeletion, http_prefix, projectVersion, False,
minimal, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, newswire, False, False, artist,
@ -1451,7 +1451,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1480,7 +1480,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
nickname, domain, port, inboxJson, 'tlmedia', nickname, domain, port, inboxJson, 'tlmedia',
allowDeletion, http_prefix, projectVersion, False, allowDeletion, http_prefix, projectVersion, False,
minimal, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, newswire, False, False, artist,
@ -1503,7 +1503,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1532,7 +1532,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
nickname, domain, port, inboxJson, 'tlblogs', nickname, domain, port, inboxJson, 'tlblogs',
allowDeletion, http_prefix, projectVersion, False, allowDeletion, http_prefix, projectVersion, False,
minimal, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, newswire, False, False, artist,
@ -1555,7 +1555,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1584,7 +1584,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
nickname, domain, port, inboxJson, 'tlfeatures', nickname, domain, port, inboxJson, 'tlfeatures',
allowDeletion, http_prefix, projectVersion, False, allowDeletion, http_prefix, projectVersion, False,
minimal, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, False, newswire, False, False, False,
@ -1607,7 +1607,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, moderator: bool, editor: bool, artist: bool, newswire: {}, moderator: bool, editor: bool, artist: bool,
@ -1635,7 +1635,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
nickname, domain, port, inboxJson, 'tlnews', nickname, domain, port, inboxJson, 'tlnews',
allowDeletion, http_prefix, projectVersion, False, allowDeletion, http_prefix, projectVersion, False,
minimal, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, moderator, editor, artist, newswire, moderator, editor, artist,
@ -1658,7 +1658,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, projectVersion: str, http_prefix: str, projectVersion: str,
minimal: bool, minimal: bool,
YTReplacementDomain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
@ -1689,7 +1689,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
nickname, domain, port, outboxJson, 'outbox', nickname, domain, port, outboxJson, 'outbox',
allowDeletion, http_prefix, projectVersion, allowDeletion, http_prefix, projectVersion,
manuallyApproveFollowers, minimal, manuallyApproveFollowers, minimal,
YTReplacementDomain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, positiveVoting, newswire, False, False, artist, positiveVoting,