summary refs log tree commit diff
diff options
context:
space:
mode:
authorH. Shay <hillerys@element.io>2023-05-10 09:29:15 -0700
committerH. Shay <hillerys@element.io>2023-05-10 09:29:15 -0700
commita767f1c8a9d7cda915650a682f42e7a8b60b7138 (patch)
tree3ff76416dd891d08d8dda4aee3e1b4ef39974622
parentremove changes to sync (diff)
downloadsynapse-a767f1c8a9d7cda915650a682f42e7a8b60b7138.tar.xz
small fix
-rw-r--r--synapse/rest/client/sync.py4
-rw-r--r--synapse/storage/databases/main/experimental_features.py1
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py
index fc036c4dfa..03b0578945 100644
--- a/synapse/rest/client/sync.py
+++ b/synapse/rest/client/sync.py
@@ -358,7 +358,7 @@ class SyncRestServlet(RestServlet):
         joined = {}
         for room in rooms:
             joined[room.room_id] = await self.encode_room(
-                room, time_now, joined=True, serialize_options=serialize_options,
+                room, time_now, joined=True, serialize_options=serialize_options
             )
 
         return joined
@@ -463,7 +463,7 @@ class SyncRestServlet(RestServlet):
         joined = {}
         for room in rooms:
             joined[room.room_id] = await self.encode_room(
-                room, time_now, joined=False, serialize_options=serialize_options,
+                room, time_now, joined=False, serialize_options=serialize_options
             )
 
         return joined
diff --git a/synapse/storage/databases/main/experimental_features.py b/synapse/storage/databases/main/experimental_features.py
index 7a0a2caa0e..d62da1160d 100644
--- a/synapse/storage/databases/main/experimental_features.py
+++ b/synapse/storage/databases/main/experimental_features.py
@@ -30,7 +30,6 @@ class ExperimentalFeature(str, Enum):
     """
 
     MSC3026 = "msc3026"
-    MSC2654 = "msc2654"
     MSC3881 = "msc3881"
     MSC3967 = "msc3967"