Skip to content

Commit 775756c

Browse files
committed
temporarily disable outboxes
for #1248
1 parent 7b0fd25 commit 775756c

File tree

2 files changed

+31
-20
lines changed

2 files changed

+31
-20
lines changed

activitypub.py

+25-20
Original file line numberDiff line numberDiff line change
@@ -1218,32 +1218,37 @@ def outbox(id):
12181218
objects, new_before, new_after = fetch_objects(query, by=Object.updated,
12191219
user=user)
12201220

1221-
# page
1222-
page = {
1223-
'type': 'CollectionPage',
1224-
'partOf': request.base_url,
1225-
'items': util.trim_nulls([ActivityPub.convert(obj, from_user=user)
1226-
for obj in objects]),
1227-
}
1228-
if new_before:
1229-
page['next'] = f'{request.base_url}?before={new_before}'
1230-
if new_after:
1231-
page['prev'] = f'{request.base_url}?after={new_after}'
1232-
1233-
if 'before' in request.args or 'after' in request.args:
1234-
page.update({
1235-
'@context': 'https://www.w3.org/ns/activitystreams',
1236-
'id': request.url,
1237-
})
1238-
logger.debug(f'Returning {json_dumps(page, indent=2)}')
1239-
return page, {'Content-Type': as2.CONTENT_TYPE_LD_PROFILE}
1221+
# TODO: bring this back once we filter it by author status, etc
1222+
# page = {
1223+
# 'type': 'CollectionPage',
1224+
# 'partOf': request.base_url,
1225+
# 'items': util.trim_nulls([ActivityPub.convert(obj, from_user=user)
1226+
# for obj in objects]),
1227+
# }
1228+
# if new_before:
1229+
# page['next'] = f'{request.base_url}?before={new_before}'
1230+
# if new_after:
1231+
# page['prev'] = f'{request.base_url}?after={new_after}'
1232+
1233+
# if 'before' in request.args or 'after' in request.args:
1234+
# page.update({
1235+
# '@context': 'https://www.w3.org/ns/activitystreams',
1236+
# 'id': request.url,
1237+
# })
1238+
# logger.debug(f'Returning {json_dumps(page, indent=2)}')
1239+
# return page, {'Content-Type': as2.CONTENT_TYPE_LD_PROFILE}
12401240

12411241
ret = {
12421242
'@context': 'https://www.w3.org/ns/activitystreams',
12431243
'id': request.url,
12441244
'type': 'OrderedCollection',
12451245
'summary': f"{id}'s outbox",
1246-
'first': page,
1246+
# 'first': page,
1247+
'first': {
1248+
'type': 'CollectionPage',
1249+
'partOf': request.base_url,
1250+
'items': [],
1251+
},
12471252
}
12481253

12491254
# count total if it's small, <= 1k. we should eventually precompute this

tests/test_activitypub.py

+6
Original file line numberDiff line numberDiff line change
@@ -1978,6 +1978,9 @@ def store_outbox_objects(self, user):
19781978
for i, obj in enumerate([REPLY, MENTION, LIKE, DELETE]):
19791979
self.store_object(id=obj['id'], users=[user.key], as2=obj)
19801980

1981+
# TODO once we're serving outboxes again
1982+
# https://github.com/snarfed/bridgy-fed/issues/1248
1983+
@skip
19811984
@patch('models.PAGE_SIZE', 2)
19821985
def test_outbox_fake_objects(self, *_):
19831986
user = self.make_user('fake:foo', cls=Fake)
@@ -2002,6 +2005,9 @@ def test_outbox_fake_objects(self, *_):
20022005
},
20032006
}, resp.json)
20042007

2008+
# TODO once we're serving outboxes again
2009+
# https://github.com/snarfed/bridgy-fed/issues/1248
2010+
@skip
20052011
@patch('models.PAGE_SIZE', 2)
20062012
def test_outbox_fake_objects_page(self, *_):
20072013
user = self.make_user('fake:foo', cls=Fake)

0 commit comments

Comments
 (0)