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

Maximum likes displayed on posts is configurable

merge-requests/22/merge
Bob Mottram 2021-08-03 11:04:45 +01:00
parent d0c4bc1cfa
commit af9a6cc6d1
11 changed files with 142 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
daemon.py
View File

@ -2928,7 +2928,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.themeName,
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
if hashtagStr:
msg = hashtagStr.encode('utf-8')
msglen = len(msg)
@ -2983,7 +2984,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.themeName, 'outbox',
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
if historyStr:
msg = historyStr.encode('utf-8')
msglen = len(msg)
@ -3018,7 +3020,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.themeName, 'bookmarks',
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
if bookmarksStr:
msg = bookmarksStr.encode('utf-8')
msglen = len(msg)
@ -3113,7 +3116,8 @@ class PubServer(BaseHTTPRequestHandler):
allowLocalNetworkAccess,
self.server.themeName,
accessKeys,
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
if profileStr:
msg = profileStr.encode('utf-8')
msglen = len(msg)
@ -6347,7 +6351,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.themeName,
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
if hashtagStr:
msg = hashtagStr.encode('utf-8')
msglen = len(msg)
@ -7289,7 +7294,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.themeName,
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
if deleteStr:
deleteStrLen = len(deleteStr)
self._set_headers('text/html', deleteStrLen,
@ -7498,7 +7504,8 @@ class PubServer(BaseHTTPRequestHandler):
peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.themeName,
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
msg = msg.encode('utf-8')
msglen = len(msg)
self._set_headers('text/html', msglen,
@ -7587,7 +7594,8 @@ class PubServer(BaseHTTPRequestHandler):
peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.themeName,
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
msg = msg.encode('utf-8')
msglen = len(msg)
self._set_headers('text/html', msglen,
@ -7687,6 +7695,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug,
accessKeys, city,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains,
rolesList,
None, None)
@ -7790,6 +7799,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug,
accessKeys, city,
self.server.systemLanguage,
self.server.maxLikeCount,
sharedItemsFederatedDomains,
skills,
None, None)
@ -7925,7 +7935,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.themeName,
self.server.systemLanguage)
self.server.systemLanguage,
self.server.maxLikeCount)
msg = msg.encode('utf-8')
msglen = len(msg)
self._set_headers('text/html', msglen,
@ -8138,6 +8149,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
sharedItemsFederatedDomains)
if GETstartTime:
self._benchmarkGETtimings(GETstartTime, GETtimings,
@ -8278,6 +8290,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -8411,6 +8424,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -8543,6 +8557,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -8675,6 +8690,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -8816,6 +8832,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -8955,6 +8972,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -9053,6 +9071,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -9170,6 +9189,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -9299,6 +9319,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -9418,6 +9439,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.textModeBanner,
accessKeys,
self.server.systemLanguage,
self.server.maxLikeCount,
sharedItemsFederatedDomains)
msg = msg.encode('utf-8')
msglen = len(msg)
@ -9535,6 +9557,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug,
accessKeys, city,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains,
shares,
pageNumber, sharesPerPage)
@ -9650,6 +9673,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug,
accessKeys, city,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains,
following,
pageNumber,
@ -9765,6 +9789,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug,
accessKeys, city,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains,
followers,
pageNumber,
@ -9903,6 +9928,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug,
accessKeys, city,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.sharedItemsFederatedDomains,
None, None).encode('utf-8')
msglen = len(msg)
@ -14993,7 +15019,8 @@ def loadTokens(baseDir: str, tokensDict: {}, tokensLookup: {}) -> None:
break
def runDaemon(sharedItemsFederatedDomains: [],
def runDaemon(maxLikeCount: int,
sharedItemsFederatedDomains: [],
userAgentsBlocked: [],
logLoginFailures: bool,
city: str,
@ -15232,6 +15259,13 @@ def runDaemon(sharedItemsFederatedDomains: [],
# for it to be considered dormant?
httpd.dormantMonths = dormantMonths
# maximum number of likes to display on a post
httpd.maxLikeCount = maxLikeCount
if httpd.maxLikeCount < 0:
httpd.maxLikeCount = 0
elif httpd.maxLikeCount > 99:
httpd.maxLikeCount = 99
httpd.followingItemsPerPage = 12
if registration == 'open':
httpd.registration = True
@ -15434,7 +15468,8 @@ def runDaemon(sharedItemsFederatedDomains: [],
httpd.peertubeInstances,
verifyAllSignatures,
httpd.themeName,
httpd.systemLanguage), daemon=True)
httpd.systemLanguage,
httpd.maxLikeCount), daemon=True)
print('Creating scheduled post thread')
httpd.thrPostSchedule = \

