diff options
author | Erik Johnston <erik@matrix.org> | 2014-11-06 15:10:55 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-11-06 15:10:55 +0000 |
commit | 4317c8e5835f0c15bf882f737d3e3c2a5b85f73f (patch) | |
tree | 4f1b822a5122529b69f54d7ed7f8b88d772171a5 /synapse/handlers/message.py | |
parent | Fix a couple more storage tests (diff) | |
download | synapse-4317c8e5835f0c15bf882f737d3e3c2a5b85f73f.tar.xz |
Implement new replace_state and changed prev_state
`prev_state` is now a list of previous state ids, similiar to prev_events. `replace_state` now points to what we think was replaced.
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r-- | synapse/handlers/message.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index c6f6ab14d1..8394013df3 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -81,7 +81,7 @@ class MessageHandler(BaseHandler): user = self.hs.parse_userid(event.user_id) assert user.is_mine, "User must be our own: %s" % (user,) - snapshot = yield self.store.snapshot_room(event.room_id, event.user_id) + snapshot = yield self.store.snapshot_room(event) yield self._on_new_room_event( event, snapshot, suppress_auth=suppress_auth @@ -141,12 +141,7 @@ class MessageHandler(BaseHandler): SynapseError if something went wrong. """ - snapshot = yield self.store.snapshot_room( - event.room_id, - event.user_id, - state_type=event.type, - state_key=event.state_key, - ) + snapshot = yield self.store.snapshot_room(event) yield self._on_new_room_event(event, snapshot) @@ -214,7 +209,7 @@ class MessageHandler(BaseHandler): @defer.inlineCallbacks def send_feedback(self, event): - snapshot = yield self.store.snapshot_room(event.room_id, event.user_id) + snapshot = yield self.store.snapshot_room(event) # store message in db yield self._on_new_room_event(event, snapshot) |