Added and updated repositories 2026-02-05 01:22:45

This commit is contained in:
github-actions[bot]
2026-02-05 01:22:45 +00:00
parent 5c2de322d3
commit abff91c013
14 changed files with 2689 additions and 561 deletions

View File

@@ -1,8 +1,8 @@
__version__ = (3, 1, 1)
# meta banner: https://raw.githubusercontent.com/kamekuro/hikka-mods/main/banners/yamusic.png
# packurl: https://raw.githubusercontent.com/coddrago/assets/refs/heads/main/modules/yamusic.yml
# meta pic: https://raw.githubusercontent.com/kamekuro/hikka-mods/main/icons/yamusic.png
# meta developer: @codrago
# meta banner: https://raw.githubusercontent.com/coddrago/modules/refs/heads/main/banner.png
# meta developer: @codrago_m
# old meta dev: @kamekuro xuesos
# scope: heroku_only
# scope: heroku_min 1.7.2
@@ -41,6 +41,7 @@ class Banners:
meta_info: str = "Music",
is_liked: bool = False,
repeat_mode: str = "NONE",
blur: int = 0,
):
self.title = title
self.artists = artists
@@ -52,6 +53,7 @@ class Banners:
self.meta_info = meta_info
self.is_liked = is_liked
self.repeat_mode = repeat_mode
self.blur = blur
def ultra(self) -> io.BytesIO:
WIDTH, HEIGHT = 2560, 1220
@@ -96,7 +98,9 @@ class Banners:
background = background.crop((0, offset, bg_w, offset + new_h))
background = background.resize((WIDTH, HEIGHT), Image.Resampling.LANCZOS)
background = background.filter(ImageFilter.GaussianBlur(radius=0))
if self.blur > 0:
background = background.filter(ImageFilter.GaussianBlur(radius=self.blur))
dark_overlay = Image.new("RGBA", (WIDTH, HEIGHT), (0, 0, 0, 180))
background = Image.alpha_composite(background, dark_overlay)
@@ -296,30 +300,6 @@ class Banners:
(heart_x, icon_y_center + heart_size + 5),
]
if self.is_liked:
draw.ellipse(c1_box, fill="red", outline="red")
draw.ellipse(c2_box, fill="red", outline="red")
draw.polygon(tri_points, fill="red", outline="red")
else:
draw.ellipse(c1_box, fill=None, outline="red", width=3)
draw.ellipse(c2_box, fill=None, outline="red", width=3)
draw.line(
[
(heart_x - c_r * 2 + 1, icon_y_center),
(heart_x, icon_y_center + heart_size + 5),
],
fill="red",
width=3,
)
draw.line(
[
(heart_x + c_r * 2 - 1, icon_y_center),
(heart_x, icon_y_center + heart_size + 5),
],
fill="red",
width=3,
)
by = io.BytesIO()
background.save(by, format="PNG")
by.seek(0)
@@ -378,8 +358,13 @@ class YaMusicMod(loader.Module):
option="banner_version",
default="ultra",
doc=lambda: self.strings["_cfg"]["banner_version"],
validator=loader.validators.Choice(["old", "new", "ultra"]),
),)
validator=loader.validators.Choice(["ultra"]),
),
loader.ConfigValue(
option="blur",
default=0,
),
)
self.ym_client = None
self.device_id = "".join(random.choices(string.ascii_lowercase, k=16))
@@ -392,6 +377,7 @@ class YaMusicMod(loader.Module):
#"now_play", self._now_play_placeholder, "placeholder for nowplay music"
# Heroku 2.0.0 feature
#)
#utils.register_placeholder("duration", self._duration_placeholder, "progress bar")
if not self.get("guide_sent", False):
await self.inline.bot.send_message(self._tg_id, self.strings("iguide"))
@@ -437,7 +423,7 @@ class YaMusicMod(loader.Module):
me = await self._client.get_me()
self._premium = me.premium if hasattr(me, "premium") else False
@loader.loop(30)
@loader.loop(15)
async def autobio(self):
if not self.config["token"]:
self.autobio.stop()
@@ -547,6 +533,88 @@ class YaMusicMod(loader.Module):
),
)
async def _duration_placeholder(self):
"""Placeholder for {duration} with custom emoji bar"""
if not self.config["token"]:
return "No Token"
try:
now = await self.__get_now_playing()
if not now or now.get("paused"):
return "<code>Not Playing</code>"
duration = now.get("duration_ms", 0)
progress = now.get("progress_ms", 0)
if duration == 0:
return "0%"
percent = (progress / duration) * 100
s_less_10 = (
"<emoji document_id=5454137780454067986></emoji>"
"<emoji document_id=6158923355173949539>⭐</emoji>"
"<emoji document_id=6159012102083188132>⭐</emoji>"
"<emoji document_id=6159012102083188132>⭐</emoji>"
"<emoji document_id=6158753257289158944>⭐</emoji>"
"<emoji document_id=6156700344526049665>⭐</emoji>"
)
s_10_to_20 = (
"<emoji document_id=5454137780454067986></emoji>"
"<emoji document_id=6159095673556840262>⭐</emoji>"
"<emoji document_id=6159012102083188132>⭐</emoji>"
"<emoji document_id=6156933677214341691>⭐</emoji>"
"<emoji document_id=6158753257289158944>⭐</emoji>"
"<emoji document_id=6156700344526049665>⭐</emoji>"
)
s_30_to_40 = (
"<emoji document_id=5454137780454067986></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=6158923355173949539>⭐</emoji>"
"<emoji document_id=6159012102083188132>⭐</emoji>"
"<emoji document_id=6156700344526049665>⭐</emoji>"
)
s_over_50 = (
"<emoji document_id=5454137780454067986></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=6156933677214341691>⭐</emoji>"
"<emoji document_id=6156700344526049665>⭐</emoji>"
)
s_over_80 = (
"<emoji document_id=5454137780454067986></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=5454397458471750662></emoji>"
"<emoji document_id=6156700344526049665>⭐</emoji>"
)
if percent < 10:
return s_less_10
elif percent < 20:
return s_10_to_20
elif percent < 30:
return s_10_to_20
elif percent < 40:
return s_30_to_40
elif percent < 50:
return s_30_to_40
elif percent < 80:
return s_over_50
else:
return s_over_80
except Exception as e:
return f"Error: {e}"
async def _download_bytes(self, url: str) -> typing.Optional[bytes]:
try:
async with aiohttp.ClientSession() as session:
@@ -686,8 +754,10 @@ class YaMusicMod(loader.Module):
meta_info=meta_info,
is_liked=is_liked,
repeat_mode=repeat_mode,
blur=self.config["blur"],
)
file = await utils.run_sync(
getattr(banners, self.config["banner_version"], banners.ultra)
)

