From 7086a87d7a3f3399323fe5d48e239c89c9994a84 Mon Sep 17 00:00:00 2001 From: owen Date: Fri, 24 Apr 2026 01:26:17 -0400 Subject: [PATCH] Simplify subscription rule filter labels for readability. Only render enabled requirement flags in status output, so false filters are omitted and the rule text is easier to scan. Made-with: Cursor --- src/commands/subscription_helpers.py | 10 +++++++--- tests/test_subscription_helpers.py | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/commands/subscription_helpers.py b/src/commands/subscription_helpers.py index e122654..c73c146 100644 --- a/src/commands/subscription_helpers.py +++ b/src/commands/subscription_helpers.py @@ -325,8 +325,6 @@ async def _fetch_clan_basic_card( def _standardized_rule_string(rule: dict[str, Any]) -> str: - fresh = "yes" if bool(rule.get("requireFresh")) else "no" - completed = "yes" if bool(rule.get("requireCompleted")) else "no" raid_ids_raw = rule.get("raidIds") raid_ids: list[str] = [] if isinstance(raid_ids_raw, list): @@ -347,7 +345,13 @@ def _standardized_rule_string(rule: dict[str, Any]) -> str: raid = f"raids:{','.join(raid_ids)}" else: raid = "raids:all" - return f"`fresh:{fresh}` `completed:{completed}` `{raid}`" + filters: list[str] = [] + if bool(rule.get("requireFresh")): + filters.append("`require:fresh`") + if bool(rule.get("requireCompleted")): + filters.append("`require:completed`") + filters.append(f"`{raid}`") + return " ".join(filters) def _player_rule_line( diff --git a/tests/test_subscription_helpers.py b/tests/test_subscription_helpers.py index 8cf334b..7da2be1 100644 --- a/tests/test_subscription_helpers.py +++ b/tests/test_subscription_helpers.py @@ -154,8 +154,8 @@ def test_registered_player_rules_show_per_rule_filters(self) -> None: ) fields = {f["name"]: f["value"] for f in out["embeds"][0]["fields"]} self.assertNotIn("Rule Filters", fields) - self.assertIn("`fresh:yes`", fields["Player Rules (1)"]) - self.assertIn("`completed:no`", fields["Player Rules (1)"]) + self.assertIn("`require:fresh`", fields["Player Rules (1)"]) + self.assertNotIn("`require:completed`", fields["Player Rules (1)"]) class SubscriptionRulesSuffixTests(unittest.TestCase):