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 23:26:38 +00:00
parent d21efe800d
commit 7b41bcb5a1
14 changed files with 148 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blocking.py
View File

@ -1006,7 +1006,7 @@ def loadCWLists(base_dir: str, verbose: bool) -> {}:
return result return result
def addCWfromLists(post_json_object: {}, CWlists: {}, translate: {}, def addCWfromLists(post_json_object: {}, cw_lists: {}, translate: {},
lists_enabled: str) -> None: lists_enabled: str) -> None:
"""Adds content warnings by matching the post content """Adds content warnings by matching the post content
against domains or keywords against domains or keywords
@ -1020,7 +1020,7 @@ def addCWfromLists(post_json_object: {}, CWlists: {}, translate: {},
cw = post_json_object['object']['summary'] cw = post_json_object['object']['summary']
content = post_json_object['object']['content'] content = post_json_object['object']['content']
for name, item in CWlists.items(): for name, item in cw_lists.items():
if name not in lists_enabled: if name not in lists_enabled:
continue continue
if not item.get('warning'): if not item.get('warning'):

90
daemon.py
View File

@ -1306,7 +1306,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
self.server.max_like_count, self.server.max_like_count,
self.server.max_recent_posts, self.server.max_recent_posts,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
self.server.content_license_url) self.server.content_license_url)
@ -2730,7 +2730,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
self.server.defaultTimeline).encode('utf-8') self.server.defaultTimeline).encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -2864,7 +2864,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
self.server.defaultTimeline).encode('utf-8') self.server.defaultTimeline).encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -3314,7 +3314,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
if hashtagStr: if hashtagStr:
msg = hashtagStr.encode('utf-8') msg = hashtagStr.encode('utf-8')
@ -3409,7 +3409,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
if historyStr: if historyStr:
msg = historyStr.encode('utf-8') msg = historyStr.encode('utf-8')
@ -3477,7 +3477,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
if bookmarksStr: if bookmarksStr:
msg = bookmarksStr.encode('utf-8') msg = bookmarksStr.encode('utf-8')
@ -3577,7 +3577,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
signing_priv_key_pem, signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
if profileStr: if profileStr:
msg = profileStr.encode('utf-8') msg = profileStr.encode('utf-8')
@ -6384,7 +6384,7 @@ class PubServer(BaseHTTPRequestHandler):
if isModerator(self.server.base_dir, nickname): if isModerator(self.server.base_dir, nickname):
# set selected content warning lists # set selected content warning lists
newListsEnabled = '' newListsEnabled = ''
for name, item in self.server.CWlists.items(): for name, item in self.server.cw_lists.items():
listVarName = getCWlistVariable(name) listVarName = getCWlistVariable(name)
if fields.get(listVarName): if fields.get(listVarName):
if fields[listVarName] == 'on': if fields[listVarName] == 'on':
@ -7554,7 +7554,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
if hashtagStr: if hashtagStr:
msg = hashtagStr.encode('utf-8') msg = hashtagStr.encode('utf-8')
@ -7770,7 +7770,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, False, True, False,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
actorAbsolute = self._getInstanceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
@ -8230,7 +8230,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, False, True, False,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
else: else:
print('WARN: Liked post not found: ' + likedPostFilename) print('WARN: Liked post not found: ' + likedPostFilename)
@ -8384,7 +8384,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, False, True, False,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
else: else:
print('WARN: Unliked post not found: ' + likedPostFilename) print('WARN: Unliked post not found: ' + likedPostFilename)
@ -8568,7 +8568,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, False, True, False,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
else: else:
print('WARN: Emoji reaction post not found: ' + print('WARN: Emoji reaction post not found: ' +
@ -8740,7 +8740,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, False, True, False,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
else: else:
print('WARN: Unreaction post not found: ' + print('WARN: Unreaction post not found: ' +
@ -8835,7 +8835,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timelineStr, pageNumber) timelineStr, pageNumber)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
@ -8960,7 +8960,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, False, True, False,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
else: else:
print('WARN: Bookmarked post not found: ' + bookmarkFilename) print('WARN: Bookmarked post not found: ' + bookmarkFilename)
@ -9088,7 +9088,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, False, True, False,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
else: else:
print('WARN: Unbookmarked post not found: ' + bookmarkFilename) print('WARN: Unbookmarked post not found: ' + bookmarkFilename)
@ -9182,7 +9182,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
if deleteStr: if deleteStr:
deleteStrLen = len(deleteStr) deleteStrLen = len(deleteStr)
@ -9291,7 +9291,7 @@ class PubServer(BaseHTTPRequestHandler):
manuallyApproveFollowers, manuallyApproveFollowers,
showPublicOnly, storeToCache, showPublicOnly, storeToCache,
useCacheOnly, useCacheOnly,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
else: else:
print('WARN: Muted post not found: ' + muteFilename) print('WARN: Muted post not found: ' + muteFilename)
@ -9401,7 +9401,7 @@ class PubServer(BaseHTTPRequestHandler):
manuallyApproveFollowers, manuallyApproveFollowers,
showPublicOnly, storeToCache, showPublicOnly, storeToCache,
useCacheOnly, useCacheOnly,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
else: else:
print('WARN: Unmuted post not found: ' + muteFilename) print('WARN: Unmuted post not found: ' + muteFilename)
@ -9519,7 +9519,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -9611,7 +9611,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -9720,7 +9720,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
rolesList, rolesList,
None, None, self.server.CWlists, None, None, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
self.server.content_license_url) self.server.content_license_url)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
@ -9837,7 +9837,7 @@ class PubServer(BaseHTTPRequestHandler):
shared_items_federated_domains, shared_items_federated_domains,
skills, skills,
None, None, None, None,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
content_license_url) content_license_url)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
@ -10001,7 +10001,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -10266,7 +10266,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
if GETstartTime: if GETstartTime:
fitnessPerformance(GETstartTime, fitnessPerformance(GETstartTime,
@ -10418,7 +10418,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -10563,7 +10563,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -10705,7 +10705,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
fed_domains, fed_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -10847,7 +10847,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
fed_domains, fed_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -10999,7 +10999,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
fed_domains, fed_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -11150,7 +11150,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -11258,7 +11258,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -11343,7 +11343,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -11468,7 +11468,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -11606,7 +11606,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -11740,7 +11740,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled) self.server.lists_enabled)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -11862,7 +11862,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
shares, shares,
pageNumber, sharesPerPage, pageNumber, sharesPerPage,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
self.server.content_license_url) self.server.content_license_url)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
@ -11984,7 +11984,7 @@ class PubServer(BaseHTTPRequestHandler):
following, following,
pageNumber, pageNumber,
followsPerPage, followsPerPage,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
content_license_url).encode('utf-8') content_license_url).encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -12104,7 +12104,7 @@ class PubServer(BaseHTTPRequestHandler):
followers, followers,
pageNumber, pageNumber,
followsPerPage, followsPerPage,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
content_license_url).encode('utf-8') content_license_url).encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -12238,7 +12238,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.max_like_count, self.server.max_like_count,
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
None, None, None, None, None, None,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
self.server.content_license_url).encode('utf-8') self.server.content_license_url).encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -12998,7 +12998,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
self.server.defaultTimeline).encode('utf-8') self.server.defaultTimeline).encode('utf-8')
if not msg: if not msg:
@ -13082,7 +13082,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.user_agents_blocked, self.server.user_agents_blocked,
accessKeys, accessKeys,
default_reply_interval_hrs, default_reply_interval_hrs,
self.server.CWlists, self.server.cw_lists,
self.server.lists_enabled).encode('utf-8') self.server.lists_enabled).encode('utf-8')
if msg: if msg:
msglen = len(msg) msglen = len(msg)
@ -18809,7 +18809,7 @@ def runDaemon(content_license_url: str,
httpd.lists_enabled = lists_enabled httpd.lists_enabled = lists_enabled
else: else:
httpd.lists_enabled = getConfigParam(base_dir, "lists_enabled") httpd.lists_enabled = getConfigParam(base_dir, "lists_enabled")
httpd.CWlists = loadCWLists(base_dir, True) httpd.cw_lists = loadCWLists(base_dir, True)
# set the avatar for the news account # set the avatar for the news account
httpd.themeName = getConfigParam(base_dir, 'theme') httpd.themeName = getConfigParam(base_dir, 'theme')
@ -18947,7 +18947,7 @@ def runDaemon(content_license_url: str,
httpd.max_like_count, httpd.max_like_count,
httpd.signing_priv_key_pem, httpd.signing_priv_key_pem,
httpd.default_reply_interval_hrs, httpd.default_reply_interval_hrs,
httpd.CWlists), daemon=True) httpd.cw_lists), daemon=True)
print('Creating scheduled post thread') print('Creating scheduled post thread')
httpd.thrPostSchedule = \ httpd.thrPostSchedule = \

