Did some refactor, add YouTube as search variant
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
from aiogram import Router
|
||||
from . import (
|
||||
initialize,
|
||||
inline_song,
|
||||
inline_default,
|
||||
inline_empty,
|
||||
on_chosen,
|
||||
@@ -14,6 +15,7 @@ router.chosen_inline_result.outer_middleware(SaveChosenMiddleware())
|
||||
|
||||
router.include_routers(
|
||||
initialize.router,
|
||||
inline_song.router,
|
||||
inline_default.router,
|
||||
inline_empty.router,
|
||||
on_chosen.router,
|
||||
|
||||
@@ -2,7 +2,7 @@ from aiogram import Router, F
|
||||
|
||||
from aiogram.types import InlineQuery
|
||||
|
||||
from bot.markups.deezer import get_deezer_search_results
|
||||
from bot.results.deezer import get_deezer_search_results
|
||||
|
||||
router = Router()
|
||||
|
||||
|
||||
10
bot/handlers/inline_song/__init__.py
Normal file
10
bot/handlers/inline_song/__init__.py
Normal file
@@ -0,0 +1,10 @@
|
||||
from aiogram import Router
|
||||
|
||||
from . import on_inline_spotify, on_inline_deezer, on_inline_youtube
|
||||
|
||||
router = Router()
|
||||
router.include_routers(
|
||||
on_inline_spotify.router,
|
||||
on_inline_deezer.router,
|
||||
on_inline_youtube.router,
|
||||
)
|
||||
17
bot/handlers/inline_song/on_inline_deezer.py
Normal file
17
bot/handlers/inline_song/on_inline_deezer.py
Normal file
@@ -0,0 +1,17 @@
|
||||
from aiogram import Router
|
||||
|
||||
from aiogram.types import InlineQuery
|
||||
|
||||
from bot.results.deezer import get_deezer_search_results
|
||||
from bot.filters import ServiceSearchFilter
|
||||
|
||||
router = Router()
|
||||
|
||||
|
||||
@router.inline_query(ServiceSearchFilter('d'))
|
||||
async def search_deezer_inline_query(inline_query: InlineQuery):
|
||||
await inline_query.answer(
|
||||
await get_deezer_search_results(inline_query.query.removeprefix('d:')),
|
||||
cache_time=0,
|
||||
is_personal=True
|
||||
)
|
||||
17
bot/handlers/inline_song/on_inline_spotify.py
Normal file
17
bot/handlers/inline_song/on_inline_spotify.py
Normal file
@@ -0,0 +1,17 @@
|
||||
from aiogram import Router
|
||||
|
||||
from aiogram.types import InlineQuery
|
||||
|
||||
from bot.results.spotify import get_spotify_search_results
|
||||
from bot.filters import ServiceSearchFilter
|
||||
|
||||
router = Router()
|
||||
|
||||
|
||||
@router.inline_query(ServiceSearchFilter('s'))
|
||||
async def search_spotify_inline_query(inline_query: InlineQuery):
|
||||
await inline_query.answer(
|
||||
await get_spotify_search_results(inline_query.query.removeprefix('s:')),
|
||||
cache_time=0,
|
||||
is_personal=True
|
||||
)
|
||||
17
bot/handlers/inline_song/on_inline_youtube.py
Normal file
17
bot/handlers/inline_song/on_inline_youtube.py
Normal file
@@ -0,0 +1,17 @@
|
||||
from aiogram import Router
|
||||
|
||||
from aiogram.types import InlineQuery
|
||||
|
||||
from bot.results.youtube import get_youtube_search_results
|
||||
from bot.filters import ServiceSearchFilter
|
||||
|
||||
router = Router()
|
||||
|
||||
|
||||
@router.inline_query(ServiceSearchFilter('y'))
|
||||
async def search_youtube_inline_query(inline_query: InlineQuery):
|
||||
await inline_query.answer(
|
||||
await get_youtube_search_results(inline_query.query.removeprefix('y:')),
|
||||
cache_time=0,
|
||||
is_personal=True
|
||||
)
|
||||
@@ -1,11 +1,12 @@
|
||||
from aiogram import Router
|
||||
from . import spotify, deezer
|
||||
from . import spotify, deezer, youtube
|
||||
|
||||
router = Router()
|
||||
|
||||
router.include_routers(
|
||||
spotify.router,
|
||||
deezer.router,
|
||||
youtube.router,
|
||||
)
|
||||
|
||||
__all__ = ['router']
|
||||
|
||||
49
bot/handlers/on_chosen/youtube.py
Normal file
49
bot/handlers/on_chosen/youtube.py
Normal file
@@ -0,0 +1,49 @@
|
||||
from aiogram import Router, Bot, F
|
||||
from aiogram.types import (
|
||||
BufferedInputFile, URLInputFile, InputMediaAudio,
|
||||
ChosenInlineResult,
|
||||
)
|
||||
|
||||
from bot.modules.youtube import youtube, AgeRestrictedError
|
||||
from bot.utils.config import config
|
||||
from bot.modules.database import db
|
||||
|
||||
router = Router()
|
||||
|
||||
|
||||
@router.chosen_inline_result(F.result_id.startswith('yt::'))
|
||||
async def on_new_chosen(chosen_result: ChosenInlineResult, bot: Bot):
|
||||
song = youtube.songs.from_id(chosen_result.result_id.removeprefix('yt::'))
|
||||
|
||||
try:
|
||||
bytestream = await song.to_bytestream()
|
||||
except AgeRestrictedError:
|
||||
await bot.edit_message_caption(
|
||||
inline_message_id=chosen_result.inline_message_id,
|
||||
caption='🔞 This song is age restricted, so I can\'t download it. '
|
||||
'Try downloading it from Deezer or SoundCloud',
|
||||
reply_markup=None
|
||||
)
|
||||
return
|
||||
|
||||
audio = await bot.send_audio(
|
||||
chat_id=config.telegram.files_chat,
|
||||
audio=BufferedInputFile(
|
||||
file=bytestream.file,
|
||||
filename=bytestream.filename,
|
||||
),
|
||||
thumbnail=URLInputFile(song.thumbnail),
|
||||
performer=song.all_artists,
|
||||
title=song.name,
|
||||
duration=bytestream.duration,
|
||||
)
|
||||
|
||||
db.spotify[song.id] = audio.audio.file_id
|
||||
|
||||
await bot.edit_message_media(
|
||||
inline_message_id=chosen_result.inline_message_id,
|
||||
media=InputMediaAudio(media=audio.audio.file_id),
|
||||
reply_markup=None
|
||||
)
|
||||
|
||||
await db.occasionally_write()
|
||||
Reference in New Issue
Block a user