Browse Source

Count every file Send toward USER_SEND_LIMIT

pull/7918/head
Daniel García 2 weeks ago
parent
commit
57553d9fe4
No known key found for this signature in database GPG Key ID: FC8A7D14C3CD543A
  1. 11
      src/api/core/sends.rs
  2. 1
      src/db/models/send.rs

11
src/api/core/sends.rs

@ -268,11 +268,12 @@ async fn post_send_file_v2(data: Json<SendData>, headers: Headers, conn: DbConn)
let file_id = crate::crypto::generate_send_file_id(); let file_id = crate::crypto::generate_send_file_id();
let mut data_value: Value = serde_json::from_str(&send.data)?; let mut data_value: Value = serde_json::from_str(&send.data)?;
if let Some(o) = data_value.as_object_mut() { let Some(o) = data_value.as_object_mut() else {
o.insert(String::from("id"), Value::String(file_id.clone())); err!("Invalid Send file data")
o.insert(String::from("size"), Value::Number(file_length.into())); };
o.insert(String::from("sizeName"), Value::String(crate::util::get_display_size(file_length))); o.insert(String::from("id"), Value::String(file_id.clone()));
} o.insert(String::from("size"), Value::Number(file_length.into()));
o.insert(String::from("sizeName"), Value::String(crate::util::get_display_size(file_length)));
send.data = serde_json::to_string(&data_value)?; send.data = serde_json::to_string(&data_value)?;
send.save(&conn).await?; send.save(&conn).await?;

1
src/db/models/send.rs

@ -334,7 +334,6 @@ impl Send {
pub async fn size_by_user(user_uuid: &UserId, conn: &DbConn) -> Option<i64> { pub async fn size_by_user(user_uuid: &UserId, conn: &DbConn) -> Option<i64> {
#[derive(serde::Deserialize)] #[derive(serde::Deserialize)]
struct FileData { struct FileData {
#[serde(rename = "size", alias = "Size")]
size: NumberOrString, size: NumberOrString,
} }

Loading…
Cancel
Save