— ban all who joined after this date/time"""
+ args = utils.get_args_raw(message).strip()
+ if not args:
+ return await utils.answer(message, self.strings["no_args"])
+
+ cutoff = _parse_dt(args)
+ if cutoff is None:
+ return await utils.answer(message, self.strings["bad_date"])
+
+ chat = await message.get_chat()
+ if not getattr(chat, "megagroup", False) and not getattr(chat, "gigagroup", False):
+ return await utils.answer(message, self.strings["not_chat"])
+
+ me = await self._client.get_me()
+ perms = await self._client.get_permissions(chat, me)
+ if not getattr(perms, "ban_users", False):
+ return await utils.answer(message, self.strings["no_rights"])
+
+ dt_str = cutoff.strftime("%d.%m.%Y %H:%M")
+ await utils.answer(message, self.strings["scanning"].format(dt=dt_str))
+
+ targets = await self._collect_targets(chat, cutoff, me.id)
+
+ if not targets:
+ return await utils.answer(message, self.strings["nobody"].format(dt=dt_str))
+
+ await self.inline.form(
+ message=message,
+ text=self.strings["confirm"].format(count=len(targets), dt=dt_str),
+ reply_markup=[[
+ {
+ "text": self.strings["btn_ban"].format(count=len(targets)),
+ "callback": self._do_ban,
+ "args": (chat, targets, dt_str, cutoff),
+ },
+ {
+ "text": self.strings["btn_cancel"],
+ "callback": self._cancel,
+ },
+ ]],
+ force_me=True,
+ )
+
+ async def _collect_targets(self, chat, cutoff: datetime, my_id: int) -> list:
+ targets = []
+ offset = 0
+ limit = 200
+
+ while True:
+ res = await self._client(GetParticipantsRequest(
+ channel=chat,
+ filter=ChannelParticipantsSearch(""),
+ offset=offset,
+ limit=limit,
+ hash=0,
+ ))
+ if not res.users:
+ break
+
+ users_map = {u.id: u for u in res.users}
+
+ for p in res.participants:
+ joined = getattr(p, "date", None)
+ if joined is None:
+ continue
+ if joined.tzinfo is None:
+ joined = joined.replace(tzinfo=timezone.utc)
+ if joined <= cutoff:
+ continue
+
+ uid = p.user_id
+ user = users_map.get(uid)
+ if not user or user.id == my_id:
+ continue
+ if getattr(user, "bot", False):
+ continue
+ if p.__class__.__name__ in ("ChannelParticipantAdmin", "ChannelParticipantCreator"):
+ continue
+
+ targets.append(uid)
+
+ if len(res.participants) < limit:
+ break
+ offset += limit
+ await asyncio.sleep(0.3)
+
+ return targets
+
+ async def _do_ban(self, call, chat, targets: list, dt_str: str, cutoff: datetime):
+ await call.edit(self.strings["banning"].format(count=len(targets)))
+
+ banned = 0
+ skipped = 0
+ banned_ids = set()
+
+ for i, uid in enumerate(targets, 1):
+ try:
+ await self._client(EditBannedRequest(chat, uid, _BAN))
+ banned += 1
+ banned_ids.add(uid)
+ except Exception as e:
+ logger.warning("LateBan: skip %s — %s", uid, e)
+ skipped += 1
+
+ if i % 10 == 0:
+ try:
+ await call.edit(
+ self.strings["progress"].format(done=i, total=len(targets))
+ )
+ except Exception:
+ pass
+
+ await asyncio.sleep(0.4)
+
+ deleted = await self._delete_join_messages(chat, banned_ids, cutoff)
+
+ await call.edit(self.strings["done"].format(
+ banned=banned, skipped=skipped, deleted=deleted
+ ))
+
+ async def _delete_join_messages(
+ self, chat, banned_ids: set, cutoff: datetime
+ ) -> int:
+ _JOIN_ACTIONS = (
+ MessageActionChatAddUser,
+ MessageActionChatJoinedByLink,
+ MessageActionChatJoinedByRequest,
+ )
+ to_delete = []
+
+ try:
+ async for msg in self._client.iter_messages(
+ chat,
+ filter=MessageService,
+ reverse=False,
+ limit=None,
+ offset_date=None,
+ ):
+ ts = msg.date
+ if ts.tzinfo is None:
+ ts = ts.replace(tzinfo=timezone.utc)
+ if ts < cutoff:
+ break
+
+ action = getattr(msg, "action", None)
+ if not isinstance(action, _JOIN_ACTIONS):
+ continue
+
+ if isinstance(action, MessageActionChatAddUser):
+ if any(uid in banned_ids for uid in action.users):
+ to_delete.append(msg.id)
+ else:
+ sender_id = getattr(msg, "from_id", None)
+ if sender_id is not None:
+ uid = getattr(sender_id, "user_id", None)
+ if uid in banned_ids:
+ to_delete.append(msg.id)
+
+ except Exception as e:
+ logger.warning("LateBan: failed to scan service messages — %s", e)
+ return 0
+
+ deleted = 0
+ for chunk in _chunks(to_delete, 100):
+ try:
+ await self._client.delete_messages(chat, chunk)
+ deleted += len(chunk)
+ except Exception as e:
+ logger.warning("LateBan: delete chunk failed — %s", e)
+ await asyncio.sleep(0.2)
+
+ return deleted
+
+ async def _cancel(self, call):
+ await call.delete()
+
+def _parse_dt(raw: str) -> datetime | None:
+ """
+ Supported formats:
+ DD.MM.YYYY → 00:00 UTC
+ DD.MM.YYYY HH:MM → HH:MM UTC
+ HH:MM → today HH:MM UTC
+ """
+ raw = raw.strip()
+ today = datetime.now(timezone.utc).date()
+
+ try:
+ return datetime.strptime(raw, "%d.%m.%Y %H:%M").replace(tzinfo=timezone.utc)
+ except ValueError:
+ pass
+
+ try:
+ return datetime.strptime(raw, "%d.%m.%Y").replace(tzinfo=timezone.utc)
+ except ValueError:
+ pass
+
+ try:
+ t = datetime.strptime(raw, "%H:%M").time()
+ return datetime(
+ today.year, today.month, today.day,
+ t.hour, t.minute, tzinfo=timezone.utc,
+ )
+ except ValueError:
+ pass
+
+ return None
+
+
+def _chunks(lst: list, n: int):
+ for i in range(0, len(lst), n):
+ yield lst[i:i + n]
diff --git a/radiocycle/Modules/LastFm.py b/radiocycle/Modules/LastFm.py
index 90ad508..9bdfc64 100644
--- a/radiocycle/Modules/LastFm.py
+++ b/radiocycle/Modules/LastFm.py
@@ -6,11 +6,6 @@
# |_|\_\___| |_| |_|\___/ \__,_|___/
# @ke_mods
# =======================================
-#
-# LICENSE: CC BY-ND 4.0 (Attribution-NoDerivatives 4.0 International)
-# --------------------------------------
-# https://creativecommons.org/licenses/by-nd/4.0/legalcode
-# =======================================
# meta developer: @ke_mods
diff --git a/radiocycle/Modules/Neofetch.py b/radiocycle/Modules/Neofetch.py
index 3301c1e..5fc11a3 100644
--- a/radiocycle/Modules/Neofetch.py
+++ b/radiocycle/Modules/Neofetch.py
@@ -6,11 +6,6 @@
# |_|\_\___| |_| |_|\___/ \__,_|___/
# @ke_mods
# =======================================
-#
-# LICENSE: CC BY-ND 4.0 (Attribution-NoDerivatives 4.0 International)
-# --------------------------------------
-# https://creativecommons.org/licenses/by-nd/4.0/legalcode
-# =======================================
# meta developer: @ke_mods
@@ -44,5 +39,5 @@ class NeofetchMod(loader.Module):
await utils.answer(message, f"{utils.escape_html(output)}")
except FileNotFoundError:
- await utils.answer(message, self.strings("not_installed"))
+ await utils.answer(message, self.strings["not_installed"])
diff --git a/radiocycle/Modules/PicToStories.py b/radiocycle/Modules/PicToStories.py
index b244a2c..7d848b1 100644
--- a/radiocycle/Modules/PicToStories.py
+++ b/radiocycle/Modules/PicToStories.py
@@ -6,11 +6,6 @@
# |_|\_\___| |_| |_|\___/ \__,_|___/
# @ke_mods
# =======================================
-#
-# LICENSE: CC BY-ND 4.0 (Attribution-NoDerivatives 4.0 International)
-# --------------------------------------
-# https://creativecommons.org/licenses/by-nd/4.0/legalcode
-# =======================================
# meta developer: @ke_mods
# requires: pillow
@@ -95,17 +90,17 @@ class PicToStoriesMod(loader.Module):
args = utils.get_args_raw(message)
reply = await message.get_reply_message()
if not reply or not reply.media:
- await utils.answer(message, self.strings("no_rep"))
+ await utils.answer(message, self.strings["no_rep"])
return
try:
image_bytes = await reply.download_media(file=bytes)
img = Image.open(io.BytesIO(image_bytes))
except Exception as e:
- await utils.answer(message, self.strings("err").format(e))
+ await utils.answer(message, self.strings["err"].format(e))
return
- await utils.answer(message, self.strings("work"))
+ await utils.answer(message, self.strings["work"])
w, h = img.size
curr_ratio = w / h
@@ -208,4 +203,4 @@ class PicToStoriesMod(loader.Module):
)
)
- await utils.answer(message, self.strings("done"))
\ No newline at end of file
+ await utils.answer(message, self.strings["done"])
diff --git a/radiocycle/Modules/RandomAnimePic.py b/radiocycle/Modules/RandomAnimePic.py
index f609d7e..e310af0 100644
--- a/radiocycle/Modules/RandomAnimePic.py
+++ b/radiocycle/Modules/RandomAnimePic.py
@@ -6,11 +6,6 @@
# |_|\_\___| |_| |_|\___/ \__,_|___/
# @ke_mods
# =======================================
-#
-# LICENSE: CC BY-ND 4.0 (Attribution-NoDerivatives 4.0 International)
-# --------------------------------------
-# https://creativecommons.org/licenses/by-nd/4.0/legalcode
-# =======================================
# meta developer: @ke_mods
# requires: pillow
@@ -55,23 +50,13 @@ class RandomAnimePicMod(loader.Module):
IMAGES_API_URL = "https://api.nekosapi.com/v4/images"
CATEGORIES_SCAN_LIMIT = 500
- def __init__(self):
- self.config = loader.ModuleConfig(
- loader.ConfigValue(
- "category",
- "",
- "Category",
- validator=loader.validators.String(),
- ),
- )
-
@loader.command(ru_doc="- получить рандомную аниме-картинку 👀")
async def rapiccmd(self, message):
"""- fetch random anime-pic 👀"""
- await utils.answer(message, self.strings("loading"))
+ await utils.answer(message, self.strings["loading"])
try:
- category = self.config["category"].strip()
+ category = await utils.get_args_raw().strip()
def fetch_image():
params = {"limit": 1, "rating": ["safe"]}
@@ -111,7 +96,7 @@ class RandomAnimePicMod(loader.Module):
url, file = await asyncio.to_thread(fetch_image)
await utils.answer(
message,
- self.strings("img").format(url),
+ self.strings["img"].format(url),
file=file
)
@@ -120,12 +105,12 @@ class RandomAnimePicMod(loader.Module):
"Error fetching random anime pic: %s",
traceback.format_exc(),
)
- await utils.answer(message, self.strings("error"))
+ await utils.answer(message, self.strings["error"])
@loader.command(ru_doc="- получить список категорий из API 👀")
async def racategoriescmd(self, message):
"""- fetch categories from api 👀"""
- await utils.answer(message, self.strings("categories_loading"))
+ await utils.answer(message, self.strings["categories_loading"])
try:
def fetch_categories() -> list[str]:
@@ -162,15 +147,15 @@ class RandomAnimePicMod(loader.Module):
categories = await asyncio.to_thread(fetch_categories)
if not categories:
- await utils.answer(message, self.strings("no_categories"))
+ await utils.answer(message, self.strings["no_categories"])
return
- formatted_categories = "\n".join(
+ formatted_categories = ", ".join(
f"{category}" for category in categories
)
await utils.answer(
message,
- self.strings("categories").format(formatted_categories),
+ self.strings["categories"].format(formatted_categories),
)
except Exception:
@@ -178,4 +163,4 @@ class RandomAnimePicMod(loader.Module):
"Error fetching categories: %s",
traceback.format_exc(),
)
- await utils.answer(message, self.strings("error"))
\ No newline at end of file
+ await utils.answer(message, self.strings["error"])
diff --git a/radiocycle/Modules/SpotifyMod.py b/radiocycle/Modules/SpotifyMod.py
index d1ea339..af176c6 100644
--- a/radiocycle/Modules/SpotifyMod.py
+++ b/radiocycle/Modules/SpotifyMod.py
@@ -16,11 +16,6 @@
# @ke_mods
# =======================================
#
-# LICENSE: CC BY-ND 4.0 (Attribution-NoDerivatives 4.0 International)
-# --------------------------------------
-# https://creativecommons.org/licenses/by-nd/4.0/legalcode
-# =======================================
-#
# meta developer: @ke_mods
# requires: telethon spotipy pillow requests yt-dlp curl_cffi
# scope: ffmpeg
@@ -39,6 +34,7 @@ import traceback
import os
from types import FunctionType
+import random
import requests
import spotipy
from PIL import Image, ImageDraw, ImageEnhance, ImageFilter, ImageFont, ImageOps
@@ -61,7 +57,9 @@ class Banners:
progress: int,
track_cover: bytes,
font,
- blur
+ blur,
+ album_title: str = "",
+ meta_info: str = "",
):
self.title = title
self.artists = ", ".join(artists) if isinstance(artists, list) else artists
@@ -70,6 +68,8 @@ class Banners:
self.track_cover = track_cover
self.font_url = font
self.blur_intensity = blur
+ self.album_title = album_title
+ self.meta_info = meta_info
def _get_font(self, size, font_bytes):
return ImageFont.truetype(io.BytesIO(font_bytes), size)
@@ -237,6 +237,164 @@ class Banners:
by.name = "banner.png"
return by
+ # Ultra banner from YaMusic by @codrago_m
+ def ultra(self) -> io.BytesIO:
+ WIDTH, HEIGHT = 2560, 1220
+
+ font_bytes = requests.get(self.font_url).content
+
+ def get_font(size):
+ try:
+ return ImageFont.truetype(io.BytesIO(font_bytes), size)
+ except Exception:
+ return ImageFont.load_default()
+
+ try:
+ original_cover = Image.open(io.BytesIO(self.track_cover)).convert("RGBA")
+ except Exception:
+ original_cover = Image.new("RGBA", (1000, 1000), "black")
+
+ dominant_color_img = original_cover.resize((1, 1), Image.Resampling.LANCZOS)
+ dominant_color = dominant_color_img.getpixel((0, 0))
+
+ r, g, b, a = dominant_color
+ brightness = (r * 299 + g * 587 + b * 114) / 1000
+ if brightness < 60:
+ r = min(255, r + 60)
+ g = min(255, g + 60)
+ b = min(255, b + 60)
+ dominant_color = (r, g, b, 255)
+
+ background = original_cover.copy()
+ bg_w, bg_h = background.size
+
+ target_ratio = WIDTH / HEIGHT
+ current_ratio = bg_w / bg_h
+
+ if current_ratio > target_ratio:
+ new_w = int(bg_h * target_ratio)
+ offset = (bg_w - new_w) // 2
+ background = background.crop((offset, 0, offset + new_w, bg_h))
+ else:
+ new_h = int(bg_w / target_ratio)
+ offset = (bg_h - new_h) // 2
+ background = background.crop((0, offset, bg_w, offset + new_h))
+
+ background = background.resize((WIDTH, HEIGHT), Image.Resampling.LANCZOS)
+
+ if self.blur_intensity > 0:
+ background = background.filter(ImageFilter.GaussianBlur(radius=self.blur_intensity))
+
+ dark_overlay = Image.new("RGBA", (WIDTH, HEIGHT), (0, 0, 0, 180))
+ background = Image.alpha_composite(background, dark_overlay)
+
+ cover_size = 500
+ cover_x = (WIDTH - cover_size) // 2
+ cover_y = 160
+
+ glow_layer = Image.new("RGBA", (WIDTH, HEIGHT), (0, 0, 0, 0))
+ draw_glow = ImageDraw.Draw(glow_layer)
+
+ glow_rect_size = 620
+ g_x = (WIDTH - glow_rect_size) // 2
+ g_y = cover_y + (cover_size - glow_rect_size) // 2
+
+ draw_glow.rounded_rectangle(
+ (g_x, g_y, g_x + glow_rect_size, g_y + glow_rect_size),
+ radius=50,
+ fill=dominant_color,
+ )
+
+ glow_layer = glow_layer.filter(ImageFilter.GaussianBlur(radius=60))
+ glow_layer = ImageEnhance.Brightness(glow_layer).enhance(1.4)
+ glow_layer = ImageEnhance.Color(glow_layer).enhance(1.2)
+
+ background = Image.alpha_composite(background, glow_layer)
+
+ cover_img = original_cover.resize((cover_size, cover_size), Image.Resampling.LANCZOS)
+
+ mask = Image.new("L", (cover_size, cover_size), 0)
+ draw_mask = ImageDraw.Draw(mask)
+ draw_mask.rounded_rectangle((0, 0, cover_size, cover_size), radius=45, fill=255)
+
+ background.paste(cover_img, (cover_x, cover_y), mask)
+
+ draw = ImageDraw.Draw(background)
+ center_x = WIDTH // 2
+ current_y = cover_y + cover_size + 130
+
+ def draw_text_shadow(text, pos, font, fill="white", anchor="ms"):
+ x, y = pos
+ draw.text((x + 2, y + 2), text, font=font, fill=(0, 0, 0, 240), anchor=anchor)
+ draw.text((x, y), text, font=font, fill=fill, anchor=anchor)
+
+ font_title = get_font(100)
+ title_text = self.title if len(self.title) <= 30 else self.title[:30] + "..."
+ draw_text_shadow(title_text.upper(), (center_x, current_y), font_title)
+
+ current_y += 85
+
+ font_artist = get_font(65)
+ artist_text = self.artists if len(self.artists) <= 45 else self.artists[:45] + "..."
+ draw_text_shadow(artist_text.upper(), (center_x, current_y), font_artist, fill=(255, 255, 255, 240))
+
+ current_y += 80
+
+ bar_width = 800
+ font_time = get_font(40)
+
+ bar_start_x = center_x - (bar_width // 2)
+ bar_end_x = center_x + (bar_width // 2)
+ bar_y = current_y
+
+ total_time_str = f"{self.duration // 1000 // 60:02d}:{(self.duration // 1000) % 60:02d}"
+ cur_time_str = f"{self.progress // 1000 // 60:02d}:{(self.progress // 1000) % 60:02d}"
+
+ draw_text_shadow(cur_time_str, (bar_start_x - 30, bar_y), font_time, anchor="rm")
+ draw_text_shadow(total_time_str, (bar_end_x + 30, bar_y), font_time, anchor="lm")
+
+ old_state = random.getstate()
+ random.seed(self.title + str(self.duration))
+
+ num_bars = 65
+ bar_spacing = bar_width / num_bars
+ bar_w = max(4, int(bar_spacing * 0.5))
+ max_h, min_h = 50, 6
+
+ active_bars = int(num_bars * (self.progress / self.duration)) if self.duration > 0 else 0
+
+ for i in range(num_bars):
+ base_h = random.randint(min_h, max_h)
+ edge_factor = 1.0 - abs((i - num_bars / 2) / (num_bars / 2))
+ h = max(min_h, int(base_h * 0.4 + max_h * edge_factor * 0.6))
+ x_center = bar_start_x + i * bar_spacing
+ color = (255, 255, 255, 255) if i < active_bars else (80, 80, 80, 100)
+ draw.rounded_rectangle(
+ (x_center - bar_w / 2, bar_y - h / 2, x_center + bar_w / 2, bar_y + h / 2),
+ radius=int(bar_w / 2),
+ fill=color,
+ )
+
+ random.setstate(old_state)
+
+ current_y += 80
+
+ if self.album_title:
+ font_album = get_font(50)
+ album_text = self.album_title if len(self.album_title) <= 50 else self.album_title[:50] + "..."
+ draw_text_shadow(album_text, (center_x, current_y), font_album, fill=(230, 230, 230))
+ current_y += 60
+
+ if self.meta_info:
+ font_meta = get_font(40)
+ draw_text_shadow(self.meta_info, (center_x, current_y), font_meta, fill=(210, 210, 210))
+
+ by = io.BytesIO()
+ background.save(by, format="PNG")
+ by.seek(0)
+ by.name = "banner.png"
+ return by
+
@loader.tds
class SpotifyMod(loader.Module):
"""Card with the currently playing track on Spotify."""
@@ -349,9 +507,6 @@ class SpotifyMod(loader.Module):
"❌ Invalid track number."
" Please search first or provide a valid number from the list."
),
- "device_list": (
- "📄 Available devices:\n{}"
- ),
"no_devices_found": (
"❌ No devices found."
),
@@ -359,10 +514,6 @@ class SpotifyMod(loader.Module):
"✅ Playback transferred to"
" {}."
),
- "invalid_device_id": (
- "❌ Invalid device ID."
- " Use .sdevice to see available devices."
- ),
"autobio": (
"🎧 Spotify autobio {}"
),
@@ -379,6 +530,7 @@ class SpotifyMod(loader.Module):
"playlist_created": "✅ Playlist {} created.",
"playlist_deleted": "✅ Playlist {} deleted.",
"no_playlist_name": "❌ Please specify a playlist name.",
+ "device_select": "📄 Select playback device:",
}
strings_ru = {
@@ -478,9 +630,6 @@ class SpotifyMod(loader.Module):
"❌ Некорректный номер трека."
" Сначала выполните поиск или укажите правильный номер из списка."
),
- "device_list": (
- "📄 Доступные устройства:\n{}"
- ),
"no_devices_found": (
"❌ Устройства не найдены."
),
@@ -488,10 +637,6 @@ class SpotifyMod(loader.Module):
"✅ Воспроизведение переключено на"
" {}."
),
- "invalid_device_id": (
- "❌ Некорректный ID устройства."
- " Используйте .sdevice , чтобы увидеть доступные устройства."
- ),
"autobio": (
"🎧 Обновление био"
" включено {}"
@@ -509,6 +654,7 @@ class SpotifyMod(loader.Module):
"playlist_created": "✅ Плейлист {} создан.",
"playlist_deleted": "✅ Плейлист {} удален.",
"no_playlist_name": "❌ Пожалуйста, укажите название плейлиста.",
+ "device_select": "📄 Выберите устройство для воспроизведения:",
}
def __init__(self):
@@ -569,7 +715,7 @@ class SpotifyMod(loader.Module):
"banner_version",
"horizontal",
lambda: "Banner version",
- validator=loader.validators.Choice(["horizontal", "vertical"]),
+ validator=loader.validators.Choice(["horizontal", "vertical", "ultra"]),
),
loader.ConfigValue(
"blur_intensity",
@@ -589,12 +735,11 @@ class SpotifyMod(loader.Module):
try:
self.sp = spotipy.Spotify(auth=access_token)
+ return True
except Exception:
self.sp = None
return False
- return True
-
async def client_ready(self, client, db):
self.font_ready = asyncio.Event()
@@ -628,8 +773,6 @@ class SpotifyMod(loader.Module):
return await func(*args, **kwargs)
except Exception as e:
error_msg = str(e)
- logger.error(f"Error in {func.__name__}: {error_msg}")
-
if "NO_ACTIVE_DEVICE" in error_msg:
user_error = "No active device"
elif "PREMIUM_REQUIRED" in error_msg:
@@ -697,8 +840,8 @@ class SpotifyMod(loader.Module):
await asyncio.sleep(getattr(e, "seconds", 30) + 1)
except asyncio.CancelledError:
break
- except Exception as e:
- logger.exception("autobio error: %s", e)
+ except Exception:
+ pass
await asyncio.sleep(self.config.get("BIO_UPDATE_DELAY", 30))
@@ -754,20 +897,17 @@ class SpotifyMod(loader.Module):
reply_to_id=None,
) -> bool:
dl_dir = os.path.join(os.getcwd(), "spotifymod")
- if not os.path.exists(dl_dir):
- os.makedirs(dl_dir, exist_ok=True)
+ os.makedirs(dl_dir, exist_ok=True)
for f in os.listdir(dl_dir):
- try:
+ with contextlib.suppress(Exception):
os.remove(os.path.join(dl_dir, f))
- except Exception:
- pass
- success = False
if caption is None:
- safe_track = utils.escape_html(track_name or "Unknown")
- safe_artists = utils.escape_html(artists or "Unknown Artist")
- caption = self.strings("download_success").format(safe_track, safe_artists)
+ caption = self.strings["download_success"].format(
+ utils.escape_html(track_name or "Unknown"),
+ utils.escape_html(artists or "Unknown Artist"),
+ )
async def send_text(text: str) -> bool:
if target is None:
@@ -789,91 +929,60 @@ class SpotifyMod(loader.Module):
if target is None:
return False
if isinstance(target, int):
- await self._client.send_file(
- target,
- file_path,
- caption=caption,
- reply_to=reply_to_id,
- )
+ await self._client.send_file(target, file_path, caption=caption, reply_to=reply_to_id)
return True
try:
await utils.answer(target, caption, file=file_path)
return True
- except Exception:
+ except Exception as e:
+ logger.error("SpotifyMod send_file fallback: %s", e, exc_info=True)
chat_id = self._get_chat_id(target)
if chat_id is None:
return False
- await self._client.send_file(
- chat_id,
- file_path,
- caption=caption,
- reply_to=reply_to_id,
- )
+ await self._client.send_file(chat_id, file_path, caption=caption, reply_to=reply_to_id)
return True
+ success = False
try:
squery = query.replace('"', '').replace("'", "")
-
cookies = self.config["cookies_path"]
-
- if cookies:
- cmd = (
- f'{self.config["ytdlp_path"]} -x --impersonate="" --cookies {cookies} --audio-format mp3 --add-metadata '
- f'--audio-quality 0 -o "{dl_dir}/%(title)s [%(id)s].%(ext)s" '
- f'"ytsearch1:{squery}"'
- )
- else:
- cmd = (
- f'{self.config["ytdlp_path"]} -x --impersonate="" --audio-format mp3 --add-metadata '
- f'--audio-quality 0 -o "{dl_dir}/%(title)s [%(id)s].%(ext)s" '
- f'"ytsearch1:{squery}"'
- )
+ ytdlp_flags = '-x --audio-format mp3 --audio-quality 0 --add-metadata --format "bestaudio/best" --no-playlist'
+ cookies_flag = f"--cookies {cookies} " if cookies else ""
+ cmd = (
+ f'{self.config["ytdlp_path"]} {ytdlp_flags} {cookies_flag}'
+ f'-o "{dl_dir}/%(title)s [%(id)s].%(ext)s" '
+ f'"ytsearch1:{squery}"'
+ )
proc = await asyncio.create_subprocess_shell(
cmd,
stdout=asyncio.subprocess.PIPE,
- stderr=asyncio.subprocess.PIPE
+ stderr=asyncio.subprocess.PIPE,
)
_, stderr = await proc.communicate()
- if proc.returncode and log_context:
- err_text = stderr.decode(errors="ignore").strip() if stderr else ""
- err_text = err_text[-400:] if err_text else "yt-dlp failed"
- logger.error("Search download failed (%s): %s", log_context, err_text)
+
+ if proc.returncode:
+ err_text = stderr.decode(errors="ignore").strip() if stderr else "yt-dlp failed"
+ logger.error("SpotifyMod: yt-dlp code %s for %r: %s", proc.returncode, log_context or query, err_text[-400:])
files = [f for f in os.listdir(dl_dir) if f.endswith(".mp3")]
-
if files:
- first = files[0]
- target_file = os.path.join(dl_dir, first)
- success = await send_file(target_file)
+ success = await send_file(os.path.join(dl_dir, files[0]))
if not success:
- if log_context:
- logger.error(
- "Search download send failed (%s). target=%s chat_id=%s",
- log_context,
- type(target).__name__,
- self._get_chat_id(target),
- )
- await send_text(self.strings("dl_err"))
+ logger.error("SpotifyMod: failed to send %r (target=%s)", log_context or query, type(target).__name__)
+ await send_text(self.strings["dl_err"])
else:
- if log_context:
- logger.error("Search download produced no files (%s)", log_context)
- await send_text(self.strings("snowt_failed"))
+ logger.error("SpotifyMod: yt-dlp produced no mp3 for %r", log_context or query)
+ await send_text(self.strings["snowt_failed"])
except Exception as e:
- if log_context:
- logger.exception("Search download error (%s)", log_context)
- else:
- logger.error(e)
- await send_text(self.strings("dl_err"))
+ logger.error("Download track error (%s): %s", log_context or "no context", e, exc_info=True)
+ await send_text(self.strings["dl_err"])
finally:
- if os.path.exists(dl_dir):
- for f in os.listdir(dl_dir):
- try:
- os.remove(os.path.join(dl_dir, f))
- except Exception:
- pass
+ for f in os.listdir(dl_dir):
+ with contextlib.suppress(Exception):
+ os.remove(os.path.join(dl_dir, f))
return success
@@ -937,7 +1046,7 @@ class SpotifyMod(loader.Module):
await call.answer()
with contextlib.suppress(Exception):
- await call.edit(self.strings("downloading_track").lstrip(), reply_markup=None)
+ await call.edit(self.strings["downloading_track"].lstrip(), reply_markup=None)
target_message = getattr(call, "message", None)
if reply_to_id is None:
@@ -951,9 +1060,9 @@ class SpotifyMod(loader.Module):
chat_id = self._get_chat_id(call)
if chat_id is None and target_message is None:
- logger.error("Inline download missing chat_id (%s - %s)", track_name, artists)
+ pass
with contextlib.suppress(Exception):
- await call.edit(self.strings("dl_err"), reply_markup=None)
+ await call.edit(self.strings["dl_err"], reply_markup=None)
return
target = chat_id if chat_id is not None else target_message
@@ -972,14 +1081,14 @@ class SpotifyMod(loader.Module):
await call.delete()
else:
with contextlib.suppress(Exception):
- await call.edit(self.strings("dl_err"), reply_markup=None)
+ await call.edit(self.strings["dl_err"], reply_markup=None)
async def _inline_search_tracks(self, query):
if not self.get("acs_tkn", False) or not self.sp:
return {
"title": "Auth required",
"description": "Run .sauth",
- "message": self.strings("need_auth"),
+ "message": self.strings["need_auth"],
}
query_text = (query.args or "").strip()
@@ -987,7 +1096,7 @@ class SpotifyMod(loader.Module):
return {
"title": "No query",
"description": "Provide search query",
- "message": self.strings("no_search_query"),
+ "message": self.strings["no_search_query"],
}
try:
@@ -1001,7 +1110,7 @@ class SpotifyMod(loader.Module):
return {
"title": "Search error",
"description": "Try again",
- "message": self.strings("err").format(
+ "message": self.strings["err"].format(
utils.escape_html(str(e)[:50])
),
}
@@ -1010,7 +1119,7 @@ class SpotifyMod(loader.Module):
return {
"title": "No results",
"description": self._short_text(query_text, limit=60),
- "message": self.strings("no_tracks_found").format(
+ "message": self.strings["no_tracks_found"].format(
utils.escape_html(query_text)
),
}
@@ -1029,7 +1138,7 @@ class SpotifyMod(loader.Module):
{
"title": self._short_text(track_name, limit=60),
"description": self._short_text(artists, limit=60) if artists else "",
- "message": f"{self.strings('downloading_track').lstrip()}\nspdl_{store_id}_{i}",
+ "message": f'{self.strings["downloading_track"].lstrip()}\nspdl_{store_id}_{i}',
"thumb": thumb,
}
)
@@ -1056,22 +1165,22 @@ class SpotifyMod(loader.Module):
"""| .spla - ➕ Add current track to playlist (use number from .splaylists | .spls)"""
args = utils.get_args_raw(message)
if not args or not args.isdigit():
- await utils.answer(message, self.strings("invalid_playlist_index"))
+ await utils.answer(message, self.strings["invalid_playlist_index"])
return
index = int(args) - 1
playlists = self.get("last_playlists", [])
if not playlists:
- await utils.answer(message, self.strings("no_cached_playlists"))
+ await utils.answer(message, self.strings["no_cached_playlists"])
return
if index < 0 or index >= len(playlists):
- await utils.answer(message, self.strings("invalid_playlist_index"))
+ await utils.answer(message, self.strings["invalid_playlist_index"])
return
current = self.sp.current_playback()
if not current or not current.get("item"):
- await utils.answer(message, self.strings("no_music"))
+ await utils.answer(message, self.strings["no_music"])
return
track_uri = current["item"]["uri"]
@@ -1083,7 +1192,7 @@ class SpotifyMod(loader.Module):
playlist_name = playlists[index]["name"]
self.sp.playlist_add_items(playlist_id, [track_uri])
- await utils.answer(message, self.strings("added_to_playlist").format(utils.escape_html(full_track_name), utils.escape_html(playlist_name)))
+ await utils.answer(message, self.strings["added_to_playlist"].format(utils.escape_html(full_track_name), utils.escape_html(playlist_name)))
@error_handler
@tokenized
@@ -1095,22 +1204,22 @@ class SpotifyMod(loader.Module):
"""| .splr - ➖ Remove current track from playlist (use number from .splaylists | .spls)"""
args = utils.get_args_raw(message)
if not args or not args.isdigit():
- await utils.answer(message, self.strings("invalid_playlist_index"))
+ await utils.answer(message, self.strings["invalid_playlist_index"])
return
index = int(args) - 1
playlists = self.get("last_playlists", [])
if not playlists:
- await utils.answer(message, self.strings("no_cached_playlists"))
+ await utils.answer(message, self.strings["no_cached_playlists"])
return
if index < 0 or index >= len(playlists):
- await utils.answer(message, self.strings("invalid_playlist_index"))
+ await utils.answer(message, self.strings["invalid_playlist_index"])
return
current = self.sp.current_playback()
if not current or not current.get("item"):
- await utils.answer(message, self.strings("no_music"))
+ await utils.answer(message, self.strings["no_music"])
return
track_uri = current["item"]["uri"]
@@ -1122,7 +1231,7 @@ class SpotifyMod(loader.Module):
playlist_name = playlists[index]["name"]
self.sp.playlist_remove_all_occurrences_of_items(playlist_id, [track_uri])
- await utils.answer(message, self.strings("removed_from_playlist").format(utils.escape_html(full_track_name), utils.escape_html(playlist_name)))
+ await utils.answer(message, self.strings["removed_from_playlist"].format(utils.escape_html(full_track_name), utils.escape_html(playlist_name)))
@error_handler
@tokenized
@@ -1134,12 +1243,12 @@ class SpotifyMod(loader.Module):
"""| .splc - 🆕 Create a new playlist"""
name = utils.get_args_raw(message)
if not name:
- await utils.answer(message, self.strings("no_playlist_name"))
+ await utils.answer(message, self.strings["no_playlist_name"])
return
user_id = self.sp.me()["id"]
self.sp.user_playlist_create(user_id, name)
- await utils.answer(message, self.strings("playlist_created").format(utils.escape_html(name)))
+ await utils.answer(message, self.strings["playlist_created"].format(utils.escape_html(name)))
@error_handler
@tokenized
@@ -1151,24 +1260,24 @@ class SpotifyMod(loader.Module):
"""| .spld - 🗑 Delete playlist (use number from .splaylists | .spls)"""
args = utils.get_args_raw(message)
if not args or not args.isdigit():
- await utils.answer(message, self.strings("invalid_playlist_index"))
+ await utils.answer(message, self.strings["invalid_playlist_index"])
return
index = int(args) - 1
playlists = self.get("last_playlists", [])
if not playlists:
- await utils.answer(message, self.strings("no_cached_playlists"))
+ await utils.answer(message, self.strings["no_cached_playlists"])
return
if index < 0 or index >= len(playlists):
- await utils.answer(message, self.strings("invalid_playlist_index"))
+ await utils.answer(message, self.strings["invalid_playlist_index"])
return
playlist_id = playlists[index]["id"]
playlist_name = playlists[index]["name"]
self.sp.current_user_unfollow_playlist(playlist_id)
- await utils.answer(message, self.strings("playlist_deleted").format(utils.escape_html(playlist_name)))
+ await utils.answer(message, self.strings["playlist_deleted"].format(utils.escape_html(playlist_name)))
@error_handler
@tokenized
@@ -1196,9 +1305,9 @@ class SpotifyMod(loader.Module):
playlist_list_text += f"{i + 1}. {name} ({count} tracks)\n"
if playlist_list_text == "":
- await utils.answer(message, self.strings("no_playlists"))
+ await utils.answer(message, self.strings["no_playlists"])
else:
- await utils.answer(message, self.strings("playlists_list").format(playlist_list_text))
+ await utils.answer(message, self.strings["playlists_list"].format(playlist_list_text))
@error_handler
@tokenized
@@ -1208,7 +1317,7 @@ class SpotifyMod(loader.Module):
async def sbiocmd(self, message):
"""- ℹ️ Toggle streaming playback in bio"""
if not getattr(self, "sp", None):
- await utils.answer(message, self.strings("need_auth"))
+ await utils.answer(message, self.strings["need_auth"])
return
state = not self.get("autobio", False)
@@ -1227,7 +1336,7 @@ class SpotifyMod(loader.Module):
await utils.answer(
message,
- self.strings("autobio").format("on" if state else "off"),
+ self.strings["autobio"].format("on" if state else "off"),
)
@error_handler
@@ -1240,64 +1349,63 @@ class SpotifyMod(loader.Module):
"""| .sv - 🔊 Change playback volume. .svolume | .sv <0-100>"""
args = utils.get_args_raw(message)
if args == "":
- await utils.answer(message, self.strings("no_volume_arg"))
+ await utils.answer(message, self.strings["no_volume_arg"])
else:
try:
volume_percent = int(args)
if 0 <= volume_percent <= 100:
self.sp.volume(volume_percent)
- await utils.answer(message, self.strings("volume_changed").format(volume_percent))
+ await utils.answer(message, self.strings["volume_changed"].format(volume_percent))
else:
- await utils.answer(message, self.strings("volume_invalid"))
+ await utils.answer(message, self.strings["volume_invalid"])
except ValueError:
- await utils.answer(message, self.strings("volume_invalid"))
+ await utils.answer(message, self.strings["volume_invalid"])
@error_handler
@tokenized
@loader.command(
- ru_doc=(
- "| .sd - 🎵 Выбрать устройство для воспроизведения. Например: .sdevice или .sdevice | .sd для вывода списка устройств"
- ),
+ ru_doc="| .sd - 🎵 Выбрать устройство для воспроизведения",
alias="sd"
)
async def sdevicecmd(self, message: Message):
- """| .sd - 🎵 Set preferred playback device. Usage: .sdevice or .sdevice | .sd to list devices"""
- args = utils.get_args_raw(message)
+ """| .sd - 🎵 Select playback device"""
devices = self.sp.devices()["devices"]
+ if not devices:
+ await utils.answer(message, self.strings["no_devices_found"])
+ return
- if args == "":
- if not devices:
- await utils.answer(message, self.strings("no_devices_found"))
- else:
- device_list_text = ""
- for i, device in enumerate(devices):
- is_active = "(active)" if device["is_active"] else ""
- device_list_text += (
- f"{i+1}. {device['name']}"
- f" ({device['type']}) {is_active}\n"
- )
- await utils.answer(message, self.strings("device_list").format(device_list_text.strip()))
- else:
- device_id = None
+ async def _switch(call, device_id: str, device_name: str):
+ with contextlib.suppress(Exception):
+ await call.answer()
try:
- device_number = int(args)
- if 0 < device_number <= len(devices):
- device_id = devices[device_number - 1]["id"]
- device_name = devices[device_number - 1]["name"]
- else:
- await utils.answer(message, self.strings("invalid_device_id"))
- return
- except ValueError:
- found_device = next((d for d in devices if d["id"] == args.strip()), None)
- if found_device:
- device_id = found_device["id"]
- device_name = found_device["name"]
- else:
- await utils.answer(message, self.strings("invalid_device_id"))
- return
+ self.sp.transfer_playback(device_id=device_id)
+ with contextlib.suppress(Exception):
+ await call.edit(
+ self.strings["device_changed"].format(utils.escape_html(device_name)),
+ reply_markup=None,
+ )
+ except Exception as e:
+ with contextlib.suppress(Exception):
+ await call.edit(
+ self.strings["err"].format(utils.escape_html(str(e)[:80])),
+ reply_markup=None,
+ )
- self.sp.transfer_playback(device_id=device_id)
- await utils.answer(message, self.strings("device_changed").format(device_name))
+ keyboard = []
+ for device in devices:
+ active_mark = "> " if device["is_active"] else ""
+ label = f"{active_mark}{device['name']} ({device['type'].lower()})"
+ keyboard.append([{
+ "text": label,
+ "callback": _switch,
+ "args": (device["id"], device["name"]),
+ }])
+
+ await self.inline.form(
+ self.strings["device_select"],
+ message=message,
+ reply_markup=keyboard,
+ )
@error_handler
@tokenized
@@ -1307,7 +1415,7 @@ class SpotifyMod(loader.Module):
async def srepeatcmd(self, message: Message):
"""- 💫 Repeat"""
self.sp.repeat("track")
- await utils.answer(message, self.strings("on-repeat"))
+ await utils.answer(message, self.strings["on-repeat"])
@error_handler
@tokenized
@@ -1317,7 +1425,7 @@ class SpotifyMod(loader.Module):
async def sderepeatcmd(self, message: Message):
"""- ✋ Stop repeat"""
self.sp.repeat("context")
- await utils.answer(message, self.strings("off-repeat"))
+ await utils.answer(message, self.strings["off-repeat"])
@error_handler
@tokenized
@@ -1327,7 +1435,7 @@ class SpotifyMod(loader.Module):
async def snextcmd(self, message: Message):
"""- 👉 Next track"""
self.sp.next_track()
- await utils.answer(message, self.strings("skipped"))
+ await utils.answer(message, self.strings["skipped"])
@error_handler
@tokenized
@@ -1337,7 +1445,7 @@ class SpotifyMod(loader.Module):
async def sresumecmd(self, message: Message):
"""- 🤚 Resume"""
self.sp.start_playback()
- await utils.answer(message, self.strings("playing"))
+ await utils.answer(message, self.strings["playing"])
@error_handler
@tokenized
@@ -1347,7 +1455,7 @@ class SpotifyMod(loader.Module):
async def spausecmd(self, message: Message):
"""- 🤚 Pause"""
self.sp.pause_playback()
- await utils.answer(message, self.strings("paused"))
+ await utils.answer(message, self.strings["paused"])
@error_handler
@tokenized
@@ -1357,7 +1465,7 @@ class SpotifyMod(loader.Module):
async def sbackcmd(self, message: Message):
"""- ⏮ Previous track"""
self.sp.previous_track()
- await utils.answer(message, self.strings("back"))
+ await utils.answer(message, self.strings["back"])
@error_handler
@tokenized
@@ -1367,7 +1475,7 @@ class SpotifyMod(loader.Module):
async def sbegincmd(self, message: Message):
"""- ⏪ Restart track"""
self.sp.seek_track(0)
- await utils.answer(message, self.strings("restarted"))
+ await utils.answer(message, self.strings["restarted"])
@error_handler
@tokenized
@@ -1378,7 +1486,7 @@ class SpotifyMod(loader.Module):
"""- ❤️ Like current track"""
cupl = self.sp.current_playback()
self.sp.current_user_saved_tracks_add([cupl["item"]["id"]])
- await utils.answer(message, self.strings("liked"))
+ await utils.answer(message, self.strings["liked"])
@error_handler
@tokenized
@@ -1389,7 +1497,7 @@ class SpotifyMod(loader.Module):
"""- 💔 Unlike current track"""
cupl = self.sp.current_playback()
self.sp.current_user_saved_tracks_delete([cupl["item"]["id"]])
- await utils.answer(message, self.strings("unlike"))
+ await utils.answer(message, self.strings["unlike"])
@error_handler
@loader.command(
@@ -1398,12 +1506,12 @@ class SpotifyMod(loader.Module):
async def sauthcmd(self, message: Message):
"""- Get authorization link"""
if self.get("acs_tkn", False) and not self.sp:
- await utils.answer(message, self.strings("already_authed"))
+ await utils.answer(message, self.strings["already_authed"])
else:
self.sp_auth.get_authorize_url()
await utils.answer(
message,
- self.strings("auth").format(self.sp_auth.get_authorize_url()),
+ self.strings["auth"].format(self.sp_auth.get_authorize_url()),
)
@error_handler
@@ -1416,7 +1524,7 @@ class SpotifyMod(loader.Module):
code = self.sp_auth.parse_auth_response_url(url)
self.set("acs_tkn", self.sp_auth.get_access_token(code, True, False))
self._init_spotify_client()
- await utils.answer(message, self.strings("authed"))
+ await utils.answer(message, self.strings["authed"])
@error_handler
@loader.command(
@@ -1426,7 +1534,7 @@ class SpotifyMod(loader.Module):
"""- Log out of account"""
self.set("acs_tkn", None)
self.sp = None
- await utils.answer(message, self.strings("deauth"))
+ await utils.answer(message, self.strings["deauth"])
@error_handler
@tokenized
@@ -1442,7 +1550,7 @@ class SpotifyMod(loader.Module):
)
self.set("NextRefresh", time.time() + 45 * 60)
self._init_spotify_client()
- await utils.answer(message, self.strings("authed"))
+ await utils.answer(message, self.strings["authed"])
@error_handler
@tokenized
@@ -1454,7 +1562,7 @@ class SpotifyMod(loader.Module):
"""| .sn - 🎧 View current track card."""
current_playback = self.sp.current_playback()
if not current_playback or not current_playback.get("is_playing", False):
- await utils.answer(message, self.strings("no_music"))
+ await utils.answer(message, self.strings["no_music"])
return
track = current_playback["item"]["name"]
@@ -1515,7 +1623,7 @@ class SpotifyMod(loader.Module):
if self.config["show_banner"]:
cover_url = current_playback["item"]["album"]["images"][0]["url"]
- tmp_msg = await utils.answer(message, text + self.strings("uploading_banner"))
+ tmp_msg = await utils.answer(message, text + self.strings["uploading_banner"])
banners = Banners(
title=track,
@@ -1525,9 +1633,14 @@ class SpotifyMod(loader.Module):
track_cover=requests.get(cover_url).content,
font=self.config["font"],
blur=self.config["blur_intensity"],
+ album_title=album_name,
+ meta_info="Spotify",
)
-
- if self.config["banner_version"] == "vertical":
+
+ version = self.config["banner_version"]
+ if version == "ultra":
+ file = banners.ultra()
+ elif version == "vertical":
file = banners.vertical()
else:
file = banners.horizontal()
@@ -1546,7 +1659,7 @@ class SpotifyMod(loader.Module):
"""| .snt - 🎧 Download current track."""
current_playback = self.sp.current_playback()
if not current_playback or not current_playback.get("is_playing", False):
- await utils.answer(message, self.strings("no_music"))
+ await utils.answer(message, self.strings["no_music"])
return
track = current_playback["item"]["name"]
@@ -1603,9 +1716,16 @@ class SpotifyMod(loader.Module):
text = self.config["custom_text"].format(**data)
- msg = await utils.answer(message, text + self.strings("downloading_track"))
-
- await self._download_track(msg, f"{artists} {track}", caption=text)
+ msg = await utils.answer(message, text + self.strings["downloading_track"])
+
+ await self._download_track(
+ msg,
+ f"{artists} {track}",
+ caption=text,
+ track_name=track,
+ artists=artists,
+ log_context=f"{track} - {artists}",
+ )
@error_handler
@tokenized
@@ -1617,7 +1737,7 @@ class SpotifyMod(loader.Module):
"""| .sq - 🔍 Search for tracks."""
args = utils.get_args_raw(message)
if not args:
- await utils.answer(message, self.strings("no_search_query"))
+ await utils.answer(message, self.strings["no_search_query"])
return
search_results = self.get("last_search_results", [])
@@ -1630,7 +1750,7 @@ class SpotifyMod(loader.Module):
if is_selection:
track_number = int(args)
- msg = await utils.answer(message, self.strings("downloading_track"))
+ msg = await utils.answer(message, self.strings["downloading_track"])
track_info = search_results[track_number - 1]
track_name, artists = self._track_info(track_info)
reply_to_id = self._reply_id(message)
@@ -1659,7 +1779,7 @@ class SpotifyMod(loader.Module):
)
if not results or not results["tracks"]["items"]:
- await utils.answer(message, self.strings("no_tracks_found").format(args))
+ await utils.answer(message, self.strings["no_tracks_found"].format(args))
return
tracks = results["tracks"]["items"]
@@ -1668,7 +1788,7 @@ class SpotifyMod(loader.Module):
reply_to_id = self._reply_id(message)
await self.inline.form(
- self.strings("search_results_inline").format(
+ self.strings["search_results_inline"].format(
count=len(tracks),
query=utils.escape_html(args),
),
@@ -1717,17 +1837,22 @@ class SpotifyMod(loader.Module):
next_refresh = self.get("NextRefresh")
if not next_refresh or next_refresh < time.time():
+ acs_tkn = self.get("acs_tkn")
+ if not acs_tkn or not acs_tkn.get("refresh_token"):
+ self.set("NextRefresh", time.time() + 300)
+ return
try:
- self.set(
- "acs_tkn",
- self.sp_auth.refresh_access_token(self.get("acs_tkn")["refresh_token"]),
- )
+ new_token = self.sp_auth.refresh_access_token(acs_tkn["refresh_token"])
+ self.set("acs_tkn", new_token)
self.set("NextRefresh", time.time() + 45 * 60)
- self.sp = spotipy.Spotify(auth=self.get("acs_tkn")["access_token"])
+ if new_token and new_token.get("access_token"):
+ self.sp = spotipy.Spotify(auth=new_token["access_token"])
+ logger.debug("Token refreshed successfully")
except Exception as e:
- logger.error(f"Spotify watcher error: {e}")
+ logger.error("Token refresh error: %s", e, exc_info=True)
if "Refresh token revoked" in str(e):
+ logger.warning("Refresh token revoked, re-authenticating")
refresh_token = await self.invoke("stokrefresh", "", self.inline.bot.id)
await refresh_token.delete()
else:
- self.set("NextRefresh", time.time() + 300)
+ self.set("NextRefresh", time.time() + 300)
\ No newline at end of file
diff --git a/radiocycle/Modules/UnbanAll.py b/radiocycle/Modules/UnbanAll.py
index 922fc3d..3aa69d6 100644
--- a/radiocycle/Modules/UnbanAll.py
+++ b/radiocycle/Modules/UnbanAll.py
@@ -6,11 +6,6 @@
# |_|\_\___| |_| |_|\___/ \__,_|___/
# @ke_mods
# =======================================
-#
-# LICENSE: CC BY-ND 4.0 (Attribution-NoDerivatives 4.0 International)
-# --------------------------------------
-# https://creativecommons.org/licenses/by-nd/4.0/legalcode
-# =======================================
# meta developer: @ke_mods
@@ -43,10 +38,10 @@ class UnbanAllMod(loader.Module):
chat = await message.get_chat()
if not chat.admin_rights and not chat.creator:
- await utils.answer(message, self.strings("no_rights"))
+ await utils.answer(message, self.strings["no_rights"])
return
- await utils.answer(message, self.strings("unban_in_process"))
+ await utils.answer(message, self.strings["unban_in_process"])
no_banned = True
@@ -64,11 +59,11 @@ class UnbanAllMod(loader.Module):
))
except Exception as e:
- await utils.answer(message, self.strings("error_occured").format(user.id, e))
+ await utils.answer(message, self.strings["error_occured"].format(user.id, e))
pass
if no_banned:
- await utils.answer(message, self.strings("no_banned"))
+ await utils.answer(message, self.strings["no_banned"])
return
- await utils.answer(message, self.strings("success"))
+ await utils.answer(message, self.strings["success"])
diff --git a/radiocycle/Modules/voicetotext.py b/radiocycle/Modules/voicetotext.py
index 0e4cfd5..c95866b 100644
--- a/radiocycle/Modules/voicetotext.py
+++ b/radiocycle/Modules/voicetotext.py
@@ -6,11 +6,6 @@
# |_|\_\___| |_| |_|\___/ \__,_|___/
# @ke_mods
# =======================================
-#
-# LICENSE: CC BY-ND 4.0 (Attribution-NoDerivatives 4.0 International)
-# --------------------------------------
-# https://creativecommons.org/licenses/by-nd/4.0/legalcode
-# =======================================
# meta developer: @ke_mods
# scope: ffmpeg
diff --git a/yummy1gay/limoka/yg_quotes.py b/yummy1gay/limoka/yg_quotes.py
index 28f89ac..a9ebb39 100644
--- a/yummy1gay/limoka/yg_quotes.py
+++ b/yummy1gay/limoka/yg_quotes.py
@@ -1,4 +1,4 @@
-__version__ = (1, 2, 0, 0)
+__version__ = (1, 3, 0, 0)
# This file is a part of Hikka Userbot!
# This product includes software developed by t.me/Fl1yd and t.me/spypm.
@@ -19,6 +19,10 @@ __version__ = (1, 2, 0, 0)
# - Added: Proxy for users from RF
# - Fixed: Correct reply author resolving for forwarded messages
+# Changelog v1.3:
+# - Added: Message grouping for consecutive messages from the same user (hides avatar/name)
+# - Changed: Replaced RU endpoint logic with direct proxy support via module config
+
# █▄█ █░█ █▀▄▀█ █▀▄▀█ █▄█ █▀▄▀█ █▀█ █▀▄ █▀
# ░█░ █▄█ █░▀░█ █░▀░█ ░█░ █░▀░█ █▄█ █▄▀ ▄█
@@ -155,9 +159,10 @@ class Dick:
return None
@staticmethod
- async def post(url: str, data: dict):
+ async def post(url: str, data: dict, proxy: Optional[str] = None):
try:
- return await utils.run_sync(requests.post, url, json=data, timeout=30)
+ px = {"http": proxy, "https": proxy} if proxy else None
+ return await utils.run_sync(requests.post, url, json=data, timeout=30, proxies=px)
except Exception:
return None
@@ -199,12 +204,8 @@ class Quotes(loader.Module):
loader.ConfigValue("endpoint","https://kok.gay/gayotes/generate",
lambda:"URL API-эндпоинта (можешь поднять локально - github.com/yummy1gay/quote-api)",
validator=loader.validators.Link()),
- loader.ConfigValue("use_rf_proxy", False,
- lambda:'Включает прокси для РФ, если основной эндпоинт возвращает ошибку "Нетворк еррорь", и при этом сервер с юзерботом находится в России или ты сам сидишь в России с ограниченным доступом к зарубежным ресурсам (Termux / UserLAnd)',
- validator=loader.validators.Boolean()),
- loader.ConfigValue("rf_endpoint", "https://ru.kok.gay/gayotes/generate",
- lambda:"URL API-эндпоинта для РФ",
- validator=loader.validators.Link()))
+ loader.ConfigValue("proxy", "",
+ lambda:"Прокси для обхода блокировок (например: http://user:pass@ip:port). Оставь пустым, если не нужно."))
async def client_ready(self, client, db):
self.client=client; self.db=db
@@ -236,11 +237,11 @@ class Quotes(loader.Module):
"format": "webp" if not doc else "png", "type": self.config["type"]}
await utils.answer(st,self.strings["api_processing"])
- endpoint=self.config['rf_endpoint'] if self.config['use_rf_proxy'] else self.config['endpoint']
- r=await Dick.post(f"{endpoint}.webp",pay)
+ prx = self.config["proxy"] if self.config["proxy"] else None
+ r=await Dick.post(f"{self.config['endpoint']}.webp",pay,proxy=prx)
if not r or r.status_code!=200:
- try: err=r.json().get("error",f"HTTP {r.status_code}") if r else "Нетворк еррорь (попробуй включить use_rf_proxy в конфиге)"
- except Exception: err=f"HTTP {r.status_code}" if r else "Нетворк еррорь (попробуй включить use_rf_proxy в конфиге)"
+ try: err=r.json().get("error",f"HTTP {r.status_code}") if r else "Нетворк еррорь (попробуй указать прокси в конфиге)"
+ except Exception: err=f"HTTP {r.status_code}" if r else "Нетворк еррорь (попробуй указать прокси в конфиге)"
return await utils.answer(st,self.strings["api_error"].format(err))
buf=io.BytesIO(r.content); buf.name="YgQuote"+(".png" if doc else ".webp")
@@ -270,11 +271,11 @@ class Quotes(loader.Module):
"format": "webp","type":self.config["type"]}
await utils.answer(st,self.strings["api_processing"])
- endpoint=self.config['rf_endpoint'] if self.config['use_rf_proxy'] else self.config['endpoint']
- r=await Dick.post(f"{endpoint}.webp",dickk)
+ prx = self.config["proxy"] if self.config["proxy"] else None
+ r=await Dick.post(f"{self.config['endpoint']}.webp",dickk,proxy=prx)
if not r or r.status_code!=200:
- try: err=r.json().get("error",f"HTTP {r.status_code}") if r else "Нетворк еррорь (попробуй включить use_rf_proxy в конфиге)"
- except Exception: err=f"HTTP {r.status_code}" if r else "Нетворк еррорь (попробуй включить use_rf_proxy в конфиге)"
+ try: err=r.json().get("error",f"HTTP {r.status_code}") if r else "Нетворк еррорь (попробуй указать прокси в конфиге)"
+ except Exception: err=f"HTTP {r.status_code}" if r else "Нетворк еррорь (попробуй указать прокси в конфиге)"
return await utils.answer(st,self.strings["api_error"].format(err))
buf=io.BytesIO(r.content); buf.name="YgQuote.webp"
@@ -290,12 +291,18 @@ class Quotes(loader.Module):
return None
out: List[dict]=[]
+ prev_sender_id = None
+
for mm in lst:
try:
u=await self.who(mm)
if not u: continue
+ current_sender_id = getattr(u,"id",0)
+
+ is_chained = (current_sender_id == prev_sender_id) if current_sender_id else False
name=telethon.utils.get_display_name(u); f,l=Dick.split(name)
- ava=await Dick.ava(self.client,getattr(u,"id",0)) if getattr(u,"id",None) else None
+
+ ava = await Dick.ava(self.client,current_sender_id) if (not is_chained and current_sender_id) else None
rb=None
try:
@@ -315,10 +322,16 @@ class Quotes(loader.Module):
txt=mm.raw_text or ""; ad=Dick.desc(mm)
if ad: txt=f"{txt}\n\n{ad}" if txt else ad
- item={"from":{"id":getattr(u,"id", 0),"first_name":getattr(u,"first_name","") or f,"last_name":getattr(u,"last_name","") or l,
- "username":getattr(u,"username",None),"name":name,"photo":{"url":ava} if ava else {}},
- "text":txt,"entities":Dick.ents(mm.entities),"avatar":True}
-
+ if is_chained:
+ item={"from":{"id":current_sender_id,"name":""},
+ "text":txt,"entities":Dick.ents(mm.entities),"avatar":False}
+ else:
+ item={"from":{"id":current_sender_id,"first_name":getattr(u,"first_name","") or f,"last_name":getattr(u,"last_name","") or l,
+ "username":getattr(u,"username",None),"name":name,"photo":{"url":ava} if ava else {}},
+ "text":txt,"entities":Dick.ents(mm.entities),"avatar":True}
+
+ es=getattr(u,"emoji_status",None)
+ if getattr(es,"document_id",None): item["from"]["emoji_status"]=str(es.document_id)
try:
if mm.voice:
a = next((a for a in mm.voice.attributes or []
@@ -327,11 +340,10 @@ class Quotes(loader.Module):
except Exception: pass
if med: item["voice" if "voice" in med else "media"] = med.get("voice", med)
-
- es=getattr(u,"emoji_status",None)
- if getattr(es,"document_id",None): item["from"]["emoji_status"]=str(es.document_id)
if rb: item["replyMessage"]=rb
out.append(item)
+
+ prev_sender_id = current_sender_id
except Exception: continue
return out
@@ -378,6 +390,8 @@ class Quotes(loader.Module):
return await self.fake(f"{getattr(u,'id','')} {args}", None)
out: List[dict]=[]
+ prev_sender_id = None
+
for part in args.split("; "):
try:
rb=None
@@ -388,22 +402,32 @@ class Quotes(loader.Module):
if not u1: continue
txt1, ents1 = html.parse(t1) if t1 else ("", [])
+
+ current_sender_id = u1.id
+ is_chained = (current_sender_id == prev_sender_id)
name=telethon.utils.get_display_name(u1); f,l=Dick.split(name)
- ava=await Dick.ava(self.client,u1.id)
+
+ ava = await Dick.ava(self.client,u1.id) if not is_chained else None
if u2:
txt2, ents2 = html.parse(t2) if t2 else ("", [])
name2=telethon.utils.get_display_name(u2); ava2=await Dick.ava(self.client,u2.id)
rb={"name":name2,"text":txt2,"entities":Dick.ents(ents2),"chatId":u2.id,"from":{"name":name2,"photo":{"url":ava2} if ava2 else {}}}
- msg={"from":{"id":u1.id,"first_name":getattr(u1,"first_name","") or f,"last_name":getattr(u1,"last_name","") or l,
- "username":getattr(u1,"username",None),"name":name,"photo":{"url":ava} if ava else {}},
- "text":txt1,"entities":Dick.ents(ents1), "avatar":True}
-
- es=getattr(u1,"emoji_status",None)
- if getattr(es,"document_id",None): msg["from"]["emoji_status"]=str(es.document_id)
+ if is_chained:
+ msg={"from":{"id":current_sender_id,"name":""},
+ "text":txt1,"entities":Dick.ents(ents1), "avatar":False}
+ else:
+ msg={"from":{"id":current_sender_id,"first_name":getattr(u1,"first_name","") or f,"last_name":getattr(u1,"last_name","") or l,
+ "username":getattr(u1,"username",None),"name":name,"photo":{"url":ava} if ava else {}},
+ "text":txt1,"entities":Dick.ents(ents1), "avatar":True}
+ es=getattr(u1,"emoji_status",None)
+ if getattr(es,"document_id",None): msg["from"]["emoji_status"]=str(es.document_id)
+
if rb: msg["replyMessage"]=rb
out.append(msg)
+
+ prev_sender_id = current_sender_id
except Exception: continue
return out
\ No newline at end of file