diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-10 18:00:49 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-10 18:00:49 +0000 |
commit | 4c682143c897b09f17ceac61fb2480d430dde929 (patch) | |
tree | f8dc99388b001dd4adef9b0c0404b63029bbbbde /synapse/handlers/room.py | |
parent | Remove dead code (diff) | |
download | synapse-4c682143c897b09f17ceac61fb2480d430dde929.tar.xz |
.from_string() no longer takes a HS
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r-- | synapse/handlers/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 93732a9c87..e771cf317b 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -76,7 +76,7 @@ class RoomCreationHandler(BaseHandler): if room_id: # Ensure room_id is the correct type - room_id_obj = RoomID.from_string(room_id, self.hs) + room_id_obj = RoomID.from_string(room_id) if not self.hs.is_mine(room_id_obj): raise SynapseError(400, "Room id must be local") @@ -476,7 +476,7 @@ class RoomMemberHandler(BaseHandler): if prev_state and prev_state.membership == Membership.INVITE: room = yield self.store.get_room(room_id) inviter = UserID.from_string( - prev_state.sender, self.hs + prev_state.sender ) is_remote_invite_join = not self.hs.is_mine(inviter) and not room |