diff options
| author | Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> | 2020-04-22 14:38:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 13:38:41 +0100 |
| commit | 6b6685db9f8cf8a55dfe0edc8f2131be8001c360 (patch) | |
| tree | 9dc2fa53f6d2e062c10a862546db441b509191de /synapse/rest | |
| parent | Merge branch 'release-v1.12.4' into develop (diff) | |
| download | synapse-6b6685db9f8cf8a55dfe0edc8f2131be8001c360.tar.xz | |
Extend room admin api with additional attributes (#7225)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/admin/rooms.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py index 659b8a10ee..d1bdb64111 100644 --- a/synapse/rest/admin/rooms.py +++ b/synapse/rest/admin/rooms.py @@ -183,10 +183,23 @@ class ListRoomRestServlet(RestServlet): # Extract query parameters start = parse_integer(request, "from", default=0) limit = parse_integer(request, "limit", default=100) - order_by = parse_string(request, "order_by", default="alphabetical") + order_by = parse_string(request, "order_by", default=RoomSortOrder.NAME.value) if order_by not in ( RoomSortOrder.ALPHABETICAL.value, RoomSortOrder.SIZE.value, + RoomSortOrder.NAME.value, + RoomSortOrder.CANONICAL_ALIAS.value, + RoomSortOrder.JOINED_MEMBERS.value, + RoomSortOrder.JOINED_LOCAL_MEMBERS.value, + RoomSortOrder.VERSION.value, + RoomSortOrder.CREATOR.value, + RoomSortOrder.ENCRYPTION.value, + RoomSortOrder.FEDERATABLE.value, + RoomSortOrder.PUBLIC.value, + RoomSortOrder.JOIN_RULES.value, + RoomSortOrder.GUEST_ACCESS.value, + RoomSortOrder.HISTORY_VISIBILITY.value, + RoomSortOrder.STATE_EVENTS.value, ): raise SynapseError( 400, |