From e91cc35fd9adf9e9861bce3527f76b8912d8a42e Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 22 Apr 2021 18:05:10 +0100 Subject: [PATCH] Revert "Key access to individual timeline posts" This reverts commit a8063e1c0dd6a433d073d108886e6801e7a6f8fe. --- inbox.py | 2 +- webapp_confirm.py | 2 +- webapp_frontscreen.py | 2 +- webapp_post.py | 43 +++++++++++-------------------------------- webapp_profile.py | 4 ++-- webapp_search.py | 4 ++-- webapp_timeline.py | 5 ++--- 7 files changed, 20 insertions(+), 42 deletions(-) diff --git a/inbox.py b/inbox.py index 747f29936..da64d8f54 100644 --- a/inbox.py +++ b/inbox.py @@ -178,7 +178,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int, httpPrefix, __version__, boxname, None, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, not isDM(postJsonObject), True, True, False, True) diff --git a/webapp_confirm.py b/webapp_confirm.py index 7442fd6d2..346d94893 100644 --- a/webapp_confirm.py +++ b/webapp_confirm.py @@ -73,7 +73,7 @@ def htmlConfirmDelete(cssCache: {}, YTReplacementDomain, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, False, False, False, False, False) deletePostStr += '
' deletePostStr += \ diff --git a/webapp_frontscreen.py b/webapp_frontscreen.py index 2f725acee..0d3d18486 100644 --- a/webapp_frontscreen.py +++ b/webapp_frontscreen.py @@ -72,7 +72,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, False, False, False, True, False) if postStr: profileStr += postStr + separatorStr diff --git a/webapp_post.py b/webapp_post.py index 18ded1c34..4b6fdfba3 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -119,7 +119,7 @@ def prepareHtmlPostNickname(nickname: str, postHtml: str) -> str: def preparePostFromHtmlCache(nickname: str, postHtml: str, boxName: str, - pageNumber: int, accessKeyIndex: int) -> str: + pageNumber: int) -> str: """Sets the page number on a cached html post """ # if on the bookmarks timeline then remain there @@ -134,19 +134,6 @@ def preparePostFromHtmlCache(nickname: str, postHtml: str, boxName: str, withPageNumber = postHtml.replace(';-999;', ';' + str(pageNumber) + ';') withPageNumber = withPageNumber.replace('?page=-999', '?page=' + str(pageNumber)) - # replace the key shortcut - for keyIndex in range(10): - keyStr = 'accesskey="' + str(keyIndex) + '"' - if keyStr in withPageNumber: - if accessKeyIndex == 0 or accessKeyIndex > 9: - withPageNumber = \ - withPageNumber.replace(keyStr, '') - else: - withPageNumber = \ - withPageNumber.replace(keyStr, - 'accesskey="' + - str(accessKeyIndex) + '"') - break return prepareHtmlPostNickname(nickname, withPageNumber) @@ -192,8 +179,7 @@ def _getPostFromRecentCache(session, postStartTime, pageNumber: int, recentPostsCache: {}, - maxRecentPosts: int, - accessKeyIndex: int) -> str: + maxRecentPosts: int) -> str: """Attempts to get the html post from the recent posts cache in memory """ if boxName == 'tlmedia': @@ -231,8 +217,7 @@ def _getPostFromRecentCache(session, return None postHtml = \ - preparePostFromHtmlCache(nickname, postHtml, boxName, - pageNumber, accessKeyIndex) + preparePostFromHtmlCache(nickname, postHtml, boxName, pageNumber) updateRecentPostsCache(recentPostsCache, maxRecentPosts, postJsonObject, postHtml) _logPostTiming(enableTimingLog, postStartTime, '3') @@ -1155,7 +1140,7 @@ def individualPostAsHtml(allowDownloads: bool, showPublishedDateOnly: bool, peertubeInstances: [], allowLocalNetworkAccess: bool, - themeName: str, accessKeyIndex: int, + themeName: str, showRepeats=True, showIcons=False, manuallyApprovesFollowers=False, @@ -1214,8 +1199,7 @@ def individualPostAsHtml(allowDownloads: bool, postStartTime, pageNumber, recentPostsCache, - maxRecentPosts, - accessKeyIndex) + maxRecentPosts) if postHtml: return postHtml @@ -1668,13 +1652,8 @@ def individualPostAsHtml(allowDownloads: bool, postHtml = '' if boxName != 'tlmedia': - if accessKeyIndex > 0 and accessKeyIndex <= 9: - postHtml = '
\n' - else: - postHtml = '
\n' + postHtml = '
\n' postHtml += avatarImageInPost postHtml += '
\n' + \ ' ' + titleStr + \ @@ -1753,7 +1732,7 @@ def htmlIndividualPost(cssCache: {}, YTReplacementDomain, showPublishedDateOnly, peertubeInstances, - allowLocalNetworkAccess, themeName, 0, + allowLocalNetworkAccess, themeName, False, authorized, False, False, False) messageId = removeIdEnding(postJsonObject['id']) @@ -1781,7 +1760,7 @@ def htmlIndividualPost(cssCache: {}, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, False, authorized, False, False, False) + postStr @@ -1812,7 +1791,7 @@ def htmlIndividualPost(cssCache: {}, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, False, authorized, False, False, False) cssFilename = baseDir + '/epicyon-profile.css' @@ -1854,7 +1833,7 @@ def htmlPostReplies(cssCache: {}, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, False, False, False, False, False) cssFilename = baseDir + '/epicyon-profile.css' diff --git a/webapp_profile.py b/webapp_profile.py index 9203445b1..c9112ae98 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -309,7 +309,7 @@ def htmlProfileAfterSearch(cssCache: {}, YTReplacementDomain, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, False, False, False, False, False) i += 1 if i >= 20: @@ -916,7 +916,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, False, False, False, True, False) if postStr: profileStr += postStr + separatorStr diff --git a/webapp_search.py b/webapp_search.py index ec81d78cf..048ba1647 100644 --- a/webapp_search.py +++ b/webapp_search.py @@ -609,7 +609,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, baseDir: str, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, showIndividualPostIcons, showIndividualPostIcons, False, False, False) @@ -782,7 +782,7 @@ def htmlHashtagSearch(cssCache: {}, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - themeName, 0, + themeName, showRepeats, showIcons, manuallyApprovesFollowers, showPublicOnly, diff --git a/webapp_timeline.py b/webapp_timeline.py index 925ae1da3..2298dd019 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -697,8 +697,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, preparePostFromHtmlCache(nickname, currTlStr, boxName, - pageNumber, - itemCtr) + pageNumber) _logTimelineTiming(enableTimingLog, timelineStartTime, boxName, '10') @@ -727,7 +726,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, showPublishedDateOnly, peertubeInstances, allowLocalNetworkAccess, - theme, itemCtr + 1, + theme, boxName != 'dm', showIndividualPostIcons, manuallyApproveFollowers,