diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-27 11:02:30 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-27 11:02:30 +0100 |
| commit | 45bdacd9a75c7e32b0b8708ae58fb9e661376bfd (patch) | |
| tree | 0118fd2870598a004d7439f67e21c8651f425643 /synapse/config/appservice.py | |
| parent | Fixup change log (diff) | |
| parent | Merge pull request #1098 from matrix-org/markjh/bearer_token (diff) | |
| download | synapse-45bdacd9a75c7e32b0b8708ae58fb9e661376bfd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2
Diffstat (limited to 'synapse/config/appservice.py')
| -rw-r--r-- | synapse/config/appservice.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py index d7537e8d44..82c50b8240 100644 --- a/synapse/config/appservice.py +++ b/synapse/config/appservice.py @@ -110,6 +110,11 @@ def _load_appservice(hostname, as_info, config_filename): user = UserID(localpart, hostname) user_id = user.to_string() + # Rate limiting for users of this AS is on by default (excludes sender) + rate_limited = True + if isinstance(as_info.get("rate_limited"), bool): + rate_limited = as_info.get("rate_limited") + # namespace checks if not isinstance(as_info.get("namespaces"), dict): raise KeyError("Requires 'namespaces' object.") @@ -155,4 +160,5 @@ def _load_appservice(hostname, as_info, config_filename): sender=user_id, id=as_info["id"], protocols=protocols, + rate_limited=rate_limited ) |