Use URL type in most outstanding struct fields (#1468)

[lemmy.git] / crates / api / src / user.rs

diff --git a/crates/api/src/user.rs b/crates/api/src/user.rs
index 6d37581e08fca0b96f152883e774c11c4b61bbb8..903c00e7269fefac66e993969509b69c814e8f46 100644 (file)
--- a/crates/api/src/user.rs
+++ b/crates/api/src/user.rs
@@ -1,6 +1,5 @@
 use crate::{
   captcha_espeak_wav_base64,
-  check_optional_url,
   collect_moderated_communities,
   get_user_from_jwt,
   get_user_from_jwt_opt,
@@ -23,6 +22,7 @@ use lemmy_apub::{
 };
 use lemmy_db_queries::{
   diesel_option_overwrite,
+  diesel_option_overwrite_to_url,
   source::{
     comment::Comment_,
     community::Community_,
@@ -366,17 +366,13 @@ impl Perform for SaveUserSettings {
     let data: &SaveUserSettings = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
 
-    let avatar = diesel_option_overwrite(&data.avatar);
-    let banner = diesel_option_overwrite(&data.banner);
+    let avatar = diesel_option_overwrite_to_url(&data.avatar)?;
+    let banner = diesel_option_overwrite_to_url(&data.banner)?;
     let email = diesel_option_overwrite(&data.email);
     let bio = diesel_option_overwrite(&data.bio);
     let preferred_username = diesel_option_overwrite(&data.preferred_username);
     let matrix_user_id = diesel_option_overwrite(&data.matrix_user_id);
 
-    // Check to make sure the avatar and banners are urls
-    check_optional_url(&avatar)?;
-    check_optional_url(&banner)?;
-
     if let Some(Some(bio)) = &bio {
       if bio.chars().count() > 300 {
         return Err(ApiError::err("bio_length_overflow").into());