summary refs log tree commit diff
path: root/synapse/storage/databases/main
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2020-09-14 17:07:04 +0300
committerGitHub <noreply@github.com>2020-09-14 10:07:04 -0400
commitb82d68c0bd952131836d00994c3c2a79b3d3a267 (patch)
tree080d97b8fbb005caf2572316b3e2f426dd2ec198 /synapse/storage/databases/main
parentImprove SAML error messages (#8248) (diff)
downloadsynapse-b82d68c0bd952131836d00994c3c2a79b3d3a267.tar.xz
Add the topic and avatar to the room details admin API (#8305)
Diffstat (limited to 'synapse/storage/databases/main')
-rw-r--r--synapse/storage/databases/main/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py
index 717df97301..127588ce4c 100644
--- a/synapse/storage/databases/main/room.py
+++ b/synapse/storage/databases/main/room.py
@@ -104,7 +104,8 @@ class RoomWorkerStore(SQLBaseStore):
                   curr.local_users_in_room AS joined_local_members, rooms.room_version AS version,
                   rooms.creator, state.encryption, state.is_federatable AS federatable,
                   rooms.is_public AS public, state.join_rules, state.guest_access,
-                  state.history_visibility, curr.current_state_events AS state_events
+                  state.history_visibility, curr.current_state_events AS state_events,
+                  state.avatar, state.topic
                 FROM rooms
                 LEFT JOIN room_stats_state state USING (room_id)
                 LEFT JOIN room_stats_current curr USING (room_id)