diff --git a/daemon.py b/daemon.py index 445fa3e6a..b7a75074b 100644 --- a/daemon.py +++ b/daemon.py @@ -269,7 +269,7 @@ from utils import set_occupation_name from utils import load_translations_from_file from utils import get_local_network_addresses from utils import decoded_host -from utils import isPublicPost +from utils import is_public_post from utils import get_locked_account from utils import has_users_path from utils import get_full_domain @@ -9989,7 +9989,7 @@ class PubServer(BaseHTTPRequestHandler): # Otherwize marketers could gain more social graph info if not authorized: pjo = post_json_object - if not isPublicPost(pjo): + if not is_public_post(pjo): self._404() self.server.GETbusy = False return True diff --git a/epicyon.py b/epicyon.py index add9c3492..80e112725 100644 --- a/epicyon.py +++ b/epicyon.py @@ -74,7 +74,7 @@ from utils import get_config_param from utils import get_domain_from_actor from utils import get_nickname_from_actor from utils import follow_person -from utils import validNickname +from utils import valid_nickname from utils import get_protocol_prefixes from utils import acct_dir from media import archiveMedia @@ -2271,7 +2271,7 @@ if args.addaccount: print('The account domain is expected to be ' + configuredDomain) sys.exit() - if not validNickname(domain, nickname): + if not valid_nickname(domain, nickname): print(nickname + ' is a reserved name. Use something different.') sys.exit() @@ -2315,7 +2315,7 @@ if args.addgroup: if nickname.startswith('!'): # remove preceding group indicator nickname = nickname[1:] - if not validNickname(domain, nickname): + if not valid_nickname(domain, nickname): print(nickname + ' is a reserved name. Use something different.') sys.exit() if not args.password: diff --git a/follow.py b/follow.py index be39f994b..8bfc58337 100644 --- a/follow.py +++ b/follow.py @@ -15,7 +15,7 @@ from utils import remove_domain_port from utils import has_users_path from utils import get_full_domain from utils import get_followers_list -from utils import validNickname +from utils import valid_nickname from utils import domain_permitted from utils import get_domain_from_actor from utils import get_nickname_from_actor @@ -463,7 +463,7 @@ def getFollowingFeed(base_dir: str, domain: str, port: int, path: str, nickname = path.replace('/@', '', 1).replace('/' + followFile, '') if not nickname: return None - if not validNickname(domain, nickname): + if not valid_nickname(domain, nickname): return None domain = get_full_domain(domain, port) diff --git a/happening.py b/happening.py index 49c2919a3..1ba8c3f3f 100644 --- a/happening.py +++ b/happening.py @@ -12,7 +12,7 @@ from uuid import UUID from datetime import datetime from datetime import timedelta -from utils import isPublicPost +from utils import is_public_post from utils import load_json from utils import save_json from utils import locate_post @@ -214,7 +214,7 @@ def getTodaysEvents(base_dir: str, nickname: str, domain: str, if not _isHappeningPost(post_json_object): continue - publicEvent = isPublicPost(post_json_object) + publicEvent = is_public_post(post_json_object) postEvent = [] dayOfMonth = None diff --git a/inbox.py b/inbox.py index 865045e16..aefe3322c 100644 --- a/inbox.py +++ b/inbox.py @@ -43,7 +43,7 @@ from utils import remove_id_ending from utils import get_protocol_prefixes from utils import is_blog_post from utils import remove_avatar_from_cache -from utils import isPublicPost +from utils import is_public_post from utils import get_cached_post_filename from utils import remove_post_from_cache from utils import url_permitted @@ -205,7 +205,7 @@ def storeHashTags(base_dir: str, nickname: str, domain: str, """Extracts hashtags from an incoming post and updates the relevant tags files. """ - if not isPublicPost(post_json_object): + if not is_public_post(post_json_object): return if not has_object_dict(post_json_object): return diff --git a/metadata.py b/metadata.py index 49261ed03..ffe6373a6 100644 --- a/metadata.py +++ b/metadata.py @@ -10,8 +10,8 @@ __module_group__ = "Metadata" import os from utils import is_account_dir from utils import load_json -from utils import noOfAccounts -from utils import noOfActiveAccountsMonthly +from utils import no_of_accounts +from utils import no_of_active_accounts_monthly def _getStatusCount(base_dir: str) -> int: @@ -47,9 +47,9 @@ def metaDataNodeInfo(base_dir: str, sensitive """ if showAccounts: - activeAccounts = noOfAccounts(base_dir) - activeAccountsMonthly = noOfActiveAccountsMonthly(base_dir, 1) - activeAccountsHalfYear = noOfActiveAccountsMonthly(base_dir, 6) + activeAccounts = no_of_accounts(base_dir) + activeAccountsMonthly = no_of_active_accounts_monthly(base_dir, 1) + activeAccountsHalfYear = no_of_active_accounts_monthly(base_dir, 6) localPosts = _getStatusCount(base_dir) else: activeAccounts = 1 @@ -132,7 +132,7 @@ def metaDataInstance(showAccounts: bool, adminActor['preferredUsername'] if showAccounts: - activeAccounts = noOfAccounts(base_dir) + activeAccounts = no_of_accounts(base_dir) localPosts = _getStatusCount(base_dir) else: activeAccounts = 1 diff --git a/newswire.py b/newswire.py index 594da5801..602c69c97 100644 --- a/newswire.py +++ b/newswire.py @@ -23,7 +23,7 @@ from utils import get_fav_filename_from_url from utils import get_base_content_from_post from utils import has_object_dict from utils import first_paragraph_from_string -from utils import isPublicPost +from utils import is_public_post from utils import locate_post from utils import load_json from utils import save_json @@ -976,7 +976,7 @@ def _isNewswireBlogPost(post_json_object: {}) -> bool: post_json_object['object'].get('url') and \ post_json_object['object'].get('content') and \ post_json_object['object'].get('published'): - return isPublicPost(post_json_object) + return is_public_post(post_json_object) return False diff --git a/person.py b/person.py index c4b196960..8dd8b00ea 100644 --- a/person.py +++ b/person.py @@ -45,7 +45,7 @@ from utils import remove_line_endings from utils import remove_domain_port from utils import get_status_number from utils import get_full_domain -from utils import validNickname +from utils import valid_nickname from utils import load_json from utils import save_json from utils import set_config_param @@ -546,7 +546,7 @@ def registerAccount(base_dir: str, http_prefix: str, domain: str, port: int, """ if _accountExists(base_dir, nickname, domain): return False - if not validNickname(domain, nickname): + if not valid_nickname(domain, nickname): print('REGISTER: Nickname ' + nickname + ' is invalid') return False if len(password) < 8: @@ -598,7 +598,7 @@ def createPerson(base_dir: str, nickname: str, domain: str, port: int, group_account: bool = False) -> (str, str, {}, {}): """Returns the private key, public key, actor and webfinger endpoint """ - if not validNickname(domain, nickname): + if not valid_nickname(domain, nickname): return None, None, None, None # If a config.json file doesn't exist then don't decrement @@ -883,7 +883,7 @@ def personLookup(domain: str, path: str, base_dir: str) -> {}: nickname = path.replace('/@', '', 1) if not nickname: return None - if not isSharedInbox and not validNickname(domain, nickname): + if not isSharedInbox and not valid_nickname(domain, nickname): return None domain = remove_domain_port(domain) handle = nickname + '@' + domain @@ -946,7 +946,7 @@ def personBoxJson(recent_posts_cache: {}, nickname = path.replace('/@', '', 1).replace('/' + boxname, '') if not nickname: return None - if not validNickname(domain, nickname): + if not valid_nickname(domain, nickname): return None if boxname == 'inbox': return createInbox(recent_posts_cache, diff --git a/posts.py b/posts.py index 7829f456f..67f40c54f 100644 --- a/posts.py +++ b/posts.py @@ -45,7 +45,7 @@ from utils import has_object_dict from utils import reject_post_id from utils import remove_invalid_chars from utils import file_last_modified -from utils import isPublicPost +from utils import is_public_post from utils import has_users_path from utils import valid_post_date from utils import get_full_domain @@ -57,7 +57,7 @@ from utils import url_permitted from utils import get_nickname_from_actor from utils import get_domain_from_actor from utils import deletePost -from utils import validNickname +from utils import valid_nickname from utils import locate_post from utils import load_json from utils import save_json @@ -2037,7 +2037,7 @@ def getMentionedPeople(base_dir: str, http_prefix: str, mentionedDomain = handle.split('@')[1].strip('\n').strip('\r') if ':' in mentionedDomain: mentionedDomain = remove_domain_port(mentionedDomain) - if not validNickname(mentionedDomain, mentionedNickname): + if not valid_nickname(mentionedDomain, mentionedNickname): continue actor = \ local_actor_url(http_prefix, mentionedNickname, @@ -3580,7 +3580,7 @@ def removePostInteractions(post_json_object: {}, force: bool) -> bool: if not force: # If not authorized and it's a private post # then just don't show it within timelines - if not isPublicPost(post_json_object): + if not is_public_post(post_json_object): return False else: postObj = post_json_object diff --git a/shares.py b/shares.py index b2b88b8ba..76e9dadea 100644 --- a/shares.py +++ b/shares.py @@ -27,7 +27,7 @@ from utils import date_string_to_seconds from utils import date_seconds_to_string from utils import get_config_param from utils import get_full_domain -from utils import validNickname +from utils import valid_nickname from utils import load_json from utils import save_json from utils import get_image_extensions @@ -483,7 +483,7 @@ def getSharesFeedForPerson(base_dir: str, path.replace('/@', '', 1).replace('/' + sharesFileType, '') if not nickname: return None - if not validNickname(domain, nickname): + if not valid_nickname(domain, nickname): return None domain = get_full_domain(domain, port) diff --git a/tests.py b/tests.py index 866fc227b..73b621377 100644 --- a/tests.py +++ b/tests.py @@ -70,7 +70,7 @@ from utils import user_agent_domain from utils import camel_case_split from utils import decoded_host from utils import get_full_domain -from utils import validNickname +from utils import valid_nickname from utils import first_paragraph_from_string from utils import remove_id_ending from utils import update_recent_posts_cache @@ -4189,16 +4189,16 @@ def _testValidNickname(): domain = 'somedomain.net' nickname = 'myvalidnick' - assert validNickname(domain, nickname) + assert valid_nickname(domain, nickname) nickname = 'my.invalid.nick' - assert not validNickname(domain, nickname) + assert not valid_nickname(domain, nickname) nickname = 'myinvalidnick?' - assert not validNickname(domain, nickname) + assert not valid_nickname(domain, nickname) nickname = 'my invalid nick?' - assert not validNickname(domain, nickname) + assert not valid_nickname(domain, nickname) def _testGuessHashtagCategory() -> None: diff --git a/utils.py b/utils.py index 00befb2ed..91d78795d 100644 --- a/utils.py +++ b/utils.py @@ -1890,7 +1890,7 @@ def _isReservedName(nickname: str) -> bool: return False -def validNickname(domain: str, nickname: str) -> bool: +def valid_nickname(domain: str, nickname: str) -> bool: """Is the given nickname valid? """ if len(nickname) == 0: @@ -1911,7 +1911,7 @@ def validNickname(domain: str, nickname: str) -> bool: return True -def noOfAccounts(base_dir: str) -> bool: +def no_of_accounts(base_dir: str) -> bool: """Returns the number of accounts on the system """ account_ctr = 0 @@ -1923,7 +1923,7 @@ def noOfAccounts(base_dir: str) -> bool: return account_ctr -def noOfActiveAccountsMonthly(base_dir: str, months: int) -> bool: +def no_of_active_accounts_monthly(base_dir: str, months: int) -> bool: """Returns the number of accounts on the system this month """ account_ctr = 0 @@ -1947,8 +1947,8 @@ def noOfActiveAccountsMonthly(base_dir: str, months: int) -> bool: return account_ctr -def isPublicPostFromUrl(base_dir: str, nickname: str, domain: str, - post_url: str) -> bool: +def is_public_post_from_url(base_dir: str, nickname: str, domain: str, + post_url: str) -> bool: """Returns whether the given url is a public post """ post_filename = locate_post(base_dir, nickname, domain, post_url) @@ -1957,10 +1957,10 @@ def isPublicPostFromUrl(base_dir: str, nickname: str, domain: str, post_json_object = load_json(post_filename, 1) if not post_json_object: return False - return isPublicPost(post_json_object) + return is_public_post(post_json_object) -def isPublicPost(post_json_object: {}) -> bool: +def is_public_post(post_json_object: {}) -> bool: """Returns true if the given post is public """ if not post_json_object.get('type'): diff --git a/webapp_create_post.py b/webapp_create_post.py index 28dcf74e0..ee65e2223 100644 --- a/webapp_create_post.py +++ b/webapp_create_post.py @@ -9,7 +9,7 @@ __module_group__ = "Web Interface" import os from utils import get_new_post_endpoints -from utils import isPublicPostFromUrl +from utils import is_public_post_from_url from utils import get_nickname_from_actor from utils import get_domain_from_actor from utils import get_media_formats @@ -287,8 +287,8 @@ def htmlNewPost(css_cache: {}, media_instance: bool, translate: {}, # if replying to a non-public post then also make # this post non-public - if not isPublicPostFromUrl(base_dir, nickname, domain, - inReplyTo): + if not is_public_post_from_url(base_dir, nickname, domain, + inReplyTo): newPostPath = path if '?' in newPostPath: newPostPath = newPostPath.split('?')[0] diff --git a/webapp_login.py b/webapp_login.py index 755e5e411..a0daff81d 100644 --- a/webapp_login.py +++ b/webapp_login.py @@ -11,7 +11,7 @@ import os import time from shutil import copyfile from utils import get_config_param -from utils import noOfAccounts +from utils import no_of_accounts from utils import getNicknameValidationPattern from webapp_utils import setCustomBackground from webapp_utils import htmlHeaderWithWebsiteMarkup @@ -61,7 +61,7 @@ def htmlLogin(css_cache: {}, translate: {}, autocomplete: bool) -> str: """Shows the login screen """ - accounts = noOfAccounts(base_dir) + accounts = no_of_accounts(base_dir) loginImage = 'login.png' loginImageFilename = None diff --git a/webapp_post.py b/webapp_post.py index c107c9c63..4ee2721bb 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -45,7 +45,7 @@ from utils import get_protocol_prefixes from utils import is_news_post from utils import is_blog_post from utils import get_display_name -from utils import isPublicPost +from utils import is_public_post from utils import update_recent_posts_cache from utils import remove_id_ending from utils import get_nickname_from_actor @@ -1486,7 +1486,7 @@ def individualPostAsHtml(signing_priv_key_pem: str, if postIsDM: showRepeatIcon = False else: - if not isPublicPost(post_json_object): + if not is_public_post(post_json_object): isPublicRepeat = True titleStr = '' @@ -1635,7 +1635,7 @@ def individualPostAsHtml(signing_priv_key_pem: str, conversationId = post_json_object['object']['conversation'] publicReply = False - if isPublicPost(post_json_object): + if is_public_post(post_json_object): publicReply = True replyStr = _getReplyIconHtml(base_dir, nickname, domain, publicReply, diff --git a/webapp_search.py b/webapp_search.py index d88018ded..b138b682b 100644 --- a/webapp_search.py +++ b/webapp_search.py @@ -20,7 +20,7 @@ from utils import load_json from utils import get_domain_from_actor from utils import get_nickname_from_actor from utils import locate_post -from utils import isPublicPost +from utils import is_public_post from utils import first_paragraph_from_string from utils import search_box_posts from utils import get_alt_path @@ -839,7 +839,7 @@ def htmlHashtagSearch(css_cache: {}, if not post_json_object: index += 1 continue - if not isPublicPost(post_json_object): + if not is_public_post(post_json_object): index += 1 continue showIndividualPostIcons = False @@ -964,7 +964,7 @@ def rssHashtagSearch(nickname: str, domain: str, port: int, continue post_json_object = load_json(post_filename) if post_json_object: - if not isPublicPost(post_json_object): + if not is_public_post(post_json_object): index += 1 if index >= maxFeedLength: break