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