summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-01-17 14:58:26 +0000
committerGitHub <noreply@github.com>2017-01-17 14:58:26 +0000
commit7fae460402afc00416531ae74070566126bc5633 (patch)
tree1d9c37e802698b433e6df79e576f97d44525fe3f
parentFix typo in return type (diff)
parentGet state at event rather than for room in push (diff)
downloadsynapse-7fae460402afc00416531ae74070566126bc5633.tar.xz
Merge pull request #1820 from matrix-org/erikj/push_tools
Get state at event rather than for room in push
-rw-r--r--synapse/push/push_tools.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py

index b47bf1f92b..a27476bbad 100644 --- a/synapse/push/push_tools.py +++ b/synapse/push/push_tools.py
@@ -52,7 +52,7 @@ def get_badge_count(store, user_id): def get_context_for_event(store, state_handler, ev, user_id): ctx = {} - room_state_ids = yield state_handler.get_current_state_ids(ev.room_id) + room_state_ids = yield store.get_state_ids_for_event(ev.event_id) # we no longer bother setting room_alias, and make room_name the # human-readable name instead, be that m.room.name, an alias or