mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-12-27 04:53:50 +03:00
Bump default room version to V9; per matrix spec recommendation
This commit is contained in:
parent
aca6218c0a
commit
cc3e1f58cc
3 changed files with 5 additions and 5 deletions
|
@ -258,6 +258,6 @@ fn default_turn_ttl() -> u64 {
|
|||
}
|
||||
|
||||
// I know, it's a great name
|
||||
fn default_default_room_version() -> RoomVersionId {
|
||||
RoomVersionId::V6
|
||||
pub fn default_default_room_version() -> RoomVersionId {
|
||||
RoomVersionId::V9
|
||||
}
|
||||
|
|
|
@ -871,7 +871,7 @@ impl Service {
|
|||
let mut content = RoomCreateEventContent::new(conduit_user.clone());
|
||||
content.federate = true;
|
||||
content.predecessor = None;
|
||||
content.room_version = RoomVersionId::V6;
|
||||
content.room_version = services().globals.default_room_version();
|
||||
|
||||
// 1. The room create event
|
||||
services().rooms.timeline.build_and_append_pdu(
|
||||
|
|
|
@ -172,8 +172,8 @@ impl Service {
|
|||
.supported_room_versions()
|
||||
.contains(&s.config.default_room_version)
|
||||
{
|
||||
error!("Room version in config isn't supported, falling back to Version 6");
|
||||
s.config.default_room_version = RoomVersionId::V6;
|
||||
error!("Room version in config isn't supported, falling back to default version");
|
||||
s.config.default_room_version = crate::config::default_default_room_version();
|
||||
};
|
||||
|
||||
Ok(s)
|
||||
|
|
Loading…
Reference in a new issue