diff --git a/docs/configuration.md b/docs/configuration.md index e80ac214..2036744e 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -44,6 +44,7 @@ The `global` section contains the following fields: | `allow_room_creation` | `boolean` | Allow users to create rooms | `true` | | `allow_unstable_room_versions` | `boolean` | Allow users to create and join rooms with unstable versions | `true` | | `default_rooms` | `array` | The list of rooms that will be joined by default on registration | [] | +| `default_rooms_join_reason` | `string` | The reason for joining the rooms | "Hello from Conduit!" | | `default_room_version` | `string` | The default room version (`"6"`-`"10"`)| `"10"` | | `allow_jaeger` | `boolean` | Allow Jaeger tracing | `false` | | `tracing_flame` | `boolean` | Enable flame tracing | `false` | diff --git a/src/api/client_server/account.rs b/src/api/client_server/account.rs index 6b0cb66a..b3f17a62 100644 --- a/src/api/client_server/account.rs +++ b/src/api/client_server/account.rs @@ -301,7 +301,15 @@ pub async fn register_route(body: Ruma) -> Result, + pub default_rooms_join_reason: Option, + #[serde(default = "default_default_room_version")] + pub default_room_version: RoomVersionId, #[serde(default)] pub well_known: WellKnownConfig, #[serde(default = "false_fn")]