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

Snake case

merge-requests/30/head
Bob Mottram 2021-12-25 20:12:07 +00:00
parent 9b9726a417
commit 025178849c
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
daemon.py
View File

@ -10176,7 +10176,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
0, 0,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if inboxFeed: if inboxFeed:
if GETstartTime: if GETstartTime:
fitnessPerformance(GETstartTime, fitnessPerformance(GETstartTime,
@ -10208,7 +10208,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
0, 0,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if GETstartTime: if GETstartTime:
fitnessPerformance(GETstartTime, fitnessPerformance(GETstartTime,
self.server.fitness, self.server.fitness,
@ -10334,7 +10334,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInFeed, 'dm', maxPostsInFeed, 'dm',
authorized, authorized,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if inboxDMFeed: if inboxDMFeed:
if self._requestHTTP(): if self._requestHTTP():
nickname = path.replace('/users/', '') nickname = path.replace('/users/', '')
@ -10361,7 +10361,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
0, 0,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
full_width_tl_button_header = \ full_width_tl_button_header = \
self.server.full_width_tl_button_header self.server.full_width_tl_button_header
minimalNick = isMinimal(base_dir, domain, nickname) minimalNick = isMinimal(base_dir, domain, nickname)
@ -10477,7 +10477,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInFeed, 'tlreplies', maxPostsInFeed, 'tlreplies',
True, True,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if not inboxRepliesFeed: if not inboxRepliesFeed:
inboxRepliesFeed = [] inboxRepliesFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -10504,7 +10504,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInFeed, 'tlreplies', maxPostsInFeed, 'tlreplies',
True, True,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
full_width_tl_button_header = \ full_width_tl_button_header = \
self.server.full_width_tl_button_header self.server.full_width_tl_button_header
minimalNick = isMinimal(base_dir, domain, nickname) minimalNick = isMinimal(base_dir, domain, nickname)
@ -10620,7 +10620,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInMediaFeed, 'tlmedia', maxPostsInMediaFeed, 'tlmedia',
True, True,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if not inboxMediaFeed: if not inboxMediaFeed:
inboxMediaFeed = [] inboxMediaFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -10647,7 +10647,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInMediaFeed, 'tlmedia', maxPostsInMediaFeed, 'tlmedia',
True, True,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
full_width_tl_button_header = \ full_width_tl_button_header = \
self.server.full_width_tl_button_header self.server.full_width_tl_button_header
minimalNick = isMinimal(base_dir, domain, nickname) minimalNick = isMinimal(base_dir, domain, nickname)
@ -10762,7 +10762,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInBlogsFeed, 'tlblogs', maxPostsInBlogsFeed, 'tlblogs',
True, True,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if not inboxBlogsFeed: if not inboxBlogsFeed:
inboxBlogsFeed = [] inboxBlogsFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -10789,7 +10789,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInBlogsFeed, 'tlblogs', maxPostsInBlogsFeed, 'tlblogs',
True, True,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
full_width_tl_button_header = \ full_width_tl_button_header = \
self.server.full_width_tl_button_header self.server.full_width_tl_button_header
minimalNick = isMinimal(base_dir, domain, nickname) minimalNick = isMinimal(base_dir, domain, nickname)
@ -10906,7 +10906,7 @@ class PubServer(BaseHTTPRequestHandler):
True, True,
self.server.newswireVotesThreshold, self.server.newswireVotesThreshold,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if not inboxNewsFeed: if not inboxNewsFeed:
inboxNewsFeed = [] inboxNewsFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -10934,7 +10934,7 @@ class PubServer(BaseHTTPRequestHandler):
True, True,
self.server.newswireVotesThreshold, self.server.newswireVotesThreshold,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
currNickname = path.split('/users/')[1] currNickname = path.split('/users/')[1]
if '/' in currNickname: if '/' in currNickname:
currNickname = currNickname.split('/')[0] currNickname = currNickname.split('/')[0]
@ -11057,7 +11057,7 @@ class PubServer(BaseHTTPRequestHandler):
True, True,
self.server.newswireVotesThreshold, self.server.newswireVotesThreshold,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if not inboxFeaturesFeed: if not inboxFeaturesFeed:
inboxFeaturesFeed = [] inboxFeaturesFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -11085,7 +11085,7 @@ class PubServer(BaseHTTPRequestHandler):
True, True,
self.server.newswireVotesThreshold, self.server.newswireVotesThreshold,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
currNickname = path.split('/users/')[1] currNickname = path.split('/users/')[1]
if '/' in currNickname: if '/' in currNickname:
currNickname = currNickname.split('/')[0] currNickname = currNickname.split('/')[0]
@ -11376,7 +11376,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInFeed, 'tlbookmarks', maxPostsInFeed, 'tlbookmarks',
authorized, authorized,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if bookmarksFeed: if bookmarksFeed:
if self._requestHTTP(): if self._requestHTTP():
nickname = path.replace('/users/', '') nickname = path.replace('/users/', '')
@ -11404,7 +11404,7 @@ class PubServer(BaseHTTPRequestHandler):
'tlbookmarks', 'tlbookmarks',
authorized, authorized,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
full_width_tl_button_header = \ full_width_tl_button_header = \
self.server.full_width_tl_button_header self.server.full_width_tl_button_header
minimalNick = isMinimal(base_dir, domain, nickname) minimalNick = isMinimal(base_dir, domain, nickname)
@ -11516,7 +11516,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.newswireVotesThreshold, self.server.newswireVotesThreshold,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if outboxFeed: if outboxFeed:
nickname = \ nickname = \
path.replace('/users/', '').replace('/outbox', '') path.replace('/users/', '').replace('/outbox', '')
@ -11544,7 +11544,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.newswireVotesThreshold, self.server.newswireVotesThreshold,
self.server.positiveVoting, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
else: else:
pageNumber = 1 pageNumber = 1
@ -11647,7 +11647,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInFeed, 'moderation', maxPostsInFeed, 'moderation',
True, True,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
if moderationFeed: if moderationFeed:
if self._requestHTTP(): if self._requestHTTP():
nickname = path.replace('/users/', '') nickname = path.replace('/users/', '')
@ -11673,7 +11673,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInFeed, 'moderation', maxPostsInFeed, 'moderation',
True, True,
0, self.server.positiveVoting, 0, self.server.positiveVoting,
self.server.votingTimeMins) self.server.voting_time_mins)
full_width_tl_button_header = \ full_width_tl_button_header = \
self.server.full_width_tl_button_header self.server.full_width_tl_button_header
moderationActionStr = '' moderationActionStr = ''
@ -18446,7 +18446,7 @@ def runDaemon(content_license_url: str,
max_newswire_feed_size_kb: int, max_newswire_feed_size_kb: int,
max_newswire_postsPerSource: int, max_newswire_postsPerSource: int,
show_published_date_only: bool, show_published_date_only: bool,
votingTimeMins: int, voting_time_mins: int,
positiveVoting: bool, positiveVoting: bool,
newswireVotesThreshold: int, newswireVotesThreshold: int,
newsInstance: bool, newsInstance: bool,
@ -18629,7 +18629,7 @@ def runDaemon(content_license_url: str,
# For moderated newswire feeds this is the amount of time allowed # For moderated newswire feeds this is the amount of time allowed
# for voting after the post arrives # 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 # on the newswire, whether moderators vote positively for items
# or against them (veto) # or against them (veto)
httpd.positiveVoting = positiveVoting httpd.positiveVoting = positiveVoting

4
person.py
View File

@ -900,7 +900,7 @@ def personBoxJson(recentPostsCache: {},
http_prefix: str, noOfItems: int, boxname: str, http_prefix: str, noOfItems: int, boxname: str,
authorized: bool, authorized: bool,
newswireVotesThreshold: int, positiveVoting: bool, newswireVotesThreshold: int, positiveVoting: bool,
votingTimeMins: int) -> {}: voting_time_mins: int) -> {}:
"""Obtain the inbox/outbox/moderation feed for the given person """Obtain the inbox/outbox/moderation feed for the given person
""" """
if boxname != 'inbox' and boxname != 'dm' and \ if boxname != 'inbox' and boxname != 'dm' and \
@ -974,7 +974,7 @@ def personBoxJson(recentPostsCache: {},
return createNewsTimeline(session, base_dir, nickname, domain, port, return createNewsTimeline(session, base_dir, nickname, domain, port,
http_prefix, noOfItems, headerOnly, http_prefix, noOfItems, headerOnly,
newswireVotesThreshold, positiveVoting, newswireVotesThreshold, positiveVoting,
votingTimeMins, pageNumber) voting_time_mins, pageNumber)
elif boxname == 'tlfeatures': elif boxname == 'tlfeatures':
return createFeaturesTimeline(session, base_dir, return createFeaturesTimeline(session, base_dir,
nickname, domain, port, nickname, domain, port,

12
posts.py
View File

@ -3365,13 +3365,13 @@ def createMediaTimeline(session, base_dir: str, nickname: str, domain: str,
def createNewsTimeline(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, port: int, http_prefix: str, itemsPerPage: int,
headerOnly: bool, newswireVotesThreshold: int, headerOnly: bool, newswireVotesThreshold: int,
positiveVoting: bool, votingTimeMins: int, positiveVoting: bool, voting_time_mins: int,
pageNumber: int) -> {}: pageNumber: int) -> {}:
return _createBoxIndexed({}, session, base_dir, 'outbox', 'news', return _createBoxIndexed({}, session, base_dir, 'outbox', 'news',
domain, port, http_prefix, domain, port, http_prefix,
itemsPerPage, headerOnly, True, itemsPerPage, headerOnly, True,
newswireVotesThreshold, positiveVoting, newswireVotesThreshold, positiveVoting,
votingTimeMins, pageNumber) voting_time_mins, pageNumber)
def createOutbox(session, base_dir: str, nickname: str, domain: str, def createOutbox(session, base_dir: str, nickname: str, domain: str,
@ -3602,7 +3602,7 @@ def _passedNewswireVoting(newswireVotesThreshold: int,
base_dir: str, domain: str, base_dir: str, domain: str,
postFilename: str, postFilename: str,
positiveVoting: bool, positiveVoting: bool,
votingTimeMins: int) -> bool: voting_time_mins: int) -> bool:
"""Returns true if the post has passed through newswire voting """Returns true if the post has passed through newswire voting
""" """
# apply votes within this timeline # apply votes within this timeline
@ -3619,7 +3619,7 @@ def _passedNewswireVoting(newswireVotesThreshold: int,
timeDiffMins = \ timeDiffMins = \
int((currDate - arrivalDate).total_seconds() / 60) int((currDate - arrivalDate).total_seconds() / 60)
# has the voting time elapsed? # has the voting time elapsed?
if timeDiffMins < votingTimeMins: if timeDiffMins < voting_time_mins:
# voting is still happening, so don't add this # voting is still happening, so don't add this
# post to the timeline # post to the timeline
return False return False
@ -3654,7 +3654,7 @@ def _createBoxIndexed(recentPostsCache: {},
nickname: str, domain: str, port: int, http_prefix: str, nickname: str, domain: str, port: int, http_prefix: str,
itemsPerPage: int, headerOnly: bool, authorized: bool, itemsPerPage: int, headerOnly: bool, authorized: bool,
newswireVotesThreshold: int, positiveVoting: 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 """Constructs the box feed for a person with the given nickname
""" """
if not authorized or not pageNumber: if not authorized or not pageNumber:
@ -3736,7 +3736,7 @@ def _createBoxIndexed(recentPostsCache: {},
base_dir, domain, base_dir, domain,
postFilename, postFilename,
positiveVoting, positiveVoting,
votingTimeMins): voting_time_mins):
continue continue
# Skip through any posts previous to the current page # Skip through any posts previous to the current page