fix gacha info NameError, fix banner id int/str mismatch, cleanup

This commit is contained in:
esef committed 2026-07-11 19:28:40 +03:00
1 parent de63e3b098
commit 7a309f19e8
1 file changed
+3 -12
+3 -12
View File
@@ -25,16 +25,14 @@ log = logging.getLogger(__name__)
def _load_banner_state() -> dict: def _load_banner_state() -> dict:
"""Which banner each user has picked. Lightweight JSON, separate from SQLite.""" """Which banner each user has picked."""
if BANNER_FILE.exists(): if BANNER_FILE.exists():
import json
with open(BANNER_FILE, "r") as f: with open(BANNER_FILE, "r") as f:
return json.load(f) return json.load(f)
return {} return {}
def _save_banner_state(state: dict) -> None: def _save_banner_state(state: dict) -> None:
import json
BANNER_FILE.parent.mkdir(parents=True, exist_ok=True) BANNER_FILE.parent.mkdir(parents=True, exist_ok=True)
with open(BANNER_FILE, "w") as f: with open(BANNER_FILE, "w") as f:
json.dump(state, f, indent=2) json.dump(state, f, indent=2)
@@ -207,7 +205,7 @@ class BlueArchiveGacha(commands.Cog):
if banner_id and banner_id != "regular": if banner_id and banner_id != "regular":
for b in self._all_banners(): for b in self._all_banners():
if b["id"] == banner_id: if str(b.get("id")) == banner_id:
banner = b banner = b
break break
if banner: if banner:
@@ -335,18 +333,11 @@ class BlueArchiveGacha(commands.Cog):
banner_name = "Regular Recruitment" banner_name = "Regular Recruitment"
if banner_id and banner_id != "regular": if banner_id and banner_id != "regular":
for b in self._all_banners(): for b in self._all_banners():
if b["id"] == banner_id: if str(b.get("id")) == banner_id:
rateups = ", ".join(b.get("rateups", [])) or "Standard Pool" rateups = ", ".join(b.get("rateups", [])) or "Standard Pool"
banner_name = f"{b.get('gachaType', 'PickupGacha')} — {rateups}" banner_name = f"{b.get('gachaType', 'PickupGacha')} — {rateups}"
break break
# Recent pulls
recent = []
for sid in reversed(history[-5:]):
s = db.get(sid)
if s:
recent.append(f"{'*' * s['StarGrade']} {s['Name']}")
embed = discord.Embed( embed = discord.Embed(
title="Your Gacha Status", title="Your Gacha Status",
color=0x5BA0D0, color=0x5BA0D0,