TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump default room version to V9; per matrix spec recommendation

Browse source
This commit is contained in:
Nyaaori 2022-10-15 10:42:14 +02:00
parent aca6218c0a
commit cc3e1f58cc
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config/mod.rs
View file

@ -258,6 +258,6 @@ fn default_turn_ttl() -> u64 {
} }
// I know, it's a great name // I know, it's a great name
fn default_default_room_version() -> RoomVersionId { pub fn default_default_room_version() -> RoomVersionId {
RoomVersionId::V6 RoomVersionId::V9
} }

2
src/service/admin/mod.rs
View file

@ -871,7 +871,7 @@ impl Service {
let mut content = RoomCreateEventContent::new(conduit_user.clone()); let mut content = RoomCreateEventContent::new(conduit_user.clone());
content.federate = true; content.federate = true;
content.predecessor = None; content.predecessor = None;
content.room_version = RoomVersionId::V6; content.room_version = services().globals.default_room_version();
// 1. The room create event // 1. The room create event
services().rooms.timeline.build_and_append_pdu( services().rooms.timeline.build_and_append_pdu(

4
src/service/globals/mod.rs
View file

@ -172,8 +172,8 @@ impl Service {
.supported_room_versions() .supported_room_versions()
.contains(&s.config.default_room_version) .contains(&s.config.default_room_version)
{ {
error!("Room version in config isn't supported, falling back to Version 6"); error!("Room version in config isn't supported, falling back to default version");
s.config.default_room_version = RoomVersionId::V6; s.config.default_room_version = crate::config::default_default_room_version();
}; };
Ok(s) Ok(s)