From a437e64eccc0013619d0f8bf2bb9b25731b9cd19 Mon Sep 17 00:00:00 2001 From: shokollm <270575765+shokollm@users.noreply.github.com> Date: Sat, 4 Apr 2026 07:23:57 +0000 Subject: [PATCH] Revert "Merge pull request 'feat: implement /timezone command to get/set room timezone' (#67) from feat/issue-53-timezone into main" This reverts commit 015df15bd59f942bb574d84cbdad19df7b8ba648, reversing changes made to bd2627efe9827fd9911d2513767fd5bd570dddae. --- apps/telegram-bot/bot.py | 3 --- apps/telegram-bot/commands.py | 31 ------------------------------- 2 files changed, 34 deletions(-) diff --git a/apps/telegram-bot/bot.py b/apps/telegram-bot/bot.py index a34453b..c72df9c 100644 --- a/apps/telegram-bot/bot.py +++ b/apps/telegram-bot/bot.py @@ -14,7 +14,6 @@ from commands import ( cmd_help, cmd_my, cmd_start, - cmd_timezone, cmd_track, cmd_untrack, cmd_update, @@ -42,7 +41,6 @@ def build_app() -> Application: app.add_handler(CommandHandler("delete", cmd_delete)) app.add_handler(CommandHandler("track", cmd_track)) app.add_handler(CommandHandler("untrack", cmd_untrack)) - app.add_handler(CommandHandler("timezone", cmd_timezone)) app.add_handler(MessageHandler(filters.COMMAND, cmd_help)) @@ -58,7 +56,6 @@ async def post_init(app: Application) -> None: ("edit", "Edit a bounty"), ("track", "Track a bounty"), ("untrack", "Stop tracking"), - ("timezone", "Get/set room timezone"), ("help", "Show help"), ] ) diff --git a/apps/telegram-bot/commands.py b/apps/telegram-bot/commands.py index 62ccafa..9a5c697 100644 --- a/apps/telegram-bot/commands.py +++ b/apps/telegram-bot/commands.py @@ -4,7 +4,6 @@ import time from datetime import datetime from functools import wraps from typing import Optional -from zoneinfo import ZoneInfo, ZoneInfoNotFoundError import dateparser from telegram import Update @@ -359,37 +358,7 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None: "/delete — delete bounty\n" "/track — track a bounty (groups only)\n" "/untrack — stop tracking (groups only)\n" - "/timezone [tz] — get/set room timezone (admin only)\n" "/start — re-initialize\n" "/help — this message", disable_web_page_preview=True, ) - - -async def cmd_timezone(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None: - args = extract_args(update.message.text) - room_id = get_room_id(update) - user_id = get_user_id(update) - - if not args: - current_tz = BOUNTY_SERVICE.get_timezone(room_id) - await update.message.reply_text(f"Current timezone: {current_tz}") - return - - timezone_str = args[0] - - try: - ZoneInfo(timezone_str) - except (KeyError, ZoneInfoNotFoundError): - await update.message.reply_text( - "⛔ Invalid timezone. Use IANA format (e.g., Asia/Jakarta)" - ) - return - - try: - BOUNTY_SERVICE.set_timezone(room_id, timezone_str, user_id) - except PermissionError as e: - await update.message.reply_text(f"⛔ {e}") - return - - await update.message.reply_text(f"✅ Timezone set to {timezone_str}.")