ADD: html_tags in misc.py

Author: BaggerFast

misc/html_tags.py

@@ -0,0 +1,14 @@
+def __html_tag_creator(text: str, tag: str) -> str:
+    return f'<{tag}>{text}</{tag}>'
+
+
+# region Tags
+
+def b(text: str) -> str:
+    return __html_tag_creator(text, 'b')
+
+
+def i(text: str) -> str:
+    return __html_tag_creator(text, 'i')
+
+# endregion

run.py

@@ -7,7 +7,8 @@
 
 def main():
     log_path = PathManager.get('logs/debug.log')
-    logger.add(log_path, format="{time} {level} {message}", level="DEBUG", rotation="10:00", compression="zip")
+    logger.add(log_path, format="{time} {level} {message}",
+               level="DEBUG", rotation="10:00", compression="zip")
     start_telegram_bot()
 
 

telegram_bot/database/methods/other.py

@@ -1,6 +1,5 @@
 from telegram_bot.database.models import User
 from telegram_bot.database.main import Database
-from telegram_bot.database.methods.create import create_user
 from telegram_bot.database.methods.get import get_user_by_telegram_id
 
 

telegram_bot/handlers/admin/main.py

@@ -100,17 +100,20 @@ async def __analytic(query: CallbackQuery, state: FSMContext) -> None:
 def register_admin_handlers(dp: Dispatcher) -> None:
     # region Msg handlers
 
-    dp.register_message_handler(__admin_insert_tg_id, IsAdmin(), content_types=['text'], state=AdminStates.INSERT_NEW_ADMIN)
+    dp.register_message_handler(__admin_insert_tg_id, IsAdmin(), content_types=['text'],
+                                state=AdminStates.INSERT_NEW_ADMIN)
 
-    dp.register_message_handler(__do_advertising, IsAdmin(), content_types=['text'], state=AdminStates.INSERT_ADVERT_TEXT)
+    dp.register_message_handler(__do_advertising, IsAdmin(), content_types=['text'],
+                                state=AdminStates.INSERT_ADVERT_TEXT)
 
     # endregion
 
     # region Callback handlers
 
     dp.register_callback_query_handler(__analytic, IsAdmin(), lambda c: c.data == "analytics", state=AdminStates.ADMIN)
     dp.register_callback_query_handler(__add_admin, IsAdmin(), lambda c: c.data == "add_admin", state=AdminStates.ADMIN)
-    dp.register_callback_query_handler(__advertising, IsAdmin(), lambda c: c.data == "advertising", state=AdminStates.ADMIN)
+    dp.register_callback_query_handler(__advertising, IsAdmin(), lambda c: c.data == "advertising",
+                                       state=AdminStates.ADMIN)
 
     # endregion
 

telegram_bot/handlers/user/main.py

@@ -16,8 +16,7 @@ async def __start(msg: Message) -> None:
     user_id = msg.from_user.id
     keyboard = get_main_keyboard(user_id)
     await bot.send_message(user_id, f"Привет, <b>{msg.from_user.first_name}</b>!\n"
-                                    f"Это <b>лучший</b> юзер бот с анимациями!😎", reply_markup=keyboard,
-                           parse_mode="HTML")
+                                    f"Это <b>лучший</b> юзер бот с анимациями!😎", reply_markup=keyboard)
 
 
 async def __teh_support(msg: Message) -> None:

telegram_bot/keyboards/util.py

