diff --git a/daemon.py b/daemon.py index 2b30bf176..5b2500fb9 100644 --- a/daemon.py +++ b/daemon.py @@ -1295,7 +1295,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.debug, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.allow_local_network_access, city, self.server.systemLanguage, self.server.shared_items_federated_domains, @@ -2722,7 +2722,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.systemLanguage, @@ -2856,7 +2856,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.systemLanguage, @@ -3305,7 +3305,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -3400,7 +3400,7 @@ class PubServer(BaseHTTPRequestHandler): port, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, 'outbox', @@ -3468,7 +3468,7 @@ class PubServer(BaseHTTPRequestHandler): port, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, 'bookmarks', @@ -3534,7 +3534,8 @@ class PubServer(BaseHTTPRequestHandler): cookie, debug, authorized) return else: - showPublishedDateOnly = self.server.showPublishedDateOnly + show_published_date_only = \ + self.server.show_published_date_only allow_local_network_access = \ self.server.allow_local_network_access @@ -3565,7 +3566,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, self.server.defaultTimeline, self.server.peertubeInstances, allow_local_network_access, @@ -7544,7 +7545,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -7756,7 +7757,7 @@ class PubServer(BaseHTTPRequestHandler): timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -8216,7 +8217,7 @@ class PubServer(BaseHTTPRequestHandler): timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -8370,7 +8371,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -8554,7 +8555,7 @@ class PubServer(BaseHTTPRequestHandler): timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -8726,7 +8727,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -8824,7 +8825,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -8946,7 +8947,7 @@ class PubServer(BaseHTTPRequestHandler): timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -9074,7 +9075,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -9171,7 +9172,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, callingDomain, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -9276,7 +9277,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -9386,7 +9387,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, timelineStr, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -9508,7 +9509,7 @@ class PubServer(BaseHTTPRequestHandler): projectVersion, ytDomain, twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -9600,7 +9601,7 @@ class PubServer(BaseHTTPRequestHandler): projectVersion, ytDomain, twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -9703,7 +9704,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, yt_replace_domain, twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.themeName, self.server.dormant_months, @@ -9780,8 +9781,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.yt_replace_domain twitterReplacementDomain = \ self.server.twitterReplacementDomain - showPublishedDateOnly = \ - self.server.showPublishedDateOnly + show_published_date_only = \ + self.server.show_published_date_only icons_as_buttons = \ self.server.icons_as_buttons allow_local_network_access = \ @@ -9819,7 +9820,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, self.server.newswire, self.server.themeName, self.server.dormant_months, @@ -9990,7 +9991,7 @@ class PubServer(BaseHTTPRequestHandler): likedBy, reactBy, reactEmoji, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, @@ -10244,7 +10245,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, yt_replace_domain, twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -10395,7 +10396,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -10538,7 +10539,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -10679,7 +10680,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -10821,7 +10822,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -10972,7 +10973,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, moderator, editor, artist, self.server.positiveVoting, @@ -11122,7 +11123,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -11231,7 +11232,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -11316,7 +11317,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -11438,7 +11439,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -11576,7 +11577,7 @@ class PubServer(BaseHTTPRequestHandler): minimalNick, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -11688,6 +11689,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.twitterReplacementDomain allow_local_network_access = \ self.server.allow_local_network_access + show_published_date_only = \ + self.server.show_published_date_only msg = \ htmlModeration(self.server.cssCache, self.server.defaultTimeline, @@ -11708,7 +11711,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, twitterReplacementDomain, - self.server.showPublishedDateOnly, + show_published_date_only, self.server.newswire, self.server.positiveVoting, self.server.show_publish_as_icon, @@ -11834,7 +11837,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.themeName, self.server.dormant_months, @@ -11955,7 +11958,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.themeName, self.server.dormant_months, @@ -12075,7 +12078,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.themeName, self.server.dormant_months, @@ -12211,7 +12214,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.personCache, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.newswire, self.server.themeName, self.server.dormant_months, @@ -12978,7 +12981,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.projectVersion, self.server.yt_replace_domain, self.server.twitterReplacementDomain, - self.server.showPublishedDateOnly, + self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, self.server.systemLanguage, @@ -18442,7 +18445,7 @@ def runDaemon(content_license_url: str, max_mirrored_articles: int, maxNewswireFeedSizeKb: int, max_newswire_postsPerSource: int, - showPublishedDateOnly: bool, + show_published_date_only: bool, votingTimeMins: int, positiveVoting: bool, newswireVotesThreshold: int, @@ -18644,7 +18647,7 @@ def runDaemon(content_license_url: str, httpd.max_newswire_postsPerSource = max_newswire_postsPerSource # Show only the date at the bottom of posts, and not the time - httpd.showPublishedDateOnly = showPublishedDateOnly + httpd.show_published_date_only = show_published_date_only # maximum number of news articles to mirror httpd.max_mirrored_articles = max_mirrored_articles @@ -18917,7 +18920,7 @@ def runDaemon(content_license_url: str, httpd.translate, unitTest, httpd.yt_replace_domain, httpd.twitterReplacementDomain, - httpd.showPublishedDateOnly, + httpd.show_published_date_only, httpd.max_followers, httpd.allow_local_network_access, httpd.peertubeInstances, diff --git a/inbox.py b/inbox.py index ec3fc6627..ccc4866bb 100644 --- a/inbox.py +++ b/inbox.py @@ -285,7 +285,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int, nickname: str, domain: str, port: int, postJsonObject: {}, allowDeletion: bool, boxname: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -313,7 +313,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int, avatarUrl, True, allowDeletion, http_prefix, __version__, boxname, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, max_like_count, notDM, True, True, False, True, False, @@ -1085,7 +1085,7 @@ def _receiveLike(recentPostsCache: {}, print('Liked post nickname: ' + handleName + ' ' + domain) print('Liked post cache: ' + str(cachedPostFilename)) pageNumber = 1 - showPublishedDateOnly = False + show_published_date_only = False showIndividualPostIcons = True manuallyApproveFollowers = \ followerApprovalActive(base_dir, handleName, domain) @@ -1100,7 +1100,7 @@ def _receiveLike(recentPostsCache: {}, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -1196,7 +1196,7 @@ def _receiveUndoLike(recentPostsCache: {}, print('Unliked post nickname: ' + handleName + ' ' + domain) print('Unliked post cache: ' + str(cachedPostFilename)) pageNumber = 1 - showPublishedDateOnly = False + show_published_date_only = False showIndividualPostIcons = True manuallyApproveFollowers = \ followerApprovalActive(base_dir, handleName, domain) @@ -1211,7 +1211,7 @@ def _receiveUndoLike(recentPostsCache: {}, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -1344,7 +1344,7 @@ def _receiveReaction(recentPostsCache: {}, print('Reaction post nickname: ' + handleName + ' ' + domain) print('Reaction post cache: ' + str(cachedPostFilename)) pageNumber = 1 - showPublishedDateOnly = False + show_published_date_only = False showIndividualPostIcons = True manuallyApproveFollowers = \ followerApprovalActive(base_dir, handleName, domain) @@ -1359,7 +1359,7 @@ def _receiveReaction(recentPostsCache: {}, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -1471,7 +1471,7 @@ def _receiveUndoReaction(recentPostsCache: {}, print('Unreaction post nickname: ' + handleName + ' ' + domain) print('Unreaction post cache: ' + str(cachedPostFilename)) pageNumber = 1 - showPublishedDateOnly = False + show_published_date_only = False showIndividualPostIcons = True manuallyApproveFollowers = \ followerApprovalActive(base_dir, handleName, domain) @@ -1486,7 +1486,7 @@ def _receiveUndoReaction(recentPostsCache: {}, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -1581,7 +1581,7 @@ def _receiveBookmark(recentPostsCache: {}, print('Bookmarked post nickname: ' + nickname + ' ' + domain) print('Bookmarked post cache: ' + str(cachedPostFilename)) pageNumber = 1 - showPublishedDateOnly = False + show_published_date_only = False showIndividualPostIcons = True manuallyApproveFollowers = \ followerApprovalActive(base_dir, nickname, domain) @@ -1596,7 +1596,7 @@ def _receiveBookmark(recentPostsCache: {}, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -1692,7 +1692,7 @@ def _receiveUndoBookmark(recentPostsCache: {}, print('Unbookmarked post nickname: ' + nickname + ' ' + domain) print('Unbookmarked post cache: ' + str(cachedPostFilename)) pageNumber = 1 - showPublishedDateOnly = False + show_published_date_only = False showIndividualPostIcons = True manuallyApproveFollowers = \ followerApprovalActive(base_dir, nickname, domain) @@ -1707,7 +1707,7 @@ def _receiveUndoBookmark(recentPostsCache: {}, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -1896,7 +1896,7 @@ def _receiveAnnounce(recentPostsCache: {}, # Generate html. This also downloads the announced post. pageNumber = 1 - showPublishedDateOnly = False + show_published_date_only = False showIndividualPostIcons = True manuallyApproveFollowers = \ followerApprovalActive(base_dir, nickname, domain) @@ -1914,7 +1914,7 @@ def _receiveAnnounce(recentPostsCache: {}, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3011,7 +3011,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str, cachedPostFilename) pageNumber = 1 - showPublishedDateOnly = False + show_published_date_only = False showIndividualPostIcons = True manuallyApproveFollowers = \ followerApprovalActive(base_dir, nickname, domain) @@ -3026,7 +3026,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -3189,7 +3189,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int, unitTest: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, allow_local_network_access: bool, peertubeInstances: [], lastBounceMessage: [], @@ -3562,7 +3562,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int, postJsonObject, allowDeletion, boxname, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -4073,7 +4073,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int, maxEmoji: int, translate: {}, unitTest: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, max_followers: int, allow_local_network_access: bool, peertubeInstances: [], @@ -4504,7 +4504,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int, translate, unitTest, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, allow_local_network_access, peertubeInstances, lastBounceMessage, diff --git a/outbox.py b/outbox.py index 4b485632c..22cc98e6e 100644 --- a/outbox.py +++ b/outbox.py @@ -189,7 +189,7 @@ def postMessageToOutbox(session, translate: {}, proxyType: str, version: str, debug: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, allow_local_network_access: bool, city: str, systemLanguage: str, shared_items_federated_domains: [], @@ -466,7 +466,7 @@ def postMessageToOutbox(session, translate: {}, boxNameIndex, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, theme, systemLanguage, diff --git a/schedule.py b/schedule.py index e4d8b8ef9..ae640d239 100644 --- a/schedule.py +++ b/schedule.py @@ -116,7 +116,7 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd, httpd.debug, httpd.yt_replace_domain, httpd.twitterReplacementDomain, - httpd.showPublishedDateOnly, + httpd.show_published_date_only, httpd.allow_local_network_access, httpd.city, httpd.systemLanguage, httpd.shared_items_federated_domains, diff --git a/webapp_confirm.py b/webapp_confirm.py index 2a546b3fc..d5273a609 100644 --- a/webapp_confirm.py +++ b/webapp_confirm.py @@ -32,7 +32,7 @@ def htmlConfirmDelete(cssCache: {}, callingDomain: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -74,7 +74,7 @@ def htmlConfirmDelete(cssCache: {}, http_prefix, projectVersion, 'outbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, max_like_count, False, False, False, False, False, False, diff --git a/webapp_create_post.py b/webapp_create_post.py index 667c459fd..31a147bd7 100644 --- a/webapp_create_post.py +++ b/webapp_create_post.py @@ -204,7 +204,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, systemLanguage: str, @@ -273,7 +273,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, boxName, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, theme, systemLanguage, diff --git a/webapp_frontscreen.py b/webapp_frontscreen.py index bb2f5fe6c..3e0643f6c 100644 --- a/webapp_frontscreen.py +++ b/webapp_frontscreen.py @@ -30,7 +30,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -76,7 +76,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int, http_prefix, projectVersion, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -104,7 +104,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str, session, cachedWebfingers: {}, personCache: {}, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, theme: str, peertubeInstances: [], allow_local_network_access: bool, @@ -181,7 +181,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str, projectVersion, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, theme, systemLanguage, diff --git a/webapp_moderation.py b/webapp_moderation.py index 578b1baa2..a3df4ba58 100644 --- a/webapp_moderation.py +++ b/webapp_moderation.py @@ -39,7 +39,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str, http_prefix: str, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -69,7 +69,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str, projectVersion, True, False, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, diff --git a/webapp_post.py b/webapp_post.py index e1d1ba342..c2f3f3b0f 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -825,7 +825,7 @@ def _getDeleteIconHtml(nickname: str, domainFull: str, def _getPublishedDateStr(postJsonObject: {}, - showPublishedDateOnly: bool) -> str: + show_published_date_only: bool) -> str: """Return the html for the published date on a post """ publishedStr = '' @@ -846,7 +846,7 @@ def _getPublishedDateStr(postJsonObject: {}, publishedStr = \ publishedStr.replace('T', ' ').split('.')[0] datetimeObject = parse(publishedStr) - if not showPublishedDateOnly: + if not show_published_date_only: publishedStr = datetimeObject.strftime("%a %b %d, %H:%M") else: publishedStr = datetimeObject.strftime("%a %b %d") @@ -1333,7 +1333,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str, boxName: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -1780,7 +1780,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str, bookmarkStr, deleteStr, muteStr) publishedStr = \ - _getPublishedDateStr(postJsonObject, showPublishedDateOnly) + _getPublishedDateStr(postJsonObject, show_published_date_only) _logPostTiming(enableTimingLog, postStartTime, '15') @@ -2001,7 +2001,7 @@ def htmlIndividualPost(cssCache: {}, reactBy: str, reactEmoji: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -2066,7 +2066,7 @@ def htmlIndividualPost(cssCache: {}, http_prefix, projectVersion, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, max_like_count, @@ -2097,7 +2097,7 @@ def htmlIndividualPost(cssCache: {}, http_prefix, projectVersion, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -2132,7 +2132,7 @@ def htmlIndividualPost(cssCache: {}, http_prefix, projectVersion, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -2160,7 +2160,7 @@ def htmlPostReplies(cssCache: {}, http_prefix: str, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -2184,7 +2184,7 @@ def htmlPostReplies(cssCache: {}, http_prefix, projectVersion, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, @@ -2213,7 +2213,7 @@ def htmlEmojiReactionPicker(cssCache: {}, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -2236,7 +2236,7 @@ def htmlEmojiReactionPicker(cssCache: {}, http_prefix, projectVersion, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, diff --git a/webapp_profile.py b/webapp_profile.py index f12e7084e..fe7181927 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -131,7 +131,7 @@ def htmlProfileAfterSearch(cssCache: {}, debug: bool, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, defaultTimeline: str, peertubeInstances: [], allow_local_network_access: bool, @@ -342,7 +342,7 @@ def htmlProfileAfterSearch(cssCache: {}, http_prefix, projectVersion, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, max_like_count, @@ -549,7 +549,7 @@ def htmlProfile(signingPrivateKeyPem: str, session, cachedWebfingers: {}, personCache: {}, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, theme: str, dormant_months: int, peertubeInstances: [], allow_local_network_access: bool, @@ -578,7 +578,7 @@ def htmlProfile(signingPrivateKeyPem: str, session, cachedWebfingers, personCache, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, theme, extraJson, allow_local_network_access, accessKeys, systemLanguage, max_like_count, @@ -960,7 +960,7 @@ def htmlProfile(signingPrivateKeyPem: str, projectVersion, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, theme, systemLanguage, @@ -1028,7 +1028,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -1073,7 +1073,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int, http_prefix, projectVersion, 'inbox', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, diff --git a/webapp_search.py b/webapp_search.py index 2bdad9624..653e9cb33 100644 --- a/webapp_search.py +++ b/webapp_search.py @@ -599,7 +599,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str, port: int, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, boxName: str, @@ -686,7 +686,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str, 'search', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, max_like_count, @@ -712,7 +712,7 @@ def htmlHashtagSearch(cssCache: {}, http_prefix: str, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, themeName: str, systemLanguage: str, @@ -869,7 +869,7 @@ def htmlHashtagSearch(cssCache: {}, 'search', yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, themeName, systemLanguage, max_like_count, diff --git a/webapp_timeline.py b/webapp_timeline.py index c5ae06da1..4fb750911 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -430,7 +430,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, moderator: bool, editor: bool, artist: bool, positiveVoting: bool, @@ -908,7 +908,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, boxName, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, peertubeInstances, allow_local_network_access, theme, systemLanguage, @@ -1128,7 +1128,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str, http_prefix: str, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1162,7 +1162,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str, False, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1186,7 +1186,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str, http_prefix: str, projectVersion: str, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1220,7 +1220,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str, False, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1245,7 +1245,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1279,7 +1279,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1304,7 +1304,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1338,7 +1338,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1362,7 +1362,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1390,7 +1390,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str, http_prefix, projectVersion, False, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1414,7 +1414,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1443,7 +1443,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1467,7 +1467,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1496,7 +1496,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1520,7 +1520,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1549,7 +1549,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1573,7 +1573,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1602,7 +1602,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, False, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1626,7 +1626,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, moderator: bool, editor: bool, artist: bool, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1654,7 +1654,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, moderator, editor, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header, @@ -1678,7 +1678,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str, minimal: bool, yt_replace_domain: str, twitterReplacementDomain: str, - showPublishedDateOnly: bool, + show_published_date_only: bool, newswire: {}, positiveVoting: bool, show_publish_as_icon: bool, full_width_tl_button_header: bool, @@ -1709,7 +1709,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str, manuallyApproveFollowers, minimal, yt_replace_domain, twitterReplacementDomain, - showPublishedDateOnly, + show_published_date_only, newswire, False, False, artist, positiveVoting, show_publish_as_icon, full_width_tl_button_header,