forked from sass/tipibot
feat(teams): grant each participant their game's divider role
Reuse the existing CS2/LoL divider roles as participant tags: sync_team_role now also adds the divider role for the member's team's game, and strips any other configured divider role (switched game / dropped out). Matched by ID against config.TEAM_DIVIDERS, so only the divider roles are ever touched. - TeamSyncResult gains divider_added / divider_removed; summary tallies both - /teamsync report and log line surface divider_assigned / divider_removed - tests: grants the game divider, swaps it on a game switch Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XPRsW4tazVtYi2jNzVQkre
This commit is contained in:
@@ -65,11 +65,13 @@ class TeamSyncResult:
|
||||
added: str | None = None # team role name granted, if any
|
||||
removed: list[str] = field(default_factory=list) # stale team roles taken away
|
||||
created: str | None = None # team role name auto-created in the guild, if any
|
||||
divider_added: str | None = None # game divider role granted as participant tag
|
||||
divider_removed: list[str] = field(default_factory=list) # stale divider roles taken away
|
||||
errors: list[str] = field(default_factory=list)
|
||||
|
||||
@property
|
||||
def changed(self) -> bool:
|
||||
return bool(self.added or self.removed)
|
||||
return bool(self.added or self.removed or self.divider_added or self.divider_removed)
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -80,6 +82,8 @@ class TeamSyncSummary:
|
||||
removed: int = 0
|
||||
created: list[str] = field(default_factory=list)
|
||||
positioned: int = 0 # team roles moved under a divider
|
||||
divider_assigned: int = 0 # members given their game divider role
|
||||
divider_removed: int = 0 # stale game divider roles taken away
|
||||
changes: list[str] = field(default_factory=list) # human-readable per-member lines
|
||||
errors: list[str] = field(default_factory=list)
|
||||
|
||||
@@ -260,9 +264,12 @@ async def sync_team_role(
|
||||
|
||||
* grants the role for the team they're registered on (auto-creating that
|
||||
role in the guild when it does not exist yet);
|
||||
* removes any *other* team role they still carry (left / switched teams).
|
||||
* removes any *other* team role they still carry (left / switched teams);
|
||||
* grants their game's divider role as a participant tag (and strips any
|
||||
other configured divider role they still carry, i.e. switched game).
|
||||
|
||||
Only role NAMES present in the team sheet are ever added or removed, so no
|
||||
Only team role NAMES present in the team sheet and the configured divider
|
||||
role IDs (``config.TEAM_DIVIDERS``) are ever added or removed, so no
|
||||
unrelated role is ever at risk. When ``TEAM_SHEET_ID`` is unset the caches
|
||||
are empty and this is a no-op returning an unchanged result.
|
||||
"""
|
||||
@@ -307,6 +314,35 @@ async def sync_team_role(
|
||||
except discord.HTTPException as e:
|
||||
result.errors.append(f"Tiimirolli eemaldamise viga kasutajale {member}: {e}")
|
||||
|
||||
# --- Participant divider role (the game's divider role doubles as a tag) ---
|
||||
# Grant the divider role for the member's team's game, and strip any other
|
||||
# configured divider role (switched game / dropped out). Matched by ID, so
|
||||
# only the roles named in config.TEAM_DIVIDERS are ever touched.
|
||||
divider_ids = set(config.TEAM_DIVIDERS.values())
|
||||
want_divider_id = sheets.get_team_dividers().get(team_name) if team_name else None
|
||||
want_divider = guild.get_role(want_divider_id) if want_divider_id else None
|
||||
|
||||
if want_divider is not None and want_divider not in member.roles:
|
||||
try:
|
||||
await member.add_roles(want_divider, reason="Team sync: mänguosaleja")
|
||||
result.divider_added = want_divider.name
|
||||
except discord.Forbidden:
|
||||
log.debug("No permission to add divider role for %s, skipping", member)
|
||||
except discord.HTTPException as e:
|
||||
result.errors.append(f"Eraldajarolli viga kasutajale {member}: {e}")
|
||||
|
||||
stale_dividers = [
|
||||
r for r in member.roles if r.id in divider_ids and r.id != want_divider_id
|
||||
]
|
||||
if stale_dividers:
|
||||
try:
|
||||
await member.remove_roles(*stale_dividers, reason="Team sync: mäng vahetus")
|
||||
result.divider_removed = [r.name for r in stale_dividers]
|
||||
except discord.Forbidden:
|
||||
log.debug("No permission to remove divider roles for %s, skipping", member)
|
||||
except discord.HTTPException as e:
|
||||
result.errors.append(f"Eraldajarolli eemaldamise viga kasutajale {member}: {e}")
|
||||
|
||||
return result
|
||||
|
||||
|
||||
@@ -449,12 +485,20 @@ async def sync_all_team_roles(
|
||||
summary.assigned += 1
|
||||
if res.removed:
|
||||
summary.removed += len(res.removed)
|
||||
if res.divider_added:
|
||||
summary.divider_assigned += 1
|
||||
if res.divider_removed:
|
||||
summary.divider_removed += len(res.divider_removed)
|
||||
if res.changed:
|
||||
bits: list[str] = []
|
||||
if res.added:
|
||||
bits.append(f"+{res.added}")
|
||||
if res.removed:
|
||||
bits.append("-" + ", -".join(res.removed))
|
||||
if res.divider_added:
|
||||
bits.append(f"+[{res.divider_added}]")
|
||||
if res.divider_removed:
|
||||
bits.append("-[" + "], -[".join(res.divider_removed) + "]")
|
||||
summary.changes.append(f"{member.display_name}: {', '.join(bits)}")
|
||||
|
||||
# Placement runs after the grant/remove pass so roles created this run are
|
||||
|
||||
Reference in New Issue
Block a user