View File

@@ -17,10 +17,9 @@ figlet
promoclaimer
passwordgen
send
lastfm
dbmod
chatmodule
stats
tagwatcher
hardspam
YaMusic
YaMusic

View File

@@ -1,124 +0,0 @@
# ---------------------------------------------------------------------------------
#░█▀▄░▄▀▀▄░█▀▄░█▀▀▄░█▀▀▄░█▀▀▀░▄▀▀▄░░░█▀▄▀█
#░█░░░█░░█░█░█░█▄▄▀░█▄▄█░█░▀▄░█░░█░░░█░▀░█
#░▀▀▀░░▀▀░░▀▀░░▀░▀▀░▀░░▀░▀▀▀▀░░▀▀░░░░▀░░▒▀
# Name: LastFM
# Description: Module for music from different services
# Author: @codrago_m
# ---------------------------------------------------------------------------------
# 🔒 Licensed under the GNU AGPLv3
# 🌐 https://www.gnu.org/licenses/agpl-3.0.html
# ---------------------------------------------------------------------------------
# Author: @codrago
# Commands: nowplay
# scope: heroku_only
# meta developer: @codrago_m
# meta banner: https://raw.githubusercontent.com/coddrago/modules/refs/heads/main/banner.png
# meta pic: https://envs.sh/Hob.webp
# ---------------------------------------------------------------------------------
from .. import loader, utils
from herokutl import events
import requests
import asyncio
@loader.tds
class lastfmmod(loader.Module):
"""Module for music from different services"""
def __init__(self):
self.config = loader.ModuleConfig(
loader.ConfigValue(
"username_lastfm",
None,
lambda: self.strings["_doc_username_lastfm"],
),
loader.ConfigValue(
"text",
"<emoji document_id=6007938409857815902>🎧</emoji> <b>now playing...</b>\n"
"<emoji document_id=5915480455603295660>🎶</emoji><b> playlist: </b><code>{song_album}</code>\n"
"<emoji document_id=5891249688933305846>🎵</emoji> <b>track:</b> <code>{song_name}</code>\n"
"<emoji document_id=5897554554894946515>🎤</emoji> <b>artist:</b> <code>{song_artist}</code>",
lambda: self.strings["_doc_text"],
),
)
strings = {
"name": "LastFm",
"loading":"<emoji document_id=5873204392429096339>⌨️</emoji> Loading song...",
"bot_no_result": "<emoji document_id=5465665476971471368>❌</emoji> Nothing found.\nTitle: {song_name}\nAuthor: {song_artist}\nAlbum:{song_album}",
"_doc_text": "The text that will be written next to the file",
"_doc_username_lastfm": "Your username from last.fm",
"nick_error": "<emoji document_id=5465665476971471368>❌</emoji> Put your nickname from last.fm",
"tutorial": "Go to last.fm and register.\nBE SURE to remember the username and password, they will come in handy later.\nLet's look at the VK version\nAfter that, go to the @vkxci channel, download VK X and log in to your VK account, then go to settings and click «Integrations», select Last FM.\nEnter the username and password.\nThen you're almost done!\nWrite <code>{prefix}fcfg lastfm username_lastfm</code> {username}\nUse the <code>{prefix}nowplay</code> command and enjoy life!",
}
strings_ru = {
"name": "LastFm",
"loading": "<emoji document_id=5873204392429096339>⌨️</emoji> Загрузка трека...",
"bot_no_result": "<emoji document_id=5465665476971471368>❌</emoji> Ничего не найдено.\nНазвание: {song_name}\nИсполнитель: {song_artist}\nАльбом: {song_album}",
"_doc_text": "Текст, который будет написан рядом с файлом",
"_doc_username_lastfm": "Ваш username с last.fm",
"nick_error": "<emoji document_id=5465665476971471368>❌</emoji> Укажите ваш никнейм с last.fm",
"tutorial": "Зайдите на last.fm и зарегистрируйтесь.\nОБЯЗАТЕЛЬНО запомните логин и пароль, они пригодятся позже.\nРассмотрим вариант для VK\nПосле этого зайдите в канал @vkxci, скачайте VK X и авторизуйтесь в своём аккаунте VK, затем зайдите в настройки и нажмите «Интеграции», выберите Last FM.\nВведите логин и пароль.\nЗатем вы почти закончили!\nНапишите <code>{prefix}fcfg lastfm username_lastfm</code> {username}\nИспользуйте команду <code>{prefix}nowplay</code> и наслаждайтесь жизнью!",
}
@loader.command(alias="np")
async def nowplay(self, message):
"""| send playing track"""
lastfm_username = self.config["username_lastfm"]
API_KEY = "460cda35be2fbf4f28e8ea7a38580730" # Облегчение жизни школьникам
if not lastfm_username:
response_text = self.strings["nick_error"]
await self.invoke("config", "lastfm", message=message)
await utils.answer(message, response_text)
else:
try:
current_track_url = f'http://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&nowplaying=true&user={lastfm_username}&api_key={API_KEY}&format=json'
response = requests.get(current_track_url)
data = response.json()
if 'recenttracks' in data and 'track' in data['recenttracks'] and data['recenttracks']['track']:
nowplaying_track = None
for track in data['recenttracks']['track']:
if '@attr' in track and 'nowplaying' in track['@attr']:
nowplaying_track = track
break
if nowplaying_track:
song_name = nowplaying_track.get('name', 'Unknown song')
song_artist = nowplaying_track.get('artist', {}).get('#text', 'Unknown Artist')
if nowplaying_track.get('album', {}).get('#text') == nowplaying_track.get('name'):
song_album = "single"
else:
song_album = nowplaying_track.get('album', {}).get('#text', 'Unknown Album')
response_text = f"/search {song_name} - {song_artist}"
try:
async with message.client.conversation("@LyaDownbot") as conv:
await conv.send_message(response_text)
while True:
response_bot = await conv.get_response()
if "Не удалось найти трек" in response_bot.text:
await utils.answer(message, self.strings["bot_no_result"])
return
if "Ищем треки..." in response_bot.text:
await utils.answer(message, self.strings["loading"])
if response_bot.media:
await message.client.send_file(message.chat_id, response_bot.media, caption = self.config["text"].format(song_artist=song_artist, song_album=song_album, song_name=song_name))
await message.delete()
return
except Exception as e:
await utils.answer(message, f"<pre><code class='language-python'>{e}</code></pre>")
except Exception as e:
await utils.answer(message, f"<pre><code class='language-python'>{e}</code></pre>")
@loader.command()
async def tutorl(self, message):
"""| tutorial"""
await utils.answer(message, self.strings['tutorial'].format(prefix = self.get_prefix(), username="{username}"))

View File

@@ -1,10 +1,13 @@
# meta developer: @codrago_m
# scope: heroku_min 2.0.0
import logging
from .. import utils, loader, main
from telethon.tl.functions.messages import MarkDialogUnreadRequest
from .. import loader, main, utils
logger = logging.getLogger("TagWatcher")
@@ -124,6 +127,7 @@ class TagWatcher(loader.Module):
description="Here will be notifications about mentions in chats.",
icon_emoji_id=5409025823388741707,
)
self.xdlib = await self.import_lib(
"https://raw.githubusercontent.com/coddrago/modules/refs/heads/main/libs/xdlib.py",
suspend_on_error=True,