60
inbox.py
View File

@ -292,7 +292,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, cw_lists: {},
lists_enabled: str) -> None: lists_enabled: str) -> None:
"""Converts the json post into html and stores it in a cache """Converts the json post into html and stores it in a cache
This enables the post to be quickly displayed later This enables the post to be quickly displayed later
@ -318,7 +318,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int,
peertubeInstances, allow_local_network_access, peertubeInstances, allow_local_network_access,
themeName, system_language, max_like_count, themeName, system_language, max_like_count,
notDM, True, True, False, True, False, notDM, True, True, False, True, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
def validInbox(base_dir: str, nickname: str, domain: str) -> bool: def validInbox(base_dir: str, nickname: str, domain: str) -> bool:
@ -1006,7 +1006,7 @@ def _receiveLike(recentPostsCache: {},
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, CWlists: {}, max_like_count: int, cw_lists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
"""Receives a Like activity within the POST section of HTTPServer """Receives a Like activity within the POST section of HTTPServer
""" """
@ -1109,7 +1109,7 @@ def _receiveLike(recentPostsCache: {},
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, CWlists, False, True, False, cw_lists,
lists_enabled) lists_enabled)
return True return True
@ -1128,7 +1128,7 @@ def _receiveUndoLike(recentPostsCache: {},
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, CWlists: {}, max_like_count: int, cw_lists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
"""Receives an undo like activity within the POST section of HTTPServer """Receives an undo like activity within the POST section of HTTPServer
""" """
@ -1220,7 +1220,7 @@ def _receiveUndoLike(recentPostsCache: {},
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, CWlists, False, True, False, cw_lists,
lists_enabled) lists_enabled)
return True return True
@ -1240,7 +1240,7 @@ def _receiveReaction(recentPostsCache: {},
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, CWlists: {}, max_like_count: int, cw_lists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
"""Receives an emoji reaction within the POST section of HTTPServer """Receives an emoji reaction within the POST section of HTTPServer
""" """
@ -1368,7 +1368,7 @@ def _receiveReaction(recentPostsCache: {},
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, CWlists, False, True, False, cw_lists,
lists_enabled) lists_enabled)
return True return True
@ -1387,7 +1387,7 @@ def _receiveUndoReaction(recentPostsCache: {},
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, CWlists: {}, max_like_count: int, cw_lists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
"""Receives an undo emoji reaction within the POST section of HTTPServer """Receives an undo emoji reaction within the POST section of HTTPServer
""" """
@ -1495,7 +1495,7 @@ def _receiveUndoReaction(recentPostsCache: {},
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, CWlists, False, True, False, cw_lists,
lists_enabled) lists_enabled)
return True return True
@ -1513,7 +1513,7 @@ def _receiveBookmark(recentPostsCache: {},
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, CWlists: {}, max_like_count: int, cw_lists: {},
lists_enabled: {}) -> bool: lists_enabled: {}) -> bool:
"""Receives a bookmark activity within the POST section of HTTPServer """Receives a bookmark activity within the POST section of HTTPServer
""" """
@ -1605,7 +1605,7 @@ def _receiveBookmark(recentPostsCache: {},
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, CWlists, False, True, False, cw_lists,
lists_enabled) lists_enabled)
return True return True
@ -1623,7 +1623,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
peertubeInstances: [], peertubeInstances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, CWlists: {}, max_like_count: int, cw_lists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
"""Receives an undo bookmark activity within the POST section of HTTPServer """Receives an undo bookmark activity within the POST section of HTTPServer
""" """
@ -1716,7 +1716,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, CWlists, lists_enabled) False, True, False, cw_lists, lists_enabled)
return True return True
@ -1810,7 +1810,7 @@ def _receiveAnnounce(recentPostsCache: {},
max_recent_posts: int, max_recent_posts: int,
allow_deletion: bool, allow_deletion: bool,
peertubeInstances: [], peertubeInstances: [],
max_like_count: int, CWlists: {}, max_like_count: int, cw_lists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
"""Receives an announce activity within the POST section of HTTPServer """Receives an announce activity within the POST section of HTTPServer
""" """
@ -1923,7 +1923,7 @@ def _receiveAnnounce(recentPostsCache: {},
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, CWlists, False, True, False, cw_lists,
lists_enabled) lists_enabled)
if not announceHtml: if not announceHtml:
print('WARN: Unable to generate html for announce ' + print('WARN: Unable to generate html for announce ' +
@ -2989,7 +2989,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, max_like_count: int,
CWlists: {}, lists_enabled: bool) -> None: cw_lists: {}, lists_enabled: bool) -> None:
"""Updates the votes on a Question/poll """Updates the votes on a Question/poll
""" """
# if this is a reply to a question then update the votes # if this is a reply to a question then update the votes
@ -3036,7 +3036,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False, CWlists, False, True, False, cw_lists,
lists_enabled) lists_enabled)
# add id to inbox index # add id to inbox index
@ -3200,7 +3200,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, signing_priv_key_pem: str,
default_reply_interval_hrs: int, default_reply_interval_hrs: int,
CWlists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
content_license_url: str) -> bool: content_license_url: str) -> bool:
""" Anything which needs to be done after initial checks have passed """ Anything which needs to be done after initial checks have passed
""" """
@ -3231,7 +3231,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, system_language, themeName, system_language,
max_like_count, CWlists, lists_enabled): max_like_count, cw_lists, lists_enabled):
if debug: if debug:
print('DEBUG: Like accepted from ' + actor) print('DEBUG: Like accepted from ' + actor)
return False return False
@ -3253,7 +3253,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, system_language, themeName, system_language,
max_like_count, CWlists, lists_enabled): max_like_count, cw_lists, lists_enabled):
if debug: if debug:
print('DEBUG: Undo like accepted from ' + actor) print('DEBUG: Undo like accepted from ' + actor)
return False return False
@ -3276,7 +3276,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, system_language, themeName, system_language,
max_like_count, CWlists, lists_enabled): max_like_count, cw_lists, lists_enabled):
if debug: if debug:
print('DEBUG: Reaction accepted from ' + actor) print('DEBUG: Reaction accepted from ' + actor)
return False return False
@ -3298,7 +3298,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, system_language, themeName, system_language,
max_like_count, CWlists, lists_enabled): max_like_count, cw_lists, lists_enabled):
if debug: if debug:
print('DEBUG: Undo reaction accepted from ' + actor) print('DEBUG: Undo reaction accepted from ' + actor)
return False return False
@ -3320,7 +3320,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, system_language, themeName, system_language,
max_like_count, CWlists, lists_enabled): max_like_count, cw_lists, lists_enabled):
if debug: if debug:
print('DEBUG: Bookmark accepted from ' + actor) print('DEBUG: Bookmark accepted from ' + actor)
return False return False
@ -3342,7 +3342,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
peertubeInstances, peertubeInstances,
allow_local_network_access, allow_local_network_access,
themeName, system_language, themeName, system_language,
max_like_count, CWlists, lists_enabled): max_like_count, cw_lists, lists_enabled):
if debug: if debug:
print('DEBUG: Undo bookmark accepted from ' + actor) print('DEBUG: Undo bookmark accepted from ' + actor)
return False return False
@ -3368,7 +3368,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
max_recent_posts, max_recent_posts,
allow_deletion, allow_deletion,
peertubeInstances, peertubeInstances,
max_like_count, CWlists, lists_enabled): max_like_count, cw_lists, lists_enabled):
if debug: if debug:
print('DEBUG: Announce accepted from ' + actor) print('DEBUG: Announce accepted from ' + actor)
@ -3465,7 +3465,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
allow_local_network_access, allow_local_network_access,
themeName, system_language, themeName, system_language,
max_like_count, max_like_count,
CWlists, lists_enabled) cw_lists, lists_enabled)
isReplyToMutedPost = False isReplyToMutedPost = False
@ -3571,7 +3571,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
themeName, system_language, themeName, system_language,
max_like_count, max_like_count,
signing_priv_key_pem, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
if debug: if debug:
timeDiff = \ timeDiff = \
str(int((time.time() - htmlCacheStartTime) * str(int((time.time() - htmlCacheStartTime) *
@ -4084,7 +4084,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str, max_like_count: int, signing_priv_key_pem: str,
default_reply_interval_hrs: int, default_reply_interval_hrs: int,
CWlists: {}) -> None: cw_lists: {}) -> None:
"""Processes received items and moves them to the appropriate """Processes received items and moves them to the appropriate
directories directories
""" """
@ -4515,7 +4515,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int,
max_like_count, max_like_count,
signing_priv_key_pem, signing_priv_key_pem,
default_reply_interval_hrs, default_reply_interval_hrs,
CWlists, lists_enabled, cw_lists, lists_enabled,
content_license_url) content_license_url)
if debug: if debug:
pprint(queueJson['post']) pprint(queueJson['post'])

