From 43c2684781f0be8c1c4b7d6bb391ab02eb00b36b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 25 Dec 2021 17:31:22 +0000 Subject: [PATCH] Snake case --- daemon.py | 14 +++++++------- epicyon.py | 6 +++--- inbox.py | 12 ++++++------ tests.py | 16 ++++++++-------- utils.py | 4 ++-- webapp_profile.py | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/daemon.py b/daemon.py index f1b32ee8b..2d2e4fd46 100644 --- a/daemon.py +++ b/daemon.py @@ -12903,7 +12903,7 @@ class PubServer(BaseHTTPRequestHandler): nickname = getNicknameFromActor(path) if inReplyToUrl: - replyIntervalHours = self.server.defaultReplyIntervalHours + replyIntervalHours = self.server.default_reply_interval_hrs if not canReplyTo(base_dir, nickname, domain, inReplyToUrl, replyIntervalHours): print('Reply outside of time window ' + inReplyToUrl + @@ -13030,7 +13030,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.keyShortcuts.get(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, translate, base_dir, @@ -13044,7 +13044,7 @@ class PubServer(BaseHTTPRequestHandler): city, self.server.userAgentsBlocked, accessKeys, - defaultReplyIntervalHours, + default_reply_interval_hrs, self.server.CWlists, self.server.listsEnabled).encode('utf-8') if msg: @@ -18392,7 +18392,7 @@ def loadTokens(base_dir: str, tokensDict: {}, tokensLookup: {}) -> None: def runDaemon(content_license_url: str, listsEnabled: str, - defaultReplyIntervalHours: int, + default_reply_interval_hrs: int, lowBandwidth: bool, maxLikeCount: int, sharedItemsFederatedDomains: [], @@ -18542,8 +18542,8 @@ def runDaemon(content_license_url: str, } # how many hours after a post was publushed can a reply be made - defaultReplyIntervalHours = 9999999 - httpd.defaultReplyIntervalHours = defaultReplyIntervalHours + default_reply_interval_hrs = 9999999 + httpd.default_reply_interval_hrs = default_reply_interval_hrs httpd.keyShortcuts = {} loadAccessKeysForAccounts(base_dir, httpd.keyShortcuts, httpd.accessKeys) @@ -18900,7 +18900,7 @@ def runDaemon(content_license_url: str, httpd.systemLanguage, httpd.maxLikeCount, httpd.signingPrivateKeyPem, - httpd.defaultReplyIntervalHours, + httpd.default_reply_interval_hrs, httpd.CWlists), daemon=True) print('Creating scheduled post thread') diff --git a/epicyon.py b/epicyon.py index 2a4438e79..a84ac7d9e 100644 --- a/epicyon.py +++ b/epicyon.py @@ -181,8 +181,8 @@ parser.add_argument('--dormantMonths', default=3, help='How many months does a followed account need to ' + 'be unseen for before being considered dormant') -parser.add_argument('--defaultReplyIntervalHours', - dest='defaultReplyIntervalHours', type=int, +parser.add_argument('--default_reply_interval_hrs', + dest='default_reply_interval_hrs', type=int, default=1000, help='How many hours after publication of a post ' + 'are replies to it permitted') @@ -3212,7 +3212,7 @@ if args.defaultCurrency: if __name__ == "__main__": runDaemon(content_license_url, listsEnabled, - args.defaultReplyIntervalHours, + args.default_reply_interval_hrs, args.lowBandwidth, args.maxLikeCount, sharedItemsFederatedDomains, userAgentsBlocked, diff --git a/inbox.py b/inbox.py index 630e57b4f..7039302dd 100644 --- a/inbox.py +++ b/inbox.py @@ -3064,7 +3064,7 @@ def _createReplyNotificationFile(base_dir: str, nickname: str, domain: str, handle: str, debug: bool, postIsDM: bool, postJsonObject: {}, actor: str, updateIndexList: [], http_prefix: str, - defaultReplyIntervalHours: int) -> bool: + default_reply_interval_hrs: int) -> bool: """Generates a file indicating that a new reply has arrived The file can then be used by other systems to create a notification xmpp, matrix, email, etc @@ -3095,7 +3095,7 @@ def _createReplyNotificationFile(base_dir: str, nickname: str, domain: str, # after publication replyIntervalHours = \ getReplyIntervalHours(base_dir, nickname, domain, - defaultReplyIntervalHours) + default_reply_interval_hrs) if canReplyTo(base_dir, nickname, domain, inReplyTo, replyIntervalHours): actUrl = localActorUrl(http_prefix, nickname, domain) @@ -3196,7 +3196,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int, themeName: str, systemLanguage: str, maxLikeCount: int, signingPrivateKeyPem: str, - defaultReplyIntervalHours: int, + default_reply_interval_hrs: int, CWlists: {}, listsEnabled: str, content_license_url: str) -> bool: """ Anything which needs to be done after initial checks have passed @@ -3493,7 +3493,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int, handle, debug, postIsDM, postJsonObject, actor, updateIndexList, http_prefix, - defaultReplyIntervalHours) + default_reply_interval_hrs) if isImageMedia(session, base_dir, http_prefix, nickname, domain, postJsonObject, @@ -4080,7 +4080,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int, verifyAllSignatures: bool, themeName: str, systemLanguage: str, maxLikeCount: int, signingPrivateKeyPem: str, - defaultReplyIntervalHours: int, + default_reply_interval_hrs: int, CWlists: {}) -> None: """Processes received items and moves them to the appropriate directories @@ -4511,7 +4511,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int, themeName, systemLanguage, maxLikeCount, signingPrivateKeyPem, - defaultReplyIntervalHours, + default_reply_interval_hrs, CWlists, listsEnabled, content_license_url) if debug: diff --git a/tests.py b/tests.py index 759636f53..8f89d6f7a 100644 --- a/tests.py +++ b/tests.py @@ -792,12 +792,12 @@ def createServerAlice(path: str, domain: str, port: int, logLoginFailures = False userAgentsBlocked = [] maxLikeCount = 10 - defaultReplyIntervalHours = 9999999999 + default_reply_interval_hrs = 9999999999 listsEnabled = '' content_license_url = 'https://creativecommons.org/licenses/by/4.0' print('Server running: Alice') runDaemon(content_license_url, - listsEnabled, defaultReplyIntervalHours, + listsEnabled, default_reply_interval_hrs, lowBandwidth, maxLikeCount, sharedItemsFederatedDomains, userAgentsBlocked, @@ -934,12 +934,12 @@ def createServerBob(path: str, domain: str, port: int, logLoginFailures = False userAgentsBlocked = [] maxLikeCount = 10 - defaultReplyIntervalHours = 9999999999 + default_reply_interval_hrs = 9999999999 listsEnabled = '' content_license_url = 'https://creativecommons.org/licenses/by/4.0' print('Server running: Bob') runDaemon(content_license_url, - listsEnabled, defaultReplyIntervalHours, + listsEnabled, default_reply_interval_hrs, lowBandwidth, maxLikeCount, sharedItemsFederatedDomains, userAgentsBlocked, @@ -1004,12 +1004,12 @@ def createServerEve(path: str, domain: str, port: int, federationList: [], userAgentsBlocked = [] maxLikeCount = 10 lowBandwidth = True - defaultReplyIntervalHours = 9999999999 + default_reply_interval_hrs = 9999999999 listsEnabled = '' content_license_url = 'https://creativecommons.org/licenses/by/4.0' print('Server running: Eve') runDaemon(content_license_url, - listsEnabled, defaultReplyIntervalHours, + listsEnabled, default_reply_interval_hrs, lowBandwidth, maxLikeCount, sharedItemsFederatedDomains, userAgentsBlocked, @@ -1076,12 +1076,12 @@ def createServerGroup(path: str, domain: str, port: int, userAgentsBlocked = [] maxLikeCount = 10 lowBandwidth = True - defaultReplyIntervalHours = 9999999999 + default_reply_interval_hrs = 9999999999 listsEnabled = '' content_license_url = 'https://creativecommons.org/licenses/by/4.0' print('Server running: Group') runDaemon(content_license_url, - listsEnabled, defaultReplyIntervalHours, + listsEnabled, default_reply_interval_hrs, lowBandwidth, maxLikeCount, sharedItemsFederatedDomains, userAgentsBlocked, diff --git a/utils.py b/utils.py index c75a57134..9636b9807 100644 --- a/utils.py +++ b/utils.py @@ -1376,7 +1376,7 @@ def _getPublishedDate(postJsonObject: {}) -> 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. The reply interval is the number of hours after a post being made during which replies are allowed @@ -1388,7 +1388,7 @@ def getReplyIntervalHours(base_dir: str, nickname: str, domain: str, hoursStr = fp.read() if hoursStr.isdigit(): return int(hoursStr) - return defaultReplyIntervalHours + return default_reply_interval_hrs def setReplyIntervalHours(base_dir: str, nickname: str, domain: str, diff --git a/webapp_profile.py b/webapp_profile.py index 2b5a38490..6ebf65f50 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -2090,7 +2090,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, base_dir: str, path: str, textModeBanner: str, city: str, userAgentsBlocked: str, accessKeys: {}, - defaultReplyIntervalHours: int, + default_reply_interval_hrs: int, CWlists: {}, listsEnabled: str) -> str: """Shows the edit profile screen """ @@ -2297,7 +2297,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, base_dir: str, path: str, # Filtering and blocking section replyIntervalHours = getReplyIntervalHours(base_dir, nickname, domain, - defaultReplyIntervalHours) + default_reply_interval_hrs) editProfileForm += \ _htmlEditProfileFiltering(base_dir, nickname, domain, userAgentsBlocked, translate,