diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:15:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:15:58 +0100 |
| commit | 2aeaa7b77c0c39f12c89b0054049970faad28406 (patch) | |
| tree | f3022ab73ea75827dfec17de532fb07b0949196f /synapse/handlers/_base.py | |
| parent | Return the store_id from persist_event (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-2aeaa7b77c0c39f12c89b0054049970faad28406.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: synapse/handlers/room.py synapse/storage/stream.py
Diffstat (limited to 'synapse/handlers/_base.py')
| -rw-r--r-- | synapse/handlers/_base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index 78df9ac53e..85a0f5dff5 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -31,7 +31,8 @@ class BaseHandler(object): class BaseRoomHandler(BaseHandler): @defer.inlineCallbacks - def _on_new_room_event(self, event, snapshot, extra_destinations=[]): + def _on_new_room_event(self, event, snapshot, extra_destinations=[], + extra_users=[]): snapshot.fill_out_prev_events(event) store_id = yield self.store.persist_event(event) @@ -43,7 +44,7 @@ class BaseRoomHandler(BaseHandler): ))) event.destinations = list(destinations) - self.notifier.on_new_room_event(event, store_id) + self.notifier.on_new_room_event(event, extra_users=[]) federation_handler = self.hs.get_handlers().federation_handler yield federation_handler.handle_new_event(event, snapshot) |