mirror of
https://github.com/matrix-org/matrix-spec
synced 2026-02-20 04:53:42 +01:00
Apply suggestions
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
This commit is contained in:
parent
e3133f0586
commit
6097642bf9
|
|
@ -6,13 +6,13 @@
|
||||||
Users may want to control who is allowed to invite them to new rooms. This module defines how
|
Users may want to control who is allowed to invite them to new rooms. This module defines how
|
||||||
clients and servers can implement invite permission.
|
clients and servers can implement invite permission.
|
||||||
|
|
||||||
#### Events
|
#### Account data
|
||||||
|
|
||||||
{{% event event="m.invite_permission_config" %}}
|
{{% event event="m.invite_permission_config" %}}
|
||||||
|
|
||||||
#### Client behaviour
|
#### Client behaviour
|
||||||
|
|
||||||
To reject invites from all users automatically, clients MUST add an [`m.invite_permission_config`](#minvite_permission_config)
|
To reject invites from all users automatically, clients MAY add an [`m.invite_permission_config`](#minvite_permission_config)
|
||||||
event in the user's [account data](#client-config) with the `default_action` property set to
|
event in the user's [account data](#client-config) with the `default_action` property set to
|
||||||
`block`. To stop rejecting all invites, the same event without the `default_action` property MUST be
|
`block`. To stop rejecting all invites, the same event without the `default_action` property MUST be
|
||||||
added to the account data.
|
added to the account data.
|
||||||
|
|
@ -20,8 +20,8 @@ added to the account data.
|
||||||
When the `default_action` field is unset, other parts of the specification might still have effects
|
When the `default_action` field is unset, other parts of the specification might still have effects
|
||||||
on invites seen by clients, like [ignoring users](#ignoring-users).
|
on invites seen by clients, like [ignoring users](#ignoring-users).
|
||||||
|
|
||||||
When sending an invite to a user that blocks invites, clients SHOULD receive an error response with
|
Attempting to send an invite to a user that blocks invites will result in an error response with the
|
||||||
the `M_INVITE_BLOCKED` error code.
|
`M_INVITE_BLOCKED` error code.
|
||||||
|
|
||||||
#### Server behaviour
|
#### Server behaviour
|
||||||
|
|
||||||
|
|
@ -38,9 +38,8 @@ is invited:
|
||||||
* [`PUT /_matrix/client/v3/rooms/{roomId}/state/m.room.member/{stateKey}`](#put_matrixclientv3roomsroomidstateeventtypestatekey),
|
* [`PUT /_matrix/client/v3/rooms/{roomId}/state/m.room.member/{stateKey}`](#put_matrixclientv3roomsroomidstateeventtypestatekey),
|
||||||
when the `membership` is set to `invite`.
|
when the `membership` is set to `invite`.
|
||||||
|
|
||||||
In addition, existing events already in the database MUST NOT be served over client synchronisation
|
In addition, invite events for this user already in the database, or received over federation, MUST
|
||||||
endpoints such as [`GET /sync`](#get_matrixclientv3sync). Invite events received over federation
|
NOT be served over client synchronisation endpoints such as [`GET /sync`](#get_matrixclientv3sync).
|
||||||
should likewise not be served over `GET /sync` requests.
|
|
||||||
|
|
||||||
Servers MAY return any suppressed invite events over `GET /sync` if invite blocking is later
|
Servers MAY return any suppressed invite events over `GET /sync` if invite blocking is later
|
||||||
disabled.
|
disabled.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue