Skip to content

Simplify Discord subscription require filter labels #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
owens1127 merged 1 commit into from
Apr 24, 2026
Merged

Simplify Discord subscription require filter labels #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/commands/subscription_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions tests/test_subscription_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading