From f054570ee25fdd33cdd4770939c1c47c73ac9ddf Mon Sep 17 00:00:00 2001 From: Anthony Wang Date: Wed, 18 Jan 2023 20:33:39 +0000 Subject: [PATCH] Add to following collection only after receiving Accept activity --- server.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server.py b/server.py index cbd5602..c76b0e7 100644 --- a/server.py +++ b/server.py @@ -95,11 +95,16 @@ class fuwuqi(SimpleHTTPRequestHandler): if self.path.endswith('inbox'): # S2S - collection_append(f'users/{username}.inbox', activity) + collection_append(username, 'inbox', activity) + if activity['type'] == 'Accept' and activity['actor'] == activity['object']['object']: + # Follow request accepted + collection_append(username, 'following', activity['actor']) elif self.path.endswith('outbox'): # C2S - collection_append(f'users/{username}.outbox', activity) + collection_append(username, 'outbox', activity) # Clients responsible for addressing activity + if type(activity['to']) is not list: + activity['to'] = [activity['to']] for to in activity['to']: if 'followers' in to or to == 'https://www.w3.org/ns/activitystreams#Public': with open(f'users/{username}.followers') as f: @@ -116,9 +121,6 @@ class fuwuqi(SimpleHTTPRequestHandler): elif activity['type'] == 'Accept': # Accept follow request collection_append(username, 'followers', activity['object']['actor']) - elif activity['type'] == 'Follow': - # Follow request - collection_append(username, 'following', activity['object']) elif activity['type'] == 'Like': # Like post collection_append(username, 'liked', activity['object'])