From b280cf990fc16d0ba1e5a1c4db1591feb06b0460 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 31 Dec 2020 12:46:35 +0000 Subject: [PATCH] Change variable names to avoid confusion --- webapp_confirm.py | 4 +-- webapp_frontscreen.py | 9 +++--- webapp_post.py | 14 +++++---- webapp_profile.py | 24 ++++++++------- webapp_search.py | 10 +++--- webapp_timeline.py | 71 ++++++++++++++++++++++++++++--------------- 6 files changed, 80 insertions(+), 52 deletions(-) diff --git a/webapp_confirm.py b/webapp_confirm.py index 3649c256..bf6b564c 100644 --- a/webapp_confirm.py +++ b/webapp_confirm.py @@ -25,7 +25,7 @@ def htmlConfirmDelete(cssCache: {}, translate, pageNumber: int, session, baseDir: str, messageId: str, httpPrefix: str, projectVersion: str, - wfRequest: {}, personCache: {}, + cachedWebfingers: {}, personCache: {}, callingDomain: str, YTReplacementDomain: str, showPublishedDateOnly: bool, @@ -61,7 +61,7 @@ def htmlConfirmDelete(cssCache: {}, deletePostStr += \ individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, pageNumber, - baseDir, session, wfRequest, personCache, + baseDir, session, cachedWebfingers, personCache, nickname, domain, port, postJsonObject, None, True, False, httpPrefix, projectVersion, 'outbox', diff --git a/webapp_frontscreen.py b/webapp_frontscreen.py index ea26b4b4..adfb0b24 100644 --- a/webapp_frontscreen.py +++ b/webapp_frontscreen.py @@ -24,7 +24,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int, translate: {}, baseDir: str, httpPrefix: str, nickname: str, domain: str, port: int, - session, wfRequest: {}, personCache: {}, + session, cachedWebfingers: {}, personCache: {}, projectVersion: str, YTReplacementDomain: str, showPublishedDateOnly: bool, @@ -59,7 +59,8 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int, individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, None, - baseDir, session, wfRequest, + baseDir, session, + cachedWebfingers, personCache, nickname, domain, port, item, None, True, False, @@ -84,7 +85,7 @@ def htmlFrontScreen(rssIconAtTop: bool, translate: {}, projectVersion: str, baseDir: str, httpPrefix: str, authorized: bool, profileJson: {}, selected: str, - session, wfRequest: {}, personCache: {}, + session, cachedWebfingers: {}, personCache: {}, YTReplacementDomain: str, showPublishedDateOnly: bool, newswire: {}, theme: str, @@ -149,7 +150,7 @@ def htmlFrontScreen(rssIconAtTop: bool, translate, baseDir, httpPrefix, nickname, domain, port, - session, wfRequest, personCache, + session, cachedWebfingers, personCache, projectVersion, YTReplacementDomain, showPublishedDateOnly, diff --git a/webapp_post.py b/webapp_post.py index 09e7d29d..136adfc7 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -1580,7 +1580,8 @@ def individualPostAsHtml(allowDownloads: bool, def htmlIndividualPost(cssCache: {}, recentPostsCache: {}, maxRecentPosts: int, translate: {}, - baseDir: str, session, wfRequest: {}, personCache: {}, + baseDir: str, session, cachedWebfingers: {}, + personCache: {}, nickname: str, domain: str, port: int, authorized: bool, postJsonObject: {}, httpPrefix: str, projectVersion: str, likedBy: str, @@ -1620,7 +1621,7 @@ def htmlIndividualPost(cssCache: {}, postStr += \ individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, None, - baseDir, session, wfRequest, personCache, + baseDir, session, cachedWebfingers, personCache, nickname, domain, port, postJsonObject, None, True, False, httpPrefix, projectVersion, 'inbox', @@ -1644,7 +1645,7 @@ def htmlIndividualPost(cssCache: {}, individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, None, - baseDir, session, wfRequest, + baseDir, session, cachedWebfingers, personCache, nickname, domain, port, postJsonObject, @@ -1674,7 +1675,7 @@ def htmlIndividualPost(cssCache: {}, individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, None, - baseDir, session, wfRequest, + baseDir, session, cachedWebfingers, personCache, nickname, domain, port, item, None, True, False, @@ -1694,7 +1695,7 @@ def htmlIndividualPost(cssCache: {}, def htmlPostReplies(cssCache: {}, recentPostsCache: {}, maxRecentPosts: int, translate: {}, baseDir: str, - session, wfRequest: {}, personCache: {}, + session, cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, repliesJson: {}, httpPrefix: str, projectVersion: str, YTReplacementDomain: str, @@ -1709,7 +1710,8 @@ def htmlPostReplies(cssCache: {}, individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, None, - baseDir, session, wfRequest, personCache, + baseDir, session, cachedWebfingers, + personCache, nickname, domain, port, item, None, True, False, httpPrefix, projectVersion, 'inbox', diff --git a/webapp_profile.py b/webapp_profile.py index 03763ab9..4d6e2170 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -359,7 +359,7 @@ def htmlProfile(rssIconAtTop: bool, translate: {}, projectVersion: str, baseDir: str, httpPrefix: str, authorized: bool, profileJson: {}, selected: str, - session, wfRequest: {}, personCache: {}, + session, cachedWebfingers: {}, personCache: {}, YTReplacementDomain: str, showPublishedDateOnly: bool, newswire: {}, theme: str, dormantMonths: int, @@ -379,7 +379,7 @@ def htmlProfile(rssIconAtTop: bool, translate, projectVersion, baseDir, httpPrefix, authorized, profileJson, selected, - session, wfRequest, personCache, + session, cachedWebfingers, personCache, YTReplacementDomain, showPublishedDateOnly, newswire, theme, extraJson, @@ -628,7 +628,7 @@ def htmlProfile(rssIconAtTop: bool, translate, baseDir, httpPrefix, authorized, nickname, domain, port, - session, wfRequest, personCache, + session, cachedWebfingers, personCache, projectVersion, YTReplacementDomain, showPublishedDateOnly, @@ -638,7 +638,7 @@ def htmlProfile(rssIconAtTop: bool, _htmlProfileFollowing(translate, baseDir, httpPrefix, authorized, nickname, domain, port, session, - wfRequest, personCache, extraJson, + cachedWebfingers, personCache, extraJson, projectVersion, ["unfollow"], selected, usersPath, pageNumber, maxItemsPerPage, dormantMonths) @@ -647,7 +647,7 @@ def htmlProfile(rssIconAtTop: bool, _htmlProfileFollowing(translate, baseDir, httpPrefix, authorized, nickname, domain, port, session, - wfRequest, personCache, extraJson, + cachedWebfingers, personCache, extraJson, projectVersion, ["block"], selected, usersPath, pageNumber, maxItemsPerPage, dormantMonths) @@ -675,7 +675,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int, baseDir: str, httpPrefix: str, authorized: bool, nickname: str, domain: str, port: int, - session, wfRequest: {}, personCache: {}, + session, cachedWebfingers: {}, personCache: {}, projectVersion: str, YTReplacementDomain: str, showPublishedDateOnly: bool, @@ -710,7 +710,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int, individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, None, - baseDir, session, wfRequest, + baseDir, session, cachedWebfingers, personCache, nickname, domain, port, item, None, True, False, @@ -731,7 +731,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int, def _htmlProfileFollowing(translate: {}, baseDir: str, httpPrefix: str, authorized: bool, nickname: str, domain: str, port: int, - session, wfRequest: {}, personCache: {}, + session, cachedWebfingers: {}, personCache: {}, followingJson: {}, projectVersion: str, buttons: [], feedName: str, actor: str, @@ -765,7 +765,7 @@ def _htmlProfileFollowing(translate: {}, baseDir: str, httpPrefix: str, profileStr += \ _individualFollowAsHtml(translate, baseDir, session, - wfRequest, personCache, + cachedWebfingers, personCache, domain, followingActor, authorized, nickname, httpPrefix, projectVersion, dormant, @@ -1483,7 +1483,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, def _individualFollowAsHtml(translate: {}, - baseDir: str, session, wfRequest: {}, + baseDir: str, session, + cachedWebfingers: {}, personCache: {}, domain: str, followUrl: str, authorized: bool, @@ -1505,7 +1506,8 @@ def _individualFollowAsHtml(translate: {}, if domain not in followUrl: (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, - avatarUrl2, displayName) = getPersonBox(baseDir, session, wfRequest, + avatarUrl2, displayName) = getPersonBox(baseDir, session, + cachedWebfingers, personCache, projectVersion, httpPrefix, nickname, domain, 'outbox', 43036) diff --git a/webapp_search.py b/webapp_search.py index 46d2f5f8..12672205 100644 --- a/webapp_search.py +++ b/webapp_search.py @@ -504,7 +504,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, baseDir: str, recentPostsCache: {}, maxRecentPosts: int, session, - wfRequest, + cachedWebfingers, personCache: {}, port: int, YTReplacementDomain: str, @@ -573,7 +573,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, baseDir: str, individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, None, - baseDir, session, wfRequest, + baseDir, session, cachedWebfingers, personCache, nickname, domain, port, postJsonObject, @@ -600,7 +600,7 @@ def htmlHashtagSearch(cssCache: {}, translate: {}, baseDir: str, hashtag: str, pageNumber: int, postsPerPage: int, - session, wfRequest: {}, personCache: {}, + session, cachedWebfingers: {}, personCache: {}, httpPrefix: str, projectVersion: str, YTReplacementDomain: str, showPublishedDateOnly: bool, @@ -740,7 +740,7 @@ def htmlHashtagSearch(cssCache: {}, individualPostAsHtml(allowDownloads, recentPostsCache, maxRecentPosts, translate, None, - baseDir, session, wfRequest, + baseDir, session, cachedWebfingers, personCache, nickname, domain, port, postJsonObject, @@ -778,7 +778,7 @@ def rssHashtagSearch(nickname: str, domain: str, port: int, translate: {}, baseDir: str, hashtag: str, postsPerPage: int, - session, wfRequest: {}, personCache: {}, + session, cachedWebfingers: {}, personCache: {}, httpPrefix: str, projectVersion: str, YTReplacementDomain: str) -> str: """Show an rss feed for a hashtag diff --git a/webapp_timeline.py b/webapp_timeline.py index e5c5dc83..e00afa94 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -43,7 +43,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, session, baseDir: str, - wfRequest: {}, personCache: {}, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, timelineJson: {}, boxName: str, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -560,7 +560,8 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, individualPostAsHtml(False, recentPostsCache, maxRecentPosts, translate, pageNumber, - baseDir, session, wfRequest, + baseDir, session, + cachedWebfingers, personCache, nickname, domain, port, item, None, True, @@ -712,7 +713,8 @@ def _htmlSharesTimeline(translate: {}, pageNumber: int, itemsPerPage: int, def htmlShares(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -734,7 +736,8 @@ def htmlShares(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, None, 'tlshares', allowDeletion, httpPrefix, projectVersion, manuallyApproveFollowers, @@ -750,7 +753,8 @@ def htmlShares(cssCache: {}, defaultTimeline: str, def htmlInbox(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, inboxJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -772,7 +776,8 @@ def htmlInbox(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, inboxJson, 'inbox', allowDeletion, httpPrefix, projectVersion, manuallyApproveFollowers, @@ -788,7 +793,8 @@ def htmlInbox(cssCache: {}, defaultTimeline: str, def htmlBookmarks(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, bookmarksJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -810,7 +816,8 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, bookmarksJson, 'tlbookmarks', allowDeletion, httpPrefix, projectVersion, manuallyApproveFollowers, @@ -826,7 +833,8 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str, def htmlEvents(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, bookmarksJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -848,7 +856,8 @@ def htmlEvents(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, bookmarksJson, 'tlevents', allowDeletion, httpPrefix, projectVersion, manuallyApproveFollowers, @@ -864,7 +873,8 @@ def htmlEvents(cssCache: {}, defaultTimeline: str, def htmlInboxDMs(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, inboxJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -883,7 +893,8 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, inboxJson, 'dm', allowDeletion, httpPrefix, projectVersion, False, minimal, YTReplacementDomain, showPublishedDateOnly, @@ -897,7 +908,8 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str, def htmlInboxReplies(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, inboxJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -916,7 +928,8 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, inboxJson, 'tlreplies', allowDeletion, httpPrefix, projectVersion, False, minimal, YTReplacementDomain, @@ -931,7 +944,8 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str, def htmlInboxMedia(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, inboxJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -950,7 +964,8 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, inboxJson, 'tlmedia', allowDeletion, httpPrefix, projectVersion, False, minimal, YTReplacementDomain, @@ -965,7 +980,8 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str, def htmlInboxBlogs(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, inboxJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -984,7 +1000,8 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, inboxJson, 'tlblogs', allowDeletion, httpPrefix, projectVersion, False, minimal, YTReplacementDomain, @@ -999,7 +1016,8 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str, def htmlInboxFeatures(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, inboxJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -1019,7 +1037,8 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, inboxJson, 'tlfeatures', allowDeletion, httpPrefix, projectVersion, False, minimal, YTReplacementDomain, @@ -1034,7 +1053,8 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str, def htmlInboxNews(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, inboxJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -1053,7 +1073,8 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, inboxJson, 'tlnews', allowDeletion, httpPrefix, projectVersion, False, minimal, YTReplacementDomain, @@ -1068,7 +1089,8 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str, def htmlOutbox(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, itemsPerPage: int, - session, baseDir: str, wfRequest: {}, personCache: {}, + session, baseDir: str, + cachedWebfingers: {}, personCache: {}, nickname: str, domain: str, port: int, outboxJson: {}, allowDeletion: bool, httpPrefix: str, projectVersion: str, @@ -1089,7 +1111,8 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str, return htmlTimeline(cssCache, defaultTimeline, recentPostsCache, maxRecentPosts, translate, pageNumber, - itemsPerPage, session, baseDir, wfRequest, personCache, + itemsPerPage, session, baseDir, + cachedWebfingers, personCache, nickname, domain, port, outboxJson, 'outbox', allowDeletion, httpPrefix, projectVersion, manuallyApproveFollowers, minimal,