indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Less indentation

merge-requests/30/head
Bob Mottram 2024-07-04 11:16:10 +01:00
parent 5590d33d88
commit f6e245da08
1 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
manualapprove.py
View File

@ -221,34 +221,38 @@ def manual_approve_follow_request(session, session_onion, session_i2p,
encoding='utf-8') as approvefile: encoding='utf-8') as approvefile:
for handle_of_follow_requester in approvefile: for handle_of_follow_requester in approvefile:
# is this the approved follow? # is this the approved follow?
if handle_of_follow_requester.startswith(approve_handle_full): approve_handl = approve_handle_full
if not handle_of_follow_requester.startswith(approve_handl):
# this isn't the approved follow so it will remain
# in the requests file
approvefilenew.write(handle_of_follow_requester)
continue
handle_of_follow_requester = \ handle_of_follow_requester = \
remove_eol(handle_of_follow_requester) remove_eol(handle_of_follow_requester)
handle_of_follow_requester = \ handle_of_follow_requester = \
handle_of_follow_requester.replace('\r', '') handle_of_follow_requester.replace('\r', '')
port2 = port port2 = port
if ':' in handle_of_follow_requester: if ':' in handle_of_follow_requester:
port2 = \ port2 = get_port_from_domain(handle_of_follow_requester)
get_port_from_domain(handle_of_follow_requester)
requests_dir = account_dir + '/requests' requests_dir = account_dir + '/requests'
follow_activity_filename = \ follow_activity_filename = \
requests_dir + '/' + \ requests_dir + '/' + handle_of_follow_requester + '.follow'
handle_of_follow_requester + '.follow' if not os.path.isfile(follow_activity_filename):
if os.path.isfile(follow_activity_filename): update_approved_followers = True
continue
follow_json = load_json(follow_activity_filename) follow_json = load_json(follow_activity_filename)
if follow_json: if not follow_json:
update_approved_followers = True
continue
approve_nickname = approve_handle.split('@')[0] approve_nickname = approve_handle.split('@')[0]
approve_domain = approve_handle.split('@')[1] approve_domain = approve_handle.split('@')[1]
approve_domain = \ approve_domain = remove_eol(approve_domain)
remove_eol(approve_domain) approve_domain = approve_domain.replace('\r', '')
approve_domain = \
approve_domain.replace('\r', '')
approve_port = port2 approve_port = port2
if ':' in approve_domain: if ':' in approve_domain:
approve_port = \ approve_port = get_port_from_domain(approve_domain)
get_port_from_domain(approve_domain) approve_domain = remove_domain_port(approve_domain)
approve_domain = \
remove_domain_port(approve_domain)
curr_domain = domain curr_domain = domain
curr_port = port curr_port = port
@ -304,10 +308,6 @@ def manual_approve_follow_request(session, session_onion, session_i2p,
sites_unavailable, sites_unavailable,
system_language) system_language)
update_approved_followers = True update_approved_followers = True
else:
# this isn't the approved follow so it will remain
# in the requests file
approvefilenew.write(handle_of_follow_requester)
followers_filename = account_dir + '/followers.txt' followers_filename = account_dir + '/followers.txt'
if update_approved_followers: if update_approved_followers: