diff --git a/daemon.py b/daemon.py index c37895ed6..8448543dc 100644 --- a/daemon.py +++ b/daemon.py @@ -10176,7 +10176,7 @@ class PubServer(BaseHTTPRequestHandler): authorized, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if inboxFeed: if GETstartTime: fitnessPerformance(GETstartTime, @@ -10208,7 +10208,7 @@ class PubServer(BaseHTTPRequestHandler): authorized, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if GETstartTime: fitnessPerformance(GETstartTime, self.server.fitness, @@ -10334,7 +10334,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInFeed, 'dm', authorized, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if inboxDMFeed: if self._requestHTTP(): nickname = path.replace('/users/', '') @@ -10361,7 +10361,7 @@ class PubServer(BaseHTTPRequestHandler): authorized, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) full_width_tl_button_header = \ self.server.full_width_tl_button_header minimalNick = isMinimal(base_dir, domain, nickname) @@ -10477,7 +10477,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInFeed, 'tlreplies', True, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if not inboxRepliesFeed: inboxRepliesFeed = [] if self._requestHTTP(): @@ -10504,7 +10504,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInFeed, 'tlreplies', True, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) full_width_tl_button_header = \ self.server.full_width_tl_button_header minimalNick = isMinimal(base_dir, domain, nickname) @@ -10620,7 +10620,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInMediaFeed, 'tlmedia', True, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if not inboxMediaFeed: inboxMediaFeed = [] if self._requestHTTP(): @@ -10647,7 +10647,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInMediaFeed, 'tlmedia', True, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) full_width_tl_button_header = \ self.server.full_width_tl_button_header minimalNick = isMinimal(base_dir, domain, nickname) @@ -10762,7 +10762,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInBlogsFeed, 'tlblogs', True, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if not inboxBlogsFeed: inboxBlogsFeed = [] if self._requestHTTP(): @@ -10789,7 +10789,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInBlogsFeed, 'tlblogs', True, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) full_width_tl_button_header = \ self.server.full_width_tl_button_header minimalNick = isMinimal(base_dir, domain, nickname) @@ -10906,7 +10906,7 @@ class PubServer(BaseHTTPRequestHandler): True, self.server.newswireVotesThreshold, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if not inboxNewsFeed: inboxNewsFeed = [] if self._requestHTTP(): @@ -10934,7 +10934,7 @@ class PubServer(BaseHTTPRequestHandler): True, self.server.newswireVotesThreshold, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) currNickname = path.split('/users/')[1] if '/' in currNickname: currNickname = currNickname.split('/')[0] @@ -11057,7 +11057,7 @@ class PubServer(BaseHTTPRequestHandler): True, self.server.newswireVotesThreshold, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if not inboxFeaturesFeed: inboxFeaturesFeed = [] if self._requestHTTP(): @@ -11085,7 +11085,7 @@ class PubServer(BaseHTTPRequestHandler): True, self.server.newswireVotesThreshold, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) currNickname = path.split('/users/')[1] if '/' in currNickname: currNickname = currNickname.split('/')[0] @@ -11376,7 +11376,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInFeed, 'tlbookmarks', authorized, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if bookmarksFeed: if self._requestHTTP(): nickname = path.replace('/users/', '') @@ -11404,7 +11404,7 @@ class PubServer(BaseHTTPRequestHandler): 'tlbookmarks', authorized, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) full_width_tl_button_header = \ self.server.full_width_tl_button_header minimalNick = isMinimal(base_dir, domain, nickname) @@ -11516,7 +11516,7 @@ class PubServer(BaseHTTPRequestHandler): authorized, self.server.newswireVotesThreshold, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if outboxFeed: nickname = \ path.replace('/users/', '').replace('/outbox', '') @@ -11544,7 +11544,7 @@ class PubServer(BaseHTTPRequestHandler): authorized, self.server.newswireVotesThreshold, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) else: pageNumber = 1 @@ -11647,7 +11647,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInFeed, 'moderation', True, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) if moderationFeed: if self._requestHTTP(): nickname = path.replace('/users/', '') @@ -11673,7 +11673,7 @@ class PubServer(BaseHTTPRequestHandler): maxPostsInFeed, 'moderation', True, 0, self.server.positiveVoting, - self.server.votingTimeMins) + self.server.voting_time_mins) full_width_tl_button_header = \ self.server.full_width_tl_button_header moderationActionStr = '' @@ -18446,7 +18446,7 @@ def runDaemon(content_license_url: str, max_newswire_feed_size_kb: int, max_newswire_postsPerSource: int, show_published_date_only: bool, - votingTimeMins: int, + voting_time_mins: int, positiveVoting: bool, newswireVotesThreshold: int, newsInstance: bool, @@ -18629,7 +18629,7 @@ def runDaemon(content_license_url: str, # For moderated newswire feeds this is the amount of time allowed # for voting after the post arrives - httpd.votingTimeMins = votingTimeMins + httpd.voting_time_mins = voting_time_mins # on the newswire, whether moderators vote positively for items # or against them (veto) httpd.positiveVoting = positiveVoting diff --git a/person.py b/person.py index 9331b69de..d659c6436 100644 --- a/person.py +++ b/person.py @@ -900,7 +900,7 @@ def personBoxJson(recentPostsCache: {}, http_prefix: str, noOfItems: int, boxname: str, authorized: bool, newswireVotesThreshold: int, positiveVoting: bool, - votingTimeMins: int) -> {}: + voting_time_mins: int) -> {}: """Obtain the inbox/outbox/moderation feed for the given person """ if boxname != 'inbox' and boxname != 'dm' and \ @@ -974,7 +974,7 @@ def personBoxJson(recentPostsCache: {}, return createNewsTimeline(session, base_dir, nickname, domain, port, http_prefix, noOfItems, headerOnly, newswireVotesThreshold, positiveVoting, - votingTimeMins, pageNumber) + voting_time_mins, pageNumber) elif boxname == 'tlfeatures': return createFeaturesTimeline(session, base_dir, nickname, domain, port, diff --git a/posts.py b/posts.py index 23c68cf6b..4d426e7b4 100644 --- a/posts.py +++ b/posts.py @@ -3365,13 +3365,13 @@ def createMediaTimeline(session, base_dir: str, nickname: str, domain: str, def createNewsTimeline(session, base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, itemsPerPage: int, headerOnly: bool, newswireVotesThreshold: int, - positiveVoting: bool, votingTimeMins: int, + positiveVoting: bool, voting_time_mins: int, pageNumber: int) -> {}: return _createBoxIndexed({}, session, base_dir, 'outbox', 'news', domain, port, http_prefix, itemsPerPage, headerOnly, True, newswireVotesThreshold, positiveVoting, - votingTimeMins, pageNumber) + voting_time_mins, pageNumber) def createOutbox(session, base_dir: str, nickname: str, domain: str, @@ -3602,7 +3602,7 @@ def _passedNewswireVoting(newswireVotesThreshold: int, base_dir: str, domain: str, postFilename: str, positiveVoting: bool, - votingTimeMins: int) -> bool: + voting_time_mins: int) -> bool: """Returns true if the post has passed through newswire voting """ # apply votes within this timeline @@ -3619,7 +3619,7 @@ def _passedNewswireVoting(newswireVotesThreshold: int, timeDiffMins = \ int((currDate - arrivalDate).total_seconds() / 60) # has the voting time elapsed? - if timeDiffMins < votingTimeMins: + if timeDiffMins < voting_time_mins: # voting is still happening, so don't add this # post to the timeline return False @@ -3654,7 +3654,7 @@ def _createBoxIndexed(recentPostsCache: {}, nickname: str, domain: str, port: int, http_prefix: str, itemsPerPage: int, headerOnly: bool, authorized: bool, newswireVotesThreshold: int, positiveVoting: bool, - votingTimeMins: int, pageNumber: int) -> {}: + voting_time_mins: int, pageNumber: int) -> {}: """Constructs the box feed for a person with the given nickname """ if not authorized or not pageNumber: @@ -3736,7 +3736,7 @@ def _createBoxIndexed(recentPostsCache: {}, base_dir, domain, postFilename, positiveVoting, - votingTimeMins): + voting_time_mins): continue # Skip through any posts previous to the current page