jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

chore: switch to method chaining over macro

Browse Source
This commit is contained in:
Zomatree
2025-08-12 03:12:27 +01:00
parent 789dedd9f1
commit 1a60aecdb3
7 changed files with 112 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/services/autumn/src/api.rs
View File

@@ -12,12 +12,12 @@ use axum::{
};
use axum_typed_multipart::{FieldData, TryFromMultipart, TypedMultipart};
use lazy_static::lazy_static;
use revolt_config::{config, report_internal_error};
use revolt_config::config;
use revolt_database::{iso8601_timestamp::Timestamp, Database, FileHash, Metadata, User};
use revolt_files::{
create_thumbnail, decode_image, fetch_from_s3, upload_to_s3, AUTHENTICATION_TAG_SIZE_BYTES,
};
use revolt_result::{create_error, Error, Result};
use revolt_result::{create_error, Error, Result, ToRevoltError};
use serde::{Deserialize, Serialize};
use sha2::Digest;
use tempfile::NamedTempFile;
@@ -181,7 +181,7 @@ async fn upload_file(
// Load file to memory
let mut buf = Vec::<u8>::new();
report_internal_error!(file.contents.read_to_end(&mut buf))?;
file.contents.read_to_end(&mut buf).to_internal_error()?;
// Take note of original file size
let original_file_size = buf.len();

16
crates/services/autumn/src/clamav.rs
View File

@@ -1,7 +1,7 @@
use std::time::Duration;
use revolt_config::{config, report_internal_error};
use revolt_result::Result;
use revolt_config::config;
use revolt_result::{Result, ToRevoltError};
/// Initialise ClamAV
pub async fn init() {
@@ -38,12 +38,12 @@ pub async fn is_malware(buf: &[u8]) -> Result<bool> {
if config.files.clamd_host.is_empty() {
Ok(false)
} else {
let scan_response = report_internal_error!(revolt_clamav_client::scan_buffer_tcp(
buf,
config.files.clamd_host,
None
))?;
let scan_response =
revolt_clamav_client::scan_buffer_tcp(buf, config.files.clamd_host, None)
.to_internal_error()?;
report_internal_error!(revolt_clamav_client::clean(&scan_response)).map(|v| !v)
revolt_clamav_client::clean(&scan_response)
.to_internal_error()
.map(|v| !v)
}
}

92
crates/services/autumn/src/exif.rs
View File

@@ -2,9 +2,8 @@ use std::io::{Cursor, Read};
use exif::Reader;
use image::{ImageFormat, ImageReader};
use revolt_config::report_internal_error;
use revolt_database::Metadata;
use revolt_result::{create_error, Result};
use revolt_result::{create_error, Result, ToRevoltError};
use tempfile::NamedTempFile;
use tokio::process::Command;
@@ -41,11 +40,11 @@ pub async fn strip_metadata(
let mut cursor = Cursor::new(buf);
// Decode the image
let image = report_internal_error!(report_internal_error!(ImageReader::new(
&mut cursor
)
.with_guessed_format())?
.decode());
let image = ImageReader::new(&mut cursor)
.with_guessed_format()
.to_internal_error()?
.decode()
.to_internal_error()?;
// Reset read position
cursor.set_position(0);
@@ -66,15 +65,15 @@ pub async fn strip_metadata(
// Apply the EXIF rotation
// See https://jdhao.github.io/2019/07/31/image_rotation_exif_info/
report_internal_error!(match &rotation {
2 => image?.fliph(),
3 => image?.rotate180(),
4 => image?.rotate180().fliph(),
5 => image?.rotate90().fliph(),
6 => image?.rotate90(),
7 => image?.rotate270().fliph(),
8 => image?.rotate270(),
_ => image?,
match &rotation {
2 => image.fliph(),
3 => image.rotate180(),
4 => image.rotate180().fliph(),
5 => image.rotate90().fliph(),
6 => image.rotate90(),
7 => image.rotate270().fliph(),
8 => image.rotate270(),
_ => image,
}
.write_to(
&mut writer,
@@ -85,7 +84,7 @@ pub async fn strip_metadata(
"image/tiff" => ImageFormat::Tiff,
_ => todo!(),
},
))?;
).to_internal_error()?;
// Calculate dimensions after rotation.
let (width, height) = match &rotation {
@@ -113,44 +112,43 @@ pub async fn strip_metadata(
};
// Temporary output file
let mut out_file = report_internal_error!(NamedTempFile::new())?;
let mut out_file = NamedTempFile::new().to_internal_error()?;
// Process the file with ffmpeg
report_internal_error!(
Command::new("ffmpeg")
.args([
// Overwrite the temporary file
"-y",
// Read original uploaded file
"-i",
file.path().to_str().ok_or(create_error!(InternalError))?,
// Strip any metadata
"-map_metadata",
"-1",
// Copy video / audio data to new file
"-c:v",
"copy",
"-c:a",
"copy",
// Select correct file format
"-f",
ext,
// Save to new temporary file
out_file
.path()
.to_str()
.ok_or(create_error!(InternalError))?,
])
.output()
.await
)?;
Command::new("ffmpeg")
.args([
// Overwrite the temporary file
"-y",
// Read original uploaded file
"-i",
file.path().to_str().ok_or(create_error!(InternalError))?,
// Strip any metadata
"-map_metadata",
"-1",
// Copy video / audio data to new file
"-c:v",
"copy",
"-c:a",
"copy",
// Select correct file format
"-f",
ext,
// Save to new temporary file
out_file
.path()
.to_str()
.ok_or(create_error!(InternalError))?,
])
.output()
.await
.to_internal_error()?;
// Probe the file again
let metadata = crate::metadata::generate_metadata(&out_file, mime);
// Read the file from disk
let mut buf = Vec::<u8>::new();
report_internal_error!(out_file.read_to_end(&mut buf))?;
out_file.read_to_end(&mut buf).to_internal_error()?;
Ok((buf, metadata))
}

20
crates/services/january/src/requests.rs
View File

@@ -6,10 +6,9 @@ use reqwest::{
header::{self, CONTENT_TYPE},
redirect, Client, Response,
};
use revolt_config::report_internal_error;
use revolt_files::{create_thumbnail, decode_image, image_size_vec, is_valid_image, video_size};
use revolt_models::v0::{Embed, Image, ImageSize, Video};
use revolt_result::{create_error, Error, Result};
use revolt_result::{create_error, Error, Result, ToRevoltError};
use std::{
io::{Cursor, Write},
time::Duration,
@@ -76,7 +75,7 @@ impl Request {
let Request { response, mime } = Request::new(url).await?;
if matches!(mime.type_(), mime::IMAGE | mime::VIDEO) {
let bytes = report_internal_error!(response.bytes().await);
let bytes = response.bytes().await.to_internal_error();
let result = match bytes {
Ok(bytes) => {
@@ -100,8 +99,8 @@ impl Request {
))
}
} else {
let mut file = report_internal_error!(tempfile::NamedTempFile::new())?;
report_internal_error!(file.write_all(&bytes))?;
let mut file = tempfile::NamedTempFile::new().to_internal_error()?;
file.write_all(&bytes).to_internal_error()?;
if video_size(&file).is_some() {
Ok((mime.to_string(), bytes.to_vec()))
@@ -144,7 +143,7 @@ impl Request {
};
if let Some((width, height)) = image_size_vec(
&report_internal_error!(request.response.bytes().await)?,
&request.response.bytes().await.to_internal_error()?,
request.mime.as_ref(),
) {
Ok(Some(Image {
@@ -181,10 +180,9 @@ impl Request {
}
};
let mut file = report_internal_error!(tempfile::NamedTempFile::new())?;
report_internal_error!(
file.write_all(&report_internal_error!(response.bytes().await)?)
)?;
let mut file = tempfile::NamedTempFile::new().to_internal_error()?;
file.write_all(&response.bytes().await.to_internal_error()?)
.to_internal_error()?;
if let Some((width, height)) = video_size(&file) {
Ok(Some(Video {
@@ -230,7 +228,7 @@ impl Request {
let encoding =
Encoding::for_label(encoding_name.as_bytes()).unwrap_or(&UTF_8_INIT);
let bytes = report_internal_error!(request.response.bytes().await)?;
let bytes = request.response.bytes().await.to_internal_error()?;
let (text, _, _) = encoding.decode(&bytes);
crate::website_embed::create_website_embed(&url, &text)