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/appservice/__init__.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/appservice/__init__.py')
-rw-r--r-- | synapse/appservice/__init__.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py index 126a10efb7..91471f7e89 100644 --- a/synapse/appservice/__init__.py +++ b/synapse/appservice/__init__.py @@ -81,7 +81,7 @@ class ApplicationService(object): NS_LIST = [NS_USERS, NS_ALIASES, NS_ROOMS] def __init__(self, token, url=None, namespaces=None, hs_token=None, - sender=None, id=None, protocols=None): + sender=None, id=None, protocols=None, rate_limited=True): self.token = token self.url = url self.hs_token = hs_token @@ -95,6 +95,8 @@ class ApplicationService(object): else: self.protocols = set() + self.rate_limited = rate_limited + def _check_namespaces(self, namespaces): # Sanity check that it is of the form: # { @@ -234,5 +236,8 @@ class ApplicationService(object): def is_exclusive_room(self, room_id): return self._is_exclusive(ApplicationService.NS_ROOMS, room_id) + def is_rate_limited(self): + return self.rate_limited + def __str__(self): return "ApplicationService: %s" % (self.__dict__,) |