Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
David Robertson 2022-07-21 11:27:08 +01:00
parent 0f971ca68e b909d5327b
commit 4f57ef0b18
No known key found for this signature in database
GPG Key ID: 903ECE108A39DEDD
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13333.doc Normal file
View File

@ -0,0 +1 @@
Document the new `rc_invites.per_issuer` throttling option added in Synapse 1.63.

8
docs/usage/configuration/config_documentation.md
View File

@ -1528,6 +1528,8 @@ The `rc_invites.per_user` limit applies to the *receiver* of the invite, rather
sender, meaning that a `rc_invite.per_user.burst_count` of 5 mandates that a single user sender, meaning that a `rc_invite.per_user.burst_count` of 5 mandates that a single user
cannot *receive* more than a burst of 5 invites at a time. cannot *receive* more than a burst of 5 invites at a time.
In contrast, the `rc_invites.per_issuer` limit applies to the *issuer* of the invite, meaning that a `rc_invite.per_issuer.burst_count` of 5 mandates that single user cannot *send* more than a burst of 5 invites at a time.
Example configuration: Example configuration:
```yaml ```yaml
rc_invites: rc_invites:
@ -1537,7 +1539,13 @@ rc_invites:
per_user: per_user:
per_second: 0.004 per_second: 0.004
burst_count: 3 burst_count: 3
per_issuer:
per_second: 0.5
burst_count: 5
``` ```
_Changed in version 1.63:_ added the `per_issuer` limit.
--- ---
### `rc_third_party_invite` ### `rc_third_party_invite`