Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
🥺
conduwuit
Commits
d8a3b257
Unverified
Commit
d8a3b257
authored
3 years ago
by
Nyaaori
Committed by
Timo Kösters
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Enable room version 4
parent
71487369
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/client_server/capabilities.rs
+2
-4
2 additions, 4 deletions
src/client_server/capabilities.rs
src/database/globals.rs
+1
-1
1 addition, 1 deletion
src/database/globals.rs
src/database/rooms.rs
+0
-1
0 additions, 1 deletion
src/database/rooms.rs
src/server_server.rs
+3
-3
3 additions, 3 deletions
src/server_server.rs
with
6 additions
and
9 deletions
src/client_server/capabilities.rs
+
2
−
4
View file @
d8a3b257
use
crate
::{
database
::
DatabaseGuard
,
Result
,
Ruma
};
use
ruma
::{
api
::
client
::
discovery
::
get_capabilities
::{
self
,
Capabilities
,
RoomVersionStability
,
RoomVersionsCapability
,
},
use
ruma
::
api
::
client
::
discovery
::
get_capabilities
::{
self
,
Capabilities
,
RoomVersionStability
,
RoomVersionsCapability
,
};
use
std
::
collections
::
BTreeMap
;
...
...
This diff is collapsed.
Click to expand it.
src/database/globals.rs
+
1
−
1
View file @
d8a3b257
...
...
@@ -151,7 +151,7 @@ pub fn load(
// Supported and stable room versions
let
stable_room_versions
=
vec!
[
RoomVersionId
::
V6
];
// Experimental, partially supported room versions
let
unstable_room_versions
=
vec!
[
RoomVersionId
::
V5
];
let
unstable_room_versions
=
vec!
[
RoomVersionId
::
V4
,
RoomVersionId
::
V5
];
let
s
=
Self
{
globals
,
...
...
This diff is collapsed.
Click to expand it.
src/database/rooms.rs
+
0
−
1
View file @
d8a3b257
...
...
@@ -1845,7 +1845,6 @@ pub fn build_and_append_pdu(
})
.transpose
()
?
;
// If there was no create event yet, assume we are creating a room with the default
// version right now
let
room_version_id
=
create_event_content
...
...
This diff is collapsed.
Click to expand it.
src/server_server.rs
+
3
−
3
View file @
d8a3b257
...
...
@@ -2592,9 +2592,9 @@ pub async fn create_join_event_template_route(
acl_check
(
sender_servername
,
&
body
.room_id
,
&
db
)
?
;
// TODO: Conduit does not implement restricted join rules yet, we always reject
let
join_rules_event
=
db
.rooms
.room_state_get
(
&
body
.room_id
,
&
StateEventType
::
RoomJoinRules
,
""
)
?
;
let
join_rules_event
=
db
.rooms
.room_state_get
(
&
body
.room_id
,
&
StateEventType
::
RoomJoinRules
,
""
)
?
;
let
join_rules_event_content
:
Option
<
RoomJoinRulesEventContent
>
=
join_rules_event
.as_ref
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment