fix: user avatar mime change from gif to avif
This commit is contained in:
parent
ffdb767518
commit
6e0f2985b9
20 changed files with 219 additions and 104 deletions
|
@ -219,7 +219,7 @@ pub async fn upload_avatar_request(
|
|||
std::fs::write(&path, img.0).unwrap();
|
||||
|
||||
// update user settings
|
||||
auth_user.settings.avatar_mime = mime.to_string();
|
||||
auth_user.settings.avatar_mime = "image/gif".to_string();
|
||||
if let Err(e) = data
|
||||
.update_user_settings(auth_user.id, auth_user.settings)
|
||||
.await
|
||||
|
@ -240,6 +240,15 @@ pub async fn upload_avatar_request(
|
|||
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();
|
||||
|
||||
|
@ -247,32 +256,12 @@ pub async fn upload_avatar_request(
|
|||
bytes.push(byte);
|
||||
}
|
||||
|
||||
match save_buffer(
|
||||
&path,
|
||||
bytes,
|
||||
if mime == "image/gif" {
|
||||
image::ImageFormat::Gif
|
||||
} else {
|
||||
image::ImageFormat::Avif
|
||||
},
|
||||
) {
|
||||
Ok(_) => {
|
||||
// update user settings
|
||||
auth_user.settings.avatar_mime = mime.to_string();
|
||||
if let Err(e) = data
|
||||
.update_user_settings(auth_user.id, auth_user.settings)
|
||||
.await
|
||||
{
|
||||
return Json(e.into());
|
||||
}
|
||||
|
||||
// ...
|
||||
Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Avatar uploaded. It might take a bit to update".to_string(),
|
||||
payload: (),
|
||||
})
|
||||
}
|
||||
match save_buffer(&path, bytes, image::ImageFormat::Avif) {
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Avatar uploaded. It might take a bit to update".to_string(),
|
||||
payload: (),
|
||||
}),
|
||||
Err(e) => Json(Error::MiscError(e.to_string()).into()),
|
||||
}
|
||||
}
|
||||
|
@ -331,7 +320,7 @@ pub async fn upload_banner_request(
|
|||
std::fs::write(&path, img.0).unwrap();
|
||||
|
||||
// update user settings
|
||||
auth_user.settings.banner_mime = mime.to_string();
|
||||
auth_user.settings.banner_mime = "image/gif".to_string();
|
||||
if let Err(e) = data
|
||||
.update_user_settings(auth_user.id, auth_user.settings)
|
||||
.await
|
||||
|
@ -352,6 +341,15 @@ pub async fn upload_banner_request(
|
|||
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();
|
||||
|
||||
|
@ -359,32 +357,12 @@ pub async fn upload_banner_request(
|
|||
bytes.push(byte);
|
||||
}
|
||||
|
||||
match save_buffer(
|
||||
&path,
|
||||
bytes,
|
||||
if mime == "image/gif" {
|
||||
image::ImageFormat::Gif
|
||||
} else {
|
||||
image::ImageFormat::Avif
|
||||
},
|
||||
) {
|
||||
Ok(_) => {
|
||||
// update user settings
|
||||
auth_user.settings.banner_mime = mime.to_string();
|
||||
if let Err(e) = data
|
||||
.update_user_settings(auth_user.id, auth_user.settings)
|
||||
.await
|
||||
{
|
||||
return Json(e.into());
|
||||
}
|
||||
|
||||
// ...
|
||||
Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Banner uploaded. It might take a bit to update".to_string(),
|
||||
payload: (),
|
||||
})
|
||||
}
|
||||
match save_buffer(&path, bytes, image::ImageFormat::Avif) {
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Banner uploaded. It might take a bit to update".to_string(),
|
||||
payload: (),
|
||||
}),
|
||||
Err(e) => Json(Error::MiscError(e.to_string()).into()),
|
||||
}
|
||||
}
|
||||
|
|
|
@ -708,7 +708,7 @@ pub async fn post_to_socket_request(
|
|||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
||||
if user.id.to_string() != user_id {
|
||||
if user.id.to_string() != user_id && !user.permissions.check(FinePermission::MANAGE_USERS) {
|
||||
return Json(Error::NotAllowed.into());
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue