tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #133 from matrix-org/invite_power_level

Browse source 
Invite power level
This commit is contained in:
Mark Haines 2015-04-28 10:50:34 +01:00
commit 55fcf62e9c
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
synapse/api/auth.py
View file

@ -222,6 +222,13 @@ class Auth(object):
elif target_in_room: # the target is already in the room. elif target_in_room: # the target is already in the room.
raise AuthError(403, "%s is already in the room." % raise AuthError(403, "%s is already in the room." %
target_user_id) target_user_id)
else:
invite_level = self._get_named_level(auth_events, "invite", 0)
if user_level < invite_level:
raise AuthError(
403, "You cannot invite user %s." % target_user_id
)
elif Membership.JOIN == membership: elif Membership.JOIN == membership:
# Joins are valid iff caller == target and they were: # Joins are valid iff caller == target and they were:
# invited: They are accepting the invitation # invited: They are accepting the invitation
@ -561,6 +568,7 @@ class Auth(object):
("ban", []), ("ban", []),
("redact", []), ("redact", []),
("kick", []), ("kick", []),
("invite", []),
] ]
old_list = current_state.content.get("users") old_list = current_state.content.get("users")

3
synapse/handlers/room.py
View file

@ -213,7 +213,8 @@ class RoomCreationHandler(BaseHandler):
"state_default": 50, "state_default": 50,
"ban": 50, "ban": 50,
"kick": 50, "kick": 50,
"redact": 50 "redact": 50,
"invite": 0,
}, },
) )