backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix api/client_server/directory events

Browse source
This commit is contained in:
Charles Hall 2024-07-15 16:50:12 -07:00
parent b6cba0c4ae
commit db666fe903
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,11 @@ pub(crate) async fn set_room_visibility_route(
match &body.visibility { match &body.visibility {
room::Visibility::Public => { room::Visibility::Public => {
services().rooms.directory.set_public(&body.room_id)?; services().rooms.directory.set_public(&body.room_id)?;
info!("{} made {} public", sender_user, body.room_id); info!(
user_id = %sender_user,
room_id = %body.room_id,
"User made room public",
);
} }
room::Visibility::Private => { room::Visibility::Private => {
services().rooms.directory.set_not_public(&body.room_id)?; services().rooms.directory.set_not_public(&body.room_id)?;
@ -264,6 +268,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
} }
#[allow(clippy::too_many_lines)] #[allow(clippy::too_many_lines)]
#[tracing::instrument]
fn room_id_to_chunk(room_id: ruma::OwnedRoomId) -> Result<PublicRoomsChunk> { fn room_id_to_chunk(room_id: ruma::OwnedRoomId) -> Result<PublicRoomsChunk> {
let canonical_alias = services() let canonical_alias = services()
.rooms .rooms
@ -286,7 +291,7 @@ fn room_id_to_chunk(room_id: ruma::OwnedRoomId) -> Result<PublicRoomsChunk> {
.state_cache .state_cache
.room_joined_count(&room_id)? .room_joined_count(&room_id)?
.unwrap_or_else(|| { .unwrap_or_else(|| {
warn!("Room {} has no member count", room_id); warn!("Room has no member count");
0 0
}) })
.try_into() .try_into()
@ -300,10 +305,7 @@ fn room_id_to_chunk(room_id: ruma::OwnedRoomId) -> Result<PublicRoomsChunk> {
serde_json::from_str(s.content.get()) serde_json::from_str(s.content.get())
.map(|c: RoomTopicEventContent| Some(c.topic)) .map(|c: RoomTopicEventContent| Some(c.topic))
.map_err(|_| { .map_err(|_| {
error!( error!("Invalid room topic event in database for room",);
"Invalid room topic event in database for room {}",
room_id
);
Error::bad_database("Invalid room topic event in database.") Error::bad_database("Invalid room topic event in database.")
}) })
})?; })?;
@ -367,8 +369,8 @@ fn room_id_to_chunk(room_id: ruma::OwnedRoomId) -> Result<PublicRoomsChunk> {
JoinRule::Knock => Some(PublicRoomJoinRule::Knock), JoinRule::Knock => Some(PublicRoomJoinRule::Knock),
_ => None, _ => None,
}) })
.map_err(|e| { .map_err(|error| {
error!("Invalid room join rule event in database: {}", e); error!(%error, "Invalid room join rule event in database");
Error::BadDatabase( Error::BadDatabase(
"Invalid room join rule event in database.", "Invalid room join rule event in database.",
) )
@ -386,8 +388,8 @@ fn room_id_to_chunk(room_id: ruma::OwnedRoomId) -> Result<PublicRoomsChunk> {
.room_state_get(&room_id, &StateEventType::RoomCreate, "")? .room_state_get(&room_id, &StateEventType::RoomCreate, "")?
.map(|s| { .map(|s| {
serde_json::from_str::<RoomCreateEventContent>(s.content.get()) serde_json::from_str::<RoomCreateEventContent>(s.content.get())
.map_err(|e| { .map_err(|error| {
error!("Invalid room create event in database: {}", e); error!(%error, "Invalid room create event in database");
Error::BadDatabase("Invalid room create event in database.") Error::BadDatabase("Invalid room create event in database.")
}) })
}) })