diff --git a/announce.py b/announce.py index 68f040d62..9b810994f 100644 --- a/announce.py +++ b/announce.py @@ -123,7 +123,7 @@ def createAnnounce(session, base_dir: str, federationList: [], send_threads: [], postLog: [], person_cache: {}, cached_webfingers: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates an announce message Typically toUrl will be https://www.w3.org/ns/activitystreams#Public and ccUrl might be a specific person favorited or repeated and the @@ -181,7 +181,7 @@ def createAnnounce(session, base_dir: str, federationList: [], http_prefix, True, client_to_server, federationList, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, None, groupAccount, - signingPrivateKeyPem, 639633) + signing_priv_key_pem, 639633) return newAnnounce @@ -192,7 +192,7 @@ def announcePublic(session, base_dir: str, federationList: [], send_threads: [], postLog: [], person_cache: {}, cached_webfingers: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Makes a public announcement """ fromDomain = getFullDomain(domain, port) @@ -206,7 +206,7 @@ def announcePublic(session, base_dir: str, federationList: [], send_threads, postLog, person_cache, cached_webfingers, debug, project_version, - signingPrivateKeyPem) + signing_priv_key_pem) def sendAnnounceViaServer(base_dir: str, session, @@ -215,7 +215,7 @@ def sendAnnounceViaServer(base_dir: str, session, http_prefix: str, repeatObjectUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates an announce message via c2s """ if not session: @@ -248,7 +248,7 @@ def sendAnnounceViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: announce webfinger failed for ' + handle) @@ -264,7 +264,7 @@ def sendAnnounceViaServer(base_dir: str, session, originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -308,7 +308,7 @@ def sendUndoAnnounceViaServer(base_dir: str, session, http_prefix: str, repeatObjectUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Undo an announce message via c2s """ if not session: @@ -333,7 +333,7 @@ def sendUndoAnnounceViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: undo announce webfinger failed for ' + handle) @@ -349,7 +349,7 @@ def sendUndoAnnounceViaServer(base_dir: str, session, originDomain = domain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, diff --git a/availability.py b/availability.py index ae375bf2a..b30f397f1 100644 --- a/availability.py +++ b/availability.py @@ -83,7 +83,7 @@ def sendAvailabilityViaServer(base_dir: str, session, status: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Sets the availability for a person via c2s """ if not session: @@ -109,7 +109,7 @@ def sendAvailabilityViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: availability webfinger failed for ' + handle) @@ -124,7 +124,7 @@ def sendAvailabilityViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = domain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, diff --git a/blog.py b/blog.py index 2b23c4de3..ac65b7572 100644 --- a/blog.py +++ b/blog.py @@ -191,7 +191,7 @@ def _htmlBlogPostContent(debug: bool, session, authorized: bool, post_json_object: {}, handle: str, restrictToDomain: bool, peertubeInstances: [], - systemLanguage: str, + system_language: str, person_cache: {}, blogSeparator: str = '
') -> str: """Returns the content for a single blog post @@ -271,7 +271,7 @@ def _htmlBlogPostContent(debug: bool, session, authorized: bool, languagesUnderstood = [] if actorJson: languagesUnderstood = getActorLanguagesList(actorJson) - jsonContent = getContentFromPost(post_json_object, systemLanguage, + jsonContent = getContentFromPost(post_json_object, system_language, languagesUnderstood) if jsonContent: contentStr = addEmbeddedElements(translate, jsonContent, @@ -351,7 +351,7 @@ def _htmlBlogPostRSS2(authorized: bool, nickname: str, domain: str, domainFull: str, post_json_object: {}, handle: str, restrictToDomain: bool, - systemLanguage: str) -> str: + system_language: str) -> str: """Returns the RSS version 2 feed for a single blog post """ rssStr = '' @@ -368,7 +368,7 @@ def _htmlBlogPostRSS2(authorized: bool, titleStr = post_json_object['object']['summary'] rssDateStr = pubDate.strftime("%a, %d %b %Y %H:%M:%S UT") content = \ - getBaseContentFromPost(post_json_object, systemLanguage) + getBaseContentFromPost(post_json_object, system_language) description = firstParagraphFromString(content) rssStr = ' ' rssStr += ' ' + titleStr + '' @@ -385,7 +385,7 @@ def _htmlBlogPostRSS3(authorized: bool, nickname: str, domain: str, domainFull: str, post_json_object: {}, handle: str, restrictToDomain: bool, - systemLanguage: str) -> str: + system_language: str) -> str: """Returns the RSS version 3 feed for a single blog post """ rssStr = '' @@ -402,7 +402,7 @@ def _htmlBlogPostRSS3(authorized: bool, titleStr = post_json_object['object']['summary'] rssDateStr = pubDate.strftime("%a, %d %b %Y %H:%M:%S UT") content = \ - getBaseContentFromPost(post_json_object, systemLanguage) + getBaseContentFromPost(post_json_object, system_language) description = firstParagraphFromString(content) rssStr = 'title: ' + titleStr + '\n' rssStr += 'link: ' + messageLink + '\n' @@ -424,10 +424,10 @@ def _htmlBlogRemoveCwButton(blogStr: str, translate: {}) -> str: def _getSnippetFromBlogContent(post_json_object: {}, - systemLanguage: str) -> str: + system_language: str) -> str: """Returns a snippet of text from the blog post as a preview """ - content = getBaseContentFromPost(post_json_object, systemLanguage) + content = getBaseContentFromPost(post_json_object, system_language) if '

' in content: content = content.split('

', 1)[1] if '

' in content: @@ -445,7 +445,7 @@ def htmlBlogPost(session, authorized: bool, nickname: str, domain: str, domainFull: str, post_json_object: {}, peertubeInstances: [], - systemLanguage: str, person_cache: {}, + system_language: str, person_cache: {}, debug: bool, content_license_url: str) -> str: """Returns a html blog post """ @@ -464,10 +464,10 @@ def htmlBlogPost(session, authorized: bool, url = '' if post_json_object['object'].get('url'): url = post_json_object['object']['url'] - snippet = _getSnippetFromBlogContent(post_json_object, systemLanguage) + snippet = _getSnippetFromBlogContent(post_json_object, system_language) blogStr = htmlHeaderWithBlogMarkup(cssFilename, instanceTitle, http_prefix, domainFull, nickname, - systemLanguage, published, modified, + system_language, published, modified, title, snippet, translate, url, content_license_url) _htmlBlogRemoveCwButton(blogStr, translate) @@ -477,7 +477,7 @@ def htmlBlogPost(session, authorized: bool, nickname, domain, domainFull, post_json_object, None, False, - peertubeInstances, systemLanguage, + peertubeInstances, system_language, person_cache) # show rss links @@ -506,7 +506,7 @@ def htmlBlogPage(authorized: bool, session, base_dir: str, http_prefix: str, translate: {}, nickname: str, domain: str, port: int, noOfItems: int, pageNumber: int, - peertubeInstances: [], systemLanguage: str, + peertubeInstances: [], system_language: str, person_cache: {}, debug: bool) -> str: """Returns a html blog page containing posts """ @@ -570,7 +570,7 @@ def htmlBlogPage(authorized: bool, session, domainFull, item, None, True, peertubeInstances, - systemLanguage, + system_language, person_cache) if len(timelineJson['orderedItems']) >= noOfItems: @@ -599,7 +599,7 @@ def htmlBlogPageRSS2(authorized: bool, session, base_dir: str, http_prefix: str, translate: {}, nickname: str, domain: str, port: int, noOfItems: int, pageNumber: int, - includeHeader: bool, systemLanguage: str) -> str: + includeHeader: bool, system_language: str) -> str: """Returns an RSS version 2 feed containing posts """ if ' ' in nickname or '@' in nickname or \ @@ -642,7 +642,7 @@ def htmlBlogPageRSS2(authorized: bool, session, http_prefix, translate, nickname, domain, domainFull, item, - None, True, systemLanguage) + None, True, system_language) if includeHeader: return blogRSS2 + rss2Footer() @@ -654,7 +654,7 @@ def htmlBlogPageRSS3(authorized: bool, session, base_dir: str, http_prefix: str, translate: {}, nickname: str, domain: str, port: int, noOfItems: int, pageNumber: int, - systemLanguage: str) -> str: + system_language: str) -> str: """Returns an RSS version 3 feed containing posts """ if ' ' in nickname or '@' in nickname or \ @@ -689,7 +689,7 @@ def htmlBlogPageRSS3(authorized: bool, session, nickname, domain, domainFull, item, None, True, - systemLanguage) + system_language) return blogRSS3 @@ -729,7 +729,7 @@ def htmlBlogView(authorized: bool, session, base_dir: str, http_prefix: str, translate: {}, domain: str, port: int, noOfItems: int, - peertubeInstances: [], systemLanguage: str, + peertubeInstances: [], system_language: str, person_cache: {}, debug: bool) -> str: """Show the blog main page """ @@ -749,7 +749,7 @@ def htmlBlogView(authorized: bool, base_dir, http_prefix, translate, nickname, domain, port, noOfItems, 1, peertubeInstances, - systemLanguage, person_cache, debug) + system_language, person_cache, debug) domainFull = getFullDomain(domain, port) @@ -775,7 +775,7 @@ def htmlEditBlog(media_instance: bool, translate: {}, path: str, pageNumber: int, nickname: str, domain: str, - postUrl: str, systemLanguage: str) -> str: + postUrl: str, system_language: str) -> str: """Edit a blog post after it was created """ postFilename = locatePost(base_dir, nickname, domain, postUrl) @@ -896,7 +896,7 @@ def htmlEditBlog(media_instance: bool, translate: {}, editBlogForm += '
' messageBoxHeight = 800 - contentStr = getBaseContentFromPost(post_json_object, systemLanguage) + contentStr = getBaseContentFromPost(post_json_object, system_language) contentStr = contentStr.replace('

', '').replace('

', '\n') editBlogForm += \ diff --git a/bookmarks.py b/bookmarks.py index 237b95f21..f4519db8d 100644 --- a/bookmarks.py +++ b/bookmarks.py @@ -376,7 +376,7 @@ def sendBookmarkViaServer(base_dir: str, session, http_prefix: str, bookmarkUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a bookmark via c2s """ if not session: @@ -406,7 +406,7 @@ def sendBookmarkViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: bookmark webfinger failed for ' + handle) @@ -421,7 +421,7 @@ def sendBookmarkViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = domain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -466,7 +466,7 @@ def sendUndoBookmarkViaServer(base_dir: str, session, http_prefix: str, bookmarkUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Removes a bookmark via c2s """ if not session: @@ -496,7 +496,7 @@ def sendUndoBookmarkViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: unbookmark webfinger failed for ' + handle) @@ -511,7 +511,7 @@ def sendUndoBookmarkViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = domain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, diff --git a/cache.py b/cache.py index b940c7f20..9fb4530a8 100644 --- a/cache.py +++ b/cache.py @@ -140,7 +140,7 @@ def getPersonPubKey(base_dir: str, session, personUrl: str, person_cache: {}, debug: bool, project_version: str, http_prefix: str, domain: str, onion_domain: str, - signingPrivateKeyPem: str) -> str: + signing_priv_key_pem: str) -> str: if not personUrl: return None personUrl = personUrl.replace('#main-key', '') @@ -166,7 +166,7 @@ def getPersonPubKey(base_dir: str, session, personUrl: str, 'Accept': 'application/activity+json; profile="' + profileStr + '"' } personJson = \ - getJson(signingPrivateKeyPem, + getJson(signing_priv_key_pem, session, personUrl, asHeader, None, debug, project_version, http_prefix, personDomain) if not personJson: diff --git a/daemon.py b/daemon.py index 241e1a238..82174929c 100644 --- a/daemon.py +++ b/daemon.py @@ -515,7 +515,7 @@ class PubServer(BaseHTTPRequestHandler): eventDate, eventTime, location, False, - self.server.systemLanguage, + self.server.system_language, conversationId, self.server.low_bandwidth, self.server.content_license_url) @@ -738,7 +738,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, self.server.http_prefix, self.server.domain, self.server.onion_domain, - self.server.signingPrivateKeyPem) + self.server.signing_priv_key_pem) if not pubKey: if self.server.debug: print('AUTH: secure mode failed to ' + @@ -1046,7 +1046,7 @@ class PubServer(BaseHTTPRequestHandler): onion_domain: str, i2p_domain: str, translate: {}, registration: bool, - systemLanguage: str, + system_language: str, project_version: str, customEmoji: [], show_node_info_accounts: bool) -> bool: @@ -1074,7 +1074,7 @@ class PubServer(BaseHTTPRequestHandler): i2p_domain, translate, registration, - systemLanguage, + system_language, project_version, customEmoji, show_node_info_accounts, @@ -1110,14 +1110,14 @@ class PubServer(BaseHTTPRequestHandler): onion_domain: str, i2p_domain: str, translate: {}, registration: bool, - systemLanguage: str, + system_language: str, project_version: str, customEmoji: [], show_node_info_accounts: bool) -> bool: return self._mastoApiV1(path, callingDomain, uaStr, authorized, http_prefix, base_dir, nickname, domain, domainFull, onion_domain, i2p_domain, - translate, registration, systemLanguage, + translate, registration, system_language, project_version, customEmoji, show_node_info_accounts) @@ -1297,11 +1297,11 @@ class PubServer(BaseHTTPRequestHandler): self.server.twitter_replacement_domain, self.server.show_published_date_only, self.server.allow_local_network_access, - city, self.server.systemLanguage, + city, self.server.system_language, self.server.shared_items_federated_domains, self.server.sharedItemFederationTokens, self.server.low_bandwidth, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.peertubeInstances, self.server.themeName, self.server.max_like_count, @@ -1542,7 +1542,7 @@ class PubServer(BaseHTTPRequestHandler): self.path, self.server.debug, self.server.blockedCache, - self.server.systemLanguage) + self.server.system_language) if queueFilename: # add json to the queue if queueFilename not in self.server.inboxQueue: @@ -1915,8 +1915,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.port, searchHandle, self.server.debug, - self.server.systemLanguage, - self.server.signingPrivateKeyPem) + self.server.system_language, + self.server.signing_priv_key_pem) else: msg = \ htmlModerationInfo(self.server.cssCache, @@ -2133,7 +2133,7 @@ class PubServer(BaseHTTPRequestHandler): debug: bool, accessKeys: {}, defaultTimeline: str, themeName: str, allow_local_network_access: bool, - systemLanguage: str) -> None: + system_language: str) -> None: """Receive POST from webapp_themeDesigner """ usersPath = '/users/' + nickname @@ -2170,9 +2170,9 @@ class PubServer(BaseHTTPRequestHandler): if 'submitThemeDesignerReset=' in themeParams: resetThemeDesignerSettings(base_dir, themeName, domain, allow_local_network_access, - systemLanguage) + system_language) setTheme(base_dir, themeName, domain, - allow_local_network_access, systemLanguage) + allow_local_network_access, system_language) if callingDomain.endswith('.onion') and onion_domain: originPathStr = \ @@ -2219,7 +2219,7 @@ class PubServer(BaseHTTPRequestHandler): setThemeFromDesigner(base_dir, themeName, domain, themeDesignerParams, allow_local_network_access, - systemLanguage) + system_language) # set boolean values if 'rss-icon-at-top' in themeDesignerParams: @@ -2727,9 +2727,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled, self.server.defaultTimeline).encode('utf-8') @@ -2746,7 +2746,7 @@ class PubServer(BaseHTTPRequestHandler): if isModerator(self.server.base_dir, chooserNickname): if debug: print('Showing info for ' + optionsActor) - signingPrivateKeyPem = self.server.signingPrivateKeyPem + signing_priv_key_pem = self.server.signing_priv_key_pem msg = \ htmlAccountInfo(self.server.cssCache, self.server.translate, @@ -2757,8 +2757,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.port, optionsActor, self.server.debug, - self.server.systemLanguage, - signingPrivateKeyPem).encode('utf-8') + self.server.system_language, + signing_priv_key_pem).encode('utf-8') msglen = len(msg) self._set_headers('text/html', msglen, cookie, callingDomain, False) @@ -2861,9 +2861,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled, self.server.defaultTimeline).encode('utf-8') @@ -3036,7 +3036,7 @@ class PubServer(BaseHTTPRequestHandler): else: print('Sending follow request from ' + followerNickname + ' to ' + followingActor) - if not self.server.signingPrivateKeyPem: + if not self.server.signing_priv_key_pem: print('Sending follow request with no signing key') sendFollowRequest(self.server.session, base_dir, followerNickname, @@ -3052,7 +3052,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.cached_webfingers, self.server.person_cache, debug, self.server.project_version, - self.server.signingPrivateKeyPem) + self.server.signing_priv_key_pem) if callingDomain.endswith('.onion') and onion_domain: originPathStr = 'http://' + onion_domain + usersPath elif (callingDomain.endswith('.i2p') and i2p_domain): @@ -3311,9 +3311,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) if hashtagStr: @@ -3406,9 +3406,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, 'outbox', - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) if historyStr: @@ -3474,9 +3474,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, 'bookmarks', - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) if bookmarksStr: @@ -3524,7 +3524,7 @@ class PubServer(BaseHTTPRequestHandler): actor, self.server.person_cache, None, True, - self.server.signingPrivateKeyPem) + self.server.signing_priv_key_pem) profilePathStr += \ '?options=' + actor + ';1;' + avatarUrl @@ -3545,8 +3545,8 @@ class PubServer(BaseHTTPRequestHandler): if self.server.keyShortcuts.get(nickname): accessKeys = self.server.keyShortcuts[nickname] - signingPrivateKeyPem = \ - self.server.signingPrivateKeyPem + signing_priv_key_pem = \ + self.server.signing_priv_key_pem twitter_replacement_domain = \ self.server.twitter_replacement_domain profileStr = \ @@ -3574,9 +3574,9 @@ class PubServer(BaseHTTPRequestHandler): allow_local_network_access, self.server.themeName, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - signingPrivateKeyPem, + signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) if profileStr: @@ -4633,7 +4633,7 @@ class PubServer(BaseHTTPRequestHandler): post_json_object['object']['content'] = \ newsPostContent contentMap = post_json_object['object']['contentMap'] - contentMap[self.server.systemLanguage] = newsPostContent + contentMap[self.server.system_language] = newsPostContent # update newswire pubDate = post_json_object['object']['published'] publishedDate = \ @@ -4677,7 +4677,7 @@ class PubServer(BaseHTTPRequestHandler): domain: str, domainFull: str, onion_domain: str, i2p_domain: str, debug: bool, allow_local_network_access: bool, - systemLanguage: str, content_license_url: str) -> None: + system_language: str, content_license_url: str) -> None: """Updates your user profile after editing via the Edit button on the profile screen """ @@ -5013,7 +5013,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.themeName = fields['themeDropdown'] setTheme(base_dir, self.server.themeName, domain, allow_local_network_access, - systemLanguage) + system_language) self.server.textModeBanner = \ getTextModeBanner(self.server.base_dir) self.server.iconsCache = {} @@ -5953,7 +5953,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.allow_local_network_access setTheme(base_dir, currTheme, domain, allow_local_network_access, - systemLanguage) + system_language) self.server.textModeBanner = \ getTextModeBanner(base_dir) self.server.iconsCache = {} @@ -6871,7 +6871,7 @@ class PubServer(BaseHTTPRequestHandler): port, maxPostsInRSSFeed, 1, True, - self.server.systemLanguage) + self.server.system_language) if msg is not None: msg = msg.encode('utf-8') msglen = len(msg) @@ -6921,7 +6921,7 @@ class PubServer(BaseHTTPRequestHandler): port, maxPostsInRSSFeed, 1, False, - self.server.systemLanguage) + self.server.system_language) break if msg: msg = rss2Header(http_prefix, @@ -7016,7 +7016,7 @@ class PubServer(BaseHTTPRequestHandler): base_dir: str, http_prefix: str, domain: str, port: int, proxy_type: str, GETstartTime, - debug: bool, systemLanguage: str) -> None: + debug: bool, system_language: str) -> None: """Returns an RSS3 feed """ nickname = path.split('/blog/')[1] @@ -7035,7 +7035,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.translate, nickname, domain, port, maxPostsInRSSFeed, 1, - systemLanguage) + system_language) if msg is not None: msg = msg.encode('utf-8') msglen = len(msg) @@ -7551,9 +7551,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) if hashtagStr: @@ -7610,7 +7610,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.project_version, self.server.yt_replace_domain, self.server.twitter_replacement_domain, - self.server.systemLanguage) + self.server.system_language) if hashtagStr: msg = hashtagStr.encode('utf-8') msglen = len(msg) @@ -7702,7 +7702,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.cached_webfingers, debug, self.server.project_version, - self.server.signingPrivateKeyPem) + self.server.signing_priv_key_pem) announceFilename = None if announceJson: # save the announce straight to the outbox @@ -7744,7 +7744,7 @@ class PubServer(BaseHTTPRequestHandler): followerApprovalActive(base_dir, self.postToNickname, domain) showRepeats = not isDM(announceJson) - individualPostAsHtml(self.server.signingPrivateKeyPem, False, + individualPostAsHtml(self.server.signing_priv_key_pem, False, self.server.recentPostsCache, self.server.max_recent_posts, self.server.translate, @@ -7764,7 +7764,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -7916,7 +7916,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.person_cache, debug, self.server.project_version, - self.server.signingPrivateKeyPem) + self.server.signing_priv_key_pem) originPathStrAbsolute = \ http_prefix + '://' + domainFull + originPathStr if callingDomain.endswith('.onion') and onion_domain: @@ -8071,7 +8071,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.person_cache, debug, self.server.project_version, - self.server.signingPrivateKeyPem) + self.server.signing_priv_key_pem) originPathStrAbsolute = \ http_prefix + '://' + domainFull + originPathStr if callingDomain.endswith('.onion') and onion_domain: @@ -8203,7 +8203,7 @@ class PubServer(BaseHTTPRequestHandler): followerApprovalActive(base_dir, self.postToNickname, domain) showRepeats = not isDM(likedPostJson) - individualPostAsHtml(self.server.signingPrivateKeyPem, False, + individualPostAsHtml(self.server.signing_priv_key_pem, False, self.server.recentPostsCache, self.server.max_recent_posts, self.server.translate, @@ -8224,7 +8224,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -8358,7 +8358,7 @@ class PubServer(BaseHTTPRequestHandler): followerApprovalActive(base_dir, self.postToNickname, domain) showRepeats = not isDM(likedPostJson) - individualPostAsHtml(self.server.signingPrivateKeyPem, False, + individualPostAsHtml(self.server.signing_priv_key_pem, False, self.server.recentPostsCache, self.server.max_recent_posts, self.server.translate, @@ -8378,7 +8378,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -8541,7 +8541,7 @@ class PubServer(BaseHTTPRequestHandler): followerApprovalActive(base_dir, self.postToNickname, domain) showRepeats = not isDM(reactionPostJson) - individualPostAsHtml(self.server.signingPrivateKeyPem, False, + individualPostAsHtml(self.server.signing_priv_key_pem, False, self.server.recentPostsCache, self.server.max_recent_posts, self.server.translate, @@ -8562,7 +8562,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -8714,7 +8714,7 @@ class PubServer(BaseHTTPRequestHandler): followerApprovalActive(base_dir, self.postToNickname, domain) showRepeats = not isDM(reactionPostJson) - individualPostAsHtml(self.server.signingPrivateKeyPem, False, + individualPostAsHtml(self.server.signing_priv_key_pem, False, self.server.recentPostsCache, self.server.max_recent_posts, self.server.translate, @@ -8734,7 +8734,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -8832,9 +8832,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled, timelineStr, pageNumber) @@ -8934,7 +8934,7 @@ class PubServer(BaseHTTPRequestHandler): followerApprovalActive(base_dir, self.postToNickname, domain) showRepeats = not isDM(bookmarkPostJson) - individualPostAsHtml(self.server.signingPrivateKeyPem, False, + individualPostAsHtml(self.server.signing_priv_key_pem, False, self.server.recentPostsCache, self.server.max_recent_posts, self.server.translate, @@ -8954,7 +8954,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -9062,7 +9062,7 @@ class PubServer(BaseHTTPRequestHandler): followerApprovalActive(base_dir, self.postToNickname, domain) showRepeats = not isDM(bookmarkPostJson) - individualPostAsHtml(self.server.signingPrivateKeyPem, False, + individualPostAsHtml(self.server.signing_priv_key_pem, False, self.server.recentPostsCache, self.server.max_recent_posts, self.server.translate, @@ -9082,7 +9082,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -9179,9 +9179,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) if deleteStr: @@ -9263,7 +9263,7 @@ class PubServer(BaseHTTPRequestHandler): allowDownloads = False showAvatarOptions = True avatarUrl = None - individualPostAsHtml(self.server.signingPrivateKeyPem, + individualPostAsHtml(self.server.signing_priv_key_pem, allowDownloads, self.server.recentPostsCache, self.server.max_recent_posts, @@ -9284,7 +9284,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -9373,7 +9373,7 @@ class PubServer(BaseHTTPRequestHandler): allowDownloads = False showAvatarOptions = True avatarUrl = None - individualPostAsHtml(self.server.signingPrivateKeyPem, + individualPostAsHtml(self.server.signing_priv_key_pem, allowDownloads, self.server.recentPostsCache, self.server.max_recent_posts, @@ -9394,7 +9394,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, showRepeats, showIndividualPostIcons, @@ -9516,9 +9516,9 @@ class PubServer(BaseHTTPRequestHandler): peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -9608,9 +9608,9 @@ class PubServer(BaseHTTPRequestHandler): peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -9691,7 +9691,7 @@ class PubServer(BaseHTTPRequestHandler): getSpoofedCity(self.server.city, base_dir, nickname, domain) msg = \ - htmlProfile(self.server.signingPrivateKeyPem, + htmlProfile(self.server.signing_priv_key_pem, self.server.rss_icon_at_top, self.server.cssCache, icons_as_buttons, @@ -9716,7 +9716,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.textModeBanner, self.server.debug, accessKeys, city, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, self.server.shared_items_federated_domains, rolesList, @@ -9802,12 +9802,12 @@ class PubServer(BaseHTTPRequestHandler): nickname, domain) shared_items_federated_domains = \ self.server.shared_items_federated_domains - signingPrivateKeyPem = \ - self.server.signingPrivateKeyPem + signing_priv_key_pem = \ + self.server.signing_priv_key_pem content_license_url = \ self.server.content_license_url msg = \ - htmlProfile(signingPrivateKeyPem, + htmlProfile(signing_priv_key_pem, self.server.rss_icon_at_top, self.server.cssCache, icons_as_buttons, @@ -9832,7 +9832,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.textModeBanner, self.server.debug, accessKeys, city, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, shared_items_federated_domains, skills, @@ -9998,9 +9998,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.peertubeInstances, self.server.allow_local_network_access, self.server.themeName, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -10262,10 +10262,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) if GETstartTime: @@ -10414,10 +10414,10 @@ class PubServer(BaseHTTPRequestHandler): allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -10559,10 +10559,10 @@ class PubServer(BaseHTTPRequestHandler): allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -10701,10 +10701,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, fed_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -10843,10 +10843,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, fed_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -10995,10 +10995,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, fed_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -11146,10 +11146,10 @@ class PubServer(BaseHTTPRequestHandler): allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -11254,10 +11254,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, self.server.shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -11339,10 +11339,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, self.server.shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -11464,10 +11464,10 @@ class PubServer(BaseHTTPRequestHandler): allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -11602,10 +11602,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, self.server.shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -11736,10 +11736,10 @@ class PubServer(BaseHTTPRequestHandler): allow_local_network_access, self.server.textModeBanner, accessKeys, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, shared_items_federated_domains, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled) msg = msg.encode('utf-8') @@ -11831,7 +11831,7 @@ class PubServer(BaseHTTPRequestHandler): city = getSpoofedCity(self.server.city, base_dir, nickname, domain) msg = \ - htmlProfile(self.server.signingPrivateKeyPem, + htmlProfile(self.server.signing_priv_key_pem, self.server.rss_icon_at_top, self.server.cssCache, self.server.icons_as_buttons, @@ -11857,7 +11857,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.textModeBanner, self.server.debug, accessKeys, city, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, self.server.shared_items_federated_domains, shares, @@ -11952,7 +11952,7 @@ class PubServer(BaseHTTPRequestHandler): content_license_url = \ self.server.content_license_url msg = \ - htmlProfile(self.server.signingPrivateKeyPem, + htmlProfile(self.server.signing_priv_key_pem, self.server.rss_icon_at_top, self.server.cssCache, self.server.icons_as_buttons, @@ -11978,7 +11978,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.textModeBanner, self.server.debug, accessKeys, city, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, self.server.shared_items_federated_domains, following, @@ -12071,7 +12071,7 @@ class PubServer(BaseHTTPRequestHandler): content_license_url = \ self.server.content_license_url msg = \ - htmlProfile(self.server.signingPrivateKeyPem, + htmlProfile(self.server.signing_priv_key_pem, self.server.rss_icon_at_top, self.server.cssCache, self.server.icons_as_buttons, @@ -12098,7 +12098,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.textModeBanner, self.server.debug, accessKeys, city, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, self.server.shared_items_federated_domains, followers, @@ -12138,13 +12138,13 @@ class PubServer(BaseHTTPRequestHandler): path: str, http_prefix: str, nickname: str, domain: str, - domainFull: str, systemLanguage: str) -> None: + domainFull: str, system_language: str) -> None: """Returns the featured posts collections in actor/collections/featured """ featuredCollection = \ jsonPinPost(base_dir, http_prefix, - nickname, domain, domainFull, systemLanguage) + nickname, domain, domainFull, system_language) msg = json.dumps(featuredCollection, ensure_ascii=False).encode('utf-8') msglen = len(msg) @@ -12207,7 +12207,7 @@ class PubServer(BaseHTTPRequestHandler): city = getSpoofedCity(self.server.city, base_dir, nickname, domain) msg = \ - htmlProfile(self.server.signingPrivateKeyPem, + htmlProfile(self.server.signing_priv_key_pem, self.server.rss_icon_at_top, self.server.cssCache, self.server.icons_as_buttons, @@ -12234,7 +12234,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.textModeBanner, self.server.debug, accessKeys, city, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, self.server.shared_items_federated_domains, None, None, None, @@ -12390,7 +12390,7 @@ class PubServer(BaseHTTPRequestHandler): domain, port, maxPostsInBlogsFeed, pageNumber, self.server.peertubeInstances, - self.server.systemLanguage, + self.server.system_language, self.server.person_cache, self.server.debug) if msg is not None: @@ -12995,9 +12995,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.show_published_date_only, self.server.peertubeInstances, self.server.allow_local_network_access, - self.server.systemLanguage, + self.server.system_language, self.server.max_like_count, - self.server.signingPrivateKeyPem, + self.server.signing_priv_key_pem, self.server.CWlists, self.server.lists_enabled, self.server.defaultTimeline).encode('utf-8') @@ -13185,7 +13185,7 @@ class PubServer(BaseHTTPRequestHandler): path, domain, port, http_prefix, postUrl, - self.server.systemLanguage).encode('utf-8') + self.server.system_language).encode('utf-8') if msg: msglen = len(msg) self._set_headers('text/html', msglen, @@ -13362,7 +13362,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.base_dir, self.server.http_prefix, self.server.domainFull, - self.server.systemLanguage, + self.server.system_language, False).encode('utf-8') msglen = len(msg) self._logout_headers('text/html', msglen, callingDomain) @@ -13697,7 +13697,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.i2p_domain, self.server.translate, self.server.registration, - self.server.systemLanguage, + self.server.system_language, self.server.project_version, self.server.customEmoji, self.server.show_node_info_accounts): @@ -13864,7 +13864,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.proxy_type, GETstartTime, self.server.debug, - self.server.systemLanguage) + self.server.system_language) return usersInPath = False @@ -13918,7 +13918,7 @@ class PubServer(BaseHTTPRequestHandler): xmlStr = \ getSSMLbox(self.server.base_dir, self.path, self.server.domain, - self.server.systemLanguage, + self.server.system_language, self.server.instanceTitle, 'inbox') if xmlStr: @@ -13956,7 +13956,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.http_prefix, nickname, self.server.domain, self.server.domainFull, - self.server.systemLanguage) + self.server.system_language) messageJson = {} if pinnedPostJson: postId = removeIdEnding(pinnedPostJson['id']) @@ -13990,7 +13990,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.http_prefix, nickname, self.server.domain, self.server.domainFull, - self.server.systemLanguage) + self.server.system_language) return if not htmlGET and \ @@ -14061,7 +14061,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.port, maxPostsInBlogsFeed, self.server.peertubeInstances, - self.server.systemLanguage, + self.server.system_language, self.server.person_cache, self.server.debug) if msg is not None: @@ -14165,7 +14165,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.domainFull, post_json_object, self.server.peertubeInstances, - self.server.systemLanguage, + self.server.system_language, self.server.person_cache, self.server.debug, self.server.content_license_url) @@ -14396,14 +14396,14 @@ class PubServer(BaseHTTPRequestHandler): self.server.base_dir, 'http', self.server.onion_domain, None, self.server.translate, - self.server.systemLanguage) + self.server.system_language) elif callingDomain.endswith('.i2p'): msg = \ htmlAbout(self.server.cssCache, self.server.base_dir, 'http', self.server.i2p_domain, None, self.server.translate, - self.server.systemLanguage) + self.server.system_language) else: msg = \ htmlAbout(self.server.cssCache, @@ -14412,7 +14412,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.domainFull, self.server.onion_domain, self.server.translate, - self.server.systemLanguage) + self.server.system_language) msg = msg.encode('utf-8') msglen = len(msg) self._login_headers('text/html', msglen, callingDomain) @@ -14492,7 +14492,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.domain): msg = \ htmlWelcomeScreen(self.server.base_dir, nickname, - self.server.systemLanguage, + self.server.system_language, self.server.translate, self.server.themeName) msg = msg.encode('utf-8') @@ -14520,7 +14520,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.domain, self.server.http_prefix, self.server.domainFull, - self.server.systemLanguage, + self.server.system_language, self.server.translate, self.server.themeName) msg = msg.encode('utf-8') @@ -14548,7 +14548,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.domain, self.server.http_prefix, self.server.domainFull, - self.server.systemLanguage, + self.server.system_language, self.server.translate, self.server.themeName) msg = msg.encode('utf-8') @@ -14917,7 +14917,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.base_dir, self.server.http_prefix, self.server.domainFull, - self.server.systemLanguage, + self.server.system_language, True).encode('utf-8') msglen = len(msg) self._login_headers('text/html', msglen, callingDomain) @@ -15694,7 +15694,7 @@ class PubServer(BaseHTTPRequestHandler): self.path, replyPageNumber, nickname, self.server.domain, - postUrl, self.server.systemLanguage) + postUrl, self.server.system_language) if msg: msg = msg.encode('utf-8') msglen = len(msg) @@ -16119,8 +16119,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.port, searchHandle, self.server.debug, - self.server.systemLanguage, - self.server.signingPrivateKeyPem) + self.server.system_language, + self.server.signing_priv_key_pem) msg = msg.encode('utf-8') msglen = len(msg) self._login_headers('text/html', @@ -16156,8 +16156,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.port, searchHandle, self.server.debug, - self.server.systemLanguage, - self.server.signingPrivateKeyPem) + self.server.system_language, + self.server.signing_priv_key_pem) msg = msg.encode('utf-8') msglen = len(msg) self._login_headers('text/html', @@ -16629,7 +16629,7 @@ class PubServer(BaseHTTPRequestHandler): fields['subject'], fields['schedulePost'], fields['eventDate'], fields['eventTime'], fields['location'], False, - self.server.systemLanguage, + self.server.system_language, conversationId, self.server.low_bandwidth, self.server.content_license_url) @@ -16639,7 +16639,7 @@ class PubServer(BaseHTTPRequestHandler): if pinToProfile: contentStr = \ getBaseContentFromPost(messageJson, - self.server.systemLanguage) + self.server.system_language) followersOnly = False pinPost(self.server.base_dir, nickname, self.server.domain, contentStr, @@ -16714,7 +16714,7 @@ class PubServer(BaseHTTPRequestHandler): fields['eventDate'], fields['eventTime'], fields['location'], - self.server.systemLanguage, + self.server.system_language, conversationId, self.server.low_bandwidth, self.server.content_license_url) @@ -16787,7 +16787,7 @@ class PubServer(BaseHTTPRequestHandler): post_json_object['object']['content'] = \ fields['message'] contentMap = post_json_object['object']['contentMap'] - contentMap[self.server.systemLanguage] = \ + contentMap[self.server.system_language] = \ fields['message'] imgDescription = '' @@ -16815,10 +16815,10 @@ class PubServer(BaseHTTPRequestHandler): replaceYouTube(post_json_object, self.server.yt_replace_domain, - self.server.systemLanguage) + self.server.system_language) replaceTwitter(post_json_object, self.server.twitter_replacement_domain, - self.server.systemLanguage) + self.server.system_language) saveJson(post_json_object, postFilename) # also save to the news actor if nickname != 'news': @@ -16867,7 +16867,7 @@ class PubServer(BaseHTTPRequestHandler): fields['eventDate'], fields['eventTime'], fields['location'], - self.server.systemLanguage, + self.server.system_language, conversationId, self.server.low_bandwidth, self.server.content_license_url) @@ -16919,7 +16919,7 @@ class PubServer(BaseHTTPRequestHandler): fields['eventDate'], fields['eventTime'], fields['location'], - self.server.systemLanguage, + self.server.system_language, conversationId, self.server.low_bandwidth, self.server.content_license_url) @@ -16976,7 +16976,7 @@ class PubServer(BaseHTTPRequestHandler): fields['eventDate'], fields['eventTime'], fields['location'], - self.server.systemLanguage, + self.server.system_language, conversationId, self.server.low_bandwidth, content_license_url) @@ -17030,7 +17030,7 @@ class PubServer(BaseHTTPRequestHandler): fields['eventDate'], fields['eventTime'], fields['location'], - self.server.systemLanguage, + self.server.system_language, conversationId, self.server.low_bandwidth, self.server.content_license_url) @@ -17068,7 +17068,7 @@ class PubServer(BaseHTTPRequestHandler): fields['imageDescription'], city, self.server.debug, fields['subject'], - self.server.systemLanguage, + self.server.system_language, self.server.low_bandwidth, self.server.content_license_url) if messageJson: @@ -17110,7 +17110,7 @@ class PubServer(BaseHTTPRequestHandler): city, fields['subject'], intDuration, - self.server.systemLanguage, + self.server.system_language, self.server.low_bandwidth, self.server.content_license_url) if messageJson: @@ -17182,7 +17182,7 @@ class PubServer(BaseHTTPRequestHandler): durationStr, self.server.debug, city, itemPrice, itemCurrency, - self.server.systemLanguage, + self.server.system_language, self.server.translate, sharesFileType, self.server.low_bandwidth, self.server.content_license_url) @@ -17602,7 +17602,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.onion_domain, self.server.i2p_domain, self.server.debug, self.server.allow_local_network_access, - self.server.systemLanguage, + self.server.system_language, self.server.content_license_url) self.server.POSTbusy = False return @@ -17944,7 +17944,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.defaultTimeline, self.server.themeName, self.server.allow_local_network_access, - self.server.systemLanguage) + self.server.system_language) self.server.POSTbusy = False return @@ -18531,7 +18531,7 @@ def runDaemon(content_license_url: str, httpd.fitness = loadJson(fitness_filename) # initialize authorized fetch key - httpd.signingPrivateKeyPem = None + httpd.signing_priv_key_pem = None httpd.show_node_info_accounts = show_node_info_accounts httpd.show_node_info_version = show_node_info_version @@ -18625,14 +18625,14 @@ def runDaemon(content_license_url: str, # load translations dictionary httpd.translate = {} - httpd.systemLanguage = 'en' + httpd.system_language = 'en' if not unit_test: - httpd.translate, httpd.systemLanguage = \ + httpd.translate, httpd.system_language = \ loadTranslationsFromFile(base_dir, language) - if not httpd.systemLanguage: + if not httpd.system_language: print('ERROR: no system language loaded') sys.exit() - print('System language: ' + httpd.systemLanguage) + print('System language: ' + httpd.system_language) if not httpd.translate: print('ERROR: no translations were loaded') sys.exit() @@ -18943,9 +18943,9 @@ def runDaemon(content_license_url: str, httpd.peertubeInstances, verify_all_signatures, httpd.themeName, - httpd.systemLanguage, + httpd.system_language, httpd.max_like_count, - httpd.signingPrivateKeyPem, + httpd.signing_priv_key_pem, httpd.default_reply_interval_hrs, httpd.CWlists), daemon=True) @@ -18967,7 +18967,7 @@ def runDaemon(content_license_url: str, args=(base_dir, httpd, http_prefix, httpd.domainFull, proxy_type, debug, - httpd.systemLanguage), daemon=True) + httpd.system_language), daemon=True) # flags used when restarting the inbox queue httpd.restartInboxQueueInProgress = False @@ -18975,12 +18975,12 @@ def runDaemon(content_license_url: str, updateHashtagCategories(base_dir) - print('Adding hashtag categories for language ' + httpd.systemLanguage) - loadHashtagCategories(base_dir, httpd.systemLanguage) + print('Adding hashtag categories for language ' + httpd.system_language) + loadHashtagCategories(base_dir, httpd.system_language) # signing key used for authorized fetch # this is the instance actor private key - httpd.signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + httpd.signing_priv_key_pem = getInstanceActorKey(base_dir, domain) if not unit_test: print('Creating inbox queue watchdog') diff --git a/delete.py b/delete.py index 4918a86b2..2e2e1ef86 100644 --- a/delete.py +++ b/delete.py @@ -32,7 +32,7 @@ def sendDeleteViaServer(base_dir: str, session, http_prefix: str, deleteObjectUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a delete request message via c2s """ if not session: @@ -60,7 +60,7 @@ def sendDeleteViaServer(base_dir: str, session, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: delete webfinger failed for ' + handle) @@ -76,7 +76,7 @@ def sendDeleteViaServer(base_dir: str, session, originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, originDomain, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, http_prefix, fromNickname, fromDomain, postToBox, 53036) diff --git a/desktop_client.py b/desktop_client.py index fea7be917..f7a1dccce 100644 --- a/desktop_client.py +++ b/desktop_client.py @@ -320,7 +320,7 @@ def _speakerEspeak(espeak, pitch: int, rate: int, srange: int, espeak.synth(html.unescape(sayText)) -def _speakerPicospeaker(pitch: int, rate: int, systemLanguage: str, +def _speakerPicospeaker(pitch: int, rate: int, system_language: str, sayText: str) -> None: """TTS using picospeaker """ @@ -332,7 +332,7 @@ def _speakerPicospeaker(pitch: int, rate: int, systemLanguage: str, "it": "it-IT" } for lang, speakerStr in supportedLanguages.items(): - if systemLanguage.startswith(lang): + if system_language.startswith(lang): speakerLang = speakerStr break sayText = str(sayText).replace('"', "'") @@ -381,18 +381,18 @@ def _desktopNotification(notificationType: str, def _textToSpeech(sayStr: str, screenreader: str, pitch: int, rate: int, srange: int, - systemLanguage: str, espeak=None) -> None: + system_language: str, espeak=None) -> None: """Say something via TTS """ # speak the post content if screenreader == 'espeak': _speakerEspeak(espeak, pitch, rate, srange, sayStr) elif screenreader == 'picospeaker': - _speakerPicospeaker(pitch, rate, systemLanguage, sayStr) + _speakerPicospeaker(pitch, rate, system_language, sayStr) def _sayCommand(content: str, sayStr: str, screenreader: str, - systemLanguage: str, + system_language: str, espeak=None, speakerName: str = 'screen reader', speakerGender: str = 'They/Them') -> None: @@ -409,7 +409,7 @@ def _sayCommand(content: str, sayStr: str, screenreader: str, _textToSpeech(sayStr, screenreader, pitch, rate, srange, - systemLanguage, espeak) + system_language, espeak) def _desktopReplyToPost(session, postId: str, @@ -417,11 +417,11 @@ def _desktopReplyToPost(session, postId: str, domain: str, port: int, http_prefix: str, cached_webfingers: {}, person_cache: {}, debug: bool, subject: str, - screenreader: str, systemLanguage: str, + screenreader: str, system_language: str, espeak, conversationId: str, low_bandwidth: bool, content_license_url: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Use the desktop client to send a reply to the most recent post """ if '://' not in postId: @@ -430,30 +430,30 @@ def _desktopReplyToPost(session, postId: str, toDomain, toPort = getDomainFromActor(postId) sayStr = 'Replying to ' + toNickname + '@' + toDomain _sayCommand(sayStr, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) sayStr = 'Type your reply message, then press Enter.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) replyMessage = input() if not replyMessage: sayStr = 'No reply was entered.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return replyMessage = replyMessage.strip() if not replyMessage: sayStr = 'No reply was entered.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return print('') sayStr = 'You entered this reply:' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) _sayCommand(replyMessage, replyMessage, screenreader, - systemLanguage, espeak) + system_language, espeak) sayStr = 'Send this reply, yes or no?' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) yesno = input() if 'y' not in yesno.lower(): sayStr = 'Abandoning reply' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return ccUrl = None followersOnly = False @@ -465,8 +465,8 @@ def _desktopReplyToPost(session, postId: str, commentsEnabled = True city = 'London, England' sayStr = 'Sending reply' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) - if sendPostViaServer(signingPrivateKeyPem, __version__, + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) + if sendPostViaServer(signing_priv_key_pem, __version__, base_dir, session, nickname, password, domain, port, toNickname, toDomain, toPort, ccUrl, @@ -474,14 +474,14 @@ def _desktopReplyToPost(session, postId: str, commentsEnabled, attach, mediaType, attachedImageDescription, city, cached_webfingers, person_cache, isArticle, - systemLanguage, low_bandwidth, + system_language, low_bandwidth, content_license_url, debug, postId, postId, conversationId, subject) == 0: sayStr = 'Reply sent' else: sayStr = 'Reply failed' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) def _desktopNewPost(session, @@ -489,37 +489,37 @@ def _desktopNewPost(session, domain: str, port: int, http_prefix: str, cached_webfingers: {}, person_cache: {}, debug: bool, - screenreader: str, systemLanguage: str, + screenreader: str, system_language: str, espeak, low_bandwidth: bool, content_license_url: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Use the desktop client to create a new post """ conversationId = None sayStr = 'Create new post' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) sayStr = 'Type your post, then press Enter.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) newMessage = input() if not newMessage: sayStr = 'No post was entered.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return newMessage = newMessage.strip() if not newMessage: sayStr = 'No post was entered.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return print('') sayStr = 'You entered this public post:' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) - _sayCommand(newMessage, newMessage, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) + _sayCommand(newMessage, newMessage, screenreader, system_language, espeak) sayStr = 'Send this post, yes or no?' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) yesno = input() if 'y' not in yesno.lower(): sayStr = 'Abandoning new post' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return ccUrl = None followersOnly = False @@ -532,8 +532,8 @@ def _desktopNewPost(session, commentsEnabled = True subject = None sayStr = 'Sending' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) - if sendPostViaServer(signingPrivateKeyPem, __version__, + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) + if sendPostViaServer(signing_priv_key_pem, __version__, base_dir, session, nickname, password, domain, port, None, '#Public', port, ccUrl, @@ -541,14 +541,14 @@ def _desktopNewPost(session, commentsEnabled, attach, mediaType, attachedImageDescription, city, cached_webfingers, person_cache, isArticle, - systemLanguage, low_bandwidth, + system_language, low_bandwidth, content_license_url, debug, None, None, conversationId, subject) == 0: sayStr = 'Post sent' else: sayStr = 'Post failed' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) def _safeMessage(content: str) -> str: @@ -667,11 +667,11 @@ def _showRepliesOnPost(post_json_object: {}, max_replies: int) -> None: def _readLocalBoxPost(session, nickname: str, domain: str, http_prefix: str, base_dir: str, boxName: str, pageNumber: int, index: int, boxJson: {}, - systemLanguage: str, + system_language: str, screenreader: str, espeak, translate: {}, yourActor: str, domainFull: str, person_cache: {}, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, blockedCache: {}) -> {}: """Reads a post from the given timeline Returns the post json @@ -690,7 +690,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str, sayStr = 'Reading ' + boxNameStr + ' post ' + str(index) + \ ' from page ' + str(pageNumber) + '.' sayStr2 = sayStr.replace(' dm ', ' DM ') - _sayCommand(sayStr, sayStr2, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr2, screenreader, system_language, espeak) print('') if post_json_object['type'] == 'Announce': @@ -710,9 +710,9 @@ def _readLocalBoxPost(session, nickname: str, domain: str, twitter_replacement_domain, allow_local_network_access, recentPostsCache, False, - systemLanguage, + system_language, domainFull, person_cache, - signingPrivateKeyPem, + signing_priv_key_pem, blockedCache) if post_json_object2: if hasObjectDict(post_json_object2): @@ -721,14 +721,14 @@ def _readLocalBoxPost(session, nickname: str, domain: str, attributedTo = post_json_object2['object']['attributedTo'] content = \ getBaseContentFromPost(post_json_object2, - systemLanguage) + system_language) if isinstance(attributedTo, str) and content: actor = attributedTo nameStr += ' ' + translate['announces'] + ' ' + \ getNicknameFromActor(actor) sayStr = nameStr _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) print('') if screenreader: time.sleep(2) @@ -739,14 +739,14 @@ def _readLocalBoxPost(session, nickname: str, domain: str, speakableText(base_dir, content, translate) sayStr = content _sayCommand(sayStr, messageStr, screenreader, - systemLanguage, espeak) + system_language, espeak) return post_json_object2 return {} attributedTo = post_json_object['object']['attributedTo'] if not attributedTo: return {} - content = getBaseContentFromPost(post_json_object, systemLanguage) + content = getBaseContentFromPost(post_json_object, system_language) if not isinstance(attributedTo, str) or \ not isinstance(content, str): return {} @@ -757,11 +757,11 @@ def _readLocalBoxPost(session, nickname: str, domain: str, if isPGPEncrypted(content): sayStr = 'Encrypted message. Please enter your passphrase.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) - content = pgpDecrypt(domain, content, actor, signingPrivateKeyPem) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) + content = pgpDecrypt(domain, content, actor, signing_priv_key_pem) if isPGPEncrypted(content): sayStr = 'Message could not be decrypted' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return {} content = _safeMessage(content) @@ -772,7 +772,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str, # say the speaker's name _sayCommand(nameStr, nameStr, screenreader, - systemLanguage, espeak, nameStr, gender) + system_language, espeak, nameStr, gender) print('') if post_json_object['object'].get('inReplyTo'): @@ -783,7 +783,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str, # speak the post content _sayCommand(content, messageStr, screenreader, - systemLanguage, espeak, nameStr, gender) + system_language, espeak, nameStr, gender) _showLikesOnPost(post_json_object, 10) _showRepliesOnPost(post_json_object, 10) @@ -799,7 +799,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str, def _desktopShowActor(base_dir: str, actorJson: {}, translate: {}, - systemLanguage: str, screenreader: str, + system_language: str, screenreader: str, espeak) -> None: """Shows information for the given actor """ @@ -810,11 +810,11 @@ def _desktopShowActor(base_dir: str, actorJson: {}, translate: {}, handle = '@' + actorNickname + '@' + actorDomainFull sayStr = 'Profile for ' + html.unescape(handle) - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) print(actor) if actorJson.get('movedTo'): sayStr = 'Moved to ' + html.unescape(actorJson['movedTo']) - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) if actorJson.get('alsoKnownAs'): alsoKnownAsStr = '' ctr = 0 @@ -825,21 +825,21 @@ def _desktopShowActor(base_dir: str, actorJson: {}, translate: {}, alsoKnownAsStr += altActor sayStr = 'Also known as ' + html.unescape(alsoKnownAsStr) - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) if actorJson.get('summary'): sayStr = html.unescape(removeHtml(actorJson['summary'])) sayStr = sayStr.replace('"', "'") sayStr2 = speakableText(base_dir, sayStr, translate)[0] - _sayCommand(sayStr, sayStr2, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr2, screenreader, system_language, espeak) def _desktopShowProfile(session, nickname: str, domain: str, http_prefix: str, base_dir: str, boxName: str, pageNumber: int, index: int, boxJson: {}, - systemLanguage: str, + system_language: str, screenreader: str, espeak, translate: {}, yourActor: str, - post_json_object: {}, signingPrivateKeyPem: str) -> {}: + post_json_object: {}, signing_priv_key_pem: str) -> {}: """Shows the profile of the actor for the given post Returns the actor json """ @@ -871,10 +871,10 @@ def _desktopShowProfile(session, nickname: str, domain: str, isHttp = True actorJson, asHeader = \ getActorJson(domain, actor, isHttp, False, False, True, - signingPrivateKeyPem, session) + signing_priv_key_pem, session) _desktopShowActor(base_dir, actorJson, translate, - systemLanguage, screenreader, espeak) + system_language, screenreader, espeak) return actorJson @@ -882,20 +882,20 @@ def _desktopShowProfile(session, nickname: str, domain: str, def _desktopShowProfileFromHandle(session, nickname: str, domain: str, http_prefix: str, base_dir: str, boxName: str, handle: str, - systemLanguage: str, + system_language: str, screenreader: str, espeak, translate: {}, yourActor: str, post_json_object: {}, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Shows the profile for a handle Returns the actor json """ actorJson, asHeader = \ getActorJson(domain, handle, False, False, False, True, - signingPrivateKeyPem, session) + signing_priv_key_pem, session) _desktopShowActor(base_dir, actorJson, translate, - systemLanguage, screenreader, espeak) + system_language, screenreader, espeak) return actorJson @@ -961,7 +961,7 @@ def _desktopShowBox(indent: str, followRequestsJson: {}, yourActor: str, boxName: str, boxJson: {}, translate: {}, - screenreader: str, systemLanguage: str, espeak, + screenreader: str, system_language: str, espeak, pageNumber: int, newReplies: bool, newDMs: bool) -> bool: @@ -997,7 +997,7 @@ def _desktopShowBox(indent: str, if boxName == 'dm': boxStr = 'DM' sayStr = indent + 'You have no ' + boxStr + ' posts yet.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) print('') return False @@ -1072,7 +1072,7 @@ def _desktopShowBox(indent: str, published = _formatPublished(post_json_object['published']) - contentStr = getBaseContentFromPost(post_json_object, systemLanguage) + contentStr = getBaseContentFromPost(post_json_object, system_language) content = _textOnlyContent(contentStr) if boxName != 'dm': if isDM(post_json_object): @@ -1120,7 +1120,7 @@ def _desktopShowBox(indent: str, sayStr2 = sayStr.replace('\33[3m', '').replace('\33[0m', '') sayStr2 = sayStr2.replace('show dm', 'show DM') sayStr2 = sayStr2.replace('dm post', 'Direct message post') - _sayCommand(sayStr, sayStr2, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr2, screenreader, system_language, espeak) print('') return True @@ -1130,10 +1130,10 @@ def _desktopNewDM(session, toHandle: str, domain: str, port: int, http_prefix: str, cached_webfingers: {}, person_cache: {}, debug: bool, - screenreader: str, systemLanguage: str, + screenreader: str, system_language: str, espeak, low_bandwidth: bool, content_license_url: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Use the desktop client to create a new direct message which can include multiple destination handles """ @@ -1153,10 +1153,10 @@ def _desktopNewDM(session, toHandle: str, domain, port, http_prefix, cached_webfingers, person_cache, debug, - screenreader, systemLanguage, + screenreader, system_language, espeak, low_bandwidth, content_license_url, - signingPrivateKeyPem) + signing_priv_key_pem) def _desktopNewDMbase(session, toHandle: str, @@ -1164,10 +1164,10 @@ def _desktopNewDMbase(session, toHandle: str, domain: str, port: int, http_prefix: str, cached_webfingers: {}, person_cache: {}, debug: bool, - screenreader: str, systemLanguage: str, + screenreader: str, system_language: str, espeak, low_bandwidth: bool, content_license_url: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Use the desktop client to create a new direct message """ conversationId = None @@ -1183,22 +1183,22 @@ def _desktopNewDMbase(session, toHandle: str, toDomain = toHandle.split('@')[1] sayStr = 'Create new direct message to ' + toHandle - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) sayStr = 'Type your direct message, then press Enter.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) newMessage = input() if not newMessage: sayStr = 'No direct message was entered.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return newMessage = newMessage.strip() if not newMessage: sayStr = 'No direct message was entered.' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return sayStr = 'You entered this direct message to ' + toHandle + ':' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) - _sayCommand(newMessage, newMessage, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) + _sayCommand(newMessage, newMessage, screenreader, system_language, espeak) ccUrl = None followersOnly = False attach = None @@ -1216,7 +1216,7 @@ def _desktopNewDMbase(session, toHandle: str, sayStr = \ 'Local PGP key detected...' + \ 'Fetching PGP public key for ' + toHandle - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) paddedMessage = newMessage if len(paddedMessage) < 32: # add some padding before and after @@ -1227,28 +1227,28 @@ def _desktopNewDMbase(session, toHandle: str, paddedMessage += ' ' cipherText = \ pgpEncryptToActor(domain, paddedMessage, toHandle, - signingPrivateKeyPem) + signing_priv_key_pem) if not cipherText: sayStr = \ toHandle + ' has no PGP public key. ' + \ 'Your message will be sent in clear text' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) else: newMessage = cipherText sayStr = 'Message encrypted' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) sayStr = 'Send this direct message, yes or no?' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) yesno = input() if 'y' not in yesno.lower(): sayStr = 'Abandoning new direct message' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) return sayStr = 'Sending' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) - if sendPostViaServer(signingPrivateKeyPem, __version__, + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) + if sendPostViaServer(signing_priv_key_pem, __version__, base_dir, session, nickname, password, domain, port, toNickname, toDomain, toPort, ccUrl, @@ -1256,14 +1256,14 @@ def _desktopNewDMbase(session, toHandle: str, commentsEnabled, attach, mediaType, attachedImageDescription, city, cached_webfingers, person_cache, isArticle, - systemLanguage, low_bandwidth, + system_language, low_bandwidth, content_license_url, debug, None, None, conversationId, subject) == 0: sayStr = 'Direct message sent' else: sayStr = 'Direct message failed' - _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) + _sayCommand(sayStr, sayStr, screenreader, system_language, espeak) def _desktopShowFollowRequests(followRequestsJson: {}, translate: {}) -> None: @@ -1317,7 +1317,7 @@ def _desktopShowFollowing(followingJson: {}, translate: {}, def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, nickname: str, domain: str, port: int, password: str, screenreader: str, - systemLanguage: str, + system_language: str, notificationSounds: bool, notificationType: str, noKeyPress: bool, @@ -1329,7 +1329,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, which announces new inbox items """ # TODO: this should probably be retrieved somehow from the server - signingPrivateKeyPem = None + signing_priv_key_pem = None content_license_url = 'https://creativecommons.org/licenses/by/4.0' @@ -1354,7 +1354,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, sayStr = indent + 'Running ' + screenreader + ' for ' + \ nickname + '@' + domain _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) else: print(indent + 'Running desktop notifications for ' + nickname + '@' + domain) @@ -1363,7 +1363,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, else: sayStr = indent + 'Notification sounds off' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) currTimeline = 'inbox' pageNumber = 1 @@ -1395,18 +1395,18 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, sayStr = indent + 'Loading translations file' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) - translate, systemLanguage = \ + system_language, espeak) + translate, system_language = \ loadTranslationsFromFile(base_dir, language) sayStr = indent + 'Connecting...' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) session = createSession(proxy_type) sayStr = indent + '/q or /quit to exit' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) domainFull = getFullDomain(domain, port) yourActor = localActorUrl(http_prefix, nickname, domainFull) @@ -1429,23 +1429,23 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, else: sayStr = indent + 'Uploading PGP public key' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) pgpPublicKeyUpload(base_dir, session, nickname, password, domain, port, http_prefix, cached_webfingers, person_cache, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) sayStr = indent + 'PGP public key uploaded' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) pgpKeyUpload = True boxJson = c2sBoxJson(base_dir, session, nickname, password, domain, port, http_prefix, currTimeline, pageNumber, - debug, signingPrivateKeyPem) + debug, signing_priv_key_pem) followRequestsJson = \ getFollowRequestsViaServer(base_dir, session, @@ -1454,7 +1454,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, http_prefix, 1, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) if not (currTimeline == 'inbox' and pageNumber == 1): # monitor the inbox to generate notifications @@ -1462,7 +1462,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, nickname, password, domain, port, http_prefix, 'inbox', 1, debug, - signingPrivateKeyPem) + signing_priv_key_pem) else: inboxJson = boxJson newDMsExist = False @@ -1493,7 +1493,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, _desktopShowBox(indent, followRequestsJson, yourActor, currTimeline, boxJson, translate, - None, systemLanguage, espeak, + None, system_language, espeak, pageNumber, newRepliesExist, newDMsExist) @@ -1527,7 +1527,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, commandStr == 'exit': sayStr = 'Quit' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) if screenreader: commandStr = _desktopWaitForCmd(2, debug) break @@ -1539,12 +1539,12 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, nickname, password, domain, port, http_prefix, currTimeline, pageNumber, - debug, signingPrivateKeyPem) + debug, signing_priv_key_pem) if boxJson: _desktopShowBox(indent, followRequestsJson, yourActor, currTimeline, boxJson, translate, - screenreader, systemLanguage, espeak, + screenreader, system_language, espeak, pageNumber, newRepliesExist, newDMsExist) newDMsExist = False @@ -1556,12 +1556,12 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, nickname, password, domain, port, http_prefix, currTimeline, pageNumber, - debug, signingPrivateKeyPem) + debug, signing_priv_key_pem) if boxJson: _desktopShowBox(indent, followRequestsJson, yourActor, currTimeline, boxJson, translate, - screenreader, systemLanguage, espeak, + screenreader, system_language, espeak, pageNumber, newRepliesExist, newDMsExist) # Turn off the replies indicator @@ -1574,12 +1574,12 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, nickname, password, domain, port, http_prefix, currTimeline, pageNumber, - debug, signingPrivateKeyPem) + debug, signing_priv_key_pem) if boxJson: _desktopShowBox(indent, followRequestsJson, yourActor, currTimeline, boxJson, translate, - screenreader, systemLanguage, espeak, + screenreader, system_language, espeak, pageNumber, newRepliesExist, newDMsExist) # Turn off the replies indicator @@ -1593,12 +1593,12 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, nickname, password, domain, port, http_prefix, currTimeline, pageNumber, - debug, signingPrivateKeyPem) + debug, signing_priv_key_pem) if boxJson: _desktopShowBox(indent, followRequestsJson, yourActor, currTimeline, boxJson, translate, - screenreader, systemLanguage, espeak, + screenreader, system_language, espeak, pageNumber, newRepliesExist, newDMsExist) elif (commandStr == 'show' or commandStr.startswith('show in') or @@ -1620,12 +1620,12 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, nickname, password, domain, port, http_prefix, currTimeline, pageNumber, - debug, signingPrivateKeyPem) + debug, signing_priv_key_pem) if boxJson: _desktopShowBox(indent, followRequestsJson, yourActor, currTimeline, boxJson, translate, - screenreader, systemLanguage, espeak, + screenreader, system_language, espeak, pageNumber, newRepliesExist, newDMsExist) elif commandStr.startswith('read ') or commandStr == 'read': @@ -1641,16 +1641,16 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, _readLocalBoxPost(session, nickname, domain, http_prefix, base_dir, currTimeline, pageNumber, postIndex, boxJson, - systemLanguage, screenreader, + system_language, screenreader, espeak, translate, yourActor, domainFull, person_cache, - signingPrivateKeyPem, + signing_priv_key_pem, blockedCache) print('') sayStr = 'Press Enter to continue...' sayStr2 = _highlightText(sayStr) _sayCommand(sayStr2, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) input() prevTimelineFirstId = '' refreshTimeline = True @@ -1665,10 +1665,10 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, currTimeline, pageNumber, postIndex, boxJson, - systemLanguage, screenreader, + system_language, screenreader, espeak, translate, yourActor, post_json_object, - signingPrivateKeyPem) + signing_priv_key_pem) else: postIndexStr = '1' else: @@ -1680,14 +1680,18 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, _desktopShowBanner() _desktopShowProfileFromHandle(session, nickname, domain, http_prefix, base_dir, - currTimeline, profileHandle, - systemLanguage, screenreader, - espeak, translate, yourActor, - None, signingPrivateKeyPem) + currTimeline, + profileHandle, + system_language, + screenreader, + espeak, translate, + yourActor, + None, + signing_priv_key_pem) sayStr = 'Press Enter to continue...' sayStr2 = _highlightText(sayStr) _sayCommand(sayStr2, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) input() prevTimelineFirstId = '' refreshTimeline = True @@ -1701,13 +1705,13 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, currTimeline, pageNumber, postIndex, boxJson, - systemLanguage, screenreader, + system_language, screenreader, espeak, translate, yourActor, - None, signingPrivateKeyPem) + None, signing_priv_key_pem) sayStr = 'Press Enter to continue...' sayStr2 = _highlightText(sayStr) _sayCommand(sayStr2, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) input() prevTimelineFirstId = '' refreshTimeline = True @@ -1729,11 +1733,11 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, domain, port, http_prefix, cached_webfingers, person_cache, debug, subject, - screenreader, systemLanguage, + screenreader, system_language, espeak, conversationId, low_bandwidth, content_license_url, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr == 'post' or commandStr == 'p' or @@ -1766,10 +1770,10 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, domain, port, http_prefix, cached_webfingers, person_cache, debug, - screenreader, systemLanguage, + screenreader, system_language, espeak, low_bandwidth, content_license_url, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True else: # public post @@ -1778,10 +1782,10 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, domain, port, http_prefix, cached_webfingers, person_cache, debug, - screenreader, systemLanguage, + screenreader, system_language, espeak, low_bandwidth, content_license_url, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif commandStr == 'like' or commandStr.startswith('like '): @@ -1800,7 +1804,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(likeActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionLike = createSession(proxy_type) sendLikeViaServer(base_dir, sessionLike, nickname, password, @@ -1808,7 +1812,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, post_json_object['id'], cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr == 'undo mute' or @@ -1839,7 +1843,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(muteActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionMute = createSession(proxy_type) sendUndoMuteViaServer(base_dir, sessionMute, nickname, password, @@ -1849,7 +1853,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr == 'mute' or @@ -1871,7 +1875,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(muteActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionMute = createSession(proxy_type) sendMuteViaServer(base_dir, sessionMute, nickname, password, @@ -1879,7 +1883,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, http_prefix, post_json_object['id'], cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr == 'undo bookmark' or @@ -1912,7 +1916,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(bmActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionbm = createSession(proxy_type) sendUndoBookmarkViaServer(base_dir, sessionbm, nickname, password, @@ -1921,7 +1925,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr == 'bookmark' or @@ -1943,7 +1947,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(bmActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionbm = createSession(proxy_type) sendBookmarkViaServer(base_dir, sessionbm, nickname, password, @@ -1951,7 +1955,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, post_json_object['id'], cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr.startswith('undo block ') or @@ -1977,7 +1981,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(blockActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionBlock = createSession(proxy_type) sendUndoBlockViaServer(base_dir, sessionBlock, nickname, password, @@ -1987,7 +1991,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif commandStr.startswith('block '): @@ -2023,7 +2027,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(blockActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionBlock = createSession(proxy_type) sendBlockViaServer(base_dir, sessionBlock, nickname, password, @@ -2033,7 +2037,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif commandStr == 'unlike' or commandStr == 'undo like': @@ -2054,7 +2058,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(unlikeActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionUnlike = createSession(proxy_type) sendUndoLikeViaServer(base_dir, sessionUnlike, nickname, password, @@ -2062,7 +2066,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, post_json_object['id'], cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr.startswith('announce') or @@ -2085,7 +2089,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(announceActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionAnnounce = createSession(proxy_type) sendAnnounceViaServer(base_dir, sessionAnnounce, nickname, password, @@ -2093,7 +2097,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, http_prefix, postId, cached_webfingers, person_cache, True, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr.startswith('unannounce') or @@ -2118,7 +2122,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, getNicknameFromActor(announceActor) _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionAnnounce = createSession(proxy_type) sendUndoAnnounceViaServer(base_dir, sessionAnnounce, post_json_object, @@ -2128,7 +2132,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, cached_webfingers, person_cache, True, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') elif (commandStr == 'follow requests' or @@ -2145,7 +2149,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, http_prefix, currPage, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) if followRequestsJson: if isinstance(followRequestsJson, dict): _desktopShowFollowRequests(followRequestsJson, @@ -2165,7 +2169,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, http_prefix, currPage, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) if followingJson: if isinstance(followingJson, dict): _desktopShowFollowing(followingJson, translate, @@ -2186,7 +2190,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, http_prefix, currPage, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) if followersJson: if isinstance(followersJson, dict): _desktopShowFollowing(followersJson, translate, @@ -2213,7 +2217,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, sayStr = 'Sending follow request to ' + \ followNickname + '@' + followDomain _sayCommand(sayStr, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) sessionFollow = createSession(proxy_type) sendFollowRequestViaServer(base_dir, sessionFollow, @@ -2226,14 +2230,14 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) else: if followHandle: sayStr = followHandle + ' is not valid' else: sayStr = 'Specify a handle to follow' _sayCommand(sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) print('') elif (commandStr.startswith('unfollow ') or commandStr.startswith('stop following ')): @@ -2249,7 +2253,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, sayStr = 'Stop following ' + \ followNickname + '@' + followDomain _sayCommand(sayStr, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) sessionUnfollow = createSession(proxy_type) sendUnfollowRequestViaServer(base_dir, sessionUnfollow, nickname, password, @@ -2261,11 +2265,11 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) else: sayStr = followHandle + ' is not valid' _sayCommand(sayStr, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) print('') elif commandStr.startswith('approve '): approveHandle = commandStr.replace('approve ', '').strip() @@ -2280,7 +2284,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, sayStr = 'Sending approve follow request for ' + \ approveNickname + '@' + approveDomain _sayCommand(sayStr, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) sessionApprove = createSession(proxy_type) approveFollowRequestViaServer(base_dir, sessionApprove, nickname, password, @@ -2291,14 +2295,14 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) else: if approveHandle: sayStr = approveHandle + ' is not valid' else: sayStr = 'Specify a handle to approve' _sayCommand(sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) print('') elif commandStr.startswith('deny '): denyHandle = commandStr.replace('deny ', '').strip() @@ -2313,7 +2317,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, sayStr = 'Sending deny follow request for ' + \ denyNickname + '@' + denyDomain _sayCommand(sayStr, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) sessionDeny = createSession(proxy_type) denyFollowRequestViaServer(base_dir, sessionDeny, nickname, password, @@ -2324,14 +2328,14 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) else: if denyHandle: sayStr = denyHandle + ' is not valid' else: sayStr = 'Specify a handle to deny' _sayCommand(sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) print('') elif (commandStr == 'repeat' or commandStr == 'replay' or commandStr == 'rp' or commandStr == 'again' or @@ -2340,11 +2344,11 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, gender and messageStr and content: sayStr = 'Repeating ' + nameStr _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak, + system_language, espeak, nameStr, gender) time.sleep(2) _sayCommand(content, messageStr, screenreader, - systemLanguage, espeak, + system_language, espeak, nameStr, gender) print('') elif (commandStr == 'sounds on' or @@ -2352,14 +2356,14 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, commandStr == 'sound'): sayStr = 'Notification sounds on' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) notificationSounds = True elif (commandStr == 'sounds off' or commandStr == 'sound off' or commandStr == 'nosound'): sayStr = 'Notification sounds off' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) notificationSounds = False elif (commandStr == 'speak' or commandStr == 'screen reader on' or @@ -2370,7 +2374,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, screenreader = originalScreenReader sayStr = 'Screen reader on' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) else: print('No --screenreader option was specified') elif (commandStr == 'mute' or @@ -2382,7 +2386,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, screenreader = None sayStr = 'Screen reader off' _sayCommand(sayStr, sayStr, originalScreenReader, - systemLanguage, espeak) + system_language, espeak) else: print('No --screenreader option was specified') elif commandStr.startswith('open'): @@ -2410,16 +2414,16 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, twitter_replacement_domain, allow_local_network_access, recentPostsCache, False, - systemLanguage, + system_language, domainFull, person_cache, - signingPrivateKeyPem, + signing_priv_key_pem, blockedCache) if post_json_object2: post_json_object = post_json_object2 if post_json_object: content = \ getBaseContentFromPost(post_json_object, - systemLanguage) + system_language) messageStr, detectedLinks = \ speakableText(base_dir, content, translate) linkOpened = False @@ -2430,11 +2434,11 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, if linkOpened: sayStr = 'Opened web links' _sayCommand(sayStr, sayStr, originalScreenReader, - systemLanguage, espeak) + system_language, espeak) else: sayStr = 'There are no web links to open.' _sayCommand(sayStr, sayStr, originalScreenReader, - systemLanguage, espeak) + system_language, espeak) print('') elif commandStr.startswith('pgp') or commandStr.startswith('gpg'): if not hasLocalPGPkey(): @@ -2447,7 +2451,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, sayStr = 'Press Enter to continue...' sayStr2 = _highlightText(sayStr) _sayCommand(sayStr2, sayStr, - screenreader, systemLanguage, espeak) + screenreader, system_language, espeak) input() prevTimelineFirstId = '' refreshTimeline = True @@ -2470,25 +2474,25 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, sayStr = 'You can only delete your own posts' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) else: print('') if post_json_object['object'].get('summary'): print(post_json_object['object']['summary']) contentStr = \ getBaseContentFromPost(post_json_object, - systemLanguage) + system_language) print(contentStr) print('') sayStr = 'Confirm delete, yes or no?' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) yesno = input() if 'y' not in yesno.lower(): sayStr = 'Deleting post' _sayCommand(sayStr, sayStr, screenreader, - systemLanguage, espeak) + system_language, espeak) sessionrm = createSession(proxy_type) sendDeleteViaServer(base_dir, sessionrm, nickname, password, @@ -2498,7 +2502,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, cached_webfingers, person_cache, False, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) refreshTimeline = True print('') @@ -2507,6 +2511,6 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str, _desktopShowBox(indent, followRequestsJson, yourActor, currTimeline, boxJson, translate, - screenreader, systemLanguage, + screenreader, system_language, espeak, pageNumber, newRepliesExist, newDMsExist) diff --git a/epicyon.py b/epicyon.py index 4fa79de78..53014959e 100644 --- a/epicyon.py +++ b/epicyon.py @@ -725,11 +725,11 @@ if args.posts: proxy_type = 'gnunet' if not args.language: args.language = 'en' - signingPrivateKeyPem = getInstanceActorKey(base_dir, originDomain) + signing_priv_key_pem = getInstanceActorKey(base_dir, originDomain) getPublicPostsOfPerson(base_dir, nickname, domain, False, True, proxy_type, args.port, http_prefix, debug, __version__, args.language, - signingPrivateKeyPem, originDomain) + signing_priv_key_pem, originDomain) sys.exit() if args.postDomains: @@ -761,13 +761,13 @@ if args.postDomains: domainList = [] if not args.language: args.language = 'en' - signingPrivateKeyPem = None + signing_priv_key_pem = None if not args.domain: originDomain = getConfigParam(base_dir, 'domain') else: originDomain = args.domain if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, originDomain) + signing_priv_key_pem = getInstanceActorKey(base_dir, originDomain) domainList = getPublicPostDomains(None, base_dir, nickname, domain, originDomain, @@ -776,7 +776,7 @@ if args.postDomains: __version__, wordFrequency, domainList, args.language, - signingPrivateKeyPem) + signing_priv_key_pem) for postDomain in domainList: print(postDomain) sys.exit() @@ -813,9 +813,9 @@ if args.postDomainsBlocked: domainList = [] if not args.language: args.language = 'en' - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) domainList = getPublicPostDomainsBlocked(None, base_dir, nickname, domain, proxy_type, args.port, @@ -823,7 +823,7 @@ if args.postDomainsBlocked: __version__, wordFrequency, domainList, args.language, - signingPrivateKeyPem) + signing_priv_key_pem) for postDomain in domainList: print(postDomain) sys.exit() @@ -858,16 +858,16 @@ if args.checkDomains: maxBlockedDomains = 0 if not args.language: args.language = 'en' - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) checkDomains(None, base_dir, nickname, domain, proxy_type, args.port, http_prefix, debug, __version__, maxBlockedDomains, False, args.language, - signingPrivateKeyPem) + signing_priv_key_pem) sys.exit() if args.socnet: @@ -886,14 +886,14 @@ if args.socnet: domain = '' if args.domain: domain = args.domain - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) dotGraph = instancesGraph(base_dir, args.socnet, proxy_type, args.port, http_prefix, debug, __version__, args.language, - signingPrivateKeyPem) + signing_priv_key_pem) try: with open('socnet.dot', 'w+') as fp: fp.write(dotGraph) @@ -925,11 +925,11 @@ if args.postsraw: proxy_type = 'gnunet' if not args.language: args.language = 'en' - signingPrivateKeyPem = getInstanceActorKey(base_dir, originDomain) + signing_priv_key_pem = getInstanceActorKey(base_dir, originDomain) getPublicPostsOfPerson(base_dir, nickname, domain, False, False, proxy_type, args.port, http_prefix, debug, __version__, args.language, - signingPrivateKeyPem, originDomain) + signing_priv_key_pem, originDomain) sys.exit() if args.json: @@ -943,14 +943,14 @@ if args.json: domain = '' if args.domain: domain = args.domain - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) if debug: print('base_dir: ' + str(base_dir)) - if signingPrivateKeyPem: + if signing_priv_key_pem: print('Obtained instance actor signing key') else: print('Did not obtain instance actor key for ' + domain) - testJson = getJson(signingPrivateKeyPem, session, args.json, asHeader, + testJson = getJson(signing_priv_key_pem, session, args.json, asHeader, None, debug, __version__, http_prefix, domain) if testJson: pprint(testJson) @@ -967,14 +967,14 @@ if args.htmlpost: domain = '' if args.domain: domain = args.domain - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) if debug: print('base_dir: ' + str(base_dir)) - if signingPrivateKeyPem: + if signing_priv_key_pem: print('Obtained instance actor signing key') else: print('Did not obtain instance actor key for ' + domain) - testHtml = downloadHtml(signingPrivateKeyPem, session, args.htmlpost, + testHtml = downloadHtml(signing_priv_key_pem, session, args.htmlpost, asHeader, None, debug, __version__, http_prefix, domain) if testHtml: @@ -1188,9 +1188,9 @@ if args.approve: person_cache = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) manualApproveFollowRequest(session, base_dir, http_prefix, args.nickname, domain, port, @@ -1199,7 +1199,7 @@ if args.approve: send_threads, postLog, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) sys.exit() if args.deny: @@ -1216,9 +1216,9 @@ if args.deny: person_cache = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) manualDenyFollowRequest(session, base_dir, http_prefix, args.nickname, domain, port, @@ -1227,7 +1227,7 @@ if args.deny: send_threads, postLog, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) sys.exit() if args.followerspending: @@ -1309,12 +1309,12 @@ if args.message: isArticle = False if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending post to ' + args.sendto) - sendPostViaServer(signingPrivateKeyPem, __version__, + sendPostViaServer(signing_priv_key_pem, __version__, base_dir, session, args.nickname, args.password, domain, port, toNickname, toDomain, toPort, ccUrl, @@ -1347,16 +1347,16 @@ if args.announce: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending announce/repeat of ' + args.announce) sendAnnounceViaServer(base_dir, session, args.nickname, args.password, domain, port, http_prefix, args.announce, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1391,16 +1391,16 @@ if args.box: proxy_type = 'gnunet' if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) session = createSession(proxy_type) boxJson = c2sBoxJson(base_dir, session, args.nickname, args.password, domain, port, http_prefix, args.box, args.pageNumber, - args.debug, signingPrivateKeyPem) + args.debug, signing_priv_key_pem) if boxJson: pprint(boxJson) else: @@ -1452,9 +1452,9 @@ if args.itemName: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending shared item: ' + args.itemName) sendShareViaServer(base_dir, session, @@ -1472,7 +1472,7 @@ if args.itemName: cached_webfingers, person_cache, debug, __version__, args.itemPrice, args.itemCurrency, - signingPrivateKeyPem) + signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1495,9 +1495,9 @@ if args.undoItemName: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending undo of shared item: ' + args.undoItemName) sendUndoShareViaServer(base_dir, session, @@ -1506,7 +1506,7 @@ if args.undoItemName: http_prefix, args.undoItemName, cached_webfingers, person_cache, - debug, __version__, signingPrivateKeyPem) + debug, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1557,9 +1557,9 @@ if args.wantedItemName: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending wanted item: ' + args.wantedItemName) sendWantedViaServer(base_dir, session, @@ -1577,7 +1577,7 @@ if args.wantedItemName: cached_webfingers, person_cache, debug, __version__, args.itemPrice, args.itemCurrency, - signingPrivateKeyPem) + signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1600,9 +1600,9 @@ if args.undoWantedItemName: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending undo of wanted item: ' + args.undoWantedItemName) sendUndoWantedViaServer(base_dir, session, @@ -1611,7 +1611,7 @@ if args.undoWantedItemName: http_prefix, args.undoWantedItemName, cached_webfingers, person_cache, - debug, __version__, signingPrivateKeyPem) + debug, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1634,9 +1634,9 @@ if args.like: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending like of ' + args.like) sendLikeViaServer(base_dir, session, @@ -1644,7 +1644,7 @@ if args.like: domain, port, http_prefix, args.like, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1673,9 +1673,9 @@ if args.react: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending emoji reaction ' + args.emoji + ' to ' + args.react) sendReactionViaServer(base_dir, session, @@ -1683,7 +1683,7 @@ if args.react: domain, port, http_prefix, args.react, args.emoji, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1706,9 +1706,9 @@ if args.undolike: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending undo like of ' + args.undolike) sendUndoLikeViaServer(base_dir, session, @@ -1717,7 +1717,7 @@ if args.undolike: http_prefix, args.undolike, cached_webfingers, person_cache, True, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1746,9 +1746,9 @@ if args.undoreact: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending undo emoji reaction ' + args.emoji + ' to ' + args.react) sendUndoReactionViaServer(base_dir, session, @@ -1757,7 +1757,7 @@ if args.undoreact: http_prefix, args.undoreact, args.emoji, cached_webfingers, person_cache, True, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1780,9 +1780,9 @@ if args.bookmark: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending bookmark of ' + args.bookmark) sendBookmarkViaServer(base_dir, session, @@ -1791,7 +1791,7 @@ if args.bookmark: http_prefix, args.bookmark, cached_webfingers, person_cache, True, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1814,9 +1814,9 @@ if args.unbookmark: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending undo bookmark of ' + args.unbookmark) sendUndoBookmarkViaServer(base_dir, session, @@ -1824,7 +1824,7 @@ if args.unbookmark: domain, port, http_prefix, args.unbookmark, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1847,9 +1847,9 @@ if args.delete: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending delete request of ' + args.delete) sendDeleteViaServer(base_dir, session, @@ -1857,7 +1857,7 @@ if args.delete: domain, port, http_prefix, args.delete, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -1892,9 +1892,9 @@ if args.follow: followHttpPrefix = 'https' if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) sendFollowRequestViaServer(base_dir, session, args.nickname, args.password, @@ -1902,7 +1902,7 @@ if args.follow: followNickname, followDomain, followPort, http_prefix, cached_webfingers, person_cache, - debug, __version__, signingPrivateKeyPem) + debug, __version__, signing_priv_key_pem) for t in range(20): time.sleep(1) # TODO some method to know if it worked @@ -1938,9 +1938,9 @@ if args.unfollow: followHttpPrefix = 'https' if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) sendUnfollowRequestViaServer(base_dir, session, args.nickname, args.password, @@ -1948,7 +1948,7 @@ if args.unfollow: followNickname, followDomain, followPort, http_prefix, cached_webfingers, person_cache, - debug, __version__, signingPrivateKeyPem) + debug, __version__, signing_priv_key_pem) for t in range(20): time.sleep(1) # TODO some method to know if it worked @@ -1973,9 +1973,9 @@ if args.followingList: followHttpPrefix = http_prefix if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) followingJson = \ getFollowingViaServer(base_dir, session, @@ -1983,7 +1983,7 @@ if args.followingList: domain, port, http_prefix, args.pageNumber, cached_webfingers, person_cache, - debug, __version__, signingPrivateKeyPem) + debug, __version__, signing_priv_key_pem) if followingJson: pprint(followingJson) sys.exit() @@ -2006,9 +2006,9 @@ if args.followersList: followHttpPrefix = http_prefix if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) followersJson = \ getFollowersViaServer(base_dir, session, @@ -2017,7 +2017,7 @@ if args.followersList: http_prefix, args.pageNumber, cached_webfingers, person_cache, debug, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) if followersJson: pprint(followersJson) sys.exit() @@ -2040,9 +2040,9 @@ if args.followRequestsList: followHttpPrefix = http_prefix if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) followRequestsJson = \ getFollowRequestsViaServer(base_dir, session, @@ -2050,7 +2050,7 @@ if args.followRequestsList: domain, port, http_prefix, args.pageNumber, cached_webfingers, person_cache, - debug, __version__, signingPrivateKeyPem) + debug, __version__, signing_priv_key_pem) if followRequestsJson: pprint(followRequestsJson) sys.exit() @@ -2092,12 +2092,12 @@ if args.migrations: session = createSession(proxy_type) if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) ctr = migrateAccounts(base_dir, session, http_prefix, cached_webfingers, - True, signingPrivateKeyPem) + True, signing_priv_key_pem) if ctr == 0: print('No followed accounts have moved') else: @@ -2107,15 +2107,15 @@ if args.migrations: if args.actor: if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) if debug: print('base_dir: ' + str(base_dir)) - if signingPrivateKeyPem: + if signing_priv_key_pem: print('Obtained instance actor signing key') else: print('Did not obtain instance actor key for ' + domain) getActorJson(domain, args.actor, args.http, args.gnunet, - debug, False, signingPrivateKeyPem, None) + debug, False, signing_priv_key_pem, None) sys.exit() if args.followers: @@ -2194,13 +2194,13 @@ if args.followers: if args.domain: hostDomain = args.domain handle = nickname + '@' + domain - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, hostDomain, __version__, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: print('Unable to webfinger ' + handle) sys.exit() @@ -2242,11 +2242,11 @@ if args.followers: asHeader = { 'Accept': 'application/ld+json; profile="' + profileStr + '"' } - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) followersList = \ - downloadFollowCollection(signingPrivateKeyPem, + downloadFollowCollection(signing_priv_key_pem, 'followers', session, http_prefix, personUrl, 1, 3, args.debug) if followersList: @@ -2500,9 +2500,9 @@ if args.skill: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending ' + args.skill + ' skill level ' + str(args.skillLevelPercent) + ' for ' + nickname) @@ -2512,7 +2512,7 @@ if args.skill: http_prefix, args.skill, args.skillLevelPercent, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -2535,9 +2535,9 @@ if args.availability: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending availability status of ' + nickname + ' as ' + args.availability) @@ -2546,7 +2546,7 @@ if args.availability: http_prefix, args.availability, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -2649,16 +2649,16 @@ if args.block: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending block of ' + args.block) sendBlockViaServer(base_dir, session, nickname, args.password, domain, port, http_prefix, args.block, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -2681,16 +2681,16 @@ if args.mute: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending mute of ' + args.mute) sendMuteViaServer(base_dir, session, nickname, args.password, domain, port, http_prefix, args.mute, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -2713,16 +2713,16 @@ if args.unmute: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending undo mute of ' + args.unmute) sendUndoMuteViaServer(base_dir, session, nickname, args.password, domain, port, http_prefix, args.unmute, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) @@ -2757,16 +2757,16 @@ if args.unblock: cached_webfingers = {} if not domain: domain = getConfigParam(base_dir, 'domain') - signingPrivateKeyPem = None + signing_priv_key_pem = None if args.secure_mode: - signingPrivateKeyPem = getInstanceActorKey(base_dir, domain) + signing_priv_key_pem = getInstanceActorKey(base_dir, domain) print('Sending undo block of ' + args.unblock) sendUndoBlockViaServer(base_dir, session, nickname, args.password, domain, port, http_prefix, args.unblock, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(10): # TODO detect send success/fail time.sleep(1) diff --git a/follow.py b/follow.py index 5e5980b0b..22f4be152 100644 --- a/follow.py +++ b/follow.py @@ -722,7 +722,7 @@ def followedAccountAccepts(session, base_dir: str, http_prefix: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, removeFollowActivity: bool, - signingPrivateKeyPem: str): + signing_priv_key_pem: str): """The person receiving a follow request accepts the new follower and sends back an Accept activity """ @@ -772,7 +772,7 @@ def followedAccountAccepts(session, base_dir: str, http_prefix: str, federationList, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, None, - groupAccount, signingPrivateKeyPem, + groupAccount, signing_priv_key_pem, 7856837) @@ -784,7 +784,7 @@ def followedAccountRejects(session, base_dir: str, http_prefix: str, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str): + signing_priv_key_pem: str): """The person receiving a follow request rejects the new follower and sends back a Reject activity """ @@ -840,7 +840,7 @@ def followedAccountRejects(session, base_dir: str, http_prefix: str, federationList, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, None, - groupAccount, signingPrivateKeyPem, + groupAccount, signing_priv_key_pem, 6393063) @@ -852,10 +852,10 @@ def sendFollowRequest(session, base_dir: str, client_to_server: bool, federationList: [], send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, debug: bool, - project_version: str, signingPrivateKeyPem: str) -> {}: + project_version: str, signing_priv_key_pem: str) -> {}: """Gets the json object for sending a follow request """ - if not signingPrivateKeyPem: + if not signing_priv_key_pem: print('WARN: follow request without signing key') if not domainPermitted(followDomain, federationList): @@ -932,7 +932,7 @@ def sendFollowRequest(session, base_dir: str, federationList, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, None, groupAccount, - signingPrivateKeyPem, 8234389) + signing_priv_key_pem, 8234389) return newFollowJson @@ -945,7 +945,7 @@ def sendFollowRequestViaServer(base_dir: str, session, http_prefix: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a follow request via c2s """ if not session: @@ -975,7 +975,7 @@ def sendFollowRequestViaServer(base_dir: str, session, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: follow request webfinger failed for ' + handle) @@ -991,7 +991,7 @@ def sendFollowRequestViaServer(base_dir: str, session, originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, originDomain, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, http_prefix, fromNickname, fromDomain, postToBox, 52025) @@ -1035,7 +1035,7 @@ def sendUnfollowRequestViaServer(base_dir: str, session, http_prefix: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a unfollow request via c2s """ if not session: @@ -1069,7 +1069,7 @@ def sendUnfollowRequestViaServer(base_dir: str, session, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: unfollow webfinger failed for ' + handle) @@ -1084,7 +1084,7 @@ def sendUnfollowRequestViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -1130,7 +1130,7 @@ def getFollowingViaServer(base_dir: str, session, http_prefix: str, pageNumber: int, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Gets a page from the following collection as json """ if not session: @@ -1152,7 +1152,7 @@ def getFollowingViaServer(base_dir: str, session, pageNumber = 1 url = followActor + '/following?page=' + str(pageNumber) followingJson = \ - getJson(signingPrivateKeyPem, session, url, headers, {}, debug, + getJson(signing_priv_key_pem, session, url, headers, {}, debug, __version__, http_prefix, domain, 10, True) if not followingJson: if debug: @@ -1171,7 +1171,7 @@ def getFollowersViaServer(base_dir: str, session, http_prefix: str, pageNumber: int, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Gets a page from the followers collection as json """ if not session: @@ -1193,7 +1193,7 @@ def getFollowersViaServer(base_dir: str, session, pageNumber = 1 url = followActor + '/followers?page=' + str(pageNumber) followersJson = \ - getJson(signingPrivateKeyPem, session, url, headers, {}, debug, + getJson(signing_priv_key_pem, session, url, headers, {}, debug, __version__, http_prefix, domain, 10, True) if not followersJson: if debug: @@ -1212,7 +1212,7 @@ def getFollowRequestsViaServer(base_dir: str, session, http_prefix: str, pageNumber: int, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Gets a page from the follow requests collection as json """ if not session: @@ -1234,7 +1234,7 @@ def getFollowRequestsViaServer(base_dir: str, session, pageNumber = 1 url = followActor + '/followrequests?page=' + str(pageNumber) followersJson = \ - getJson(signingPrivateKeyPem, session, url, headers, {}, debug, + getJson(signing_priv_key_pem, session, url, headers, {}, debug, __version__, http_prefix, domain, 10, True) if not followersJson: if debug: @@ -1253,7 +1253,7 @@ def approveFollowRequestViaServer(base_dir: str, session, http_prefix: str, approveHandle: int, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> str: + signing_priv_key_pem: str) -> str: """Approves a follow request This is not exactly via c2s though. It simulates pressing the Approve button on the web interface @@ -1275,7 +1275,7 @@ def approveFollowRequestViaServer(base_dir: str, session, url = actor + '/followapprove=' + approveHandle approveHtml = \ - getJson(signingPrivateKeyPem, session, url, headers, {}, debug, + getJson(signing_priv_key_pem, session, url, headers, {}, debug, __version__, http_prefix, domain, 10, True) if not approveHtml: if debug: @@ -1294,7 +1294,7 @@ def denyFollowRequestViaServer(base_dir: str, session, http_prefix: str, denyHandle: int, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> str: + signing_priv_key_pem: str) -> str: """Denies a follow request This is not exactly via c2s though. It simulates pressing the Deny button on the web interface @@ -1316,7 +1316,7 @@ def denyFollowRequestViaServer(base_dir: str, session, url = actor + '/followdeny=' + denyHandle denyHtml = \ - getJson(signingPrivateKeyPem, session, url, headers, {}, debug, + getJson(signing_priv_key_pem, session, url, headers, {}, debug, __version__, http_prefix, domain, 10, True) if not denyHtml: if debug: diff --git a/inbox.py b/inbox.py index 457dba3a7..9f0cda17d 100644 --- a/inbox.py +++ b/inbox.py @@ -289,9 +289,9 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int, show_published_date_only: bool, peertubeInstances: [], allow_local_network_access: bool, - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, CWlists: {}, lists_enabled: str) -> None: """Converts the json post into html and stores it in a cache @@ -305,7 +305,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int, notDM = not isDM(post_json_object) yt_replace_domain = getConfigParam(base_dir, 'youtubedomain') twitter_replacement_domain = getConfigParam(base_dir, 'twitterdomain') - individualPostAsHtml(signingPrivateKeyPem, + individualPostAsHtml(signing_priv_key_pem, True, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, @@ -316,7 +316,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, max_recent_posts: int, yt_replace_domain, twitter_replacement_domain, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, max_like_count, + themeName, system_language, max_like_count, notDM, True, True, False, True, False, CWlists, lists_enabled) @@ -456,7 +456,7 @@ def savePostToInboxQueue(base_dir: str, http_prefix: str, messageBytes: str, httpHeaders: {}, postPath: str, debug: bool, - blockedCache: [], systemLanguage: str) -> str: + blockedCache: [], system_language: str) -> str: """Saves the given json to the inbox queue for the person keyId specifies the actor sending the post """ @@ -521,7 +521,7 @@ def savePostToInboxQueue(base_dir: str, http_prefix: str, return None if post_json_object['object'].get('content'): contentStr = \ - getBaseContentFromPost(post_json_object, systemLanguage) + getBaseContentFromPost(post_json_object, system_language) if contentStr: if isFiltered(base_dir, nickname, domain, contentStr): if debug: @@ -998,14 +998,14 @@ def _receiveLike(recentPostsCache: {}, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, messageJson: {}, federationList: [], debug: bool, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, max_recent_posts: int, translate: {}, allow_deletion: bool, yt_replace_domain: str, twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, CWlists: {}, lists_enabled: str) -> bool: """Receives a Like activity within the POST section of HTTPServer @@ -1092,7 +1092,7 @@ def _receiveLike(recentPostsCache: {}, manuallyApproveFollowers = \ followerApprovalActive(base_dir, handleName, domain) notDM = not isDM(likedPostJson) - individualPostAsHtml(signingPrivateKeyPem, False, + individualPostAsHtml(signing_priv_key_pem, False, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, person_cache, @@ -1105,7 +1105,7 @@ def _receiveLike(recentPostsCache: {}, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, notDM, showIndividualPostIcons, manuallyApproveFollowers, @@ -1120,14 +1120,14 @@ def _receiveUndoLike(recentPostsCache: {}, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, messageJson: {}, federationList: [], debug: bool, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, max_recent_posts: int, translate: {}, allow_deletion: bool, yt_replace_domain: str, twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, CWlists: {}, lists_enabled: str) -> bool: """Receives an undo like activity within the POST section of HTTPServer @@ -1203,7 +1203,7 @@ def _receiveUndoLike(recentPostsCache: {}, manuallyApproveFollowers = \ followerApprovalActive(base_dir, handleName, domain) notDM = not isDM(likedPostJson) - individualPostAsHtml(signingPrivateKeyPem, False, + individualPostAsHtml(signing_priv_key_pem, False, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, person_cache, @@ -1216,7 +1216,7 @@ def _receiveUndoLike(recentPostsCache: {}, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, notDM, showIndividualPostIcons, manuallyApproveFollowers, @@ -1232,14 +1232,14 @@ def _receiveReaction(recentPostsCache: {}, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, messageJson: {}, federationList: [], debug: bool, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, max_recent_posts: int, translate: {}, allow_deletion: bool, yt_replace_domain: str, twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, CWlists: {}, lists_enabled: str) -> bool: """Receives an emoji reaction within the POST section of HTTPServer @@ -1351,7 +1351,7 @@ def _receiveReaction(recentPostsCache: {}, manuallyApproveFollowers = \ followerApprovalActive(base_dir, handleName, domain) notDM = not isDM(reactionPostJson) - individualPostAsHtml(signingPrivateKeyPem, False, + individualPostAsHtml(signing_priv_key_pem, False, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, person_cache, @@ -1364,7 +1364,7 @@ def _receiveReaction(recentPostsCache: {}, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, notDM, showIndividualPostIcons, manuallyApproveFollowers, @@ -1379,14 +1379,14 @@ def _receiveUndoReaction(recentPostsCache: {}, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, messageJson: {}, federationList: [], debug: bool, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, max_recent_posts: int, translate: {}, allow_deletion: bool, yt_replace_domain: str, twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, CWlists: {}, lists_enabled: str) -> bool: """Receives an undo emoji reaction within the POST section of HTTPServer @@ -1478,7 +1478,7 @@ def _receiveUndoReaction(recentPostsCache: {}, manuallyApproveFollowers = \ followerApprovalActive(base_dir, handleName, domain) notDM = not isDM(reactionPostJson) - individualPostAsHtml(signingPrivateKeyPem, False, + individualPostAsHtml(signing_priv_key_pem, False, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, person_cache, @@ -1491,7 +1491,7 @@ def _receiveUndoReaction(recentPostsCache: {}, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, notDM, showIndividualPostIcons, manuallyApproveFollowers, @@ -1505,14 +1505,14 @@ def _receiveBookmark(recentPostsCache: {}, http_prefix: str, domain: str, port: int, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, messageJson: {}, federationList: [], - debug: bool, signingPrivateKeyPem: str, + debug: bool, signing_priv_key_pem: str, max_recent_posts: int, translate: {}, allow_deletion: bool, yt_replace_domain: str, twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, CWlists: {}, lists_enabled: {}) -> bool: """Receives a bookmark activity within the POST section of HTTPServer @@ -1588,7 +1588,7 @@ def _receiveBookmark(recentPostsCache: {}, manuallyApproveFollowers = \ followerApprovalActive(base_dir, nickname, domain) notDM = not isDM(bookmarkedPostJson) - individualPostAsHtml(signingPrivateKeyPem, False, + individualPostAsHtml(signing_priv_key_pem, False, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, person_cache, @@ -1601,7 +1601,7 @@ def _receiveBookmark(recentPostsCache: {}, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, notDM, showIndividualPostIcons, manuallyApproveFollowers, @@ -1615,14 +1615,14 @@ def _receiveUndoBookmark(recentPostsCache: {}, http_prefix: str, domain: str, port: int, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, messageJson: {}, federationList: [], - debug: bool, signingPrivateKeyPem: str, + debug: bool, signing_priv_key_pem: str, max_recent_posts: int, translate: {}, allow_deletion: bool, yt_replace_domain: str, twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, CWlists: {}, lists_enabled: str) -> bool: """Receives an undo bookmark activity within the POST section of HTTPServer @@ -1699,7 +1699,7 @@ def _receiveUndoBookmark(recentPostsCache: {}, manuallyApproveFollowers = \ followerApprovalActive(base_dir, nickname, domain) notDM = not isDM(bookmarkedPostJson) - individualPostAsHtml(signingPrivateKeyPem, False, + individualPostAsHtml(signing_priv_key_pem, False, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, person_cache, @@ -1712,7 +1712,7 @@ def _receiveUndoBookmark(recentPostsCache: {}, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, notDM, showIndividualPostIcons, manuallyApproveFollowers, @@ -1805,8 +1805,8 @@ def _receiveAnnounce(recentPostsCache: {}, yt_replace_domain: str, twitter_replacement_domain: str, allow_local_network_access: bool, - themeName: str, systemLanguage: str, - signingPrivateKeyPem: str, + themeName: str, system_language: str, + signing_priv_key_pem: str, max_recent_posts: int, allow_deletion: bool, peertubeInstances: [], @@ -1906,7 +1906,7 @@ def _receiveAnnounce(recentPostsCache: {}, if debug: print('Generating html for announce ' + messageJson['id']) announceHtml = \ - individualPostAsHtml(signingPrivateKeyPem, True, + individualPostAsHtml(signing_priv_key_pem, True, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, person_cache, @@ -1919,7 +1919,7 @@ def _receiveAnnounce(recentPostsCache: {}, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, notDM, showIndividualPostIcons, manuallyApproveFollowers, @@ -1941,9 +1941,9 @@ def _receiveAnnounce(recentPostsCache: {}, twitter_replacement_domain, allow_local_network_access, recentPostsCache, debug, - systemLanguage, + system_language, domainFull, person_cache, - signingPrivateKeyPem, + signing_priv_key_pem, blockedCache) if not post_json_object: print('WARN: unable to download announce: ' + str(messageJson)) @@ -2007,7 +2007,7 @@ def _receiveAnnounce(recentPostsCache: {}, person_cache, debug, __version__, http_prefix, domain, onion_domain, - signingPrivateKeyPem) + signing_priv_key_pem) if pubKey: if debug: print('DEBUG: public key obtained for announce: ' + @@ -2189,7 +2189,7 @@ def _estimateNumberOfEmoji(content: str) -> int: def _validPostContent(base_dir: str, nickname: str, domain: str, messageJson: {}, max_mentions: int, max_emoji: int, allow_local_network_access: bool, debug: bool, - systemLanguage: str, + system_language: str, http_prefix: str, domainFull: str, person_cache: {}) -> bool: """Is the content of a received post valid? @@ -2230,7 +2230,7 @@ def _validPostContent(base_dir: str, nickname: str, domain: str, messageJson['object']['content']): return True - contentStr = getBaseContentFromPost(messageJson, systemLanguage) + contentStr = getBaseContentFromPost(messageJson, system_language) if dangerousMarkup(contentStr, allow_local_network_access): if messageJson['object'].get('id'): print('REJECT ARBITRARY HTML: ' + messageJson['object']['id']) @@ -2265,7 +2265,7 @@ def _validPostContent(base_dir: str, nickname: str, domain: str, return False # check that the post is in a language suitable for this account if not understoodPostLanguage(base_dir, nickname, domain, - messageJson, systemLanguage, + messageJson, system_language, http_prefix, domainFull, person_cache): return False @@ -2294,7 +2294,7 @@ def _validPostContent(base_dir: str, nickname: str, domain: str, def _obtainAvatarForReplyPost(session, base_dir: str, http_prefix: str, domain: str, onion_domain: str, person_cache: {}, post_json_object: {}, debug: bool, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Tries to obtain the actor for the person being replied to so that their avatar can later be shown """ @@ -2325,7 +2325,7 @@ def _obtainAvatarForReplyPost(session, base_dir: str, http_prefix: str, getPersonPubKey(base_dir, session, lookupActor, person_cache, debug, __version__, http_prefix, - domain, onion_domain, signingPrivateKeyPem) + domain, onion_domain, signing_priv_key_pem) if pubKey: if debug: print('DEBUG: public key obtained for reply: ' + lookupActor) @@ -2612,9 +2612,9 @@ def _sendToGroupMembers(session, base_dir: str, handle: str, port: int, http_prefix: str, federationList: [], send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, debug: bool, - systemLanguage: str, + system_language: str, onion_domain: str, i2p_domain: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """When a post arrives for a group send it out to the group members """ if debug: @@ -2665,7 +2665,7 @@ def _sendToGroupMembers(session, base_dir: str, handle: str, port: int, http_prefix, postId, False, False, send_threads, postLog, person_cache, cached_webfingers, - debug, __version__, signingPrivateKeyPem) + debug, __version__, signing_priv_key_pem) sendToFollowersThread(session, base_dir, nickname, domain, onion_domain, i2p_domain, port, @@ -2675,7 +2675,7 @@ def _sendToGroupMembers(session, base_dir: str, handle: str, port: int, announceJson, debug, __version__, shared_items_federated_domains, sharedItemFederationTokens, - signingPrivateKeyPem) + signing_priv_key_pem) def _inboxUpdateCalendar(base_dir: str, handle: str, @@ -2795,8 +2795,8 @@ def _bounceDM(senderPostId: str, session, http_prefix: str, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, translate: {}, debug: bool, - lastBounceMessage: [], systemLanguage: str, - signingPrivateKeyPem: str, + lastBounceMessage: [], system_language: str, + signing_priv_key_pem: str, content_license_url: str) -> bool: """Sends a bounce message back to the sending handle if a DM has been rejected @@ -2856,7 +2856,7 @@ def _bounceDM(senderPostId: str, session, http_prefix: str, inReplyTo, inReplyToAtomUri, subject, debug, schedulePost, eventDate, eventTime, location, - systemLanguage, conversationId, low_bandwidth, + system_language, conversationId, low_bandwidth, content_license_url) if not post_json_object: print('WARN: unable to create bounce message to ' + sendingHandle) @@ -2869,7 +2869,7 @@ def _bounceDM(senderPostId: str, session, http_prefix: str, http_prefix, False, False, federationList, send_threads, postLog, cached_webfingers, person_cache, debug, __version__, None, groupAccount, - signingPrivateKeyPem, 7238634) + signing_priv_key_pem, 7238634) return True @@ -2882,8 +2882,8 @@ def _isValidDM(base_dir: str, nickname: str, domain: str, port: int, person_cache: {}, translate: {}, debug: bool, lastBounceMessage: [], - handle: str, systemLanguage: str, - signingPrivateKeyPem: str, + handle: str, system_language: str, + signing_priv_key_pem: str, content_license_url: str) -> bool: """Is the given message a valid DM? """ @@ -2961,8 +2961,8 @@ def _isValidDM(base_dir: str, nickname: str, domain: str, port: int, person_cache, translate, debug, lastBounceMessage, - systemLanguage, - signingPrivateKeyPem, + system_language, + signing_priv_key_pem, content_license_url) return False @@ -2980,14 +2980,14 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str, i2p_domain: str, port: int, federationList: [], send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, max_recent_posts: int, translate: {}, allow_deletion: bool, yt_replace_domain: str, twitter_replacement_domain: str, peertubeInstances: [], allow_local_network_access: bool, - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, CWlists: {}, lists_enabled: bool) -> None: """Updates the votes on a Question/poll @@ -3019,7 +3019,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str, manuallyApproveFollowers = \ followerApprovalActive(base_dir, nickname, domain) notDM = not isDM(questionJson) - individualPostAsHtml(signingPrivateKeyPem, False, + individualPostAsHtml(signing_priv_key_pem, False, recentPostsCache, max_recent_posts, translate, pageNumber, base_dir, session, cached_webfingers, person_cache, @@ -3032,7 +3032,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, notDM, showIndividualPostIcons, manuallyApproveFollowers, @@ -3060,7 +3060,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str, post_json_object, debug, __version__, shared_items_federated_domains, sharedItemFederationTokens, - signingPrivateKeyPem) + signing_priv_key_pem) def _createReplyNotificationFile(base_dir: str, nickname: str, domain: str, @@ -3196,9 +3196,9 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, allow_local_network_access: bool, peertubeInstances: [], lastBounceMessage: [], - themeName: str, systemLanguage: str, + themeName: str, system_language: str, max_like_count: int, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, default_reply_interval_hrs: int, CWlists: {}, lists_enabled: str, content_license_url: str) -> bool: @@ -3223,14 +3223,14 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, person_cache, messageJson, federationList, - debug, signingPrivateKeyPem, + debug, signing_priv_key_pem, max_recent_posts, translate, allow_deletion, yt_replace_domain, twitter_replacement_domain, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, CWlists, lists_enabled): if debug: print('DEBUG: Like accepted from ' + actor) @@ -3245,14 +3245,14 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, person_cache, messageJson, federationList, - debug, signingPrivateKeyPem, + debug, signing_priv_key_pem, max_recent_posts, translate, allow_deletion, yt_replace_domain, twitter_replacement_domain, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, CWlists, lists_enabled): if debug: print('DEBUG: Undo like accepted from ' + actor) @@ -3268,14 +3268,14 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, person_cache, messageJson, federationList, - debug, signingPrivateKeyPem, + debug, signing_priv_key_pem, max_recent_posts, translate, allow_deletion, yt_replace_domain, twitter_replacement_domain, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, CWlists, lists_enabled): if debug: print('DEBUG: Reaction accepted from ' + actor) @@ -3290,14 +3290,14 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, person_cache, messageJson, federationList, - debug, signingPrivateKeyPem, + debug, signing_priv_key_pem, max_recent_posts, translate, allow_deletion, yt_replace_domain, twitter_replacement_domain, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, CWlists, lists_enabled): if debug: print('DEBUG: Undo reaction accepted from ' + actor) @@ -3312,14 +3312,14 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, person_cache, messageJson, federationList, - debug, signingPrivateKeyPem, + debug, signing_priv_key_pem, max_recent_posts, translate, allow_deletion, yt_replace_domain, twitter_replacement_domain, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, CWlists, lists_enabled): if debug: print('DEBUG: Bookmark accepted from ' + actor) @@ -3334,14 +3334,14 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, person_cache, messageJson, federationList, - debug, signingPrivateKeyPem, + debug, signing_priv_key_pem, max_recent_posts, translate, allow_deletion, yt_replace_domain, twitter_replacement_domain, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, CWlists, lists_enabled): if debug: print('DEBUG: Undo bookmark accepted from ' + actor) @@ -3363,8 +3363,8 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, yt_replace_domain, twitter_replacement_domain, allow_local_network_access, - themeName, systemLanguage, - signingPrivateKeyPem, + themeName, system_language, + signing_priv_key_pem, max_recent_posts, allow_deletion, peertubeInstances, @@ -3419,12 +3419,12 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, if _validPostContent(base_dir, nickname, domain, post_json_object, max_mentions, max_emoji, allow_local_network_access, debug, - systemLanguage, http_prefix, + system_language, http_prefix, domainFull, person_cache): # is the sending actor valid? if not validSendingActor(session, base_dir, nickname, domain, person_cache, post_json_object, - signingPrivateKeyPem, debug, unit_test): + signing_priv_key_pem, debug, unit_test): return False if post_json_object.get('object'): @@ -3439,11 +3439,11 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, return False # replace YouTube links, so they get less tracking data - replaceYouTube(post_json_object, yt_replace_domain, systemLanguage) + replaceYouTube(post_json_object, yt_replace_domain, system_language) # replace twitter link domains, so that you can view twitter posts # without having an account replaceTwitter(post_json_object, twitter_replacement_domain, - systemLanguage) + system_language) # list of indexes to be updated updateIndexList = ['inbox'] @@ -3456,14 +3456,14 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, session, onion_domain, i2p_domain, port, federationList, send_threads, postLog, cached_webfingers, person_cache, - signingPrivateKeyPem, + signing_priv_key_pem, max_recent_posts, translate, allow_deletion, yt_replace_domain, twitter_replacement_domain, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, CWlists, lists_enabled) @@ -3482,8 +3482,8 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, person_cache, translate, debug, lastBounceMessage, - handle, systemLanguage, - signingPrivateKeyPem, + handle, system_language, + signing_priv_key_pem, content_license_url): return False @@ -3504,8 +3504,8 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, yt_replace_domain, twitter_replacement_domain, allow_local_network_access, - recentPostsCache, debug, systemLanguage, - domainFull, person_cache, signingPrivateKeyPem): + recentPostsCache, debug, system_language, + domainFull, person_cache, signing_priv_key_pem): # media index will be updated updateIndexList.append('tlmedia') if isBlogPost(post_json_object): @@ -3516,7 +3516,7 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, _obtainAvatarForReplyPost(session, base_dir, http_prefix, domain, onion_domain, person_cache, post_json_object, debug, - signingPrivateKeyPem) + signing_priv_key_pem) # save the post to file if saveJson(post_json_object, destinationFilename): @@ -3568,9 +3568,9 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, show_published_date_only, peertubeInstances, allow_local_network_access, - themeName, systemLanguage, + themeName, system_language, max_like_count, - signingPrivateKeyPem, + signing_priv_key_pem, CWlists, lists_enabled) if debug: timeDiff = \ @@ -3612,9 +3612,9 @@ def _inboxAfterInitial(recentPostsCache: {}, max_recent_posts: int, post_json_object, http_prefix, federationList, send_threads, postLog, cached_webfingers, person_cache, - debug, systemLanguage, + debug, system_language, onion_domain, i2p_domain, - signingPrivateKeyPem) + signing_priv_key_pem) # if the post wasn't saved if not os.path.isfile(destinationFilename): @@ -3852,7 +3852,7 @@ def _receiveFollowRequest(session, base_dir: str, http_prefix: str, messageJson: {}, federationList: [], debug: bool, project_version: str, max_followers: int, onion_domain: str, - signingPrivateKeyPem: str, unit_test: bool) -> bool: + signing_priv_key_pem: str, unit_test: bool) -> bool: """Receives a follow request within the POST section of HTTPServer """ if not messageJson['type'].startswith('Follow'): @@ -3935,7 +3935,7 @@ def _receiveFollowRequest(session, base_dir: str, http_prefix: str, if not validSendingActor(session, base_dir, nicknameToFollow, domainToFollow, person_cache, messageJson, - signingPrivateKeyPem, debug, unit_test): + signing_priv_key_pem, debug, unit_test): print('REJECT spam follow request ' + approveHandle) return False @@ -3972,7 +3972,7 @@ def _receiveFollowRequest(session, base_dir: str, http_prefix: str, if not getPersonPubKey(base_dir, session, messageJson['actor'], person_cache, debug, project_version, http_prefix, domainToFollow, onion_domain, - signingPrivateKeyPem): + signing_priv_key_pem): if debug: print('Unable to obtain following actor: ' + messageJson['actor']) @@ -4009,7 +4009,7 @@ def _receiveFollowRequest(session, base_dir: str, http_prefix: str, if not getPersonPubKey(base_dir, session, messageJson['actor'], person_cache, debug, project_version, http_prefix, domainToFollow, onion_domain, - signingPrivateKeyPem): + signing_priv_key_pem): if debug: print('Unable to obtain following actor: ' + messageJson['actor']) @@ -4058,7 +4058,7 @@ def _receiveFollowRequest(session, base_dir: str, http_prefix: str, messageJson, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, True, - signingPrivateKeyPem) + signing_priv_key_pem) def runInboxQueue(recentPostsCache: {}, max_recent_posts: int, @@ -4081,8 +4081,8 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int, allow_local_network_access: bool, peertubeInstances: [], verify_all_signatures: bool, - themeName: str, systemLanguage: str, - max_like_count: int, signingPrivateKeyPem: str, + themeName: str, system_language: str, + max_like_count: int, signing_priv_key_pem: str, default_reply_interval_hrs: int, CWlists: {}) -> None: """Processes received items and moves them to the appropriate @@ -4236,7 +4236,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int, getPersonPubKey(base_dir, session, keyId, person_cache, debug, project_version, http_prefix, - domain, onion_domain, signingPrivateKeyPem) + domain, onion_domain, signing_priv_key_pem) if pubKey: if debug: print('DEBUG: public key: ' + str(pubKey)) @@ -4375,7 +4375,7 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int, federationList, debug, project_version, max_followers, onion_domain, - signingPrivateKeyPem, unit_test): + signing_priv_key_pem, unit_test): if os.path.isfile(queueFilename): try: os.remove(queueFilename) @@ -4511,9 +4511,9 @@ def runInboxQueue(recentPostsCache: {}, max_recent_posts: int, allow_local_network_access, peertubeInstances, lastBounceMessage, - themeName, systemLanguage, + themeName, system_language, max_like_count, - signingPrivateKeyPem, + signing_priv_key_pem, default_reply_interval_hrs, CWlists, lists_enabled, content_license_url) diff --git a/languages.py b/languages.py index 9cea10894..49bf16c1f 100644 --- a/languages.py +++ b/languages.py @@ -90,7 +90,7 @@ def setActorLanguages(base_dir: str, actorJson: {}, languagesStr: str) -> None: def understoodPostLanguage(base_dir: str, nickname: str, domain: str, - messageJson: {}, systemLanguage: str, + messageJson: {}, system_language: str, http_prefix: str, domainFull: str, person_cache: {}) -> bool: """Returns true if the post is written in a language @@ -103,7 +103,7 @@ def understoodPostLanguage(base_dir: str, nickname: str, domain: str, return True if not isinstance(msgObject['contentMap'], dict): return True - if msgObject['contentMap'].get(systemLanguage): + if msgObject['contentMap'].get(system_language): return True personUrl = localActorUrl(http_prefix, nickname, domainFull) actorJson = getPersonFromCache(base_dir, personUrl, person_cache, False) @@ -274,7 +274,7 @@ def libretranslate(url: str, text: str, def autoTranslatePost(base_dir: str, post_json_object: {}, - systemLanguage: str, translate: {}) -> str: + system_language: str, translate: {}) -> str: """Tries to automatically translate the given post """ if not hasObjectDict(post_json_object): @@ -297,7 +297,7 @@ def autoTranslatePost(base_dir: str, post_json_object: {}, content = msgObject['contentMap'][lang] translatedText = \ libretranslate(libretranslateUrl, content, - lang, systemLanguage, + lang, system_language, libretranslateApiKey) if translatedText: if removeHtml(translatedText) == removeHtml(content): diff --git a/like.py b/like.py index 0dc131d4a..0ac78dca8 100644 --- a/like.py +++ b/like.py @@ -77,7 +77,7 @@ def _like(recentPostsCache: {}, send_threads: [], postLog: [], person_cache: {}, cached_webfingers: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a like actor is the person doing the liking 'to' might be a specific person (actor) whose post was liked @@ -138,7 +138,7 @@ def _like(recentPostsCache: {}, http_prefix, True, client_to_server, federationList, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, None, groupAccount, - signingPrivateKeyPem, 7367374) + signing_priv_key_pem, 7367374) return newLikeJson @@ -152,7 +152,7 @@ def likePost(recentPostsCache: {}, send_threads: [], postLog: [], person_cache: {}, cached_webfingers: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Likes a given status post. This is only used by unit tests """ likeDomain = getFullDomain(likeDomain, likePort) @@ -164,7 +164,7 @@ def likePost(recentPostsCache: {}, session, base_dir, federationList, nickname, domain, port, ccList, http_prefix, objectUrl, actorLiked, client_to_server, send_threads, postLog, person_cache, cached_webfingers, - debug, project_version, signingPrivateKeyPem) + debug, project_version, signing_priv_key_pem) def sendLikeViaServer(base_dir: str, session, @@ -173,7 +173,7 @@ def sendLikeViaServer(base_dir: str, session, http_prefix: str, likeUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a like via c2s """ if not session: @@ -197,7 +197,7 @@ def sendLikeViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: like webfinger failed for ' + handle) @@ -212,7 +212,7 @@ def sendLikeViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -256,7 +256,7 @@ def sendUndoLikeViaServer(base_dir: str, session, http_prefix: str, likeUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Undo a like via c2s """ if not session: @@ -284,7 +284,7 @@ def sendUndoLikeViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: unlike webfinger failed for ' + handle) @@ -300,7 +300,7 @@ def sendUndoLikeViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, diff --git a/manualapprove.py b/manualapprove.py index bd95979d5..20322c553 100644 --- a/manualapprove.py +++ b/manualapprove.py @@ -28,7 +28,7 @@ def manualDenyFollowRequest(session, base_dir: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Manually deny a follow request """ accountsDir = acctDir(base_dir, nickname, domain) @@ -66,7 +66,7 @@ def manualDenyFollowRequest(session, base_dir: str, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, - signingPrivateKeyPem) + signing_priv_key_pem) print('Follow request from ' + denyHandle + ' was denied.') @@ -80,7 +80,7 @@ def manualDenyFollowRequestThread(session, base_dir: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Manually deny a follow request, within a thread so that the user interface doesn't lag """ @@ -95,7 +95,7 @@ def manualDenyFollowRequestThread(session, base_dir: str, cached_webfingers, person_cache, debug, project_version, - signingPrivateKeyPem), daemon=True) + signing_priv_key_pem), daemon=True) thr.start() send_threads.append(thr) @@ -129,7 +129,7 @@ def manualApproveFollowRequest(session, base_dir: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Manually approve a follow request """ handle = nickname + '@' + domain @@ -219,7 +219,7 @@ def manualApproveFollowRequest(session, base_dir: str, person_cache, debug, project_version, False, - signingPrivateKeyPem) + signing_priv_key_pem) updateApprovedFollowers = True else: # this isn't the approved follow so it will remain @@ -286,7 +286,7 @@ def manualApproveFollowRequestThread(session, base_dir: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """Manually approve a follow request, in a thread so as not to cause the UI to lag """ @@ -301,6 +301,6 @@ def manualApproveFollowRequestThread(session, base_dir: str, cached_webfingers, person_cache, debug, project_version, - signingPrivateKeyPem), daemon=True) + signing_priv_key_pem), daemon=True) thr.start() send_threads.append(thr) diff --git a/mastoapiv1.py b/mastoapiv1.py index 071291f2a..38f3cb6b1 100644 --- a/mastoapiv1.py +++ b/mastoapiv1.py @@ -90,7 +90,7 @@ def mastoApiV1Response(path: str, callingDomain: str, onion_domain: str, i2p_domain: str, translate: {}, registration: bool, - systemLanguage: str, + system_language: str, project_version: str, customEmoji: [], show_node_info_accounts: bool, @@ -229,7 +229,7 @@ def mastoApiV1Response(path: str, callingDomain: str, domain, domainFull, registration, - systemLanguage, + system_language, project_version) sendJsonStr = 'masto API instance metadata sent ' + uaStr elif path.startswith('/api/v1/instance/peers'): diff --git a/media.py b/media.py index 454db5ede..c266661a2 100644 --- a/media.py +++ b/media.py @@ -54,7 +54,7 @@ def _getBlurHash() -> str: def _replaceSiloDomain(post_json_object: {}, siloDomain: str, replacementDomain: str, - systemLanguage: str) -> None: + system_language: str) -> None: """Replace a silo domain with a replacement domain """ if not replacementDomain: @@ -63,31 +63,31 @@ def _replaceSiloDomain(post_json_object: {}, return if not post_json_object['object'].get('content'): return - contentStr = getBaseContentFromPost(post_json_object, systemLanguage) + contentStr = getBaseContentFromPost(post_json_object, system_language) if siloDomain not in contentStr: return contentStr = contentStr.replace(siloDomain, replacementDomain) post_json_object['object']['content'] = contentStr if post_json_object['object'].get('contentMap'): - post_json_object['object']['contentMap'][systemLanguage] = contentStr + post_json_object['object']['contentMap'][system_language] = contentStr def replaceYouTube(post_json_object: {}, replacementDomain: str, - systemLanguage: str) -> None: + system_language: str) -> None: """Replace YouTube with a replacement domain This denies Google some, but not all, tracking data """ _replaceSiloDomain(post_json_object, 'www.youtube.com', - replacementDomain, systemLanguage) + replacementDomain, system_language) def replaceTwitter(post_json_object: {}, replacementDomain: str, - systemLanguage: str) -> None: + system_language: str) -> None: """Replace Twitter with a replacement domain This allows you to view twitter posts without having a twitter account """ _replaceSiloDomain(post_json_object, 'twitter.com', - replacementDomain, systemLanguage) + replacementDomain, system_language) def _removeMetaData(imageFilename: str, outputFilename: str) -> None: diff --git a/metadata.py b/metadata.py index 84a2b004b..01533cab5 100644 --- a/metadata.py +++ b/metadata.py @@ -87,7 +87,7 @@ def metaDataInstance(showAccounts: bool, instanceDescription: str, http_prefix: str, base_dir: str, adminNickname: str, domain: str, domainFull: str, - registration: bool, systemLanguage: str, + registration: bool, system_language: str, version: str) -> {}: """ /api/v1/instance endpoint """ @@ -163,7 +163,7 @@ def metaDataInstance(showAccounts: bool, 'username': adminActor['preferredUsername'] }, 'description': instanceDescription, - 'languages': [systemLanguage], + 'languages': [system_language], 'short_description': instanceDescriptionShort, 'stats': { 'domain_count': 2, diff --git a/migrate.py b/migrate.py index 9a9729a78..ffad009ec 100644 --- a/migrate.py +++ b/migrate.py @@ -24,7 +24,7 @@ def _moveFollowingHandlesForAccount(base_dir: str, nickname: str, domain: str, session, http_prefix: str, cached_webfingers: {}, debug: bool, - signingPrivateKeyPem: str) -> int: + signing_priv_key_pem: str) -> int: """Goes through all follows for an account and updates any that have moved """ ctr = 0 @@ -39,14 +39,14 @@ def _moveFollowingHandlesForAccount(base_dir: str, nickname: str, domain: str, _updateMovedHandle(base_dir, nickname, domain, followHandle, session, http_prefix, cached_webfingers, - debug, signingPrivateKeyPem) + debug, signing_priv_key_pem) return ctr def _updateMovedHandle(base_dir: str, nickname: str, domain: str, handle: str, session, http_prefix: str, cached_webfingers: {}, - debug: bool, signingPrivateKeyPem: str) -> int: + debug: bool, signing_priv_key_pem: str) -> int: """Check if an account has moved, and if so then alter following.txt for each account. Returns 1 if moved, 0 otherwise @@ -61,7 +61,7 @@ def _updateMovedHandle(base_dir: str, nickname: str, domain: str, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, __version__, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: print('updateMovedHandle unable to webfinger ' + handle) return ctr @@ -86,7 +86,7 @@ def _updateMovedHandle(base_dir: str, nickname: str, domain: str, gnunet = True personJson = \ getActorJson(domain, personUrl, http_prefix, gnunet, debug, False, - signingPrivateKeyPem, None) + signing_priv_key_pem, None) if not personJson: return ctr if not personJson.get('movedTo'): @@ -175,7 +175,7 @@ def _updateMovedHandle(base_dir: str, nickname: str, domain: str, def migrateAccounts(base_dir: str, session, http_prefix: str, cached_webfingers: {}, - debug: bool, signingPrivateKeyPem: str) -> int: + debug: bool, signing_priv_key_pem: str) -> int: """If followed accounts change then this modifies the following lists for each account accordingly. Returns the number of accounts migrated @@ -192,6 +192,6 @@ def migrateAccounts(base_dir: str, session, _moveFollowingHandlesForAccount(base_dir, nickname, domain, session, http_prefix, cached_webfingers, debug, - signingPrivateKeyPem) + signing_priv_key_pem) break return ctr diff --git a/newsdaemon.py b/newsdaemon.py index 04f842a91..0cb926e07 100644 --- a/newsdaemon.py +++ b/newsdaemon.py @@ -287,7 +287,7 @@ def hashtagRuleTree(operators: [], def _hashtagAdd(base_dir: str, http_prefix: str, domainFull: str, post_json_object: {}, - actionStr: str, hashtags: [], systemLanguage: str, + actionStr: str, hashtags: [], system_language: str, translate: {}) -> None: """Adds a hashtag via a hashtag rule """ @@ -322,7 +322,7 @@ def _hashtagAdd(base_dir: str, http_prefix: str, domainFull: str, hashtagHtml = \ " #" + htId + "" - content = getBaseContentFromPost(post_json_object, systemLanguage) + content = getBaseContentFromPost(post_json_object, system_language) if hashtagHtml in content: return @@ -342,7 +342,7 @@ def _hashtagAdd(base_dir: str, http_prefix: str, domainFull: str, def _hashtagRemove(http_prefix: str, domainFull: str, post_json_object: {}, - actionStr: str, hashtags: [], systemLanguage: str) -> None: + actionStr: str, hashtags: [], system_language: str) -> None: """Removes a hashtag via a hashtag rule """ rmHashtag = actionStr.split('remove ', 1)[1].strip() @@ -357,11 +357,11 @@ def _hashtagRemove(http_prefix: str, domainFull: str, post_json_object: {}, hashtagHtml = \ "#" + htId + "" - content = getBaseContentFromPost(post_json_object, systemLanguage) + content = getBaseContentFromPost(post_json_object, system_language) if hashtagHtml in content: content = content.replace(hashtagHtml, '').replace(' ', ' ') post_json_object['object']['content'] = content - post_json_object['object']['contentMap'][systemLanguage] = content + post_json_object['object']['contentMap'][system_language] = content rmTagObject = None for t in post_json_object['object']['tag']: if t.get('type') and t.get('name'): @@ -381,7 +381,7 @@ def _newswireHashtagProcessing(session, base_dir: str, post_json_object: {}, federationList: [], send_threads: [], postLog: [], moderated: bool, url: str, - systemLanguage: str, + system_language: str, translate: {}) -> bool: """Applies hashtag rules to a news post. Returns true if the post should be saved to the news timeline @@ -399,7 +399,7 @@ def _newswireHashtagProcessing(session, base_dir: str, post_json_object: {}, # get the full text content of the post content = '' if post_json_object['object'].get('content'): - content += getBaseContentFromPost(post_json_object, systemLanguage) + content += getBaseContentFromPost(post_json_object, system_language) if post_json_object['object'].get('summary'): content += ' ' + post_json_object['object']['summary'] content = content.lower() @@ -426,12 +426,12 @@ def _newswireHashtagProcessing(session, base_dir: str, post_json_object: {}, if actionStr.startswith('add '): # add a hashtag _hashtagAdd(base_dir, http_prefix, domainFull, - post_json_object, actionStr, hashtags, systemLanguage, + post_json_object, actionStr, hashtags, system_language, translate) elif actionStr.startswith('remove '): # remove a hashtag _hashtagRemove(http_prefix, domainFull, post_json_object, - actionStr, hashtags, systemLanguage) + actionStr, hashtags, system_language) elif actionStr.startswith('block') or actionStr.startswith('drop'): # Block this item return False @@ -544,7 +544,7 @@ def _convertRSStoActivityPub(base_dir: str, http_prefix: str, send_threads: [], postLog: [], max_mirrored_articles: int, allow_local_network_access: bool, - systemLanguage: str, + system_language: str, low_bandwidth: bool, content_license_url: str) -> None: """Converts rss items in a newswire into posts @@ -637,7 +637,7 @@ def _convertRSStoActivityPub(base_dir: str, http_prefix: str, followersOnly, saveToFile, attachImageFilename, mediaType, imageDescription, city, - rssTitle, systemLanguage, + rssTitle, system_language, conversationId, low_bandwidth, content_license_url) if not blog: @@ -669,7 +669,7 @@ def _convertRSStoActivityPub(base_dir: str, http_prefix: str, blog['object']['published'] = dateStr blog['object']['content'] = rssDescription - blog['object']['contentMap'][systemLanguage] = rssDescription + blog['object']['contentMap'][system_language] = rssDescription domainFull = getFullDomain(domain, port) @@ -685,7 +685,7 @@ def _convertRSStoActivityPub(base_dir: str, http_prefix: str, person_cache, cached_webfingers, federationList, send_threads, postLog, - moderated, url, systemLanguage, + moderated, url, system_language, translate) # save the post and update the index @@ -708,7 +708,7 @@ def _convertRSStoActivityPub(base_dir: str, http_prefix: str, "\" class=\"addedHashtag\" " + \ "rel=\"tag\">#" + \ htId + "" - content = getBaseContentFromPost(blog, systemLanguage) + content = getBaseContentFromPost(blog, system_language) if hashtagHtml not in content: if content.endswith('

'): content = \ @@ -717,7 +717,7 @@ def _convertRSStoActivityPub(base_dir: str, http_prefix: str, else: content += hashtagHtml blog['object']['content'] = content - blog['object']['contentMap'][systemLanguage] = content + blog['object']['contentMap'][system_language] = content # update the newswire tags if new ones have been found by # _newswireHashtagProcessing @@ -802,7 +802,7 @@ def runNewswireDaemon(base_dir: str, httpd, httpd.max_feed_item_size_kb, httpd.max_newswire_posts, httpd.maxCategoriesFeedItemSizeKb, - httpd.systemLanguage, + httpd.system_language, httpd.debug) if not httpd.newswire: @@ -835,7 +835,7 @@ def runNewswireDaemon(base_dir: str, httpd, httpd.postLog, httpd.max_mirrored_articles, httpd.allow_local_network_access, - httpd.systemLanguage, + httpd.system_language, httpd.low_bandwidth, httpd.content_license_url) print('Newswire feed converted to ActivityPub') diff --git a/newswire.py b/newswire.py index 7495855a1..243934375 100644 --- a/newswire.py +++ b/newswire.py @@ -1008,7 +1008,7 @@ def _addAccountBlogsToNewswire(base_dir: str, nickname: str, domain: str, newswire: {}, maxBlogsPerAccount: int, indexFilename: str, - maxTags: int, systemLanguage: str, + maxTags: int, system_language: str, session, debug: bool) -> None: """Adds blogs for the given account to the newswire """ @@ -1063,7 +1063,7 @@ def _addAccountBlogsToNewswire(base_dir: str, nickname: str, domain: str, votes = loadJson(fullPostFilename + '.votes') content = \ getBaseContentFromPost(post_json_object, - systemLanguage) + system_language) description = firstParagraphFromString(content) description = removeHtml(description) tagsFromPost = _getHashtagsFromPost(post_json_object) @@ -1084,7 +1084,7 @@ def _addAccountBlogsToNewswire(base_dir: str, nickname: str, domain: str, def _addBlogsToNewswire(base_dir: str, domain: str, newswire: {}, maxBlogsPerAccount: int, - maxTags: int, systemLanguage: str, + maxTags: int, system_language: str, session, debug: bool) -> None: """Adds blogs from each user account into the newswire """ @@ -1114,7 +1114,7 @@ def _addBlogsToNewswire(base_dir: str, domain: str, newswire: {}, _addAccountBlogsToNewswire(base_dir, nickname, domain, newswire, maxBlogsPerAccount, blogsIndex, maxTags, - systemLanguage, session, + system_language, session, debug) break @@ -1140,7 +1140,7 @@ def getDictFromNewswire(session, base_dir: str, domain: str, maxTags: int, max_feed_item_size_kb: int, max_newswire_posts: int, maxCategoriesFeedItemSizeKb: int, - systemLanguage: str, debug: bool) -> {}: + system_language: str, debug: bool) -> {}: """Gets rss feeds as a dictionary from newswire file """ subscriptionsFilename = base_dir + '/accounts/newswire.txt' @@ -1188,7 +1188,7 @@ def getDictFromNewswire(session, base_dir: str, domain: str, # add blogs from each user account _addBlogsToNewswire(base_dir, domain, result, - maxPostsPerSource, maxTags, systemLanguage, + maxPostsPerSource, maxTags, system_language, session, debug) # sort into chronological order, latest first diff --git a/outbox.py b/outbox.py index a16615176..f99159796 100644 --- a/outbox.py +++ b/outbox.py @@ -191,11 +191,11 @@ def postMessageToOutbox(session, translate: {}, twitter_replacement_domain: str, show_published_date_only: bool, allow_local_network_access: bool, - city: str, systemLanguage: str, + city: str, system_language: str, shared_items_federated_domains: [], sharedItemFederationTokens: {}, low_bandwidth: bool, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, peertubeInstances: str, theme: str, max_like_count: int, max_recent_posts: int, CWlists: {}, @@ -223,7 +223,7 @@ def postMessageToOutbox(session, translate: {}, # check that the outgoing post doesn't contain any markup # which can be used to implement exploits if hasObjectDict(messageJson): - contentStr = getBaseContentFromPost(messageJson, systemLanguage) + contentStr = getBaseContentFromPost(messageJson, system_language) if contentStr: if dangerousMarkup(contentStr, allow_local_network_access): print('POST to outbox contains dangerous markup: ' + @@ -286,10 +286,11 @@ def postMessageToOutbox(session, translate: {}, print('DEBUG: domain is blocked: ' + messageJson['actor']) return False # replace youtube, so that google gets less tracking data - replaceYouTube(messageJson, yt_replace_domain, systemLanguage) + replaceYouTube(messageJson, yt_replace_domain, system_language) # replace twitter, so that twitter posts can be shown without # having a twitter account - replaceTwitter(messageJson, twitter_replacement_domain, systemLanguage) + replaceTwitter(messageJson, twitter_replacement_domain, + system_language) # https://www.w3.org/TR/activitypub/#create-activity-outbox messageJson['object']['attributedTo'] = messageJson['actor'] if messageJson['object'].get('attachment'): @@ -426,9 +427,9 @@ def postMessageToOutbox(session, translate: {}, yt_replace_domain, twitter_replacement_domain, allow_local_network_access, - recentPostsCache, debug, systemLanguage, + recentPostsCache, debug, system_language, domainFull, person_cache, - signingPrivateKeyPem): + signing_priv_key_pem): inboxUpdateIndex('tlmedia', base_dir, postToNickname + '@' + domain, savedFilename, debug) @@ -452,7 +453,7 @@ def postMessageToOutbox(session, translate: {}, manuallyApproveFollowers = \ followerApprovalActive(base_dir, postToNickname, domain) - individualPostAsHtml(signingPrivateKeyPem, + individualPostAsHtml(signing_priv_key_pem, False, recentPostsCache, max_recent_posts, translate, pageNumber, @@ -469,7 +470,7 @@ def postMessageToOutbox(session, translate: {}, show_published_date_only, peertubeInstances, allow_local_network_access, - theme, systemLanguage, + theme, system_language, max_like_count, boxNameIndex != 'dm', showIndividualPostIcons, @@ -523,7 +524,7 @@ def postMessageToOutbox(session, translate: {}, version, shared_items_federated_domains, sharedItemFederationTokens, - signingPrivateKeyPem) + signing_priv_key_pem) followers_threads.append(followersThread) if debug: @@ -625,7 +626,7 @@ def postMessageToOutbox(session, translate: {}, print('DEBUG: handle share uploads') outboxShareUpload(base_dir, http_prefix, postToNickname, domain, port, messageJson, debug, city, - systemLanguage, translate, low_bandwidth, + system_language, translate, low_bandwidth, content_license_url) if debug: @@ -664,6 +665,6 @@ def postMessageToOutbox(session, translate: {}, version, shared_items_federated_domains, sharedItemFederationTokens, - signingPrivateKeyPem) + signing_priv_key_pem) followers_threads.append(namedAddressesThread) return True diff --git a/person.py b/person.py index 845be4aed..4774c2a2f 100644 --- a/person.py +++ b/person.py @@ -1429,7 +1429,7 @@ def _detectUsersPath(url: str) -> str: def getActorJson(hostDomain: str, handle: str, http: bool, gnunet: bool, debug: bool, quiet: bool, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, existingSession) -> ({}, {}): """Returns the actor json """ @@ -1537,7 +1537,7 @@ def getActorJson(hostDomain: str, handle: str, http: bool, gnunet: bool, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, hostDomain, __version__, debug, - groupAccount, signingPrivateKeyPem) + groupAccount, signing_priv_key_pem) if not wfRequest: if not quiet: print('getActorJson Unable to webfinger ' + handle) @@ -1594,7 +1594,7 @@ def getActorJson(hostDomain: str, handle: str, http: bool, gnunet: bool, 'Accept': headerMimeType + '; profile="' + profileStr + '"' } personJson = \ - getJson(signingPrivateKeyPem, session, personUrl, asHeader, None, + getJson(signing_priv_key_pem, session, personUrl, asHeader, None, debug, __version__, http_prefix, hostDomain, 20, quiet) if personJson: if not quiet: @@ -1658,7 +1658,7 @@ def validSendingActor(session, base_dir: str, nickname: str, domain: str, person_cache: {}, post_json_object: {}, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, debug: bool, unit_test: bool) -> bool: """When a post arrives in the inbox this is used to check that the sending actor is valid @@ -1681,7 +1681,7 @@ def validSendingActor(session, base_dir: str, # download the actor actorJson, _ = getActorJson(domain, sendingActor, True, False, debug, True, - signingPrivateKeyPem, session) + signing_priv_key_pem, session) if actorJson: downloadedActor = True if not actorJson: diff --git a/pgp.py b/pgp.py index 4efe02702..1f09b5fa1 100644 --- a/pgp.py +++ b/pgp.py @@ -334,7 +334,7 @@ def _pgpEncrypt(content: str, recipientPubKey: str) -> str: return encryptResult -def _getPGPPublicKeyFromActor(signingPrivateKeyPem: str, +def _getPGPPublicKeyFromActor(signing_priv_key_pem: str, domain: str, handle: str, actorJson: {} = None) -> str: """Searches tags on the actor to see if there is any PGP @@ -343,7 +343,7 @@ def _getPGPPublicKeyFromActor(signingPrivateKeyPem: str, if not actorJson: actorJson, asHeader = \ getActorJson(domain, handle, False, False, False, True, - signingPrivateKeyPem, None) + signing_priv_key_pem, None) if not actorJson: return None if not actorJson.get('attachment'): @@ -376,12 +376,12 @@ def hasLocalPGPkey() -> bool: def pgpEncryptToActor(domain: str, content: str, toHandle: str, - signingPrivateKeyPem: str) -> str: + signing_priv_key_pem: str) -> str: """PGP encrypt a message to the given actor or handle """ # get the actor and extract the pgp public key from it recipientPubKey = \ - _getPGPPublicKeyFromActor(signingPrivateKeyPem, domain, toHandle) + _getPGPPublicKeyFromActor(signing_priv_key_pem, domain, toHandle) if not recipientPubKey: return None # encrypt using the recipient public key @@ -389,7 +389,7 @@ def pgpEncryptToActor(domain: str, content: str, toHandle: str, def pgpDecrypt(domain: str, content: str, fromHandle: str, - signingPrivateKeyPem: str) -> str: + signing_priv_key_pem: str) -> str: """ Encrypt using your default pgp key to the given recipient fromHandle can be a handle or actor url """ @@ -401,7 +401,7 @@ def pgpDecrypt(domain: str, content: str, fromHandle: str, pubKey = extractPGPPublicKey(content) else: pubKey = \ - _getPGPPublicKeyFromActor(signingPrivateKeyPem, + _getPGPPublicKeyFromActor(signing_priv_key_pem, domain, content, fromHandle) if pubKey: _pgpImportPubKey(pubKey) @@ -458,7 +458,7 @@ def pgpPublicKeyUpload(base_dir: str, session, http_prefix: str, cached_webfingers: {}, person_cache: {}, debug: bool, test: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: if debug: print('pgpPublicKeyUpload') @@ -491,7 +491,7 @@ def pgpPublicKeyUpload(base_dir: str, session, actorJson, asHeader = \ getActorJson(domainFull, handle, False, False, debug, True, - signingPrivateKeyPem, session) + signing_priv_key_pem, session) if not actorJson: if debug: print('No actor returned for ' + handle) @@ -559,7 +559,7 @@ def pgpPublicKeyUpload(base_dir: str, session, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, __version__, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: pgp actor update webfinger failed for ' + @@ -576,7 +576,7 @@ def pgpPublicKeyUpload(base_dir: str, session, # get the actor inbox for the To handle originDomain = domain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, originDomain, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, __version__, http_prefix, nickname, domain, postToBox, 35725) diff --git a/posts.py b/posts.py index 75670ea74..5b8dc0277 100644 --- a/posts.py +++ b/posts.py @@ -226,7 +226,7 @@ def getUserUrl(wfRequest: {}, sourceId: int, debug: bool) -> str: return None -def parseUserFeed(signingPrivateKeyPem: str, +def parseUserFeed(signing_priv_key_pem: str, session, feedUrl: str, asHeader: {}, project_version: str, http_prefix: str, originDomain: str, debug: bool, depth: int = 0) -> []: @@ -241,7 +241,7 @@ def parseUserFeed(signingPrivateKeyPem: str, print('http_prefix ' + str(http_prefix)) print('originDomain ' + str(originDomain)) - feedJson = getJson(signingPrivateKeyPem, session, feedUrl, asHeader, None, + feedJson = getJson(signing_priv_key_pem, session, feedUrl, asHeader, None, debug, project_version, http_prefix, originDomain) if not feedJson: profileStr = 'https://www.w3.org/ns/activitystreams' @@ -250,7 +250,7 @@ def parseUserFeed(signingPrivateKeyPem: str, asHeader = { 'Accept': acceptStr } - feedJson = getJson(signingPrivateKeyPem, session, feedUrl, + feedJson = getJson(signing_priv_key_pem, session, feedUrl, asHeader, None, debug, project_version, http_prefix, originDomain) if not feedJson: @@ -280,7 +280,7 @@ def parseUserFeed(signingPrivateKeyPem: str, if isinstance(nextUrl, str): if '?max_id=0' not in nextUrl: userFeed = \ - parseUserFeed(signingPrivateKeyPem, + parseUserFeed(signing_priv_key_pem, session, nextUrl, asHeader, project_version, http_prefix, originDomain, debug, depth + 1) @@ -300,7 +300,7 @@ def _getPersonBoxActor(session, base_dir: str, actor: str, debug: bool, project_version: str, http_prefix: str, originDomain: str, person_cache: {}, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, sourceId: int) -> {}: """Returns the actor json for the given actor url """ @@ -313,24 +313,24 @@ def _getPersonBoxActor(session, base_dir: str, actor: str, asHeader = { 'Accept': 'application/ld+json; profile="' + profileStr + '"' } - personJson = getJson(signingPrivateKeyPem, session, actor, asHeader, None, + personJson = getJson(signing_priv_key_pem, session, actor, asHeader, None, debug, project_version, http_prefix, originDomain) if personJson: return personJson asHeader = { 'Accept': 'application/ld+json; profile="' + profileStr + '"' } - personJson = getJson(signingPrivateKeyPem, session, actor, asHeader, None, + personJson = getJson(signing_priv_key_pem, session, actor, asHeader, None, debug, project_version, http_prefix, originDomain) if personJson: return personJson print('Unable to get actor for ' + actor + ' ' + str(sourceId)) - if not signingPrivateKeyPem: + if not signing_priv_key_pem: print('No signing key provided when getting actor') return None -def getPersonBox(signingPrivateKeyPem: str, originDomain: str, +def getPersonBox(signing_priv_key_pem: str, originDomain: str, base_dir: str, session, wfRequest: {}, person_cache: {}, project_version: str, http_prefix: str, nickname: str, domain: str, @@ -369,7 +369,7 @@ def getPersonBox(signingPrivateKeyPem: str, originDomain: str, profileStr, asHeader, debug, project_version, http_prefix, originDomain, - person_cache, signingPrivateKeyPem, + person_cache, signing_priv_key_pem, sourceId) if not personJson: return None, None, None, None, None, None, None, None @@ -530,8 +530,8 @@ def _getPosts(session, outboxUrl: str, maxPosts: int, person_cache: {}, raw: bool, simple: bool, debug: bool, project_version: str, http_prefix: str, - originDomain: str, systemLanguage: str, - signingPrivateKeyPem: str) -> {}: + originDomain: str, system_language: str, + signing_priv_key_pem: str) -> {}: """Gets public posts from an outbox """ if debug: @@ -558,7 +558,7 @@ def _getPosts(session, outboxUrl: str, maxPosts: int, print('Returning the raw feed') result = [] i = 0 - userFeed = parseUserFeed(signingPrivateKeyPem, + userFeed = parseUserFeed(signing_priv_key_pem, session, outboxUrl, asHeader, project_version, http_prefix, originDomain, debug) @@ -572,7 +572,7 @@ def _getPosts(session, outboxUrl: str, maxPosts: int, if debug: print('Returning a human readable version of the feed') - userFeed = parseUserFeed(signingPrivateKeyPem, + userFeed = parseUserFeed(signing_priv_key_pem, session, outboxUrl, asHeader, project_version, http_prefix, originDomain, debug) @@ -591,7 +591,7 @@ def _getPosts(session, outboxUrl: str, maxPosts: int, if item['type'] != 'Note' and item['type'] != 'Page': thisItem = item['object'] - content = getBaseContentFromPost(item, systemLanguage) + content = getBaseContentFromPost(item, system_language) content = content.replace(''', "'") mentions = [] @@ -751,8 +751,8 @@ def getPostDomains(session, outboxUrl: str, maxPosts: int, project_version: str, http_prefix: str, domain: str, wordFrequency: {}, - domainList: [], systemLanguage: str, - signingPrivateKeyPem: str) -> []: + domainList: [], system_language: str, + signing_priv_key_pem: str) -> []: """Returns a list of domains referenced within public posts """ if not outboxUrl: @@ -775,7 +775,7 @@ def getPostDomains(session, outboxUrl: str, maxPosts: int, postDomains = domainList i = 0 - userFeed = parseUserFeed(signingPrivateKeyPem, + userFeed = parseUserFeed(signing_priv_key_pem, session, outboxUrl, asHeader, project_version, http_prefix, domain, debug) for item in userFeed: @@ -784,7 +784,7 @@ def getPostDomains(session, outboxUrl: str, maxPosts: int, break if not hasObjectDict(item): continue - contentStr = getBaseContentFromPost(item, systemLanguage) + contentStr = getBaseContentFromPost(item, system_language) if contentStr: _updateWordFrequency(contentStr, wordFrequency) if item['object'].get('inReplyTo'): @@ -817,7 +817,7 @@ def _getPostsForBlockedDomains(base_dir: str, debug: bool, project_version: str, http_prefix: str, domain: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Returns a dictionary of posts for blocked domains """ if not outboxUrl: @@ -840,7 +840,7 @@ def _getPostsForBlockedDomains(base_dir: str, blockedPosts = {} i = 0 - userFeed = parseUserFeed(signingPrivateKeyPem, + userFeed = parseUserFeed(signing_priv_key_pem, session, outboxUrl, asHeader, project_version, http_prefix, domain, debug) for item in userFeed: @@ -1071,7 +1071,7 @@ def _createPostS2S(base_dir: str, nickname: str, domain: str, port: int, tags: [], attachImageFilename: str, mediaType: str, imageDescription: str, city: str, postObjectType: str, summary: str, - inReplyToAtomUri: str, systemLanguage: str, + inReplyToAtomUri: str, system_language: str, conversationId: str, low_bandwidth: bool, content_license_url: str) -> {}: """Creates a new server-to-server post @@ -1113,7 +1113,7 @@ def _createPostS2S(base_dir: str, nickname: str, domain: str, port: int, 'mediaType': 'text/html', 'content': content, 'contentMap': { - systemLanguage: content + system_language: content }, 'attachment': [], 'tag': tags, @@ -1146,7 +1146,7 @@ def _createPostC2S(base_dir: str, nickname: str, domain: str, port: int, tags: [], attachImageFilename: str, mediaType: str, imageDescription: str, city: str, postObjectType: str, summary: str, - inReplyToAtomUri: str, systemLanguage: str, + inReplyToAtomUri: str, system_language: str, conversationId: str, low_bandwidth: str, content_license_url: str) -> {}: """Creates a new client-to-server post @@ -1179,7 +1179,7 @@ def _createPostC2S(base_dir: str, nickname: str, domain: str, port: int, 'mediaType': 'text/html', 'content': content, 'contentMap': { - systemLanguage: content + system_language: content }, 'attachment': [], 'tag': tags, @@ -1380,7 +1380,7 @@ def _createPostBase(base_dir: str, repliesModerationOption: str, anonymousParticipationEnabled: bool, eventStatus: str, ticketUrl: str, - systemLanguage: str, + system_language: str, conversationId: str, low_bandwidth: bool, content_license_url: str) -> {}: """Creates a message @@ -1516,7 +1516,7 @@ def _createPostBase(base_dir: str, tags, attachImageFilename, mediaType, imageDescription, city, postObjectType, summary, - inReplyToAtomUri, systemLanguage, + inReplyToAtomUri, system_language, conversationId, low_bandwidth, content_license_url) else: @@ -1529,7 +1529,7 @@ def _createPostBase(base_dir: str, tags, attachImageFilename, mediaType, imageDescription, city, postObjectType, summary, - inReplyToAtomUri, systemLanguage, + inReplyToAtomUri, system_language, conversationId, low_bandwidth, content_license_url) @@ -1661,7 +1661,7 @@ def undoPinnedPost(base_dir: str, nickname: str, domain: str) -> None: def getPinnedPostAsJson(base_dir: str, http_prefix: str, nickname: str, domain: str, - domainFull: str, systemLanguage: str) -> {}: + domainFull: str, system_language: str) -> {}: """Returns the pinned profile post as json """ accountDir = acctDir(base_dir, nickname, domain) @@ -1682,7 +1682,7 @@ def getPinnedPostAsJson(base_dir: str, http_prefix: str, ], 'content': pinnedContent, 'contentMap': { - systemLanguage: pinnedContent + system_language: pinnedContent }, 'id': actor + '/pinned', 'inReplyTo': None, @@ -1701,13 +1701,13 @@ def getPinnedPostAsJson(base_dir: str, http_prefix: str, def jsonPinPost(base_dir: str, http_prefix: str, nickname: str, domain: str, - domainFull: str, systemLanguage: str) -> {}: + domainFull: str, system_language: str) -> {}: """Returns a pinned post as json """ pinnedPostJson = \ getPinnedPostAsJson(base_dir, http_prefix, nickname, domain, - domainFull, systemLanguage) + domainFull, system_language) itemsList = [] if pinnedPostJson: itemsList = [pinnedPostJson] @@ -1766,7 +1766,7 @@ def createPublicPost(base_dir: str, eventDate: str, eventTime: str, location: str, isArticle: bool, - systemLanguage: str, + system_language: str, conversationId: str, low_bandwidth: bool, content_license_url: str) -> {}: """Public post @@ -1798,7 +1798,7 @@ def createPublicPost(base_dir: str, maximumAttendeeCapacity, repliesModerationOption, anonymousParticipationEnabled, - eventStatus, ticketUrl, systemLanguage, + eventStatus, ticketUrl, system_language, conversationId, low_bandwidth, content_license_url) @@ -1842,7 +1842,7 @@ def createBlogPost(base_dir: str, inReplyTo: str, inReplyToAtomUri: str, subject: str, schedulePost: bool, eventDate: str, eventTime: str, - location: str, systemLanguage: str, + location: str, system_language: str, conversationId: str, low_bandwidth: bool, content_license_url: str) -> {}: blogJson = \ @@ -1855,7 +1855,7 @@ def createBlogPost(base_dir: str, inReplyTo, inReplyToAtomUri, subject, schedulePost, eventDate, eventTime, location, - True, systemLanguage, conversationId, + True, system_language, conversationId, low_bandwidth, content_license_url) blogJson['object']['url'] = \ blogJson['object']['url'].replace('/@', '/users/') @@ -1869,7 +1869,7 @@ def createNewsPost(base_dir: str, content: str, followersOnly: bool, saveToFile: bool, attachImageFilename: str, mediaType: str, imageDescription: str, city: str, - subject: str, systemLanguage: str, + subject: str, system_language: str, conversationId: str, low_bandwidth: bool, content_license_url: str) -> {}: client_to_server = False @@ -1889,7 +1889,7 @@ def createNewsPost(base_dir: str, inReplyTo, inReplyToAtomUri, subject, schedulePost, eventDate, eventTime, location, - True, systemLanguage, conversationId, + True, system_language, conversationId, low_bandwidth, content_license_url) blog['object']['type'] = 'Article' return blog @@ -1903,7 +1903,7 @@ def createQuestionPost(base_dir: str, attachImageFilename: str, mediaType: str, imageDescription: str, city: str, subject: str, durationDays: int, - systemLanguage: str, low_bandwidth: bool, + system_language: str, low_bandwidth: bool, content_license_url: str) -> {}: """Question post with multiple choice options """ @@ -1920,7 +1920,7 @@ def createQuestionPost(base_dir: str, False, False, None, None, subject, False, None, None, None, None, None, None, None, None, - None, None, None, None, None, systemLanguage, + None, None, None, None, None, system_language, None, low_bandwidth, content_license_url) messageJson['object']['type'] = 'Question' messageJson['object']['oneOf'] = [] @@ -1952,7 +1952,7 @@ def createUnlistedPost(base_dir: str, inReplyTo: str, inReplyToAtomUri: str, subject: str, schedulePost: bool, eventDate: str, eventTime: str, - location: str, systemLanguage: str, + location: str, system_language: str, conversationId: str, low_bandwidth: bool, content_license_url: str) -> {}: """Unlisted post. This has the #Public and followers links inverted. @@ -1970,7 +1970,7 @@ def createUnlistedPost(base_dir: str, inReplyTo, inReplyToAtomUri, subject, schedulePost, eventDate, eventTime, location, None, None, None, None, None, - None, None, None, None, None, systemLanguage, + None, None, None, None, None, system_language, conversationId, low_bandwidth, content_license_url) @@ -1987,7 +1987,7 @@ def createFollowersOnlyPost(base_dir: str, inReplyToAtomUri: str, subject: str, schedulePost: bool, eventDate: str, eventTime: str, - location: str, systemLanguage: str, + location: str, system_language: str, conversationId: str, low_bandwidth: bool, content_license_url: str) -> {}: """Followers only post @@ -2005,7 +2005,7 @@ def createFollowersOnlyPost(base_dir: str, inReplyTo, inReplyToAtomUri, subject, schedulePost, eventDate, eventTime, location, None, None, None, None, None, - None, None, None, None, None, systemLanguage, + None, None, None, None, None, system_language, conversationId, low_bandwidth, content_license_url) @@ -2058,7 +2058,7 @@ def createDirectMessagePost(base_dir: str, subject: str, debug: bool, schedulePost: bool, eventDate: str, eventTime: str, - location: str, systemLanguage: str, + location: str, system_language: str, conversationId: str, low_bandwidth: bool, content_license_url: str) -> {}: """Direct Message post @@ -2083,7 +2083,7 @@ def createDirectMessagePost(base_dir: str, inReplyTo, inReplyToAtomUri, subject, schedulePost, eventDate, eventTime, location, None, None, None, None, None, - None, None, None, None, None, systemLanguage, + None, None, None, None, None, system_language, conversationId, low_bandwidth, content_license_url) # mentioned recipients go into To rather than Cc @@ -2104,7 +2104,7 @@ def createReportPost(base_dir: str, client_to_server: bool, commentsEnabled: bool, attachImageFilename: str, mediaType: str, imageDescription: str, city: str, - debug: bool, subject: str, systemLanguage: str, + debug: bool, subject: str, system_language: str, low_bandwidth: bool, content_license_url: str) -> {}: """Send a report to moderators @@ -2179,7 +2179,7 @@ def createReportPost(base_dir: str, True, False, None, None, subject, False, None, None, None, None, None, None, None, None, - None, None, None, None, None, systemLanguage, + None, None, None, None, None, system_language, None, low_bandwidth, content_license_url) if not post_json_object: continue @@ -2263,7 +2263,7 @@ def threadSendPost(session, postJsonStr: str, federationList: [], tries += 1 -def sendPost(signingPrivateKeyPem: str, project_version: str, +def sendPost(signing_priv_key_pem: str, project_version: str, session, base_dir: str, nickname: str, domain: str, port: int, toNickname: str, toDomain: str, toPort: int, cc: str, http_prefix: str, content: str, followersOnly: bool, @@ -2273,7 +2273,7 @@ def sendPost(signingPrivateKeyPem: str, project_version: str, imageDescription: str, city: str, federationList: [], send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, - isArticle: bool, systemLanguage: str, + isArticle: bool, system_language: str, shared_items_federated_domains: [], sharedItemFederationTokens: {}, low_bandwidth: bool, content_license_url: str, @@ -2296,7 +2296,7 @@ def sendPost(signingPrivateKeyPem: str, project_version: str, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: return 1 if not isinstance(wfRequest, dict): @@ -2314,7 +2314,7 @@ def sendPost(signingPrivateKeyPem: str, project_version: str, # get the actor inbox for the To handle originDomain = domain (inboxUrl, pubKeyId, pubKey, toPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -2341,7 +2341,7 @@ def sendPost(signingPrivateKeyPem: str, project_version: str, inReplyToAtomUri, subject, False, None, None, None, None, None, None, None, None, - None, None, None, None, None, systemLanguage, + None, None, None, None, None, system_language, conversationId, low_bandwidth, content_license_url) @@ -2414,7 +2414,7 @@ def sendPost(signingPrivateKeyPem: str, project_version: str, return 0 -def sendPostViaServer(signingPrivateKeyPem: str, project_version: str, +def sendPostViaServer(signing_priv_key_pem: str, project_version: str, base_dir: str, session, fromNickname: str, password: str, fromDomain: str, fromPort: int, toNickname: str, toDomain: str, toPort: int, cc: str, @@ -2423,7 +2423,7 @@ def sendPostViaServer(signingPrivateKeyPem: str, project_version: str, attachImageFilename: str, mediaType: str, imageDescription: str, city: str, cached_webfingers: {}, person_cache: {}, - isArticle: bool, systemLanguage: str, + isArticle: bool, system_language: str, low_bandwidth: bool, content_license_url: str, debug: bool = False, @@ -2445,7 +2445,7 @@ def sendPostViaServer(signingPrivateKeyPem: str, project_version: str, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomainFull, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: post webfinger failed for ' + handle) @@ -2462,7 +2462,7 @@ def sendPostViaServer(signingPrivateKeyPem: str, project_version: str, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -2510,7 +2510,7 @@ def sendPostViaServer(signingPrivateKeyPem: str, project_version: str, inReplyToAtomUri, subject, False, None, None, None, None, None, None, None, None, - None, None, None, None, None, systemLanguage, + None, None, None, None, None, system_language, conversationId, low_bandwidth, content_license_url) @@ -2616,7 +2616,7 @@ def sendSignedJson(post_json_object: {}, session, base_dir: str, send_threads: [], postLog: [], cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, sharedItemsToken: str, groupAccount: bool, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, sourceId: int) -> int: """Sends a signed json object to an inbox/outbox """ @@ -2655,7 +2655,7 @@ def sendSignedJson(post_json_object: {}, session, base_dir: str, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, groupAccount, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: webfinger for ' + handle + ' failed') @@ -2678,7 +2678,7 @@ def sendSignedJson(post_json_object: {}, session, base_dir: str, # get the actor inbox/outbox for the To handle originDomain = domain (inboxUrl, pubKeyId, pubKey, toPersonId, sharedInboxUrl, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -2868,7 +2868,7 @@ def _sendToNamedAddresses(session, base_dir: str, project_version: str, shared_items_federated_domains: [], sharedItemFederationTokens: {}, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """sends a post to the specific named addresses in to/cc """ if not session: @@ -3008,7 +3008,7 @@ def _sendToNamedAddresses(session, base_dir: str, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, sharedItemsToken, groupAccount, - signingPrivateKeyPem, 34436782) + signing_priv_key_pem, 34436782) def sendToNamedAddressesThread(session, base_dir: str, @@ -3021,7 +3021,7 @@ def sendToNamedAddressesThread(session, base_dir: str, project_version: str, shared_items_federated_domains: [], sharedItemFederationTokens: {}, - signingPrivateKeyPem: str): + signing_priv_key_pem: str): """Returns a thread used to send a post to named addresses """ sendThread = \ @@ -3036,7 +3036,7 @@ def sendToNamedAddressesThread(session, base_dir: str, project_version, shared_items_federated_domains, sharedItemFederationTokens, - signingPrivateKeyPem), daemon=True) + signing_priv_key_pem), daemon=True) try: sendThread.start() except SocketError as ex: @@ -3051,7 +3051,7 @@ def sendToNamedAddressesThread(session, base_dir: str, def _hasSharedInbox(session, http_prefix: str, domain: str, - debug: bool, signingPrivateKeyPem: str) -> bool: + debug: bool, signing_priv_key_pem: str) -> bool: """Returns true if the given domain has a shared inbox This tries the new and the old way of webfingering the shared inbox """ @@ -3062,7 +3062,7 @@ def _hasSharedInbox(session, http_prefix: str, domain: str, for handle in tryHandles: wfRequest = webfingerHandle(session, handle, http_prefix, {}, domain, __version__, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if wfRequest: if isinstance(wfRequest, dict): if not wfRequest.get('errors'): @@ -3097,7 +3097,7 @@ def sendToFollowers(session, base_dir: str, project_version: str, shared_items_federated_domains: [], sharedItemFederationTokens: {}, - signingPrivateKeyPem: str) -> None: + signing_priv_key_pem: str) -> None: """sends a post to the followers of the given nickname """ print('sendToFollowers') @@ -3157,7 +3157,7 @@ def sendToFollowers(session, base_dir: str, withSharedInbox = \ _hasSharedInbox(session, http_prefix, followerDomain, debug, - signingPrivateKeyPem) + signing_priv_key_pem) if debug: if withSharedInbox: print(followerDomain + ' has shared inbox') @@ -3218,7 +3218,7 @@ def sendToFollowers(session, base_dir: str, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, sharedItemsToken, groupAccount, - signingPrivateKeyPem, 639342) + signing_priv_key_pem, 639342) else: # send to individual followers without using a shared inbox for handle in followerHandles: @@ -3247,7 +3247,7 @@ def sendToFollowers(session, base_dir: str, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, sharedItemsToken, groupAccount, - signingPrivateKeyPem, 634219) + signing_priv_key_pem, 634219) time.sleep(4) @@ -3270,7 +3270,7 @@ def sendToFollowersThread(session, base_dir: str, project_version: str, shared_items_federated_domains: [], sharedItemFederationTokens: {}, - signingPrivateKeyPem: str): + signing_priv_key_pem: str): """Returns a thread used to send a post to followers """ sendThread = \ @@ -3285,7 +3285,7 @@ def sendToFollowersThread(session, base_dir: str, project_version, shared_items_federated_domains, sharedItemFederationTokens, - signingPrivateKeyPem), daemon=True) + signing_priv_key_pem), daemon=True) try: sendThread.start() except SocketError as ex: @@ -3461,9 +3461,9 @@ def isImageMedia(session, base_dir: str, http_prefix: str, twitter_replacement_domain: str, allow_local_network_access: bool, recentPostsCache: {}, debug: bool, - systemLanguage: str, + system_language: str, domainFull: str, person_cache: {}, - signingPrivateKeyPem: str) -> bool: + signing_priv_key_pem: str) -> bool: """Returns true if the given post has attached image media """ if post_json_object['type'] == 'Announce': @@ -3476,9 +3476,9 @@ def isImageMedia(session, base_dir: str, http_prefix: str, twitter_replacement_domain, allow_local_network_access, recentPostsCache, debug, - systemLanguage, + system_language, domainFull, person_cache, - signingPrivateKeyPem, + signing_priv_key_pem, blockedCache) if postJsonAnnounce: post_json_object = postJsonAnnounce @@ -4062,13 +4062,13 @@ def getPublicPostsOfPerson(base_dir: str, nickname: str, domain: str, raw: bool, simple: bool, proxy_type: str, port: int, http_prefix: str, debug: bool, project_version: str, - systemLanguage: str, - signingPrivateKeyPem: str, + system_language: str, + signing_priv_key_pem: str, originDomain: str) -> None: """ This is really just for test purposes """ if debug: - if signingPrivateKeyPem: + if signing_priv_key_pem: print('Signing key available') else: print('Signing key missing') @@ -4092,7 +4092,7 @@ def getPublicPostsOfPerson(base_dir: str, nickname: str, domain: str, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, originDomain, project_version, debug, groupAccount, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('No webfinger result was returned for ' + handle) @@ -4105,7 +4105,7 @@ def getPublicPostsOfPerson(base_dir: str, nickname: str, domain: str, if debug: print('Getting the outbox for ' + handle) (personUrl, pubKeyId, pubKey, personId, shaedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -4123,8 +4123,8 @@ def getPublicPostsOfPerson(base_dir: str, nickname: str, domain: str, _getPosts(session, personUrl, 30, max_mentions, max_emoji, maxAttachments, federationList, person_cache, raw, simple, debug, - project_version, http_prefix, originDomain, systemLanguage, - signingPrivateKeyPem) + project_version, http_prefix, originDomain, system_language, + signing_priv_key_pem) def getPublicPostDomains(session, base_dir: str, nickname: str, domain: str, @@ -4132,8 +4132,8 @@ def getPublicPostDomains(session, base_dir: str, nickname: str, domain: str, proxy_type: str, port: int, http_prefix: str, debug: bool, project_version: str, wordFrequency: {}, domainList: [], - systemLanguage: str, - signingPrivateKeyPem: str) -> []: + system_language: str, + signing_priv_key_pem: str) -> []: """ Returns a list of domains referenced within public posts """ if not session: @@ -4149,7 +4149,7 @@ def getPublicPostDomains(session, base_dir: str, nickname: str, domain: str, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: return domainList if not isinstance(wfRequest, dict): @@ -4158,7 +4158,7 @@ def getPublicPostDomains(session, base_dir: str, nickname: str, domain: str, return domainList (personUrl, pubKeyId, pubKey, personId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -4173,13 +4173,13 @@ def getPublicPostDomains(session, base_dir: str, nickname: str, domain: str, maxAttachments, federationList, person_cache, debug, project_version, http_prefix, domain, - wordFrequency, domainList, systemLanguage, - signingPrivateKeyPem) + wordFrequency, domainList, system_language, + signing_priv_key_pem) postDomains.sort() return postDomains -def downloadFollowCollection(signingPrivateKeyPem: str, +def downloadFollowCollection(signing_priv_key_pem: str, followType: str, session, http_prefix: str, actor: str, pageNumber: int, @@ -4206,7 +4206,7 @@ def downloadFollowCollection(signingPrivateKeyPem: str, for pageCtr in range(noOfPages): url = actor + '/' + followType + '?page=' + str(pageNumber + pageCtr) followersJson = \ - getJson(signingPrivateKeyPem, session, url, sessionHeaders, None, + getJson(signing_priv_key_pem, session, url, sessionHeaders, None, debug, __version__, http_prefix, None) if followersJson: if followersJson.get('orderedItems'): @@ -4228,8 +4228,8 @@ def getPublicPostInfo(session, base_dir: str, nickname: str, domain: str, originDomain: str, proxy_type: str, port: int, http_prefix: str, debug: bool, project_version: str, - wordFrequency: {}, systemLanguage: str, - signingPrivateKeyPem: str) -> []: + wordFrequency: {}, system_language: str, + signing_priv_key_pem: str) -> []: """ Returns a dict of domains referenced within public posts """ if not session: @@ -4245,7 +4245,7 @@ def getPublicPostInfo(session, base_dir: str, nickname: str, domain: str, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: return {} if not isinstance(wfRequest, dict): @@ -4254,7 +4254,7 @@ def getPublicPostInfo(session, base_dir: str, nickname: str, domain: str, return {} (personUrl, pubKeyId, pubKey, personId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -4266,11 +4266,13 @@ def getPublicPostInfo(session, base_dir: str, nickname: str, domain: str, maxAttachments = 5 maxPosts = 64 postDomains = \ - getPostDomains(session, personUrl, maxPosts, max_mentions, max_emoji, + getPostDomains(session, personUrl, maxPosts, + max_mentions, max_emoji, maxAttachments, federationList, person_cache, debug, project_version, http_prefix, domain, - wordFrequency, [], systemLanguage, signingPrivateKeyPem) + wordFrequency, [], system_language, + signing_priv_key_pem) postDomains.sort() domainsInfo = {} for d in postDomains: @@ -4285,7 +4287,7 @@ def getPublicPostInfo(session, base_dir: str, nickname: str, domain: str, person_cache, debug, project_version, http_prefix, - domain, signingPrivateKeyPem) + domain, signing_priv_key_pem) for blockedDomain, postUrlList in blockedPosts.items(): domainsInfo[blockedDomain] += postUrlList @@ -4297,8 +4299,8 @@ def getPublicPostDomainsBlocked(session, base_dir: str, proxy_type: str, port: int, http_prefix: str, debug: bool, project_version: str, wordFrequency: {}, domainList: [], - systemLanguage: str, - signingPrivateKeyPem: str) -> []: + system_language: str, + signing_priv_key_pem: str) -> []: """ Returns a list of domains referenced within public posts which are globally blocked on this instance """ @@ -4308,8 +4310,8 @@ def getPublicPostDomainsBlocked(session, base_dir: str, originDomain, proxy_type, port, http_prefix, debug, project_version, - wordFrequency, domainList, systemLanguage, - signingPrivateKeyPem) + wordFrequency, domainList, system_language, + signing_priv_key_pem) if not postDomains: return [] @@ -4358,8 +4360,8 @@ def checkDomains(session, base_dir: str, proxy_type: str, port: int, http_prefix: str, debug: bool, project_version: str, maxBlockedDomains: int, singleCheck: bool, - systemLanguage: str, - signingPrivateKeyPem: str) -> None: + system_language: str, + signing_priv_key_pem: str) -> None: """Checks follower accounts for references to globally blocked domains """ wordFrequency = {} @@ -4388,8 +4390,8 @@ def checkDomains(session, base_dir: str, proxy_type, port, http_prefix, debug, project_version, wordFrequency, [], - systemLanguage, - signingPrivateKeyPem) + system_language, + signing_priv_key_pem) if blockedDomains: if len(blockedDomains) > maxBlockedDomains: followerWarningStr += handle + '\n' @@ -4410,8 +4412,8 @@ def checkDomains(session, base_dir: str, proxy_type, port, http_prefix, debug, project_version, wordFrequency, [], - systemLanguage, - signingPrivateKeyPem) + system_language, + signing_priv_key_pem) if blockedDomains: print(handle) for d in blockedDomains: @@ -4512,9 +4514,9 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str, twitter_replacement_domain: str, allow_local_network_access: bool, recentPostsCache: {}, debug: bool, - systemLanguage: str, + system_language: str, domainFull: str, person_cache: {}, - signingPrivateKeyPem: str, + signing_priv_key_pem: str, blockedCache: {}) -> {}: """Download the post referenced by an announce """ @@ -4595,7 +4597,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str, print('Downloading Announce content for ' + post_json_object['object']) announcedJson = \ - getJson(signingPrivateKeyPem, session, + getJson(signing_priv_key_pem, session, post_json_object['object'], asHeader, None, debug, project_version, http_prefix, domain) @@ -4623,7 +4625,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str, if announcedJson['type'] == 'Video': convertedJson = \ convertVideoToNote(base_dir, nickname, domain, - systemLanguage, + system_language, announcedJson, blockedCache) if convertedJson: announcedJson = convertedJson @@ -4661,7 +4663,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str, recentPostsCache) return None if not understoodPostLanguage(base_dir, nickname, domain, - announcedJson, systemLanguage, + announcedJson, system_language, http_prefix, domainFull, person_cache): return None @@ -4729,9 +4731,9 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str, recentPostsCache) return None post_json_object = announcedJson - replaceYouTube(post_json_object, yt_replace_domain, systemLanguage) + replaceYouTube(post_json_object, yt_replace_domain, system_language) replaceTwitter(post_json_object, twitter_replacement_domain, - systemLanguage) + system_language) if saveJson(post_json_object, announceFilename): return post_json_object return None @@ -4761,7 +4763,7 @@ def sendBlockViaServer(base_dir: str, session, http_prefix: str, blockedUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a block via c2s """ if not session: @@ -4789,7 +4791,7 @@ def sendBlockViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: block webfinger failed for ' + handle) @@ -4804,7 +4806,7 @@ def sendBlockViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -4845,7 +4847,7 @@ def sendMuteViaServer(base_dir: str, session, http_prefix: str, mutedUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a mute via c2s """ if not session: @@ -4869,7 +4871,7 @@ def sendMuteViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: mute webfinger failed for ' + handle) @@ -4884,7 +4886,7 @@ def sendMuteViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -4925,7 +4927,7 @@ def sendUndoMuteViaServer(base_dir: str, session, http_prefix: str, mutedUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Undoes a mute via c2s """ if not session: @@ -4954,7 +4956,7 @@ def sendUndoMuteViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: undo mute webfinger failed for ' + handle) @@ -4969,7 +4971,7 @@ def sendUndoMuteViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -5011,7 +5013,7 @@ def sendUndoBlockViaServer(base_dir: str, session, http_prefix: str, blockedUrl: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a block via c2s """ if not session: @@ -5043,7 +5045,7 @@ def sendUndoBlockViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: unblock webfinger failed for ' + handle) @@ -5058,7 +5060,7 @@ def sendUndoBlockViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, http_prefix, fromNickname, @@ -5128,7 +5130,7 @@ def c2sBoxJson(base_dir: str, session, domain: str, port: int, http_prefix: str, boxName: str, pageNumber: int, - debug: bool, signingPrivateKeyPem: str) -> {}: + debug: bool, signing_priv_key_pem: str) -> {}: """C2S Authenticated GET of posts for a timeline """ if not session: @@ -5150,7 +5152,7 @@ def c2sBoxJson(base_dir: str, session, # GET json url = actor + '/' + boxName + '?page=' + str(pageNumber) - boxJson = getJson(signingPrivateKeyPem, session, url, headers, None, + boxJson = getJson(signing_priv_key_pem, session, url, headers, None, debug, __version__, http_prefix, None) if boxJson is not None and debug: diff --git a/reaction.py b/reaction.py index 7c1daff9d..1aa381409 100644 --- a/reaction.py +++ b/reaction.py @@ -70,7 +70,7 @@ def _reaction(recentPostsCache: {}, send_threads: [], postLog: [], person_cache: {}, cached_webfingers: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates an emoji reaction actor is the person doing the reacting 'to' might be a specific person (actor) whose post was reaction @@ -140,7 +140,7 @@ def _reaction(recentPostsCache: {}, http_prefix, True, client_to_server, federationList, send_threads, postLog, cached_webfingers, person_cache, debug, project_version, None, groupAccount, - signingPrivateKeyPem, 7165392) + signing_priv_key_pem, 7165392) return newReactionJson @@ -155,7 +155,7 @@ def reactionPost(recentPostsCache: {}, send_threads: [], postLog: [], person_cache: {}, cached_webfingers: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Adds a reaction to a given status post. This is only used by unit tests """ reactionDomain = getFullDomain(reactionDomain, reactionPort) @@ -170,7 +170,7 @@ def reactionPost(recentPostsCache: {}, ccList, http_prefix, objectUrl, emojiContent, actorReaction, client_to_server, send_threads, postLog, person_cache, cached_webfingers, - debug, project_version, signingPrivateKeyPem) + debug, project_version, signing_priv_key_pem) def sendReactionViaServer(base_dir: str, session, @@ -180,7 +180,7 @@ def sendReactionViaServer(base_dir: str, session, emojiContent: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a reaction via c2s """ if not session: @@ -209,7 +209,7 @@ def sendReactionViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: reaction webfinger failed for ' + handle) @@ -224,7 +224,7 @@ def sendReactionViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -270,7 +270,7 @@ def sendUndoReactionViaServer(base_dir: str, session, emojiContent: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Undo a reaction via c2s """ if not session: @@ -299,7 +299,7 @@ def sendUndoReactionViaServer(base_dir: str, session, wfRequest = webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: unreaction webfinger failed for ' + handle) @@ -315,7 +315,7 @@ def sendUndoReactionViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, diff --git a/schedule.py b/schedule.py index 8d8a23ded..8c141c02a 100644 --- a/schedule.py +++ b/schedule.py @@ -118,11 +118,11 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd, httpd.twitter_replacement_domain, httpd.show_published_date_only, httpd.allow_local_network_access, - httpd.city, httpd.systemLanguage, + httpd.city, httpd.system_language, httpd.shared_items_federated_domains, httpd.sharedItemFederationTokens, httpd.low_bandwidth, - httpd.signingPrivateKeyPem, + httpd.signing_priv_key_pem, httpd.peertubeInstances, httpd.themeName, httpd.max_like_count, diff --git a/session.py b/session.py index 303e89fde..19014ee6a 100644 --- a/session.py +++ b/session.py @@ -88,7 +88,7 @@ def urlExists(session, url: str, timeoutSec: int = 3, def _getJsonRequest(session, url: str, domainFull: str, sessionHeaders: {}, sessionParams: {}, timeoutSec: int, - signingPrivateKeyPem: str, quiet: bool, debug: bool, + signing_priv_key_pem: str, quiet: bool, debug: bool, returnJson: bool) -> {}: """http GET for json """ @@ -138,7 +138,7 @@ def _getJsonRequest(session, url: str, domainFull: str, sessionHeaders: {}, def _getJsonSigned(session, url: str, domainFull: str, sessionHeaders: {}, sessionParams: {}, timeoutSec: int, - signingPrivateKeyPem: str, quiet: bool, debug: bool) -> {}: + signing_priv_key_pem: str, quiet: bool, debug: bool) -> {}: """Authorized fetch - a signed version of GET """ if not domainFull: @@ -188,7 +188,7 @@ def _getJsonSigned(session, url: str, domainFull: str, sessionHeaders: {}, if sessionHeaders.get('Accept'): contentType = sessionHeaders['Accept'] signatureHeaderJson = \ - createSignedHeader(None, signingPrivateKeyPem, 'actor', domain, port, + createSignedHeader(None, signing_priv_key_pem, 'actor', domain, port, toDomain, toPort, path, http_prefix, withDigest, messageStr, contentType) if debug: @@ -210,7 +210,7 @@ def _getJsonSigned(session, url: str, domainFull: str, sessionHeaders: {}, debug, returnJson) -def getJson(signingPrivateKeyPem: str, +def getJson(signing_priv_key_pem: str, session, url: str, headers: {}, params: {}, debug: bool, version: str = '1.2.0', http_prefix: str = 'https', domain: str = 'testdomain', @@ -238,10 +238,10 @@ def getJson(signingPrivateKeyPem: str, if debug: HTTPConnection.debuglevel = 1 - if signingPrivateKeyPem: + if signing_priv_key_pem: return _getJsonSigned(session, url, domain, sessionHeaders, sessionParams, - timeoutSec, signingPrivateKeyPem, + timeoutSec, signing_priv_key_pem, quiet, debug) else: return _getJsonRequest(session, url, domain, sessionHeaders, @@ -249,7 +249,7 @@ def getJson(signingPrivateKeyPem: str, None, quiet, debug, True) -def downloadHtml(signingPrivateKeyPem: str, +def downloadHtml(signing_priv_key_pem: str, session, url: str, headers: {}, params: {}, debug: bool, version: str = '1.2.0', http_prefix: str = 'https', domain: str = 'testdomain', @@ -279,10 +279,10 @@ def downloadHtml(signingPrivateKeyPem: str, if debug: HTTPConnection.debuglevel = 1 - if signingPrivateKeyPem: + if signing_priv_key_pem: return _getJsonSigned(session, url, domain, sessionHeaders, sessionParams, - timeoutSec, signingPrivateKeyPem, + timeoutSec, signing_priv_key_pem, quiet, debug) else: return _getJsonRequest(session, url, domain, sessionHeaders, diff --git a/shares.py b/shares.py index 848f58211..228b3c1d5 100644 --- a/shares.py +++ b/shares.py @@ -46,7 +46,7 @@ from content import getPriceFromString from blocking import isBlocked -def _loadDfcIds(base_dir: str, systemLanguage: str, +def _loadDfcIds(base_dir: str, system_language: str, productType: str, http_prefix: str, domainFull: str) -> {}: """Loads the product types ontology @@ -74,12 +74,12 @@ def _loadDfcIds(base_dir: str, systemLanguage: str, for label in productTypes['@graph'][0]['rdfs:label']: if not label.get('@language'): continue - if label['@language'] == systemLanguage: + if label['@language'] == system_language: languageExists = True break if not languageExists: print('productTypes ontology does not contain the language ' + - systemLanguage) + system_language) return None dfcIds = {} for item in productTypes['@graph']: @@ -92,7 +92,7 @@ def _loadDfcIds(base_dir: str, systemLanguage: str, continue if not label.get('@value'): continue - if label['@language'] == systemLanguage: + if label['@language'] == system_language: itemId = \ item['@id'].replace('http://static.datafoodconsortium.org', http_prefix + '://' + domainFull) @@ -199,7 +199,7 @@ def _dfcProductTypeFromCategory(base_dir: str, return None -def _getshareDfcId(base_dir: str, systemLanguage: str, +def _getshareDfcId(base_dir: str, system_language: str, itemType: str, itemCategory: str, translate: {}, http_prefix: str, domainFull: str, @@ -217,7 +217,7 @@ def _getshareDfcId(base_dir: str, systemLanguage: str, itemType = itemType.replace('.', '') return 'epicyon#' + itemType if not dfcIds: - dfcIds = _loadDfcIds(base_dir, systemLanguage, matchedProductType, + dfcIds = _loadDfcIds(base_dir, system_language, matchedProductType, http_prefix, domainFull) if not dfcIds: return '' @@ -306,7 +306,7 @@ def addShare(base_dir: str, itemQty: float, itemType: str, itemCategory: str, location: str, duration: str, debug: bool, city: str, price: str, currency: str, - systemLanguage: str, translate: {}, + system_language: str, translate: {}, sharesFileType: str, low_bandwidth: bool, content_license_url: str) -> None: """Adds a new share @@ -329,7 +329,7 @@ def addShare(base_dir: str, domainFull = getFullDomain(domain, port) actor = localActorUrl(http_prefix, nickname, domainFull) itemID = _getValidSharedItemID(actor, displayName) - dfcId = _getshareDfcId(base_dir, systemLanguage, + dfcId = _getshareDfcId(base_dir, system_language, itemType, itemCategory, translate, http_prefix, domainFull) @@ -561,7 +561,7 @@ def sendShareViaServer(base_dir, session, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, itemPrice: str, itemCurrency: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates an item share via c2s """ if not session: @@ -612,7 +612,7 @@ def sendShareViaServer(base_dir, session, webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: share webfinger failed for ' + handle) @@ -627,7 +627,7 @@ def sendShareViaServer(base_dir, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, @@ -682,7 +682,7 @@ def sendUndoShareViaServer(base_dir: str, session, http_prefix: str, displayName: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Undoes a share via c2s """ if not session: @@ -716,7 +716,7 @@ def sendUndoShareViaServer(base_dir: str, session, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: unshare webfinger failed for ' + handle) @@ -731,7 +731,7 @@ def sendUndoShareViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, @@ -781,7 +781,7 @@ def sendWantedViaServer(base_dir, session, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, itemMaxPrice: str, itemCurrency: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Creates a wanted item via c2s """ if not session: @@ -832,7 +832,7 @@ def sendWantedViaServer(base_dir, session, webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: share webfinger failed for ' + handle) @@ -847,7 +847,7 @@ def sendWantedViaServer(base_dir, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, @@ -902,7 +902,7 @@ def sendUndoWantedViaServer(base_dir: str, session, http_prefix: str, displayName: str, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Undoes a wanted item via c2s """ if not session: @@ -936,7 +936,7 @@ def sendUndoWantedViaServer(base_dir: str, session, wfRequest = \ webfingerHandle(session, handle, http_prefix, cached_webfingers, fromDomain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: unwant webfinger failed for ' + handle) @@ -951,7 +951,7 @@ def sendUndoWantedViaServer(base_dir: str, session, # get the actor inbox for the To handle originDomain = fromDomain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, @@ -995,7 +995,7 @@ def getSharedItemsCatalogViaServer(base_dir, session, nickname: str, password: str, domain: str, port: int, http_prefix: str, debug: bool, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Returns the shared items catalog via c2s """ if not session: @@ -1014,7 +1014,7 @@ def getSharedItemsCatalogViaServer(base_dir, session, url = localActorUrl(http_prefix, nickname, domainFull) + '/catalog' if debug: print('Shared items catalog request to: ' + url) - catalogJson = getJson(signingPrivateKeyPem, session, url, headers, None, + catalogJson = getJson(signing_priv_key_pem, session, url, headers, None, debug, __version__, http_prefix, None) if not catalogJson: if debug: @@ -1030,7 +1030,7 @@ def getSharedItemsCatalogViaServer(base_dir, session, def outboxShareUpload(base_dir: str, http_prefix: str, nickname: str, domain: str, port: int, messageJson: {}, debug: bool, city: str, - systemLanguage: str, translate: {}, + system_language: str, translate: {}, low_bandwidth: bool, content_license_url: str) -> None: """ When a shared item is received by the outbox from c2s @@ -1093,7 +1093,7 @@ def outboxShareUpload(base_dir: str, http_prefix: str, debug, city, messageJson['object']['itemPrice'], messageJson['object']['itemCurrency'], - systemLanguage, translate, 'shares', + system_language, translate, 'shares', low_bandwidth, content_license_url) if debug: print('DEBUG: shared item received via c2s') @@ -1543,7 +1543,7 @@ def _updateFederatedSharesCache(session, shared_items_federated_domains: [], base_dir: str, domainFull: str, http_prefix: str, tokensJson: {}, debug: bool, - systemLanguage: str, + system_language: str, sharesFileType: str) -> None: """Updates the cache of federated shares for the instance. This enables shared items to be available even when other instances @@ -1590,7 +1590,7 @@ def _updateFederatedSharesCache(session, shared_items_federated_domains: [], if saveJson(catalogJson, catalogFilename): print('Downloaded shared items catalog for ' + federatedDomainFull) sharesJson = _dfcToSharesFormat(catalogJson, - base_dir, systemLanguage, + base_dir, system_language, http_prefix, domainFull) if sharesJson: sharesFilename = \ @@ -1699,7 +1699,7 @@ def _regenerateSharesToken(base_dir: str, domainFull: str, def runFederatedSharesDaemon(base_dir: str, httpd, http_prefix: str, domainFull: str, proxy_type: str, debug: bool, - systemLanguage: str) -> None: + system_language: str) -> None: """Runs the daemon used to update federated shared items """ secondsPerHour = 60 * 60 @@ -1746,13 +1746,13 @@ def runFederatedSharesDaemon(base_dir: str, httpd, http_prefix: str, _updateFederatedSharesCache(session, shared_items_federated_domains, base_dir, domainFull, http_prefix, - tokensJson, debug, systemLanguage, + tokensJson, debug, system_language, sharesFileType) time.sleep(secondsPerHour * 6) def _dfcToSharesFormat(catalogJson: {}, - base_dir: str, systemLanguage: str, + base_dir: str, system_language: str, http_prefix: str, domainFull: str) -> {}: """Converts DFC format into the internal formal used to store shared items. This simplifies subsequent search and display @@ -1765,7 +1765,7 @@ def _dfcToSharesFormat(catalogJson: {}, productTypesList = getCategoryTypes(base_dir) for productType in productTypesList: dfcIds[productType] = \ - _loadDfcIds(base_dir, systemLanguage, productType, + _loadDfcIds(base_dir, system_language, productType, http_prefix, domainFull) currTime = int(time.time()) diff --git a/skills.py b/skills.py index cb4d17431..1d5dcbcae 100644 --- a/skills.py +++ b/skills.py @@ -178,7 +178,7 @@ def sendSkillViaServer(base_dir: str, session, nickname: str, password: str, skill: str, skillLevelPercent: int, cached_webfingers: {}, person_cache: {}, debug: bool, project_version: str, - signingPrivateKeyPem: str) -> {}: + signing_priv_key_pem: str) -> {}: """Sets a skill for a person via c2s """ if not session: @@ -211,7 +211,7 @@ def sendSkillViaServer(base_dir: str, session, nickname: str, password: str, webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: if debug: print('DEBUG: skill webfinger failed for ' + handle) @@ -226,7 +226,7 @@ def sendSkillViaServer(base_dir: str, session, nickname: str, password: str, # get the actor inbox for the To handle originDomain = domain (inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, project_version, diff --git a/socnet.py b/socnet.py index 208f6f0f5..593d4c15f 100644 --- a/socnet.py +++ b/socnet.py @@ -18,7 +18,7 @@ def instancesGraph(base_dir: str, handles: str, proxy_type: str, port: int, http_prefix: str, debug: bool, project_version: str, - systemLanguage: str, signingPrivateKeyPem: str) -> str: + system_language: str, signing_priv_key_pem: str) -> str: """ Returns a dot graph of federating instances based upon a few sample handles. The handles argument should contain a comma separated list @@ -55,7 +55,7 @@ def instancesGraph(base_dir: str, handles: str, webfingerHandle(session, handle, http_prefix, cached_webfingers, domain, project_version, debug, False, - signingPrivateKeyPem) + signing_priv_key_pem) if not wfRequest: return dotGraphStr + '}\n' if not isinstance(wfRequest, dict): @@ -65,7 +65,7 @@ def instancesGraph(base_dir: str, handles: str, originDomain = None (personUrl, pubKeyId, pubKey, personId, shaedInbox, avatarUrl, - displayName, _) = getPersonBox(signingPrivateKeyPem, + displayName, _) = getPersonBox(signing_priv_key_pem, originDomain, base_dir, session, wfRequest, person_cache, @@ -78,8 +78,8 @@ def instancesGraph(base_dir: str, handles: str, maxAttachments, federationList, person_cache, debug, project_version, http_prefix, domain, - wordFrequency, [], systemLanguage, - signingPrivateKeyPem) + wordFrequency, [], system_language, + signing_priv_key_pem) postDomains.sort() for fedDomain in postDomains: dotLineStr = ' "' + domain + '" -> "' + fedDomain + '";\n' diff --git a/speaker.py b/speaker.py index 024b5ae3c..c4fb90aa3 100644 --- a/speaker.py +++ b/speaker.py @@ -296,7 +296,7 @@ def _speakerEndpointJson(displayName: str, summary: str, return speakerJson -def _SSMLheader(systemLanguage: str, instanceTitle: str) -> str: +def _SSMLheader(system_language: str, instanceTitle: str) -> str: """Returns a header for an SSML document """ return '\n' + \ @@ -306,7 +306,7 @@ def _SSMLheader(systemLanguage: str, instanceTitle: str) -> str: ' http://www.w3.org/TR/speech-synthesis11/synthesis.xsd"\n' + \ ' version="1.1">\n' + \ ' \n' + \ - ' ' + \ + ' ' + \ instanceTitle + ' inbox\n' + \ ' \n' @@ -350,7 +350,7 @@ def _speakerEndpointSSML(displayName: str, summary: str, def getSSMLbox(base_dir: str, path: str, domain: str, - systemLanguage: str, + system_language: str, instanceTitle: str, boxName: str) -> str: """Returns SSML for the given timeline @@ -373,7 +373,7 @@ def getSSMLbox(base_dir: str, path: str, speakerJson['say'], speakerJson['imageDescription'], speakerJson['detectedLinks'], - systemLanguage, + system_language, instanceTitle, gender) diff --git a/tests.py b/tests.py index a7c70236a..2cfabe5ed 100644 --- a/tests.py +++ b/tests.py @@ -688,7 +688,7 @@ def createServerAlice(path: str, domain: str, port: int, os.mkdir(path) os.chdir(path) shared_items_federated_domains = [] - systemLanguage = 'en' + system_language = 'en' nickname = 'alice' http_prefix = 'http' proxy_type = None @@ -741,7 +741,7 @@ def createServerAlice(path: str, domain: str, port: int, testInReplyTo, testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) createPublicPost(path, nickname, domain, port, http_prefix, "Curiouser and curiouser!", @@ -755,7 +755,7 @@ def createServerAlice(path: str, domain: str, port: int, testInReplyTo, testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) createPublicPost(path, nickname, domain, port, http_prefix, "In the gardens of memory, in the palace " + @@ -770,7 +770,7 @@ def createServerAlice(path: str, domain: str, port: int, testInReplyTo, testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) regenerateIndexForBox(path, nickname, domain, 'outbox') global testServerAliceRunning @@ -832,7 +832,7 @@ def createServerBob(path: str, domain: str, port: int, os.mkdir(path) os.chdir(path) shared_items_federated_domains = [] - systemLanguage = 'en' + system_language = 'en' nickname = 'bob' http_prefix = 'http' proxy_type = None @@ -883,7 +883,7 @@ def createServerBob(path: str, domain: str, port: int, testInReplyTo, testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) createPublicPost(path, nickname, domain, port, http_prefix, "One of the things I've realised is that " + @@ -898,7 +898,7 @@ def createServerBob(path: str, domain: str, port: int, testInReplyTo, testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) createPublicPost(path, nickname, domain, port, http_prefix, "Quantum physics is a bit of a passion of mine", @@ -912,7 +912,7 @@ def createServerBob(path: str, domain: str, port: int, testInReplyTo, testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) regenerateIndexForBox(path, nickname, domain, 'outbox') global testServerBobRunning @@ -1042,7 +1042,7 @@ def createServerGroup(path: str, domain: str, port: int, os.mkdir(path) os.chdir(path) shared_items_federated_domains = [] - # systemLanguage = 'en' + # system_language = 'en' nickname = 'testgroup' http_prefix = 'http' proxy_type = None @@ -1114,7 +1114,7 @@ def testPostMessageBetweenServers(base_dir: str) -> None: testServerAliceRunning = False testServerBobRunning = False - systemLanguage = 'en' + system_language = 'en' http_prefix = 'http' proxy_type = None content_license_url = 'https://creativecommons.org/licenses/by/4.0' @@ -1206,9 +1206,9 @@ def testPostMessageBetweenServers(base_dir: str) -> None: assert len([name for name in os.listdir(outboxPath) if os.path.isfile(os.path.join(outboxPath, name))]) == 0 low_bandwidth = False - signingPrivateKeyPem = None + signing_priv_key_pem = None sendResult = \ - sendPost(signingPrivateKeyPem, __version__, + sendPost(signing_priv_key_pem, __version__, sessionAlice, aliceDir, 'alice', aliceDomain, alicePort, 'bob', bobDomain, bobPort, ccUrl, http_prefix, 'Why is a mouse when it spins? ' + @@ -1218,7 +1218,7 @@ def testPostMessageBetweenServers(base_dir: str) -> None: attachedImageFilename, mediaType, attachedImageDescription, city, federationList, aliceSendThreads, alicePostLog, aliceCachedWebfingers, - alicePersonCache, isArticle, systemLanguage, + alicePersonCache, isArticle, system_language, aliceSharedItemsFederatedDomains, aliceSharedItemFederationTokens, low_bandwidth, content_license_url, @@ -1284,7 +1284,7 @@ def testPostMessageBetweenServers(base_dir: str) -> None: assert 'Why is a mouse when it spins?' in \ receivedJson['object']['content'] assert 'Why is a mouse when it spins?' in \ - receivedJson['object']['contentMap'][systemLanguage] + receivedJson['object']['contentMap'][system_language] assert 'यह एक परीक्षण है' in receivedJson['object']['content'] print('Check that message received from Alice contains an attachment') assert receivedJson['object']['attachment'] @@ -1332,7 +1332,7 @@ def testPostMessageBetweenServers(base_dir: str) -> None: 'alice', aliceDomain, alicePort, [], statusNumber, False, bobSendThreads, bobPostLog, bobPersonCache, bobCachedWebfingers, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(20): if 'likes' in open(outboxPostFilename).read(): @@ -1354,7 +1354,7 @@ def testPostMessageBetweenServers(base_dir: str) -> None: statusNumber, '😀', False, bobSendThreads, bobPostLog, bobPersonCache, bobCachedWebfingers, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(20): if 'reactions' in open(outboxPostFilename).read(): @@ -1389,7 +1389,7 @@ def testPostMessageBetweenServers(base_dir: str) -> None: objectUrl, False, bobSendThreads, bobPostLog, bobPersonCache, bobCachedWebfingers, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) announceMessageArrived = False outboxMessageArrived = False for i in range(10): @@ -1438,7 +1438,7 @@ def testFollowBetweenServers(base_dir: str) -> None: testServerAliceRunning = False testServerBobRunning = False - systemLanguage = 'en' + system_language = 'en' http_prefix = 'http' proxy_type = None federationList = [] @@ -1524,7 +1524,7 @@ def testFollowBetweenServers(base_dir: str) -> None: aliceCachedWebfingers = {} alicePostLog = [] bobActor = http_prefix + '://' + bobAddress + '/users/bob' - signingPrivateKeyPem = None + signing_priv_key_pem = None sendResult = \ sendFollowRequest(sessionAlice, aliceDir, 'alice', aliceDomain, alicePort, http_prefix, @@ -1533,7 +1533,7 @@ def testFollowBetweenServers(base_dir: str) -> None: client_to_server, federationList, aliceSendThreads, alicePostLog, aliceCachedWebfingers, alicePersonCache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) print('sendResult: ' + str(sendResult)) for t in range(16): @@ -1570,16 +1570,16 @@ def testFollowBetweenServers(base_dir: str) -> None: isArticle = False city = 'London, England' low_bandwidth = False - signingPrivateKeyPem = None + signing_priv_key_pem = None sendResult = \ - sendPost(signingPrivateKeyPem, __version__, + sendPost(signing_priv_key_pem, __version__, sessionAlice, aliceDir, 'alice', aliceDomain, alicePort, 'bob', bobDomain, bobPort, ccUrl, http_prefix, 'Alice message', followersOnly, saveToFile, client_to_server, True, None, None, None, city, federationList, aliceSendThreads, alicePostLog, aliceCachedWebfingers, - alicePersonCache, isArticle, systemLanguage, + alicePersonCache, isArticle, system_language, aliceSharedItemsFederatedDomains, aliceSharedItemFederationTokens, low_bandwidth, content_license_url, @@ -1627,7 +1627,7 @@ def testSharedItemsFederation(base_dir: str) -> None: testServerAliceRunning = False testServerBobRunning = False - systemLanguage = 'en' + system_language = 'en' http_prefix = 'http' proxy_type = None federationList = [] @@ -1698,7 +1698,7 @@ def testSharedItemsFederation(base_dir: str) -> None: assert ctr <= 60 time.sleep(1) - signingPrivateKeyPem = None + signing_priv_key_pem = None sessionClient = createSession(proxy_type) # Get Bob's instance actor @@ -1710,7 +1710,7 @@ def testSharedItemsFederation(base_dir: str) -> None: 'Accept': 'application/ld+json; profile="' + profileStr + '"' } bobInstanceActorJson = \ - getJson(signingPrivateKeyPem, sessionClient, + getJson(signing_priv_key_pem, sessionClient, 'http://' + bobAddress + '/@actor', testHeaders, {}, True, __version__, 'http', 'somedomain.or.other', 10, True) assert bobInstanceActorJson @@ -1750,7 +1750,7 @@ def testSharedItemsFederation(base_dir: str) -> None: client_to_server, federationList, aliceSendThreads, alicePostLog, aliceCachedWebfingers, alicePersonCache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) print('sendResult: ' + str(sendResult)) for t in range(16): @@ -1808,7 +1808,7 @@ def testSharedItemsFederation(base_dir: str) -> None: sharedItemDuration = "10 days" sharedItemPrice = "1.30" sharedItemCurrency = "EUR" - signingPrivateKeyPem = None + signing_priv_key_pem = None sessionBob = createSession(proxy_type) shareJson = \ sendShareViaServer(bobDir, sessionBob, @@ -1821,7 +1821,7 @@ def testSharedItemsFederation(base_dir: str) -> None: bobCachedWebfingers, bobPersonCache, True, __version__, sharedItemPrice, sharedItemCurrency, - signingPrivateKeyPem) + signing_priv_key_pem) assert shareJson assert isinstance(shareJson, dict) sharedItemName = 'Epicyon T-shirt' @@ -1845,7 +1845,7 @@ def testSharedItemsFederation(base_dir: str) -> None: bobCachedWebfingers, bobPersonCache, True, __version__, sharedItemPrice, sharedItemCurrency, - signingPrivateKeyPem) + signing_priv_key_pem) assert shareJson assert isinstance(shareJson, dict) sharedItemName = 'Soldering iron' @@ -1869,7 +1869,7 @@ def testSharedItemsFederation(base_dir: str) -> None: bobCachedWebfingers, bobPersonCache, True, __version__, sharedItemPrice, sharedItemCurrency, - signingPrivateKeyPem) + signing_priv_key_pem) assert shareJson assert isinstance(shareJson, dict) @@ -1891,11 +1891,11 @@ def testSharedItemsFederation(base_dir: str) -> None: print('\n\n*********************************************************') print('Bob can read the shared items catalog on his own instance') - signingPrivateKeyPem = None + signing_priv_key_pem = None catalogJson = \ getSharedItemsCatalogViaServer(bobDir, sessionBob, 'bob', bobPassword, bobDomain, bobPort, http_prefix, True, - signingPrivateKeyPem) + signing_priv_key_pem) assert catalogJson pprint(catalogJson) assert 'DFC:supplies' in catalogJson @@ -1921,16 +1921,16 @@ def testSharedItemsFederation(base_dir: str) -> None: isArticle = False city = 'London, England' low_bandwidth = False - signingPrivateKeyPem = None + signing_priv_key_pem = None sendResult = \ - sendPost(signingPrivateKeyPem, __version__, + sendPost(signing_priv_key_pem, __version__, sessionAlice, aliceDir, 'alice', aliceDomain, alicePort, 'bob', bobDomain, bobPort, ccUrl, http_prefix, 'Alice message', followersOnly, saveToFile, client_to_server, True, None, None, None, city, federationList, aliceSendThreads, alicePostLog, aliceCachedWebfingers, - alicePersonCache, isArticle, systemLanguage, + alicePersonCache, isArticle, system_language, aliceSharedItemsFederatedDomains, aliceSharedItemFederationTokens, low_bandwidth, content_license_url, True, @@ -1987,8 +1987,8 @@ def testSharedItemsFederation(base_dir: str) -> None: 'Accept': 'application/json' } url = http_prefix + '://' + bobAddress + '/catalog' - signingPrivateKeyPem = None - catalogJson = getJson(signingPrivateKeyPem, sessionAlice, url, headers, + signing_priv_key_pem = None + catalogJson = getJson(signing_priv_key_pem, sessionAlice, url, headers, None, True) assert catalogJson pprint(catalogJson) @@ -2028,12 +2028,12 @@ def testGroupFollow(base_dir: str) -> None: global testServerAliceRunning global testServerBobRunning global testServerGroupRunning - systemLanguage = 'en' + system_language = 'en' testServerAliceRunning = False testServerBobRunning = False testServerGroupRunning = False - # systemLanguage = 'en' + # system_language = 'en' http_prefix = 'http' proxy_type = None federationList = [] @@ -2135,8 +2135,8 @@ def testGroupFollow(base_dir: str) -> None: asHeader = { 'Accept': 'application/ld+json; profile="' + profileStr + '"' } - signingPrivateKeyPem = None - outboxJson = getJson(signingPrivateKeyPem, session, aliceOutbox, asHeader, + signing_priv_key_pem = None + outboxJson = getJson(signing_priv_key_pem, session, aliceOutbox, asHeader, None, True, __version__, 'http', None) assert outboxJson pprint(outboxJson) @@ -2147,7 +2147,7 @@ def testGroupFollow(base_dir: str) -> None: print('Alice outbox totalItems: ' + str(outboxJson['totalItems'])) assert outboxJson['totalItems'] == 3 - outboxJson = getJson(signingPrivateKeyPem, session, firstPage, asHeader, + outboxJson = getJson(signing_priv_key_pem, session, firstPage, asHeader, None, True, __version__, 'http', None) assert outboxJson pprint(outboxJson) @@ -2180,7 +2180,7 @@ def testGroupFollow(base_dir: str) -> None: # aliceActor = http_prefix + '://' + aliceAddress + '/users/alice' testgroupActor = \ http_prefix + '://' + testgroupAddress + '/users/testgroup' - signingPrivateKeyPem = None + signing_priv_key_pem = None sendResult = \ sendFollowRequest(sessionAlice, aliceDir, 'alice', aliceDomain, alicePort, http_prefix, @@ -2189,7 +2189,7 @@ def testGroupFollow(base_dir: str) -> None: client_to_server, federationList, aliceSendThreads, alicePostLog, aliceCachedWebfingers, alicePersonCache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) print('sendResult: ' + str(sendResult)) aliceFollowingFilename = \ @@ -2257,7 +2257,7 @@ def testGroupFollow(base_dir: str) -> None: # bobActor = http_prefix + '://' + bobAddress + '/users/bob' testgroupActor = \ http_prefix + '://' + testgroupAddress + '/users/testgroup' - signingPrivateKeyPem = None + signing_priv_key_pem = None sendResult = \ sendFollowRequest(sessionBob, bobDir, 'bob', bobDomain, bobPort, http_prefix, @@ -2266,7 +2266,7 @@ def testGroupFollow(base_dir: str) -> None: client_to_server, federationList, bobSendThreads, bobPostLog, bobCachedWebfingers, bobPersonCache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) print('sendResult: ' + str(sendResult)) bobFollowingFilename = \ @@ -2329,7 +2329,7 @@ def testGroupFollow(base_dir: str) -> None: isArticle = False city = 'London, England' low_bandwidth = False - signingPrivateKeyPem = None + signing_priv_key_pem = None queuePath = \ testgroupDir + '/accounts/testgroup@' + testgroupDomain + '/queue' @@ -2346,14 +2346,14 @@ def testGroupFollow(base_dir: str) -> None: if os.path.isfile(os.path.join(outboxPath, name))]) sendResult = \ - sendPost(signingPrivateKeyPem, __version__, + sendPost(signing_priv_key_pem, __version__, sessionAlice, aliceDir, 'alice', aliceDomain, alicePort, 'testgroup', testgroupDomain, testgroupPort, ccUrl, http_prefix, "Alice group message", followersOnly, saveToFile, client_to_server, True, None, None, None, city, federationList, aliceSendThreads, alicePostLog, aliceCachedWebfingers, - alicePersonCache, isArticle, systemLanguage, + alicePersonCache, isArticle, system_language, aliceSharedItemsFederatedDomains, aliceSharedItemFederationTokens, low_bandwidth, content_license_url, @@ -2669,7 +2669,7 @@ def _testFollows(base_dir: str) -> None: def _testCreatePerson(base_dir: str): print('testCreatePerson') - systemLanguage = 'en' + system_language = 'en' currDir = base_dir nickname = 'test382' domain = 'badgerdomain.com' @@ -2717,7 +2717,7 @@ def _testCreatePerson(base_dir: str): testInReplyTo, testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) os.chdir(currDir) @@ -2785,7 +2785,7 @@ def testClientToServer(base_dir: str): testServerAliceRunning = False testServerBobRunning = False - systemLanguage = 'en' + system_language = 'en' http_prefix = 'http' proxy_type = None federationList = [] @@ -2886,9 +2886,9 @@ def testClientToServer(base_dir: str): assert len([name for name in os.listdir(bobOutboxPath) if os.path.isfile(os.path.join(bobOutboxPath, name))]) == 0 print('EVENT: all inboxes and outboxes are empty') - signingPrivateKeyPem = None + signing_priv_key_pem = None sendResult = \ - sendPostViaServer(signingPrivateKeyPem, __version__, + sendPostViaServer(signing_priv_key_pem, __version__, aliceDir, sessionAlice, 'alice', password, aliceDomain, alicePort, 'bob', bobDomain, bobPort, None, @@ -2897,7 +2897,7 @@ def testClientToServer(base_dir: str): attachedImageFilename, mediaType, attachedImageDescription, city, cached_webfingers, person_cache, isArticle, - systemLanguage, low_bandwidth, + system_language, low_bandwidth, content_license_url, True, None, None, conversationId, None) @@ -2954,14 +2954,14 @@ def testClientToServer(base_dir: str): aliceDomain, alicePort) print('\n\nAlice follows Bob') - signingPrivateKeyPem = None + signing_priv_key_pem = None sendFollowRequestViaServer(aliceDir, sessionAlice, 'alice', password, aliceDomain, alicePort, 'bob', bobDomain, bobPort, http_prefix, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) alicePetnamesFilename = aliceDir + '/accounts/' + \ 'alice@' + aliceDomain + '/petnames.txt' aliceFollowingFilename = \ @@ -3003,7 +3003,7 @@ def testClientToServer(base_dir: str): 'alice', aliceDomain, alicePort, http_prefix, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for t in range(10): if os.path.isfile(aliceDir + '/accounts/alice@' + aliceDomain + '/followers.txt'): @@ -3058,7 +3058,7 @@ def testClientToServer(base_dir: str): bobDomain, bobPort, http_prefix, outboxPostId, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(20): if os.path.isdir(outboxPath) and os.path.isdir(inboxPath): if len([name for name in os.listdir(outboxPath) @@ -3088,7 +3088,7 @@ def testClientToServer(base_dir: str): bobDomain, bobPort, http_prefix, outboxPostId, '😃', cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(20): if os.path.isdir(outboxPath) and os.path.isdir(inboxPath): if len([name for name in os.listdir(outboxPath) @@ -3129,13 +3129,13 @@ def testClientToServer(base_dir: str): showTestBoxes('alice', aliceInboxPath, aliceOutboxPath) showTestBoxes('bob', bobInboxPath, bobOutboxPath) print('\n\nEVENT: Bob repeats the post') - signingPrivateKeyPem = None + signing_priv_key_pem = None sendAnnounceViaServer(bobDir, sessionBob, 'bob', password, bobDomain, bobPort, http_prefix, outboxPostId, cached_webfingers, person_cache, True, __version__, - signingPrivateKeyPem) + signing_priv_key_pem) for i in range(20): if os.path.isdir(outboxPath) and os.path.isdir(inboxPath): if len([name for name in os.listdir(outboxPath) @@ -3172,7 +3172,7 @@ def testClientToServer(base_dir: str): aliceDomain, alicePort, http_prefix, outboxPostId, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for i in range(30): if os.path.isdir(inboxPath): test = len([name for name in os.listdir(inboxPath) @@ -3197,7 +3197,7 @@ def testClientToServer(base_dir: str): 'bob', bobDomain, bobPort, http_prefix, cached_webfingers, person_cache, - True, __version__, signingPrivateKeyPem) + True, __version__, signing_priv_key_pem) for t in range(10): if 'alice@' + aliceDomain + ':' + str(alicePort) not in \ open(bobFollowersFilename).read(): @@ -4227,7 +4227,7 @@ def _testGetMentionedPeople(base_dir: str) -> None: def _testReplyToPublicPost(base_dir: str) -> None: - systemLanguage = 'en' + system_language = 'en' nickname = 'test7492362' domain = 'other.site' port = 443 @@ -4262,7 +4262,7 @@ def _testReplyToPublicPost(base_dir: str) -> None: testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) # print(str(reply)) assert reply['object']['content'] == \ @@ -4270,7 +4270,7 @@ def _testReplyToPublicPost(base_dir: str) -> None: '@ninjarodent' + \ ' This is a test.

' - reply['object']['contentMap'][systemLanguage] = reply['object']['content'] + reply['object']['contentMap'][system_language] = reply['object']['content'] assert reply['object']['tag'][0]['type'] == 'Mention' assert reply['object']['tag'][0]['name'] == '@ninjarodent@rat.site' assert reply['object']['tag'][0]['href'] == 'https://rat.site/@ninjarodent' @@ -4772,7 +4772,7 @@ def _testFunctions(): def _testLinksWithinPost(base_dir: str) -> None: - systemLanguage = 'en' + system_language = 'en' nickname = 'test27636' domain = 'rando.site' port = 443 @@ -4808,7 +4808,7 @@ def _testLinksWithinPost(base_dir: str) -> None: testInReplyTo, testInReplyToAtomUri, testSubject, testSchedulePost, testEventDate, testEventTime, testLocation, - testIsArticle, systemLanguage, conversationId, + testIsArticle, system_language, conversationId, low_bandwidth, content_license_url) assert post_json_object['object']['content'] == \ @@ -4823,7 +4823,7 @@ def _testLinksWithinPost(base_dir: str) -> None: '' + \ 'libreserver.org

' assert post_json_object['object']['content'] == \ - post_json_object['object']['contentMap'][systemLanguage] + post_json_object['object']['contentMap'][system_language] content = "

Some text

Other text

More text

" + \ "
Errno::EOHNOES (No such file or rodent @ " + \
@@ -4845,10 +4845,10 @@ def _testLinksWithinPost(base_dir: str) -> None:
                          testInReplyTo, testInReplyToAtomUri,
                          testSubject, testSchedulePost,
                          testEventDate, testEventTime, testLocation,
-                         testIsArticle, systemLanguage, conversationId,
+                         testIsArticle, system_language, conversationId,
                          low_bandwidth, content_license_url)
     assert post_json_object['object']['content'] == content
-    assert post_json_object['object']['contentMap'][systemLanguage] == content
+    assert post_json_object['object']['contentMap'][system_language] == content
 
 
 def _testMastoApi():
@@ -5141,14 +5141,14 @@ def testUpdateActor(base_dir: str):
         'fnaZ2Wi050483Sj2RmQRpb99Dod7rVZTDtCqXk0J\n' + \
         '=gv5G\n' + \
         '-----END PGP PUBLIC KEY BLOCK-----'
-    signingPrivateKeyPem = None
+    signing_priv_key_pem = None
     actorUpdate = \
         pgpPublicKeyUpload(aliceDir, sessionAlice,
                            'alice', password,
                            aliceDomain, alicePort,
                            http_prefix,
                            cached_webfingers, person_cache,
-                           True, pubKey, signingPrivateKeyPem)
+                           True, pubKey, signing_priv_key_pem)
     print('actor update result: ' + str(actorUpdate))
     assert actorUpdate
 
@@ -5759,7 +5759,7 @@ def _translateOntology(base_dir: str) -> None:
 
 def _testCanReplyTo(base_dir: str) -> None:
     print('testCanReplyTo')
-    systemLanguage = 'en'
+    system_language = 'en'
     nickname = 'test27637'
     domain = 'rando.site'
     port = 443
@@ -5795,7 +5795,7 @@ def _testCanReplyTo(base_dir: str) -> None:
                          testInReplyTo, testInReplyToAtomUri,
                          testSubject, testSchedulePost,
                          testEventDate, testEventTime, testLocation,
-                         testIsArticle, systemLanguage, conversationId,
+                         testIsArticle, system_language, conversationId,
                          low_bandwidth, content_license_url)
     # set the date on the post
     currDateStr = "2021-09-08T20:45:00Z"