@@ -31,7 +31,7 @@ def get_admin_keyboard(user_id: int) -> InlineKeyboardMarkup:
     kb.add(
         InlineKeyboardButton("Добавить администратора ➕", callback_data="add_admin"),
         InlineKeyboardButton(f"Vip {'ВЫКЛ ❌' if user.vip else 'ВКЛ ✅'}", callback_data="vip_switcher"),
-        InlineKeyboardButton(f"Выдать Vip ✨", callback_data="give_vip"),
+        InlineKeyboardButton("Выдать Vip ✨", callback_data="give_vip"),
         InlineKeyboardButton("Аналитика 🤌", callback_data="analytics"),
         InlineKeyboardButton("Рассылка ✉️", callback_data="advertising"),
         InlineKeyboardButton("Выйти ⛔️", callback_data="admin_exit"),

telegram_bot/utils/__init__.py

@@ -1,5 +1,3 @@
 from .env import Env
 from .config import TgConfig
 from .states import CreateUserBotState
-
-

user_bot/handlers/common/games.py

@@ -9,7 +9,7 @@
 from user_bot.utils import cmd
 
 
-@cmd(False)
+@cmd()
 async def __coin(app: Client, msg: Message):
     loader = (
         f'{randint(1, 10)}%   █▒▒▒▒▒▒▒▒▒▒▒▒',

user_bot/handlers/common/main.py

@@ -5,14 +5,15 @@
 from pyrogram.handlers import MessageHandler
 from pyrogram.types import Message
 
+from misc.html_tags import b
 from user_bot.filters import get_free_filters
 from user_bot.handlers.common.games import _get_game_handlers
 from user_bot.utils import cmd, play_anim
 from user_bot.handlers.common.stickers import _get_sticker_handlers
 from user_bot.handlers.common.texts import _get_text_handlers
 
 
-@cmd(False)
+@cmd()
 async def __night(app, msg: Message):
     sleep_words = (
         'зайка 💚', 'солнышко 💛', 'котёнок ❤', 'цветочек 💙', 'ангелочек 💜', 'принцесса 💓',
@@ -22,14 +23,14 @@ async def __night(app, msg: Message):
         '❤ я ❤', '💚 тебя 💚', '💙 очень 💙', '💛 сильно 💛', '💜 люблю 💜',
     )
     for word in sleep_words:
-        await msg.edit(f'<b>Cпокойной ночи {word}</b>')
+        await msg.edit(b(f'Cпокойной ночи {word}'))
         await sleep(0.5)
     for word in love_words:
-        await msg.edit(f'<b>{word}</b>')
+        await msg.edit(b(word))
         await sleep(0.5)
 
 
-@cmd()
+@cmd(True)
 async def __bombs(app: Client, msg: Message):
     row = '▪️▪️▪️▪️\n'
     bombs = '💣 💣 💣 💣\n'
@@ -49,7 +50,7 @@ async def __bombs(app: Client, msg: Message):
     await play_anim(msg, words)
 
 
-@cmd()
+@cmd(True)
 async def __stupid(app: Client, msg: Message):
     first_str = 'YOUR BRAIN ➡️ 🧠\n\n🧠'
     second_str = 'YOUR BRAIN ➡️ 🧠\n\n'
@@ -70,7 +71,7 @@ async def __stupid(app: Client, msg: Message):
     await play_anim(msg, words)
 
 
-@cmd(False)
+@cmd()
 async def __compli(app: Client, msg: Message):
     words = (
         'удивительная', 'внимательная', 'красивая', 'лучшая', 'успешная', 'заботливая', 'милая', 'прекрасная',
@@ -83,9 +84,9 @@ async def __compli(app: Client, msg: Message):
     await sleep(1)
 
     for word in words:
-        await msg.edit(f'<b>Cамая {word}</b> ✨')
+        await msg.edit(b(f'Cамая {word}✨'))
         await sleep(0.5)
-    await msg.edit(f'<b>Cамая {choice(words)}</b> ✨')
+    await msg.edit(b(f'Cамая {choice(words)}✨'))
 
 
 def get_common_handlers() -> tuple[MessageHandler, ...]:
@@ -98,6 +99,4 @@ def get_common_handlers() -> tuple[MessageHandler, ...]:
         *_get_game_handlers(),
         *_get_text_handlers(),
         *_get_sticker_handlers(),
-
-
     )

user_bot/handlers/common/stickers.py

@@ -9,7 +9,7 @@
 from user_bot.utils import cmd, play_stroke_anim
 
 
-@cmd(False)
+@cmd()
 async def __steve(app: Client, msg: Message):
     img = (
         "🏿🏿🏿🏿🏿🏿🏿🏿",
@@ -23,7 +23,7 @@ async def __steve(app: Client, msg: Message):
     await play_stroke_anim(msg, img)
 
 
-@cmd(False)
+@cmd()
 async def __uno(app: Client, msg: Message):
     img = (
         "⣿⣿⣿⡿⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇",
@@ -43,7 +43,7 @@ async def __uno(app: Client, msg: Message):
     await play_stroke_anim(msg, img)
 
 
-@cmd(False)
+@cmd()
 async def __gubka(app: Client, msg: Message):
     img = (
         "╲┏━┳━━━━━━━━┓╲╲",
@@ -57,7 +57,7 @@ async def __gubka(app: Client, msg: Message):
     await play_stroke_anim(msg, img)
 
 
-@cmd(False)
+@cmd()
 async def __rabbit(app: Client, msg: Message):
     left_eyes = '┈┃▋▏▋▏┃┈'
     right_eyes = '┈┃╱▋╱▋┃┈'