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

feat: better error handling

Browse Source
This commit is contained in:
Zomatree
2025-07-01 19:06:38 +01:00
parent ed22b3a5ce
commit 3d6f39a0eb
17 changed files with 336 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/core/files/Cargo.toml
View File

@@ -14,7 +14,7 @@ imagesize = "0.13.0"
tempfile = "3.12.0"
base64 = "0.22.1"
aes-gcm = "0.10.3"
aes-gcm = { version = "0.10.3", features = ["std"] }
typenum = "1.17.0"
aws-config = "1.5.5"

6
crates/core/files/src/lib.rs
View File

@@ -6,7 +6,7 @@ use aes_gcm::{
};
use image::{DynamicImage, ImageBuffer};
use revolt_config::{config, report_internal_error, FilesS3};
use revolt_result::{create_error, Result};
use revolt_result::{create_error, Result, ToRevoltError};
use aws_sdk_s3::{
config::{Credentials, Region},
@@ -78,7 +78,7 @@ pub async fn fetch_from_s3(bucket_id: &str, path: &str, nonce: &str) -> Result<V
// Decrypt the file
create_cipher(&config.files.encryption_key)
.decrypt_in_place(nonce, b"", &mut buf)
.map_err(|_| create_error!(InternalError))?;
.to_internal_error()?;
Ok(buf)
}
@@ -97,7 +97,7 @@ pub async fn upload_to_s3(bucket_id: &str, path: &str, buf: &[u8]) -> Result<Str
// Encrypt the file in place
create_cipher(&config.files.encryption_key)
.encrypt_in_place(&nonce, b"", &mut buf)
.map_err(|_| create_error!(InternalError))?;
.to_internal_error()?;
// Upload the file to remote
report_internal_error!(