4
outbox.py
View File

@ -198,7 +198,7 @@ def postMessageToOutbox(session, translate: {},
signing_priv_key_pem: str, signing_priv_key_pem: str,
peertubeInstances: str, theme: str, peertubeInstances: str, theme: str,
max_like_count: int, max_like_count: int,
max_recent_posts: int, CWlists: {}, max_recent_posts: int, cw_lists: {},
lists_enabled: str, lists_enabled: str,
content_license_url: str) -> bool: content_license_url: str) -> bool:
"""post is received by the outbox """post is received by the outbox
@ -476,7 +476,7 @@ def postMessageToOutbox(session, translate: {},
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, useCacheOnly, False, True, useCacheOnly,
CWlists, lists_enabled) cw_lists, lists_enabled)
if outboxAnnounce(recentPostsCache, if outboxAnnounce(recentPostsCache,
base_dir, messageJson, debug): base_dir, messageJson, debug):

2
schedule.py
View File

@ -127,7 +127,7 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd,
httpd.themeName, httpd.themeName,
httpd.max_like_count, httpd.max_like_count,
httpd.max_recent_posts, httpd.max_recent_posts,
httpd.CWlists, httpd.cw_lists,
httpd.lists_enabled, httpd.lists_enabled,
httpd.content_license_url): httpd.content_license_url):
indexLines.remove(line) indexLines.remove(line)

