Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links

Neilj/fix room invite mail links

2 files changed, 2 insertions, 1 deletions

diff --git a/changelog.d/3868.bugfix b/changelog.d/3868.bugfix
new file mode 100644

index 0000000000..99da8389a5
--- /dev/null
+++ b/changelog.d/3868.bugfix
@@ -0,0 +1 @@
+Fix broken invite email links for self hosted riots 
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py

index b78ce10396..1a5a10d974 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -441,7 +441,7 @@ class Mailer(object):
 
     def make_room_link(self, room_id):
         if self.hs.config.email_riot_base_url:
-            base_url = self.hs.config.email_riot_base_url
+            base_url = "%s/#/room" % (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"