Merge branch 'develop' into storage_transactions

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."""