10
tests.py
View File

@ -5859,8 +5859,8 @@ def _testWordsSimilarity() -> None:
def _testAddCWfromLists(base_dir: str) -> None: def _testAddCWfromLists(base_dir: str) -> None:
print('testAddCWfromLists') print('testAddCWfromLists')
translate = {} translate = {}
CWlists = loadCWLists(base_dir, True) cw_lists = loadCWLists(base_dir, True)
assert CWlists assert cw_lists
post_json_object = { post_json_object = {
"object": { "object": {
@ -5869,7 +5869,7 @@ def _testAddCWfromLists(base_dir: str) -> None:
"content": "" "content": ""
} }
} }
addCWfromLists(post_json_object, CWlists, translate, 'Murdoch press') addCWfromLists(post_json_object, cw_lists, translate, 'Murdoch press')
assert post_json_object['object']['sensitive'] is False assert post_json_object['object']['sensitive'] is False
assert post_json_object['object']['summary'] is None assert post_json_object['object']['summary'] is None
@ -5880,7 +5880,7 @@ def _testAddCWfromLists(base_dir: str) -> None:
"content": "Blah blah news.co.uk blah blah" "content": "Blah blah news.co.uk blah blah"
} }
} }
addCWfromLists(post_json_object, CWlists, translate, 'Murdoch press') addCWfromLists(post_json_object, cw_lists, translate, 'Murdoch press')
assert post_json_object['object']['sensitive'] is True assert post_json_object['object']['sensitive'] is True
assert post_json_object['object']['summary'] == "Murdoch Press" assert post_json_object['object']['summary'] == "Murdoch Press"
@ -5891,7 +5891,7 @@ def _testAddCWfromLists(base_dir: str) -> None:
"content": "Blah blah news.co.uk blah blah" "content": "Blah blah news.co.uk blah blah"
} }
} }
addCWfromLists(post_json_object, CWlists, translate, 'Murdoch press') addCWfromLists(post_json_object, cw_lists, translate, 'Murdoch press')
assert post_json_object['object']['sensitive'] is True assert post_json_object['object']['sensitive'] is True
assert post_json_object['object']['summary'] == \ assert post_json_object['object']['summary'] == \
"Murdoch Press / Existing CW" "Murdoch Press / Existing CW"

