diff options
| author | Krombel <krombel@krombel.de> | 2017-06-21 14:48:21 +0200 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2017-06-21 14:48:21 +0200 |
| commit | 4202fba82a255eb52783a91d873b91aa8ef2191c (patch) | |
| tree | 73975e960b5a80f7a466cbf62810639662093d4a /synapse/handlers/message.py | |
| parent | replaced json.dumps with encode_canonical_json (diff) | |
| parent | Merge pull request #2292 from matrix-org/erikj/quarantine_media (diff) | |
| download | synapse-4202fba82a255eb52783a91d873b91aa8ef2191c.tar.xz | |
Merge branch 'develop' into avoid_duplicate_filters
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 196925edad..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,6 +53,8 @@ class MessageHandler(BaseHandler): # This is to stop us from diverging history *too* much. self.limiter = Limiter(max_count=5) + self.action_generator = hs.get_action_generator() + @defer.inlineCallbacks def purge_history(self, room_id, event_id): event = yield self.store.get_event(event_id) @@ -590,8 +591,7 @@ class MessageHandler(BaseHandler): "Changing the room create event is forbidden", ) - action_generator = ActionGenerator(self.hs) - yield action_generator.handle_push_actions_for_event( + yield self.action_generator.handle_push_actions_for_event( event, context ) |