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

refactor: Fix errors in api/server/media.rs

Browse Source
This commit is contained in:
Ginger
2026-04-28 09:16:52 -04:00
parent 0406f755c2
commit 78d9c29a05
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/server/media.rs
+21 -23
View File
@@ -2,12 +2,10 @@ use axum::extract::State;
use axum_client_ip::ClientIp; use axum_client_ip::ClientIp;
use conduwuit::{Err, Result, utils::content_disposition::make_content_disposition}; use conduwuit::{Err, Result, utils::content_disposition::make_content_disposition};
use conduwuit_service::media::{Dim, FileMeta}; use conduwuit_service::media::{Dim, FileMeta};
use ruma::{ use ruma::api::federation::authenticated_media::{
Mxc, Content, ContentMetadata, FileOrLocation, get_content, get_content_thumbnail,
api::federation::authenticated_media::{
Content, ContentMetadata, FileOrLocation, get_content, get_content_thumbnail,
},
}; };
use service::media::mxc::Mxc;
use crate::Ruma; use crate::Ruma;
@@ -41,16 +39,16 @@ pub(crate) async fn get_content_route(
let content_disposition = let content_disposition =
make_content_disposition(content_disposition.as_ref(), content_type.as_deref(), None); make_content_disposition(content_disposition.as_ref(), content_type.as_deref(), None);
let content = Content { let content = Content::new(
file: content.expect("entire file contents"), content.expect("entire file contents"),
content_type: content_type.map(Into::into), content_type.unwrap_or_default(),
content_disposition: Some(content_disposition), content_disposition,
}; );
Ok(get_content::v1::Response { Ok(get_content::v1::Response::new(
content: FileOrLocation::File(content), ContentMetadata::new(),
metadata: ContentMetadata::new(), FileOrLocation::File(content),
}) ))
} }
/// # `GET /_matrix/federation/v1/media/thumbnail/{mediaId}` /// # `GET /_matrix/federation/v1/media/thumbnail/{mediaId}`
@@ -84,14 +82,14 @@ pub(crate) async fn get_content_thumbnail_route(
let content_disposition = let content_disposition =
make_content_disposition(content_disposition.as_ref(), content_type.as_deref(), None); make_content_disposition(content_disposition.as_ref(), content_type.as_deref(), None);
let content = Content { let content = Content::new(
file: content.expect("entire file contents"), content.expect("entire file contents"),
content_type: content_type.map(Into::into), content_type.unwrap_or_default(),
content_disposition: Some(content_disposition), content_disposition,
}; );
Ok(get_content_thumbnail::v1::Response { Ok(get_content_thumbnail::v1::Response::new(
content: FileOrLocation::File(content), ContentMetadata::new(),
metadata: ContentMetadata::new(), FileOrLocation::File(content),
}) ))
} }