From 3987331c3b0735aa844cdf1cc7b9702bd5bba657 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Tue, 19 May 2026 20:26:04 +0100 Subject: [PATCH] chore: Fix clippy warnings --- src/api/client/report.rs | 12 ++++++------ src/core/utils/tests.rs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/api/client/report.rs b/src/api/client/report.rs index 3917754dc..5267df110 100644 --- a/src/api/client/report.rs +++ b/src/api/client/report.rs @@ -219,14 +219,14 @@ async fn is_event_report_valid( fn build_report(report: Report) -> RoomMessageEventContent { let mut text = format!("@room New {} report received from {}:\n\n", report.report_type, report.sender); - if report.user_id.is_some() { - let _ = writeln!(text, "- Reported User ID: `{}`", report.user_id.unwrap()); + if let Some(user_id) = report.user_id { + let _ = writeln!(text, "- Reported User ID: `{user_id}`"); } - if report.room_id.is_some() { - let _ = writeln!(text, "- Reported Room ID: `{}`", report.room_id.unwrap()); + if let Some(room_id) = report.room_id { + let _ = writeln!(text, "- Reported Room ID: `{room_id}`"); } - if report.event_id.is_some() { - let _ = writeln!(text, "- Reported Event ID: `{}`", report.event_id.unwrap()); + if let Some(event_id) = report.event_id { + let _ = writeln!(text, "- Reported Event ID: `{event_id}`"); } let _ = writeln!(text, "- Report Reason: {}", report.reason); diff --git a/src/core/utils/tests.rs b/src/core/utils/tests.rs index 69fc1a3bc..e131f407d 100644 --- a/src/core/utils/tests.rs +++ b/src/core/utils/tests.rs @@ -284,11 +284,11 @@ fn is_within_bounds() { use utils::time::{TimeDirection, is_within_bounds}; let now = SystemTime::now(); - let yesterday = now - Duration::from_secs(86400); + let yesterday = now - Duration::from_hours(24); assert!(is_within_bounds(yesterday, now, TimeDirection::Before)); assert!(!is_within_bounds(yesterday, now, TimeDirection::After)); - let tomorrow = now + Duration::from_secs(86400); + let tomorrow = now + Duration::from_hours(24); assert!(is_within_bounds(tomorrow, now, TimeDirection::After)); assert!(!is_within_bounds(tomorrow, now, TimeDirection::Before));