diff options
| author | Erik Johnston <erikj@jki.re> | 2017-05-19 13:42:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 13:42:49 +0100 |
| commit | 99713dc7d33a4f65e68e7a5b83c0b6cb346f41ac (patch) | |
| tree | 7dcbb8503bcf13dc2e9b74a642b5a7701a3023a9 /synapse/handlers/message.py | |
| parent | Don't push users who have left (diff) | |
| parent | Move invalidation cb to its own structure (diff) | |
| download | synapse-99713dc7d33a4f65e68e7a5b83c0b6cb346f41ac.tar.xz | |
Merge pull request #2234 from matrix-org/erikj/fix_push
Store ActionGenerator in HomeServer
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index ba8776f288..a04f634c5c 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -20,7 +20,6 @@ from synapse.api.errors import AuthError, Codes, SynapseError from synapse.crypto.event_signing import add_hashes_and_signatures from synapse.events.utils import serialize_event from synapse.events.validator import EventValidator -from synapse.push.action_generator import ActionGenerator from synapse.types import ( UserID, RoomAlias, RoomStreamToken, ) @@ -54,7 +53,7 @@ class MessageHandler(BaseHandler): # This is to stop us from diverging history *too* much. self.limiter = Limiter(max_count=5) - self.action_generator = ActionGenerator(self.hs) + self.action_generator = hs.get_action_generator() @defer.inlineCallbacks def purge_history(self, room_id, event_id): |