minimize g.user in activitypub.actor

for #690
pull/731/head
Ryan Barrett 2023-11-19 21:52:05 -08:00
rodzic 2c6a470058
commit eb7da31873
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
1 zmienionych plików z 10 dodań i 9 usunięć

Wyświetl plik

@ -787,21 +787,22 @@ def actor(handle_or_id):
id = handle_or_id id = handle_or_id
assert id assert id
g.user = cls.get_or_create(id) user = cls.get_or_create(id)
if not g.user.obj or not g.user.obj.as1: if not user.obj or not user.obj.as1:
g.user.obj = cls.load(g.user.profile_id(), gateway=True) user.obj = cls.load(user.profile_id(), gateway=True)
actor = ActivityPub.convert(g.user.obj) or { g.user = user
actor = ActivityPub.convert(user.obj) or {
'@context': [as2.CONTEXT], '@context': [as2.CONTEXT],
'type': 'Person', 'type': 'Person',
} }
actor = postprocess_as2(actor) actor = postprocess_as2(actor)
actor.update({ actor.update({
'id': g.user.ap_actor(), 'id': user.ap_actor(),
'inbox': g.user.ap_actor('inbox'), 'inbox': user.ap_actor('inbox'),
'outbox': g.user.ap_actor('outbox'), 'outbox': user.ap_actor('outbox'),
'following': g.user.ap_actor('following'), 'following': user.ap_actor('following'),
'followers': g.user.ap_actor('followers'), 'followers': user.ap_actor('followers'),
'endpoints': { 'endpoints': {
'sharedInbox': subdomain_wrap(cls, '/ap/sharedInbox'), 'sharedInbox': subdomain_wrap(cls, '/ap/sharedInbox'),
}, },