Media upload
This commit is contained in:
@@ -1,7 +1,11 @@
|
||||
use diesel::{self, PgConnection, QueryDsl, ExpressionMethods, RunQueryDsl};
|
||||
use serde_json;
|
||||
|
||||
use ap_url;
|
||||
use instance::Instance;
|
||||
use schema::medias;
|
||||
|
||||
#[derive(Queryable)]
|
||||
#[derive(Queryable, Serialize)]
|
||||
pub struct Media {
|
||||
pub id: i32,
|
||||
pub file_path: String,
|
||||
@@ -9,7 +13,8 @@ pub struct Media {
|
||||
pub is_remote: bool,
|
||||
pub remote_url: Option<String>,
|
||||
pub sensitive: bool,
|
||||
pub content_warning: Option<String>
|
||||
pub content_warning: Option<String>,
|
||||
pub owner_id: i32
|
||||
}
|
||||
|
||||
#[derive(Insertable)]
|
||||
@@ -20,10 +25,38 @@ pub struct NewMedia {
|
||||
pub is_remote: bool,
|
||||
pub remote_url: Option<String>,
|
||||
pub sensitive: bool,
|
||||
pub content_warning: Option<String>
|
||||
pub content_warning: Option<String>,
|
||||
pub owner_id: i32
|
||||
}
|
||||
|
||||
impl Media {
|
||||
insert!(medias, NewMedia);
|
||||
get!(medias);
|
||||
list_by!(medias, for_user, owner_id as i32);
|
||||
|
||||
pub fn to_json(&self, conn: &PgConnection) -> serde_json::Value {
|
||||
let mut json = serde_json::to_value(self).unwrap();
|
||||
let (preview, html) = match self.file_path.rsplitn(2, '.').next().unwrap() {
|
||||
"png" | "jpg" | "jpeg" | "gif" => (
|
||||
format!("<img src=\"{}\" alt=\"{}\" title=\"{}\" class=\"preview\">", self.url(conn), self.alt_text, self.alt_text),
|
||||
format!("<img src=\"{}\" alt=\"{}\" title=\"{}\">", self.url(conn), self.alt_text, self.alt_text)
|
||||
),
|
||||
"mp3" | "wav" | "flac" => (
|
||||
format!("<audio src=\"{}\" title=\"{}\" class=\"preview\"></audio>", self.url(conn), self.alt_text),
|
||||
format!("<audio src=\"{}\" title=\"{}\"></audio>", self.url(conn), self.alt_text)
|
||||
),
|
||||
"mp4" | "avi" | "webm" | "mov" => (
|
||||
format!("<video src=\"{}\" title=\"{}\" class=\"preview\"></video>", self.url(conn), self.alt_text),
|
||||
format!("<video src=\"{}\" title=\"{}\"></video>", self.url(conn), self.alt_text)
|
||||
),
|
||||
_ => (String::new(), String::new())
|
||||
};
|
||||
json["html_preview"] = json!(preview);
|
||||
json["html"] = json!(html);
|
||||
json
|
||||
}
|
||||
|
||||
pub fn url(&self, conn: &PgConnection) -> String {
|
||||
ap_url(format!("{}/static/{}", Instance::get_local(conn).unwrap().public_domain, self.file_path))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,6 +81,7 @@ table! {
|
||||
remote_url -> Nullable<Text>,
|
||||
sensitive -> Bool,
|
||||
content_warning -> Nullable<Text>,
|
||||
owner_id -> Int4,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,6 +165,7 @@ joinable!(comments -> posts (post_id));
|
||||
joinable!(comments -> users (author_id));
|
||||
joinable!(likes -> posts (post_id));
|
||||
joinable!(likes -> users (user_id));
|
||||
joinable!(medias -> users (owner_id));
|
||||
joinable!(mentions -> comments (comment_id));
|
||||
joinable!(mentions -> posts (post_id));
|
||||
joinable!(mentions -> users (mentioned_id));
|
||||
|
||||
Reference in New Issue
Block a user