diff --git a/crates/app/src/routes/api/v1/auth/images.rs b/crates/app/src/routes/api/v1/auth/images.rs
index cbaf344..1e6087d 100644
--- a/crates/app/src/routes/api/v1/auth/images.rs
+++ b/crates/app/src/routes/api/v1/auth/images.rs
@@ -1,17 +1,12 @@
-use axum::{
- Extension, Json,
- body::Body,
- extract::{Path, Query},
- response::IntoResponse,
-};
+use axum::{Extension, Json, response::IntoResponse};
use crate::cookie::CookieJar;
-use pathbufd::{PathBufD, pathd};
-use serde::Deserialize;
-use std::{
- fs::{File, exists},
- io::Read,
+use pathbufd::PathBufD;
+use std::{fs::File, io::Read};
+use tetratto_core::model::{
+ permissions::FinePermission,
+ uploads::{MediaType, MediaUpload},
+ ApiReturn, Error,
};
-use tetratto_core::model::{permissions::FinePermission, ApiReturn, Error};
use crate::{
State,
@@ -29,139 +24,6 @@ pub fn read_image(path: PathBufD) -> Vec
{
bytes
}
-#[derive(Deserialize, PartialEq, Eq)]
-pub enum AvatarSelectorType {
- #[serde(alias = "username")]
- Username,
- #[serde(alias = "id")]
- Id,
-}
-
-#[derive(Deserialize)]
-pub struct AvatarSelectorQuery {
- pub selector_type: AvatarSelectorType,
-}
-
-/// Get a profile's avatar image
-/// `/api/v1/auth/user/{id}/avatar`
-pub async fn avatar_request(
- Path(selector): Path,
- Extension(data): Extension,
- Query(req): Query,
-) -> impl IntoResponse {
- let data = &(data.read().await).0;
-
- let user = match if req.selector_type == AvatarSelectorType::Id {
- data.get_user_by_id(match selector.parse::() {
- Ok(d) => d,
- Err(_) => {
- return Err((
- [("Content-Type", "image/svg+xml")],
- Body::from(read_image(PathBufD::current().extend(&[
- data.0.0.dirs.media.as_str(),
- "images",
- "default-avatar.svg",
- ]))),
- ));
- }
- })
- .await
- } else {
- data.get_user_by_username(&selector).await
- } {
- Ok(ua) => ua,
- Err(_) => {
- return Err((
- [("Content-Type", "image/svg+xml")],
- Body::from(read_image(PathBufD::current().extend(&[
- data.0.0.dirs.media.as_str(),
- "images",
- "default-avatar.svg",
- ]))),
- ));
- }
- };
-
- let mime = if user.settings.avatar_mime.is_empty() {
- "image/avif"
- } else {
- &user.settings.avatar_mime
- };
-
- let path = PathBufD::current().extend(&[
- data.0.0.dirs.media.as_str(),
- "avatars",
- &format!("{}.{}", &(user.id as i64), mime.replace("image/", "")),
- ]);
-
- if !exists(&path).unwrap() {
- return Err((
- [("Content-Type", "image/svg+xml")],
- Body::from(read_image(PathBufD::current().extend(&[
- data.0.0.dirs.media.as_str(),
- "images",
- "default-avatar.svg",
- ]))),
- ));
- }
-
- Ok((
- [("Content-Type".to_string(), mime.to_owned())],
- Body::from(read_image(path)),
- ))
-}
-
-/// Get a profile's banner image
-/// `/api/v1/auth/user/{id}/banner`
-pub async fn banner_request(
- Path(username): Path,
- Extension(data): Extension,
-) -> impl IntoResponse {
- let data = &(data.read().await).0;
-
- let user = match data.get_user_by_username(&username).await {
- Ok(ua) => ua,
- Err(_) => {
- return Err((
- [("Content-Type", "image/svg+xml")],
- Body::from(read_image(PathBufD::current().extend(&[
- data.0.0.dirs.media.as_str(),
- "images",
- "default-banner.svg",
- ]))),
- ));
- }
- };
-
- let mime = if user.settings.banner_mime.is_empty() {
- "image/avif"
- } else {
- &user.settings.banner_mime
- };
-
- let path = PathBufD::current().extend(&[
- data.0.0.dirs.media.as_str(),
- "banners",
- &format!("{}.{}", &(user.id as i64), mime.replace("image/", "")),
- ]);
-
- if !exists(&path).unwrap() {
- return Err((
- [("Content-Type", "image/svg+xml")],
- Body::from(read_image(PathBufD::current().extend(&[
- data.0.0.dirs.media.as_str(),
- "images",
- "default-banner.svg",
- ]))),
- ));
- }
-
- Ok((
- [("Content-Type".to_string(), mime.to_owned())],
- Body::from(read_image(path)),
- ))
-}
-
pub const MAXIMUM_FILE_SIZE: usize = 8388608;
pub const MAXIMUM_GIF_FILE_SIZE: usize = 2097152;
@@ -173,44 +35,57 @@ pub async fn upload_avatar_request(
) -> impl IntoResponse {
// get user from token
let data = &(data.read().await).0;
- let mut auth_user = match get_user_from_token!(jar, data) {
+ let auth_user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
- if img.1 == "image/gif" && !auth_user.permissions.check(FinePermission::SUPPORTER) {
- return Json(Error::RequiresSupporter.into());
- }
-
- let mime = if img.1 == "image/gif" {
- "image/gif"
+ if img.1 == "image/gif" {
+ if !auth_user.permissions.check(FinePermission::SUPPORTER) {
+ return Json(Error::RequiresSupporter.into());
+ } else {
+ if img.0.len() > MAXIMUM_GIF_FILE_SIZE {
+ return Json(Error::FileTooLarge.into());
+ }
+ }
} else {
- "image/avif"
- };
-
- if auth_user.settings.avatar_mime != mime {
- // mime changed; delete old image
- let path = pathd!(
- "{}/avatars/{}.{}",
- data.0.0.dirs.media,
- &auth_user.id,
- auth_user.settings.avatar_mime.replace("image/", "")
- );
-
- if std::fs::exists(&path).unwrap() {
- std::fs::remove_file(path).unwrap();
+ if img.0.len() > MAXIMUM_FILE_SIZE {
+ return Json(Error::FileTooLarge.into());
}
}
- let path = pathd!(
- "{}/avatars/{}.{}",
- data.0.0.dirs.media,
- &auth_user.id,
- mime.replace("image/", "")
+ // delete old upload
+ if let Ok(u) = data
+ .2
+ .get_upload_by_id_bucket(auth_user.id, "avatars")
+ .await
+ {
+ if let Err(e) = data.2.delete_upload_with_bucket(u.id, "avatars").await {
+ return Json(Error::MiscError(e.to_string()).into());
+ }
+ }
+
+ // create new upload
+ let mut new_upload = MediaUpload::new(
+ if img.1 == "image/gif" {
+ MediaType::Gif
+ } else {
+ MediaType::Avif
+ },
+ auth_user.id,
+ "avatars".to_string(),
);
+ new_upload.id = auth_user.id;
+
+ let upload = match data.2.create_upload(new_upload).await {
+ Ok(x) => x,
+ Err(e) => return Json(Error::MiscError(e.to_string()).into()),
+ };
+
// upload image (gif)
- if mime == "image/gif" {
+ let path = upload.path(&data.2.0.0.directory);
+ if img.1 == "image/gif" {
// gif image, don't encode
if img.0.len() > MAXIMUM_GIF_FILE_SIZE {
return Json(Error::FileTooLarge.into());
@@ -218,15 +93,6 @@ pub async fn upload_avatar_request(
std::fs::write(&path, img.0).unwrap();
- // update user settings
- auth_user.settings.avatar_mime = "image/gif".to_string();
- if let Err(e) = data
- .update_user_settings(auth_user.id, auth_user.settings)
- .await
- {
- return Json(e.into());
- }
-
// ...
return Json(ApiReturn {
ok: true,
@@ -235,28 +101,8 @@ pub async fn upload_avatar_request(
});
}
- // check file size
- if img.0.len() > MAXIMUM_FILE_SIZE {
- return Json(Error::FileTooLarge.into());
- }
-
- // update user settings
- auth_user.settings.avatar_mime = "image/avif".to_string();
- if let Err(e) = data
- .update_user_settings(auth_user.id, auth_user.settings)
- .await
- {
- return Json(e.into());
- }
-
// upload image
- let mut bytes = Vec::new();
-
- for byte in img.0 {
- bytes.push(byte);
- }
-
- match save_buffer(&path, bytes, image::ImageFormat::Avif) {
+ match save_buffer(&path.to_string(), img.0.to_vec(), image::ImageFormat::Avif) {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Avatar uploaded. It might take a bit to update".to_string(),
@@ -274,44 +120,57 @@ pub async fn upload_banner_request(
) -> impl IntoResponse {
// get user from token
let data = &(data.read().await).0;
- let mut auth_user = match get_user_from_token!(jar, data) {
+ let auth_user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
- if img.1 == "image/gif" && !auth_user.permissions.check(FinePermission::SUPPORTER) {
- return Json(Error::RequiresSupporter.into());
- }
-
- let mime = if img.1 == "image/gif" {
- "image/gif"
+ if img.1 == "image/gif" {
+ if !auth_user.permissions.check(FinePermission::SUPPORTER) {
+ return Json(Error::RequiresSupporter.into());
+ } else {
+ if img.0.len() > MAXIMUM_GIF_FILE_SIZE {
+ return Json(Error::FileTooLarge.into());
+ }
+ }
} else {
- "image/avif"
- };
-
- if auth_user.settings.banner_mime != mime {
- // mime changed; delete old image
- let path = pathd!(
- "{}/banners/{}.{}",
- data.0.0.dirs.media,
- &auth_user.id,
- auth_user.settings.banner_mime.replace("image/", "")
- );
-
- if std::fs::exists(&path).unwrap() {
- std::fs::remove_file(path).unwrap();
+ if img.0.len() > MAXIMUM_FILE_SIZE {
+ return Json(Error::FileTooLarge.into());
}
}
- let path = pathd!(
- "{}/banners/{}.{}",
- data.0.0.dirs.media,
- &auth_user.id,
- mime.replace("image/", "")
+ // delete old upload
+ if let Ok(u) = data
+ .2
+ .get_upload_by_id_bucket(auth_user.id, "banners")
+ .await
+ {
+ if let Err(e) = data.2.delete_upload_with_bucket(u.id, "banners").await {
+ return Json(Error::MiscError(e.to_string()).into());
+ }
+ }
+
+ // create new upload
+ let mut new_upload = MediaUpload::new(
+ if img.1 == "image/gif" {
+ MediaType::Gif
+ } else {
+ MediaType::Avif
+ },
+ auth_user.id,
+ "banners".to_string(),
);
+ new_upload.id = auth_user.id;
+
+ let upload = match data.2.create_upload(new_upload).await {
+ Ok(x) => x,
+ Err(e) => return Json(Error::MiscError(e.to_string()).into()),
+ };
+
// upload image (gif)
- if mime == "image/gif" {
+ let path = upload.path(&data.2.0.0.directory);
+ if img.1 == "image/gif" {
// gif image, don't encode
if img.0.len() > MAXIMUM_GIF_FILE_SIZE {
return Json(Error::FileTooLarge.into());
@@ -319,15 +178,6 @@ pub async fn upload_banner_request(
std::fs::write(&path, img.0).unwrap();
- // update user settings
- auth_user.settings.banner_mime = "image/gif".to_string();
- if let Err(e) = data
- .update_user_settings(auth_user.id, auth_user.settings)
- .await
- {
- return Json(e.into());
- }
-
// ...
return Json(ApiReturn {
ok: true,
@@ -336,28 +186,8 @@ pub async fn upload_banner_request(
});
}
- // check file size
- if img.0.len() > MAXIMUM_FILE_SIZE {
- return Json(Error::FileTooLarge.into());
- }
-
- // update user settings
- auth_user.settings.avatar_mime = "image/avif".to_string();
- if let Err(e) = data
- .update_user_settings(auth_user.id, auth_user.settings)
- .await
- {
- return Json(e.into());
- }
-
// upload image
- let mut bytes = Vec::new();
-
- for byte in img.0 {
- bytes.push(byte);
- }
-
- match save_buffer(&path, bytes, image::ImageFormat::Avif) {
+ match save_buffer(&path.to_string(), img.0.to_vec(), image::ImageFormat::Avif) {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Banner uploaded. It might take a bit to update".to_string(),
diff --git a/crates/app/src/routes/api/v1/mod.rs b/crates/app/src/routes/api/v1/mod.rs
index a5c92b3..5f94bd5 100644
--- a/crates/app/src/routes/api/v1/mod.rs
+++ b/crates/app/src/routes/api/v1/mod.rs
@@ -306,8 +306,6 @@ pub fn routes() -> Router {
"/auth/user/me/policy_consent",
post(auth::profile::policy_consent_request),
)
- .route("/auth/user/{id}/avatar", get(auth::images::avatar_request))
- .route("/auth/user/{id}/banner", get(auth::images::banner_request))
.route("/auth/user/{id}/follow", post(auth::social::follow_request))
.route(
"/auth/user/{id}/follow/toggle",
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index fefadbf..c5096c4 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -49,4 +49,4 @@ oiseau = { version = "0.1.2", default-features = false, features = [
], optional = true }
paste = { version = "1.0.15", optional = true }
tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] }
-buckets-core = "1.0.1"
+buckets-core = "1.0.4"
diff --git a/crates/core/src/database/auth.rs b/crates/core/src/database/auth.rs
index c9ad94f..88097be 100644
--- a/crates/core/src/database/auth.rs
+++ b/crates/core/src/database/auth.rs
@@ -11,8 +11,6 @@ use crate::model::{
ACHIEVEMENTS, AppliedConfigType,
},
};
-use pathbufd::PathBufD;
-use std::fs::{exists, remove_file};
use tetratto_shared::{
hash::{hash_salted, salt},
unix_epoch_timestamp,
@@ -618,35 +616,6 @@ impl DataManager {
self.delete_app(app.id, &user).await?;
}
- // remove images
- let avatar = PathBufD::current().extend(&[
- self.0.0.dirs.media.as_str(),
- "avatars",
- &format!(
- "{}.{}",
- &(user.id as i64),
- user.settings.avatar_mime.replace("image/", "")
- ),
- ]);
-
- let banner = PathBufD::current().extend(&[
- self.0.0.dirs.media.as_str(),
- "banners",
- &format!(
- "{}.{}",
- &(user.id as i64),
- user.settings.banner_mime.replace("image/", "")
- ),
- ]);
-
- if exists(&avatar).unwrap() {
- remove_file(avatar).unwrap();
- }
-
- if exists(&banner).unwrap() {
- remove_file(banner).unwrap();
- }
-
// delete uploads
for upload in match self.2.get_uploads_by_owner_all(user.id).await {
Ok(x) => x,
diff --git a/crates/core/src/database/drivers/mod.rs b/crates/core/src/database/drivers/mod.rs
index dc16c49..9e1e35f 100644
--- a/crates/core/src/database/drivers/mod.rs
+++ b/crates/core/src/database/drivers/mod.rs
@@ -18,6 +18,7 @@ impl DataManager {
pub async fn new(config: Config) -> Result {
let buckets_manager = BucketsManager::new(BucketsConfig {
directory: format!("{}/{}", config.dirs.media, "uploads"),
+ bucket_defaults: HashMap::new(),
database: config.database.clone(),
})
.await
diff --git a/crates/core/src/database/posts.rs b/crates/core/src/database/posts.rs
index 7f6b9fe..0bda649 100644
--- a/crates/core/src/database/posts.rs
+++ b/crates/core/src/database/posts.rs
@@ -1657,7 +1657,7 @@ impl DataManager {
let res = query_rows!(
&conn,
&format!(
- "SELECT * FROM posts WHERE (owner = {} {query_string}) AND replying_to = 0 AND is_deleted = 0 ORDER BY created DESC LIMIT $1 OFFSET $2",
+ "SELECT * FROM posts WHERE (owner = {id} OR owner = {} {query_string}) AND replying_to = 0 AND is_deleted = 0 ORDER BY created DESC LIMIT $1 OFFSET $2",
first.receiver
),
&[&(batch as i64), &((page * batch) as i64)],
diff --git a/crates/core/src/model/auth.rs b/crates/core/src/model/auth.rs
index 0f4799f..00bcfeb 100644
--- a/crates/core/src/model/auth.rs
+++ b/crates/core/src/model/auth.rs
@@ -298,9 +298,6 @@ pub struct UserSettings {
/// The user's status. Shows over connection info.
#[serde(default)]
pub status: String,
- /// The mime type of the user's avatar.
- #[serde(default = "mime_avif")]
- pub avatar_mime: String,
/// The mime type of the user's banner.
#[serde(default = "mime_avif")]
pub banner_mime: String,
diff --git a/manual_migrations/avatars.js b/manual_migrations/avatars.js
new file mode 100644
index 0000000..e3c5ce1
--- /dev/null
+++ b/manual_migrations/avatars.js
@@ -0,0 +1,54 @@
+import postgres from "npm:postgres";
+import { parse } from "npm:smol-toml";
+import { readdir, rename } from "node:fs/promises";
+
+const config = parse(await Deno.readTextFile(Deno.cwd() + "/tetratto.toml"), {
+ integersAsBigInt: true,
+});
+
+const db = postgres({
+ user: config.database.user,
+ password: config.database.password,
+ database: config.database.name,
+ hostname: config.database.url.split(":")[0],
+ port: config.database.url.split(":")[1],
+});
+
+let i = 0;
+for (const fname of await readdir(Deno.cwd() + "/media/avatars")) {
+ const [uid, type] = fname.split(".");
+
+ await db`INSERT INTO uploads VALUES (${BigInt(uid)}, ${BigInt(new Date().getTime())}, ${BigInt(uid)}, 'avatars', ${JSON.stringify(
+ {
+ what: type.charAt(0).toUpperCase() + type.slice(1),
+ },
+ )});`;
+
+ await rename(
+ Deno.cwd() + "/media/avatars/" + fname,
+ Deno.cwd() + "/media/uploads/avatars." + fname,
+ );
+
+ i += 1;
+ console.log(`done ${i}`);
+}
+
+for (const fname of await readdir(Deno.cwd() + "/media/banners")) {
+ const [uid, type] = fname.split(".");
+
+ await db`INSERT INTO uploads VALUES (${BigInt(uid)}, ${BigInt(new Date().getTime())}, ${BigInt(uid)}, 'banners', ${JSON.stringify(
+ {
+ what: type.charAt(0).toUpperCase() + type.slice(1),
+ },
+ )});`;
+
+ await rename(
+ Deno.cwd() + "/media/banners/" + fname,
+ Deno.cwd() + "/media/uploads/banners." + fname,
+ );
+
+ i += 1;
+ console.log(`done ${i}`);
+}
+
+await db.end();
diff --git a/manual_migrations/uploads_pkey.sql b/manual_migrations/uploads_pkey.sql
new file mode 100644
index 0000000..a8f3edc
--- /dev/null
+++ b/manual_migrations/uploads_pkey.sql
@@ -0,0 +1,4 @@
+ALTER TABLE uploads
+DROP CONSTRAINT uploads_pkey;
+
+ALTER TABLE uploads ADD CONSTRAINT uploads_pkey PRIMARY KEY (id, bucket);