From 4f37cc05cd06f46600a1b9b4fc45550736a21dad Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 25 Dec 2021 20:55:47 +0000 Subject: [PATCH] Snake case --- daemon.py | 134 ++++++++++++++++++++++-------------------- desktop_client.py | 8 +-- epicyon.py | 6 +- inbox.py | 64 ++++++++++---------- outbox.py | 8 +-- posts.py | 8 +-- schedule.py | 2 +- webapp_confirm.py | 4 +- webapp_create_post.py | 4 +- webapp_frontscreen.py | 8 +-- webapp_moderation.py | 4 +- webapp_post.py | 20 +++---- webapp_profile.py | 22 +++---- webapp_search.py | 10 ++-- webapp_timeline.py | 48 +++++++-------- 15 files changed, 179 insertions(+), 171 deletions(-) diff --git a/daemon.py b/daemon.py index 3fa7ab46a..2a8cb36f9 100644 --- a/daemon.py +++ b/daemon.py @@ -1294,7 +1294,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.proxyType, version, self.server.debug, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.allow_local_network_access, city, self.server.systemLanguage, @@ -2723,7 +2723,7 @@ class PubServer(BaseHTTPRequestHandler): None, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -2857,7 +2857,7 @@ class PubServer(BaseHTTPRequestHandler): None, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -3306,7 +3306,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -3401,7 +3401,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, port, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -3469,7 +3469,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, port, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -3547,8 +3547,8 @@ class PubServer(BaseHTTPRequestHandler): signingPrivateKeyPem = \ self.server.signingPrivateKeyPem - twitterReplacementDomain = \ - self.server.twitterReplacementDomain + twitter_replacement_domain = \ + self.server.twitter_replacement_domain profileStr = \ htmlProfileAfterSearch(self.server.cssCache, self.server.recentPostsCache, @@ -3567,7 +3567,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.debug, self.server.project_version, self.server.yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, self.server.defaultTimeline, self.server.peertubeInstances, @@ -5154,7 +5154,7 @@ class PubServer(BaseHTTPRequestHandler): # change twitter alternate domain if fields.get('twitterdomain'): currTwitterDomain = \ - self.server.twitterReplacementDomain + self.server.twitter_replacement_domain if fields['twitterdomain'] != currTwitterDomain: newTwitterDomain = fields['twitterdomain'] if '://' in newTwitterDomain: @@ -5167,12 +5167,12 @@ class PubServer(BaseHTTPRequestHandler): setConfigParam(base_dir, 'twitterdomain', newTwitterDomain) - self.server.twitterReplacementDomain = \ + self.server.twitter_replacement_domain = \ newTwitterDomain else: setConfigParam(base_dir, 'twitterdomain', '') - self.server.twitterReplacementDomain = None + self.server.twitter_replacement_domain = None # change custom post submit button text currCustomSubmitText = \ @@ -7546,7 +7546,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -7609,7 +7609,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.systemLanguage) if hashtagStr: msg = hashtagStr.encode('utf-8') @@ -7759,7 +7759,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -8219,7 +8219,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -8373,7 +8373,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -8557,7 +8557,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -8729,7 +8729,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -8827,7 +8827,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.http_prefix, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -8949,7 +8949,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -9077,7 +9077,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -9174,7 +9174,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.cachedWebfingers, self.server.personCache, callingDomain, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -9279,7 +9279,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -9389,7 +9389,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, timelineStr, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -9492,8 +9492,8 @@ class PubServer(BaseHTTPRequestHandler): personCache = self.server.personCache project_version = self.server.project_version ytDomain = self.server.yt_replace_domain - twitterReplacementDomain = \ - self.server.twitterReplacementDomain + twitter_replacement_domain = \ + self.server.twitter_replacement_domain peertubeInstances = self.server.peertubeInstances msg = \ htmlPostReplies(self.server.cssCache, @@ -9511,7 +9511,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, project_version, ytDomain, - twitterReplacementDomain, + twitter_replacement_domain, self.server.show_published_date_only, peertubeInstances, self.server.allow_local_network_access, @@ -9584,8 +9584,8 @@ class PubServer(BaseHTTPRequestHandler): personCache = self.server.personCache project_version = self.server.project_version ytDomain = self.server.yt_replace_domain - twitterReplacementDomain = \ - self.server.twitterReplacementDomain + twitter_replacement_domain = \ + self.server.twitter_replacement_domain peertubeInstances = self.server.peertubeInstances msg = \ htmlPostReplies(self.server.cssCache, @@ -9603,7 +9603,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, project_version, ytDomain, - twitterReplacementDomain, + twitter_replacement_domain, self.server.show_published_date_only, peertubeInstances, self.server.allow_local_network_access, @@ -9677,8 +9677,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.cachedWebfingers yt_replace_domain = \ self.server.yt_replace_domain - twitterReplacementDomain = \ - self.server.twitterReplacementDomain + twitter_replacement_domain = \ + self.server.twitter_replacement_domain icons_as_buttons = \ self.server.icons_as_buttons @@ -9706,7 +9706,7 @@ class PubServer(BaseHTTPRequestHandler): cachedWebfingers, self.server.personCache, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.themeName, @@ -9782,8 +9782,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.cachedWebfingers yt_replace_domain = \ self.server.yt_replace_domain - twitterReplacementDomain = \ - self.server.twitterReplacementDomain + twitter_replacement_domain = \ + self.server.twitter_replacement_domain show_published_date_only = \ self.server.show_published_date_only icons_as_buttons = \ @@ -9822,7 +9822,7 @@ class PubServer(BaseHTTPRequestHandler): cachedWebfingers, self.server.personCache, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, self.server.newswire, self.server.themeName, @@ -9993,7 +9993,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, likedBy, reactBy, reactEmoji, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -10162,7 +10162,7 @@ class PubServer(BaseHTTPRequestHandler): allowDeletion: bool, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str) -> bool: + twitter_replacement_domain: str) -> bool: """Shows the inbox timeline """ if '/users/' in path: @@ -10247,7 +10247,7 @@ class PubServer(BaseHTTPRequestHandler): project_version, minimalNick, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -10378,6 +10378,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.shared_items_federated_domains allow_local_network_access = \ self.server.allow_local_network_access + twitter_replacement_domain = \ + self.server.twitter_replacement_domain msg = \ htmlInboxDMs(self.server.cssCache, self.server.defaultTimeline, @@ -10398,7 +10400,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, minimalNick, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -10521,6 +10523,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.shared_items_federated_domains allow_local_network_access = \ self.server.allow_local_network_access + twitter_replacement_domain = \ + self.server.twitter_replacement_domain msg = \ htmlInboxReplies(self.server.cssCache, self.server.defaultTimeline, @@ -10541,7 +10545,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, minimalNick, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -10682,7 +10686,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, minimalNick, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -10824,7 +10828,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, minimalNick, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -10975,7 +10979,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, minimalNick, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, moderator, editor, artist, @@ -11105,6 +11109,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.shared_items_federated_domains allow_local_network_access = \ self.server.allow_local_network_access + twitter_replacement_domain = \ + self.server.twitter_replacement_domain msg = \ htmlInboxFeatures(self.server.cssCache, self.server.defaultTimeline, @@ -11125,7 +11131,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, minimalNick, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -11234,7 +11240,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -11319,7 +11325,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -11421,6 +11427,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.shared_items_federated_domains allow_local_network_access = \ self.server.allow_local_network_access + twitter_replacement_domain = \ + self.server.twitter_replacement_domain msg = \ htmlBookmarks(self.server.cssCache, self.server.defaultTimeline, @@ -11441,7 +11449,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, minimalNick, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -11579,7 +11587,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, minimalNick, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -11688,8 +11696,8 @@ class PubServer(BaseHTTPRequestHandler): shared_items_federated_domains = \ self.server.shared_items_federated_domains - twitterReplacementDomain = \ - self.server.twitterReplacementDomain + twitter_replacement_domain = \ + self.server.twitter_replacement_domain allow_local_network_access = \ self.server.allow_local_network_access show_published_date_only = \ @@ -11713,7 +11721,7 @@ class PubServer(BaseHTTPRequestHandler): http_prefix, self.server.project_version, self.server.yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, self.server.newswire, self.server.positive_voting, @@ -11839,7 +11847,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.cachedWebfingers, self.server.personCache, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.themeName, @@ -11960,7 +11968,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.cachedWebfingers, self.server.personCache, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.themeName, @@ -12080,7 +12088,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.cachedWebfingers, self.server.personCache, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.themeName, @@ -12216,7 +12224,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.cachedWebfingers, self.server.personCache, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.newswire, self.server.themeName, @@ -12983,7 +12991,7 @@ class PubServer(BaseHTTPRequestHandler): postJsonObject, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, @@ -15913,7 +15921,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.allowDeletion, self.server.project_version, self.server.yt_replace_domain, - self.server.twitterReplacementDomain): + self.server.twitter_replacement_domain): self.server.GETbusy = False return @@ -16807,7 +16815,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.yt_replace_domain, self.server.systemLanguage) replaceTwitter(postJsonObject, - self.server.twitterReplacementDomain, + self.server.twitter_replacement_domain, self.server.systemLanguage) saveJson(postJsonObject, postFilename) # also save to the news actor @@ -18462,7 +18470,7 @@ def runDaemon(content_license_url: str, base_dir: str, domain: str, onion_domain: str, i2p_domain: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, port: int = 80, proxyPort: int = 80, http_prefix: str = 'https', fedList: [] = [], @@ -18590,7 +18598,7 @@ def runDaemon(content_license_url: str, # unit tests are run on the local network with LAN addresses httpd.allow_local_network_access = True httpd.yt_replace_domain = yt_replace_domain - httpd.twitterReplacementDomain = twitterReplacementDomain + httpd.twitter_replacement_domain = twitter_replacement_domain # newswire storing rss feeds httpd.newswire = {} @@ -18926,7 +18934,7 @@ def runDaemon(content_license_url: str, maxMentions, maxEmoji, httpd.translate, unitTest, httpd.yt_replace_domain, - httpd.twitterReplacementDomain, + httpd.twitter_replacement_domain, httpd.show_published_date_only, httpd.max_followers, httpd.allow_local_network_access, diff --git a/desktop_client.py b/desktop_client.py index 536c41889..7546e12a6 100644 --- a/desktop_client.py +++ b/desktop_client.py @@ -698,7 +698,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str, recentPostsCache = {} allow_local_network_access = False yt_replace_domain = None - twitterReplacementDomain = None + twitter_replacement_domain = None postJsonObject2 = \ downloadAnnounce(session, base_dir, http_prefix, @@ -706,7 +706,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str, postJsonObject, __version__, translate, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, allow_local_network_access, recentPostsCache, False, systemLanguage, @@ -2396,7 +2396,7 @@ def runDesktopClient(base_dir: str, proxyType: str, http_prefix: str, recentPostsCache = {} allow_local_network_access = False yt_replace_domain = None - twitterReplacementDomain = None + twitter_replacement_domain = None postJsonObject2 = \ downloadAnnounce(session, base_dir, http_prefix, @@ -2404,7 +2404,7 @@ def runDesktopClient(base_dir: str, proxyType: str, http_prefix: str, postJsonObject, __version__, translate, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, allow_local_network_access, recentPostsCache, False, systemLanguage, diff --git a/epicyon.py b/epicyon.py index d2ce0afe4..8ece5ad40 100644 --- a/epicyon.py +++ b/epicyon.py @@ -234,7 +234,7 @@ parser.add_argument('--path', dest='base_dir', parser.add_argument('--ytdomain', dest='yt_replace_domain', type=str, default=None, 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, help='Domain used to replace twitter.com') parser.add_argument('--language', dest='language', @@ -3178,7 +3178,7 @@ if twitterDomain: if '/' in twitterDomain: twitterDomain = twitterDomain.split('/')[0] if '.' in twitterDomain: - args.twitterReplacementDomain = twitterDomain + args.twitter_replacement_domain = twitterDomain if setTheme(base_dir, themeName, domain, args.allow_local_network_access, args.language): @@ -3249,7 +3249,7 @@ if __name__ == "__main__": instance_id, args.client, base_dir, domain, onion_domain, i2p_domain, args.yt_replace_domain, - args.twitterReplacementDomain, + args.twitter_replacement_domain, port, proxyPort, http_prefix, federationList, args.maxMentions, args.maxEmoji, args.secureMode, diff --git a/inbox.py b/inbox.py index 361fe2551..95b0a715f 100644 --- a/inbox.py +++ b/inbox.py @@ -303,7 +303,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int, notDM = not isDM(postJsonObject) yt_replace_domain = getConfigParam(base_dir, 'youtubedomain') - twitterReplacementDomain = getConfigParam(base_dir, 'twitterdomain') + twitter_replacement_domain = getConfigParam(base_dir, 'twitterdomain') individualPostAsHtml(signingPrivateKeyPem, True, recentPostsCache, max_recent_posts, translate, pageNumber, @@ -312,7 +312,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int, nickname, domain, port, postJsonObject, avatarUrl, True, allowDeletion, http_prefix, __version__, boxname, - yt_replace_domain, twitterReplacementDomain, + yt_replace_domain, twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, max_like_count, @@ -1000,7 +1000,7 @@ def _receiveLike(recentPostsCache: {}, max_recent_posts: int, translate: {}, allowDeletion: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -1099,7 +1099,7 @@ def _receiveLike(recentPostsCache: {}, http_prefix, __version__, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1122,7 +1122,7 @@ def _receiveUndoLike(recentPostsCache: {}, max_recent_posts: int, translate: {}, allowDeletion: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -1210,7 +1210,7 @@ def _receiveUndoLike(recentPostsCache: {}, http_prefix, __version__, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1234,7 +1234,7 @@ def _receiveReaction(recentPostsCache: {}, max_recent_posts: int, translate: {}, allowDeletion: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -1358,7 +1358,7 @@ def _receiveReaction(recentPostsCache: {}, http_prefix, __version__, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1381,7 +1381,7 @@ def _receiveUndoReaction(recentPostsCache: {}, max_recent_posts: int, translate: {}, allowDeletion: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -1485,7 +1485,7 @@ def _receiveUndoReaction(recentPostsCache: {}, http_prefix, __version__, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1507,7 +1507,7 @@ def _receiveBookmark(recentPostsCache: {}, max_recent_posts: int, translate: {}, allowDeletion: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -1595,7 +1595,7 @@ def _receiveBookmark(recentPostsCache: {}, http_prefix, __version__, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1617,7 +1617,7 @@ def _receiveUndoBookmark(recentPostsCache: {}, max_recent_posts: int, translate: {}, allowDeletion: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -1706,7 +1706,7 @@ def _receiveUndoBookmark(recentPostsCache: {}, http_prefix, __version__, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1801,7 +1801,7 @@ def _receiveAnnounce(recentPostsCache: {}, personCache: {}, messageJson: {}, federationList: [], debug: bool, translate: {}, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, allow_local_network_access: bool, themeName: str, systemLanguage: str, signingPrivateKeyPem: str, @@ -1913,7 +1913,7 @@ def _receiveAnnounce(recentPostsCache: {}, http_prefix, __version__, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1936,7 +1936,7 @@ def _receiveAnnounce(recentPostsCache: {}, messageJson, __version__, translate, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, allow_local_network_access, recentPostsCache, debug, systemLanguage, @@ -2982,7 +2982,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str, max_recent_posts: int, translate: {}, allowDeletion: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -3026,7 +3026,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str, http_prefix, __version__, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -3189,7 +3189,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, maxMentions: int, maxEmoji: int, translate: {}, unitTest: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, allow_local_network_access: bool, peertubeInstances: [], @@ -3225,7 +3225,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, max_recent_posts, translate, allowDeletion, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3247,7 +3247,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, max_recent_posts, translate, allowDeletion, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3270,7 +3270,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, max_recent_posts, translate, allowDeletion, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3292,7 +3292,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, max_recent_posts, translate, allowDeletion, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3314,7 +3314,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, max_recent_posts, translate, allowDeletion, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3336,7 +3336,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, max_recent_posts, translate, allowDeletion, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3359,7 +3359,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, federationList, debug, translate, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, allow_local_network_access, themeName, systemLanguage, signingPrivateKeyPem, @@ -3440,7 +3440,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, replaceYouTube(postJsonObject, yt_replace_domain, systemLanguage) # replace twitter link domains, so that you can view twitter posts # without having an account - replaceTwitter(postJsonObject, twitterReplacementDomain, + replaceTwitter(postJsonObject, twitter_replacement_domain, systemLanguage) # list of indexes to be updated @@ -3458,7 +3458,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, max_recent_posts, translate, allowDeletion, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3500,7 +3500,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, nickname, domain, postJsonObject, translate, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, allow_local_network_access, recentPostsCache, debug, systemLanguage, domainFull, personCache, signingPrivateKeyPem): @@ -4073,7 +4073,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int, allowDeletion: bool, debug: bool, maxMentions: int, maxEmoji: int, translate: {}, unitTest: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, max_followers: int, allow_local_network_access: bool, @@ -4504,7 +4504,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int, maxMentions, maxEmoji, translate, unitTest, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, allow_local_network_access, peertubeInstances, diff --git a/outbox.py b/outbox.py index 6840493b5..e1ec8bd3d 100644 --- a/outbox.py +++ b/outbox.py @@ -188,7 +188,7 @@ def postMessageToOutbox(session, translate: {}, personCache: {}, allowDeletion: bool, proxyType: str, version: str, debug: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, allow_local_network_access: bool, city: str, systemLanguage: str, @@ -289,7 +289,7 @@ def postMessageToOutbox(session, translate: {}, replaceYouTube(messageJson, yt_replace_domain, systemLanguage) # replace twitter, so that twitter posts can be shown without # having a twitter account - replaceTwitter(messageJson, twitterReplacementDomain, systemLanguage) + replaceTwitter(messageJson, twitter_replacement_domain, systemLanguage) # https://www.w3.org/TR/activitypub/#create-activity-outbox messageJson['object']['attributedTo'] = messageJson['actor'] if messageJson['object'].get('attachment'): @@ -424,7 +424,7 @@ def postMessageToOutbox(session, translate: {}, messageJson, translate, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, allow_local_network_access, recentPostsCache, debug, systemLanguage, domainFull, personCache, @@ -465,7 +465,7 @@ def postMessageToOutbox(session, translate: {}, http_prefix, __version__, boxNameIndex, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, diff --git a/posts.py b/posts.py index df6f0a69e..2ee3d2fa4 100644 --- a/posts.py +++ b/posts.py @@ -3454,7 +3454,7 @@ def isImageMedia(session, base_dir: str, http_prefix: str, nickname: str, domain: str, postJsonObject: {}, translate: {}, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, allow_local_network_access: bool, recentPostsCache: {}, debug: bool, systemLanguage: str, @@ -3469,7 +3469,7 @@ def isImageMedia(session, base_dir: str, http_prefix: str, nickname, domain, postJsonObject, __version__, translate, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, allow_local_network_access, recentPostsCache, debug, systemLanguage, @@ -4505,7 +4505,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str, postJsonObject: {}, project_version: str, translate: {}, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, allow_local_network_access: bool, recentPostsCache: {}, debug: bool, systemLanguage: str, @@ -4725,7 +4725,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str, return None postJsonObject = announcedJson replaceYouTube(postJsonObject, yt_replace_domain, systemLanguage) - replaceTwitter(postJsonObject, twitterReplacementDomain, + replaceTwitter(postJsonObject, twitter_replacement_domain, systemLanguage) if saveJson(postJsonObject, announceFilename): return postJsonObject diff --git a/schedule.py b/schedule.py index fbcb996b1..b395ab270 100644 --- a/schedule.py +++ b/schedule.py @@ -115,7 +115,7 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd, httpd.project_version, httpd.debug, httpd.yt_replace_domain, - httpd.twitterReplacementDomain, + httpd.twitter_replacement_domain, httpd.show_published_date_only, httpd.allow_local_network_access, httpd.city, httpd.systemLanguage, diff --git a/webapp_confirm.py b/webapp_confirm.py index 690cb9ff0..c425525fc 100644 --- a/webapp_confirm.py +++ b/webapp_confirm.py @@ -31,7 +31,7 @@ def htmlConfirmDelete(cssCache: {}, cachedWebfingers: {}, personCache: {}, callingDomain: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -73,7 +73,7 @@ def htmlConfirmDelete(cssCache: {}, None, True, False, http_prefix, project_version, 'outbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, max_like_count, diff --git a/webapp_create_post.py b/webapp_create_post.py index 38c96bfcd..e8de90791 100644 --- a/webapp_create_post.py +++ b/webapp_create_post.py @@ -203,7 +203,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {}, postJsonObject: {}, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -272,7 +272,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {}, http_prefix, project_version, boxName, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, diff --git a/webapp_frontscreen.py b/webapp_frontscreen.py index 06b637244..c2c11c65d 100644 --- a/webapp_frontscreen.py +++ b/webapp_frontscreen.py @@ -29,7 +29,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, max_recent_posts: int, session, cachedWebfingers: {}, personCache: {}, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -75,7 +75,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, max_recent_posts: int, None, True, False, http_prefix, project_version, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -103,7 +103,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str, profileJson: {}, selected: str, session, cachedWebfingers: {}, personCache: {}, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, theme: str, peertubeInstances: [], @@ -180,7 +180,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str, session, cachedWebfingers, personCache, project_version, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, diff --git a/webapp_moderation.py b/webapp_moderation.py index cd8586e3c..13a60d38d 100644 --- a/webapp_moderation.py +++ b/webapp_moderation.py @@ -38,7 +38,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str, allowDeletion: bool, http_prefix: str, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -68,7 +68,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str, allowDeletion, http_prefix, project_version, True, False, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, diff --git a/webapp_post.py b/webapp_post.py index 0754ee5bc..736a690a1 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -1332,7 +1332,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str, http_prefix: str, project_version: str, boxName: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -1500,7 +1500,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str, nickname, domain, postJsonObject, project_version, translate, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, allow_local_network_access, recentPostsCache, False, systemLanguage, @@ -2000,7 +2000,7 @@ def htmlIndividualPost(cssCache: {}, project_version: str, likedBy: str, reactBy: str, reactEmoji: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -2065,7 +2065,7 @@ def htmlIndividualPost(cssCache: {}, None, True, False, http_prefix, project_version, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, themeName, @@ -2096,7 +2096,7 @@ def htmlIndividualPost(cssCache: {}, None, True, False, http_prefix, project_version, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -2131,7 +2131,7 @@ def htmlIndividualPost(cssCache: {}, None, True, False, http_prefix, project_version, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -2159,7 +2159,7 @@ def htmlPostReplies(cssCache: {}, nickname: str, domain: str, port: int, repliesJson: {}, http_prefix: str, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -2183,7 +2183,7 @@ def htmlPostReplies(cssCache: {}, None, True, False, http_prefix, project_version, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -2212,7 +2212,7 @@ def htmlEmojiReactionPicker(cssCache: {}, postJsonObject: {}, http_prefix: str, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -2235,7 +2235,7 @@ def htmlEmojiReactionPicker(cssCache: {}, None, True, False, http_prefix, project_version, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, diff --git a/webapp_profile.py b/webapp_profile.py index 6472e59a6..a7a452de1 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -130,7 +130,7 @@ def htmlProfileAfterSearch(cssCache: {}, session, cachedWebfingers: {}, personCache: {}, debug: bool, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, defaultTimeline: str, peertubeInstances: [], @@ -341,7 +341,7 @@ def htmlProfileAfterSearch(cssCache: {}, postJsonObject, avatarUrl, False, False, http_prefix, project_version, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -548,7 +548,7 @@ def htmlProfile(signingPrivateKeyPem: str, profileJson: {}, selected: str, session, cachedWebfingers: {}, personCache: {}, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, theme: str, dormant_months: int, peertubeInstances: [], @@ -577,7 +577,7 @@ def htmlProfile(signingPrivateKeyPem: str, profileJson, selected, session, cachedWebfingers, personCache, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, theme, extraJson, allow_local_network_access, accessKeys, @@ -959,7 +959,7 @@ def htmlProfile(signingPrivateKeyPem: str, session, cachedWebfingers, personCache, project_version, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1027,7 +1027,7 @@ def _htmlProfilePosts(recentPostsCache: {}, max_recent_posts: int, session, cachedWebfingers: {}, personCache: {}, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -1072,7 +1072,7 @@ def _htmlProfilePosts(recentPostsCache: {}, max_recent_posts: int, None, True, False, http_prefix, project_version, 'inbox', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1284,12 +1284,12 @@ def _htmlEditProfileTwitter(base_dir: str, translate: {}, twitterStr += \ editCheckBox(translate['Remove Twitter posts'], 'removeTwitter', removeTwitter) - twitterReplacementDomain = getConfigParam(base_dir, "twitterdomain") - if not twitterReplacementDomain: - twitterReplacementDomain = '' + twitter_replacement_domain = getConfigParam(base_dir, "twitterdomain") + if not twitter_replacement_domain: + twitter_replacement_domain = '' twitterStr += \ editTextField(translate['Twitter Replacement Domain'], - 'twitterdomain', twitterReplacementDomain) + 'twitterdomain', twitter_replacement_domain) twitterStr += endEditSection() return twitterStr diff --git a/webapp_search.py b/webapp_search.py index c5c09dbbe..4556334da 100644 --- a/webapp_search.py +++ b/webapp_search.py @@ -598,7 +598,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str, personCache: {}, port: int, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -685,7 +685,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str, http_prefix, project_version, 'search', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -711,7 +711,7 @@ def htmlHashtagSearch(cssCache: {}, session, cachedWebfingers: {}, personCache: {}, http_prefix: str, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, @@ -868,7 +868,7 @@ def htmlHashtagSearch(cssCache: {}, http_prefix, project_version, 'search', yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -904,7 +904,7 @@ def rssHashtagSearch(nickname: str, domain: str, port: int, session, cachedWebfingers: {}, personCache: {}, http_prefix: str, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, systemLanguage: str) -> str: """Show an rss feed for a hashtag """ diff --git a/webapp_timeline.py b/webapp_timeline.py index 8c1d254b8..6d76b3ae8 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -429,7 +429,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, manuallyApproveFollowers: bool, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, moderator: bool, editor: bool, artist: bool, @@ -907,7 +907,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, http_prefix, project_version, boxName, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, @@ -1127,7 +1127,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str, allowDeletion: bool, http_prefix: str, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1161,7 +1161,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str, manuallyApproveFollowers, False, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, @@ -1185,7 +1185,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str, allowDeletion: bool, http_prefix: str, project_version: str, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1219,7 +1219,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str, manuallyApproveFollowers, False, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, @@ -1244,7 +1244,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1278,7 +1278,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str, manuallyApproveFollowers, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, @@ -1303,7 +1303,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1337,7 +1337,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str, manuallyApproveFollowers, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, @@ -1361,7 +1361,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1389,7 +1389,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str, nickname, domain, port, inboxJson, 'dm', allowDeletion, http_prefix, project_version, False, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, @@ -1413,7 +1413,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1442,7 +1442,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str, allowDeletion, http_prefix, project_version, False, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, @@ -1466,7 +1466,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1495,7 +1495,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str, allowDeletion, http_prefix, project_version, False, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, @@ -1519,7 +1519,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1548,7 +1548,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str, allowDeletion, http_prefix, project_version, False, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon, @@ -1572,7 +1572,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1601,7 +1601,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str, allowDeletion, http_prefix, project_version, False, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, False, positive_voting, show_publish_as_icon, @@ -1625,7 +1625,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, moderator: bool, editor: bool, artist: bool, positive_voting: bool, show_publish_as_icon: bool, @@ -1653,7 +1653,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str, allowDeletion, http_prefix, project_version, False, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, moderator, editor, artist, positive_voting, show_publish_as_icon, @@ -1677,7 +1677,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str, http_prefix: str, project_version: str, minimal: bool, yt_replace_domain: str, - twitterReplacementDomain: str, + twitter_replacement_domain: str, show_published_date_only: bool, newswire: {}, positive_voting: bool, show_publish_as_icon: bool, @@ -1708,7 +1708,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str, allowDeletion, http_prefix, project_version, manuallyApproveFollowers, minimal, yt_replace_domain, - twitterReplacementDomain, + twitter_replacement_domain, show_published_date_only, newswire, False, False, artist, positive_voting, show_publish_as_icon,