tgbots/AnyMusicBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

used black

Browse Source
This commit is contained in:
hhh
2024-11-02 00:10:24 +02:00
parent 1b1f217b75
commit e0a3d256d5
79 changed files with 658 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bot/keyboards/inline/full_menu.py
View File

@@ -1,27 +1,23 @@
from aiogram.utils.keyboard import (InlineKeyboardMarkup, InlineKeyboardButton,
InlineKeyboardBuilder)
from aiogram.utils.keyboard import (
InlineKeyboardMarkup,
InlineKeyboardButton,
InlineKeyboardBuilder,
)
from bot.factories.full_menu import FullMenuCallback
from bot.keyboards.inline import search_variants as sv
def get_full_menu_kb() -> InlineKeyboardMarkup:
buttons = (sv.get_search_variants(
query='',
services=
sv.soundcloud |
sv.spotify |
sv.deezer |
sv.youtube
buttons = sv.get_search_variants(
query="", services=sv.soundcloud | sv.spotify | sv.deezer | sv.youtube
) + [
[
InlineKeyboardButton(
text='⚙️ Settings',
callback_data=FullMenuCallback(
action='settings'
).pack()
)
],
])
[
InlineKeyboardButton(
text="⚙️ Settings",
callback_data=FullMenuCallback(action="settings").pack(),
)
],
]
return InlineKeyboardBuilder(buttons).as_markup()

42
bot/keyboards/inline/search_variants.py
View File

@@ -1,42 +1,34 @@
from aiogram.utils.keyboard import (InlineKeyboardMarkup, InlineKeyboardButton,
InlineKeyboardBuilder)
from aiogram.utils.keyboard import (
InlineKeyboardMarkup,
InlineKeyboardButton,
InlineKeyboardBuilder,
)
deezer = {
'd': '🎵 Search in Deezer'
}
soundcloud = {
'c': '☁️ Search in SoundCloud'
}
youtube = {
'y': '▶️ Search in YouTube'
}
spotify = {
's': '🎧 Search in Spotify'
}
deezer = {"d": "🎵 Search in Deezer"}
soundcloud = {"c": "☁️ Search in SoundCloud"}
youtube = {"y": "▶️ Search in YouTube"}
spotify = {"s": "🎧 Search in Spotify"}
def get_search_variants(
query: str,
services: dict[str, str],
query: str,
services: dict[str, str],
) -> list[list[InlineKeyboardButton]]:
buttons = [
[
InlineKeyboardButton(
text=services[key],
switch_inline_query_current_chat=f'{key}:{query}'
text=services[key], switch_inline_query_current_chat=f"{key}:{query}"
)
] for key in services.keys()
]
for key in services.keys()
]
return buttons
def get_search_variants_kb(
query: str,
services: dict[str, str],
query: str,
services: dict[str, str],
) -> InlineKeyboardMarkup:
return InlineKeyboardBuilder(get_search_variants(
query,
services
)).as_markup()
return InlineKeyboardBuilder(get_search_variants(query, services)).as_markup()

32
bot/keyboards/inline/setting.py
View File

@@ -1,5 +1,8 @@
from aiogram.utils.keyboard import (InlineKeyboardMarkup, InlineKeyboardButton,
InlineKeyboardBuilder)
from aiogram.utils.keyboard import (
InlineKeyboardMarkup,
InlineKeyboardButton,
InlineKeyboardBuilder,
)
from bot.factories.open_setting import SettingChoiceCallback
from bot.factories.full_menu import FullMenuCallback
@@ -11,22 +14,21 @@ def get_setting_kb(s_id: str, user_id: str) -> InlineKeyboardMarkup:
buttons = [
[
InlineKeyboardButton(
text=(
'✅ ' if setting.value == choice else ''
) + setting.choices[choice],
text=("✅ " if setting.value == choice else "")
+ setting.choices[choice],
callback_data=SettingChoiceCallback(
s_id=s_id,
choice=choice,
).pack()
).pack(),
)
] for choice in setting.choices.keys()
] + [[
InlineKeyboardButton(
text='🔙',
callback_data=FullMenuCallback(
action='settings'
).pack()
)
]]
]
for choice in setting.choices.keys()
] + [
[
InlineKeyboardButton(
text="🔙", callback_data=FullMenuCallback(action="settings").pack()
)
]
]
return InlineKeyboardBuilder(buttons).as_markup()

27
bot/keyboards/inline/settings.py
View File

@@ -1,5 +1,8 @@
from aiogram.utils.keyboard import (InlineKeyboardMarkup, InlineKeyboardButton,
InlineKeyboardBuilder)
from aiogram.utils.keyboard import (
InlineKeyboardMarkup,
InlineKeyboardButton,
InlineKeyboardBuilder,
)
from bot.factories.open_setting import OpenSettingCallback
from bot.factories.full_menu import FullMenuCallback
@@ -13,16 +16,16 @@ def get_settings_kb() -> InlineKeyboardMarkup:
text=settings_strings[setting_id].name,
callback_data=OpenSettingCallback(
s_id=setting_id,
).pack()
).pack(),
)
] for setting_id in settings_strings.keys()
] + [[
InlineKeyboardButton(
text='🔙',
callback_data=FullMenuCallback(
action='home'
).pack()
)
]]
]
for setting_id in settings_strings.keys()
] + [
[
InlineKeyboardButton(
text="🔙", callback_data=FullMenuCallback(action="home").pack()
)
]
]
return InlineKeyboardBuilder(buttons).as_markup()