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 17:31:22 +00:00
parent 935bf87d30
commit 43c2684781
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon.py
View File

@ -12903,7 +12903,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname = getNicknameFromActor(path) nickname = getNicknameFromActor(path)
if inReplyToUrl: if inReplyToUrl:
replyIntervalHours = self.server.defaultReplyIntervalHours replyIntervalHours = self.server.default_reply_interval_hrs
if not canReplyTo(base_dir, nickname, domain, if not canReplyTo(base_dir, nickname, domain,
inReplyToUrl, replyIntervalHours): inReplyToUrl, replyIntervalHours):
print('Reply outside of time window ' + inReplyToUrl + print('Reply outside of time window ' + inReplyToUrl +
@ -13030,7 +13030,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.keyShortcuts.get(nickname): if self.server.keyShortcuts.get(nickname):
accessKeys = self.server.keyShortcuts[nickname] accessKeys = self.server.keyShortcuts[nickname]
defaultReplyIntervalHours = self.server.defaultReplyIntervalHours default_reply_interval_hrs = self.server.default_reply_interval_hrs
msg = htmlEditProfile(self.server.cssCache, msg = htmlEditProfile(self.server.cssCache,
translate, translate,
base_dir, base_dir,
@ -13044,7 +13044,7 @@ class PubServer(BaseHTTPRequestHandler):
city, city,
self.server.userAgentsBlocked, self.server.userAgentsBlocked,
accessKeys, accessKeys,
defaultReplyIntervalHours, default_reply_interval_hrs,
self.server.CWlists, self.server.CWlists,
self.server.listsEnabled).encode('utf-8') self.server.listsEnabled).encode('utf-8')
if msg: if msg:
@ -18392,7 +18392,7 @@ def loadTokens(base_dir: str, tokensDict: {}, tokensLookup: {}) -> None:
def runDaemon(content_license_url: str, def runDaemon(content_license_url: str,
listsEnabled: str, listsEnabled: str,
defaultReplyIntervalHours: int, default_reply_interval_hrs: int,
lowBandwidth: bool, lowBandwidth: bool,
maxLikeCount: int, maxLikeCount: int,
sharedItemsFederatedDomains: [], sharedItemsFederatedDomains: [],
@ -18542,8 +18542,8 @@ def runDaemon(content_license_url: str,
} }
# how many hours after a post was publushed can a reply be made # how many hours after a post was publushed can a reply be made
defaultReplyIntervalHours = 9999999 default_reply_interval_hrs = 9999999
httpd.defaultReplyIntervalHours = defaultReplyIntervalHours httpd.default_reply_interval_hrs = default_reply_interval_hrs
httpd.keyShortcuts = {} httpd.keyShortcuts = {}
loadAccessKeysForAccounts(base_dir, httpd.keyShortcuts, httpd.accessKeys) loadAccessKeysForAccounts(base_dir, httpd.keyShortcuts, httpd.accessKeys)
@ -18900,7 +18900,7 @@ def runDaemon(content_license_url: str,
httpd.systemLanguage, httpd.systemLanguage,
httpd.maxLikeCount, httpd.maxLikeCount,
httpd.signingPrivateKeyPem, httpd.signingPrivateKeyPem,
httpd.defaultReplyIntervalHours, httpd.default_reply_interval_hrs,
httpd.CWlists), daemon=True) httpd.CWlists), daemon=True)
print('Creating scheduled post thread') print('Creating scheduled post thread')

6
epicyon.py
View File

