diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs index 0d7a14faef..2516c2d0cc 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs @@ -212,8 +212,17 @@ LEFT OUTER JOIN entity_stats } match view_as { - ViewAs::Moderator => {} - ViewAs::Author | ViewAs::AnotherUser => { + ViewAs::Moderator | ViewAs::Author => { + if !first_predicate_added { + query_builder.push(" WHERE "); + first_predicate_added = true; + } else { + query_builder.push(" AND "); + } + // NB(bt): Actually, mods don't want to see deleted files. We'll improve the moderator UI later. + query_builder.push(" m.user_deleted_at IS NULL AND m.mod_deleted_at IS NULL "); + } + ViewAs::AnotherUser => { if !first_predicate_added { query_builder.push(" WHERE "); first_predicate_added = true; diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs index 9c10eb9e61..fbf6c917a9 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs @@ -202,10 +202,10 @@ LEFT OUTER JOIN entity_stats } match view_as { - ViewAs::Author => { + ViewAs::Author | ViewAs::Moderator => { + // NB(bt): Actually, mods don't want to see deleted files. We'll improve the moderator UI later. query_builder.push(" AND m.user_deleted_at IS NULL AND m.mod_deleted_at IS NULL "); } - ViewAs::Moderator => {} ViewAs::AnotherUser => { query_builder.push(" AND m.user_deleted_at IS NULL AND m.mod_deleted_at IS NULL "); // FIXME: Binding shouldn't require to_str(). diff --git a/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs b/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs index 3b61cd6ecd..bc2743fd76 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs @@ -207,10 +207,10 @@ LEFT OUTER JOIN entity_stats query_builder.push_bind(username); match view_as { - ViewAs::Author => { + ViewAs::Author | ViewAs::Moderator => { + // NB(bt): Actually, mods don't want to see deleted models. We'll improve the moderator UI later. query_builder.push(" AND mw.user_deleted_at IS NULL AND mw.mod_deleted_at IS NULL "); } - ViewAs::Moderator => {} ViewAs::AnotherUser => { query_builder.push(" AND mw.user_deleted_at IS NULL AND mw.mod_deleted_at IS NULL "); query_builder.push(" AND mw.creator_set_visibility = "); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs index d8b83a5a0a..31ab632d14 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs @@ -163,8 +163,8 @@ pub async fn list_available_weights_handler( .weights_type(query.weight_type) .scope_creator_username(None) .include_user_hidden(include_user_hidden) - .include_user_deleted_results(is_mod) - .include_mod_deleted_results(is_mod) + .include_user_deleted_results(false) // NB: Mods don't want to see deleted models. We'll improve this later. + .include_mod_deleted_results(false) // NB: Mods don't want to see deleted models. We'll improve this later. .limit(limit) .offset(cursor);