diff options
author | Mark Haines <mjark@negativecurvature.net> | 2015-01-23 13:41:55 +0000 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2015-01-23 13:41:55 +0000 |
commit | f7cb6042117fd54748ec771337a4b04fe8498ac8 (patch) | |
tree | 62fece1cc473923d5bd4e72dac9035ca9e81ea1f /synapse/handlers/events.py | |
parent | Merge pull request #31 from matrix-org/client_api_resource (diff) | |
parent | Remove hs.parse_eventid (diff) | |
download | synapse-f7cb6042117fd54748ec771337a4b04fe8498ac8.tar.xz |
Merge pull request #32 from matrix-org/remove_parse_id_from_hs
Remove parse id from hs
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r-- | synapse/handlers/events.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 103bc67c42..01e67b0818 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -17,6 +17,7 @@ from twisted.internet import defer from synapse.util.logcontext import PreserveLoggingContext from synapse.util.logutils import log_function +from synapse.types import UserID from ._base import BaseHandler @@ -48,7 +49,7 @@ class EventStreamHandler(BaseHandler): @log_function def get_stream(self, auth_user_id, pagin_config, timeout=0, as_client_event=True): - auth_user = self.hs.parse_userid(auth_user_id) + auth_user = UserID.from_string(auth_user_id) try: if auth_user not in self._streams_per_user: |