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

Fix manual follower approval

merge-requests/30/head
Bob Mottram 2022-02-28 19:37:33 +00:00
parent 23a2fb8cf5
commit d14f31b883
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
follow.py
View File

@ -582,7 +582,7 @@ def follow_approval_required(base_dir: str, nickname_to_follow: str,
if os.path.isfile(actor_filename): if os.path.isfile(actor_filename):
actor = load_json(actor_filename) actor = load_json(actor_filename)
if actor: if actor:
if actor.get('manually_approves_followers'): if 'manuallyApprovesFollowers' in actor:
manually_approve_follows = actor['manuallyApprovesFollowers'] manually_approve_follows = actor['manuallyApprovesFollowers']
else: else:
if debug: if debug:
@ -757,8 +757,7 @@ def followed_account_accepts(session, base_dir: str, http_prefix: str,
# remove the follow request json # remove the follow request json
follow_activity_filename = \ follow_activity_filename = \
acct_dir(base_dir, nickname_to_follow, domain_to_follow) + \ acct_dir(base_dir, nickname_to_follow, domain_to_follow) + \
'/requests/' + \ '/requests/' + nickname + '@' + domain + '.follow'
nickname + '@' + domain + '.follow'
if os.path.isfile(follow_activity_filename): if os.path.isfile(follow_activity_filename):
try: try:
os.remove(follow_activity_filename) os.remove(follow_activity_filename)
@ -1454,7 +1453,7 @@ def follower_approval_active(base_dir: str,
if os.path.isfile(actor_filename): if os.path.isfile(actor_filename):
actor_json = load_json(actor_filename) actor_json = load_json(actor_filename)
if actor_json: if actor_json:
if actor_json.get('manuallyApprovesFollowers'): if 'manuallyApprovesFollowers' in actor_json:
manually_approves_followers = \ manually_approves_followers = \
actor_json['manuallyApprovesFollowers'] actor_json['manuallyApprovesFollowers']
return manually_approves_followers return manually_approves_followers