diff --git a/theme.py b/theme.py
index 86f717d4d..7b18b565a 100644
--- a/theme.py
+++ b/theme.py
@@ -138,20 +138,20 @@ def getThemesList(base_dir: str) -> []:
 
 
 def _copyThemeHelpFiles(base_dir: str, themeName: str,
-                        systemLanguage: str) -> None:
+                        system_language: str) -> None:
     """Copies any theme specific help files from the welcome subdirectory
     """
-    if not systemLanguage:
-        systemLanguage = 'en'
+    if not system_language:
+        system_language = 'en'
     themeDir = base_dir + '/theme/' + themeName + '/welcome'
     if not os.path.isdir(themeDir):
         themeDir = base_dir + '/defaultwelcome'
     for subdir, dirs, files in os.walk(themeDir):
         for helpMarkdownFile in files:
-            if not helpMarkdownFile.endswith('_' + systemLanguage + '.md'):
+            if not helpMarkdownFile.endswith('_' + system_language + '.md'):
                 continue
             destHelpMarkdownFile = \
-                helpMarkdownFile.replace('_' + systemLanguage + '.md', '.md')
+                helpMarkdownFile.replace('_' + system_language + '.md', '.md')
             if destHelpMarkdownFile == 'profile.md' or \
                destHelpMarkdownFile == 'final.md':
                 destHelpMarkdownFile = 'welcome_' + destHelpMarkdownFile
