diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 16:54:12 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 16:54:12 +0100 |
| commit | 1d95e78759cc1307d15d6cc6388f52063e833355 (patch) | |
| tree | 0307617989016019bfd1d41a15b22499d02091ef /synapse/server.py | |
| parent | add _get_room_member, fix datastore methods (diff) | |
| parent | Added RestServlet for /rooms/$roomid/initialSync (diff) | |
| download | synapse-1d95e78759cc1307d15d6cc6388f52063e833355.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index 9de88b6642..94facf9d99 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -124,6 +124,11 @@ class BaseHomeServer(object): object.""" return UserID.from_string(s, hs=self) + def parse_roomid(self, s): + """Parse the string given by 's' as a Room ID and return a RoomID + object.""" + return RoomID.from_string(s, hs=self) + def parse_roomalias(self, s): """Parse the string given by 's' as a Room Alias and return a RoomAlias object.""" |