dolysis
/
conduwuit
mirror of https://github.com/girlbossceo/conduwuit.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Nyaaori/bump-default-room-version' into 'next' 

Bump default room version to V9

See merge request famedly/conduit!400
This commit is contained in:
Timo Kösters 2022-10-15 11:02:44 +00:00
parent b1991c8f4f 1e1a144dfa
commit 3054af41ba
3 changed files with 7 additions and 11 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(

12
src/service/globals/mod.rs
View File

@ -127,14 +127,10 @@ impl Service {
RoomVersionId::V7, RoomVersionId::V7,
RoomVersionId::V8, RoomVersionId::V8,
RoomVersionId::V9, RoomVersionId::V9,
];
// Experimental, partially supported room versions
let unstable_room_versions = vec![
RoomVersionId::V3,
RoomVersionId::V4,
RoomVersionId::V5,
RoomVersionId::V10, RoomVersionId::V10,
]; ];
// Experimental, partially supported room versions
let unstable_room_versions = vec![RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5];
let mut s = Self { let mut s = Self {
db, db,
@ -172,8 +168,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)