Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-05 02:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

.from_string() no longer takes a HS

Browse Source
This commit is contained in:
Erik Johnston 2014-12-10 18:00:49 +00:00
parent 02e4c18171
commit 4c682143c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/room.py
View File

@ -76,7 +76,7 @@ class RoomCreationHandler(BaseHandler):
if room_id: if room_id:
# Ensure room_id is the correct type # 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): if not self.hs.is_mine(room_id_obj):
raise SynapseError(400, "Room id must be local") raise SynapseError(400, "Room id must be local")
@ -476,7 +476,7 @@ class RoomMemberHandler(BaseHandler):
if prev_state and prev_state.membership == Membership.INVITE: if prev_state and prev_state.membership == Membership.INVITE:
room = yield self.store.get_room(room_id) room = yield self.store.get_room(room_id)
inviter = UserID.from_string( 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 is_remote_invite_join = not self.hs.is_mine(inviter) and not room