@ -181,8 +181,8 @@ parser.add_argument('--dormantMonths',
default=3, default=3,
help='How many months does a followed account need to ' + help='How many months does a followed account need to ' +
'be unseen for before being considered dormant') 'be unseen for before being considered dormant')
parser.add_argument('--defaultReplyIntervalHours', parser.add_argument('--default_reply_interval_hrs',
dest='defaultReplyIntervalHours', type=int, dest='default_reply_interval_hrs', type=int,
default=1000, default=1000,
help='How many hours after publication of a post ' + help='How many hours after publication of a post ' +
'are replies to it permitted') 'are replies to it permitted')
@ -3212,7 +3212,7 @@ if args.defaultCurrency:
if __name__ == "__main__": if __name__ == "__main__":
runDaemon(content_license_url, runDaemon(content_license_url,
listsEnabled, listsEnabled,
args.defaultReplyIntervalHours, args.default_reply_interval_hrs,
args.lowBandwidth, args.maxLikeCount, args.lowBandwidth, args.maxLikeCount,
sharedItemsFederatedDomains, sharedItemsFederatedDomains,
userAgentsBlocked, userAgentsBlocked,

12
inbox.py
View File

@ -3064,7 +3064,7 @@ def _createReplyNotificationFile(base_dir: str, nickname: str, domain: str,
handle: str, debug: bool, postIsDM: bool, handle: str, debug: bool, postIsDM: bool,
postJsonObject: {}, actor: str, postJsonObject: {}, actor: str,
updateIndexList: [], http_prefix: str, updateIndexList: [], http_prefix: str,
defaultReplyIntervalHours: int) -> bool: default_reply_interval_hrs: int) -> bool:
"""Generates a file indicating that a new reply has arrived """Generates a file indicating that a new reply has arrived
The file can then be used by other systems to create a notification The file can then be used by other systems to create a notification
xmpp, matrix, email, etc xmpp, matrix, email, etc
@ -3095,7 +3095,7 @@ def _createReplyNotificationFile(base_dir: str, nickname: str, domain: str,
# after publication # after publication
replyIntervalHours = \ replyIntervalHours = \
getReplyIntervalHours(base_dir, nickname, domain, getReplyIntervalHours(base_dir, nickname, domain,
defaultReplyIntervalHours) default_reply_interval_hrs)
if canReplyTo(base_dir, nickname, domain, inReplyTo, if canReplyTo(base_dir, nickname, domain, inReplyTo,
replyIntervalHours): replyIntervalHours):
actUrl = localActorUrl(http_prefix, nickname, domain) actUrl = localActorUrl(http_prefix, nickname, domain)
@ -3196,7 +3196,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
maxLikeCount: int, maxLikeCount: int,
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
defaultReplyIntervalHours: int, default_reply_interval_hrs: int,
CWlists: {}, listsEnabled: str, CWlists: {}, listsEnabled: 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
@ -3493,7 +3493,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
handle, debug, postIsDM, handle, debug, postIsDM,
postJsonObject, actor, postJsonObject, actor,
updateIndexList, http_prefix, updateIndexList, http_prefix,
defaultReplyIntervalHours) default_reply_interval_hrs)
if isImageMedia(session, base_dir, http_prefix, if isImageMedia(session, base_dir, http_prefix,
nickname, domain, postJsonObject, nickname, domain, postJsonObject,
@ -4080,7 +4080,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
verifyAllSignatures: bool, verifyAllSignatures: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
maxLikeCount: int, signingPrivateKeyPem: str, maxLikeCount: int, signingPrivateKeyPem: str,
defaultReplyIntervalHours: int, default_reply_interval_hrs: int,
CWlists: {}) -> None: CWlists: {}) -> None:
"""Processes received items and moves them to the appropriate """Processes received items and moves them to the appropriate
directories directories
@ -4511,7 +4511,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
themeName, systemLanguage, themeName, systemLanguage,
maxLikeCount, maxLikeCount,
signingPrivateKeyPem, signingPrivateKeyPem,
defaultReplyIntervalHours, default_reply_interval_hrs,
CWlists, listsEnabled, CWlists, listsEnabled,
content_license_url) content_license_url)
if debug: if debug:

16
tests.py
View File

