esef/discordbot
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forwarder polish

Browse Source
This commit is contained in:
esef committed 2026-07-18 13:53:58 +03:00
1 parent e11d712ba0
commit 5e69d316db
1 file changed
+64 -34
Download Patch File Download Diff File Expand all files Collapse all files
tgbridge/forwarder.py
+64 -34
View File
@@ -105,60 +105,90 @@ class TelegramForwarder:
# --- START OF ENHANCED GIF HANDLING BLOCK --- # --- START OF ENHANCED GIF HANDLING BLOCK ---
# Telegram may send a GIF as an `animation` (the normal case) *or* # Telegram may send a GIF as an `animation` (the normal case) *or*
# as a generic `document`/`video` with MIME type `video/mp4`. We want to # as a muted `video` / `document` with a video MIME type.
# treat any of those as a potential GIF and try to convert it to a true # Videos with an audio track are real videos → sent as-is.
# GIF for Discord auto‑looping. # Silent videos are treated as GIFs → converted for Discord auto-loop.
elif getattr(message, "animation", None) or ( elif getattr(message, "animation", None) or (
getattr(message, "document", None) and message.document.mime_type.startswith("video") getattr(message, "document", None) and message.document.mime_type.startswith("video")
) or message.video: ) or message.video:
# Identify the file source
if message.animation: if message.animation:
file_id = message.animation.file_id file_id = message.animation.file_id
is_animation = True
elif message.video: elif message.video:
file_id = message.video.file_id file_id = message.video.file_id
is_animation = False
else: else:
file_id = message.document.file_id file_id = message.document.file_id
is_animation = False
print(f"[GIF-HANDLER] Detected potential media (file_id={file_id})", flush=True) print(f"[GIF-HANDLER] Detected potential media (file_id={file_id})", flush=True)
file_data, filename = await self._download_file(file_id) file_data, filename = await self._download_file(file_id)
# Attempt conversion if it's a video/animation # Probe for audio track to decide: real video or GIF?
# >>> FFMPEG GIF CONVERSION START >>> convert_to_gif = is_animation # animations never have audio
try:
if not shutil.which('ffmpeg'): if not is_animation and shutil.which('ffprobe'):
raise RuntimeError("ffmpeg binary not found in PATH") try:
with tempfile.NamedTemporaryFile(suffix='.mp4', delete=False) as tmp:
tmp.write(file_data)
tmp_path = tmp.name
with tempfile.NamedTemporaryFile(suffix='.mp4', delete=False) as temp_mp4: probe = await asyncio.create_subprocess_exec(
temp_mp4.write(file_data) 'ffprobe', '-v', 'error',
temp_mp4_path = temp_mp4.name '-select_streams', 'a',
'-show_entries', 'stream=codec_type',
'-of', 'csv=p=0',
tmp_path,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE
)
stdout, _ = await asyncio.wait_for(probe.communicate(), timeout=15.0)
os.remove(tmp_path)
temp_gif_path = temp_mp4_path + '.gif' # ffprobe outputs "audio" if an audio stream is present
convert_to_gif = b'audio' not in stdout
if not convert_to_gif:
print("[GIF-HANDLER] Audio track detected — sending as video", flush=True)
except Exception as e:
print(f"[GIF-HANDLER] ffprobe failed, defaulting to convert: {e}", flush=True)
convert_to_gif = True
process = await asyncio.create_subprocess_exec( if convert_to_gif:
'ffmpeg', '-y', '-i', temp_mp4_path, # >>> FFMPEG GIF CONVERSION START >>>
'-filter_complex', 'fps=15,scale=320:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse', try:
'-loop', '0', temp_gif_path, if not shutil.which('ffmpeg'):
stdout=asyncio.subprocess.DEVNULL, raise RuntimeError("ffmpeg binary not found in PATH")
stderr=asyncio.subprocess.PIPE
)
stdout, stderr = await asyncio.wait_for(process.communicate(), timeout=30.0) with tempfile.NamedTemporaryFile(suffix='.mp4', delete=False) as temp_mp4:
temp_mp4.write(file_data)
temp_mp4_path = temp_mp4.name
if process.returncode == 0 and os.path.exists(temp_gif_path): temp_gif_path = temp_mp4_path + '.gif'
gif_size = os.path.getsize(temp_gif_path)
if gif_size < 10 * 1024 * 1024:
with open(temp_gif_path, 'rb') as f:
file_data = f.read()
filename = filename.rsplit('.', 1)[0] + '.gif'
else:
print(f"[GIF-HANDLER] ffmpeg error: {stderr.decode()}", flush=True)
if os.path.exists(temp_mp4_path): os.remove(temp_mp4_path) process = await asyncio.create_subprocess_exec(
if os.path.exists(temp_gif_path): os.remove(temp_gif_path) 'ffmpeg', '-y', '-i', temp_mp4_path,
except Exception as e: '-filter_complex', 'fps=15,scale=320:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse',
print(f'ffmpeg conversion skipped/failed: {e}', flush=True) '-loop', '0', temp_gif_path,
# <<< FFMPEG GIF CONVERSION END <<< stdout=asyncio.subprocess.DEVNULL,
stderr=asyncio.subprocess.PIPE
)
stdout, stderr = await asyncio.wait_for(process.communicate(), timeout=30.0)
if process.returncode == 0 and os.path.exists(temp_gif_path):
gif_size = os.path.getsize(temp_gif_path)
if gif_size < 10 * 1024 * 1024:
with open(temp_gif_path, 'rb') as f:
file_data = f.read()
filename = filename.rsplit('.', 1)[0] + '.gif'
else:
print(f"[GIF-HANDLER] ffmpeg error: {stderr.decode()}", flush=True)
if os.path.exists(temp_mp4_path): os.remove(temp_mp4_path)
if os.path.exists(temp_gif_path): os.remove(temp_gif_path)
except Exception as e:
print(f'ffmpeg conversion skipped/failed: {e}', flush=True)
# <<< FFMPEG GIF CONVERSION END <<<
text = caption.strip() text = caption.strip()
await self._send_to_webhook(webhook_url, sender, text, file_data, filename) await self._send_to_webhook(webhook_url, sender, text, file_data, filename)