shoko/jigaido
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle admin_user_ids=None case in add_admin

Browse Source 
When loading room data with admin_user_ids=null in JSON,
the code now properly initializes admin_user_ids to []
instead of incorrectly creating a new RoomData.

Also removed debug logging added during troubleshooting.
This commit is contained in:
shokollm
2026-04-04 22:59:37 +00:00
parent 6e5006b429
commit badb2e3292
2 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/telegram-bot/commands.py
View File

@@ -438,24 +438,14 @@ async def cmd_untrack(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None: async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
user_id = get_user_id(update) user_id = get_user_id(update)
room_id = get_room_id(update) room_id = get_room_id(update)
import logging
logging.info(
f"cmd_start: user_id={user_id}, room_id={room_id}, is_group={is_group(update)}"
)
if is_group(update): if is_group(update):
try: try:
chat_member = await ctx.bot.get_chat_member(room_id, user_id) chat_member = await ctx.bot.get_chat_member(room_id, user_id)
logging.info(f"cmd_start: chat_member.status={chat_member.status}")
if chat_member.status == "creator" and not BOUNTY_SERVICE.is_admin( if chat_member.status == "creator" and not BOUNTY_SERVICE.is_admin(
room_id, user_id room_id, user_id
): ):
logging.info(f"cmd_start: Promoting user {user_id} to admin")
BOUNTY_SERVICE.add_admin(room_id, user_id, user_id) BOUNTY_SERVICE.add_admin(room_id, user_id, user_id)
logging.info(
f"cmd_start: After add_admin, is_admin={BOUNTY_SERVICE.is_admin(room_id, user_id)}"
)
await update.message.reply_text( await update.message.reply_text(
"👻 JIGAIDO is watching.\n\n" "👻 JIGAIDO is watching.\n\n"
"This group's bounty list is now active.\n" "This group's bounty list is now active.\n"
@@ -466,8 +456,7 @@ async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
"/my — your tracked bounties" "/my — your tracked bounties"
) )
return return
except Exception as e: except Exception:
logging.error(f"cmd_start: Exception in group start: {e}")
pass pass
await update.message.reply_text( await update.message.reply_text(
@@ -480,7 +469,6 @@ async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
) )
else: else:
if not BOUNTY_SERVICE.is_admin(room_id, user_id): if not BOUNTY_SERVICE.is_admin(room_id, user_id):
logging.info(f"cmd_start: DM - promoting user {user_id} to admin")
BOUNTY_SERVICE.add_admin(room_id, user_id, user_id) BOUNTY_SERVICE.add_admin(room_id, user_id, user_id)
await update.message.reply_text( await update.message.reply_text(

30
core/services.py
View File

@@ -36,51 +36,23 @@ class BountyService:
self, room_id: int, admin_user_id: int, requesting_user_id: int self, room_id: int, admin_user_id: int, requesting_user_id: int
) -> None: ) -> None:
"""Add an admin to a room. Requires admin permission, or self-promotion if first admin.""" """Add an admin to a room. Requires admin permission, or self-promotion if first admin."""
import logging
logging.info(
f"add_admin: room_id={room_id}, admin_user_id={admin_user_id}, requesting_user_id={requesting_user_id}"
)
room_data = self._storage.load(room_id) room_data = self._storage.load(room_id)
logging.info(
f"add_admin: loaded room_data.admin_user_ids={room_data.admin_user_ids if room_data else None}"
)
has_no_admins = room_data is None or not room_data.admin_user_ids has_no_admins = room_data is None or not room_data.admin_user_ids
is_self_promotion = requesting_user_id == admin_user_id is_self_promotion = requesting_user_id == admin_user_id
logging.info(
f"add_admin: has_no_admins={has_no_admins}, is_self_promotion={is_self_promotion}"
)
if not self.is_admin(room_id, requesting_user_id): if not self.is_admin(room_id, requesting_user_id):
if not (has_no_admins and is_self_promotion): if not (has_no_admins and is_self_promotion):
logging.error("add_admin: PermissionError raised")
raise PermissionError("Only admins can add admins.") raise PermissionError("Only admins can add admins.")
logging.info("add_admin: Self-promotion allowed")
if room_data is None: if room_data is None or room_data.admin_user_ids is None:
room_data = RoomData( room_data = RoomData(
room_id=room_id, bounties=[], next_id=1, admin_user_ids=[] room_id=room_id, bounties=[], next_id=1, admin_user_ids=[]
) )
logging.info("add_admin: Created new RoomData")
logging.info(
f"add_admin: Before append, room_data.admin_user_ids={room_data.admin_user_ids}"
)
if admin_user_id not in (room_data.admin_user_ids or []): if admin_user_id not in (room_data.admin_user_ids or []):
logging.info(f"add_admin: Appending {admin_user_id}")
room_data.admin_user_ids.append(admin_user_id) room_data.admin_user_ids.append(admin_user_id)
logging.info(
f"add_admin: After append, room_data.admin_user_ids={room_data.admin_user_ids}"
)
self._storage.save(room_data) self._storage.save(room_data)
logging.info("add_admin: Saved")
else:
logging.info(
f"add_admin: {admin_user_id} already in admin_user_ids, not appending"
)
def remove_admin( def remove_admin(
self, room_id: int, admin_user_id: int, requesting_user_id: int self, room_id: int, admin_user_id: int, requesting_user_id: int