Skip to content

Commit be89827

Browse files
committed
Final Commit
1 parent aaf54c5 commit be89827

File tree

6 files changed

+5
-12
lines changed

6 files changed

+5
-12
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
- name: Install dependencies
2020
run: |
2121
python -m pip install --upgrade pip
22+
pip install -r requirements.txt
2223
pip install pylint_runner
2324
- name: Pylint
2425
run: pylint_runner

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
# AdvancedUserTelegramBot
2+
> только для тех кто любит больших и волосатых мужиков

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ aiogram~=2.22.1
77
SQLAlchemy~=1.4.40
88

99
# Debug
10-
pylint
10+
pylint_runner
1111
loguru~=0.6.0
1212

1313
# Other
1414
asyncio
1515
tgcrypto
16-
# uvloop
16+

telegram_bot/database/methods.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,16 @@ def create_user(telegram_id: int) -> None:
99
select_query = select(User.telegram_id).where(User.telegram_id == telegram_id)
1010
session = Database().session
1111
if session.execute(select_query).fetchone():
12-
logger.debug(f"Такой пользователь уже есть в базе! Его Telegram-id - {telegram_id}")
1312
return
1413
insert_query = User(telegram_id=telegram_id)
1514
session.add(insert_query)
1615
session.commit()
17-
logger.debug(f"Добавлен новый юзер! Telegram-id - {telegram_id}")
1816

1917

2018
def create_user_bot_session(user: User, user_bot_session: str):
21-
logger.debug("Зашёл в создание сессии")
2219
session = Database().session
2320
session.add(Session(user_id=user.id, session=user_bot_session))
2421
session.commit()
25-
logger.debug("После создания сессии в бд")
2622

2723

2824
def get_user_by_id_telegram_id(telegram_id: int) -> User | None:
@@ -36,19 +32,15 @@ def get_user_by_id_telegram_id(telegram_id: int) -> User | None:
3632

3733
def check_vip(telegram_id) -> bool:
3834
select_query = select(User.vip).where(User.telegram_id == telegram_id)
39-
logger.debug("Отправляю запрос на проверку vip")
4035
result = bool(Database().session.execute(select_query).fetchone()[0])
41-
logger.debug(f"result: {result}")
4236
return result
4337

4438

4539
def set_vip(telegram_id) -> None:
4640
update_query = update(User, values={User.vip: 1}).where(User.telegram_id == telegram_id)
47-
logger.debug("Отправляю запрос на установку vip статуса")
4841
session = Database().session
4942
session.execute(update_query)
5043
session.commit()
51-
logger.debug("Vip статус установлен!")
5244

5345

5446
def get_users_with_sessions():

telegram_bot/handlers/user/user_bot_creator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ async def __input_oauth_code(msg: Message, state: FSMContext) -> None:
156156
await state.finish()
157157
return
158158
except SessionPasswordNeeded as e:
159-
logger.error(e)
159+
logger.debug("У пользователя включена 2-х этапная аунтефикаия")
160160
await bot.send_message(msg.from_user.id, "Введи 2fa")
161161
await state.set_state(CreateUserBotState.TWO_FA_PASSWORD)
162162
return

telegram_bot/main.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ async def __on_start_up(dp: Dispatcher) -> None:
2121

2222
users_tg_id = get_users_with_sessions()
2323
count = 0
24-
logger.debug(users_tg_id)
2524
if not users_tg_id:
2625
logger.info("В базе никого нет, я хочу плакать. У меня дипрессия и мне одиноко!")
2726
return

0 commit comments

Comments
 (0)