diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-02 11:04:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-02 11:04:48 +0100 |
| commit | 657847e4c6b955911768e7d3025ac1b245208882 (patch) | |
| tree | a826411c63b4691a7356ce2740e7b4438b8ead78 /synapse/push/mailer.py | |
| parent | Limit the length of state chains (diff) | |
| parent | Merge pull request #1061 from matrix-org/erikj/linearize_resolution (diff) | |
| download | synapse-657847e4c6b955911768e7d3025ac1b245208882.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/push/mailer.py')
| -rw-r--r-- | synapse/push/mailer.py | 2 |
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)] |