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 20:55:47 +00:00
parent ed8d83c6c7
commit 4f37cc05cd
15 changed files with 179 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
daemon.py
View File

@ -1294,7 +1294,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.proxyType, version, self.server.proxyType, version,
self.server.debug, self.server.debug,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.allow_local_network_access, self.server.allow_local_network_access,
city, self.server.systemLanguage, city, self.server.systemLanguage,
@ -2723,7 +2723,7 @@ class PubServer(BaseHTTPRequestHandler):
None, None,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -2857,7 +2857,7 @@ class PubServer(BaseHTTPRequestHandler):
None, None,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -3306,7 +3306,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -3401,7 +3401,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
port, port,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -3469,7 +3469,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
port, port,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -3547,8 +3547,8 @@ class PubServer(BaseHTTPRequestHandler):
signingPrivateKeyPem = \ signingPrivateKeyPem = \
self.server.signingPrivateKeyPem self.server.signingPrivateKeyPem
twitterReplacementDomain = \ twitter_replacement_domain = \
self.server.twitterReplacementDomain self.server.twitter_replacement_domain
profileStr = \ profileStr = \
htmlProfileAfterSearch(self.server.cssCache, htmlProfileAfterSearch(self.server.cssCache,
self.server.recentPostsCache, self.server.recentPostsCache,
@ -3567,7 +3567,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug, self.server.debug,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -5154,7 +5154,7 @@ class PubServer(BaseHTTPRequestHandler):
# change twitter alternate domain # change twitter alternate domain
if fields.get('twitterdomain'): if fields.get('twitterdomain'):
currTwitterDomain = \ currTwitterDomain = \
self.server.twitterReplacementDomain self.server.twitter_replacement_domain
if fields['twitterdomain'] != currTwitterDomain: if fields['twitterdomain'] != currTwitterDomain:
newTwitterDomain = fields['twitterdomain'] newTwitterDomain = fields['twitterdomain']
if '://' in newTwitterDomain: if '://' in newTwitterDomain:
@ -5167,12 +5167,12 @@ class PubServer(BaseHTTPRequestHandler):
setConfigParam(base_dir, setConfigParam(base_dir,
'twitterdomain', 'twitterdomain',
newTwitterDomain) newTwitterDomain)
self.server.twitterReplacementDomain = \ self.server.twitter_replacement_domain = \
newTwitterDomain newTwitterDomain
else: else:
setConfigParam(base_dir, setConfigParam(base_dir,
'twitterdomain', '') 'twitterdomain', '')
self.server.twitterReplacementDomain = None self.server.twitter_replacement_domain = None
# change custom post submit button text # change custom post submit button text
currCustomSubmitText = \ currCustomSubmitText = \
@ -7546,7 +7546,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -7609,7 +7609,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.systemLanguage) self.server.systemLanguage)
if hashtagStr: if hashtagStr:
msg = hashtagStr.encode('utf-8') msg = hashtagStr.encode('utf-8')
@ -7759,7 +7759,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, self.server.project_version, http_prefix, self.server.project_version,
timelineStr, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -8219,7 +8219,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
timelineStr, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -8373,7 +8373,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, timelineStr, self.server.project_version, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -8557,7 +8557,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
timelineStr, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -8729,7 +8729,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, timelineStr, self.server.project_version, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -8827,7 +8827,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.http_prefix, self.server.http_prefix,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -8949,7 +8949,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, self.server.project_version, http_prefix, self.server.project_version,
timelineStr, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -9077,7 +9077,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, timelineStr, self.server.project_version, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -9174,7 +9174,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, callingDomain, self.server.personCache, callingDomain,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -9279,7 +9279,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, timelineStr, self.server.project_version, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -9389,7 +9389,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, timelineStr, self.server.project_version, timelineStr,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -9492,8 +9492,8 @@ class PubServer(BaseHTTPRequestHandler):
personCache = self.server.personCache personCache = self.server.personCache
project_version = self.server.project_version project_version = self.server.project_version
ytDomain = self.server.yt_replace_domain ytDomain = self.server.yt_replace_domain
twitterReplacementDomain = \ twitter_replacement_domain = \
self.server.twitterReplacementDomain self.server.twitter_replacement_domain
peertubeInstances = self.server.peertubeInstances peertubeInstances = self.server.peertubeInstances
msg = \ msg = \
htmlPostReplies(self.server.cssCache, htmlPostReplies(self.server.cssCache,
@ -9511,7 +9511,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
project_version, project_version,
ytDomain, ytDomain,
twitterReplacementDomain, twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
peertubeInstances, peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -9584,8 +9584,8 @@ class PubServer(BaseHTTPRequestHandler):
personCache = self.server.personCache personCache = self.server.personCache
project_version = self.server.project_version project_version = self.server.project_version
ytDomain = self.server.yt_replace_domain ytDomain = self.server.yt_replace_domain
twitterReplacementDomain = \ twitter_replacement_domain = \
self.server.twitterReplacementDomain self.server.twitter_replacement_domain
peertubeInstances = self.server.peertubeInstances peertubeInstances = self.server.peertubeInstances
msg = \ msg = \
htmlPostReplies(self.server.cssCache, htmlPostReplies(self.server.cssCache,
@ -9603,7 +9603,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
project_version, project_version,
ytDomain, ytDomain,
twitterReplacementDomain, twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
peertubeInstances, peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -9677,8 +9677,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers self.server.cachedWebfingers
yt_replace_domain = \ yt_replace_domain = \
self.server.yt_replace_domain self.server.yt_replace_domain
twitterReplacementDomain = \ twitter_replacement_domain = \
self.server.twitterReplacementDomain self.server.twitter_replacement_domain
icons_as_buttons = \ icons_as_buttons = \
self.server.icons_as_buttons self.server.icons_as_buttons
@ -9706,7 +9706,7 @@ class PubServer(BaseHTTPRequestHandler):
cachedWebfingers, cachedWebfingers,
self.server.personCache, self.server.personCache,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.themeName, self.server.themeName,
@ -9782,8 +9782,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers self.server.cachedWebfingers
yt_replace_domain = \ yt_replace_domain = \
self.server.yt_replace_domain self.server.yt_replace_domain
twitterReplacementDomain = \ twitter_replacement_domain = \
self.server.twitterReplacementDomain self.server.twitter_replacement_domain
show_published_date_only = \ show_published_date_only = \
self.server.show_published_date_only self.server.show_published_date_only
icons_as_buttons = \ icons_as_buttons = \
@ -9822,7 +9822,7 @@ class PubServer(BaseHTTPRequestHandler):
cachedWebfingers, cachedWebfingers,
self.server.personCache, self.server.personCache,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.themeName, self.server.themeName,
@ -9993,7 +9993,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
likedBy, reactBy, reactEmoji, likedBy, reactBy, reactEmoji,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -10162,7 +10162,7 @@ class PubServer(BaseHTTPRequestHandler):
allowDeletion: bool, allowDeletion: bool,
project_version: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str) -> bool: twitter_replacement_domain: str) -> bool:
"""Shows the inbox timeline """Shows the inbox timeline
""" """
if '/users/' in path: if '/users/' in path:
@ -10247,7 +10247,7 @@ class PubServer(BaseHTTPRequestHandler):
project_version, project_version,
minimalNick, minimalNick,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -10378,6 +10378,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
allow_local_network_access = \ allow_local_network_access = \
self.server.allow_local_network_access self.server.allow_local_network_access
twitter_replacement_domain = \
self.server.twitter_replacement_domain
msg = \ msg = \
htmlInboxDMs(self.server.cssCache, htmlInboxDMs(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -10398,7 +10400,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
minimalNick, minimalNick,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -10521,6 +10523,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
allow_local_network_access = \ allow_local_network_access = \
self.server.allow_local_network_access self.server.allow_local_network_access
twitter_replacement_domain = \
self.server.twitter_replacement_domain
msg = \ msg = \
htmlInboxReplies(self.server.cssCache, htmlInboxReplies(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -10541,7 +10545,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
minimalNick, minimalNick,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -10682,7 +10686,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
minimalNick, minimalNick,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -10824,7 +10828,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
minimalNick, minimalNick,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -10975,7 +10979,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
minimalNick, minimalNick,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
moderator, editor, artist, moderator, editor, artist,
@ -11105,6 +11109,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
allow_local_network_access = \ allow_local_network_access = \
self.server.allow_local_network_access self.server.allow_local_network_access
twitter_replacement_domain = \
self.server.twitter_replacement_domain
msg = \ msg = \
htmlInboxFeatures(self.server.cssCache, htmlInboxFeatures(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -11125,7 +11131,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
minimalNick, minimalNick,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -11234,7 +11240,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -11319,7 +11325,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -11421,6 +11427,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
allow_local_network_access = \ allow_local_network_access = \
self.server.allow_local_network_access self.server.allow_local_network_access
twitter_replacement_domain = \
self.server.twitter_replacement_domain
msg = \ msg = \
htmlBookmarks(self.server.cssCache, htmlBookmarks(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -11441,7 +11449,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
minimalNick, minimalNick,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -11579,7 +11587,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.project_version, self.server.project_version,
minimalNick, minimalNick,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -11688,8 +11696,8 @@ class PubServer(BaseHTTPRequestHandler):
shared_items_federated_domains = \ shared_items_federated_domains = \
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
twitterReplacementDomain = \ twitter_replacement_domain = \
self.server.twitterReplacementDomain self.server.twitter_replacement_domain
allow_local_network_access = \ allow_local_network_access = \
self.server.allow_local_network_access self.server.allow_local_network_access
show_published_date_only = \ show_published_date_only = \
@ -11713,7 +11721,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix, http_prefix,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.positive_voting, self.server.positive_voting,
@ -11839,7 +11847,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.themeName, self.server.themeName,
@ -11960,7 +11968,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.themeName, self.server.themeName,
@ -12080,7 +12088,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.themeName, self.server.themeName,
@ -12216,7 +12224,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.newswire, self.server.newswire,
self.server.themeName, self.server.themeName,
@ -12983,7 +12991,7 @@ class PubServer(BaseHTTPRequestHandler):
postJsonObject, postJsonObject,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
@ -15913,7 +15921,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.allowDeletion, self.server.allowDeletion,
self.server.project_version, self.server.project_version,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain): self.server.twitter_replacement_domain):
self.server.GETbusy = False self.server.GETbusy = False
return return
@ -16807,7 +16815,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.systemLanguage) self.server.systemLanguage)
replaceTwitter(postJsonObject, replaceTwitter(postJsonObject,
self.server.twitterReplacementDomain, self.server.twitter_replacement_domain,
self.server.systemLanguage) self.server.systemLanguage)
saveJson(postJsonObject, postFilename) saveJson(postJsonObject, postFilename)
# also save to the news actor # also save to the news actor
@ -18462,7 +18470,7 @@ def runDaemon(content_license_url: str,
base_dir: str, domain: str, base_dir: str, domain: str,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
port: int = 80, proxyPort: int = 80, port: int = 80, proxyPort: int = 80,
http_prefix: str = 'https', http_prefix: str = 'https',
fedList: [] = [], fedList: [] = [],
@ -18590,7 +18598,7 @@ def runDaemon(content_license_url: str,
# unit tests are run on the local network with LAN addresses # unit tests are run on the local network with LAN addresses
httpd.allow_local_network_access = True httpd.allow_local_network_access = True
httpd.yt_replace_domain = yt_replace_domain httpd.yt_replace_domain = yt_replace_domain
httpd.twitterReplacementDomain = twitterReplacementDomain httpd.twitter_replacement_domain = twitter_replacement_domain
# newswire storing rss feeds # newswire storing rss feeds
httpd.newswire = {} httpd.newswire = {}
@ -18926,7 +18934,7 @@ def runDaemon(content_license_url: str,
maxMentions, maxEmoji, maxMentions, maxEmoji,
httpd.translate, unitTest, httpd.translate, unitTest,
httpd.yt_replace_domain, httpd.yt_replace_domain,
httpd.twitterReplacementDomain, httpd.twitter_replacement_domain,
httpd.show_published_date_only, httpd.show_published_date_only,
httpd.max_followers, httpd.max_followers,
httpd.allow_local_network_access, httpd.allow_local_network_access,

8
desktop_client.py
View File

@ -698,7 +698,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str,
recentPostsCache = {} recentPostsCache = {}
allow_local_network_access = False allow_local_network_access = False
yt_replace_domain = None yt_replace_domain = None
twitterReplacementDomain = None twitter_replacement_domain = None
postJsonObject2 = \ postJsonObject2 = \
downloadAnnounce(session, base_dir, downloadAnnounce(session, base_dir,
http_prefix, http_prefix,
@ -706,7 +706,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str,
postJsonObject, postJsonObject,
__version__, translate, __version__, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
allow_local_network_access, allow_local_network_access,
recentPostsCache, False, recentPostsCache, False,
systemLanguage, systemLanguage,
@ -2396,7 +2396,7 @@ def runDesktopClient(base_dir: str, proxyType: str, http_prefix: str,
recentPostsCache = {} recentPostsCache = {}
allow_local_network_access = False allow_local_network_access = False
yt_replace_domain = None yt_replace_domain = None
twitterReplacementDomain = None twitter_replacement_domain = None
postJsonObject2 = \ postJsonObject2 = \
downloadAnnounce(session, base_dir, downloadAnnounce(session, base_dir,
http_prefix, http_prefix,
@ -2404,7 +2404,7 @@ def runDesktopClient(base_dir: str, proxyType: str, http_prefix: str,
postJsonObject, postJsonObject,
__version__, translate, __version__, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
allow_local_network_access, allow_local_network_access,
recentPostsCache, False, recentPostsCache, False,
systemLanguage, systemLanguage,

6
epicyon.py
View File

@ -234,7 +234,7 @@ parser.add_argument('--path', dest='base_dir',
parser.add_argument('--ytdomain', dest='yt_replace_domain', 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='twitter_replacement_domain',
type=str, default=None, type=str, default=None,
help='Domain used to replace twitter.com') help='Domain used to replace twitter.com')
parser.add_argument('--language', dest='language', parser.add_argument('--language', dest='language',
@ -3178,7 +3178,7 @@ if twitterDomain:
if '/' in twitterDomain: if '/' in twitterDomain:
twitterDomain = twitterDomain.split('/')[0] twitterDomain = twitterDomain.split('/')[0]
if '.' in twitterDomain: if '.' in twitterDomain:
args.twitterReplacementDomain = twitterDomain args.twitter_replacement_domain = twitterDomain
if setTheme(base_dir, themeName, domain, if setTheme(base_dir, themeName, domain,
args.allow_local_network_access, args.language): args.allow_local_network_access, args.language):
@ -3249,7 +3249,7 @@ if __name__ == "__main__":
instance_id, args.client, base_dir, instance_id, args.client, base_dir,
domain, onion_domain, i2p_domain, domain, onion_domain, i2p_domain,
args.yt_replace_domain, args.yt_replace_domain,
args.twitterReplacementDomain, args.twitter_replacement_domain,
port, proxyPort, http_prefix, port, proxyPort, http_prefix,
federationList, args.maxMentions, federationList, args.maxMentions,
args.maxEmoji, args.secureMode, args.maxEmoji, args.secureMode,

64
inbox.py
View File

@ -303,7 +303,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int,
notDM = not isDM(postJsonObject) notDM = not isDM(postJsonObject)
yt_replace_domain = getConfigParam(base_dir, 'youtubedomain') yt_replace_domain = getConfigParam(base_dir, 'youtubedomain')
twitterReplacementDomain = getConfigParam(base_dir, 'twitterdomain') twitter_replacement_domain = getConfigParam(base_dir, 'twitterdomain')
individualPostAsHtml(signingPrivateKeyPem, individualPostAsHtml(signingPrivateKeyPem,
True, recentPostsCache, max_recent_posts, True, recentPostsCache, max_recent_posts,
translate, pageNumber, translate, pageNumber,
@ -312,7 +312,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int,
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
avatarUrl, True, allowDeletion, avatarUrl, True, allowDeletion,
http_prefix, __version__, boxname, http_prefix, __version__, boxname,
yt_replace_domain, twitterReplacementDomain, yt_replace_domain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, allow_local_network_access, peertubeInstances, allow_local_network_access,
themeName, systemLanguage, max_like_count, themeName, systemLanguage, max_like_count,
@ -1000,7 +1000,7 @@ def _receiveLike(recentPostsCache: {},
max_recent_posts: int, translate: {}, max_recent_posts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -1099,7 +1099,7 @@ def _receiveLike(recentPostsCache: {},
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1122,7 +1122,7 @@ def _receiveUndoLike(recentPostsCache: {},
max_recent_posts: int, translate: {}, max_recent_posts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -1210,7 +1210,7 @@ def _receiveUndoLike(recentPostsCache: {},
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1234,7 +1234,7 @@ def _receiveReaction(recentPostsCache: {},
max_recent_posts: int, translate: {}, max_recent_posts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -1358,7 +1358,7 @@ def _receiveReaction(recentPostsCache: {},
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1381,7 +1381,7 @@ def _receiveUndoReaction(recentPostsCache: {},
max_recent_posts: int, translate: {}, max_recent_posts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -1485,7 +1485,7 @@ def _receiveUndoReaction(recentPostsCache: {},
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1507,7 +1507,7 @@ def _receiveBookmark(recentPostsCache: {},
max_recent_posts: int, translate: {}, max_recent_posts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -1595,7 +1595,7 @@ def _receiveBookmark(recentPostsCache: {},
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1617,7 +1617,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
max_recent_posts: int, translate: {}, max_recent_posts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -1706,7 +1706,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1801,7 +1801,7 @@ def _receiveAnnounce(recentPostsCache: {},
personCache: {}, messageJson: {}, federationList: [], personCache: {}, messageJson: {}, federationList: [],
debug: bool, translate: {}, debug: bool, translate: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
@ -1913,7 +1913,7 @@ def _receiveAnnounce(recentPostsCache: {},
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1936,7 +1936,7 @@ def _receiveAnnounce(recentPostsCache: {},
messageJson, messageJson,
__version__, translate, __version__, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
allow_local_network_access, allow_local_network_access,
recentPostsCache, debug, recentPostsCache, debug,
systemLanguage, systemLanguage,
@ -2982,7 +2982,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
max_recent_posts: int, translate: {}, max_recent_posts: int, translate: {},
allowDeletion: bool, allowDeletion: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -3026,7 +3026,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
http_prefix, __version__, http_prefix, __version__,
'inbox', 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -3189,7 +3189,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
maxMentions: int, maxEmoji: int, translate: {}, maxMentions: int, maxEmoji: int, translate: {},
unitTest: bool, unitTest: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
allow_local_network_access: bool, allow_local_network_access: bool,
peertubeInstances: [], peertubeInstances: [],
@ -3225,7 +3225,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_recent_posts, translate, max_recent_posts, translate,
allowDeletion, allowDeletion,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
@ -3247,7 +3247,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_recent_posts, translate, max_recent_posts, translate,
allowDeletion, allowDeletion,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
@ -3270,7 +3270,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_recent_posts, translate, max_recent_posts, translate,
allowDeletion, allowDeletion,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
@ -3292,7 +3292,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_recent_posts, translate, max_recent_posts, translate,
allowDeletion, allowDeletion,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
@ -3314,7 +3314,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_recent_posts, translate, max_recent_posts, translate,
allowDeletion, allowDeletion,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
@ -3336,7 +3336,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_recent_posts, translate, max_recent_posts, translate,
allowDeletion, allowDeletion,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
@ -3359,7 +3359,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
federationList, federationList,
debug, translate, debug, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
allow_local_network_access, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
signingPrivateKeyPem, signingPrivateKeyPem,
@ -3440,7 +3440,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
replaceYouTube(postJsonObject, yt_replace_domain, 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, twitter_replacement_domain,
systemLanguage) systemLanguage)
# list of indexes to be updated # list of indexes to be updated
@ -3458,7 +3458,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_recent_posts, translate, max_recent_posts, translate,
allowDeletion, allowDeletion,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
@ -3500,7 +3500,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
nickname, domain, postJsonObject, nickname, domain, postJsonObject,
translate, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
allow_local_network_access, allow_local_network_access,
recentPostsCache, debug, systemLanguage, recentPostsCache, debug, systemLanguage,
domainFull, personCache, signingPrivateKeyPem): domainFull, personCache, signingPrivateKeyPem):
@ -4073,7 +4073,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int,
allowDeletion: bool, debug: bool, maxMentions: int, allowDeletion: bool, debug: bool, maxMentions: int,
maxEmoji: int, translate: {}, unitTest: bool, maxEmoji: int, translate: {}, unitTest: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
max_followers: int, max_followers: int,
allow_local_network_access: bool, allow_local_network_access: bool,
@ -4504,7 +4504,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int,
maxMentions, maxEmoji, maxMentions, maxEmoji,
translate, unitTest, translate, unitTest,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
allow_local_network_access, allow_local_network_access,
peertubeInstances, peertubeInstances,

8
outbox.py
View File

@ -188,7 +188,7 @@ def postMessageToOutbox(session, translate: {},
personCache: {}, allowDeletion: bool, personCache: {}, allowDeletion: bool,
proxyType: str, version: str, debug: bool, proxyType: str, version: str, debug: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
allow_local_network_access: bool, allow_local_network_access: bool,
city: str, systemLanguage: str, city: str, systemLanguage: str,
@ -289,7 +289,7 @@ def postMessageToOutbox(session, translate: {},
replaceYouTube(messageJson, yt_replace_domain, 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, twitter_replacement_domain, systemLanguage)
# https://www.w3.org/TR/activitypub/#create-activity-outbox # https://www.w3.org/TR/activitypub/#create-activity-outbox
messageJson['object']['attributedTo'] = messageJson['actor'] messageJson['object']['attributedTo'] = messageJson['actor']
if messageJson['object'].get('attachment'): if messageJson['object'].get('attachment'):
@ -424,7 +424,7 @@ def postMessageToOutbox(session, translate: {},
messageJson, messageJson,
translate, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
allow_local_network_access, allow_local_network_access,
recentPostsCache, debug, systemLanguage, recentPostsCache, debug, systemLanguage,
domainFull, personCache, domainFull, personCache,
@ -465,7 +465,7 @@ def postMessageToOutbox(session, translate: {},
http_prefix, __version__, http_prefix, __version__,
boxNameIndex, boxNameIndex,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,

8
posts.py
View File

@ -3454,7 +3454,7 @@ def isImageMedia(session, base_dir: str, http_prefix: str,
nickname: str, domain: str, nickname: str, domain: str,
postJsonObject: {}, translate: {}, postJsonObject: {}, translate: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
allow_local_network_access: bool, allow_local_network_access: bool,
recentPostsCache: {}, debug: bool, recentPostsCache: {}, debug: bool,
systemLanguage: str, systemLanguage: str,
@ -3469,7 +3469,7 @@ def isImageMedia(session, base_dir: str, http_prefix: str,
nickname, domain, postJsonObject, nickname, domain, postJsonObject,
__version__, translate, __version__, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
allow_local_network_access, allow_local_network_access,
recentPostsCache, debug, recentPostsCache, debug,
systemLanguage, systemLanguage,
@ -4505,7 +4505,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str,
postJsonObject: {}, project_version: str, postJsonObject: {}, project_version: str,
translate: {}, translate: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
allow_local_network_access: bool, allow_local_network_access: bool,
recentPostsCache: {}, debug: bool, recentPostsCache: {}, debug: bool,
systemLanguage: str, systemLanguage: str,
@ -4725,7 +4725,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str,
return None return None
postJsonObject = announcedJson postJsonObject = announcedJson
replaceYouTube(postJsonObject, yt_replace_domain, systemLanguage) replaceYouTube(postJsonObject, yt_replace_domain, systemLanguage)
replaceTwitter(postJsonObject, twitterReplacementDomain, replaceTwitter(postJsonObject, twitter_replacement_domain,
systemLanguage) systemLanguage)
if saveJson(postJsonObject, announceFilename): if saveJson(postJsonObject, announceFilename):
return postJsonObject return postJsonObject

2
schedule.py
View File

@ -115,7 +115,7 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd,
httpd.project_version, httpd.project_version,
httpd.debug, httpd.debug,
httpd.yt_replace_domain, httpd.yt_replace_domain,
httpd.twitterReplacementDomain, httpd.twitter_replacement_domain,
httpd.show_published_date_only, httpd.show_published_date_only,
httpd.allow_local_network_access, httpd.allow_local_network_access,
httpd.city, httpd.systemLanguage, httpd.city, httpd.systemLanguage,

4
webapp_confirm.py
View File

@ -31,7 +31,7 @@ def htmlConfirmDelete(cssCache: {},
cachedWebfingers: {}, personCache: {}, cachedWebfingers: {}, personCache: {},
callingDomain: str, callingDomain: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -73,7 +73,7 @@ def htmlConfirmDelete(cssCache: {},
None, True, False, None, True, False,
http_prefix, project_version, 'outbox', http_prefix, project_version, 'outbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, allow_local_network_access, peertubeInstances, allow_local_network_access,
themeName, systemLanguage, max_like_count, themeName, systemLanguage, max_like_count,

4
webapp_create_post.py
View File

@ -203,7 +203,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {},
postJsonObject: {}, postJsonObject: {},
project_version: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -272,7 +272,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {},
http_prefix, project_version, http_prefix, project_version,
boxName, boxName,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,

8
webapp_frontscreen.py
View File

@ -29,7 +29,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, max_recent_posts: int,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
project_version: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -75,7 +75,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, max_recent_posts: int,
None, True, False, None, True, False,
http_prefix, project_version, 'inbox', http_prefix, project_version, 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -103,7 +103,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str,
profileJson: {}, selected: str, profileJson: {}, selected: str,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, theme: str, newswire: {}, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -180,7 +180,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str,
session, cachedWebfingers, personCache, session, cachedWebfingers, personCache,
project_version, project_version,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,

4
webapp_moderation.py
View File

@ -38,7 +38,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -68,7 +68,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
allowDeletion, http_prefix, allowDeletion, http_prefix,
project_version, True, False, project_version, True, False,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, positive_voting, newswire, False, False, artist, positive_voting,
show_publish_as_icon, show_publish_as_icon,

20
webapp_post.py
View File

@ -1332,7 +1332,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
boxName: str, boxName: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -1500,7 +1500,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
nickname, domain, postJsonObject, nickname, domain, postJsonObject,
project_version, translate, project_version, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
allow_local_network_access, allow_local_network_access,
recentPostsCache, False, recentPostsCache, False,
systemLanguage, systemLanguage,
@ -2000,7 +2000,7 @@ def htmlIndividualPost(cssCache: {},
project_version: str, likedBy: str, project_version: str, likedBy: str,
reactBy: str, reactEmoji: str, reactBy: str, reactEmoji: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -2065,7 +2065,7 @@ def htmlIndividualPost(cssCache: {},
None, True, False, None, True, False,
http_prefix, project_version, 'inbox', http_prefix, project_version, 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, themeName, allow_local_network_access, themeName,
@ -2096,7 +2096,7 @@ def htmlIndividualPost(cssCache: {},
None, True, False, None, True, False,
http_prefix, project_version, 'inbox', http_prefix, project_version, 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -2131,7 +2131,7 @@ def htmlIndividualPost(cssCache: {},
None, True, False, None, True, False,
http_prefix, project_version, 'inbox', http_prefix, project_version, 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -2159,7 +2159,7 @@ def htmlPostReplies(cssCache: {},
nickname: str, domain: str, port: int, repliesJson: {}, nickname: str, domain: str, port: int, repliesJson: {},
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -2183,7 +2183,7 @@ def htmlPostReplies(cssCache: {},
None, True, False, None, True, False,
http_prefix, project_version, 'inbox', http_prefix, project_version, 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -2212,7 +2212,7 @@ def htmlEmojiReactionPicker(cssCache: {},
postJsonObject: {}, http_prefix: str, postJsonObject: {}, http_prefix: str,
project_version: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -2235,7 +2235,7 @@ def htmlEmojiReactionPicker(cssCache: {},
None, True, False, None, True, False,
http_prefix, project_version, 'inbox', http_prefix, project_version, 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,

22
webapp_profile.py
View File

@ -130,7 +130,7 @@ def htmlProfileAfterSearch(cssCache: {},
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
defaultTimeline: str, defaultTimeline: str,
peertubeInstances: [], peertubeInstances: [],
@ -341,7 +341,7 @@ def htmlProfileAfterSearch(cssCache: {},
postJsonObject, avatarUrl, False, False, postJsonObject, avatarUrl, False, False,
http_prefix, project_version, 'inbox', http_prefix, project_version, 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -548,7 +548,7 @@ def htmlProfile(signingPrivateKeyPem: str,
profileJson: {}, selected: str, profileJson: {}, selected: str,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, theme: str, dormant_months: int, newswire: {}, theme: str, dormant_months: int,
peertubeInstances: [], peertubeInstances: [],
@ -577,7 +577,7 @@ def htmlProfile(signingPrivateKeyPem: str,
profileJson, selected, profileJson, selected,
session, cachedWebfingers, personCache, session, cachedWebfingers, personCache,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, theme, extraJson, newswire, theme, extraJson,
allow_local_network_access, accessKeys, allow_local_network_access, accessKeys,
@ -959,7 +959,7 @@ def htmlProfile(signingPrivateKeyPem: str,
session, cachedWebfingers, personCache, session, cachedWebfingers, personCache,
project_version, project_version,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1027,7 +1027,7 @@ def _htmlProfilePosts(recentPostsCache: {}, max_recent_posts: int,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
project_version: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -1072,7 +1072,7 @@ def _htmlProfilePosts(recentPostsCache: {}, max_recent_posts: int,
None, True, False, None, True, False,
http_prefix, project_version, 'inbox', http_prefix, project_version, 'inbox',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1284,12 +1284,12 @@ def _htmlEditProfileTwitter(base_dir: str, translate: {},
twitterStr += \ twitterStr += \
editCheckBox(translate['Remove Twitter posts'], editCheckBox(translate['Remove Twitter posts'],
'removeTwitter', removeTwitter) 'removeTwitter', removeTwitter)
twitterReplacementDomain = getConfigParam(base_dir, "twitterdomain") twitter_replacement_domain = getConfigParam(base_dir, "twitterdomain")
if not twitterReplacementDomain: if not twitter_replacement_domain:
twitterReplacementDomain = '' twitter_replacement_domain = ''
twitterStr += \ twitterStr += \
editTextField(translate['Twitter Replacement Domain'], editTextField(translate['Twitter Replacement Domain'],
'twitterdomain', twitterReplacementDomain) 'twitterdomain', twitter_replacement_domain)
twitterStr += endEditSection() twitterStr += endEditSection()
return twitterStr return twitterStr

10
webapp_search.py
View File

@ -598,7 +598,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
personCache: {}, personCache: {},
port: int, port: int,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -685,7 +685,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
http_prefix, project_version, http_prefix, project_version,
'search', 'search',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -711,7 +711,7 @@ def htmlHashtagSearch(cssCache: {},
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
@ -868,7 +868,7 @@ def htmlHashtagSearch(cssCache: {},
http_prefix, project_version, http_prefix, project_version,
'search', 'search',
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -904,7 +904,7 @@ def rssHashtagSearch(nickname: str, domain: str, port: int,
session, cachedWebfingers: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: 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

@ -429,7 +429,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
manuallyApproveFollowers: bool, manuallyApproveFollowers: bool,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, moderator: bool, newswire: {}, moderator: bool,
editor: bool, artist: bool, editor: bool, artist: bool,
@ -907,7 +907,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
http_prefix, project_version, http_prefix, project_version,
boxName, boxName,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
@ -1127,7 +1127,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1161,7 +1161,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
manuallyApproveFollowers, manuallyApproveFollowers,
False, False,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, newswire, False, False, artist,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1185,7 +1185,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
allowDeletion: bool, allowDeletion: bool,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1219,7 +1219,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
manuallyApproveFollowers, manuallyApproveFollowers,
False, False,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, newswire, False, False, artist,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1244,7 +1244,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1278,7 +1278,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
manuallyApproveFollowers, manuallyApproveFollowers,
minimal, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, newswire, False, False, artist,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1303,7 +1303,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1337,7 +1337,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
manuallyApproveFollowers, manuallyApproveFollowers,
minimal, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, newswire, False, False, artist,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1361,7 +1361,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1389,7 +1389,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
nickname, domain, port, inboxJson, 'dm', allowDeletion, nickname, domain, port, inboxJson, 'dm', allowDeletion,
http_prefix, project_version, False, minimal, http_prefix, project_version, False, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, positive_voting, newswire, False, False, artist, positive_voting,
show_publish_as_icon, show_publish_as_icon,
@ -1413,7 +1413,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1442,7 +1442,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
allowDeletion, http_prefix, project_version, False, allowDeletion, http_prefix, project_version, False,
minimal, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, newswire, False, False, artist,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1466,7 +1466,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1495,7 +1495,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
allowDeletion, http_prefix, project_version, False, allowDeletion, http_prefix, project_version, False,
minimal, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, newswire, False, False, artist,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1519,7 +1519,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1548,7 +1548,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
allowDeletion, http_prefix, project_version, False, allowDeletion, http_prefix, project_version, False,
minimal, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, newswire, False, False, artist,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1572,7 +1572,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1601,7 +1601,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
allowDeletion, http_prefix, project_version, False, allowDeletion, http_prefix, project_version, False,
minimal, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, False, newswire, False, False, False,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1625,7 +1625,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, moderator: bool, editor: bool, artist: bool, newswire: {}, moderator: bool, editor: bool, artist: bool,
positive_voting: bool, show_publish_as_icon: bool, positive_voting: bool, show_publish_as_icon: bool,
@ -1653,7 +1653,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
allowDeletion, http_prefix, project_version, False, allowDeletion, http_prefix, project_version, False,
minimal, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, moderator, editor, artist, newswire, moderator, editor, artist,
positive_voting, show_publish_as_icon, positive_voting, show_publish_as_icon,
@ -1677,7 +1677,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
http_prefix: str, project_version: str, http_prefix: str, project_version: str,
minimal: bool, minimal: bool,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
newswire: {}, positive_voting: bool, newswire: {}, positive_voting: bool,
show_publish_as_icon: bool, show_publish_as_icon: bool,
@ -1708,7 +1708,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
allowDeletion, http_prefix, project_version, allowDeletion, http_prefix, project_version,
manuallyApproveFollowers, minimal, manuallyApproveFollowers, minimal,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitter_replacement_domain,
show_published_date_only, show_published_date_only,
newswire, False, False, artist, positive_voting, newswire, False, False, artist, positive_voting,
show_publish_as_icon, show_publish_as_icon,