aitzol
/
Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependencies (#440)

This commit is contained in:
Baptiste Gelez 2019-02-13 13:39:30 +01:00 committed by GitHub
parent a8b1f1107e
commit 77bfe635d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 568 additions and 516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1071
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
Cargo.toml
View File

@ -49,7 +49,7 @@ version = "*"
[dependencies.multipart] [dependencies.multipart]
default-features = false default-features = false
features = ["server"] features = ["server"]
version = "0.15" version = "0.16"
[dependencies.plume-api] [dependencies.plume-api]
path = "plume-api" path = "plume-api"

1
plume-models/src/lib.rs
View File

@ -1,4 +1,3 @@
#![allow(proc_macro_derive_resolution_fallback)] // This can be removed after diesel-1.4
#![feature(try_trait)] #![feature(try_trait)]
extern crate activitypub; extern crate activitypub;

10
src/routes/medias.rs
View File

@ -32,14 +32,14 @@ pub fn upload(user: User, data: Data, ct: &ContentType, conn: DbConn) -> Result<
SaveResult::Full(entries) => { SaveResult::Full(entries) => {
let fields = entries.fields; let fields = entries.fields;
let filename = fields.get(&"file".to_string()).and_then(|v| v.into_iter().next()) let filename = fields.get("file").and_then(|v| v.into_iter().next())
.ok_or_else(|| status::BadRequest(Some("No file uploaded")))?.headers .ok_or_else(|| status::BadRequest(Some("No file uploaded")))?.headers
.filename.clone(); .filename.clone();
let ext = filename.and_then(|f| f.rsplit('.').next().map(|ext| ext.to_owned())) let ext = filename.and_then(|f| f.rsplit('.').next().map(|ext| ext.to_owned()))
.unwrap_or_else(|| "png".to_owned()); .unwrap_or_else(|| "png".to_owned());
let dest = format!("static/media/{}.{}", GUID::rand().to_string(), ext); let dest = format!("static/media/{}.{}", GUID::rand().to_string(), ext);
match fields[&"file".to_string()][0].data { match fields["file"][0].data {
SavedData::Bytes(ref bytes) => fs::write(&dest, bytes).map_err(|_| status::BadRequest(Some("Couldn't save upload")))?, SavedData::Bytes(ref bytes) => fs::write(&dest, bytes).map_err(|_| status::BadRequest(Some("Couldn't save upload")))?,
SavedData::File(ref path, _) => {fs::copy(path, &dest).map_err(|_| status::BadRequest(Some("Couldn't copy upload")))?;}, SavedData::File(ref path, _) => {fs::copy(path, &dest).map_err(|_| status::BadRequest(Some("Couldn't copy upload")))?;},
_ => { _ => {
@ -47,15 +47,15 @@ pub fn upload(user: User, data: Data, ct: &ContentType, conn: DbConn) -> Result<
} }
} }
let has_cw = !read(&fields[&"cw".to_string()][0].data).map(|cw| cw.is_empty()).unwrap_or(false); let has_cw = !read(&fields["cw"][0].data).map(|cw| cw.is_empty()).unwrap_or(false);
let media = Media::insert(&*conn, NewMedia { let media = Media::insert(&*conn, NewMedia {
file_path: dest, file_path: dest,
alt_text: read(&fields[&"alt".to_string()][0].data)?, alt_text: read(&fields["alt"][0].data)?,
is_remote: false, is_remote: false,
remote_url: None, remote_url: None,
sensitive: has_cw, sensitive: has_cw,
content_warning: if has_cw { content_warning: if has_cw {
Some(read(&fields[&"cw".to_string()][0].data)?) Some(read(&fields["cw"][0].data)?)
} else { } else {
None None
}, },