mirror of https://gitlab.com/bashrc2/epicyon
Snake case
parent
b99cc2ecb1
commit
0d9e2748b1
260
manualapprove.py
260
manualapprove.py
|
|
@ -22,61 +22,61 @@ from threads import thread_with_trace
|
|||
def manual_deny_follow_request(session, base_dir: str,
|
||||
http_prefix: str,
|
||||
nickname: str, domain: str, port: int,
|
||||
denyHandle: str,
|
||||
deny_handle: str,
|
||||
federation_list: [],
|
||||
send_threads: [], postLog: [],
|
||||
send_threads: [], post_log: [],
|
||||
cached_webfingers: {}, person_cache: {},
|
||||
debug: bool,
|
||||
project_version: str,
|
||||
signing_priv_key_pem: str) -> None:
|
||||
"""Manually deny a follow request
|
||||
"""
|
||||
accountsDir = acct_dir(base_dir, nickname, domain)
|
||||
accounts_dir = acct_dir(base_dir, nickname, domain)
|
||||
|
||||
# has this handle already been rejected?
|
||||
rejectedFollowsFilename = accountsDir + '/followrejects.txt'
|
||||
if os.path.isfile(rejectedFollowsFilename):
|
||||
if denyHandle in open(rejectedFollowsFilename).read():
|
||||
rejected_follows_filename = accounts_dir + '/followrejects.txt'
|
||||
if os.path.isfile(rejected_follows_filename):
|
||||
if deny_handle in open(rejected_follows_filename).read():
|
||||
remove_from_follow_requests(base_dir, nickname, domain,
|
||||
denyHandle, debug)
|
||||
print(denyHandle + ' has already been rejected as a follower of ' +
|
||||
deny_handle, debug)
|
||||
print(deny_handle + ' has already been rejected as a follower of ' +
|
||||
nickname)
|
||||
return
|
||||
|
||||
remove_from_follow_requests(base_dir, nickname, domain, denyHandle, debug)
|
||||
remove_from_follow_requests(base_dir, nickname, domain, deny_handle, debug)
|
||||
|
||||
# Store rejected follows
|
||||
try:
|
||||
with open(rejectedFollowsFilename, 'a+') as rejectsFile:
|
||||
rejectsFile.write(denyHandle + '\n')
|
||||
with open(rejected_follows_filename, 'a+') as rejects_file:
|
||||
rejects_file.write(deny_handle + '\n')
|
||||
except OSError:
|
||||
print('EX: unable to append ' + rejectedFollowsFilename)
|
||||
print('EX: unable to append ' + rejected_follows_filename)
|
||||
|
||||
denyNickname = denyHandle.split('@')[0]
|
||||
denyDomain = \
|
||||
denyHandle.split('@')[1].replace('\n', '').replace('\r', '')
|
||||
denyPort = port
|
||||
if ':' in denyDomain:
|
||||
denyPort = get_port_from_domain(denyDomain)
|
||||
denyDomain = remove_domain_port(denyDomain)
|
||||
deny_nickname = deny_handle.split('@')[0]
|
||||
deny_domain = \
|
||||
deny_handle.split('@')[1].replace('\n', '').replace('\r', '')
|
||||
deny_port = port
|
||||
if ':' in deny_domain:
|
||||
deny_port = get_port_from_domain(deny_domain)
|
||||
deny_domain = remove_domain_port(deny_domain)
|
||||
followed_account_rejects(session, base_dir, http_prefix,
|
||||
nickname, domain, port,
|
||||
denyNickname, denyDomain, denyPort,
|
||||
deny_nickname, deny_domain, deny_port,
|
||||
federation_list,
|
||||
send_threads, postLog,
|
||||
send_threads, post_log,
|
||||
cached_webfingers, person_cache,
|
||||
debug, project_version,
|
||||
signing_priv_key_pem)
|
||||
|
||||
print('Follow request from ' + denyHandle + ' was denied.')
|
||||
print('Follow request from ' + deny_handle + ' was denied.')
|
||||
|
||||
|
||||
def manual_deny_follow_request_thread(session, base_dir: str,
|
||||
http_prefix: str,
|
||||
nickname: str, domain: str, port: int,
|
||||
denyHandle: str,
|
||||
deny_handle: str,
|
||||
federation_list: [],
|
||||
send_threads: [], postLog: [],
|
||||
send_threads: [], post_log: [],
|
||||
cached_webfingers: {}, person_cache: {},
|
||||
debug: bool,
|
||||
project_version: str,
|
||||
|
|
@ -89,9 +89,9 @@ def manual_deny_follow_request_thread(session, base_dir: str,
|
|||
args=(session, base_dir,
|
||||
http_prefix,
|
||||
nickname, domain, port,
|
||||
denyHandle,
|
||||
deny_handle,
|
||||
federation_list,
|
||||
send_threads, postLog,
|
||||
send_threads, post_log,
|
||||
cached_webfingers, person_cache,
|
||||
debug,
|
||||
project_version,
|
||||
|
|
@ -100,32 +100,32 @@ def manual_deny_follow_request_thread(session, base_dir: str,
|
|||
send_threads.append(thr)
|
||||
|
||||
|
||||
def _approve_follower_handle(accountDir: str, approveHandle: str) -> None:
|
||||
def _approve_follower_handle(account_dir: str, approve_handle: str) -> None:
|
||||
""" Record manually approved handles so that if they unfollow and then
|
||||
re-follow later then they don't need to be manually approved again
|
||||
"""
|
||||
approvedFilename = accountDir + '/approved.txt'
|
||||
if os.path.isfile(approvedFilename):
|
||||
if approveHandle not in open(approvedFilename).read():
|
||||
approved_filename = account_dir + '/approved.txt'
|
||||
if os.path.isfile(approved_filename):
|
||||
if approve_handle not in open(approved_filename).read():
|
||||
try:
|
||||
with open(approvedFilename, 'a+') as approvedFile:
|
||||
approvedFile.write(approveHandle + '\n')
|
||||
with open(approved_filename, 'a+') as approved_file:
|
||||
approved_file.write(approve_handle + '\n')
|
||||
except OSError:
|
||||
print('EX: unable to append ' + approvedFilename)
|
||||
print('EX: unable to append ' + approved_filename)
|
||||
else:
|
||||
try:
|
||||
with open(approvedFilename, 'w+') as approvedFile:
|
||||
approvedFile.write(approveHandle + '\n')
|
||||
with open(approved_filename, 'w+') as approved_file:
|
||||
approved_file.write(approve_handle + '\n')
|
||||
except OSError:
|
||||
print('EX: unable to write ' + approvedFilename)
|
||||
print('EX: unable to write ' + approved_filename)
|
||||
|
||||
|
||||
def manual_approve_follow_request(session, base_dir: str,
|
||||
http_prefix: str,
|
||||
nickname: str, domain: str, port: int,
|
||||
approveHandle: str,
|
||||
approve_handle: str,
|
||||
federation_list: [],
|
||||
send_threads: [], postLog: [],
|
||||
send_threads: [], post_log: [],
|
||||
cached_webfingers: {}, person_cache: {},
|
||||
debug: bool,
|
||||
project_version: str,
|
||||
|
|
@ -134,157 +134,159 @@ def manual_approve_follow_request(session, base_dir: str,
|
|||
"""
|
||||
handle = nickname + '@' + domain
|
||||
print('Manual follow accept: ' + handle +
|
||||
' approving follow request from ' + approveHandle)
|
||||
accountDir = base_dir + '/accounts/' + handle
|
||||
approveFollowsFilename = accountDir + '/followrequests.txt'
|
||||
if not os.path.isfile(approveFollowsFilename):
|
||||
' approving follow request from ' + approve_handle)
|
||||
account_dir = base_dir + '/accounts/' + handle
|
||||
approve_follows_filename = account_dir + '/followrequests.txt'
|
||||
if not os.path.isfile(approve_follows_filename):
|
||||
print('Manual follow accept: follow requests file ' +
|
||||
approveFollowsFilename + ' not found')
|
||||
approve_follows_filename + ' not found')
|
||||
return
|
||||
|
||||
# is the handle in the requests file?
|
||||
approveFollowsStr = ''
|
||||
with open(approveFollowsFilename, 'r') as fpFollowers:
|
||||
approveFollowsStr = fpFollowers.read()
|
||||
approve_follows_str = ''
|
||||
with open(approve_follows_filename, 'r') as fp_foll:
|
||||
approve_follows_str = fp_foll.read()
|
||||
exists = False
|
||||
approveHandleFull = approveHandle
|
||||
if approveHandle in approveFollowsStr:
|
||||
approve_handle_full = approve_handle
|
||||
if approve_handle in approve_follows_str:
|
||||
exists = True
|
||||
elif '@' in approveHandle:
|
||||
elif '@' in approve_handle:
|
||||
group_account = False
|
||||
if approveHandle.startswith('!'):
|
||||
if approve_handle.startswith('!'):
|
||||
group_account = True
|
||||
reqNick = approveHandle.split('@')[0].replace('!', '')
|
||||
reqDomain = approveHandle.split('@')[1].strip()
|
||||
reqPrefix = http_prefix + '://' + reqDomain
|
||||
req_nick = approve_handle.split('@')[0].replace('!', '')
|
||||
req_domain = approve_handle.split('@')[1].strip()
|
||||
req_prefix = http_prefix + '://' + req_domain
|
||||
paths = get_user_paths()
|
||||
for userPath in paths:
|
||||
if reqPrefix + userPath + reqNick in approveFollowsStr:
|
||||
for user_path in paths:
|
||||
if req_prefix + user_path + req_nick in approve_follows_str:
|
||||
exists = True
|
||||
approveHandleFull = reqPrefix + userPath + reqNick
|
||||
approve_handle_full = req_prefix + user_path + req_nick
|
||||
if group_account:
|
||||
approveHandleFull = '!' + approveHandleFull
|
||||
approve_handle_full = '!' + approve_handle_full
|
||||
break
|
||||
if not exists:
|
||||
print('Manual follow accept: ' + approveHandleFull +
|
||||
print('Manual follow accept: ' + approve_handle_full +
|
||||
' not in requests file "' +
|
||||
approveFollowsStr.replace('\n', ' ') +
|
||||
'" ' + approveFollowsFilename)
|
||||
approve_follows_str.replace('\n', ' ') +
|
||||
'" ' + approve_follows_filename)
|
||||
return
|
||||
|
||||
with open(approveFollowsFilename + '.new', 'w+') as approvefilenew:
|
||||
updateApprovedFollowers = False
|
||||
followActivityfilename = None
|
||||
with open(approveFollowsFilename, 'r') as approvefile:
|
||||
for handleOfFollowRequester in approvefile:
|
||||
with open(approve_follows_filename + '.new', 'w+') as approvefilenew:
|
||||
update_approved_followers = False
|
||||
follow_activity_filename = None
|
||||
with open(approve_follows_filename, 'r') as approvefile:
|
||||
for handle_of_follow_requester in approvefile:
|
||||
# is this the approved follow?
|
||||
if handleOfFollowRequester.startswith(approveHandleFull):
|
||||
handleOfFollowRequester = \
|
||||
handleOfFollowRequester.replace('\n', '')
|
||||
handleOfFollowRequester = \
|
||||
handleOfFollowRequester.replace('\r', '')
|
||||
if handle_of_follow_requester.startswith(approve_handle_full):
|
||||
handle_of_follow_requester = \
|
||||
handle_of_follow_requester.replace('\n', '')
|
||||
handle_of_follow_requester = \
|
||||
handle_of_follow_requester.replace('\r', '')
|
||||
port2 = port
|
||||
if ':' in handleOfFollowRequester:
|
||||
port2 = get_port_from_domain(handleOfFollowRequester)
|
||||
requestsDir = accountDir + '/requests'
|
||||
followActivityfilename = \
|
||||
requestsDir + '/' + handleOfFollowRequester + '.follow'
|
||||
if os.path.isfile(followActivityfilename):
|
||||
followJson = load_json(followActivityfilename)
|
||||
if followJson:
|
||||
approveNickname = approveHandle.split('@')[0]
|
||||
approveDomain = approveHandle.split('@')[1]
|
||||
approveDomain = \
|
||||
approveDomain.replace('\n', '')
|
||||
approveDomain = \
|
||||
approveDomain.replace('\r', '')
|
||||
approvePort = port2
|
||||
if ':' in approveDomain:
|
||||
approvePort = \
|
||||
get_port_from_domain(approveDomain)
|
||||
approveDomain = \
|
||||
remove_domain_port(approveDomain)
|
||||
if ':' in handle_of_follow_requester:
|
||||
port2 = \
|
||||
get_port_from_domain(handle_of_follow_requester)
|
||||
requests_dir = account_dir + '/requests'
|
||||
follow_activity_filename = \
|
||||
requests_dir + '/' + \
|
||||
handle_of_follow_requester + '.follow'
|
||||
if os.path.isfile(follow_activity_filename):
|
||||
follow_json = load_json(follow_activity_filename)
|
||||
if follow_json:
|
||||
approve_nickname = approve_handle.split('@')[0]
|
||||
approve_domain = approve_handle.split('@')[1]
|
||||
approve_domain = \
|
||||
approve_domain.replace('\n', '')
|
||||
approve_domain = \
|
||||
approve_domain.replace('\r', '')
|
||||
approve_port = port2
|
||||
if ':' in approve_domain:
|
||||
approve_port = \
|
||||
get_port_from_domain(approve_domain)
|
||||
approve_domain = \
|
||||
remove_domain_port(approve_domain)
|
||||
print('Manual follow accept: Sending Accept for ' +
|
||||
handle + ' follow request from ' +
|
||||
approveNickname + '@' + approveDomain)
|
||||
approve_nickname + '@' + approve_domain)
|
||||
followed_account_accepts(session, base_dir,
|
||||
http_prefix,
|
||||
nickname, domain, port,
|
||||
approveNickname,
|
||||
approveDomain,
|
||||
approvePort,
|
||||
followJson['actor'],
|
||||
approve_nickname,
|
||||
approve_domain,
|
||||
approve_port,
|
||||
follow_json['actor'],
|
||||
federation_list,
|
||||
followJson,
|
||||
send_threads, postLog,
|
||||
follow_json,
|
||||
send_threads, post_log,
|
||||
cached_webfingers,
|
||||
person_cache,
|
||||
debug,
|
||||
project_version, False,
|
||||
signing_priv_key_pem)
|
||||
updateApprovedFollowers = True
|
||||
update_approved_followers = True
|
||||
else:
|
||||
# this isn't the approved follow so it will remain
|
||||
# in the requests file
|
||||
approvefilenew.write(handleOfFollowRequester)
|
||||
approvefilenew.write(handle_of_follow_requester)
|
||||
|
||||
followersFilename = accountDir + '/followers.txt'
|
||||
if updateApprovedFollowers:
|
||||
followers_filename = account_dir + '/followers.txt'
|
||||
if update_approved_followers:
|
||||
# update the followers
|
||||
print('Manual follow accept: updating ' + followersFilename)
|
||||
if os.path.isfile(followersFilename):
|
||||
if approveHandleFull not in open(followersFilename).read():
|
||||
print('Manual follow accept: updating ' + followers_filename)
|
||||
if os.path.isfile(followers_filename):
|
||||
if approve_handle_full not in open(followers_filename).read():
|
||||
try:
|
||||
with open(followersFilename, 'r+') as followersFile:
|
||||
content = followersFile.read()
|
||||
if approveHandleFull + '\n' not in content:
|
||||
followersFile.seek(0, 0)
|
||||
followersFile.write(approveHandleFull + '\n' +
|
||||
content)
|
||||
with open(followers_filename, 'r+') as followers_file:
|
||||
content = followers_file.read()
|
||||
if approve_handle_full + '\n' not in content:
|
||||
followers_file.seek(0, 0)
|
||||
followers_file.write(approve_handle_full + '\n' +
|
||||
content)
|
||||
except Exception as ex:
|
||||
print('WARN: Manual follow accept. ' +
|
||||
'Failed to write entry to followers file ' + str(ex))
|
||||
else:
|
||||
print('WARN: Manual follow accept: ' + approveHandleFull +
|
||||
' already exists in ' + followersFilename)
|
||||
print('WARN: Manual follow accept: ' + approve_handle_full +
|
||||
' already exists in ' + followers_filename)
|
||||
else:
|
||||
print('Manual follow accept: first follower accepted for ' +
|
||||
handle + ' is ' + approveHandleFull)
|
||||
handle + ' is ' + approve_handle_full)
|
||||
try:
|
||||
with open(followersFilename, 'w+') as followersFile:
|
||||
followersFile.write(approveHandleFull + '\n')
|
||||
with open(followers_filename, 'w+') as followers_file:
|
||||
followers_file.write(approve_handle_full + '\n')
|
||||
except OSError:
|
||||
print('EX: unable to write ' + followersFilename)
|
||||
print('EX: unable to write ' + followers_filename)
|
||||
|
||||
# only update the follow requests file if the follow is confirmed to be
|
||||
# in followers.txt
|
||||
if approveHandleFull in open(followersFilename).read():
|
||||
if approve_handle_full in open(followers_filename).read():
|
||||
# mark this handle as approved for following
|
||||
_approve_follower_handle(accountDir, approveHandle)
|
||||
_approve_follower_handle(account_dir, approve_handle)
|
||||
# update the follow requests with the handles not yet approved
|
||||
os.rename(approveFollowsFilename + '.new', approveFollowsFilename)
|
||||
os.rename(approve_follows_filename + '.new', approve_follows_filename)
|
||||
# remove the .follow file
|
||||
if followActivityfilename:
|
||||
if os.path.isfile(followActivityfilename):
|
||||
if follow_activity_filename:
|
||||
if os.path.isfile(follow_activity_filename):
|
||||
try:
|
||||
os.remove(followActivityfilename)
|
||||
os.remove(follow_activity_filename)
|
||||
except OSError:
|
||||
print('EX: manual_approve_follow_request ' +
|
||||
'unable to delete ' + followActivityfilename)
|
||||
'unable to delete ' + follow_activity_filename)
|
||||
else:
|
||||
try:
|
||||
os.remove(approveFollowsFilename + '.new')
|
||||
os.remove(approve_follows_filename + '.new')
|
||||
except OSError:
|
||||
print('EX: manual_approve_follow_request unable to delete ' +
|
||||
approveFollowsFilename + '.new')
|
||||
approve_follows_filename + '.new')
|
||||
|
||||
|
||||
def manual_approve_follow_request_thread(session, base_dir: str,
|
||||
http_prefix: str,
|
||||
nickname: str, domain: str, port: int,
|
||||
approveHandle: str,
|
||||
approve_handle: str,
|
||||
federation_list: [],
|
||||
send_threads: [], postLog: [],
|
||||
send_threads: [], post_log: [],
|
||||
cached_webfingers: {},
|
||||
person_cache: {},
|
||||
debug: bool,
|
||||
|
|
@ -298,9 +300,9 @@ def manual_approve_follow_request_thread(session, base_dir: str,
|
|||
args=(session, base_dir,
|
||||
http_prefix,
|
||||
nickname, domain, port,
|
||||
approveHandle,
|
||||
approve_handle,
|
||||
federation_list,
|
||||
send_threads, postLog,
|
||||
send_threads, post_log,
|
||||
cached_webfingers, person_cache,
|
||||
debug,
|
||||
project_version,
|
||||
|
|
|
|||
Loading…
Reference in New Issue