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

Enable room version 4

This commit is contained in:
Nyaaori 2021-11-01 02:22:32 +00:00 committed by Timo Kösters
parent 714873694d
commit d8a3b257f2
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client_server/capabilities.rs
View File

@ -1,8 +1,6 @@
use crate::{database::DatabaseGuard, Result, Ruma}; use crate::{database::DatabaseGuard, Result, Ruma};
use ruma::{ use ruma::api::client::discovery::get_capabilities::{
api::client::discovery::get_capabilities::{ self, Capabilities, RoomVersionStability, RoomVersionsCapability,
self, Capabilities, RoomVersionStability, RoomVersionsCapability,
},
}; };
use std::collections::BTreeMap; use std::collections::BTreeMap;

2
src/database/globals.rs
View File

@ -151,7 +151,7 @@ impl Globals {
// Supported and stable room versions // Supported and stable room versions
let stable_room_versions = vec![RoomVersionId::V6]; let stable_room_versions = vec![RoomVersionId::V6];
// Experimental, partially supported room versions // Experimental, partially supported room versions
let unstable_room_versions = vec![RoomVersionId::V5]; let unstable_room_versions = vec![RoomVersionId::V4, RoomVersionId::V5];
let s = Self { let s = Self {
globals, globals,

1
src/database/rooms.rs
View File

@ -1845,7 +1845,6 @@ impl Rooms {
}) })
.transpose()?; .transpose()?;
// If there was no create event yet, assume we are creating a room with the default // If there was no create event yet, assume we are creating a room with the default
// version right now // version right now
let room_version_id = create_event_content let room_version_id = create_event_content

6
src/server_server.rs
View File

@ -2592,9 +2592,9 @@ pub async fn create_join_event_template_route(
acl_check(sender_servername, &body.room_id, &db)?; acl_check(sender_servername, &body.room_id, &db)?;
// TODO: Conduit does not implement restricted join rules yet, we always reject // TODO: Conduit does not implement restricted join rules yet, we always reject
let join_rules_event = db let join_rules_event =
.rooms db.rooms
.room_state_get(&body.room_id, &StateEventType::RoomJoinRules, "")?; .room_state_get(&body.room_id, &StateEventType::RoomJoinRules, "")?;
let join_rules_event_content: Option<RoomJoinRulesEventContent> = join_rules_event let join_rules_event_content: Option<RoomJoinRulesEventContent> = join_rules_event
.as_ref() .as_ref()