4
webapp_confirm.py
View File

@ -37,7 +37,7 @@ def htmlConfirmDelete(cssCache: {},
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str, max_like_count: int, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Shows a screen asking to confirm the deletion of a post """Shows a screen asking to confirm the deletion of a post
""" """
if '/statuses/' not in messageId: if '/statuses/' not in messageId:
@ -79,7 +79,7 @@ def htmlConfirmDelete(cssCache: {},
peertubeInstances, allow_local_network_access, peertubeInstances, allow_local_network_access,
themeName, system_language, max_like_count, themeName, system_language, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
deletePostStr += '<center>' deletePostStr += '<center>'
deletePostStr += \ deletePostStr += \
' <p class="followText">' + \ ' <p class="followText">' + \

4
webapp_create_post.py
View File

@ -209,7 +209,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {},
allow_local_network_access: bool, allow_local_network_access: bool,
system_language: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str, max_like_count: int, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
boxName: str) -> str: boxName: str) -> str:
"""New post screen """New post screen
""" """
@ -280,7 +280,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {},
max_like_count, max_like_count,
False, False, False, False, False, False,
False, False, False, False, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
replyStr = '<input type="hidden" ' + \ replyStr = '<input type="hidden" ' + \
'name="replyTo" value="' + inReplyTo + '">\n' 'name="replyTo" value="' + inReplyTo + '">\n'

8
webapp_frontscreen.py
View File

@ -35,7 +35,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, max_recent_posts: int,
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, CWlists: {}, signing_priv_key_pem: str, cw_lists: {},
lists_enabled: str) -> str: lists_enabled: str) -> str:
"""Shows posts on the front screen of a news instance """Shows posts on the front screen of a news instance
These should only be public blog posts from the features timeline These should only be public blog posts from the features timeline
@ -83,7 +83,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, max_recent_posts: int,
max_like_count, max_like_count,
False, False, False, False, False, False,
True, False, False, True, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
if postStr: if postStr:
profileStr += postStr + separatorStr profileStr += postStr + separatorStr
ctr += 1 ctr += 1
@ -114,7 +114,7 @@ def htmlFrontScreen(signing_priv_key_pem: str,
extraJson: {}, extraJson: {},
pageNumber: int, pageNumber: int,
maxItemsPerPage: int, maxItemsPerPage: int,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the news instance front screen """Show the news instance front screen
""" """
nickname = profileJson['preferredUsername'] nickname = profileJson['preferredUsername']
@ -187,7 +187,7 @@ def htmlFrontScreen(signing_priv_key_pem: str,
theme, system_language, theme, system_language,
max_like_count, max_like_count,
signing_priv_key_pem, signing_priv_key_pem,
CWlists, lists_enabled) + licenseStr cw_lists, lists_enabled) + licenseStr
# Footer which is only used for system accounts # Footer which is only used for system accounts
profileFooterStr = ' </td>\n' profileFooterStr = ' </td>\n'

4
webapp_moderation.py
View File

