nickpons666/lastwar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mejoras en el envío de plantillas con imágenes

Browse Source 
- Agregar detección de URLs de Discord gifts para evitar botones de traducción
- Enviar imágenes en orden correcto (texto-imagen-texto-imagen) en Discord y Telegram
- Usar APP_URL del .env para las URLs de imágenes
- Agregar funciones sendContentWithOrderedImagesAndButtons en ambos bots
This commit is contained in:
nickpons666
2026-02-19 19:12:28 -06:00
parent a55c45ef94
commit e8912bdb63
5 changed files with 130 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
telegram/TelegramSender.php
View File

@@ -247,20 +247,43 @@ class TelegramSender
*/
public function sendContentWithOrderedImages(int $chatId, array $segments): void
{
$this->sendContentWithOrderedImagesAndButtons($chatId, $segments, null);
}
/**
* Enviar contenido con texto e imágenes en el orden correcto con botones
*/
public function sendContentWithOrderedImagesAndButtons(int $chatId, array $segments, ?array $buttons = null): void
{
$appUrl = $_ENV['APP_URL'] ?? getenv('APP_URL') ?? '';
$baseUrl = rtrim($appUrl, '/');
$totalSegments = count($segments);
$currentSegment = 0;
foreach ($segments as $segment) {
$currentSegment++;
$isLastSegment = ($currentSegment === $totalSegments);
if ($segment['type'] === 'text') {
// Enviar texto
if (!empty(trim($segment['content']))) {
$this->sendMessage($chatId, $segment['content']);
if ($isLastSegment && $buttons) {
$this->sendMessage($chatId, $segment['content'], $buttons);
} else {
$this->sendMessage($chatId, $segment['content']);
}
}
} elseif ($segment['type'] === 'image') {
$imagePath = $segment['src'];
if (file_exists($imagePath)) {
// Es un archivo local
$this->sendPhoto($chatId, $imagePath);
} elseif (strpos($imagePath, 'http') === 0) {
// Es una URL remota
// Convertir ruta local a URL usando APP_URL
if (strpos($imagePath, 'http') !== 0) {
$imagePath = $baseUrl . '/' . ltrim($imagePath, '/');
}
if ($isLastSegment && $buttons) {
$this->sendPhoto($chatId, $imagePath, null, $buttons);
} else {
$this->sendPhoto($chatId, $imagePath);
}
}

37
telegram/webhook/telegram_bot_webhook.php
View File

@@ -335,26 +335,25 @@ function sendTemplateByCommand(PDO $pdo, Telegram\TelegramSender $sender, int $c
$template = $stmt->fetch();
if ($template) {
$converter = new Telegram\Converters\HtmlToTelegramHtmlConverter();
$content = $converter->convert($template['message_content']);
// Parsear el contenido manteniendo el orden texto-imagen
$segments = $sender->parseContent($template['message_content']);
$plainText = $template['message_content'];
$plainText = preg_replace('/<br\s*\/?>/i', "\n", $plainText);
$plainText = preg_replace('/<\/p>/i', "\n", $plainText);
$plainText = preg_replace('/<p[^>]*>/i', '', $plainText);
$plainText = strip_tags($plainText);
$plainText = html_entity_decode($plainText, ENT_QUOTES | ENT_HTML5, 'UTF-8');
// Limpiar espacios múltiples pero preservar saltos de línea
$plainText = preg_replace('/[ \t]+/', ' ', $plainText);
$plainText = preg_replace('/\n\s*\n/', "\n", $plainText);
$plainText = trim($plainText);
$translationButtons = getTelegramTranslationButtons($pdo, $plainText);
if ($translationButtons) {
$sender->sendMessage($chatId, $content, $translationButtons);
} else {
$sender->sendMessage($chatId, $content);
if (!empty($segments)) {
// Obtener texto completo para botones de traducción
$plainText = $template['message_content'];
$plainText = preg_replace('/<br\s*\/?>/i', "\n", $plainText);
$plainText = preg_replace('/<\/p>/i', "\n", $plainText);
$plainText = preg_replace('/<p[^>]*>/i', '', $plainText);
$plainText = strip_tags($plainText);
$plainText = html_entity_decode($plainText, ENT_QUOTES | ENT_HTML5, 'UTF-8');
$plainText = preg_replace('/[ \t]+/', ' ', $plainText);
$plainText = preg_replace('/\n\s*\n/', "\n", $plainText);
$plainText = trim($plainText);
$translationButtons = getTelegramTranslationButtons($pdo, $plainText);
// Enviar contenido ordenado con botones
$sender->sendContentWithOrderedImagesAndButtons($chatId, $segments, $translationButtons);
}
} else {
$sender->sendMessage($chatId, "❌ Plantilla no encontrada: #{$command}");