diff --git a/crates/app/src/public/html/communities/settings.html b/crates/app/src/public/html/communities/settings.html index 236f6db..083129d 100644 --- a/crates/app/src/public/html/communities/settings.html +++ b/crates/app/src/public/html/communities/settings.html @@ -781,7 +781,7 @@ - + + ", " String { - input - .replace("<", "<") - .replace(">", ">") - .replace("url(\"", "url(\"/api/v0/util/ext/image?img=") - .replace("url(https://", "url(/api/v0/util/ext/image?img=https://") - .replace("", "") -} - -/// Clean user settings -pub fn clean_settings(settings: &UserSettings) -> String { - remove_tags(&serde_json::to_string(&clean_settings_raw(settings)).unwrap()) - .replace("\u{200d}", "") - // how do you end up with these in your settings? - .replace("\u{0010}", "") - .replace("\u{0011}", "") - .replace("\u{0012}", "") - .replace("\u{0013}", "") - .replace("\u{0014}", "") -} - -/// Clean user settings row -pub fn clean_settings_raw(settings: &UserSettings) -> UserSettings { - let mut settings = settings.to_owned(); - - settings.biography = clean_single(&settings.biography); - settings.theme_hue = clean_single(&settings.theme_hue); - settings.theme_sat = clean_single(&settings.theme_sat); - settings.theme_lit = clean_single(&settings.theme_lit); - - settings -} - -/// Clean community context -pub fn clean_context(context: &CommunityContext) -> String { - remove_tags(&serde_json::to_string(&clean_context_raw(context)).unwrap()) - .replace("\u{200d}", "") - // how do you end up with these in your settings? - .replace("\u{0010}", "") - .replace("\u{0011}", "") - .replace("\u{0012}", "") - .replace("\u{0013}", "") - .replace("\u{0014}", "") -} - -/// Clean community context row -pub fn clean_context_raw(context: &CommunityContext) -> CommunityContext { - let mut context = context.to_owned(); - context.description = clean_single(&context.description); - context -} diff --git a/crates/core/src/database/auth.rs b/crates/core/src/database/auth.rs index 2ee5a0f..9c19af9 100644 --- a/crates/core/src/database/auth.rs +++ b/crates/core/src/database/auth.rs @@ -51,6 +51,7 @@ impl DataManager { auto_method!(get_user_by_id(usize as i64)@get_user_from_row -> "SELECT * FROM users WHERE id = $1" --name="user" --returns=User --cache-key-tmpl="atto.user:{}"); auto_method!(get_user_by_username(&str)@get_user_from_row -> "SELECT * FROM users WHERE username = $1" --name="user" --returns=User --cache-key-tmpl="atto.user:{}"); + auto_method!(get_user_by_username_no_cache(&str)@get_user_from_row -> "SELECT * FROM users WHERE username = $1" --name="user" --returns=User); /// Get a user given just their ID. Returns the void user if the user doesn't exist. /// @@ -409,7 +410,6 @@ impl DataManager { } self.cache_clear_user(&user).await; - Ok(()) }