kaslo/synapse
1
0
Fork 0
Code Packages Releases 124 Wiki Activity

linting & fix tests

Browse Source
This commit is contained in:
Travis Ralston
2025-12-15 23:28:36 -07:00
parent ad230c4530
commit 516b74068b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/rest/admin/media.py
View File

@@ -319,18 +319,18 @@ class ListQuarantinedMedia(RestServlet):
) )
start_ts = 0 start_ts = 0
#start_index = 0 start_index = 0
if '-' in start: # indicates we have a next_batch token if "-" in start: # indicates we have a next_batch token
# Batch tokens are structured as `timestamp-index`, where `index` is relative # Batch tokens are structured as `timestamp-index`, where `index` is relative
# to the timestamp. This is done to support pages having many records with # to the timestamp. This is done to support pages having many records with
# the same timestamp (like existing servers having a ton of `ts=0` records). # the same timestamp (like existing servers having a ton of `ts=0` records).
# #
# Dev note: The structure of the `from` token is partially documented in the # Dev note: The structure of the `from` token is partially documented in the
# admin API. Do not change the behaviour without consulting the docs. # admin API. Do not change the behaviour without consulting the docs.
parts = start.split('-', maxsplit=1) parts = start.split("-", maxsplit=1)
start_ts = int(parts[0]) start_ts = int(parts[0])
start_index = int(parts[1]) start_index = int(parts[1])
else: elif len(start) > 0:
start_index = int(start) start_index = int(start)
mxcs_with_ts = await self.store.get_quarantined_media_mxcs_and_timestamps( mxcs_with_ts = await self.store.get_quarantined_media_mxcs_and_timestamps(
@@ -338,12 +338,14 @@ class ListQuarantinedMedia(RestServlet):
) )
res: JsonDict = { res: JsonDict = {
"media": (mxc for mxc, _ in mxcs_with_ts), "media": [mxc for mxc, _ in mxcs_with_ts],
} }
if len(mxcs_with_ts) > 0: if len(mxcs_with_ts) > 0:
max_ts = mxcs_with_ts[-1][1] if mxcs_with_ts else 0 max_ts = mxcs_with_ts[-1][1] if mxcs_with_ts else 0
count_of_max_ts = sum(1 for _, ts in mxcs_with_ts if ts == max_ts) count_of_max_ts = (
sum(1 for _, ts in mxcs_with_ts if ts == max_ts) + start_index
)
res["next_batch"] = f"{max_ts}-{count_of_max_ts}" res["next_batch"] = f"{max_ts}-{count_of_max_ts}"
return HTTPStatus.OK, res return HTTPStatus.OK, res

2
tests/rest/admin/test_media.py
View File

@@ -906,7 +906,7 @@ class ListQuarantinedMediaTestCase(_AdminMediaTests):
) )
self.assertEqual(200, channel.code, msg=channel.json_body) self.assertEqual(200, channel.code, msg=channel.json_body)
self.assertEqual(0, len(channel.json_body["media"])) self.assertEqual(0, len(channel.json_body["media"]))
self.assertNone(channel.json_body["next_batch"]) self.assertNotIn("next_batch", channel.json_body)
class QuarantineMediaByIDTestCase(_AdminMediaTests): class QuarantineMediaByIDTestCase(_AdminMediaTests):