diff --git a/changelogs/room_versions/newsfragments/2220.clarification b/changelogs/room_versions/newsfragments/2220.clarification new file mode 100644 index 00000000..4141e31a --- /dev/null +++ b/changelogs/room_versions/newsfragments/2220.clarification @@ -0,0 +1 @@ +In room versions 8 through 12, clarify that "sufficient permission to invite users" on restricted joins also includes being a joined member of the room. \ No newline at end of file diff --git a/content/rooms/fragments/v8-auth-rules.md b/content/rooms/fragments/v8-auth-rules.md index 9e267e53..5def04a6 100644 --- a/content/rooms/fragments/v8-auth-rules.md +++ b/content/rooms/fragments/v8-auth-rules.md @@ -74,7 +74,7 @@ The rules are as follows: 1. If membership state is `join` or `invite`, allow. 2. If the `join_authorised_via_users_server` key in `content` is not a user with sufficient permission to invite other - users, reject. + users or is not a joined member of the room, reject. 3. Otherwise, allow. 6. If the `join_rule` is `public`, allow. 7. Otherwise, reject. diff --git a/content/rooms/v10.md b/content/rooms/v10.md index 3cfe1998..7af19873 100644 --- a/content/rooms/v10.md +++ b/content/rooms/v10.md @@ -150,7 +150,7 @@ The rules are as follows: 1. If membership state is `join` or `invite`, allow. 2. If the `join_authorised_via_users_server` key in `content` is not a user with sufficient permission to invite other - users, reject. + users or is not a joined member of the room, reject. 3. Otherwise, allow. 6. If the `join_rule` is `public`, allow. 7. Otherwise, reject. diff --git a/content/rooms/v11.md b/content/rooms/v11.md index db1b1928..e994a347 100644 --- a/content/rooms/v11.md +++ b/content/rooms/v11.md @@ -157,7 +157,7 @@ The rules are as follows: 1. If membership state is `join` or `invite`, allow. 2. If the `join_authorised_via_users_server` key in `content` is not a user with sufficient permission to invite other - users, reject. + users or is not a joined member of the room, reject. 3. Otherwise, allow. 6. If the `join_rule` is `public`, allow. 7. Otherwise, reject. diff --git a/content/rooms/v12.md b/content/rooms/v12.md index 42f3e122..94f2ca03 100644 --- a/content/rooms/v12.md +++ b/content/rooms/v12.md @@ -141,7 +141,7 @@ The rules are as follows: 1. If membership state is `join` or `invite`, allow. 2. If the `join_authorised_via_users_server` key in `content` is not a user with sufficient permission to invite other - users, reject. + users or is not a joined member of the room, reject. 3. Otherwise, allow. 6. If the `join_rule` is `public`, allow. 7. Otherwise, reject.