diff --git a/epicyon.py b/epicyon.py index 9590c433a..2f8bb5875 100644 --- a/epicyon.py +++ b/epicyon.py @@ -2314,6 +2314,10 @@ if args.followers: nickname = args.followers.split('/profile/')[1] nickname = nickname.replace('\n', '').replace('\r', '') domain = args.followers.split('/profile/')[0] + elif '/author/' in args.followers: + nickname = args.followers.split('/author/')[1] + nickname = nickname.replace('\n', '').replace('\r', '') + domain = args.followers.split('/author/')[0] elif '/channel/' in args.followers: nickname = args.followers.split('/channel/')[1] nickname = nickname.replace('\n', '').replace('\r', '') @@ -2401,6 +2405,7 @@ if args.followers: person_url = person_url.replace('/accounts/', '/actor/') person_url = person_url.replace('/channel/', '/actor/') person_url = person_url.replace('/profile/', '/actor/') + person_url = person_url.replace('/author/', '/actor/') person_url = person_url.replace('/u/', '/actor/') person_url = person_url.replace('/c/', '/actor/') if not person_url: diff --git a/inbox.py b/inbox.py index 87a6f16f3..f5cce538b 100644 --- a/inbox.py +++ b/inbox.py @@ -4068,7 +4068,8 @@ def _receive_follow_request(session, session_onion, session_i2p, return False if not has_users_path(message_json['actor']): if debug: - print('DEBUG: users/profile/accounts/channel missing from actor') + print('DEBUG: ' + + 'users/profile/author/accounts/channel missing from actor') return False domain, temp_port = get_domain_from_actor(message_json['actor']) from_port = port @@ -4090,7 +4091,7 @@ def _receive_follow_request(session, session_onion, session_i2p, message_json['to'] = message_json['object'] if not has_users_path(message_json['object']): if debug: - print('DEBUG: users/profile/channel/accounts ' + + print('DEBUG: users/profile/author/channel/accounts ' + 'not found within object') return False domain_to_follow, temp_port = get_domain_from_actor(message_json['object']) diff --git a/utils.py b/utils.py index e65cb083e..7a93dd934 100644 --- a/utils.py +++ b/utils.py @@ -1139,7 +1139,7 @@ def get_user_paths() -> []: e.g. /users/nickname, /channel/nickname """ return ('/users/', '/profile/', '/accounts/', '/channel/', '/u/', - '/c/', '/video-channels/') + '/c/', '/video-channels/', '/author/') def get_group_paths() -> []: @@ -1943,7 +1943,7 @@ def _get_reserved_words() -> str: 'activity', 'undo', 'pinned', 'actor', 'Actor', 'instance.actor', 'reply', 'replies', 'question', 'like', - 'likes', 'users', 'statuses', 'tags', + 'likes', 'users', 'statuses', 'tags', 'author', 'accounts', 'headers', 'channels', 'profile', 'u', 'c', 'updates', 'repeat', 'announce',