renkar/tipibot
1
0
Fork 0
forked from sass/tipibot
Code Pull Requests Activity

Admin check now a dict

Browse Source
This commit is contained in:
Rene Arumetsa
2026-06-21 22:40:57 +03:00
parent 1e9ec56761
commit 6101a278e7
2 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
config.py
View File

@@ -43,21 +43,28 @@ BIRTHDAY_WINDOW_DAYS = int(os.getenv("BIRTHDAY_WINDOW_DAYS", "7"))
BASE_ROLE_IDS: list[int] = [1478304631930228779, 1478302278862766190] BASE_ROLE_IDS: list[int] = [1478304631930228779, 1478302278862766190]
def _parse_admin_roles(raw: str) -> dict[int, int]: def _parse_admin_roles(raw: str) -> dict[int, set[int]]:
"""Parse BOT_ADMIN_ROLES env var as "guild_id:role_id,guild_id:role_id".""" """Parse BOT_ADMIN_ROLES env var as "guild_id:role_id[:role_id...],guild_id:role_id...".
result: dict[int, int] = {}
for pair in raw.split(","): Multiple admin roles per guild are colon-separated; guild entries are comma-separated.
pair = pair.strip() Repeating a guild_id across entries merges its roles.
if not pair: """
result: dict[int, set[int]] = {}
for entry in raw.split(","):
entry = entry.strip()
if not entry:
continue continue
guild_str, _, role_str = pair.partition(":") parts = entry.split(":")
if not role_str: if len(parts) < 2 or not all(p.strip() for p in parts):
raise SystemExit(f"BOT_ADMIN_ROLES: expected 'guild_id:role_id', got {pair!r}") raise SystemExit(
result[int(guild_str)] = int(role_str) f"BOT_ADMIN_ROLES: expected 'guild_id:role_id[:role_id...]', got {entry!r}"
)
guild_id = int(parts[0].strip())
result.setdefault(guild_id, set()).update(int(p.strip()) for p in parts[1:])
return result return result
BOT_ADMIN_ROLES: dict[int, int] = _parse_admin_roles(os.getenv("BOT_ADMIN_ROLES", "")) BOT_ADMIN_ROLES: dict[int, set[int]] = _parse_admin_roles(os.getenv("BOT_ADMIN_ROLES", ""))
PB_URL = os.getenv("PB_URL", "http://127.0.0.1:8090") PB_URL = os.getenv("PB_URL", "http://127.0.0.1:8090")
PB_ADMIN_EMAIL = os.getenv("PB_ADMIN_EMAIL", "") PB_ADMIN_EMAIL = os.getenv("PB_ADMIN_EMAIL", "")
@@ -75,26 +82,3 @@ PB_ECONOMY_COLLECTION_ECONOMY = (
PB_ECONOMY_COLLECTION = ( PB_ECONOMY_COLLECTION = (
PB_ECONOMY_COLLECTION_ECONOMY if BOT_PROFILE == "economy" else PB_ECONOMY_COLLECTION_DEV PB_ECONOMY_COLLECTION_ECONOMY if BOT_PROFILE == "economy" else PB_ECONOMY_COLLECTION_DEV
) )
def _parse_admin_roles() -> dict[int, int]:
"""Parse BOT_ADMIN_ROLES env var (format: guild_id:role_id,guild_id:role_id)."""
raw = os.getenv("BOT_ADMIN_ROLES", "").strip()
if not raw:
return {}
result: dict[int, int] = {}
for pair in raw.split(","):
pair = pair.strip()
if not pair:
continue
parts = pair.split(":")
if len(parts) != 2:
continue
try:
result[int(parts[0].strip())] = int(parts[1].strip())
except ValueError:
continue
return result
BOT_ADMIN_ROLES: dict[int, int] = _parse_admin_roles()

8
core/admin.py
View File

@@ -7,13 +7,13 @@ import config
def is_bot_admin(member: discord.abc.User | None) -> bool: def is_bot_admin(member: discord.abc.User | None) -> bool:
"""True when the member has the configured admin role for their guild.""" """True when the member has any of the configured admin roles for their guild."""
if not isinstance(member, discord.Member) or member.guild is None: if not isinstance(member, discord.Member) or member.guild is None:
return False return False
role_id = config.BOT_ADMIN_ROLES.get(member.guild.id) admin_role_ids = config.BOT_ADMIN_ROLES.get(member.guild.id)
if role_id is None: if not admin_role_ids:
return False return False
return any(r.id == role_id for r in member.roles) return any(r.id in admin_role_ids for r in member.roles)
def bot_admin_check(): def bot_admin_check():