Add room_types filter and room_type response to /publicRooms, a…

…s per [MSC3827](matrix-org/matrix-spec-proposals#3827)
benkuly · Nov 1, 2022 · 98b3dd5 · 98b3dd5
1 parent 5552b1c
commit 98b3dd5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/...mmonMain/kotlin/net/folivo/trixnity/clientserverapi/model/rooms/GetPublicRoomsResponse.kt b/...mmonMain/kotlin/net/folivo/trixnity/clientserverapi/model/rooms/GetPublicRoomsResponse.kt
@@ -4,6 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import net.folivo.trixnity.core.model.RoomAliasId
 import net.folivo.trixnity.core.model.RoomId
+import net.folivo.trixnity.core.model.events.m.room.CreateEventContent
 import net.folivo.trixnity.core.model.events.m.room.JoinRulesEventContent
 
 @Serializable
@@ -22,6 +23,7 @@ data class GetPublicRoomsResponse(
         @SerialName("name") val name: String? = null,
         @SerialName("num_joined_members") val joinedMembersCount: Long,
         @SerialName("room_id") val roomId: RoomId,
+        @SerialName("room_type") val roomType: CreateEventContent.RoomType? = null,
         @SerialName("topic") val topic: String? = null,
         @SerialName("world_readable") val worldReadable: Boolean,
     )

diff --git a/...onMain/kotlin/net/folivo/trixnity/clientserverapi/model/rooms/GetPublicRoomsWithFilter.kt b/...onMain/kotlin/net/folivo/trixnity/clientserverapi/model/rooms/GetPublicRoomsWithFilter.kt
@@ -7,6 +7,7 @@ import net.folivo.trixnity.core.HttpMethod
 import net.folivo.trixnity.core.HttpMethodType.POST
 import net.folivo.trixnity.core.MatrixEndpoint
 import net.folivo.trixnity.core.model.UserId
+import net.folivo.trixnity.core.model.events.m.room.CreateEventContent
 
 /**
  * @see <a href="https://spec.matrix.org/v1.3/client-server-api/#post_matrixclientv3publicrooms">matrix spec</a>
@@ -28,7 +29,8 @@ data class GetPublicRoomsWithFilter(
     ) {
         @Serializable
         data class Filter(
-            @SerialName("generic_search_term") val genericSearchTerm: String? = null
+            @SerialName("generic_search_term") val genericSearchTerm: String? = null,
+            @SerialName("room_types") val roomTypes: Set<CreateEventContent.RoomType?>? = null,
         )
     }
 }
diff --git a/...ain/kotlin/net/folivo/trixnity/serverserverapi/model/federation/GetPublicRoomsResponse.kt b/...ain/kotlin/net/folivo/trixnity/serverserverapi/model/federation/GetPublicRoomsResponse.kt
@@ -4,6 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import net.folivo.trixnity.core.model.RoomAliasId
 import net.folivo.trixnity.core.model.RoomId
+import net.folivo.trixnity.core.model.events.m.room.CreateEventContent
 import net.folivo.trixnity.core.model.events.m.room.JoinRulesEventContent
 
 @Serializable
@@ -22,6 +23,7 @@ data class GetPublicRoomsResponse(
         @SerialName("name") val name: String? = null,
         @SerialName("num_joined_members") val joinedMembersCount: Long,
         @SerialName("room_id") val roomId: RoomId,
+        @SerialName("room_type") val roomType: CreateEventContent.RoomType? = null,
         @SerialName("topic") val topic: String? = null,
         @SerialName("world_readable") val worldReadable: Boolean,
     )

diff --git a/...n/kotlin/net/folivo/trixnity/serverserverapi/model/federation/GetPublicRoomsWithFilter.kt b/...n/kotlin/net/folivo/trixnity/serverserverapi/model/federation/GetPublicRoomsWithFilter.kt
@@ -6,6 +6,7 @@ import kotlinx.serialization.Serializable
 import net.folivo.trixnity.core.HttpMethod
 import net.folivo.trixnity.core.HttpMethodType.POST
 import net.folivo.trixnity.core.MatrixEndpoint
+import net.folivo.trixnity.core.model.events.m.room.CreateEventContent
 
 /**
  * @see <a href="https://spec.matrix.org/v1.3/server-server-api/#post_matrixfederationv1publicrooms">matrix spec</a>
@@ -24,7 +25,8 @@ object GetPublicRoomsWithFilter : MatrixEndpoint<GetPublicRoomsWithFilter.Reques
     ) {
         @Serializable
         data class Filter(
-            @SerialName("generic_search_term") val genericSearchTerm: String? = null
+            @SerialName("generic_search_term") val genericSearchTerm: String? = null,
+            @SerialName("room_types") val roomTypes: Set<CreateEventContent.RoomType?>? = null,
         )
     }
 }