Skip to content

Commit

Permalink
fix: some minor fix of on_hold status in telegram-bot
Browse files Browse the repository at this point in the history
  • Loading branch information
@SaintShit
SaintShit committed Jul 28, 2024
1 parent 71b4882 commit cf98e95
Showing 1 changed file with 26 additions and 21 deletions.
47 changes: 26 additions & 21 deletions app/telegram/handlers/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ def add_user_status_step(call: types.CallbackQuery):
bot.delete_message(call.message.chat.id, call.message.message_id)

if user_status == 'onhold':
expiry_message = '⬆️ Enter Expire Days\nYou Can Use Regex Symbol: ^[0-9]{1,3}(M|D) :\n⚠️ Send 0 for never expire.'
expiry_message = '⬆️ Enter Expire Days\nYou Can Use Regex Symbol: ^[0-9]{1,3}(M|D) :'
else:
expiry_message = '⬆️ Enter Expire Date (YYYY-MM-DD)\nOr You Can Use Regex Symbol: ^[0-9]{1,3}(M|D) :\n⚠️ Send 0 for never expire.'

Expand Down Expand Up @@ -1236,6 +1236,8 @@ def add_user_expire_step(message: types.Message, username: str, data_limit: int,
elif symbol == 'D':
expire_date = today + relativedelta(days=number)
elif message.text == '0':
if user_status == 'onhold':
raise ValueError("Expire days is required for an on hold user.")
expire_date = None
elif user_status == 'active':
expire_date = datetime.strptime(message.text, "%Y-%m-%d")
Expand All @@ -1248,7 +1250,8 @@ def add_user_expire_step(message: types.Message, username: str, data_limit: int,
wait_msg = bot.send_message(message.chat.id, f'❌ {error_message}')
schedule_delete_message(message.chat.id, wait_msg.id)
schedule_delete_message(message.chat.id, message.id)
return bot.register_next_step_handler(wait_msg, add_user_expire_step, username=username, data_limit=data_limit, user_status=user_status)
return bot.register_next_step_handler(
wait_msg, add_user_expire_step, username=username, data_limit=data_limit, user_status=user_status)

mem_store.set(f'{message.chat.id}:username', username)
mem_store.set(f'{message.chat.id}:data_limit', data_limit)
Expand All @@ -1258,7 +1261,7 @@ def add_user_expire_step(message: types.Message, username: str, data_limit: int,
schedule_delete_message(message.chat.id, message.id)
cleanup_messages(message.chat.id)
if user_status == "onhold":
timeout_message = '⬆️ Enter timeout (YYYY-MM-DD)\nOr You Can Use Regex Symbol: ^[0-9]{1,3}(M|D) :\n⚠️ Send 0 for never expire.'
timeout_message = '⬆️ Enter timeout (YYYY-MM-DD)\nOr You Can Use Regex Symbol: ^[0-9]{1,3}(M|D) :\n⚠️ Send 0 for never timeout.'
msg = bot.send_message(
message.chat.id,
timeout_message,
Expand All @@ -1268,16 +1271,17 @@ def add_user_expire_step(message: types.Message, username: str, data_limit: int,
return bot.register_next_step_handler(msg, add_on_hold_timeout)

bot.send_message(
message.chat.id,
'Select Protocols:\nUsername: {}\nData Limit: {}\nStatus: {}\nExpiry Date: {}'.format(
message.chat.id, 'Select Protocols:\nUsername: {}\nData Limit: {}\nStatus: {}\nExpiry Date: {}'.format(
mem_store.get(f'{message.chat.id}:username'),
readable_size(mem_store.get(f'{message.chat.id}:data_limit')) if mem_store.get(
f'{message.chat.id}:data_limit') else "Unlimited",
mem_store.get(f'{message.chat.id}:user_status'),
mem_store.get(f'{message.chat.id}:expire_date').strftime("%Y-%m-%d") if isinstance(mem_store.get(f'{message.chat.id}:expire_date'), datetime)
else mem_store.get(f'{message.chat.id}:expire_date') if mem_store.get(f'{message.chat.id}:expire_date') else 'Never'),
reply_markup=BotKeyboard.select_protocols({}, action="create")
)
readable_size(mem_store.get(f'{message.chat.id}:data_limit'))
if mem_store.get(f'{message.chat.id}:data_limit') else "Unlimited", mem_store.get(
f'{message.chat.id}:user_status'),
mem_store.get(f'{message.chat.id}:expire_date').strftime("%Y-%m-%d")
if isinstance(mem_store.get(f'{message.chat.id}:expire_date'),
datetime) else mem_store.get(f'{message.chat.id}:expire_date')
if mem_store.get(f'{message.chat.id}:expire_date') else 'Never'),
reply_markup=BotKeyboard.select_protocols({},
action="create"))


def add_on_hold_timeout(message: types.Message):
Expand Down Expand Up @@ -1313,16 +1317,17 @@ def add_on_hold_timeout(message: types.Message):
cleanup_messages(message.chat.id)

bot.send_message(
message.chat.id,
'Select Protocols:\nUsername: {}\nData Limit: {}\nStatus: {}\nExpiry Date: {}'.format(
message.chat.id, 'Select Protocols:\nUsername: {}\nData Limit: {}\nStatus: {}\nExpiry Date: {}'.format(
mem_store.get(f'{message.chat.id}:username'),
readable_size(mem_store.get(f'{message.chat.id}:data_limit')) if mem_store.get(
f'{message.chat.id}:data_limit') else "Unlimited",
mem_store.get(f'{message.chat.id}:user_status'),
mem_store.get(f'{message.chat.id}:expire_date').strftime("%Y-%m-%d") if isinstance(mem_store.get(f'{message.chat.id}:expire_date'), datetime)
else mem_store.get(f'{message.chat.id}:expire_date') if mem_store.get(f'{message.chat.id}:expire_date') else 'Never'),
reply_markup=BotKeyboard.select_protocols({}, action="create")
)
readable_size(mem_store.get(f'{message.chat.id}:data_limit'))
if mem_store.get(f'{message.chat.id}:data_limit') else "Unlimited", mem_store.get(
f'{message.chat.id}:user_status'),
mem_store.get(f'{message.chat.id}:expire_date').strftime("%Y-%m-%d")
if isinstance(mem_store.get(f'{message.chat.id}:expire_date'),
datetime) else mem_store.get(f'{message.chat.id}:expire_date')
if mem_store.get(f'{message.chat.id}:expire_date') else 'Never'),
reply_markup=BotKeyboard.select_protocols({},
action="create"))


@bot.callback_query_handler(cb_query_startswith('select_inbound:'), is_admin=True)
Expand Down

0 comments on commit cf98e95

Please sign in to comment.