From ca51993ee35fbafbc132e9e99a89dfc82ae56b06 Mon Sep 17 00:00:00 2001 From: timedout Date: Sun, 25 Jan 2026 04:22:43 +0000 Subject: [PATCH] fix: Deserialisation error breaks logins --- src/api/client/media.rs | 4 ++-- src/service/media/data.rs | 2 +- src/service/users/mod.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/client/media.rs b/src/api/client/media.rs index 468291bb..e3b99887 100644 --- a/src/api/client/media.rs +++ b/src/api/client/media.rs @@ -5,7 +5,7 @@ use axum_client_ip::InsecureClientIp; use conduwuit::{ Err, Result, debug::DebugInspect, - debug_info, err, info, + debug_info, err, utils::{self, content_disposition::make_content_disposition, math::ruma_from_usize}, warn, }; @@ -297,7 +297,7 @@ pub(crate) async fn redact_media_route( media_id: &body.media_id, }; - if !services.media.user_owns(&user, &mxc).await { + if !services.media.user_owns(user, &mxc).await { return Err!(Request(Forbidden("You do not have permission to redact this attachment."))); } diff --git a/src/service/media/data.rs b/src/service/media/data.rs index fb2b6c46..05d8a0c2 100644 --- a/src/service/media/data.rs +++ b/src/service/media/data.rs @@ -310,7 +310,7 @@ impl Data { pub(super) fn add_interested_server_name(&self, media_id: &str, server_name: &str) { let key = (media_id, server_name); self.mediaid_interestedservername - .insert(&database::serialize_key(&key).expect("key must be serializable"), []); + .insert(&database::serialize_key(key).expect("key must be serializable"), []); } pub(super) async fn interested_server_names(&self, media_id: &str) -> Vec { diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs index c79e4f72..80040fa3 100644 --- a/src/service/users/mod.rs +++ b/src/service/users/mod.rs @@ -304,7 +304,7 @@ impl Service { pub fn enable_login(&self, user_id: &UserId) { self.db.userid_logindisabled.remove(user_id); } pub async fn is_login_disabled(&self, user_id: &UserId) -> bool { - self.db.userid_logindisabled.contains(user_id).await + self.db.userid_logindisabled.exists(user_id).await.is_ok() } /// Check if account is active, infallible