summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-07 10:42:44 +0000
committerErik Johnston <erik@matrix.org>2014-11-07 10:53:38 +0000
commit49948d72f3c76f0ca32b844955d3add7922180ea (patch)
tree0b62809346b3c28563a6d3238e77545b358d5f50 /synapse/storage
parentImplement method to get auth_chain from a given event_id (diff)
downloadsynapse-49948d72f3c76f0ca32b844955d3add7922180ea.tar.xz
Fix joining over federation
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 48ad4d864f..96adf20c89 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -310,6 +310,7 @@ class DataStore(RoomMemberStore, RoomStore,
                     "room_id": event.room_id,
                     "auth_id": auth_id,
                 },
+                or_ignore=True,
             )
 
         (ref_alg, ref_hash_bytes) = compute_event_reference_hash(event)