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

'author' users path for pixelfed

merge-requests/30/head
Bob Mottram 2022-03-28 22:45:11 +01:00
parent 70cb0f6299
commit 7857b3f369
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epicyon.py
View File

@ -2314,6 +2314,10 @@ if args.followers:
nickname = args.followers.split('/profile/')[1] nickname = args.followers.split('/profile/')[1]
nickname = nickname.replace('\n', '').replace('\r', '') nickname = nickname.replace('\n', '').replace('\r', '')
domain = args.followers.split('/profile/')[0] 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: elif '/channel/' in args.followers:
nickname = args.followers.split('/channel/')[1] nickname = args.followers.split('/channel/')[1]
nickname = nickname.replace('\n', '').replace('\r', '') 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('/accounts/', '/actor/')
person_url = person_url.replace('/channel/', '/actor/') person_url = person_url.replace('/channel/', '/actor/')
person_url = person_url.replace('/profile/', '/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('/u/', '/actor/')
person_url = person_url.replace('/c/', '/actor/') person_url = person_url.replace('/c/', '/actor/')
if not person_url: if not person_url:

5
inbox.py
View File

@ -4068,7 +4068,8 @@ def _receive_follow_request(session, session_onion, session_i2p,
return False return False
if not has_users_path(message_json['actor']): if not has_users_path(message_json['actor']):
if debug: if debug:
print('DEBUG: users/profile/accounts/channel missing from actor') print('DEBUG: ' +
'users/profile/author/accounts/channel missing from actor')
return False return False
domain, temp_port = get_domain_from_actor(message_json['actor']) domain, temp_port = get_domain_from_actor(message_json['actor'])
from_port = port from_port = port
@ -4090,7 +4091,7 @@ def _receive_follow_request(session, session_onion, session_i2p,
message_json['to'] = message_json['object'] message_json['to'] = message_json['object']
if not has_users_path(message_json['object']): if not has_users_path(message_json['object']):
if debug: if debug:
print('DEBUG: users/profile/channel/accounts ' + print('DEBUG: users/profile/author/channel/accounts ' +
'not found within object') 'not found within object')
return False return False
domain_to_follow, temp_port = get_domain_from_actor(message_json['object']) domain_to_follow, temp_port = get_domain_from_actor(message_json['object'])

4
utils.py
View File

@ -1139,7 +1139,7 @@ def get_user_paths() -> []:
e.g. /users/nickname, /channel/nickname e.g. /users/nickname, /channel/nickname
""" """
return ('/users/', '/profile/', '/accounts/', '/channel/', '/u/', return ('/users/', '/profile/', '/accounts/', '/channel/', '/u/',
'/c/', '/video-channels/') '/c/', '/video-channels/', '/author/')
def get_group_paths() -> []: def get_group_paths() -> []:
@ -1943,7 +1943,7 @@ def _get_reserved_words() -> str:
'activity', 'undo', 'pinned', 'activity', 'undo', 'pinned',
'actor', 'Actor', 'instance.actor', 'actor', 'Actor', 'instance.actor',
'reply', 'replies', 'question', 'like', 'reply', 'replies', 'question', 'like',
'likes', 'users', 'statuses', 'tags', 'likes', 'users', 'statuses', 'tags', 'author',
'accounts', 'headers', 'accounts', 'headers',
'channels', 'profile', 'u', 'c', 'channels', 'profile', 'u', 'c',
'updates', 'repeat', 'announce', 'updates', 'repeat', 'announce',