Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-26 05:50:29 +01:00
Apply rustfmt.
Because apparently CLion's default formatting is not the same as rustfmt for some reason.
Dieser Commit ist enthalten in:
Ursprung
31595888ea
Commit
84bcac0112
2 geänderte Dateien mit 9 neuen und 10 gelöschten Zeilen
|
@ -2,20 +2,20 @@ use std::collections::{HashMap, HashSet};
|
||||||
|
|
||||||
use chrono::{NaiveDateTime, Utc};
|
use chrono::{NaiveDateTime, Utc};
|
||||||
use futures::{stream, stream::StreamExt};
|
use futures::{stream, stream::StreamExt};
|
||||||
|
use rocket::fs::TempFile;
|
||||||
|
use rocket::serde::json::Json;
|
||||||
use rocket::{
|
use rocket::{
|
||||||
form::{Form, FromForm},
|
form::{Form, FromForm},
|
||||||
Route,
|
Route,
|
||||||
};
|
};
|
||||||
use rocket::fs::TempFile;
|
|
||||||
use rocket::serde::json::Json;
|
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
api::{self, EmptyResult, JsonResult, JsonUpcase, Notify, PasswordData, UpdateType},
|
api::{self, EmptyResult, JsonResult, JsonUpcase, Notify, PasswordData, UpdateType},
|
||||||
auth::Headers,
|
auth::Headers,
|
||||||
CONFIG,
|
|
||||||
crypto,
|
crypto,
|
||||||
db::{DbConn, DbPool, models::*},
|
db::{models::*, DbConn, DbPool},
|
||||||
|
CONFIG,
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::folders::FolderData;
|
use super::folders::FolderData;
|
||||||
|
@ -805,7 +805,7 @@ async fn share_cipher_by_uuid(
|
||||||
nt,
|
nt,
|
||||||
UpdateType::CipherUpdate,
|
UpdateType::CipherUpdate,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(Json(cipher.to_json(&headers.host, &headers.user.uuid, None, conn).await))
|
Ok(Json(cipher.to_json(&headers.host, &headers.user.uuid, None, conn).await))
|
||||||
}
|
}
|
||||||
|
@ -1001,7 +1001,7 @@ async fn save_attachment(
|
||||||
|
|
||||||
match data.data.persist_to(&file_path).await {
|
match data.data.persist_to(&file_path).await {
|
||||||
Ok(_result) => {}
|
Ok(_result) => {}
|
||||||
Err(_error) => data.data.move_copy_to(&file_path).await?
|
Err(_error) => data.data.move_copy_to(&file_path).await?,
|
||||||
}
|
}
|
||||||
|
|
||||||
nt.send_cipher_update(UpdateType::CipherUpdate, &cipher, &cipher.update_users_revision(&conn).await).await;
|
nt.send_cipher_update(UpdateType::CipherUpdate, &cipher, &cipher.update_users_revision(&conn).await).await;
|
||||||
|
|
|
@ -10,9 +10,9 @@ use serde_json::Value;
|
||||||
use crate::{
|
use crate::{
|
||||||
api::{ApiResult, EmptyResult, JsonResult, JsonUpcase, Notify, NumberOrString, UpdateType},
|
api::{ApiResult, EmptyResult, JsonResult, JsonUpcase, Notify, NumberOrString, UpdateType},
|
||||||
auth::{ClientIp, Headers, Host},
|
auth::{ClientIp, Headers, Host},
|
||||||
CONFIG,
|
db::{models::*, DbConn, DbPool},
|
||||||
db::{DbConn, DbPool, models::*},
|
|
||||||
util::SafeString,
|
util::SafeString,
|
||||||
|
CONFIG,
|
||||||
};
|
};
|
||||||
|
|
||||||
const SEND_INACCESSIBLE_MSG: &str = "Send does not exist or is no longer available";
|
const SEND_INACCESSIBLE_MSG: &str = "Send does not exist or is no longer available";
|
||||||
|
@ -226,10 +226,9 @@ async fn post_send_file(data: Form<UploadData<'_>>, headers: Headers, conn: DbCo
|
||||||
let file_path = folder_path.join(&file_id);
|
let file_path = folder_path.join(&file_id);
|
||||||
tokio::fs::create_dir_all(&folder_path).await?;
|
tokio::fs::create_dir_all(&folder_path).await?;
|
||||||
|
|
||||||
|
|
||||||
match data.persist_to(&file_path).await {
|
match data.persist_to(&file_path).await {
|
||||||
Ok(_result) => {}
|
Ok(_result) => {}
|
||||||
Err(_error) => data.move_copy_to(&file_path).await?
|
Err(_error) => data.move_copy_to(&file_path).await?,
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut data_value: Value = serde_json::from_str(&send.data)?;
|
let mut data_value: Value = serde_json::from_str(&send.data)?;
|
||||||
|
|
Laden …
In neuem Issue referenzieren