diff options
| author | Erik Johnston <erikj@jki.re> | 2016-10-11 11:20:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-11 11:20:54 +0100 |
| commit | a2f2516199dc0c4bb94b26a870da0d6531d57723 (patch) | |
| tree | 3f4ad96f70e2ad39e8881d9f65e0380b547d3582 /synapse/handlers/room.py | |
| parent | Merge pull request #1150 from Rugvip/state_key (diff) | |
| parent | rest/client/v1/register: use the correct requester in createUser (diff) | |
| download | synapse-a2f2516199dc0c4bb94b26a870da0d6531d57723.tar.xz | |
Merge pull request #1157 from Rugvip/nolimit
Remove rate limiting from app service senders and fix get_or_create_user requester
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index cbd26f8f95..a7f533f7be 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -437,7 +437,7 @@ class RoomEventSource(object): logger.warn("Stream has topological part!!!! %r", from_key) from_key = "s%s" % (from_token.stream,) - app_service = yield self.store.get_app_service_by_user_id( + app_service = self.store.get_app_service_by_user_id( user.to_string() ) if app_service: |