diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-02-19 12:00:16 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-02-19 12:00:16 +0000 |
| commit | 05aee12652e687adf8926314a69362b5a7183d5e (patch) | |
| tree | 0cf5695e5042ab107065489b07a695c707b837f8 /synapse/storage/event_federation.py | |
| parent | Allow guest users access to messages in rooms they have joined (diff) | |
| parent | Add presence metric (diff) | |
| download | synapse-05aee12652e687adf8926314a69362b5a7183d5e.tar.xz | |
Merge branch 'develop' into rav/guest_access_after_room_join
Diffstat (limited to 'synapse/storage/event_federation.py')
| -rw-r--r-- | synapse/storage/event_federation.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index ce2c794025..3489315e0d 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -114,10 +114,10 @@ class EventFederationStore(SQLBaseStore): retcol="event_id", ) - def get_latest_events_in_room(self, room_id): + def get_latest_event_ids_and_hashes_in_room(self, room_id): return self.runInteraction( - "get_latest_events_in_room", - self._get_latest_events_in_room, + "get_latest_event_ids_and_hashes_in_room", + self._get_latest_event_ids_and_hashes_in_room, room_id, ) @@ -132,7 +132,7 @@ class EventFederationStore(SQLBaseStore): desc="get_latest_event_ids_in_room", ) - def _get_latest_events_in_room(self, txn, room_id): + def _get_latest_event_ids_and_hashes_in_room(self, txn, room_id): sql = ( "SELECT e.event_id, e.depth FROM events as e " "INNER JOIN event_forward_extremities as f " |