mirror of
https://github.com/aiogram/aiogram.git
synced 2025-12-11 18:01:04 +00:00
Refactor and improve bot examples (#1256)
* Refactor and improve bot messages
Refactored bot code to use aiogram enumerations and enhanced chat messages with markdown beautifications for a more user-friendly display.
CommandStart() is now used instead of Command('start') for readability.
Furthermore, the bot's 'stop' command was improved, ensuring it executes appropriately during KeyboardInterrupt or SystemExit.
Additionally, the bot's logging was adjusted to output to sys.stdout for better logs' readability.
* Added Changelog
* Add guidance comments on obtaining bot tokens from environment variables
* Remove hardcoded tokens, opt for environment variable
* Remove unnecessary spaces and reorganize imports
* Fix error, switch default storage from Redis to Memory, and add logging to multibot example
This commit is contained in:
parent
68c0516f69
commit
c516ea9d6a
8 changed files with 89 additions and 56 deletions
|
|
@ -1,8 +1,11 @@
|
|||
import asyncio
|
||||
import logging
|
||||
import sys
|
||||
from os import getenv
|
||||
|
||||
from aiogram import Bot, Dispatcher, Router
|
||||
from aiogram.filters import Command
|
||||
from aiogram.enums import ParseMode
|
||||
from aiogram.filters import LEAVE_TRANSITION, ChatMemberUpdatedFilter, CommandStart
|
||||
from aiogram.types import (
|
||||
CallbackQuery,
|
||||
ChatMemberUpdated,
|
||||
|
|
@ -10,8 +13,9 @@ from aiogram.types import (
|
|||
InlineKeyboardMarkup,
|
||||
Message,
|
||||
)
|
||||
from aiogram.utils.markdown import hbold, hcode
|
||||
|
||||
TOKEN = "6wo"
|
||||
TOKEN = getenv("BOT_TOKEN")
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
|
@ -19,14 +23,14 @@ logging.basicConfig(level=logging.INFO)
|
|||
router = Router()
|
||||
|
||||
|
||||
@router.message(Command("start"))
|
||||
@router.message(CommandStart())
|
||||
async def command_start_handler(message: Message) -> None:
|
||||
"""
|
||||
This handler receives messages with `/start` command
|
||||
"""
|
||||
|
||||
await message.answer(
|
||||
f"Hello, <b>{message.from_user.full_name}!</b>",
|
||||
f"Hello, {hbold(message.from_user.full_name)}!",
|
||||
reply_markup=InlineKeyboardMarkup(
|
||||
inline_keyboard=[[InlineKeyboardButton(text="Tap me, bro", callback_data="*")]]
|
||||
),
|
||||
|
|
@ -37,7 +41,7 @@ async def command_start_handler(message: Message) -> None:
|
|||
async def chat_member_update(chat_member: ChatMemberUpdated, bot: Bot) -> None:
|
||||
await bot.send_message(
|
||||
chat_member.chat.id,
|
||||
"Member {chat_member.from_user.id} was changed "
|
||||
f"Member {hcode(chat_member.from_user.id)} was changed "
|
||||
+ f"from {chat_member.old_chat_member.status} to {chat_member.new_chat_member.status}",
|
||||
)
|
||||
|
||||
|
|
@ -48,7 +52,7 @@ sub_router = Router()
|
|||
|
||||
@sub_router.callback_query()
|
||||
async def callback_tap_me(callback_query: CallbackQuery) -> None:
|
||||
await callback_query.answer("Yeah good, now i'm fine")
|
||||
await callback_query.answer("Yeah good, now I'm fine")
|
||||
|
||||
|
||||
# this router will use only edited_message updates
|
||||
|
|
@ -57,38 +61,39 @@ sub_sub_router = Router()
|
|||
|
||||
@sub_sub_router.edited_message()
|
||||
async def edited_message_handler(edited_message: Message) -> None:
|
||||
await edited_message.reply("Message was edited, big brother watch you")
|
||||
await edited_message.reply("Message was edited, Big Brother watches you")
|
||||
|
||||
|
||||
# this router will use only my_chat_member updates
|
||||
deep_dark_router = Router()
|
||||
|
||||
|
||||
@deep_dark_router.my_chat_member()
|
||||
@deep_dark_router.my_chat_member(~ChatMemberUpdatedFilter(~LEAVE_TRANSITION))
|
||||
async def my_chat_member_change(chat_member: ChatMemberUpdated, bot: Bot) -> None:
|
||||
await bot.send_message(
|
||||
chat_member.chat.id,
|
||||
"Member was changed from "
|
||||
+ f"{chat_member.old_chat_member.status} to {chat_member.new_chat_member.status}",
|
||||
"This Bot`s status was changed from "
|
||||
+ f"{hbold(chat_member.old_chat_member.status)} to {hbold(chat_member.new_chat_member.status)}",
|
||||
)
|
||||
|
||||
|
||||
async def main() -> None:
|
||||
# Initialize Bot instance with a default parse mode which will be passed to all API calls
|
||||
bot = Bot(TOKEN, parse_mode="HTML")
|
||||
bot = Bot(TOKEN, parse_mode=ParseMode.HTML)
|
||||
|
||||
dp = Dispatcher()
|
||||
dp.include_router(router)
|
||||
|
||||
sub_router.include_router(deep_dark_router)
|
||||
router.include_router(sub_router)
|
||||
router.include_router(sub_sub_router)
|
||||
router.include_routers(sub_router, sub_sub_router)
|
||||
dp.include_router(router)
|
||||
|
||||
useful_updates = dp.resolve_used_update_types()
|
||||
|
||||
# And the run events dispatching
|
||||
await dp.start_polling(bot, allowed_updates=useful_updates)
|
||||
# Start event dispatching
|
||||
await dp.start_polling(bot)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
asyncio.run(main())
|
||||
logging.basicConfig(level=logging.INFO, stream=sys.stdout)
|
||||
try:
|
||||
asyncio.run(main())
|
||||
except (KeyboardInterrupt, SystemExit):
|
||||
logger.info("Bot stopped!")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue