lnbits-exts/castle
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

USERNAME DEBUG LOGS removal

Browse source
This commit is contained in:
padreug 2025-11-10 22:59:06 +01:00
parent 9ac3494f1b
commit 9974a8fa64
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
views_api.py
View file

@ -518,39 +518,39 @@ async def _get_username_from_user_id(user_id: str) -> str:
""" """
from lnbits.core.crud.users import get_user from lnbits.core.crud.users import get_user
logger.info(f"[USERNAME] Called with: '{user_id}' (len={len(user_id) if user_id else 0})") logger.debug(f"[USERNAME] Called with: '{user_id}' (len={len(user_id) if user_id else 0})")
if not user_id: if not user_id:
return None return None
# Case 1: Already in standard UUID format (36 chars with dashes) # Case 1: Already in standard UUID format (36 chars with dashes)
if len(user_id) == 36 and user_id.count('-') == 4: if len(user_id) == 36 and user_id.count('-') == 4:
logger.info(f"[USERNAME] Case 1: Full UUID format") logger.debug(f"[USERNAME] Case 1: Full UUID format")
user = await get_user(user_id) user = await get_user(user_id)
result = user.username if user and user.username else f"User-{user_id[:8]}" result = user.username if user and user.username else f"User-{user_id[:8]}"
logger.info(f"[USERNAME] Case 1 result: '{result}'") logger.debug(f"[USERNAME] Case 1 result: '{result}'")
return result return result
# Case 2: Dashless 32-char UUID - lookup via Castle user settings, fallback to LNbits # Case 2: Dashless 32-char UUID - lookup via Castle user settings, fallback to LNbits
elif len(user_id) == 32 and '-' not in user_id: elif len(user_id) == 32 and '-' not in user_id:
logger.info(f"[USERNAME] Case 2: Dashless UUID format - looking up in Castle user settings") logger.debug(f"[USERNAME] Case 2: Dashless UUID format - looking up in Castle user settings")
try: try:
# Convert dashless to dashed format # Convert dashless to dashed format
user_id_with_dashes = f"{user_id[0:8]}-{user_id[8:12]}-{user_id[12:16]}-{user_id[16:20]}-{user_id[20:32]}" user_id_with_dashes = f"{user_id[0:8]}-{user_id[8:12]}-{user_id[12:16]}-{user_id[16:20]}-{user_id[20:32]}"
logger.info(f"[USERNAME] Converted to dashed format: {user_id_with_dashes}") logger.debug(f"[USERNAME] Converted to dashed format: {user_id_with_dashes}")
# Try Castle settings first # Try Castle settings first
user_settings = await get_all_user_wallet_settings() user_settings = await get_all_user_wallet_settings()
for setting in user_settings: for setting in user_settings:
if setting.id == user_id_with_dashes: if setting.id == user_id_with_dashes:
logger.info(f"[USERNAME] Found matching user in Castle settings") logger.debug(f"[USERNAME] Found matching user in Castle settings")
user = await get_user(setting.id) user = await get_user(setting.id)
result = user.username if user and user.username else f"User-{user_id[:8]}" result = user.username if user and user.username else f"User-{user_id[:8]}"
logger.info(f"[USERNAME] Case 2 result (from Castle): '{result}'") logger.debug(f"[USERNAME] Case 2 result (from Castle): '{result}'")
return result return result
# Not in Castle settings - try LNbits database directly # Not in Castle settings - try LNbits database directly
logger.info(f"[USERNAME] Not in Castle settings, querying LNbits database directly") logger.debug(f"[USERNAME] Not in Castle settings, querying LNbits database directly")
from lnbits.db import Database from lnbits.db import Database
db = Database("database") db = Database("database")
async with db.connect() as conn: async with db.connect() as conn:
@ -558,16 +558,16 @@ async def _get_username_from_user_id(user_id: str) -> str:
"SELECT id, username FROM accounts WHERE id = :user_id LIMIT 1", "SELECT id, username FROM accounts WHERE id = :user_id LIMIT 1",
{"user_id": user_id_with_dashes} {"user_id": user_id_with_dashes}
) )
logger.info(f"[USERNAME] Database query result: {row}") logger.debug(f"[USERNAME] Database query result: {row}")
if row and row["username"]: if row and row["username"]:
result = row["username"] result = row["username"]
logger.info(f"[USERNAME] Case 2 result (from LNbits DB): '{result}'") logger.debug(f"[USERNAME] Case 2 result (from LNbits DB): '{result}'")
return result return result
# User doesn't exist anywhere # User doesn't exist anywhere
logger.info(f"[USERNAME] User not found in LNbits database either") logger.debug(f"[USERNAME] User not found in LNbits database either")
result = f"User-{user_id[:8]}" result = f"User-{user_id[:8]}"
logger.info(f"[USERNAME] Case 2 result (not found): '{result}'") logger.debug(f"[USERNAME] Case 2 result (not found): '{result}'")
return result return result
except Exception as e: except Exception as e:
@ -577,7 +577,7 @@ async def _get_username_from_user_id(user_id: str) -> str:
# Case 3: Partial ID (8 chars from account name) - lookup via Castle user settings # Case 3: Partial ID (8 chars from account name) - lookup via Castle user settings
elif len(user_id) == 8: elif len(user_id) == 8:
logger.info(f"[USERNAME] Case 3: Partial ID format - looking up in Castle user settings") logger.debug(f"[USERNAME] Case 3: Partial ID format - looking up in Castle user settings")
try: try:
# Get all Castle users (which have full user_ids) # Get all Castle users (which have full user_ids)
user_settings = await get_all_user_wallet_settings() user_settings = await get_all_user_wallet_settings()
@ -585,17 +585,17 @@ async def _get_username_from_user_id(user_id: str) -> str:
# Find matching user by first 8 chars # Find matching user by first 8 chars
for setting in user_settings: for setting in user_settings:
if setting.id.startswith(user_id): if setting.id.startswith(user_id):
logger.info(f"[USERNAME] Found full user_id: {setting.id}") logger.debug(f"[USERNAME] Found full user_id: {setting.id}")
# Now get username from LNbits with full ID # Now get username from LNbits with full ID
user = await get_user(setting.id) user = await get_user(setting.id)
result = user.username if user and user.username else f"User-{user_id}" result = user.username if user and user.username else f"User-{user_id}"
logger.info(f"[USERNAME] Case 3 result (found): '{result}'") logger.debug(f"[USERNAME] Case 3 result (found): '{result}'")
return result return result
# No matching user found in Castle settings # No matching user found in Castle settings
logger.info(f"[USERNAME] No matching user found in Castle settings") logger.debug(f"[USERNAME] No matching user found in Castle settings")
result = f"User-{user_id}" result = f"User-{user_id}"
logger.info(f"[USERNAME] Case 3 result (not found): '{result}'") logger.debug(f"[USERNAME] Case 3 result (not found): '{result}'")
return result return result
except Exception as e: except Exception as e:
@ -605,16 +605,16 @@ async def _get_username_from_user_id(user_id: str) -> str:
# Case 4: Unknown format - try as-is and fall back # Case 4: Unknown format - try as-is and fall back
else: else:
logger.info(f"[USERNAME] Case 4: Unknown format - trying as-is") logger.debug(f"[USERNAME] Case 4: Unknown format - trying as-is")
try: try:
user = await get_user(user_id) user = await get_user(user_id)
result = user.username if user and user.username else f"User-{user_id[:8]}" result = user.username if user and user.username else f"User-{user_id[:8]}"
logger.info(f"[USERNAME] Case 4 result: '{result}'") logger.debug(f"[USERNAME] Case 4 result: '{result}'")
return result return result
except Exception as e: except Exception as e:
logger.info(f"[USERNAME] Case 4 exception: {e}") logger.debug(f"[USERNAME] Case 4 exception: {e}")
result = f"User-{user_id[:8]}" result = f"User-{user_id[:8]}"
logger.info(f"[USERNAME] Case 4 fallback result: '{result}'") logger.debug(f"[USERNAME] Case 4 fallback result: '{result}'")
return result return result