oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-08-16 18:01:35 +00:00
Code Wiki Activity

chore: bump ruma

Browse source 
(cherry picked from commit 1a4a348ccf)
This commit is contained in:
Matthias Ahouansou 2025-06-28 19:40:10 +01:00
parent f37ec3f0fe
commit c992711941
No known key found for this signature in database
8 changed files with 164 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/api/client_server/directory.rs
View file

@ -11,7 +11,7 @@ use ruma::{
},
federation,
},
directory::{Filter, PublicRoomJoinRule, PublicRoomsChunk, RoomNetwork},
directory::{Filter, PublicRoomsChunk, RoomNetwork},
events::{
room::{
avatar::RoomAvatarEventContent,
@ -19,7 +19,7 @@ use ruma::{
create::RoomCreateEventContent,
guest_access::{GuestAccess, RoomGuestAccessEventContent},
history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
join_rules::{JoinRule, RoomJoinRulesEventContent},
join_rules::RoomJoinRulesEventContent,
topic::RoomTopicEventContent,
},
StateEventType,
@ -273,18 +273,13 @@ pub(crate) async fn get_public_rooms_filtered_helper(
.room_state_get(&room_id, &StateEventType::RoomJoinRules, "")?
.map(|s| {
serde_json::from_str(s.content.get())
.map(|c: RoomJoinRulesEventContent| match c.join_rule {
JoinRule::Public => Some(PublicRoomJoinRule::Public),
JoinRule::Knock => Some(PublicRoomJoinRule::Knock),
_ => None,
})
.map(|c: RoomJoinRulesEventContent| c.join_rule.kind())
.map_err(|e| {
error!("Invalid room join rule event in database: {}", e);
Error::BadDatabase("Invalid room join rule event in database.")
})
})
.transpose()?
.flatten()
.ok_or_else(|| Error::bad_database("Missing room join rule event for room."))?,
room_type: services()
.rooms

8
src/api/client_server/room.rs
View file

@ -463,17 +463,15 @@ pub async fn create_room_route(
.await?;
}
if let Some(topic) = &body.topic {
if let Some(topic) = body.topic.clone() {
services()
.rooms
.timeline
.build_and_append_pdu(
PduBuilder {
event_type: TimelineEventType::RoomTopic,
content: to_raw_value(&RoomTopicEventContent {
topic: topic.clone(),
})
.expect("event is valid, we just created it"),
content: to_raw_value(&RoomTopicEventContent::new(topic))
.expect("event is valid, we just created it"),
unsigned: None,
state_key: Some("".to_owned()),
redacts: None,