summary refs log tree commit diff
path: root/synapse/storage/state.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-16 11:37:17 +0100
committerNeil Johnson <neil@matrix.org>2018-08-16 11:37:17 +0100
commit25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a (patch)
tree64576e7083a569f13765c8d3a41fe6326ac631fa /synapse/storage/state.py
parentWIP impl commiting to get feedback (diff)
parentinitial cut at a room summary API (#3574) (diff)
downloadsynapse-25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r--synapse/storage/state.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 754dfa6973..dd03c4168b 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -480,7 +480,8 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
     @defer.inlineCallbacks
     def get_state_ids_for_events(self, event_ids, types=None, filtered_types=None):
         """
-        Get the state dicts corresponding to a list of events
+        Get the state dicts corresponding to a list of events, containing the event_ids
+        of the state events (as opposed to the events themselves)
 
         Args:
             event_ids(list(str)): events whose state should be returned
@@ -493,7 +494,7 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
                 If None, `types` filtering is applied to all events.
 
         Returns:
-            A deferred dict from event_id -> (type, state_key) -> state_event
+            A deferred dict from event_id -> (type, state_key) -> event_id
         """
         event_to_groups = yield self._get_state_group_for_events(
             event_ids,