diff options
author | Adrian Perez de Castro <aperez@igalia.com> | 2017-01-13 17:12:04 +0200 |
---|---|---|
committer | Adrian Perez de Castro <aperez@igalia.com> | 2017-01-13 17:12:04 +0200 |
commit | a3e4a198e3f5e0acd91d40d5743f97ece2cf5b6f (patch) | |
tree | 473d33f9a3afcf53b261ac02b41dfbd044e88adf /synapse/push/mailer.py | |
parent | Merge pull request #1795 from matrix-org/erikj/port_defaults (diff) | |
download | synapse-a3e4a198e3f5e0acd91d40d5743f97ece2cf5b6f.tar.xz |
Allow configuring the Riot URL used in notification emails
The URLs used for notification emails were hardcoded to use either matrix.to or vector.im; but for self-hosted setups where Riot is also self-hosted it may be desirable to allow configuring an alternative Riot URL. Fixes #1809. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Diffstat (limited to 'synapse/push/mailer.py')
-rw-r--r-- | synapse/push/mailer.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index 53551632b6..ce2d31fb98 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -439,15 +439,23 @@ class Mailer(object): }) def make_room_link(self, room_id): - # need /beta for Universal Links to work on iOS - if self.app_name == "Vector": - return "https://vector.im/beta/#/room/%s" % (room_id,) + if self.hs.config.email_riot_base_url: + base_url = self.hs.config.email_riot_base_url + elif self.app_name == "Vector": + # need /beta for Universal Links to work on iOS + base_url = "https://vector.im/beta/#/room" else: - return "https://matrix.to/#/%s" % (room_id,) + base_url = "https://matrix.to/#" + return "%s/%s" % (base_url, room_id) def make_notif_link(self, notif): - # need /beta for Universal Links to work on iOS - if self.app_name == "Vector": + if self.hs.config.email_riot_base_url: + return "%s/#/room/%s/%s" % ( + self.hs.config.email_riot_base_url, + notif['room_id'], notif['event_id'] + ) + elif self.app_name == "Vector": + # need /beta for Universal Links to work on iOS return "https://vector.im/beta/#/room/%s/%s" % ( notif['room_id'], notif['event_id'] ) |