wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pull note about ban & ACLs out of each join rule description.

Browse source
This commit is contained in:
Patrick Cloke 2021-06-28 08:34:44 -04:00 • committed by Richard van der Hoff
parent ba63bedec0
commit 289c64035f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
proposals/3083-restricted-rooms.md
View file

@ -81,13 +81,13 @@ enforced over federation by event authorisation).<sup id="a3">[3](#f3)</sup>
See the [join rules](https://matrix.org/docs/spec/client_server/r0.6.1#m-room-join-rules)
specification for full details; the summary below is meant to highlight the differences
between `public`, `invite`, and `restricted`.
between `public`, `invite`, and `restricted`. Note that all join rules are subject
to `ban` and `server_acls`.
* `public`: anyone can join, subject to `ban` and `server_acls`, as today.
* `invite`: only people with membership `invite` can join, subject to `ban` and
`server_acls`, as today.
* `knock`: the same as `invite`, except anyone can knock, subject to `ban` and
`server_acls`. See [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
* `public`: anyone can join, as today.
* `invite`: only people with membership `invite` can join, as today.
* `knock`: the same as `invite`, except anyone can knock. See
[MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
* `private`: This is reserved, but unspecified.
* `restricted`: the same as `public`, with the additional caveat that servers must
verify the `m.room.member` event is signed by a homeserver whose users may issue