diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-12 11:22:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-12 11:24:11 +0000 |
| commit | 6fea478d2e7737c2462b074b935d4427ced5f3d4 (patch) | |
| tree | b14646c2e337e3a4d44fd7a61cb6bac60b8c42c6 /synapse/storage/state.py | |
| parent | SYWEB-146: Fix room ID leaking on recents page when the name of the room is j... (diff) | |
| download | synapse-6fea478d2e7737c2462b074b935d4427ced5f3d4.tar.xz | |
Fix bugs with invites/joins across federatiom.
Both in terms of auth and not trying to fetch missing PDUs for invites, joins etc.
Diffstat (limited to 'synapse/storage/state.py')
| -rw-r--r-- | synapse/storage/state.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py index 68975969f5..2f3a70b4e5 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -70,7 +70,8 @@ class StateStore(SQLBaseStore): values={ "room_id": event.room_id, "event_id": event.event_id, - } + }, + or_ignore=True, ) for state in event.state_events.values(): @@ -83,7 +84,8 @@ class StateStore(SQLBaseStore): "type": state.type, "state_key": state.state_key, "event_id": state.event_id, - } + }, + or_ignore=True, ) self._simple_insert_txn( @@ -92,5 +94,6 @@ class StateStore(SQLBaseStore): values={ "state_group": state_group, "event_id": event.event_id, - } + }, + or_replace=True, ) |