diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
| commit | 9b1e552b5163aad84a3ae4fd70116d3e782fb443 (patch) | |
| tree | 19d827838d10688da26e3fa5503c63b71fd34db0 /synapse/handlers/events.py | |
| parent | Add storage method have_events (diff) | |
| parent | Update .gitignore (diff) | |
| download | synapse-9b1e552b5163aad84a3ae4fd70116d3e782fb443.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
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: |