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 21:29:53 +00:00
parent bf8bf79620
commit 74ee5eeb7e
10 changed files with 114 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
daemon.py
View File

@ -1290,7 +1290,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.postLog,
self.server.cachedWebfingers,
self.server.personCache,
self.server.allowDeletion,
self.server.allow_deletion,
self.server.proxy_type, version,
self.server.debug,
self.server.yt_replace_domain,
@ -7755,7 +7755,7 @@ class PubServer(BaseHTTPRequestHandler):
self.postToNickname, domain,
self.server.port, announceJson,
None, True,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix, self.server.project_version,
timelineStr,
self.server.yt_replace_domain,
@ -8214,7 +8214,7 @@ class PubServer(BaseHTTPRequestHandler):
self.postToNickname, domain,
self.server.port, likedPostJson,
None, True,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
timelineStr,
@ -8369,7 +8369,7 @@ class PubServer(BaseHTTPRequestHandler):
self.postToNickname, domain,
self.server.port, likedPostJson,
None, True,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version, timelineStr,
self.server.yt_replace_domain,
@ -8552,7 +8552,7 @@ class PubServer(BaseHTTPRequestHandler):
self.postToNickname, domain,
self.server.port, reactionPostJson,
None, True,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
timelineStr,
@ -8725,7 +8725,7 @@ class PubServer(BaseHTTPRequestHandler):
self.postToNickname, domain,
self.server.port, reactionPostJson,
None, True,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version, timelineStr,
self.server.yt_replace_domain,
@ -8945,7 +8945,7 @@ class PubServer(BaseHTTPRequestHandler):
self.postToNickname, domain,
self.server.port, bookmarkPostJson,
None, True,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix, self.server.project_version,
timelineStr,
self.server.yt_replace_domain,
@ -9073,7 +9073,7 @@ class PubServer(BaseHTTPRequestHandler):
self.postToNickname, domain,
self.server.port, bookmarkPostJson,
None, True,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version, timelineStr,
self.server.yt_replace_domain,
@ -9135,7 +9135,7 @@ class PubServer(BaseHTTPRequestHandler):
usersPath = path.split('?delete=')[0]
actor = \
http_prefix + '://' + domainFull + usersPath
if self.server.allowDeletion or \
if self.server.allow_deletion or \
deleteUrl.startswith(actor):
if self.server.debug:
print('DEBUG: deleteUrl=' + deleteUrl)
@ -9275,7 +9275,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname, domain,
self.server.port, mutePostJson,
avatarUrl, showAvatarOptions,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version, timelineStr,
self.server.yt_replace_domain,
@ -9385,7 +9385,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname, domain,
self.server.port, mutePostJson,
avatarUrl, showAvatarOptions,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version, timelineStr,
self.server.yt_replace_domain,
@ -10159,7 +10159,7 @@ class PubServer(BaseHTTPRequestHandler):
translate: {},
cachedWebfingers: {},
personCache: {},
allowDeletion: bool,
allow_deletion: bool,
project_version: str,
yt_replace_domain: str,
twitter_replacement_domain: str) -> bool:
@ -10242,7 +10242,7 @@ class PubServer(BaseHTTPRequestHandler):
domain,
port,
inboxFeed,
allowDeletion,
allow_deletion,
http_prefix,
project_version,
minimalNick,
@ -10395,7 +10395,7 @@ class PubServer(BaseHTTPRequestHandler):
domain,
port,
inboxDMFeed,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
minimalNick,
@ -10540,7 +10540,7 @@ class PubServer(BaseHTTPRequestHandler):
domain,
port,
inboxRepliesFeed,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
minimalNick,
@ -10681,7 +10681,7 @@ class PubServer(BaseHTTPRequestHandler):
domain,
port,
inboxMediaFeed,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
minimalNick,
@ -10823,7 +10823,7 @@ class PubServer(BaseHTTPRequestHandler):
domain,
port,
inboxBlogsFeed,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
minimalNick,
@ -10974,7 +10974,7 @@ class PubServer(BaseHTTPRequestHandler):
domain,
port,
inboxNewsFeed,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
minimalNick,
@ -11126,7 +11126,7 @@ class PubServer(BaseHTTPRequestHandler):
domain,
port,
inboxFeaturesFeed,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
minimalNick,
@ -11236,7 +11236,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname,
domain,
port,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
self.server.yt_replace_domain,
@ -11321,7 +11321,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname,
domain,
port,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
self.server.yt_replace_domain,
@ -11444,7 +11444,7 @@ class PubServer(BaseHTTPRequestHandler):
domain,
port,
bookmarksFeed,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
minimalNick,
@ -11582,7 +11582,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache,
nickname, domain, port,
outboxFeed,
self.server.allowDeletion,
self.server.allow_deletion,
http_prefix,
self.server.project_version,
minimalNick,
@ -15918,7 +15918,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.translate,
self.server.cachedWebfingers,
self.server.personCache,
self.server.allowDeletion,
self.server.allow_deletion,
self.server.project_version,
self.server.yt_replace_domain,
self.server.twitter_replacement_domain):
@ -18479,7 +18479,7 @@ def runDaemon(content_license_url: str,
proxy_type: str = None, max_replies: int = 64,
domain_max_posts_per_day: int = 8640,
account_max_posts_per_day: int = 864,
allowDeletion: bool = False,
allow_deletion: bool = False,
debug: bool = False, unitTest: bool = False,
instanceOnlySkillsSearch: bool = False,
sendThreads: [] = [],
@ -18752,7 +18752,7 @@ def runDaemon(content_license_url: str,
httpd.sendThreads = sendThreads
httpd.postLog = []
httpd.maxQueueLength = 64
httpd.allowDeletion = allowDeletion
httpd.allow_deletion = allow_deletion
httpd.lastLoginTime = 0
httpd.lastLoginFailure = 0
httpd.loginFailureCount = {}
@ -18930,7 +18930,7 @@ def runDaemon(content_license_url: str,
max_replies,
domain_max_posts_per_day,
account_max_posts_per_day,
allowDeletion, debug,
allow_deletion, debug,
max_mentions, max_emoji,
httpd.translate, unitTest,
httpd.yt_replace_domain,

4
delete.py
View File

@ -115,7 +115,7 @@ def sendDeleteViaServer(base_dir: str, session,
def outboxDelete(base_dir: str, http_prefix: str,
nickname: str, domain: str,
messageJson: {}, debug: bool,
allowDeletion: bool,
allow_deletion: bool,
recentPostsCache: {}) -> None:
""" When a delete request is received by the outbox from c2s
"""
@ -132,7 +132,7 @@ def outboxDelete(base_dir: str, http_prefix: str,
if debug:
print('DEBUG: c2s delete request arrived in outbox')
deletePrefix = http_prefix + '://' + domain
if (not allowDeletion and
if (not allow_deletion and
(not messageJson['object'].startswith(deletePrefix) or
not messageJson['actor'].startswith(deletePrefix))):
if debug:

66
inbox.py
View File

@ -284,7 +284,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int,
session, cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int,
postJsonObject: {},
allowDeletion: bool, boxname: str,
allow_deletion: bool, boxname: str,
show_published_date_only: bool,
peertubeInstances: [],
allow_local_network_access: bool,
@ -310,7 +310,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int,
base_dir, session, cachedWebfingers,
personCache,
nickname, domain, port, postJsonObject,
avatarUrl, True, allowDeletion,
avatarUrl, True, allow_deletion,
http_prefix, __version__, boxname,
yt_replace_domain, twitter_replacement_domain,
show_published_date_only,
@ -998,7 +998,7 @@ def _receiveLike(recentPostsCache: {},
debug: bool,
signingPrivateKeyPem: str,
max_recent_posts: int, translate: {},
allowDeletion: bool,
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
@ -1095,7 +1095,7 @@ def _receiveLike(recentPostsCache: {},
translate, pageNumber, base_dir,
session, cachedWebfingers, personCache,
handleName, domain, port, likedPostJson,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, __version__,
'inbox',
yt_replace_domain,
@ -1120,7 +1120,7 @@ def _receiveUndoLike(recentPostsCache: {},
debug: bool,
signingPrivateKeyPem: str,
max_recent_posts: int, translate: {},
allowDeletion: bool,
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
@ -1206,7 +1206,7 @@ def _receiveUndoLike(recentPostsCache: {},
translate, pageNumber, base_dir,
session, cachedWebfingers, personCache,
handleName, domain, port, likedPostJson,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, __version__,
'inbox',
yt_replace_domain,
@ -1232,7 +1232,7 @@ def _receiveReaction(recentPostsCache: {},
debug: bool,
signingPrivateKeyPem: str,
max_recent_posts: int, translate: {},
allowDeletion: bool,
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
@ -1354,7 +1354,7 @@ def _receiveReaction(recentPostsCache: {},
translate, pageNumber, base_dir,
session, cachedWebfingers, personCache,
handleName, domain, port, reactionPostJson,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, __version__,
'inbox',
yt_replace_domain,
@ -1379,7 +1379,7 @@ def _receiveUndoReaction(recentPostsCache: {},
debug: bool,
signingPrivateKeyPem: str,
max_recent_posts: int, translate: {},
allowDeletion: bool,
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
@ -1481,7 +1481,7 @@ def _receiveUndoReaction(recentPostsCache: {},
translate, pageNumber, base_dir,
session, cachedWebfingers, personCache,
handleName, domain, port, reactionPostJson,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, __version__,
'inbox',
yt_replace_domain,
@ -1505,7 +1505,7 @@ def _receiveBookmark(recentPostsCache: {},
personCache: {}, messageJson: {}, federationList: [],
debug: bool, signingPrivateKeyPem: str,
max_recent_posts: int, translate: {},
allowDeletion: bool,
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
@ -1591,7 +1591,7 @@ def _receiveBookmark(recentPostsCache: {},
translate, pageNumber, base_dir,
session, cachedWebfingers, personCache,
nickname, domain, port, bookmarkedPostJson,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, __version__,
'inbox',
yt_replace_domain,
@ -1615,7 +1615,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
personCache: {}, messageJson: {}, federationList: [],
debug: bool, signingPrivateKeyPem: str,
max_recent_posts: int, translate: {},
allowDeletion: bool,
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
@ -1702,7 +1702,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
translate, pageNumber, base_dir,
session, cachedWebfingers, personCache,
nickname, domain, port, bookmarkedPostJson,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, __version__,
'inbox',
yt_replace_domain,
@ -1722,7 +1722,7 @@ def _receiveDelete(session, handle: str, isGroup: bool, base_dir: str,
http_prefix: str, domain: str, port: int,
sendThreads: [], postLog: [], cachedWebfingers: {},
personCache: {}, messageJson: {}, federationList: [],
debug: bool, allowDeletion: bool,
debug: bool, allow_deletion: bool,
recentPostsCache: {}) -> bool:
"""Receives a Delete activity within the POST section of HTTPServer
"""
@ -1736,7 +1736,7 @@ def _receiveDelete(session, handle: str, isGroup: bool, base_dir: str,
return False
domainFull = getFullDomain(domain, port)
deletePrefix = http_prefix + '://' + domainFull + '/'
if (not allowDeletion and
if (not allow_deletion and
(not messageJson['object'].startswith(deletePrefix) or
not messageJson['actor'].startswith(deletePrefix))):
if debug:
@ -1806,7 +1806,7 @@ def _receiveAnnounce(recentPostsCache: {},
themeName: str, systemLanguage: str,
signingPrivateKeyPem: str,
max_recent_posts: int,
allowDeletion: bool,
allow_deletion: bool,
peertubeInstances: [],
max_like_count: int, CWlists: {},
lists_enabled: str) -> bool:
@ -1909,7 +1909,7 @@ def _receiveAnnounce(recentPostsCache: {},
translate, pageNumber, base_dir,
session, cachedWebfingers, personCache,
nickname, domain, port, messageJson,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, __version__,
'inbox',
yt_replace_domain,
@ -2980,7 +2980,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
cachedWebfingers: {}, personCache: {},
signingPrivateKeyPem: str,
max_recent_posts: int, translate: {},
allowDeletion: bool,
allow_deletion: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertubeInstances: [],
@ -3022,7 +3022,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
translate, pageNumber, base_dir,
session, cachedWebfingers, personCache,
nickname, domain, port, questionJson,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, __version__,
'inbox',
yt_replace_domain,
@ -3185,7 +3185,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
port: int, proxy_type: str,
federationList: [], debug: bool,
queueFilename: str, destinationFilename: str,
max_replies: int, allowDeletion: bool,
max_replies: int, allow_deletion: bool,
max_mentions: int, max_emoji: int, translate: {},
unitTest: bool,
yt_replace_domain: str,
@ -3223,7 +3223,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
federationList,
debug, signingPrivateKeyPem,
max_recent_posts, translate,
allowDeletion,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
@ -3245,7 +3245,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
federationList,
debug, signingPrivateKeyPem,
max_recent_posts, translate,
allowDeletion,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
@ -3268,7 +3268,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
federationList,
debug, signingPrivateKeyPem,
max_recent_posts, translate,
allowDeletion,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
@ -3290,7 +3290,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
federationList,
debug, signingPrivateKeyPem,
max_recent_posts, translate,
allowDeletion,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
@ -3312,7 +3312,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
federationList,
debug, signingPrivateKeyPem,
max_recent_posts, translate,
allowDeletion,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
@ -3334,7 +3334,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
federationList,
debug, signingPrivateKeyPem,
max_recent_posts, translate,
allowDeletion,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
@ -3364,7 +3364,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
themeName, systemLanguage,
signingPrivateKeyPem,
max_recent_posts,
allowDeletion,
allow_deletion,
peertubeInstances,
max_like_count, CWlists, lists_enabled):
if debug:
@ -3392,7 +3392,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
personCache,
messageJson,
federationList,
debug, allowDeletion,
debug, allow_deletion,
recentPostsCache):
if debug:
print('DEBUG: Delete accepted from ' + actor)
@ -3456,7 +3456,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
cachedWebfingers, personCache,
signingPrivateKeyPem,
max_recent_posts, translate,
allowDeletion,
allow_deletion,
yt_replace_domain,
twitter_replacement_domain,
peertubeInstances,
@ -3561,7 +3561,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int,
handleName,
domain, port,
postJsonObject,
allowDeletion,
allow_deletion,
boxname,
show_published_date_only,
peertubeInstances,
@ -4070,7 +4070,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int,
federationList: [], max_replies: int,
domain_max_posts_per_day: int,
account_max_posts_per_day: int,
allowDeletion: bool, debug: bool, max_mentions: int,
allow_deletion: bool, debug: bool, max_mentions: int,
max_emoji: int, translate: {}, unitTest: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
@ -4500,7 +4500,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int,
federationList,
debug,
queueFilename, destination,
max_replies, allowDeletion,
max_replies, allow_deletion,
max_mentions, max_emoji,
translate, unitTest,
yt_replace_domain,

6
outbox.py
View File

@ -185,7 +185,7 @@ def postMessageToOutbox(session, translate: {},
recentPostsCache: {}, followersThreads: [],
federationList: [], sendThreads: [],
postLog: [], cachedWebfingers: {},
personCache: {}, allowDeletion: bool,
personCache: {}, allow_deletion: bool,
proxy_type: str, version: str, debug: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
@ -461,7 +461,7 @@ def postMessageToOutbox(session, translate: {},
personCache,
postToNickname, domain, port,
messageJson, None, True,
allowDeletion,
allow_deletion,
http_prefix, __version__,
boxNameIndex,
yt_replace_domain,
@ -589,7 +589,7 @@ def postMessageToOutbox(session, translate: {},
outboxDelete(base_dir, http_prefix,
postToNickname, domain,
messageJson, debug,
allowDeletion,
allow_deletion,
recentPostsCache)
if debug:

2
schedule.py
View File

@ -110,7 +110,7 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd,
httpd.postLog,
httpd.cachedWebfingers,
httpd.personCache,
httpd.allowDeletion,
httpd.allow_deletion,
httpd.proxy_type,
httpd.project_version,
httpd.debug,

16
tests.py
View File

@ -696,7 +696,7 @@ def createServerAlice(path: str, domain: str, port: int,
max_replies = 64
domain_max_posts_per_day = 1000
account_max_posts_per_day = 1000
allowDeletion = True
allow_deletion = True
low_bandwidth = True
privateKeyPem, publicKeyPem, person, wfEndpoint = \
createPerson(path, nickname, domain, port, http_prefix, True,
@ -818,7 +818,7 @@ def createServerAlice(path: str, domain: str, port: int,
http_prefix, federationList, max_mentions, max_emoji, False,
proxy_type, max_replies,
domain_max_posts_per_day, account_max_posts_per_day,
allowDeletion, True, True, False, sendThreads,
allow_deletion, True, True, False, sendThreads,
False)
@ -841,7 +841,7 @@ def createServerBob(path: str, domain: str, port: int,
max_replies = 64
domain_max_posts_per_day = 1000
account_max_posts_per_day = 1000
allowDeletion = True
allow_deletion = True
low_bandwidth = True
privateKeyPem, publicKeyPem, person, wfEndpoint = \
createPerson(path, nickname, domain, port, http_prefix, True,
@ -960,7 +960,7 @@ def createServerBob(path: str, domain: str, port: int,
http_prefix, federationList, max_mentions, max_emoji, False,
proxy_type, max_replies,
domain_max_posts_per_day, account_max_posts_per_day,
allowDeletion, True, True, False, sendThreads,
allow_deletion, True, True, False, sendThreads,
False)
@ -978,7 +978,7 @@ def createServerEve(path: str, domain: str, port: int, federationList: [],
proxy_type = None
password = 'evepass'
max_replies = 64
allowDeletion = True
allow_deletion = True
privateKeyPem, publicKeyPem, person, wfEndpoint = \
createPerson(path, nickname, domain, port, http_prefix, True,
False, password)
@ -1028,7 +1028,7 @@ def createServerEve(path: str, domain: str, port: int, federationList: [],
"instance_id", False, path, domain,
onion_domain, i2p_domain, None, None, port, port,
http_prefix, federationList, max_mentions, max_emoji, False,
proxy_type, max_replies, allowDeletion, True, True, False,
proxy_type, max_replies, allow_deletion, True, True, False,
sendThreads, False)
@ -1050,7 +1050,7 @@ def createServerGroup(path: str, domain: str, port: int,
max_replies = 64
domain_max_posts_per_day = 1000
account_max_posts_per_day = 1000
allowDeletion = True
allow_deletion = True
privateKeyPem, publicKeyPem, person, wfEndpoint = \
createGroup(path, nickname, domain, port, http_prefix, True,
password)
@ -1102,7 +1102,7 @@ def createServerGroup(path: str, domain: str, port: int,
http_prefix, federationList, max_mentions, max_emoji, False,
proxy_type, max_replies,
domain_max_posts_per_day, account_max_posts_per_day,
allowDeletion, True, True, False, sendThreads,
allow_deletion, True, True, False, sendThreads,
False)

4
webapp_moderation.py
View File

@ -35,7 +35,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
translate: {}, pageNumber: int, itemsPerPage: int,
session, base_dir: str, wfRequest: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
yt_replace_domain: str,
twitter_replacement_domain: str,
@ -65,7 +65,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
wfRequest, personCache,
nickname, domain, port, inboxJson, 'moderation',
allowDeletion, http_prefix,
allow_deletion, http_prefix,
project_version, True, False,
yt_replace_domain,
twitter_replacement_domain,

14
webapp_post.py
View File

@ -747,7 +747,7 @@ def _getMuteIconHtml(isMuted: bool,
postActor: str,
messageId: str,
nickname: str, domainFull: str,
allowDeletion: bool,
allow_deletion: bool,
pageNumberParam: str,
boxName: str,
timelinePostBookmark: str,
@ -755,7 +755,7 @@ def _getMuteIconHtml(isMuted: bool,
"""Returns html for mute icon/button
"""
muteStr = ''
if (allowDeletion or
if (allow_deletion or
('/' + domainFull + '/' in postActor and
messageId.startswith(postActor))):
return muteStr
@ -793,7 +793,7 @@ def _getMuteIconHtml(isMuted: bool,
def _getDeleteIconHtml(nickname: str, domainFull: str,
allowDeletion: bool,
allow_deletion: bool,
postActor: str,
messageId: str,
postJsonObject: {},
@ -802,7 +802,7 @@ def _getDeleteIconHtml(nickname: str, domainFull: str,
"""Returns html for delete icon/button
"""
deleteStr = ''
if (allowDeletion or
if (allow_deletion or
('/' + domainFull + '/' in postActor and
messageId.startswith(postActor))):
if '/users/' + nickname + '/' in messageId:
@ -1328,7 +1328,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
nickname: str, domain: str, port: int,
postJsonObject: {},
avatarUrl: str, showAvatarOptions: bool,
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
boxName: str,
yt_replace_domain: str,
@ -1730,7 +1730,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
postActor,
messageId,
nickname, domainFull,
allowDeletion,
allow_deletion,
pageNumberParam,
boxName,
timelinePostBookmark,
@ -1738,7 +1738,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
deleteStr = \
_getDeleteIconHtml(nickname, domainFull,
allowDeletion,
allow_deletion,
postActor,
messageId,
postJsonObject,

8
webapp_search.py
View File

@ -671,7 +671,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
index += 1
continue
showIndividualPostIcons = True
allowDeletion = False
allow_deletion = False
postStr = \
individualPostAsHtml(signingPrivateKeyPem,
True, recentPostsCache,
@ -681,7 +681,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
personCache,
nickname, domain, port,
postJsonObject,
None, True, allowDeletion,
None, True, allow_deletion,
http_prefix, project_version,
'search',
yt_replace_domain,
@ -845,7 +845,7 @@ def htmlHashtagSearch(cssCache: {},
showIndividualPostIcons = False
if nickname:
showIndividualPostIcons = True
allowDeletion = False
allow_deletion = False
showRepeats = showIndividualPostIcons
showIcons = showIndividualPostIcons
manuallyApprovesFollowers = False
@ -864,7 +864,7 @@ def htmlHashtagSearch(cssCache: {},
nickname, domain, port,
postJsonObject,
avatarUrl, showAvatarOptions,
allowDeletion,
allow_deletion,
http_prefix, project_version,
'search',
yt_replace_domain,

52
webapp_timeline.py
View File

@ -424,7 +424,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
itemsPerPage: int, session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, timelineJson: {},
boxName: str, allowDeletion: bool,
boxName: str, allow_deletion: bool,
http_prefix: str, project_version: str,
manuallyApproveFollowers: bool,
minimal: bool,
@ -903,7 +903,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
personCache,
nickname, domain, port,
item, None, True,
allowDeletion,
allow_deletion,
http_prefix, project_version,
boxName,
yt_replace_domain,
@ -1124,7 +1124,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int,
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
yt_replace_domain: str,
twitter_replacement_domain: str,
@ -1156,7 +1156,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, None,
'tlshares', allowDeletion,
'tlshares', allow_deletion,
http_prefix, project_version,
manuallyApproveFollowers,
False,
@ -1182,7 +1182,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int,
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
yt_replace_domain: str,
twitter_replacement_domain: str,
@ -1214,7 +1214,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, None,
'tlwanted', allowDeletion,
'tlwanted', allow_deletion,
http_prefix, project_version,
manuallyApproveFollowers,
False,
@ -1240,7 +1240,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1273,7 +1273,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, inboxJson,
'inbox', allowDeletion,
'inbox', allow_deletion,
http_prefix, project_version,
manuallyApproveFollowers,
minimal,
@ -1299,7 +1299,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, bookmarksJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1332,7 +1332,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, bookmarksJson,
'tlbookmarks', allowDeletion,
'tlbookmarks', allow_deletion,
http_prefix, project_version,
manuallyApproveFollowers,
minimal,
@ -1357,7 +1357,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1386,7 +1386,8 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
translate, pageNumber,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, inboxJson, 'dm', allowDeletion,
nickname, domain, port, inboxJson,
'dm', allow_deletion,
http_prefix, project_version, False, minimal,
yt_replace_domain,
twitter_replacement_domain,
@ -1399,7 +1400,8 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem,
shared_items_federated_domains,
signingPrivateKeyPem,
CWlists, lists_enabled)
@ -1409,7 +1411,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1439,7 +1441,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, inboxJson, 'tlreplies',
allowDeletion, http_prefix, project_version, False,
allow_deletion, http_prefix, project_version, False,
minimal,
yt_replace_domain,
twitter_replacement_domain,
@ -1462,7 +1464,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1492,7 +1494,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, inboxJson, 'tlmedia',
allowDeletion, http_prefix, project_version, False,
allow_deletion, http_prefix, project_version, False,
minimal,
yt_replace_domain,
twitter_replacement_domain,
@ -1515,7 +1517,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1545,7 +1547,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, inboxJson, 'tlblogs',
allowDeletion, http_prefix, project_version, False,
allow_deletion, http_prefix, project_version, False,
minimal,
yt_replace_domain,
twitter_replacement_domain,
@ -1568,7 +1570,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1598,7 +1600,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, inboxJson, 'tlfeatures',
allowDeletion, http_prefix, project_version, False,
allow_deletion, http_prefix, project_version, False,
minimal,
yt_replace_domain,
twitter_replacement_domain,
@ -1621,7 +1623,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1650,7 +1652,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, inboxJson, 'tlnews',
allowDeletion, http_prefix, project_version, False,
allow_deletion, http_prefix, project_version, False,
minimal,
yt_replace_domain,
twitter_replacement_domain,
@ -1673,7 +1675,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
session, base_dir: str,
cachedWebfingers: {}, personCache: {},
nickname: str, domain: str, port: int, outboxJson: {},
allowDeletion: bool,
allow_deletion: bool,
http_prefix: str, project_version: str,
minimal: bool,
yt_replace_domain: str,
@ -1705,7 +1707,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
itemsPerPage, session, base_dir,
cachedWebfingers, personCache,
nickname, domain, port, outboxJson, 'outbox',
allowDeletion, http_prefix, project_version,
allow_deletion, http_prefix, project_version,
manuallyApproveFollowers, minimal,
yt_replace_domain,
twitter_replacement_domain,