diff options
| author | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
| commit | 6a0092d3715a168415619fd253c7fb4da5faf348 (patch) | |
| tree | 72f8553014ff152fecd10a40cd2ad7b46387f44d /synapse/appservice | |
| parent | Fix up comment (diff) | |
| parent | document the REPLICATE command a bit better (#6305) (diff) | |
| download | synapse-6a0092d3715a168415619fd253c7fb4da5faf348.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/appservice')
| -rw-r--r-- | synapse/appservice/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py index 33b3579425..aea3985a5f 100644 --- a/synapse/appservice/__init__.py +++ b/synapse/appservice/__init__.py @@ -94,7 +94,9 @@ class ApplicationService(object): ip_range_whitelist=None, ): self.token = token - self.url = url + self.url = ( + url.rstrip("/") if isinstance(url, str) else None + ) # url must not end with a slash self.hs_token = hs_token self.sender = sender self.server_name = hostname |