summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-04-28 17:28:27 +0100
committerDavid Baker <dave@matrix.org>2016-04-28 17:28:27 +0100
commite800ee2f636a6aa63a9ac35388b9f982b01cd1c0 (patch)
treeb35b386ded91903b98cdf024da2fefce3e85209e /synapse
parentPut back real delay before mailing (diff)
downloadsynapse-e800ee2f636a6aa63a9ac35388b9f982b01cd1c0.tar.xz
May as well always include room link
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/mailer.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py

index 60a4878a3e..c53ae9a547 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py
@@ -157,12 +157,11 @@ class Mailer(object): "title": calculate_room_name(room_state, user_id), "hash": string_ordinal_total(room_id), # See sender avatar hash "notifs": [], - "invite": is_invite + "invite": is_invite, + "link": self.make_room_link(room_id), } - if is_invite: - room_vars["link"] = self.make_room_link(room_id) - else: + if not is_invite: for n in notifs: vars = yield self.get_notif_vars( n, user_id, notif_events[n['event_id']], room_state