style: Fix clippy

This commit is contained in:
Jade Ellis 2025-12-19 00:35:38 +00:00
parent 705fa6c5c6
commit 8fd15f26ce
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
2 changed files with 5 additions and 9 deletions

View file

@ -1,11 +1,11 @@
use axum::extract::State;
use conduwuit::{
Result, at, debug_warn, err,
Err, Result, at, debug_warn,
matrix::{Event, event::RelationTypeEqual, pdu::PduCount},
utils::{IterStream, ReadyExt, result::FlatOk, stream::WidebandExt},
};
use conduwuit_service::Services;
use futures::{StreamExt, TryFutureExt};
use futures::StreamExt;
use ruma::{
EventId, RoomId, UInt, UserId,
api::{
@ -113,9 +113,10 @@ async fn paginate_relations_with_filter(
.rooms
.state_accessor
.user_can_see_event(sender_user, room_id, target)
.await
{
debug_warn!(req_evt = ?target, ?room_id, "Event relations requested by {sender_user} but is not allowed to see it, returning 404");
return err!(Request(NotFound("Event not found.")));
return Err!(Request(NotFound("Event not found.")));
}
let start: PduCount = from
@ -138,11 +139,6 @@ async fn paginate_relations_with_filter(
// Spec (v1.10) recommends depth of at least 3
let depth: u8 = if recurse { 3 } else { 1 };
// Check if this is a thread request
let is_thread = filter_rel_type
.as_ref()
.is_some_and(|rel| *rel == RelationType::Thread);
let events: Vec<_> = services
.rooms
.pdu_metadata

View file

@ -50,7 +50,7 @@ pub(crate) async fn search_events_route(
Ok(Response {
search_categories: ResultCategories {
room_events: room_events_result
room_events: Box::pin(room_events_result)
.await
.unwrap_or_else(|| Ok(ResultRoomEvents::default()))?,
},