@ -792,12 +792,12 @@ def createServerAlice(path: str, domain: str, port: int,
logLoginFailures = False logLoginFailures = False
userAgentsBlocked = [] userAgentsBlocked = []
maxLikeCount = 10 maxLikeCount = 10
defaultReplyIntervalHours = 9999999999 default_reply_interval_hrs = 9999999999
listsEnabled = '' listsEnabled = ''
content_license_url = 'https://creativecommons.org/licenses/by/4.0' content_license_url = 'https://creativecommons.org/licenses/by/4.0'
print('Server running: Alice') print('Server running: Alice')
runDaemon(content_license_url, runDaemon(content_license_url,
listsEnabled, defaultReplyIntervalHours, listsEnabled, default_reply_interval_hrs,
lowBandwidth, maxLikeCount, lowBandwidth, maxLikeCount,
sharedItemsFederatedDomains, sharedItemsFederatedDomains,
userAgentsBlocked, userAgentsBlocked,
@ -934,12 +934,12 @@ def createServerBob(path: str, domain: str, port: int,
logLoginFailures = False logLoginFailures = False
userAgentsBlocked = [] userAgentsBlocked = []
maxLikeCount = 10 maxLikeCount = 10
defaultReplyIntervalHours = 9999999999 default_reply_interval_hrs = 9999999999
listsEnabled = '' listsEnabled = ''
content_license_url = 'https://creativecommons.org/licenses/by/4.0' content_license_url = 'https://creativecommons.org/licenses/by/4.0'
print('Server running: Bob') print('Server running: Bob')
runDaemon(content_license_url, runDaemon(content_license_url,
listsEnabled, defaultReplyIntervalHours, listsEnabled, default_reply_interval_hrs,
lowBandwidth, maxLikeCount, lowBandwidth, maxLikeCount,
sharedItemsFederatedDomains, sharedItemsFederatedDomains,
userAgentsBlocked, userAgentsBlocked,
@ -1004,12 +1004,12 @@ def createServerEve(path: str, domain: str, port: int, federationList: [],
userAgentsBlocked = [] userAgentsBlocked = []
maxLikeCount = 10 maxLikeCount = 10
lowBandwidth = True lowBandwidth = True
defaultReplyIntervalHours = 9999999999 default_reply_interval_hrs = 9999999999
listsEnabled = '' listsEnabled = ''
content_license_url = 'https://creativecommons.org/licenses/by/4.0' content_license_url = 'https://creativecommons.org/licenses/by/4.0'
print('Server running: Eve') print('Server running: Eve')
runDaemon(content_license_url, runDaemon(content_license_url,
listsEnabled, defaultReplyIntervalHours, listsEnabled, default_reply_interval_hrs,
lowBandwidth, maxLikeCount, lowBandwidth, maxLikeCount,
sharedItemsFederatedDomains, sharedItemsFederatedDomains,
userAgentsBlocked, userAgentsBlocked,
@ -1076,12 +1076,12 @@ def createServerGroup(path: str, domain: str, port: int,
userAgentsBlocked = [] userAgentsBlocked = []
maxLikeCount = 10 maxLikeCount = 10
lowBandwidth = True lowBandwidth = True
defaultReplyIntervalHours = 9999999999 default_reply_interval_hrs = 9999999999
listsEnabled = '' listsEnabled = ''
content_license_url = 'https://creativecommons.org/licenses/by/4.0' content_license_url = 'https://creativecommons.org/licenses/by/4.0'
print('Server running: Group') print('Server running: Group')
runDaemon(content_license_url, runDaemon(content_license_url,
listsEnabled, defaultReplyIntervalHours, listsEnabled, default_reply_interval_hrs,
lowBandwidth, maxLikeCount, lowBandwidth, maxLikeCount,
sharedItemsFederatedDomains, sharedItemsFederatedDomains,
userAgentsBlocked, userAgentsBlocked,

4
utils.py
View File

@ -1376,7 +1376,7 @@ def _getPublishedDate(postJsonObject: {}) -> str:
def getReplyIntervalHours(base_dir: str, nickname: str, domain: str, def getReplyIntervalHours(base_dir: str, nickname: str, domain: str,
defaultReplyIntervalHours: int) -> int: default_reply_interval_hrs: int) -> int:
"""Returns the reply interval for the given account. """Returns the reply interval for the given account.
The reply interval is the number of hours after a post being made The reply interval is the number of hours after a post being made
during which replies are allowed during which replies are allowed
@ -1388,7 +1388,7 @@ def getReplyIntervalHours(base_dir: str, nickname: str, domain: str,
hoursStr = fp.read() hoursStr = fp.read()
if hoursStr.isdigit(): if hoursStr.isdigit():
return int(hoursStr) return int(hoursStr)
return defaultReplyIntervalHours return default_reply_interval_hrs
def setReplyIntervalHours(base_dir: str, nickname: str, domain: str, def setReplyIntervalHours(base_dir: str, nickname: str, domain: str,

4
webapp_profile.py
View File

@ -2090,7 +2090,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, base_dir: str, path: str,
textModeBanner: str, city: str, textModeBanner: str, city: str,
userAgentsBlocked: str, userAgentsBlocked: str,
accessKeys: {}, accessKeys: {},
defaultReplyIntervalHours: int, default_reply_interval_hrs: int,
CWlists: {}, listsEnabled: str) -> str: CWlists: {}, listsEnabled: str) -> str:
"""Shows the edit profile screen """Shows the edit profile screen
""" """
@ -2297,7 +2297,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, base_dir: str, path: str,
# Filtering and blocking section # Filtering and blocking section
replyIntervalHours = getReplyIntervalHours(base_dir, nickname, domain, replyIntervalHours = getReplyIntervalHours(base_dir, nickname, domain,
defaultReplyIntervalHours) default_reply_interval_hrs)
editProfileForm += \ editProfileForm += \
_htmlEditProfileFiltering(base_dir, nickname, domain, _htmlEditProfileFiltering(base_dir, nickname, domain,
userAgentsBlocked, translate, userAgentsBlocked, translate,