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-28 16:50:20 +00:00
parent 6fdde8e107
commit c6cc551605
4 changed files with 251 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

457
daemon.py
View File

@ -66,7 +66,7 @@ from person import activateAccount
from person import deactivateAccount from person import deactivateAccount
from person import registerAccount from person import registerAccount
from person import personLookup from person import personLookup
from person import personBoxJson from person import person_box_json
from person import createSharedInbox from person import createSharedInbox
from person import createNewsInbox from person import createNewsInbox
from person import suspendAccount from person import suspendAccount
@ -10170,18 +10170,18 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
inboxFeed = \ inboxFeed = \
personBoxJson(recent_posts_cache, person_box_json(recent_posts_cache,
session, session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_feed, 'inbox', max_posts_in_feed, 'inbox',
authorized, authorized,
0, 0,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if inboxFeed: if inboxFeed:
if GETstartTime: if GETstartTime:
fitnessPerformance(GETstartTime, fitnessPerformance(GETstartTime,
@ -10202,18 +10202,18 @@ class PubServer(BaseHTTPRequestHandler):
if 'page=' not in path: if 'page=' not in path:
# if no page was specified then show the first # if no page was specified then show the first
inboxFeed = \ inboxFeed = \
personBoxJson(recent_posts_cache, person_box_json(recent_posts_cache,
session, session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_feed, 'inbox', max_posts_in_feed, 'inbox',
authorized, authorized,
0, 0,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if GETstartTime: if GETstartTime:
fitnessPerformance(GETstartTime, fitnessPerformance(GETstartTime,
self.server.fitness, self.server.fitness,
@ -10329,17 +10329,17 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
inboxDMFeed = \ inboxDMFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_feed, 'dm', max_posts_in_feed, 'dm',
authorized, authorized,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if inboxDMFeed: if inboxDMFeed:
if self._requestHTTP(): if self._requestHTTP():
nickname = path.replace('/users/', '') nickname = path.replace('/users/', '')
@ -10355,18 +10355,18 @@ class PubServer(BaseHTTPRequestHandler):
if 'page=' not in path: if 'page=' not in path:
# if no page was specified then show the first # if no page was specified then show the first
inboxDMFeed = \ inboxDMFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_feed, 'dm', max_posts_in_feed, 'dm',
authorized, authorized,
0, 0,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) 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)
@ -10474,17 +10474,17 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
inboxRepliesFeed = \ inboxRepliesFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_feed, 'tlreplies', max_posts_in_feed, 'tlreplies',
True, True,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if not inboxRepliesFeed: if not inboxRepliesFeed:
inboxRepliesFeed = [] inboxRepliesFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -10501,17 +10501,17 @@ class PubServer(BaseHTTPRequestHandler):
if 'page=' not in path: if 'page=' not in path:
# if no page was specified then show the first # if no page was specified then show the first
inboxRepliesFeed = \ inboxRepliesFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_feed, 'tlreplies', max_posts_in_feed, 'tlreplies',
True, True,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) 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)
@ -10619,17 +10619,17 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
inboxMediaFeed = \ inboxMediaFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_media_feed, 'tlmedia', max_posts_in_media_feed, 'tlmedia',
True, True,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if not inboxMediaFeed: if not inboxMediaFeed:
inboxMediaFeed = [] inboxMediaFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -10646,17 +10646,17 @@ class PubServer(BaseHTTPRequestHandler):
if 'page=' not in path: if 'page=' not in path:
# if no page was specified then show the first # if no page was specified then show the first
inboxMediaFeed = \ inboxMediaFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_media_feed, 'tlmedia', max_posts_in_media_feed, 'tlmedia',
True, True,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) 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)
@ -10761,17 +10761,17 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
inboxBlogsFeed = \ inboxBlogsFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_blogs_feed, 'tlblogs', max_posts_in_blogs_feed, 'tlblogs',
True, True,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if not inboxBlogsFeed: if not inboxBlogsFeed:
inboxBlogsFeed = [] inboxBlogsFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -10788,17 +10788,17 @@ class PubServer(BaseHTTPRequestHandler):
if 'page=' not in path: if 'page=' not in path:
# if no page was specified then show the first # if no page was specified then show the first
inboxBlogsFeed = \ inboxBlogsFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_blogs_feed, 'tlblogs', max_posts_in_blogs_feed, 'tlblogs',
True, True,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) 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)
@ -10904,18 +10904,18 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
inboxNewsFeed = \ inboxNewsFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_news_feed, 'tlnews', max_posts_in_news_feed, 'tlnews',
True, True,
self.server.newswire_votes_threshold, self.server.newswire_votes_threshold,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if not inboxNewsFeed: if not inboxNewsFeed:
inboxNewsFeed = [] inboxNewsFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -10930,20 +10930,22 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
pageNumber = 1 pageNumber = 1
if 'page=' not in path: if 'page=' not in path:
newswire_votes_threshold = \
self.server.newswire_votes_threshold
# if no page was specified then show the first # if no page was specified then show the first
inboxNewsFeed = \ inboxNewsFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_blogs_feed, 'tlnews', max_posts_in_blogs_feed, 'tlnews',
True, True,
self.server.newswire_votes_threshold, newswire_votes_threshold,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) 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]
@ -11055,18 +11057,18 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
inboxFeaturesFeed = \ inboxFeaturesFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_news_feed, 'tlfeatures', max_posts_in_news_feed, 'tlfeatures',
True, True,
self.server.newswire_votes_threshold, self.server.newswire_votes_threshold,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if not inboxFeaturesFeed: if not inboxFeaturesFeed:
inboxFeaturesFeed = [] inboxFeaturesFeed = []
if self._requestHTTP(): if self._requestHTTP():
@ -11081,21 +11083,23 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
pageNumber = 1 pageNumber = 1
if 'page=' not in path: if 'page=' not in path:
newswire_votes_threshold = \
self.server.newswire_votes_threshold
# if no page was specified then show the first # if no page was specified then show the first
inboxFeaturesFeed = \ inboxFeaturesFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_blogs_feed, max_posts_in_blogs_feed,
'tlfeatures', 'tlfeatures',
True, True,
self.server.newswire_votes_threshold, newswire_votes_threshold,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) 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]
@ -11378,17 +11382,17 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
bookmarksFeed = \ bookmarksFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_feed, 'tlbookmarks', max_posts_in_feed, 'tlbookmarks',
authorized, authorized,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if bookmarksFeed: if bookmarksFeed:
if self._requestHTTP(): if self._requestHTTP():
nickname = path.replace('/users/', '') nickname = path.replace('/users/', '')
@ -11405,18 +11409,18 @@ class PubServer(BaseHTTPRequestHandler):
if 'page=' not in path: if 'page=' not in path:
# if no page was specified then show the first # if no page was specified then show the first
bookmarksFeed = \ bookmarksFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_feed, max_posts_in_feed,
'tlbookmarks', 'tlbookmarks',
authorized, authorized,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) 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)
@ -11523,14 +11527,14 @@ class PubServer(BaseHTTPRequestHandler):
""" """
# get outbox feed for a person # get outbox feed for a person
outboxFeed = \ outboxFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, domain, port, path, base_dir, domain, port, path,
http_prefix, max_posts_in_feed, 'outbox', http_prefix, max_posts_in_feed, 'outbox',
authorized, authorized,
self.server.newswire_votes_threshold, self.server.newswire_votes_threshold,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if outboxFeed: if outboxFeed:
nickname = \ nickname = \
path.replace('/users/', '').replace('/outbox', '') path.replace('/users/', '').replace('/outbox', '')
@ -11549,16 +11553,16 @@ class PubServer(BaseHTTPRequestHandler):
# if a page wasn't specified then show the first one # if a page wasn't specified then show the first one
pageStr = '?page=' + str(pageNumber) pageStr = '?page=' + str(pageNumber)
outboxFeed = \ outboxFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, domain, port, base_dir, domain, port,
path + pageStr, path + pageStr,
http_prefix, http_prefix,
max_posts_in_feed, 'outbox', max_posts_in_feed, 'outbox',
authorized, authorized,
self.server.newswire_votes_threshold, self.server.newswire_votes_threshold,
self.server.positive_voting, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
else: else:
pageNumber = 1 pageNumber = 1
@ -11651,17 +11655,17 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in path: if '/users/' in path:
if authorized: if authorized:
moderationFeed = \ moderationFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path, path,
http_prefix, http_prefix,
max_posts_in_feed, 'moderation', max_posts_in_feed, 'moderation',
True, True,
0, self.server.positive_voting, 0, self.server.positive_voting,
self.server.voting_time_mins) self.server.voting_time_mins)
if moderationFeed: if moderationFeed:
if self._requestHTTP(): if self._requestHTTP():
nickname = path.replace('/users/', '') nickname = path.replace('/users/', '')
@ -11677,17 +11681,18 @@ class PubServer(BaseHTTPRequestHandler):
if 'page=' not in path: if 'page=' not in path:
# if no page was specified then show the first # if no page was specified then show the first
moderationFeed = \ moderationFeed = \
personBoxJson(self.server.recent_posts_cache, person_box_json(self.server.recent_posts_cache,
self.server.session, self.server.session,
base_dir, base_dir,
domain, domain,
port, port,
path + '?page=1', path + '?page=1',
http_prefix, http_prefix,
max_posts_in_feed, 'moderation', max_posts_in_feed,
True, 'moderation',
0, self.server.positive_voting, True,
self.server.voting_time_mins) 0, self.server.positive_voting,
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 = ''

16
person.py
View File

@ -898,12 +898,12 @@ def personLookup(domain: str, path: str, base_dir: str) -> {}:
return personJson return personJson
def personBoxJson(recent_posts_cache: {}, def person_box_json(recent_posts_cache: {},
session, base_dir: str, domain: str, port: int, path: str, session, base_dir: str, domain: str, port: int, path: str,
http_prefix: str, noOfItems: int, boxname: str, http_prefix: str, noOfItems: int, boxname: str,
authorized: bool, authorized: bool,
newswire_votes_threshold: int, positive_voting: bool, newswire_votes_threshold: int, positive_voting: bool,
voting_time_mins: 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 \
@ -912,7 +912,7 @@ def personBoxJson(recent_posts_cache: {},
boxname != 'tlfeatures' and \ boxname != 'tlfeatures' and \
boxname != 'outbox' and boxname != 'moderation' and \ boxname != 'outbox' and boxname != 'moderation' and \
boxname != 'tlbookmarks' and boxname != 'bookmarks': boxname != 'tlbookmarks' and boxname != 'bookmarks':
print('ERROR: personBoxJson invalid box name ' + boxname) print('ERROR: person_box_json invalid box name ' + boxname)
return None return None
if not '/' + boxname in path: if not '/' + boxname in path:
@ -931,7 +931,7 @@ def personBoxJson(recent_posts_cache: {},
try: try:
pageNumber = int(pageNumber) pageNumber = int(pageNumber)
except BaseException: except BaseException:
print('EX: personBoxJson unable to convert to int ' + print('EX: person_box_json unable to convert to int ' +
str(pageNumber)) str(pageNumber))
pass pass
path = path.split('?page=')[0] path = path.split('?page=')[0]

10
webapp_frontscreen.py
View File

@ -11,7 +11,7 @@ import os
from utils import is_system_account from utils import is_system_account
from utils import get_domain_from_actor from utils import get_domain_from_actor
from utils import get_config_param from utils import get_config_param
from person import personBoxJson from person import person_box_json
from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlHeaderWithExternalStyle
from webapp_utils import htmlFooter from webapp_utils import htmlFooter
from webapp_utils import getBannerFile from webapp_utils import getBannerFile
@ -53,10 +53,10 @@ def _htmlFrontScreenPosts(recent_posts_cache: {}, max_recent_posts: int,
'/users/' + nickname + '/' + boxName + \ '/users/' + nickname + '/' + boxName + \
'?page=' + str(currPage) '?page=' + str(currPage)
outboxFeed = \ outboxFeed = \
personBoxJson({}, session, base_dir, domain, port, person_box_json({}, session, base_dir, domain, port,
outboxFeedPathStr, outboxFeedPathStr,
http_prefix, 10, boxName, http_prefix, 10, boxName,
authorized, 0, False, 0) authorized, 0, False, 0)
if not outboxFeed: if not outboxFeed:
break break
if len(outboxFeed['orderedItems']) == 0: if len(outboxFeed['orderedItems']) == 0:

14
webapp_profile.py
View File

@ -32,7 +32,7 @@ from utils import get_reply_interval_hours
from languages import getActorLanguages from languages import getActorLanguages
from skills import getSkills from skills import getSkills
from theme import getThemesList from theme import getThemesList
from person import personBoxJson from person import person_box_json
from person import getActorJson from person import getActorJson
from person import getPersonAvatarUrl from person import getPersonAvatarUrl
from posts import getPersonBox from posts import getPersonBox
@ -1055,12 +1055,12 @@ def _htmlProfilePosts(recent_posts_cache: {}, max_recent_posts: int,
'/users/' + nickname + '/' + boxName + '?page=' + \ '/users/' + nickname + '/' + boxName + '?page=' + \
str(currPage) str(currPage)
outboxFeed = \ outboxFeed = \
personBoxJson({}, session, base_dir, domain, person_box_json({}, session, base_dir, domain,
port, port,
outboxFeedPathStr, outboxFeedPathStr,
http_prefix, http_prefix,
10, boxName, 10, boxName,
authorized, 0, False, 0) authorized, 0, False, 0)
if not outboxFeed: if not outboxFeed:
break break
if len(outboxFeed['orderedItems']) == 0: if len(outboxFeed['orderedItems']) == 0: