Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-28 19:48:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle feedback from Travis.

Browse source
This commit is contained in:
Patrick Cloke 2021-06-16 14:12:00 -04:00 committed by Richard van der Hoff
parent 4afe946def
commit d63e39c4af
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,9 +8,9 @@ their room based on the membership of one or more spaces from
## Proposal
A new `join_rule` (`restricted`) will be used to reflect a cross between `invite`
and `public` join rules. The content of the join rules would include the rooms
to trust for membership. For example:
In a future room version a new `join_rule` (`restricted`) will be used to reflect
a cross between `invite` and `public` join rules. The content of the join rules
would include the rooms to trust for membership. For example:
```json
{
@ -21,12 +21,12 @@ to trust for membership. For example:
"allow": [
{
"type": "m.room_membership",
"room": "!mods:example.org",
"room_id": "!mods:example.org",
"via": ["example.org"]
},
{
"type": "m.room_membership",
"room": "!users:example.org",
"room_id": "!users:example.org",
"via": ["example.org"]
}
]
@ -44,14 +44,14 @@ following keys:
* `type`: `"m.room_membership"` to describe that we are allowing access via room
membership. Future MSCs may define other types.
* `room`: The room ID to check the membership of.
* `room_id`: The room ID to check the membership of.
* `via`: A list of servers which may be used to peek for membership of the room.
Any entries in the list which do not match the expected format are ignored. Thus,
if all entries are invalid, the list behaves as if empty and all users without
an invite are rejected.
From the perspective of hee [auth rules](https://spec.matrix.org/unstable/rooms/v1/#authorization-rules),
From the perspective of the [auth rules](https://spec.matrix.org/unstable/rooms/v1/#authorization-rules),
the `restricted` join rule has the same behavior as `public`. Additional checks
against the `allow` rules are performed during event generation, as described below.