summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-31 14:33:45 +0100
committerGitHub <noreply@github.com>2016-08-31 14:33:45 +0100
commitfbd2615de41cb8d119c5fae437f86bea92b5662d (patch)
treec26f956adac763bd041970d53a59d6781e59d371
parentMerge pull request #1058 from matrix-org/markjh/direct_to_device_synchrotron (diff)
parentFix email notifs by adding missing param (diff)
downloadsynapse-fbd2615de41cb8d119c5fae437f86bea92b5662d.tar.xz
Merge pull request #1057 from matrix-org/erikj/fix_email_name
Fix email notifs by adding missing param
-rw-r--r--synapse/push/mailer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py

index 81b1af4a19..2cafcfd8f5 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py
@@ -338,7 +338,7 @@ class Mailer(object): # want the generated-from-names one here otherwise we'll # end up with, "new message from Bob in the Bob room" room_name = yield calculate_room_name( - state_by_room[room_id], user_id, fallback_to_members=False + self.store, state_by_room[room_id], user_id, fallback_to_members=False ) my_member_event = state_by_room[room_id][("m.room.member", user_id)]