diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-13 17:26:59 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-13 17:26:59 +0000 |
| commit | 4fbe6ca4010f804d784e16255fe4c63b7f607c52 (patch) | |
| tree | 6a483ad84dae70964241b918b98d2525038f2fb2 /synapse/storage/events.py | |
| parent | Merge branch 'develop' into paul/tiny-fixes (diff) | |
| parent | Merge pull request #374 from matrix-org/daniel/guestleave (diff) | |
| download | synapse-4fbe6ca4010f804d784e16255fe4c63b7f607c52.tar.xz | |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index e6c1abfc27..5d35ca90b9 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -311,6 +311,10 @@ class EventsStore(SQLBaseStore): self._store_room_message_txn(txn, event) elif event.type == EventTypes.Redaction: self._store_redaction(txn, event) + elif event.type == EventTypes.RoomHistoryVisibility: + self._store_history_visibility_txn(txn, event) + elif event.type == EventTypes.GuestAccess: + self._store_guest_access_txn(txn, event) self._store_room_members_txn( txn, @@ -827,7 +831,8 @@ class EventsStore(SQLBaseStore): allow_none=True, ) if prev: - ev.unsigned["prev_content"] = prev.get_dict()["content"] + ev.unsigned["prev_content"] = prev.content + ev.unsigned["prev_sender"] = prev.sender self._get_event_cache.prefill( (ev.event_id, check_redacted, get_prev_content), ev @@ -884,7 +889,8 @@ class EventsStore(SQLBaseStore): get_prev_content=False, ) if prev: - ev.unsigned["prev_content"] = prev.get_dict()["content"] + ev.unsigned["prev_content"] = prev.content + ev.unsigned["prev_sender"] = prev.sender self._get_event_cache.prefill( (ev.event_id, check_redacted, get_prev_content), ev |