oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-06-27 16:35:59 +00:00
Code Wiki Activity

promising this to be the last change

Browse source
This commit is contained in:
avdb13 2024-07-04 20:28:30 +02:00
parent b4583ed1da
commit 7fd778a6f2
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/configuration.md
View file

@ -44,6 +44,7 @@ The `global` section contains the following fields:
| `allow_room_creation` | `boolean` | Allow users to create rooms | `true` | | `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` | | `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` | `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"` | | `default_room_version` | `string` | The default room version (`"6"`-`"10"`)| `"10"` |
| `allow_jaeger` | `boolean` | Allow Jaeger tracing | `false` | | `allow_jaeger` | `boolean` | Allow Jaeger tracing | `false` |
| `tracing_flame` | `boolean` | Enable flame tracing | `false` | | `tracing_flame` | `boolean` | Enable flame tracing | `false` |

10
src/api/client_server/account.rs
View file

@ -301,7 +301,15 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
if let Err(e) = join_room_by_id_helper( if let Err(e) = join_room_by_id_helper(
Some(&user_id), Some(&user_id),
room_id, room_id,
Some("All men are equal before fish.".to_owned()), Some(
services()
.globals
.config
.default_rooms_join_reason
.as_deref()
.unwrap_or("Hello from Conduit!")
.to_owned(),
),
&servers, &servers,
None, None,
) )

5
src/config/mod.rs
View file

@ -57,10 +57,11 @@ pub struct Config {
pub allow_room_creation: bool, pub allow_room_creation: bool,
#[serde(default = "true_fn")] #[serde(default = "true_fn")]
pub allow_unstable_room_versions: bool, pub allow_unstable_room_versions: bool,
#[serde(default = "default_default_room_version")]
pub default_room_version: RoomVersionId,
#[serde(default = "Vec::new")] #[serde(default = "Vec::new")]
pub default_rooms: Vec<OwnedRoomOrAliasId>, pub default_rooms: Vec<OwnedRoomOrAliasId>,
pub default_rooms_join_reason: Option<String>,
#[serde(default = "default_default_room_version")]
pub default_room_version: RoomVersionId,
#[serde(default)] #[serde(default)]
pub well_known: WellKnownConfig, pub well_known: WellKnownConfig,
#[serde(default = "false_fn")] #[serde(default = "false_fn")]