diff options
| author | Erik Johnston <erik@matrix.org> | 2024-08-05 13:10:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2024-08-05 13:18:13 +0100 |
| commit | 81d6257bead22cdedb5c3e584a2c94331e7fba0a (patch) | |
| tree | 5bfdcc3a42042488de5284218d5d0141bf7c2589 | |
| parent | Merge remote-tracking branch 'origin/develop' into erikj/ss_hacks (diff) | |
| download | synapse-81d6257bead22cdedb5c3e584a2c94331e7fba0a.tar.xz | |
Don't send down list ops
| -rw-r--r-- | synapse/rest/client/sync.py | 2 | ||||
| -rw-r--r-- | tests/rest/client/test_sync.py | 22 |
2 files changed, 1 insertions, 23 deletions
diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py index a0ff238af9..b8c4ccd08d 100644 --- a/synapse/rest/client/sync.py +++ b/synapse/rest/client/sync.py @@ -982,7 +982,7 @@ class SlidingSyncRestServlet(RestServlet): for list_key, list_result in lists.items(): serialized_lists[list_key] = { "count": list_result.count, - "ops": [encode_operation(op) for op in list_result.ops], + # "ops": [encode_operation(op) for op in list_result.ops], } return serialized_lists diff --git a/tests/rest/client/test_sync.py b/tests/rest/client/test_sync.py index 14cea95f17..eb050066e9 100644 --- a/tests/rest/client/test_sync.py +++ b/tests/rest/client/test_sync.py @@ -32,13 +32,7 @@ from synapse.api.constants import ( EventTypes, ReceiptTypes, RelationTypes, -<<<<<<< HEAD - RoomTypes, ) -from synapse.api.room_versions import RoomVersions -from synapse.events import EventBase -from synapse.handlers.sliding_sync import RoomSyncConfig, StateValues -from synapse.http.servlet import validate_json_object from synapse.rest.client import ( devices, knock, @@ -46,28 +40,12 @@ from synapse.rest.client import ( read_marker, receipts, room, - sendtodevice, sync, -======= ->>>>>>> origin/develop ) -from synapse.rest.client import devices, knock, login, read_marker, receipts, room, sync from synapse.server import HomeServer -<<<<<<< HEAD from synapse.types import ( JsonDict, - Requester, - RoomStreamToken, - SlidingSyncStreamToken, - StreamKeyType, - StreamToken, - UserID, ) -from synapse.types.handlers import SlidingSyncConfig -from synapse.types.rest.client import SlidingSyncBody -======= -from synapse.types import JsonDict ->>>>>>> origin/develop from synapse.util import Clock from tests import unittest |