diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 22:38:21 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 22:38:21 -0400 |
| commit | 6f4bc6d01d6eed5211021fd29ef152f96c03c357 (patch) | |
| tree | 1f0a6e344096d8f40283be7c1e74be6eb45735ca /synapse/appservice/__init__.py | |
| parent | rename get_devices_by_remote to get_device_updates_by_remote (diff) | |
| parent | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify (diff) | |
| download | synapse-6f4bc6d01d6eed5211021fd29ef152f96c03c357.tar.xz | |
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'synapse/appservice/__init__.py')
| -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 |