Skip to content

Commit b6a127b

Browse files
authored
Clarify that restricted joins require the referenced user to be joined (#2220)
1 parent 0a649cb commit b6a127b

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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.

content/rooms/fragments/v8-auth-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The rules are as follows:
7474
1. If membership state is `join` or `invite`, allow.
7575
2. If the `join_authorised_via_users_server` key in `content`
7676
is not a user with sufficient permission to invite other
77-
users, reject.
77+
users or is not a joined member of the room, reject.
7878
3. Otherwise, allow.
7979
6. If the `join_rule` is `public`, allow.
8080
7. Otherwise, reject.

content/rooms/v10.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ The rules are as follows:
150150
1. If membership state is `join` or `invite`, allow.
151151
2. If the `join_authorised_via_users_server` key in `content`
152152
is not a user with sufficient permission to invite other
153-
users, reject.
153+
users or is not a joined member of the room, reject.
154154
3. Otherwise, allow.
155155
6. If the `join_rule` is `public`, allow.
156156
7. Otherwise, reject.

content/rooms/v11.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ The rules are as follows:
157157
1. If membership state is `join` or `invite`, allow.
158158
2. If the `join_authorised_via_users_server` key in `content`
159159
is not a user with sufficient permission to invite other
160-
users, reject.
160+
users or is not a joined member of the room, reject.
161161
3. Otherwise, allow.
162162
6. If the `join_rule` is `public`, allow.
163163
7. Otherwise, reject.

content/rooms/v12.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ The rules are as follows:
141141
1. If membership state is `join` or `invite`, allow.
142142
2. If the `join_authorised_via_users_server` key in `content`
143143
is not a user with sufficient permission to invite other
144-
users, reject.
144+
users or is not a joined member of the room, reject.
145145
3. Otherwise, allow.
146146
6. If the `join_rule` is `public`, allow.
147147
7. Otherwise, reject.

0 commit comments

Comments
 (0)