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

Snake case

merge-requests/30/head
Bob Mottram 2021-12-25 23:38:53 +00:00
parent 89644bb50c
commit 2f7ea9084a
14 changed files with 175 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
blog.py
View File

@ -190,7 +190,7 @@ def _htmlBlogPostContent(debug: bool, session, authorized: bool,
nickname: str, domain: str, domainFull: str,
post_json_object: {},
handle: str, restrictToDomain: bool,
peertubeInstances: [],
peertube_instances: [],
system_language: str,
person_cache: {},
blogSeparator: str = '<hr>') -> str:
@ -275,7 +275,7 @@ def _htmlBlogPostContent(debug: bool, session, authorized: bool,
languagesUnderstood)
if jsonContent:
contentStr = addEmbeddedElements(translate, jsonContent,
peertubeInstances)
peertube_instances)
if post_json_object['object'].get('tag'):
post_json_object_tags = post_json_object['object']['tag']
contentStr = replaceEmojiFromTags(session, base_dir, contentStr,
@ -444,7 +444,7 @@ def htmlBlogPost(session, authorized: bool,
base_dir: str, http_prefix: str, translate: {},
nickname: str, domain: str, domainFull: str,
post_json_object: {},
peertubeInstances: [],
peertube_instances: [],
system_language: str, person_cache: {},
debug: bool, content_license_url: str) -> str:
"""Returns a html blog post
@ -477,7 +477,7 @@ def htmlBlogPost(session, authorized: bool,
nickname, domain,
domainFull, post_json_object,
None, False,
peertubeInstances, system_language,
peertube_instances, system_language,
person_cache)
# show rss links
@ -506,7 +506,7 @@ def htmlBlogPage(authorized: bool, session,
base_dir: str, http_prefix: str, translate: {},
nickname: str, domain: str, port: int,
noOfItems: int, pageNumber: int,
peertubeInstances: [], system_language: str,
peertube_instances: [], system_language: str,
person_cache: {}, debug: bool) -> str:
"""Returns a html blog page containing posts
"""
@ -569,7 +569,7 @@ def htmlBlogPage(authorized: bool, session,
nickname, domain,
domainFull, item,
None, True,
peertubeInstances,
peertube_instances,
system_language,
person_cache)
@ -729,7 +729,7 @@ def htmlBlogView(authorized: bool,
session, base_dir: str, http_prefix: str,
translate: {}, domain: str, port: int,
noOfItems: int,
peertubeInstances: [], system_language: str,
peertube_instances: [], system_language: str,
person_cache: {}, debug: bool) -> str:
"""Show the blog main page
"""
@ -748,7 +748,7 @@ def htmlBlogView(authorized: bool,
return htmlBlogPage(authorized, session,
base_dir, http_prefix, translate,
nickname, domain, port,
noOfItems, 1, peertubeInstances,
noOfItems, 1, peertube_instances,
system_language, person_cache, debug)
domainFull = getFullDomain(domain, port)

122
daemon.py
View File

@ -1302,7 +1302,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.sharedItemFederationTokens,
self.server.low_bandwidth,
self.server.signing_priv_key_pem,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.theme_name,
self.server.max_like_count,
self.server.max_recent_posts,
@ -2725,7 +2725,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.system_language,
self.server.max_like_count,
@ -2859,7 +2859,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.system_language,
self.server.max_like_count,
@ -3308,7 +3308,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -3403,7 +3403,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name, 'outbox',
self.server.system_language,
@ -3471,7 +3471,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name, 'bookmarks',
self.server.system_language,
@ -3570,7 +3570,7 @@ class PubServer(BaseHTTPRequestHandler):
twitter_replacement_domain,
show_published_date_only,
self.server.defaultTimeline,
self.server.peertubeInstances,
self.server.peertube_instances,
allow_local_network_access,
self.server.theme_name,
accessKeys,
@ -6422,17 +6422,17 @@ class PubServer(BaseHTTPRequestHandler):
user_agents_blockedStr)
# save peertube instances list
peertubeInstancesFile = \
peertube_instancesFile = \
base_dir + '/accounts/peertube.txt'
if fields.get('ptInstances'):
self.server.peertubeInstances.clear()
self.server.peertube_instances.clear()
try:
with open(peertubeInstancesFile,
with open(peertube_instancesFile,
'w+') as aFile:
aFile.write(fields['ptInstances'])
except OSError:
print('EX: unable to write peertube ' +
peertubeInstancesFile)
peertube_instancesFile)
ptInstancesList = \
fields['ptInstances'].split('\n')
if ptInstancesList:
@ -6440,18 +6440,18 @@ class PubServer(BaseHTTPRequestHandler):
url = url.strip()
if not url:
continue
if url in self.server.peertubeInstances:
if url in self.server.peertube_instances:
continue
self.server.peertubeInstances.append(url)
self.server.peertube_instances.append(url)
else:
if os.path.isfile(peertubeInstancesFile):
if os.path.isfile(peertube_instancesFile):
try:
os.remove(peertubeInstancesFile)
os.remove(peertube_instancesFile)
except OSError:
print('EX: _profileUpdate ' +
'unable to delete ' +
peertubeInstancesFile)
self.server.peertubeInstances.clear()
peertube_instancesFile)
self.server.peertube_instances.clear()
# save git project names list
gitProjectsFilename = \
@ -7548,7 +7548,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -7761,7 +7761,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -8221,7 +8221,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -8375,7 +8375,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -8559,7 +8559,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -8731,7 +8731,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -8829,7 +8829,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -8951,7 +8951,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -9079,7 +9079,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -9176,7 +9176,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -9281,7 +9281,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -9391,7 +9391,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -9494,7 +9494,7 @@ class PubServer(BaseHTTPRequestHandler):
ytDomain = self.server.yt_replace_domain
twitter_replacement_domain = \
self.server.twitter_replacement_domain
peertubeInstances = self.server.peertubeInstances
peertube_instances = self.server.peertube_instances
msg = \
htmlPostReplies(self.server.cssCache,
recentPostsCache,
@ -9513,7 +9513,7 @@ class PubServer(BaseHTTPRequestHandler):
ytDomain,
twitter_replacement_domain,
self.server.show_published_date_only,
peertubeInstances,
peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -9586,7 +9586,7 @@ class PubServer(BaseHTTPRequestHandler):
ytDomain = self.server.yt_replace_domain
twitter_replacement_domain = \
self.server.twitter_replacement_domain
peertubeInstances = self.server.peertubeInstances
peertube_instances = self.server.peertube_instances
msg = \
htmlPostReplies(self.server.cssCache,
recentPostsCache,
@ -9605,7 +9605,7 @@ class PubServer(BaseHTTPRequestHandler):
ytDomain,
twitter_replacement_domain,
self.server.show_published_date_only,
peertubeInstances,
peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -9711,7 +9711,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.newswire,
self.server.theme_name,
self.server.dormant_months,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
self.server.debug,
@ -9827,7 +9827,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.newswire,
self.server.theme_name,
self.server.dormant_months,
self.server.peertubeInstances,
self.server.peertube_instances,
allow_local_network_access,
self.server.text_mode_banner,
self.server.debug,
@ -9995,7 +9995,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
@ -10258,7 +10258,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publish_button_at_top,
authorized,
self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -10410,7 +10410,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.rss_icon_at_top,
self.server.publish_button_at_top,
authorized, self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -10555,7 +10555,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.rss_icon_at_top,
self.server.publish_button_at_top,
authorized, self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -10697,7 +10697,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publish_button_at_top,
authorized,
self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -10839,7 +10839,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publish_button_at_top,
authorized,
self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -10991,7 +10991,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publish_button_at_top,
authorized,
self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -11142,7 +11142,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publish_button_at_top,
authorized,
self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -11250,7 +11250,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.rss_icon_at_top,
self.server.publish_button_at_top,
authorized, self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -11335,7 +11335,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.rss_icon_at_top,
self.server.publish_button_at_top,
authorized, self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -11460,7 +11460,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publish_button_at_top,
authorized,
self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -11598,7 +11598,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publish_button_at_top,
authorized,
self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -11732,7 +11732,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publish_button_at_top,
authorized, moderationActionStr,
self.server.theme_name,
self.server.peertubeInstances,
self.server.peertube_instances,
allow_local_network_access,
self.server.text_mode_banner,
accessKeys,
@ -11852,7 +11852,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.newswire,
self.server.theme_name,
self.server.dormant_months,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
self.server.debug,
@ -11973,7 +11973,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.newswire,
self.server.theme_name,
self.server.dormant_months,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
self.server.debug,
@ -12093,7 +12093,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.newswire,
self.server.theme_name,
self.server.dormant_months,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
self.server.debug,
@ -12229,7 +12229,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.newswire,
self.server.theme_name,
self.server.dormant_months,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
self.server.debug,
@ -12389,7 +12389,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname,
domain, port,
maxPostsInBlogsFeed, pageNumber,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.system_language,
self.server.person_cache,
self.server.debug)
@ -12993,7 +12993,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.system_language,
self.server.max_like_count,
@ -13054,7 +13054,7 @@ class PubServer(BaseHTTPRequestHandler):
"""Show the edit profile screen
"""
if '/users/' in path and path.endswith('/editprofile'):
peertubeInstances = self.server.peertubeInstances
peertube_instances = self.server.peertube_instances
nickname = getNicknameFromActor(path)
if nickname:
city = getSpoofedCity(self.server.city,
@ -13076,7 +13076,7 @@ class PubServer(BaseHTTPRequestHandler):
http_prefix,
self.server.defaultTimeline,
self.server.theme_name,
peertubeInstances,
peertube_instances,
self.server.text_mode_banner,
city,
self.server.user_agents_blocked,
@ -14060,7 +14060,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.domain,
self.server.port,
maxPostsInBlogsFeed,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.system_language,
self.server.person_cache,
self.server.debug)
@ -14164,7 +14164,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname, self.server.domain,
self.server.domainFull,
post_json_object,
self.server.peertubeInstances,
self.server.peertube_instances,
self.server.system_language,
self.server.person_cache,
self.server.debug,
@ -18912,8 +18912,8 @@ def runDaemon(content_license_url: str,
httpd.sharedItemFederationTokens)
# load peertube instances from file into a list
httpd.peertubeInstances = []
loadPeertubeInstances(base_dir, httpd.peertubeInstances)
httpd.peertube_instances = []
loadPeertubeInstances(base_dir, httpd.peertube_instances)
createInitialLastSeen(base_dir, http_prefix)
@ -18940,7 +18940,7 @@ def runDaemon(content_license_url: str,
httpd.show_published_date_only,
httpd.max_followers,
httpd.allow_local_network_access,
httpd.peertubeInstances,
httpd.peertube_instances,
verify_all_signatures,
httpd.theme_name,
httpd.system_language,

60
inbox.py
View File

@ -287,7 +287,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int,
post_json_object: {},
allow_deletion: bool, boxname: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int,
@ -315,7 +315,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int,
http_prefix, __version__, boxname,
yt_replace_domain, twitter_replacement_domain,
show_published_date_only,
peertubeInstances, allow_local_network_access,
peertube_instances, allow_local_network_access,
theme_name, system_language, max_like_count,
notDM, True, True, False, True, False,
cw_lists, lists_enabled)
@ -1003,7 +1003,7 @@ def _receiveLike(recentPostsCache: {},
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, cw_lists: {},
@ -1103,7 +1103,7 @@ def _receiveLike(recentPostsCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, notDM,
@ -1125,7 +1125,7 @@ def _receiveUndoLike(recentPostsCache: {},
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, cw_lists: {},
@ -1214,7 +1214,7 @@ def _receiveUndoLike(recentPostsCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, notDM,
@ -1237,7 +1237,7 @@ def _receiveReaction(recentPostsCache: {},
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, cw_lists: {},
@ -1362,7 +1362,7 @@ def _receiveReaction(recentPostsCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, notDM,
@ -1384,7 +1384,7 @@ def _receiveUndoReaction(recentPostsCache: {},
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, cw_lists: {},
@ -1489,7 +1489,7 @@ def _receiveUndoReaction(recentPostsCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, notDM,
@ -1510,7 +1510,7 @@ def _receiveBookmark(recentPostsCache: {},
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, cw_lists: {},
@ -1599,7 +1599,7 @@ def _receiveBookmark(recentPostsCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, notDM,
@ -1620,7 +1620,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, cw_lists: {},
@ -1710,7 +1710,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, notDM,
@ -1809,7 +1809,7 @@ def _receiveAnnounce(recentPostsCache: {},
signing_priv_key_pem: str,
max_recent_posts: int,
allow_deletion: bool,
peertubeInstances: [],
peertube_instances: [],
max_like_count: int, cw_lists: {},
lists_enabled: str) -> bool:
"""Receives an announce activity within the POST section of HTTPServer
@ -1917,7 +1917,7 @@ def _receiveAnnounce(recentPostsCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, notDM,
@ -2985,7 +2985,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int,
@ -3030,7 +3030,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, notDM,
@ -3194,7 +3194,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
twitter_replacement_domain: str,
show_published_date_only: bool,
allow_local_network_access: bool,
peertubeInstances: [],
peertube_instances: [],
lastBounceMessage: [],
theme_name: str, system_language: str,
max_like_count: int,
@ -3228,7 +3228,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, cw_lists, lists_enabled):
@ -3250,7 +3250,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, cw_lists, lists_enabled):
@ -3273,7 +3273,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, cw_lists, lists_enabled):
@ -3295,7 +3295,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, cw_lists, lists_enabled):
@ -3317,7 +3317,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, cw_lists, lists_enabled):
@ -3339,7 +3339,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count, cw_lists, lists_enabled):
@ -3367,7 +3367,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
signing_priv_key_pem,
max_recent_posts,
allow_deletion,
peertubeInstances,
peertube_instances,
max_like_count, cw_lists, lists_enabled):
if debug:
print('DEBUG: Announce accepted from ' + actor)
@ -3461,7 +3461,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,
@ -3566,7 +3566,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_deletion,
boxname,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,
@ -4079,7 +4079,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int,
show_published_date_only: bool,
max_followers: int,
allow_local_network_access: bool,
peertubeInstances: [],
peertube_instances: [],
verify_all_signatures: bool,
theme_name: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str,
@ -4509,7 +4509,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int,
twitter_replacement_domain,
show_published_date_only,
allow_local_network_access,
peertubeInstances,
peertube_instances,
lastBounceMessage,
theme_name, system_language,
max_like_count,

