summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2021-01-23 21:34:32 +0200
committerJason Robinson <jasonr@matrix.org>2021-01-23 21:34:32 +0200
commit930ba009719788ebc2004c6ef89329dae1b9689b (patch)
tree3dfae3dfba4061bc3ac063db54df651224fab0be /synapse
parentRemove trailing whitespace to appease the linter (diff)
downloadsynapse-930ba009719788ebc2004c6ef89329dae1b9689b.tar.xz
Add depth and received_ts to forward_extremities admin API response
Also add a warning on the admin API documentation.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/databases/main/events_forward_extremities.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/events_forward_extremities.py b/synapse/storage/databases/main/events_forward_extremities.py
index 5fea974050..84aaa919fb 100644
--- a/synapse/storage/databases/main/events_forward_extremities.py
+++ b/synapse/storage/databases/main/events_forward_extremities.py
@@ -86,9 +86,10 @@ class EventForwardExtremitiesStore(SQLBaseStore):
 
         def get_forward_extremities_for_room_txn(txn):
             sql = """
-                SELECT event_id, state_group
+                SELECT event_id, state_group, depth, received_ts
                 FROM event_forward_extremities
                 NATURAL JOIN event_to_state_groups
+                NATURAL JOIN events
                 WHERE room_id = ?
             """