Snake case

merge-requests/30/head
Bob Mottram 2021-12-26 18:14:21 +00:00
parent ad4b988f4c
commit 1b64e604ca
5 changed files with 13 additions and 12 deletions

View File

@ -66,7 +66,7 @@ from tests import runAllTests
from auth import storeBasicCredentials from auth import storeBasicCredentials
from auth import createPassword from auth import createPassword
from utils import removeDomainPort from utils import removeDomainPort
from utils import getPortFromDomain from utils import get_port_from_domain
from utils import has_users_path from utils import has_users_path
from utils import get_full_domain from utils import get_full_domain
from utils import setConfigParam from utils import setConfigParam
@ -1277,7 +1277,7 @@ if args.message:
toDomain = toDomain.replace('\n', '').replace('\r', '') toDomain = toDomain.replace('\n', '').replace('\r', '')
toPort = 443 toPort = 443
if ':' in toDomain: if ':' in toDomain:
toPort = getPortFromDomain(toDomain) toPort = get_port_from_domain(toDomain)
toDomain = removeDomainPort(toDomain) toDomain = removeDomainPort(toDomain)
else: else:
if args.sendto.endswith('followers'): if args.sendto.endswith('followers'):

View File

@ -31,7 +31,7 @@ from utils import get_user_paths
from utils import get_base_content_from_post from utils import get_base_content_from_post
from utils import acct_dir from utils import acct_dir
from utils import removeDomainPort from utils import removeDomainPort
from utils import getPortFromDomain from utils import get_port_from_domain
from utils import has_object_dict from utils import has_object_dict
from utils import dmAllowedFromDomain from utils import dmAllowedFromDomain
from utils import isRecentPost from utils import isRecentPost
@ -2830,7 +2830,7 @@ def _bounceDM(senderPostId: str, session, http_prefix: str,
senderDomain = sendingHandle.split('@')[1] senderDomain = sendingHandle.split('@')[1]
senderPort = port senderPort = port
if ':' in senderDomain: if ':' in senderDomain:
senderPort = getPortFromDomain(senderDomain) senderPort = get_port_from_domain(senderDomain)
senderDomain = removeDomainPort(senderDomain) senderDomain = removeDomainPort(senderDomain)
cc = [] cc = []

View File

@ -13,7 +13,7 @@ from follow import followedAccountRejects
from follow import removeFromFollowRequests from follow import removeFromFollowRequests
from utils import load_json from utils import load_json
from utils import removeDomainPort from utils import removeDomainPort
from utils import getPortFromDomain from utils import get_port_from_domain
from utils import get_user_paths from utils import get_user_paths
from utils import acct_dir from utils import acct_dir
from threads import threadWithTrace from threads import threadWithTrace
@ -57,7 +57,7 @@ def manualDenyFollowRequest(session, base_dir: str,
denyHandle.split('@')[1].replace('\n', '').replace('\r', '') denyHandle.split('@')[1].replace('\n', '').replace('\r', '')
denyPort = port denyPort = port
if ':' in denyDomain: if ':' in denyDomain:
denyPort = getPortFromDomain(denyDomain) denyPort = get_port_from_domain(denyDomain)
denyDomain = removeDomainPort(denyDomain) denyDomain = removeDomainPort(denyDomain)
followedAccountRejects(session, base_dir, http_prefix, followedAccountRejects(session, base_dir, http_prefix,
nickname, domain, port, nickname, domain, port,
@ -185,7 +185,7 @@ def manualApproveFollowRequest(session, base_dir: str,
handleOfFollowRequester.replace('\r', '') handleOfFollowRequester.replace('\r', '')
port2 = port port2 = port
if ':' in handleOfFollowRequester: if ':' in handleOfFollowRequester:
port2 = getPortFromDomain(handleOfFollowRequester) port2 = get_port_from_domain(handleOfFollowRequester)
requestsDir = accountDir + '/requests' requestsDir = accountDir + '/requests'
followActivityfilename = \ followActivityfilename = \
requestsDir + '/' + handleOfFollowRequester + '.follow' requestsDir + '/' + handleOfFollowRequester + '.follow'
@ -200,7 +200,8 @@ def manualApproveFollowRequest(session, base_dir: str,
approveDomain.replace('\r', '') approveDomain.replace('\r', '')
approvePort = port2 approvePort = port2
if ':' in approveDomain: if ':' in approveDomain:
approvePort = getPortFromDomain(approveDomain) approvePort = \
get_port_from_domain(approveDomain)
approveDomain = removeDomainPort(approveDomain) approveDomain = removeDomainPort(approveDomain)
print('Manual follow accept: Sending Accept for ' + print('Manual follow accept: Sending Accept for ' +
handle + ' follow request from ' + handle + ' follow request from ' +

View File

@ -40,7 +40,7 @@ from utils import replace_users_with_at
from utils import has_group_type from utils import has_group_type
from utils import get_base_content_from_post from utils import get_base_content_from_post
from utils import removeDomainPort from utils import removeDomainPort
from utils import getPortFromDomain from utils import get_port_from_domain
from utils import has_object_dict from utils import has_object_dict
from utils import rejectPostId from utils import rejectPostId
from utils import removeInvalidChars from utils import removeInvalidChars
@ -3171,7 +3171,7 @@ def sendToFollowers(session, base_dir: str,
index = 0 index = 0
toDomain = followerHandles[index].split('@')[1] toDomain = followerHandles[index].split('@')[1]
if ':' in toDomain: if ':' in toDomain:
toPort = getPortFromDomain(toDomain) toPort = get_port_from_domain(toDomain)
toDomain = removeDomainPort(toDomain) toDomain = removeDomainPort(toDomain)
cc = '' cc = ''

View File

@ -1097,7 +1097,7 @@ def getDomainFromActor(actor: str) -> (str, int):
if '/' in actor: if '/' in actor:
domain = domain.split('/')[0] domain = domain.split('/')[0]
if ':' in domain: if ':' in domain:
port = getPortFromDomain(domain) port = get_port_from_domain(domain)
domain = removeDomainPort(domain) domain = removeDomainPort(domain)
return domain, port return domain, port
@ -2920,7 +2920,7 @@ def removeDomainPort(domain: str) -> str:
return domain return domain
def getPortFromDomain(domain: str) -> int: def get_port_from_domain(domain: str) -> int:
"""If the domain has a port number appended then return it """If the domain has a port number appended then return it
eg. mydomain.com:80 returns 80 eg. mydomain.com:80 returns 80
""" """