Skip to content

Commit 9585b4e

Browse files
Mode switching fix & pep8
1 parent 9ab70b9 commit 9585b4e

File tree

6 files changed

+25
-10
lines changed

6 files changed

+25
-10
lines changed
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from system.db import db
2+
from telegram_bot.handlers.utils.decorators import remember_new_user, \
3+
send_typing, write_logs
4+
from telegram_bot.handlers.utils.menu_entries import MenuEntry
5+
from telegram_bot.handlers.utils.reply_markup import create_main_reply_markup
26
from telegram_bot.models import User
3-
from telegram_bot.handlers.utils.decorators import remember_new_user, send_typing, write_logs
47

58

69
@write_logs
710
@send_typing
811
@remember_new_user
9-
def handle_detailed_mode_cmd(bot, update) -> None:
12+
def handle_detailed_mode_cmd(bot, update) -> int:
1013
db.session.query(User).filter_by(
1114
telegram_id=update.message.from_user.id
1215
).update({
@@ -15,5 +18,7 @@ def handle_detailed_mode_cmd(bot, update) -> None:
1518
db.session.commit()
1619
bot.send_message(
1720
chat_id=update.message.chat_id,
18-
text='Switched to detailed mode'
21+
text='Switched to detailed mode',
22+
reply_markup=create_main_reply_markup()
1923
)
24+
return MenuEntry.START_MENU.value

telegram_bot/handlers/commands/examples.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from telegram_bot.handlers.utils.menu_entries import MenuEntry
22
from telegram_bot.handlers.utils.reply_markup import create_main_reply_markup
3-
from telegram_bot.handlers.utils.decorators import write_logs, remember_new_user, send_typing
3+
from telegram_bot.handlers.utils.decorators import write_logs, \
4+
remember_new_user, send_typing
45

56

67
@write_logs

telegram_bot/handlers/commands/help.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from telegram_bot.handlers.utils.menu_entries import MenuEntry
22
from telegram_bot.handlers.utils.reply_markup import create_main_reply_markup
3-
from telegram_bot.handlers.utils.decorators import write_logs, send_typing, remember_new_user
3+
from telegram_bot.handlers.utils.decorators import write_logs, \
4+
send_typing, remember_new_user
45

56

67
@write_logs
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from system.db import db
2+
from telegram_bot.handlers.utils.decorators import write_logs, send_typing, \
3+
remember_new_user
4+
from telegram_bot.handlers.utils.menu_entries import MenuEntry
5+
from telegram_bot.handlers.utils.reply_markup import create_main_reply_markup
26
from telegram_bot.models import User
3-
from telegram_bot.handlers.utils.decorators import write_logs, send_typing, remember_new_user
47

58

69
@write_logs
710
@send_typing
811
@remember_new_user
9-
def handle_simple_mode_cmd(bot, update) -> None:
12+
def handle_simple_mode_cmd(bot, update) -> int:
1013
db.session.query(User).filter_by(
1114
telegram_id=update.message.from_user.id
1215
).update({
@@ -15,5 +18,7 @@ def handle_simple_mode_cmd(bot, update) -> None:
1518
db.session.commit()
1619
bot.send_message(
1720
chat_id=update.message.chat_id,
18-
text='Switched to simple mode'
21+
text='Switched to simple mode',
22+
reply_markup=create_main_reply_markup()
1923
)
24+
return MenuEntry.START_MENU.value

telegram_bot/handlers/commands/start.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from telegram_bot.handlers.utils.menu_entries import MenuEntry
22
from telegram_bot.handlers.utils.reply_markup import create_main_reply_markup
3-
from telegram_bot.handlers.utils.decorators import write_logs, send_typing, remember_new_user
3+
from telegram_bot.handlers.utils.decorators import write_logs, \
4+
send_typing, remember_new_user
45

56

67
@write_logs

telegram_bot/handlers/messages/mode_toggling.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
from system.db import db
22
from telegram_bot.handlers.utils.decorators import write_logs, send_typing, \
33
remember_new_user
4+
from telegram_bot.handlers.utils.menu_entries import MenuEntry
45
from telegram_bot.models import User
56

67

78
@write_logs
89
@send_typing
910
@remember_new_user
10-
def handle_mode_toggling(bot, update) -> None:
11+
def handle_mode_toggling(bot, update) -> int:
1112
current_user = db.session.query(User).filter_by(
1213
telegram_id=update.message.from_user.id
1314
).first()
@@ -20,3 +21,4 @@ def handle_mode_toggling(bot, update) -> None:
2021
'simple' if simple_mode else 'detailed'
2122
)
2223
)
24+
return MenuEntry.START_MENU.value

0 commit comments

Comments
 (0)