11
epicyon.py
View File

@ -449,6 +449,9 @@ parser.add_argument('--minimumvotes', dest='minimumvotes', type=int,
default=1,
help='Minimum number of votes to remove or add' +
' a newswire item')
parser.add_argument('--maxLikeCount', dest='maxLikeCount', type=int,
default=10,
help='Maximum number of likes displayed on a post')
parser.add_argument('--votingtime', dest='votingtime', type=int,
default=1440,
help='Time to vote on newswire items in minutes')
@ -2584,6 +2587,11 @@ sendThreadsTimeoutMins = \
if sendThreadsTimeoutMins is not None:
args.sendThreadsTimeoutMins = int(sendThreadsTimeoutMins)
maxLikeCount = \
getConfigParam(baseDir, 'maxLikeCount')
if maxLikeCount is not None:
args.maxLikeCount = int(maxLikeCount)
showPublishAsIcon = \
getConfigParam(baseDir, 'showPublishAsIcon')
if showPublishAsIcon is not None:
@ -2687,7 +2695,8 @@ if args.registration:
print('New registrations closed')
if __name__ == "__main__":
runDaemon(sharedItemsFederatedDomains,
runDaemon(args.maxLikeCount,
sharedItemsFederatedDomains,
userAgentsBlocked,
args.logLoginFailures,
args.city,

17
inbox.py
View File

@ -167,7 +167,8 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
showPublishedDateOnly: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str) -> None:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> None:
"""Converts the json post into html and stores it in a cache
This enables the post to be quickly displayed later
"""
@ -185,7 +186,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
httpPrefix, __version__, boxname, None,
showPublishedDateOnly,
peertubeInstances, allowLocalNetworkAccess,
themeName, systemLanguage,
themeName, systemLanguage, maxLikeCount,
not isDM(postJsonObject),
True, True, False, True)
@ -2246,7 +2247,8 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
allowLocalNetworkAccess: bool,
peertubeInstances: [],
lastBounceMessage: [],
themeName: str, systemLanguage: str) -> bool:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> bool:
""" Anything which needs to be done after initial checks have passed
"""
actor = keyId
@ -2572,7 +2574,8 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage)
themeName, systemLanguage,
maxLikeCount)
if debug:
timeDiff = \
str(int((time.time() - htmlCacheStartTime) *
@ -2832,7 +2835,8 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
maxFollowers: int, allowLocalNetworkAccess: bool,
peertubeInstances: [],
verifyAllSignatures: bool,
themeName: str, systemLanguage: str) -> None:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> None:
"""Processes received items and moves them to the appropriate
directories
"""
@ -3220,7 +3224,8 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
allowLocalNetworkAccess,
peertubeInstances,
lastBounceMessage,
themeName, systemLanguage)
themeName, systemLanguage,
maxLikeCount)
if debug:
pprint(queueJson['post'])
print('Queue: Queue post accepted')

16
tests.py
View File

