Skip to content

Commit eb54332

Browse files
committed
refactor: move game_handler to game.py
1 parent 5436e45 commit eb54332

File tree

2 files changed

+27
-17
lines changed

2 files changed

+27
-17
lines changed

tfinance/game.py

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
from telegram import InlineKeyboardButton, InlineKeyboardMarkup, Update
2-
from telegram.ext import ContextTypes, CallbackContext
1+
from telegram import (
2+
InlineKeyboardButton,
3+
InlineKeyboardMarkup,
4+
Update,
5+
)
6+
from telegram.ext import (
7+
ContextTypes,
8+
CallbackContext,
9+
ConversationHandler,
10+
CommandHandler,
11+
CallbackQueryHandler,
12+
)
313

414
from database import Database
515
from exceptions import (
@@ -201,3 +211,15 @@ async def game_results(context: CallbackContext):
201211
# Удаляем пройденные прогнозы
202212
db.delete_predictions(user)
203213
user.prediction = db.get_predictions(user)
214+
215+
216+
game_handler = ConversationHandler(
217+
entry_points=[CommandHandler("game", game_menu)],
218+
states={
219+
1: [
220+
CallbackQueryHandler(higher_game, pattern="^1$"),
221+
CallbackQueryHandler(lower_game, pattern="^2$"),
222+
],
223+
},
224+
fallbacks=[CommandHandler("game", game_menu)],
225+
)

tfinance/main.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# -------------------------- Основной файл приложения -------------------------- #
2-
# --------------- Импорт необходимых библиотек, функций, классов --------------- #
1+
# ------------------------ Основной файл приложения ------------------------ #
2+
# ------------- Импорт необходимых библиотек, функций, классов ------------- #
33
# Встроенные библиотеки.
44
import datetime
55
import logging
@@ -9,9 +9,7 @@
99

1010
# Работа с telegram-bot-api.
1111
from telegram.ext import (
12-
CallbackQueryHandler,
1312
CommandHandler,
14-
ConversationHandler,
1513
Application,
1614
ContextTypes,
1715
)
@@ -23,7 +21,7 @@
2321
from database import Database
2422
from exceptions import EmptyDataFrameError, WrongPeriodError
2523
from functions import create_user
26-
from game import game_menu, game_results, higher_game, lower_game
24+
from game import game_handler, game_results
2725
from graphics.visualize import do_stock_image
2826
from stock import check_stock, get_all_stocks, load_stocks
2927
from config import BOT_TOKEN, TIMEZONE
@@ -218,16 +216,6 @@ def main():
218216
),
219217
)
220218

221-
game_handler = ConversationHandler(
222-
entry_points=[CommandHandler("game", game_menu)],
223-
states={
224-
1: [
225-
CallbackQueryHandler(higher_game, pattern="^1$"),
226-
CallbackQueryHandler(lower_game, pattern="^2$"),
227-
],
228-
},
229-
fallbacks=[CommandHandler("game", game_menu)],
230-
)
231219
application.add_handler(game_handler)
232220

233221
application.add_handler(CommandHandler("daily", daily))

0 commit comments

Comments
 (0)