@@ -495,16 +495,16 @@ def _setCustomFont(base_dir: str):
 def setThemeFromDesigner(base_dir: str, themeName: str, domain: str,
                          themeParams: {},
                          allow_local_network_access: bool,
-                         systemLanguage: str):
+                         system_language: str):
     customThemeFilename = base_dir + '/accounts/theme.json'
     saveJson(themeParams, customThemeFilename)
     setTheme(base_dir, themeName, domain,
-             allow_local_network_access, systemLanguage)
+             allow_local_network_access, system_language)
 
 
 def resetThemeDesignerSettings(base_dir: str, themeName: str, domain: str,
                                allow_local_network_access: bool,
-                               systemLanguage: str) -> None:
+                               system_language: str) -> None:
     """Resets the theme designer settings
     """
     customVariablesFile = base_dir + '/accounts/theme.json'
@@ -815,7 +815,7 @@ def _setClearCacheFlag(base_dir: str) -> None:
 
 
 def setTheme(base_dir: str, name: str, domain: str,
-             allow_local_network_access: bool, systemLanguage: str) -> bool:
+             allow_local_network_access: bool, system_language: str) -> bool:
     """Sets the theme with the given name as the current theme
     """
     result = False
@@ -826,7 +826,7 @@ def setTheme(base_dir: str, name: str, domain: str,
     if prevThemeName != name:
         resetThemeDesignerSettings(base_dir, name, domain,
                                    allow_local_network_access,
-                                   systemLanguage)
+                                   system_language)
 
     _removeTheme(base_dir)
 