@ -568,8 +568,10 @@ def createServerAlice(path: str, domain: str, port: int,
city = 'London, England'
logLoginFailures = False
userAgentsBlocked = []
maxLikeCount = 10
print('Server running: Alice')
runDaemon(sharedItemsFederatedDomains,
runDaemon(maxLikeCount,
sharedItemsFederatedDomains,
userAgentsBlocked,
logLoginFailures, city,
showNodeInfoAccounts,
@ -697,8 +699,10 @@ def createServerBob(path: str, domain: str, port: int,
city = 'London, England'
logLoginFailures = False
userAgentsBlocked = []
maxLikeCount = 10
print('Server running: Bob')
runDaemon(sharedItemsFederatedDomains,
runDaemon(maxLikeCount,
sharedItemsFederatedDomains,
userAgentsBlocked,
logLoginFailures, city,
showNodeInfoAccounts,
@ -759,8 +763,10 @@ def createServerEve(path: str, domain: str, port: int, federationList: [],
city = 'London, England'
logLoginFailures = False
userAgentsBlocked = []
maxLikeCount = 10
print('Server running: Eve')
runDaemon(sharedItemsFederatedDomains,
runDaemon(maxLikeCount,
sharedItemsFederatedDomains,
userAgentsBlocked,
logLoginFailures, city,
showNodeInfoAccounts,
@ -823,8 +829,10 @@ def createServerGroup(path: str, domain: str, port: int,
city = 'London, England'
logLoginFailures = False
userAgentsBlocked = []
maxLikeCount = 10
print('Server running: Group')
runDaemon(sharedItemsFederatedDomains,
runDaemon(maxLikeCount,
sharedItemsFederatedDomains,
userAgentsBlocked,
logLoginFailures, city,
showNodeInfoAccounts,

5
webapp_confirm.py
View File

@ -33,7 +33,8 @@ def htmlConfirmDelete(cssCache: {},
showPublishedDateOnly: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str) -> str:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> str:
"""Shows a screen asking to confirm the deletion of a post
"""
if '/statuses/' not in messageId:
@ -74,7 +75,7 @@ def htmlConfirmDelete(cssCache: {},
YTReplacementDomain,
showPublishedDateOnly,
peertubeInstances, allowLocalNetworkAccess,
themeName, systemLanguage,
themeName, systemLanguage, maxLikeCount,
False, False, False, False, False)
deletePostStr += '<center>'
deletePostStr += \

9
webapp_frontscreen.py
View File

@ -32,7 +32,8 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int,
showPublishedDateOnly: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str) -> str:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> str:
"""Shows posts on the front screen of a news instance
These should only be public blog posts from the features timeline
which is the blog timeline of the news actor
@ -74,6 +75,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int,
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
maxLikeCount,
False, False, False, True, False)
if postStr:
profileStr += postStr + separatorStr
@ -98,7 +100,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
accessKeys: {},
systemLanguage: str,
systemLanguage: str, maxLikeCount: int,
sharedItemsFederatedDomains: [],
extraJson: {} = None,
pageNumber: int = None,
@ -170,7 +172,8 @@ def htmlFrontScreen(rssIconAtTop: bool,
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
theme, systemLanguage) + licenseStr
theme, systemLanguage,
maxLikeCount) + licenseStr
# Footer which is only used for system accounts
profileFooterStr = ' </td>\n'

3
webapp_moderation.py
View File

@ -48,6 +48,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the moderation feed as html
This is what you see when selecting the "mod" timeline
@ -65,7 +66,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
authorized, moderationActionStr, theme,
peertubeInstances, allowLocalNetworkAccess,
textModeBanner, accessKeys, systemLanguage,
sharedItemsFederatedDomains)
maxLikeCount, sharedItemsFederatedDomains)
def htmlAccountInfo(cssCache: {}, translate: {},

21
webapp_post.py
View File

@ -460,7 +460,8 @@ def _getLikeIconHtml(nickname: str, domainFull: str,
postStartTime,
translate: {}, pageNumberParam: str,
timelinePostBookmark: str,
boxName: str) -> str:
boxName: str,
maxLikeCount: int) -> str:
"""Returns html for like icon/button
"""
likeStr = ''
@ -475,10 +476,10 @@ def _getLikeIconHtml(nickname: str, domainFull: str,
likeCountStr = ''
if likeCount > 0:
if likeCount <= 10:
if likeCount <= maxLikeCount:
likeCountStr = ' (' + str(likeCount) + ')'
else:
likeCountStr = ' (10+)'
likeCountStr = ' (' + str(maxLikeCount) + '+)'
if likedByPerson(postJsonObject, nickname, domainFull):
if likeCount == 1:
# liked by the reader only
@ -1101,6 +1102,7 @@ def individualPostAsHtml(allowDownloads: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str,
maxLikeCount: int,
showRepeats: bool = True,
showIcons: bool = False,
manuallyApprovesFollowers: bool = False,
@ -1392,7 +1394,7 @@ def individualPostAsHtml(allowDownloads: bool,
postStartTime,
translate, pageNumberParam,
timelinePostBookmark,
boxName)
boxName, maxLikeCount)
_logPostTiming(enableTimingLog, postStartTime, '12.5')
@ -1673,7 +1675,8 @@ def htmlIndividualPost(cssCache: {},
showPublishedDateOnly: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str) -> str:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> str:
"""Show an individual post as html
"""
postStr = ''
@ -1715,7 +1718,7 @@ def htmlIndividualPost(cssCache: {},
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess, themeName,
systemLanguage,
systemLanguage, maxLikeCount,
False, authorized, False, False, False)
messageId = removeIdEnding(postJsonObject['id'])
@ -1744,6 +1747,7 @@ def htmlIndividualPost(cssCache: {},
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
maxLikeCount,
False, authorized,
False, False, False) + postStr
@ -1775,6 +1779,7 @@ def htmlIndividualPost(cssCache: {},
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
maxLikeCount,
False, authorized,
False, False, False)
cssFilename = baseDir + '/epicyon-profile.css'
@ -1797,7 +1802,8 @@ def htmlPostReplies(cssCache: {},
showPublishedDateOnly: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str) -> str:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> str:
"""Show the replies to an individual post as html
"""
repliesStr = ''
@ -1817,6 +1823,7 @@ def htmlPostReplies(cssCache: {},
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
maxLikeCount,
False, False, False, False, False)
cssFilename = baseDir + '/epicyon-profile.css'

16
webapp_profile.py
View File

@ -80,7 +80,8 @@ def htmlProfileAfterSearch(cssCache: {},
allowLocalNetworkAccess: bool,
themeName: str,
accessKeys: {},
systemLanguage: str) -> str:
systemLanguage: str,
maxLikeCount: int) -> str:
"""Show a profile page after a search for a fediverse address
"""
http = False
@ -272,7 +273,7 @@ def htmlProfileAfterSearch(cssCache: {},
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
themeName, systemLanguage, maxLikeCount,
False, False, False, False, False)
i += 1
if i >= 20:
@ -475,7 +476,7 @@ def htmlProfile(rssIconAtTop: bool,
allowLocalNetworkAccess: bool,
textModeBanner: str,
debug: bool, accessKeys: {}, city: str,
systemLanguage: str,
systemLanguage: str, maxLikeCount: int,
sharedItemsFederatedDomains: [],
extraJson: {} = None, pageNumber: int = None,
maxItemsPerPage: int = None) -> str:
@ -497,7 +498,7 @@ def htmlProfile(rssIconAtTop: bool,
showPublishedDateOnly,
newswire, theme, extraJson,
allowLocalNetworkAccess, accessKeys,
systemLanguage,
systemLanguage, maxLikeCount,
sharedItemsFederatedDomains,
pageNumber, maxItemsPerPage)
@ -828,7 +829,8 @@ def htmlProfile(rssIconAtTop: bool,
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
theme, systemLanguage) + licenseStr
theme, systemLanguage,
maxLikeCount) + licenseStr
elif selected == 'following':
profileStr += \
_htmlProfileFollowing(translate, baseDir, httpPrefix,
@ -882,7 +884,8 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int,
showPublishedDateOnly: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str) -> str:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> str:
"""Shows posts on the profile screen
These should only be public posts
"""
@ -923,6 +926,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int,
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
maxLikeCount,
False, False, False, True, False)
if postStr:
profileStr += postStr + separatorStr

10
webapp_search.py
View File

@ -567,7 +567,8 @@ def htmlHistorySearch(cssCache: {}, translate: {}, baseDir: str,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, boxName: str,
systemLanguage: str) -> str:
systemLanguage: str,
maxLikeCount: int) -> str:
"""Show a page containing search results for your post history
"""
if historysearch.startswith("'"):
@ -647,7 +648,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, baseDir: str,
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
themeName, systemLanguage, maxLikeCount,
showIndividualPostIcons,
showIndividualPostIcons,
False, False, False)
@ -671,7 +672,8 @@ def htmlHashtagSearch(cssCache: {},
showPublishedDateOnly: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
themeName: str, systemLanguage: str) -> str:
themeName: str, systemLanguage: str,
maxLikeCount: int) -> str:
"""Show a page containing search results for a hashtag
or after selecting a hashtag from the swarm
"""
@ -822,7 +824,7 @@ def htmlHashtagSearch(cssCache: {},
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
themeName, systemLanguage, maxLikeCount,
showRepeats, showIcons,
manuallyApprovesFollowers,
showPublicOnly,

32
webapp_timeline.py
View File

@ -400,6 +400,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the timeline as html
"""
@ -804,6 +805,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
peertubeInstances,
allowLocalNetworkAccess,
theme, systemLanguage,
maxLikeCount,
boxName != 'dm',
showIndividualPostIcons,
manuallyApproveFollowers,
@ -998,6 +1000,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the shares timeline as html
"""
@ -1020,7 +1023,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1045,6 +1048,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the inbox as html
"""
@ -1067,7 +1071,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1092,6 +1096,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the bookmarks as html
"""
@ -1114,7 +1119,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1139,6 +1144,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the DM timeline as html
"""
@ -1156,7 +1162,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1181,6 +1187,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the replies timeline as html
"""
@ -1199,7 +1206,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1224,6 +1231,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the media timeline as html
"""
@ -1242,7 +1250,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1267,6 +1275,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the blogs timeline as html
"""
@ -1285,7 +1294,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1311,6 +1320,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the features timeline as html
"""
@ -1329,7 +1339,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1354,6 +1364,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the news timeline as html
"""
@ -1372,7 +1383,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)
@ -1397,6 +1408,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
allowLocalNetworkAccess: bool,
textModeBanner: str,
accessKeys: {}, systemLanguage: str,
maxLikeCount: int,
sharedItemsFederatedDomains: []) -> str:
"""Show the Outbox as html
"""
@ -1416,5 +1428,5 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner,
accessKeys, systemLanguage,
accessKeys, systemLanguage, maxLikeCount,
sharedItemsFederatedDomains)