From 20668c267b5de34ef01ea62474d2e98de3466fe7 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 15 Aug 2021 22:39:20 -0400 Subject: [PATCH] show visibility for W2L results --- src/database/queries/query_tts_result.rs | 3 +-- src/database/queries/query_w2l_result.rs | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/database/queries/query_tts_result.rs b/src/database/queries/query_tts_result.rs index 0655c43430..0b1b3b6bde 100644 --- a/src/database/queries/query_tts_result.rs +++ b/src/database/queries/query_tts_result.rs @@ -1,6 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use crate::AnyhowResult; +use crate::database::enums::record_visibility::RecordVisibility; use crate::database::helpers::boolean_converters::i8_to_bool; use crate::database::helpers::boolean_converters::nullable_i8_to_optional_bool; use derive_more::{Display, Error}; @@ -11,8 +12,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::database::helpers::enums::CreatorSetVisibility; -use crate::database::enums::record_visibility::RecordVisibility; #[derive(Serialize)] pub struct TtsResultRecordForResponse { diff --git a/src/database/queries/query_w2l_result.rs b/src/database/queries/query_w2l_result.rs index c3497301fd..3f4bbe6cc7 100644 --- a/src/database/queries/query_w2l_result.rs +++ b/src/database/queries/query_w2l_result.rs @@ -11,6 +11,7 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; +use crate::database::enums::record_visibility::RecordVisibility; #[derive(Serialize)] pub struct W2lResultRecordForResponse { @@ -33,6 +34,8 @@ pub struct W2lResultRecordForResponse { pub maybe_template_creator_display_name: Option, pub maybe_template_creator_gravatar_hash: Option, + pub creator_set_visibility: RecordVisibility, + pub file_size_bytes: u32, pub frame_width: u32, pub frame_height: u32, @@ -78,6 +81,8 @@ pub struct W2lResultRecordRaw { pub maybe_template_creator_display_name: Option, pub maybe_template_creator_gravatar_hash: Option, + pub creator_set_visibility: String, + pub file_size_bytes: i32, pub frame_width: i32, pub frame_height: i32, @@ -142,6 +147,10 @@ pub async fn select_w2l_result_by_token( maybe_template_creator_display_name: ir.maybe_template_creator_display_name.clone(), maybe_template_creator_gravatar_hash: ir.maybe_template_creator_gravatar_hash.clone(), + // NB: Fail open/public since we're already looking at it + creator_set_visibility: RecordVisibility::from_str(&ir.creator_set_visibility) + .unwrap_or(RecordVisibility::Public), + //template_is_mod_approved: if ir.template_is_mod_approved == 0 { false } else { true }, file_size_bytes: if ir.file_size_bytes > 0 { ir.file_size_bytes as u32 } else { 0 }, @@ -189,6 +198,8 @@ SELECT template_users.display_name as maybe_template_creator_display_name, template_users.email_gravatar_hash as maybe_template_creator_gravatar_hash, + w2l_results.creator_set_visibility, + w2l_results.file_size_bytes, w2l_results.frame_width, w2l_results.frame_height, @@ -243,6 +254,8 @@ SELECT template_users.display_name as maybe_template_creator_display_name, template_users.email_gravatar_hash as maybe_template_creator_gravatar_hash, + w2l_results.creator_set_visibility, + w2l_results.file_size_bytes, w2l_results.frame_width, w2l_results.frame_height,