@@ -876,7 +876,7 @@ def setTheme(base_dir: str, name: str, domain: str,
     else:
         disableGrayscale(base_dir)
 
-    _copyThemeHelpFiles(base_dir, name, systemLanguage)
+    _copyThemeHelpFiles(base_dir, name, system_language)
     _setThemeInConfig(base_dir, name)
     _setClearCacheFlag(base_dir)
     return result
diff --git a/utils.py b/utils.py
index 8305ba8db..63da48267 100644
--- a/utils.py
+++ b/utils.py
@@ -77,7 +77,7 @@ def getActorLanguagesList(actorJson: {}) -> []:
     return []
 
 
-def getContentFromPost(post_json_object: {}, systemLanguage: str,
+def getContentFromPost(post_json_object: {}, system_language: str,
                        languagesUnderstood: []) -> str:
     """Returns the content from the post in the given language
     including searching for a matching entry within contentMap
@@ -90,9 +90,10 @@ def getContentFromPost(post_json_object: {}, systemLanguage: str,
     content = ''
     if thisPostJson.get('contentMap'):
         if isinstance(thisPostJson['contentMap'], dict):
-            if thisPostJson['contentMap'].get(systemLanguage):
-                if isinstance(thisPostJson['contentMap'][systemLanguage], str):
-                    return thisPostJson['contentMap'][systemLanguage]
+            if thisPostJson['contentMap'].get(system_language):
+                sys_lang = thisPostJson['contentMap'][system_language]
+                if isinstance(sys_lang, str):
+                    return thisPostJson['contentMap'][system_language]
             else:
                 # is there a contentMap entry for one of
                 # the understood languages?
@@ -105,7 +106,7 @@ def getContentFromPost(post_json_object: {}, systemLanguage: str,
     return content
 
 
-def getBaseContentFromPost(post_json_object: {}, systemLanguage: str) -> str:
+def getBaseContentFromPost(post_json_object: {}, system_language: str) -> str:
     """Returns the content from the post in the given language
     """
     thisPostJson = post_json_object
@@ -2675,24 +2676,24 @@ def loadTranslationsFromFile(base_dir: str, language: str) -> ({}, str):
         print('ERROR: translations directory not found')
         return None, None
     if not language:
-        systemLanguage = locale.getdefaultlocale()[0]
+        system_language = locale.getdefaultlocale()[0]
     else:
-        systemLanguage = language
-    if not systemLanguage:
-        systemLanguage = 'en'
-    if '_' in systemLanguage:
-        systemLanguage = systemLanguage.split('_')[0]
-    while '/' in systemLanguage:
-        systemLanguage = systemLanguage.split('/')[1]
-    if '.' in systemLanguage:
-        systemLanguage = systemLanguage.split('.')[0]
+        system_language = language
+    if not system_language:
+        system_language = 'en'
+    if '_' in system_language:
+        system_language = system_language.split('_')[0]
+    while '/' in system_language:
+        system_language = system_language.split('/')[1]
+    if '.' in system_language:
+        system_language = system_language.split('.')[0]
     translationsFile = base_dir + '/translations/' + \
-        systemLanguage + '.json'
+        system_language + '.json'
     if not os.path.isfile(translationsFile):
-        systemLanguage = 'en'
+        system_language = 'en'
         translationsFile = base_dir + '/translations/' + \
-            systemLanguage + '.json'
-    return loadJson(translationsFile), systemLanguage
+            system_language + '.json'
+    return loadJson(translationsFile), system_language
 
 
 def dmAllowedFromDomain(base_dir: str,
diff --git a/video.py b/video.py
index 7ef7c8187..19ff2add8 100644
--- a/video.py
+++ b/video.py
@@ -16,7 +16,7 @@ from filters import isFiltered
 
 
 def convertVideoToNote(base_dir: str, nickname: str, domain: str,
-                       systemLanguage: str,
+                       system_language: str,
                        post_json_object: {}, blockedCache: {}) -> {}:
     """Converts a PeerTube Video ActivityPub(ish) object into
     a Note, so that it can then be displayed in a timeline
@@ -54,7 +54,7 @@ def convertVideoToNote(base_dir: str, nickname: str, domain: str,
         return None
 
     # get the language of the video
-    postLanguage = systemLanguage
+    postLanguage = system_language
     if post_json_object.get('language'):
         if isinstance(post_json_object['language'], dict):
             if post_json_object['language'].get('identifier'):
diff --git a/webapp_about.py b/webapp_about.py
index 2663addbb..2fa2a0fbb 100644
--- a/webapp_about.py
+++ b/webapp_about.py
@@ -17,7 +17,7 @@ from markdown import markdownToHtml
 
 def htmlAbout(cssCache: {}, base_dir: str, http_prefix: str,
               domainFull: str, onion_domain: str, translate: {},
-              systemLanguage: str) -> str:
+              system_language: str) -> str:
     """Show the about screen
     """
     adminNickname = getConfigParam(base_dir, 'admin')
@@ -45,7 +45,7 @@ def htmlAbout(cssCache: {}, base_dir: str, http_prefix: str,
     aboutForm = \
         htmlHeaderWithWebsiteMarkup(cssFilename, instanceTitle,
                                     http_prefix, domainFull,
-                                    systemLanguage)
+                                    system_language)
     aboutForm += '
' + aboutText + '
'
     if onion_domain:
         aboutForm += \
diff --git a/webapp_column_right.py b/webapp_column_right.py
index 9b165d76f..164345312 100644
--- a/webapp_column_right.py
+++ b/webapp_column_right.py
@@ -643,7 +643,7 @@ def htmlEditNewswire(cssCache: {}, translate: {}, base_dir: str, path: str,
 def htmlEditNewsPost(cssCache: {}, translate: {}, base_dir: str, path: str,
                      domain: str, port: int,
                      http_prefix: str, postUrl: str,
-                     systemLanguage: str) -> str:
+                     system_language: str) -> str:
     """Edits a news post on the news/features timeline
     """
     if '/users/' not in path:
@@ -704,7 +704,7 @@ def htmlEditNewsPost(cssCache: {}, translate: {}, base_dir: str, path: str,
         '  
\n'
 
-    newsPostContent = getBaseContentFromPost(post_json_object, systemLanguage)
+    newsPostContent = getBaseContentFromPost(post_json_object, system_language)
     editNewsPostForm += \
         '