Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Neilj/fix room invite mail links
This commit is contained in:
Neil Johnson 2018-09-20 13:32:38 +01:00 committed by GitHub
parent 1f3f5fcf52 38ead946a9
commit 23b53b4ef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3868.bugfix Normal file
View File

@ -0,0 +1 @@
Fix broken invite email links for self hosted riots

2
synapse/push/mailer.py
View File

@ -441,7 +441,7 @@ class Mailer(object):
def make_room_link(self, room_id): def make_room_link(self, room_id):
if self.hs.config.email_riot_base_url: 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": elif self.app_name == "Vector":
# need /beta for Universal Links to work on iOS # need /beta for Universal Links to work on iOS
base_url = "https://vector.im/beta/#/room" base_url = "https://vector.im/beta/#/room"