4
outbox.py
View File

@ -196,7 +196,7 @@ def postMessageToOutbox(session, translate: {},
sharedItemFederationTokens: {},
low_bandwidth: bool,
signing_priv_key_pem: str,
peertubeInstances: str, theme: str,
peertube_instances: str, theme: str,
max_like_count: int,
max_recent_posts: int, cw_lists: {},
lists_enabled: str,
@ -468,7 +468,7 @@ def postMessageToOutbox(session, translate: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme, system_language,
max_like_count,

2
schedule.py
View File

@ -123,7 +123,7 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd,
httpd.sharedItemFederationTokens,
httpd.low_bandwidth,
httpd.signing_priv_key_pem,
httpd.peertubeInstances,
httpd.peertube_instances,
httpd.theme_name,
httpd.max_like_count,
httpd.max_recent_posts,

4
webapp_confirm.py
View File

@ -33,7 +33,7 @@ def htmlConfirmDelete(cssCache: {},
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str,
@ -76,7 +76,7 @@ def htmlConfirmDelete(cssCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances, allow_local_network_access,
peertube_instances, allow_local_network_access,
theme_name, system_language, max_like_count,
False, False, False, False, False, False,
cw_lists, lists_enabled)

4
webapp_create_post.py
View File

@ -205,7 +205,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {},
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
system_language: str,
max_like_count: int, signing_priv_key_pem: str,
@ -274,7 +274,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme, system_language,
max_like_count,

8
webapp_frontscreen.py
View File

@ -31,7 +31,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, max_recent_posts: int,
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int,
@ -77,7 +77,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, max_recent_posts: int,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,
@ -106,7 +106,7 @@ def htmlFrontScreen(signing_priv_key_pem: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
newswire: {}, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
accessKeys: {},
system_language: str, max_like_count: int,
@ -182,7 +182,7 @@ def htmlFrontScreen(signing_priv_key_pem: str,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme, system_language,
max_like_count,

22
webapp_media.py
View File

@ -11,13 +11,13 @@ import os
from utils import validUrlPrefix
def loadPeertubeInstances(base_dir: str, peertubeInstances: []) -> None:
def loadPeertubeInstances(base_dir: str, peertube_instances: []) -> None:
"""Loads peertube instances from file into the given list
"""
peertubeList = None
peertubeInstancesFilename = base_dir + '/accounts/peertube.txt'
if os.path.isfile(peertubeInstancesFilename):
with open(peertubeInstancesFilename, 'r') as fp:
peertube_instancesFilename = base_dir + '/accounts/peertube.txt'
if os.path.isfile(peertube_instancesFilename):
with open(peertube_instancesFilename, 'r') as fp:
peertubeStr = fp.read()
if peertubeStr:
peertubeStr = peertubeStr.replace('\r', '')
@ -25,13 +25,13 @@ def loadPeertubeInstances(base_dir: str, peertubeInstances: []) -> None:
if not peertubeList:
return
for url in peertubeList:
if url in peertubeInstances:
if url in peertube_instances:
continue
peertubeInstances.append(url)
peertube_instances.append(url)
def _addEmbeddedVideoFromSites(translate: {}, content: str,
peertubeInstances: [],
peertube_instances: [],
width: int, height: int) -> str:
"""Adds embedded videos
"""
@ -110,10 +110,10 @@ def _addEmbeddedVideoFromSites(translate: {}, content: str,
return content
if '"https://' in content:
if peertubeInstances:
if peertube_instances:
# only create an embedded video for a limited set of
# peertube sites.
peerTubeSites = peertubeInstances
peerTubeSites = peertube_instances
else:
# A default minimal set of peertube instances
# Also see https://peertube_isolation.frama.io/list/ for
@ -246,10 +246,10 @@ def _addEmbeddedVideo(translate: {}, content: str) -> str:
def addEmbeddedElements(translate: {}, content: str,
peertubeInstances: []) -> str:
peertube_instances: []) -> str:
"""Adds embedded elements for various media types
"""
content = _addEmbeddedVideoFromSites(translate, content,
peertubeInstances, 400, 300)
peertube_instances, 400, 300)
content = _addEmbeddedAudio(translate, content)
return _addEmbeddedVideo(translate, content)

4
webapp_moderation.py
View File

@ -47,7 +47,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, moderationActionStr: str,
theme: str, peertubeInstances: [],
theme: str, peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -76,7 +76,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, moderationActionStr, theme,
peertubeInstances, allow_local_network_access,
peertube_instances, allow_local_network_access,
text_mode_banner, accessKeys, system_language,
max_like_count, shared_items_federated_domains,
signing_priv_key_pem, cw_lists, lists_enabled)

22
webapp_post.py
View File

@ -1334,7 +1334,7 @@ def individualPostAsHtml(signing_priv_key_pem: str,
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int,
@ -1894,7 +1894,7 @@ def individualPostAsHtml(signing_priv_key_pem: str,
if not postIsSensitive:
contentStr = objectContent + attachmentStr
contentStr = addEmbeddedElements(translate, contentStr,
peertubeInstances)
peertube_instances)
contentStr = insertQuestion(base_dir, translate,
nickname, domain, port,
contentStr, post_json_object,
@ -1916,7 +1916,7 @@ def individualPostAsHtml(signing_priv_key_pem: str,
cwContentStr = objectContent + attachmentStr
if not isPatch:
cwContentStr = addEmbeddedElements(translate, cwContentStr,
peertubeInstances)
peertube_instances)
cwContentStr = \
insertQuestion(base_dir, translate, nickname, domain, port,
cwContentStr, post_json_object, pageNumber)
@ -2002,7 +2002,7 @@ def htmlIndividualPost(cssCache: {},
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str,
@ -2068,7 +2068,7 @@ def htmlIndividualPost(cssCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access, theme_name,
system_language, max_like_count,
False, authorized, False, False, False, False,
@ -2099,7 +2099,7 @@ def htmlIndividualPost(cssCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,
@ -2134,7 +2134,7 @@ def htmlIndividualPost(cssCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,
@ -2162,7 +2162,7 @@ def htmlPostReplies(cssCache: {},
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int,
@ -2186,7 +2186,7 @@ def htmlPostReplies(cssCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,
@ -2215,7 +2215,7 @@ def htmlEmojiReactionPicker(cssCache: {},
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str,
@ -2238,7 +2238,7 @@ def htmlEmojiReactionPicker(cssCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,

26
webapp_profile.py
View File

@ -133,7 +133,7 @@ def htmlProfileAfterSearch(cssCache: {},
twitter_replacement_domain: str,
show_published_date_only: bool,
defaultTimeline: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str,
accessKeys: {},
@ -345,7 +345,7 @@ def htmlProfileAfterSearch(cssCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,
@ -554,7 +554,7 @@ def htmlProfile(signing_priv_key_pem: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
newswire: {}, theme: str, dormant_months: int,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
debug: bool, accessKeys: {}, city: str,
@ -964,7 +964,7 @@ def htmlProfile(signing_priv_key_pem: str,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme, system_language,
max_like_count,
@ -1034,7 +1034,7 @@ def _htmlProfilePosts(recentPostsCache: {}, max_recent_posts: int,
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int,
@ -1079,7 +1079,7 @@ def _htmlProfilePosts(recentPostsCache: {}, max_recent_posts: int,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language,
max_like_count,
@ -1300,7 +1300,7 @@ def _htmlEditProfileTwitter(base_dir: str, translate: {},
def _htmlEditProfileInstance(base_dir: str, translate: {},
peertubeInstances: [],
peertube_instances: [],
media_instanceStr: str,
blogs_instanceStr: str,
news_instanceStr: str) -> (str, str, str, str):
@ -1458,12 +1458,12 @@ def _htmlEditProfileInstance(base_dir: str, translate: {},
# Video section
peertubeStr = beginEditSection(translate['Video Settings'])
peertubeInstancesStr = ''
for url in peertubeInstances:
peertubeInstancesStr += url + '\n'
peertube_instancesStr = ''
for url in peertube_instances:
peertube_instancesStr += url + '\n'
peertubeStr += \
editTextArea(translate['Peertube Instances'], 'ptInstances',
peertubeInstancesStr, 200, '', False)
peertube_instancesStr, 200, '', False)
peertubeStr += \
' <br>\n'
yt_replace_domain = getConfigParam(base_dir, "youtubedomain")
@ -2091,7 +2091,7 @@ def _htmlEditProfileTopBanner(base_dir: str,
def htmlEditProfile(cssCache: {}, translate: {}, base_dir: str, path: str,
domain: str, port: int, http_prefix: str,
defaultTimeline: str, theme: str,
peertubeInstances: [],
peertube_instances: [],
text_mode_banner: str, city: str,
user_agents_blocked: str,
accessKeys: {},
@ -2225,7 +2225,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, base_dir: str, path: str,
domain, translate)
instanceStr, roleAssignStr, peertubeStr, libretranslateStr = \
_htmlEditProfileInstance(base_dir, translate,
peertubeInstances,
peertube_instances,
media_instanceStr,
blogs_instanceStr,
news_instanceStr)

8
webapp_search.py
View File

@ -600,7 +600,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, boxName: str,
system_language: str,
@ -687,7 +687,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language, max_like_count,
showIndividualPostIcons,
@ -713,7 +713,7 @@ def htmlHashtagSearch(cssCache: {},
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
theme_name: str, system_language: str,
max_like_count: int,
@ -870,7 +870,7 @@ def htmlHashtagSearch(cssCache: {},
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme_name, system_language, max_like_count,
showRepeats, showIcons,

48
webapp_timeline.py
View File

@ -443,7 +443,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
authorized: bool,
moderationActionStr: str,
theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -910,7 +910,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertubeInstances,
peertube_instances,
allow_local_network_access,
theme, system_language,
max_like_count,
@ -1137,7 +1137,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1169,7 +1169,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains,
@ -1195,7 +1195,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1227,7 +1227,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains,
@ -1254,7 +1254,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1286,7 +1286,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains,
@ -1313,7 +1313,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1345,7 +1345,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem,
@ -1371,7 +1371,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1398,7 +1398,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains,
@ -1425,7 +1425,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1452,7 +1452,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem,
@ -1478,7 +1478,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1505,7 +1505,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem,
@ -1531,7 +1531,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1558,7 +1558,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem,
@ -1585,7 +1585,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
publish_button_at_top: bool,
authorized: bool,
theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1611,7 +1611,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem,
@ -1637,7 +1637,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1663,7 +1663,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem,
@ -1689,7 +1689,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool, theme: str,
peertubeInstances: [],
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
accessKeys: {}, system_language: str,
@ -1718,7 +1718,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
full_width_tl_button_header,
icons_as_buttons, rss_icon_at_top,
publish_button_at_top,
authorized, None, theme, peertubeInstances,
authorized, None, theme, peertube_instances,
allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem,