From 22a09f81f306e9dc67cdd561f329fb9842e4251e Mon Sep 17 00:00:00 2001 From: Orual Date: Wed, 31 Dec 2025 17:31:54 -0500 Subject: [PATCH] some test fixes with new enum stuff --- crates/jacquard/src/moderation/tests.rs | 35 ++++++++++++++----------- examples/subscribe_repos.rs | 31 ++++++++++------------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/crates/jacquard/src/moderation/tests.rs b/crates/jacquard/src/moderation/tests.rs index b00ad5ea..1b86f78f 100644 --- a/crates/jacquard/src/moderation/tests.rs +++ b/crates/jacquard/src/moderation/tests.rs @@ -4,7 +4,10 @@ use crate::moderation::{ }; use jacquard_api::app_bsky::feed::FeedViewPost; use jacquard_api::app_bsky::labeler::get_services::GetServicesOutput; -use jacquard_api::com_atproto::label::{Label, LabelValueDefinition}; +use jacquard_api::com_atproto::label::{ + Label, LabelValueDefinition, LabelValueDefinitionBlurs, LabelValueDefinitionDefaultSetting, + LabelValueDefinitionSeverity, +}; use jacquard_common::CowStr; use jacquard_common::types::string::{Datetime, Did, Uri}; use serde::Deserialize; @@ -50,9 +53,9 @@ fn test_moderate_with_default_hide() { // Create a label definition with defaultSetting: "hide" let spam_def = LabelValueDefinition { identifier: CowStr::from("spam"), - blurs: CowStr::from("content"), - severity: CowStr::from("inform"), - default_setting: Some(CowStr::from("hide")), + blurs: LabelValueDefinitionBlurs::Content, + severity: LabelValueDefinitionSeverity::Inform, + default_setting: Some(LabelValueDefinitionDefaultSetting::Hide), adult_only: Some(false), locales: vec![], extra_data: None, @@ -102,9 +105,9 @@ fn test_moderate_with_user_preference() { let def = LabelValueDefinition { identifier: CowStr::from("test-label"), - blurs: CowStr::from("content"), - severity: CowStr::from("alert"), - default_setting: Some(CowStr::from("hide")), + blurs: LabelValueDefinitionBlurs::Content, + severity: LabelValueDefinitionSeverity::Alert, + default_setting: Some(LabelValueDefinitionDefaultSetting::Hide), adult_only: Some(false), locales: vec![], extra_data: None, @@ -221,9 +224,9 @@ fn test_blur_media_vs_content() { // Media blur let media_def = LabelValueDefinition { identifier: CowStr::from("media-label"), - blurs: CowStr::from("media"), - severity: CowStr::from("alert"), - default_setting: Some(CowStr::from("warn")), + blurs: LabelValueDefinitionBlurs::Media, + severity: LabelValueDefinitionSeverity::Alert, + default_setting: Some(LabelValueDefinitionDefaultSetting::Warn), adult_only: Some(false), locales: vec![], extra_data: None, @@ -232,9 +235,9 @@ fn test_blur_media_vs_content() { // Content blur let content_def = LabelValueDefinition { identifier: CowStr::from("content-label"), - blurs: CowStr::from("content"), - severity: CowStr::from("alert"), - default_setting: Some(CowStr::from("warn")), + blurs: LabelValueDefinitionBlurs::Content, + severity: LabelValueDefinitionSeverity::Alert, + default_setting: Some(LabelValueDefinitionDefaultSetting::Warn), adult_only: Some(false), locales: vec![], extra_data: None, @@ -301,9 +304,9 @@ fn test_adult_only_labels_require_adult_content_enabled() { let adult_def = LabelValueDefinition { identifier: CowStr::from("adult-label"), - blurs: CowStr::from("content"), - severity: CowStr::from("alert"), - default_setting: Some(CowStr::from("warn")), + blurs: LabelValueDefinitionBlurs::Content, + severity: LabelValueDefinitionSeverity::Alert, + default_setting: Some(LabelValueDefinitionDefaultSetting::Warn), adult_only: Some(true), locales: vec![], extra_data: None, diff --git a/examples/subscribe_repos.rs b/examples/subscribe_repos.rs index 87af55b0..4a8b5872 100644 --- a/examples/subscribe_repos.rs +++ b/examples/subscribe_repos.rs @@ -8,7 +8,6 @@ use clap::Parser; use jacquard::api::com_atproto::sync::subscribe_repos::{SubscribeRepos, SubscribeReposMessage}; -use jacquard_api::com_atproto::sync::subscribe_repos::RepoOp; use jacquard_common::xrpc::{SubscriptionClient, TungsteniteSubscriptionClient}; use miette::IntoDiagnostic; use n0_future::StreamExt; @@ -45,22 +44,20 @@ fn normalize_url(input: &str) -> Result { fn print_message(msg: &SubscribeReposMessage) { match msg { SubscribeReposMessage::Commit(commit) => { - if commit.ops.iter().any(|op| op.action == "delete") { - println!( - "Commit | repo={} seq={} time={} rev={} commit={} ops={:?} prev={}", - commit.repo, - commit.seq, - commit.time, - commit.rev, - commit.commit, - commit.ops, - commit - .since - .as_ref() - .map(|ts| ts.to_smolstr()) - .unwrap_or_default(), - ); - } + println!( + "Commit | repo={} seq={} time={} rev={} commit={} prev={}\n | ops={:?} ", + commit.repo, + commit.seq, + commit.time, + commit.rev, + commit.commit, + commit + .since + .as_ref() + .map(|ts| ts.to_smolstr()) + .unwrap_or_default(), + commit.ops, + ); } SubscribeReposMessage::Identity(identity) => { println!( -- 2.51.2