summary refs log tree commit diff
path: root/synapse/handlers/room_member.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-01-03 16:19:55 +0000
committerRichard van der Hoff <richard@matrix.org>2020-01-06 13:45:33 +0000
commit3bef62488e5cff4dfb33454f2f2e18cc928f319b (patch)
tree8b8c819039eef4d197ba16952eb65b7df3d7171e /synapse/handlers/room_member.py
parentRemove unused hashes and depths from create_new_client_event params (diff)
downloadsynapse-3bef62488e5cff4dfb33454f2f2e18cc928f319b.tar.xz
Remove unused hashes and depths from create_event params
Diffstat (limited to 'synapse/handlers/room_member.py')
-rw-r--r--synapse/handlers/room_member.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 91bb34cd55..d550ba8ab4 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -164,6 +164,12 @@ class RoomMemberHandler(object):
         if requester.is_guest:
             content["kind"] = "guest"
 
+        prev_event_ids = (
+            None
+            if prev_events_and_hashes is None
+            else [event_id for event_id, _, _ in prev_events_and_hashes]
+        )
+
         event, context = yield self.event_creation_handler.create_event(
             requester,
             {
@@ -177,7 +183,7 @@ class RoomMemberHandler(object):
             },
             token_id=requester.access_token_id,
             txn_id=txn_id,
-            prev_events_and_hashes=prev_events_and_hashes,
+            prev_event_ids=prev_event_ids,
             require_consent=require_consent,
         )