@ -54,7 +54,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the moderation feed as html """Show the moderation feed as html
This is what you see when selecting the "mod" timeline This is what you see when selecting the "mod" timeline
""" """
@ -79,7 +79,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
peertubeInstances, allow_local_network_access, peertubeInstances, allow_local_network_access,
text_mode_banner, accessKeys, system_language, text_mode_banner, accessKeys, system_language,
max_like_count, shared_items_federated_domains, max_like_count, shared_items_federated_domains,
signing_priv_key_pem, CWlists, lists_enabled) signing_priv_key_pem, cw_lists, lists_enabled)
def htmlAccountInfo(cssCache: {}, translate: {}, def htmlAccountInfo(cssCache: {}, translate: {},

20
webapp_post.py
View File

@ -1344,7 +1344,7 @@ def individualPostAsHtml(signing_priv_key_pem: str,
showPublicOnly: bool, showPublicOnly: bool,
storeToCache: bool, storeToCache: bool,
useCacheOnly: bool, useCacheOnly: bool,
CWlists: {}, cw_lists: {},
lists_enabled: str) -> str: lists_enabled: str) -> str:
""" Shows a single post as html """ Shows a single post as html
""" """
@ -1820,7 +1820,7 @@ def individualPostAsHtml(signing_priv_key_pem: str,
footerStr = newFooterStr footerStr = newFooterStr
# add any content warning from the cwlists directory # add any content warning from the cwlists directory
addCWfromLists(post_json_object, CWlists, translate, lists_enabled) addCWfromLists(post_json_object, cw_lists, translate, lists_enabled)
postIsSensitive = False postIsSensitive = False
if post_json_object['object'].get('sensitive'): if post_json_object['object'].get('sensitive'):
@ -2006,7 +2006,7 @@ def htmlIndividualPost(cssCache: {},
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str, max_like_count: int, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show an individual post as html """Show an individual post as html
""" """
originalPostJson = post_json_object originalPostJson = post_json_object
@ -2072,7 +2072,7 @@ def htmlIndividualPost(cssCache: {},
allow_local_network_access, themeName, allow_local_network_access, themeName,
system_language, max_like_count, system_language, max_like_count,
False, authorized, False, False, False, False, False, authorized, False, False, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
messageId = removeIdEnding(post_json_object['id']) messageId = removeIdEnding(post_json_object['id'])
# show the previous posts # show the previous posts
@ -2105,7 +2105,7 @@ def htmlIndividualPost(cssCache: {},
max_like_count, max_like_count,
False, authorized, False, authorized,
False, False, False, False, False, False, False, False,
CWlists, lists_enabled) + postStr cw_lists, lists_enabled) + postStr
# show the following posts # show the following posts
postFilename = locatePost(base_dir, nickname, domain, messageId) postFilename = locatePost(base_dir, nickname, domain, messageId)
@ -2140,7 +2140,7 @@ def htmlIndividualPost(cssCache: {},
max_like_count, max_like_count,
False, authorized, False, authorized,
False, False, False, False, False, False, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
cssFilename = base_dir + '/epicyon-profile.css' cssFilename = base_dir + '/epicyon-profile.css'
if os.path.isfile(base_dir + '/epicyon.css'): if os.path.isfile(base_dir + '/epicyon.css'):
cssFilename = base_dir + '/epicyon.css' cssFilename = base_dir + '/epicyon.css'
@ -2166,7 +2166,7 @@ def htmlPostReplies(cssCache: {},
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, CWlists: {}, signing_priv_key_pem: str, cw_lists: {},
lists_enabled: str) -> str: lists_enabled: str) -> str:
"""Show the replies to an individual post as html """Show the replies to an individual post as html
""" """
@ -2191,7 +2191,7 @@ def htmlPostReplies(cssCache: {},
themeName, system_language, themeName, system_language,
max_like_count, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
cssFilename = base_dir + '/epicyon-profile.css' cssFilename = base_dir + '/epicyon-profile.css'
if os.path.isfile(base_dir + '/epicyon.css'): if os.path.isfile(base_dir + '/epicyon.css'):
@ -2219,7 +2219,7 @@ def htmlEmojiReactionPicker(cssCache: {},
allow_local_network_access: bool, allow_local_network_access: bool,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str, max_like_count: int, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
boxName: str, pageNumber: int) -> str: boxName: str, pageNumber: int) -> str:
"""Returns the emoji picker screen """Returns the emoji picker screen
""" """
@ -2243,7 +2243,7 @@ def htmlEmojiReactionPicker(cssCache: {},
themeName, system_language, themeName, system_language,
max_like_count, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
reactionsFilename = base_dir + '/emoji/reactions.json' reactionsFilename = base_dir + '/emoji/reactions.json'
if not os.path.isfile(reactionsFilename): if not os.path.isfile(reactionsFilename):

30
webapp_profile.py
View File

@ -140,7 +140,7 @@ def htmlProfileAfterSearch(cssCache: {},
system_language: str, system_language: str,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show a profile page after a search for a fediverse address """Show a profile page after a search for a fediverse address
""" """
http = False http = False
@ -350,7 +350,7 @@ def htmlProfileAfterSearch(cssCache: {},
themeName, system_language, themeName, system_language,
max_like_count, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
i += 1 i += 1
if i >= 8: if i >= 8:
break break
@ -562,7 +562,7 @@ def htmlProfile(signing_priv_key_pem: str,
shared_items_federated_domains: [], shared_items_federated_domains: [],
extraJson: {}, pageNumber: int, extraJson: {}, pageNumber: int,
maxItemsPerPage: int, maxItemsPerPage: int,
CWlists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
content_license_url: str) -> str: content_license_url: str) -> str:
"""Show the profile page as html """Show the profile page as html
""" """
@ -586,7 +586,7 @@ def htmlProfile(signing_priv_key_pem: str,
allow_local_network_access, accessKeys, allow_local_network_access, accessKeys,
system_language, max_like_count, system_language, max_like_count,
shared_items_federated_domains, None, shared_items_federated_domains, None,
pageNumber, maxItemsPerPage, CWlists, pageNumber, maxItemsPerPage, cw_lists,
lists_enabled) lists_enabled)
domain, port = getDomainFromActor(profileJson['id']) domain, port = getDomainFromActor(profileJson['id'])
@ -969,7 +969,7 @@ def htmlProfile(signing_priv_key_pem: str,
theme, system_language, theme, system_language,
max_like_count, max_like_count,
signing_priv_key_pem, signing_priv_key_pem,
CWlists, lists_enabled) + licenseStr cw_lists, lists_enabled) + licenseStr
if not isGroup: if not isGroup:
if selected == 'following': if selected == 'following':
profileStr += \ profileStr += \
@ -1039,7 +1039,7 @@ def _htmlProfilePosts(recentPostsCache: {}, max_recent_posts: int,
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Shows posts on the profile screen """Shows posts on the profile screen
These should only be public posts These should only be public posts
""" """
@ -1085,7 +1085,7 @@ def _htmlProfilePosts(recentPostsCache: {}, max_recent_posts: int,
max_like_count, max_like_count,
False, False, False, False, False, False,
True, False, False, True, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
if postStr: if postStr:
profileStr += postStr + separatorStr profileStr += postStr + separatorStr
ctr += 1 ctr += 1
@ -1599,7 +1599,7 @@ def _htmlEditProfileSharedItems(base_dir: str, nickname: str, domain: str,
def _htmlEditProfileFiltering(base_dir: str, nickname: str, domain: str, def _htmlEditProfileFiltering(base_dir: str, nickname: str, domain: str,
user_agents_blocked: str, user_agents_blocked: str,
translate: {}, replyIntervalHours: int, translate: {}, replyIntervalHours: int,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Filtering and blocking section of edit profile screen """Filtering and blocking section of edit profile screen
""" """
filterStr = '' filterStr = ''
@ -1774,8 +1774,8 @@ def _htmlEditProfileFiltering(base_dir: str, nickname: str, domain: str,
'user_agents_blockedStr', user_agents_blockedStr, 'user_agents_blockedStr', user_agents_blockedStr,
200, '', False) 200, '', False)
CWlistsStr = '' cw_listsStr = ''
for name, item in CWlists.items(): for name, item in cw_lists.items():
variableName = getCWlistVariable(name) variableName = getCWlistVariable(name)
listIsEnabled = False listIsEnabled = False
if lists_enabled: if lists_enabled:
@ -1783,12 +1783,12 @@ def _htmlEditProfileFiltering(base_dir: str, nickname: str, domain: str,
listIsEnabled = True listIsEnabled = True
if translate.get(name): if translate.get(name):
name = translate[name] name = translate[name]
CWlistsStr += editCheckBox(name, variableName, listIsEnabled) cw_listsStr += editCheckBox(name, variableName, listIsEnabled)
if CWlistsStr: if cw_listsStr:
idx = 'Add content warnings for the following sites' idx = 'Add content warnings for the following sites'
editProfileForm += \ editProfileForm += \
'<label class="labels">' + translate[idx] + ':</label>\n' + \ '<label class="labels">' + translate[idx] + ':</label>\n' + \
'<br>' + CWlistsStr '<br>' + cw_listsStr
editProfileForm += endEditSection() editProfileForm += endEditSection()
return editProfileForm return editProfileForm
@ -2096,7 +2096,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, base_dir: str, path: str,
user_agents_blocked: str, user_agents_blocked: str,
accessKeys: {}, accessKeys: {},
default_reply_interval_hrs: int, default_reply_interval_hrs: int,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Shows the edit profile screen """Shows the edit profile screen
""" """
path = path.replace('/inbox', '').replace('/outbox', '') path = path.replace('/inbox', '').replace('/outbox', '')
@ -2307,7 +2307,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, base_dir: str, path: str,
_htmlEditProfileFiltering(base_dir, nickname, domain, _htmlEditProfileFiltering(base_dir, nickname, domain,
user_agents_blocked, translate, user_agents_blocked, translate,
replyIntervalHours, replyIntervalHours,
CWlists, lists_enabled) cw_lists, lists_enabled)
# git projects section # git projects section
editProfileForm += \ editProfileForm += \

8
webapp_search.py
View File

@ -606,7 +606,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
system_language: str, system_language: str,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, cw_lists: {},
lists_enabled: str) -> str: lists_enabled: str) -> str:
"""Show a page containing search results for your post history """Show a page containing search results for your post history
""" """
@ -693,7 +693,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
showIndividualPostIcons, showIndividualPostIcons,
showIndividualPostIcons, showIndividualPostIcons,
False, False, False, False, False, False, False, False,
CWlists, lists_enabled) cw_lists, lists_enabled)
if postStr: if postStr:
historySearchForm += separatorStr + postStr historySearchForm += separatorStr + postStr
index += 1 index += 1
@ -718,7 +718,7 @@ def htmlHashtagSearch(cssCache: {},
themeName: str, system_language: str, themeName: str, system_language: str,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show a page containing search results for a hashtag """Show a page containing search results for a hashtag
or after selecting a hashtag from the swarm or after selecting a hashtag from the swarm
""" """
@ -876,7 +876,7 @@ def htmlHashtagSearch(cssCache: {},
showRepeats, showIcons, showRepeats, showIcons,
manuallyApprovesFollowers, manuallyApprovesFollowers,
showPublicOnly, showPublicOnly,
storeToCache, False, CWlists, storeToCache, False, cw_lists,
lists_enabled) lists_enabled)
if postStr: if postStr:
hashtagSearchForm += separatorStr + postStr hashtagSearchForm += separatorStr + postStr

48
webapp_timeline.py
View File

@ -450,7 +450,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the timeline as html """Show the timeline as html
""" """
enableTimingLog = False enableTimingLog = False
@ -918,7 +918,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, useCacheOnly, False, True, useCacheOnly,
CWlists, lists_enabled) cw_lists, lists_enabled)
_logTimelineTiming(enableTimingLog, _logTimelineTiming(enableTimingLog,
timelineStartTime, boxName, '12') timelineStartTime, boxName, '12')
@ -1144,7 +1144,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the shares timeline as html """Show the shares timeline as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -1174,7 +1174,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
signing_priv_key_pem, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlWanted(cssCache: {}, defaultTimeline: str, def htmlWanted(cssCache: {}, defaultTimeline: str,
@ -1202,7 +1202,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the wanted timeline as html """Show the wanted timeline as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -1232,7 +1232,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
signing_priv_key_pem, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlInbox(cssCache: {}, defaultTimeline: str, def htmlInbox(cssCache: {}, defaultTimeline: str,
@ -1261,7 +1261,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the inbox as html """Show the inbox as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -1291,7 +1291,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
signing_priv_key_pem, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlBookmarks(cssCache: {}, defaultTimeline: str, def htmlBookmarks(cssCache: {}, defaultTimeline: str,
@ -1320,7 +1320,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the bookmarks as html """Show the bookmarks as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -1349,7 +1349,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
allow_local_network_access, text_mode_banner, allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem, shared_items_federated_domains, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlInboxDMs(cssCache: {}, defaultTimeline: str, def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
@ -1378,7 +1378,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the DM timeline as html """Show the DM timeline as html
""" """
artist = isArtist(base_dir, nickname) artist = isArtist(base_dir, nickname)
@ -1403,7 +1403,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
signing_priv_key_pem, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlInboxReplies(cssCache: {}, defaultTimeline: str, def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
@ -1432,7 +1432,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the replies timeline as html """Show the replies timeline as html
""" """
artist = isArtist(base_dir, nickname) artist = isArtist(base_dir, nickname)
@ -1456,7 +1456,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
allow_local_network_access, text_mode_banner, allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem, shared_items_federated_domains, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlInboxMedia(cssCache: {}, defaultTimeline: str, def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
@ -1485,7 +1485,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the media timeline as html """Show the media timeline as html
""" """
artist = isArtist(base_dir, nickname) artist = isArtist(base_dir, nickname)
@ -1509,7 +1509,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
allow_local_network_access, text_mode_banner, allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem, shared_items_federated_domains, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlInboxBlogs(cssCache: {}, defaultTimeline: str, def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
@ -1538,7 +1538,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the blogs timeline as html """Show the blogs timeline as html
""" """
artist = isArtist(base_dir, nickname) artist = isArtist(base_dir, nickname)
@ -1562,7 +1562,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
allow_local_network_access, text_mode_banner, allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem, shared_items_federated_domains, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlInboxFeatures(cssCache: {}, defaultTimeline: str, def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
@ -1592,7 +1592,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the features timeline as html """Show the features timeline as html
""" """
return htmlTimeline(cssCache, defaultTimeline, return htmlTimeline(cssCache, defaultTimeline,
@ -1615,7 +1615,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
allow_local_network_access, text_mode_banner, allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem, shared_items_federated_domains, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlInboxNews(cssCache: {}, defaultTimeline: str, def htmlInboxNews(cssCache: {}, defaultTimeline: str,
@ -1644,7 +1644,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the news timeline as html """Show the news timeline as html
""" """
return htmlTimeline(cssCache, defaultTimeline, return htmlTimeline(cssCache, defaultTimeline,
@ -1667,7 +1667,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
allow_local_network_access, text_mode_banner, allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem, shared_items_federated_domains, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)
def htmlOutbox(cssCache: {}, defaultTimeline: str, def htmlOutbox(cssCache: {}, defaultTimeline: str,
@ -1696,7 +1696,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
max_like_count: int, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
signing_priv_key_pem: str, signing_priv_key_pem: str,
CWlists: {}, lists_enabled: str) -> str: cw_lists: {}, lists_enabled: str) -> str:
"""Show the Outbox as html """Show the Outbox as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -1722,4 +1722,4 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
allow_local_network_access, text_mode_banner, allow_local_network_access, text_mode_banner,
accessKeys, system_language, max_like_count, accessKeys, system_language, max_like_count,
shared_items_federated_domains, signing_priv_key_pem, shared_items_federated_domains, signing_priv_key_pem,
CWlists, lists_enabled) cw_lists, lists_enabled)