Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolve compile errors

Browse Source 
me and cargo check are oops now
This commit is contained in:
timedout
2025-12-31 18:31:42 +00:00
committed by Jade Ellis
parent 41e628892d
commit bf200ad12d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/client/room/summary.rs
+10 -10
View File
@@ -3,11 +3,10 @@ use axum_client_ip::InsecureClientIp;
use conduwuit::{ use conduwuit::{
Err, Result, debug, debug_warn, info, trace, Err, Result, debug, debug_warn, info, trace,
utils::{IterStream, future::TryExtExt}, utils::{IterStream, future::TryExtExt},
warn,
}; };
use futures::{ use futures::{
FutureExt, StreamExt, TryFutureExt, FutureExt, StreamExt, TryFutureExt,
future::{OptionFuture, join, join3, ok}, future::{OptionFuture, join3},
stream::FuturesUnordered, stream::FuturesUnordered,
}; };
use ruma::{ use ruma::{
@@ -118,15 +117,16 @@ async fn local_room_summary_response(
sender_user: Option<&UserId>, sender_user: Option<&UserId>,
) -> Result<get_summary::msc3266::Response> { ) -> Result<get_summary::msc3266::Response> {
trace!(?sender_user, "Sending local room summary response for {room_id:?}"); trace!(?sender_user, "Sending local room summary response for {room_id:?}");
let join_rule = services.rooms.state_accessor.get_join_rules(room_id).await; let (join_rule, world_readable, guest_can_join) = join3(
services.rooms.state_accessor.get_join_rules(room_id),
services.rooms.state_accessor.is_world_readable(room_id),
services.rooms.state_accessor.guest_can_join(room_id),
)
.await;
// Synapse allows server admins to bypass visibility checks. // Synapse allows server admins to bypass visibility checks.
// That seems neat so we'll copy that behaviour. // That seems neat so we'll copy that behaviour.
if sender_user.is_none() || !services.users.is_admin(sender_user.unwrap()).await { if sender_user.is_none() || !services.users.is_admin(sender_user.unwrap()).await {
let world_readable = services.rooms.state_accessor.is_world_readable(room_id);
let guest_can_join = services.rooms.state_accessor.guest_can_join(room_id);
let (world_readable, guest_can_join) = join(world_readable, guest_can_join).await;
trace!("{join_rule:?}, {world_readable:?}, {guest_can_join:?}");
user_can_see_summary( user_can_see_summary(
services, services,
room_id, room_id,
@@ -253,10 +253,10 @@ async fn remote_room_summary_hierarchy_response(
services services
.sending .sending
.send_federation_request(server, request.clone()) .send_federation_request(server, request.clone())
.inspect_ok(|v| { .inspect_ok(move |v| {
debug!("Fetched room summary for {room_id} from server {server}: {v:?}"); debug!("Fetched room summary for {room_id} from server {server}: {v:?}");
}) })
.inspect_err(|e| { .inspect_err(move |e| {
info!("Failed to fetch room summary for {room_id} from server {server}: {e}"); info!("Failed to fetch room summary for {room_id} from server {server}: {e}");
}) })
}) })