temporarily disable outboxes

for #1248
pull/1258/head
Ryan Barrett 2024-08-13 21:22:00 -07:00
rodzic 7b0fd25793
commit 775756c7b2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
2 zmienionych plików z 30 dodań i 19 usunięć

Wyświetl plik

@ -1218,32 +1218,37 @@ def outbox(id):
objects, new_before, new_after = fetch_objects(query, by=Object.updated,
user=user)
# page
page = {
'type': 'CollectionPage',
'partOf': request.base_url,
'items': util.trim_nulls([ActivityPub.convert(obj, from_user=user)
for obj in objects]),
}
if new_before:
page['next'] = f'{request.base_url}?before={new_before}'
if new_after:
page['prev'] = f'{request.base_url}?after={new_after}'
# TODO: bring this back once we filter it by author status, etc
# page = {
# 'type': 'CollectionPage',
# 'partOf': request.base_url,
# 'items': util.trim_nulls([ActivityPub.convert(obj, from_user=user)
# for obj in objects]),
# }
# if new_before:
# page['next'] = f'{request.base_url}?before={new_before}'
# if new_after:
# page['prev'] = f'{request.base_url}?after={new_after}'
if 'before' in request.args or 'after' in request.args:
page.update({
'@context': 'https://www.w3.org/ns/activitystreams',
'id': request.url,
})
logger.debug(f'Returning {json_dumps(page, indent=2)}')
return page, {'Content-Type': as2.CONTENT_TYPE_LD_PROFILE}
# if 'before' in request.args or 'after' in request.args:
# page.update({
# '@context': 'https://www.w3.org/ns/activitystreams',
# 'id': request.url,
# })
# logger.debug(f'Returning {json_dumps(page, indent=2)}')
# return page, {'Content-Type': as2.CONTENT_TYPE_LD_PROFILE}
ret = {
'@context': 'https://www.w3.org/ns/activitystreams',
'id': request.url,
'type': 'OrderedCollection',
'summary': f"{id}'s outbox",
'first': page,
# 'first': page,
'first': {
'type': 'CollectionPage',
'partOf': request.base_url,
'items': [],
},
}
# count total if it's small, <= 1k. we should eventually precompute this

Wyświetl plik

@ -1978,6 +1978,9 @@ class ActivityPubTest(TestCase):
for i, obj in enumerate([REPLY, MENTION, LIKE, DELETE]):
self.store_object(id=obj['id'], users=[user.key], as2=obj)
# TODO once we're serving outboxes again
# https://github.com/snarfed/bridgy-fed/issues/1248
@skip
@patch('models.PAGE_SIZE', 2)
def test_outbox_fake_objects(self, *_):
user = self.make_user('fake:foo', cls=Fake)
@ -2002,6 +2005,9 @@ class ActivityPubTest(TestCase):
},
}, resp.json)
# TODO once we're serving outboxes again
# https://github.com/snarfed/bridgy-fed/issues/1248
@skip
@patch('models.PAGE_SIZE', 2)
def test_outbox_fake_objects_page(self, *_):
user = self.make_user('fake:foo', cls=Fake)