refactor: streamline configuration loading and enhance admin checks

- Refactored the configuration loading in `config.py` to utilize a single source of truth through the `Settings` class, improving maintainability and clarity.
- Introduced the `is_admin_for_telegram_user` function in `repository.py` to centralize admin checks based on usernames and phone numbers.
- Updated command handlers to use the new admin check function, ensuring consistent access control across the application.
- Enhanced error handling in the `error_handler` to log exceptions when sending error replies to users, improving debugging capabilities.
- Improved the handling of user phone updates in `repository.py` to ensure proper normalization and validation of phone numbers.

duty_teller/handlers/commands.py

@@ -11,6 +11,7 @@ from duty_teller.db.repository import (
     get_or_create_user,
     set_user_phone,
     create_calendar_token,
+    is_admin_for_telegram_user,
 )
 from duty_teller.i18n import get_lang, t
 from duty_teller.utils.user import build_full_name
@@ -150,7 +151,13 @@ async def help_cmd(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
         t(lang, "help.calendar_link"),
         t(lang, "help.pin_duty"),
     ]
-    if config.is_admin(update.effective_user.username or ""):
+
+    def check_admin() -> bool:
+        with session_scope(config.DATABASE_URL) as session:
+            return is_admin_for_telegram_user(session, update.effective_user.id)
+
+    is_admin_user = await asyncio.get_running_loop().run_in_executor(None, check_admin)
+    if is_admin_user:
         lines.append(t(lang, "help.import_schedule"))
     await update.message.reply_text("\n".join(lines))
 

duty_teller/handlers/errors.py

@@ -22,6 +22,9 @@ async def error_handler(
     """
     logger.exception("Exception while handling an update")
     if isinstance(update, Update) and update.effective_message:
-        user = getattr(update, "effective_user", None)
-        lang = get_lang(user) if user else config.DEFAULT_LANGUAGE
-        await update.effective_message.reply_text(t(lang, "errors.generic"))
+        try:
+            user = getattr(update, "effective_user", None)
+            lang = get_lang(user) if user else config.DEFAULT_LANGUAGE
+            await update.effective_message.reply_text(t(lang, "errors.generic"))
+        except Exception:
+            logger.warning("Could not send error reply to user", exc_info=True)

duty_teller/handlers/group_duty_pin.py

@@ -190,8 +190,8 @@ async def restore_group_pin_jobs(application) -> None:
     """Restore scheduled pin-update jobs for all chats that have a pinned message (on startup)."""
     loop = asyncio.get_running_loop()
     chat_ids = await loop.run_in_executor(None, _get_all_pin_chat_ids_sync)
+    next_end = await loop.run_in_executor(None, _get_next_shift_end_sync)
     for chat_id in chat_ids:
-        next_end = await loop.run_in_executor(None, _get_next_shift_end_sync)
         await _schedule_next_update(application, chat_id, next_end)
     logger.info("Restored %s group pin jobs", len(chat_ids))
 

duty_teller/handlers/import_duty_schedule.py

@@ -7,6 +7,7 @@ from telegram import Update
 from telegram.ext import CommandHandler, ContextTypes, MessageHandler, filters
 
 from duty_teller.db.session import session_scope
+from duty_teller.db.repository import is_admin_for_telegram_user
 from duty_teller.i18n import get_lang, t
 from duty_teller.importers.duty_schedule import (
     DutyScheduleParseError,
@@ -23,7 +24,13 @@ async def import_duty_schedule_cmd(
     if not update.message or not update.effective_user:
         return
     lang = get_lang(update.effective_user)
-    if not config.is_admin(update.effective_user.username or ""):
+
+    def check_admin() -> bool:
+        with session_scope(config.DATABASE_URL) as session:
+            return is_admin_for_telegram_user(session, update.effective_user.id)
+
+    is_admin_user = await asyncio.get_running_loop().run_in_executor(None, check_admin)
+    if not is_admin_user:
         await update.message.reply_text(t(lang, "import.admin_only"))
         return
     context.user_data["awaiting_handover_time"] = True
@@ -38,7 +45,13 @@ async def handle_handover_time_text(
         return
     if not context.user_data.get("awaiting_handover_time"):
         return
-    if not config.is_admin(update.effective_user.username or ""):
+
+    def check_admin() -> bool:
+        with session_scope(config.DATABASE_URL) as session:
+            return is_admin_for_telegram_user(session, update.effective_user.id)
+
+    is_admin_user = await asyncio.get_running_loop().run_in_executor(None, check_admin)
+    if not is_admin_user:
         return
     lang = get_lang(update.effective_user)
     text = update.message.text.strip()
@@ -63,7 +76,15 @@ async def handle_duty_schedule_document(
         return
     lang = get_lang(update.effective_user)
     handover = context.user_data.get("handover_utc_time")
-    if not handover or not config.is_admin(update.effective_user.username or ""):
+    if not handover:
+        return
+
+    def check_admin() -> bool:
+        with session_scope(config.DATABASE_URL) as session:
+            return is_admin_for_telegram_user(session, update.effective_user.id)
+
+    is_admin_user = await asyncio.get_running_loop().run_in_executor(None, check_admin)
+    if not is_admin_user:
         return
     if not (update.message.document.file_name or "").lower().endswith(".json"):
         await update.message.reply_text(t(lang, "import.need_json"))