Ajout de nouvelles colonnes pour la personnalisation des notifications YouTube dans la table youtube_notification, y compris le titre, la description, la couleur, le pied de page, le nom et l'icône de l'auteur, ainsi que des options pour afficher la miniature et l'image. Mise à jour de l'interface web pour permettre la configuration de ces options et ajout d'une prévisualisation de l'embed Discord.

database/__init__.py

@@ -33,7 +33,13 @@ def _set_sqlite_pragma(dbapi_connection, connection_record):
 	except Exception:
 		pass
 
+def _tableExists(table_name:str, cursor:Cursor) -> bool:
+	cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name=?", (table_name,))
+	return cursor.fetchone() is not None
+
 def _tableHaveColumn(table_name:str, column_name:str, cursor:Cursor) -> bool: 
+	if not _tableExists(table_name, cursor):
+		return False
 	cursor.execute(f'PRAGMA table_info({table_name})')
 	columns = cursor.fetchall()
 	return any(col[1] == column_name for col in columns)
@@ -65,6 +71,27 @@ def _doPostImportMigration(cursor:Cursor):
 		logging.info("suppression de la table temporaire game_bundle_old")
 		_dropTable('game_bundle_old', cursor)
 	
+	if _tableExists('youtube_notification', cursor):
+		logging.info("Migration de la table youtube_notification: ajout des colonnes d'embed")
+		embed_columns = [
+			('embed_title', 'VARCHAR(256)'),
+			('embed_description', 'VARCHAR(2000)'),
+			('embed_color', 'VARCHAR(8) DEFAULT "FF0000"'),
+			('embed_footer', 'VARCHAR(2048)'),
+			('embed_author_name', 'VARCHAR(256)'),
+			('embed_author_icon', 'VARCHAR(512)'),
+			('embed_thumbnail', 'BOOLEAN DEFAULT 1'),
+			('embed_image', 'BOOLEAN DEFAULT 1')
+		]
+		for col_name, col_type in embed_columns:
+			if not _tableHaveColumn('youtube_notification', col_name, cursor):
+				try:
+					cursor.execute(f'ALTER TABLE youtube_notification ADD COLUMN {col_name} {col_type}')
+					logging.info(f"Colonne {col_name} ajoutée à youtube_notification")
+				except Exception as e:
+					logging.error(f"Impossible d'ajouter la colonne {col_name}: {e}")
+					raise
+
 with webapp.app_context():
 	with open('database/schema.sql', 'r') as f:
 		sql = f.read()

database/models.py

@@ -65,9 +65,17 @@ class YouTubeNotification(db.Model):
 	__tablename__ = 'youtube_notification'
 	id = db.Column(db.Integer, primary_key=True)
 	enable = db.Column(db.Boolean, default=True)
-	channel_id = db.Column(db.String(128))  # ID de la chaîne YouTube
-	notify_channel = db.Column(db.Integer)  # ID du canal Discord
+	channel_id = db.Column(db.String(128))
+	notify_channel = db.Column(db.Integer)
 	message = db.Column(db.String(2000))
-	video_type = db.Column(db.String(16), default='all')  # 'all', 'video', 'short'
-	last_video_id = db.Column(db.String(128))  # ID de la dernière vidéo notifiée
+	video_type = db.Column(db.String(16), default='all')
+	last_video_id = db.Column(db.String(128))
+	embed_title = db.Column(db.String(256))
+	embed_description = db.Column(db.String(2000))
+	embed_color = db.Column(db.String(8), default='FF0000')
+	embed_footer = db.Column(db.String(2048))
+	embed_author_name = db.Column(db.String(256))
+	embed_author_icon = db.Column(db.String(512))
+	embed_thumbnail = db.Column(db.Boolean, default=True)
+	embed_image = db.Column(db.Boolean, default=True)
 

database/schema.sql

@@ -84,5 +84,13 @@ CREATE TABLE IF NOT EXISTS `youtube_notification` (
 	`notify_channel` INTEGER NOT NULL,
 	`message` VARCHAR(2000) NOT NULL,
 	`video_type` VARCHAR(16) NOT NULL DEFAULT 'all',
-	`last_video_id` VARCHAR(128)
+	`last_video_id` VARCHAR(128),
+	`embed_title` VARCHAR(256),
+	`embed_description` VARCHAR(2000),
+	`embed_color` VARCHAR(8) NOT NULL DEFAULT 'FF0000',
+	`embed_footer` VARCHAR(2048),
+	`embed_author_name` VARCHAR(256),
+	`embed_author_icon` VARCHAR(512),
+	`embed_thumbnail` BOOLEAN NOT NULL DEFAULT TRUE,
+	`embed_image` BOOLEAN NOT NULL DEFAULT TRUE
 );

discordbot/youtube.py

@@ -149,31 +149,76 @@ async def _notifyVideo(notification: YouTubeNotification, video_data: dict, vide
 			message = f"🎥 Nouvelle vidéo de {channel_name}: [{video_title}]({video_url})"
 		
 		logger.info(f"Envoi de notification YouTube: {message}")
-		bot.loop.create_task(_sendMessage(notification.notify_channel, message, video_url, thumbnail, video_title, channel_name))
+		bot.loop.create_task(_sendMessage(notification, message, video_url, thumbnail, video_title, channel_name, video_id, published_at, is_short))
 		
 	except Exception as e:
 		logger.error(f"Erreur lors de la notification: {e}")
 
 
-async def _sendMessage(channel_id: int, message: str, video_url: str, thumbnail: str, video_title: str, channel_name: str):
+def _format_embed_text(text: str, channel_name: str, video_title: str, video_url: str, video_id: str, thumbnail: str, published_at: str, is_short: bool) -> str:
+	"""Formate un texte d'embed avec les variables disponibles"""
+	if not text:
+		return None
+	try:
+		return text.format(
+			channel_name=channel_name or 'Inconnu',
+			video_title=video_title or 'Sans titre',
+			video_url=video_url,
+			video_id=video_id,
+			thumbnail=thumbnail or '',
+			published_at=published_at or '',
+			is_short=is_short
+		)
+	except KeyError:
+		return text
+
+
+async def _sendMessage(notification: YouTubeNotification, message: str, video_url: str, thumbnail: str, video_title: str, channel_name: str, video_id: str, published_at: str, is_short: bool):
 	from discordbot import bot
 	try:
-		discord_channel = bot.get_channel(channel_id)
+		discord_channel = bot.get_channel(notification.notify_channel)
 		if not discord_channel:
-			logger.error(f"Canal Discord {channel_id} introuvable")
+			logger.error(f"Canal Discord {notification.notify_channel} introuvable")
 			return
 		
 		import discord
+		
+		embed_title = _format_embed_text(notification.embed_title, channel_name, video_title, video_url, video_id, thumbnail, published_at, is_short) if notification.embed_title else video_title
+		embed_description = _format_embed_text(notification.embed_description, channel_name, video_title, video_url, video_id, thumbnail, published_at, is_short) if notification.embed_description else None
+		
+		try:
+			embed_color = int(notification.embed_color or 'FF0000', 16)
+		except ValueError:
+			embed_color = 0xFF0000
+		
 		embed = discord.Embed(
-			title=video_title,
+			title=embed_title,
 			url=video_url,
-			color=0xFF0000
+			color=embed_color
 		)
-		embed.set_author(name=channel_name, icon_url="https://www.youtube.com/img/desktop/yt_1200.png")
-		if thumbnail:
+		
+		if embed_description:
+			embed.description = embed_description
+		
+		author_name = _format_embed_text(notification.embed_author_name, channel_name, video_title, video_url, video_id, thumbnail, published_at, is_short) if notification.embed_author_name else channel_name
+		author_icon = notification.embed_author_icon if notification.embed_author_icon else "https://www.youtube.com/img/desktop/yt_1200.png"
+		embed.set_author(name=author_name, icon_url=author_icon)
+		
+		if notification.embed_thumbnail and thumbnail:
+			embed.set_thumbnail(url=thumbnail)
+		
+		if notification.embed_image and thumbnail:
 			embed.set_image(url=thumbnail)
 		
-		await discord_channel.send(message, embed=embed)
+		if notification.embed_footer:
+			footer_text = _format_embed_text(notification.embed_footer, channel_name, video_title, video_url, video_id, thumbnail, published_at, is_short)
+			if footer_text:
+				embed.set_footer(text=footer_text)
+		
+		if message and message.strip():
+			await discord_channel.send(message, embed=embed)
+		else:
+			await discord_channel.send(embed=embed)
 		logger.info(f"Notification YouTube envoyée avec succès")
 		
 	except Exception as e:

webapp/templates/youtube.html

@@ -62,52 +62,184 @@
 {% endif %}
 
 <h2>{{ 'Editer une notification' if notification else 'Ajouter une notification YouTube' }}</h2>
-<form action="{{ url_for('submitEditYouTube', id = notification.id) if notification else url_for('addYouTube') }}" method="POST">
-	<label for="channel_id">Lien ou ID de la chaîne YouTube</label>
-	<input name="channel_id" type="text" maxlength="256" required="required" value="{{notification.channel_id if notification}}" placeholder="https://www.youtube.com/@513v3 ou https://www.youtube.com/channel/UC... ou UC..."/>
-	<label for="notify_channel">Canal de Notification Discord</label>
-	<select name="notify_channel">
-		{% for channel in channels %}
-		<option value="{{channel.id}}"{% if notification and notification.notify_channel == channel.id %}
-			selected="selected" {% endif %}>{{channel.name}}</option>
-		{% endfor %}
-	</select>
-	<label for="video_type">Type de vidéo à notifier</label>
-	<select name="video_type">
-		<option value="all"{% if notification and notification.video_type == 'all' %} selected="selected" {% endif %}>Toutes (vidéos + shorts)</option>
-		<option value="video"{% if notification and notification.video_type == 'video' %} selected="selected" {% endif %}>Vidéos uniquement</option>
-		<option value="short"{% if notification and notification.video_type == 'short' %} selected="selected" {% endif %}>Shorts uniquement</option>
-	</select>
-	<label for="message">Message</label>
-	<textarea name="message" rows="5" cols="50" required="required">{{notification.message if notification}}</textarea>
-	<input type="Submit" value="{{ 'Modifier' if notification else 'Ajouter' }}">
-	<p>
-		Vous pouvez coller directement le lien de la chaîne YouTube dans n'importe quel format :
-		<ul>
-			<li><strong>Lien avec handle :</strong> <code>https://www.youtube.com/@513v3</code></li>
-			<li><strong>Lien avec ID :</strong> <code>https://www.youtube.com/channel/UCxxxxxxxxxxxxxxxxxxxxxxxxxx</code></li>
-			<li><strong>ID seul :</strong> <code>UCxxxxxxxxxxxxxxxxxxxxxxxxxx</code></li>
-			<li><strong>Handle seul :</strong> <code>@513v3</code></li>
-		</ul>
-		Le système extraira automatiquement l'ID de la chaîne.
-		<br><br>
-		<strong>Note :</strong> Les notifications utilisent le flux RSS YouTube, aucune clé API n'est nécessaire !
-	</p>
-	<p>
-		Pour le message vous avez accès à ces variables :
-		<ul>
-			<li><code>{channel_name}</code> : nom de la chaîne YouTube</li>
-			<li><code>{video_title}</code> : titre de la vidéo</li>
-			<li><code>{video_url}</code> : lien vers la vidéo</li>
-			<li><code>{video_id}</code> : ID de la vidéo</li>
-			<li><code>{thumbnail}</code> : URL de la miniature</li>
-			<li><code>{published_at}</code> : date de publication</li>
-			<li><code>{is_short}</code> : True si c'est un short, False sinon</li>
-		</ul>
-		Le message est au format <a href="https://commonmark.org/" target="_blank">common-mark</a> dans la limite de ce que
-		support Discord.
-		Exemple : <code>🎥 Nouvelle vidéo de {channel_name} : [{video_title}]({video_url})</code>
-	</p>
-</form>
+
+<div style="display: grid; grid-template-columns: 1fr 1fr; gap: 20px;">
+	<div>
+		<form id="youtube-form" action="{{ url_for('submitEditYouTube', id = notification.id) if notification else url_for('addYouTube') }}" method="POST">
+			<fieldset>
+				<legend>Configuration de base</legend>
+				<label for="channel_id">Lien ou ID de la chaîne YouTube</label>
+				<input name="channel_id" id="channel_id" type="text" maxlength="256" required="required" value="{{notification.channel_id if notification}}" placeholder="https://www.youtube.com/@513v3 ou https://www.youtube.com/channel/UC... ou UC..."/>
+				
+				<label for="notify_channel">Canal de Notification Discord</label>
+				<select name="notify_channel" id="notify_channel">
+					{% for channel in channels %}
+					<option value="{{channel.id}}"{% if notification and notification.notify_channel == channel.id %}
+						selected="selected" {% endif %}>{{channel.name}}</option>
+					{% endfor %}
+				</select>
+				
+				<label for="video_type">Type de vidéo à notifier</label>
+				<select name="video_type" id="video_type">
+					<option value="all"{% if notification and notification.video_type == 'all' %} selected="selected" {% endif %}>Toutes (vidéos + shorts)</option>
+					<option value="video"{% if notification and notification.video_type == 'video' %} selected="selected" {% endif %}>Vidéos uniquement</option>
+					<option value="short"{% if notification and notification.video_type == 'short' %} selected="selected" {% endif %}>Shorts uniquement</option>
+				</select>
+				
+				<label for="message">Message (optionnel, envoyé avant l'embed)</label>
+				<textarea name="message" id="message" rows="3" cols="50">{{notification.message if notification}}</textarea>
+			</fieldset>
+
+			<fieldset>
+				<legend>Personnalisation de l'embed Discord</legend>
+				
+				<label for="embed_title">Titre de l'embed</label>
+				<input name="embed_title" id="embed_title" type="text" maxlength="256" value="{{notification.embed_title if notification}}" placeholder="{video_title} (par défaut: titre de la vidéo)"/>
+				<small>Variables: {video_title}, {channel_name}, {video_url}, {video_id}</small>
+				
+				<label for="embed_description">Description de l'embed</label>
+				<textarea name="embed_description" id="embed_description" rows="4" cols="50" placeholder="Description optionnelle de l'embed">{{notification.embed_description if notification}}</textarea>
+				<small>Variables: {video_title}, {channel_name}, {video_url}, {published_at}, {is_short}</small>
+				
+				<label for="embed_color">Couleur de l'embed (hexadécimal)</label>
+				<input name="embed_color" id="embed_color" type="color" value="#{{notification.embed_color if notification else 'FF0000'}}" style="width: 100px; height: 40px;"/>
+				<input type="text" id="embed_color_text" value="{{notification.embed_color if notification else 'FF0000'}}" placeholder="FF0000" style="width: 100px; margin-left: 10px;" maxlength="6"/>
+				<small>Format: FF0000 (rouge YouTube par défaut)</small>
+				
+				<label for="embed_author_name">Nom de l'auteur</label>
+				<input name="embed_author_name" id="embed_author_name" type="text" maxlength="256" value="{{notification.embed_author_name if notification}}" placeholder="{channel_name} (par défaut: nom de la chaîne)"/>
+				
+				<label for="embed_author_icon">Icône de l'auteur (URL)</label>
+				<input name="embed_author_icon" id="embed_author_icon" type="text" maxlength="512" value="{{notification.embed_author_icon if notification}}" placeholder="https://www.youtube.com/img/desktop/yt_1200.png"/>
+				
+				<label for="embed_footer">Pied de page</label>
+				<input name="embed_footer" id="embed_footer" type="text" maxlength="2048" value="{{notification.embed_footer if notification}}" placeholder="Texte optionnel en bas de l'embed"/>
+				
+				<label>
+					<input type="checkbox" name="embed_thumbnail" id="embed_thumbnail" {% if not notification or notification.embed_thumbnail %}checked="checked"{% endif %}>
+					Afficher la miniature (thumbnail) en haut à droite
+				</label>
+				
+				<label>
+					<input type="checkbox" name="embed_image" id="embed_image" {% if not notification or notification.embed_image %}checked="checked"{% endif %}>
+					Afficher l'image principale (image de la vidéo)
+				</label>
+			</fieldset>
+
+			<input type="Submit" value="{{ 'Modifier' if notification else 'Ajouter' }}">
+		</form>
+	</div>
+
+	<div>
+		<h3>Prévisualisation de l'embed Discord</h3>
+		<div id="embed-preview" style="background-color: #2f3136; border-radius: 4px; padding: 16px; font-family: 'Whitney', 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #dcddde; max-width: 520px; border-left: 4px solid #FF0000;">
+			<div id="embed-author" style="display: flex; align-items: center; margin-bottom: 8px; font-size: 14px;">
+				<img id="embed-author-icon" src="https://www.youtube.com/img/desktop/yt_1200.png" style="width: 20px; height: 20px; border-radius: 50%; margin-right: 8px;" onerror="this.style.display='none'"/>
+				<span id="embed-author-name" style="font-weight: 600;">Nom de la chaîne</span>
+			</div>
+			<a id="embed-title" href="#" style="color: #00aff4; text-decoration: none; font-size: 16px; font-weight: 600; display: block; margin-bottom: 8px;">Titre de la vidéo</a>
+			<div id="embed-description" style="font-size: 14px; line-height: 1.375; margin-bottom: 8px; color: #dcddde;"></div>
+			<div id="embed-thumbnail-container" style="margin: 8px 0;">
+				<img id="embed-thumbnail" src="" style="max-width: 80px; max-height: 80px; border-radius: 4px; float: right; margin-left: 16px; display: none;"/>
+			</div>
+			<div id="embed-image-container" style="margin-top: 16px;">
+				<img id="embed-image" src="https://i.ytimg.com/vi/dQw4w9WgXcQ/maxresdefault.jpg" style="max-width: 100%; border-radius: 4px; display: none;"/>
+			</div>
+			<div id="embed-footer" style="margin-top: 8px; font-size: 12px; color: #72767d;"></div>
+		</div>
+		<small style="color: #666;">Cette prévisualisation est approximative. L'apparence réelle sur Discord peut varier légèrement.</small>
+	</div>
+</div>
+
+<script>
+	function formatText(text, vars) {
+		if (!text) return '';
+		return text.replace(/\{(\w+)\}/g, function(match, key) {
+			return vars[key] || match;
+		});
+	}
+
+	function updatePreview() {
+		const embedTitle = document.getElementById('embed_title').value || '{video_title}';
+		const embedDescription = document.getElementById('embed_description').value || '';
+		const embedColor = document.getElementById('embed_color_text').value || 'FF0000';
+		const embedAuthorName = document.getElementById('embed_author_name').value || '{channel_name}';
+		const embedAuthorIcon = document.getElementById('embed_author_icon').value || 'https://www.youtube.com/img/desktop/yt_1200.png';
+		const embedFooter = document.getElementById('embed_footer').value || '';
+		const embedThumbnail = document.getElementById('embed_thumbnail').checked;
+		const embedImage = document.getElementById('embed_image').checked;
+
+		const vars = {
+			video_title: 'Nouvelle vidéo de test',
+			channel_name: 'Ma Chaîne YouTube',
+			video_url: 'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
+			video_id: 'dQw4w9WgXcQ',
+			thumbnail: 'https://i.ytimg.com/vi/dQw4w9WgXcQ/maxresdefault.jpg',
+			published_at: '2026-01-25T12:00:00Z',
+			is_short: false
+		};
+
+		document.getElementById('embed-title').textContent = formatText(embedTitle, vars);
+		document.getElementById('embed-title').href = vars.video_url;
+		document.getElementById('embed-description').textContent = formatText(embedDescription, vars);
+		document.getElementById('embed-author-name').textContent = formatText(embedAuthorName, vars);
+		document.getElementById('embed-author-icon').src = embedAuthorIcon;
+		document.getElementById('embed-footer').textContent = formatText(embedFooter, vars);
+		
+		document.getElementById('embed-preview').style.borderLeftColor = '#' + embedColor;
+		
+		if (embedThumbnail) {
+			document.getElementById('embed-thumbnail').src = vars.thumbnail;
+			document.getElementById('embed-thumbnail').style.display = 'block';
+		} else {
+			document.getElementById('embed-thumbnail').style.display = 'none';
+		}
+		
+		if (embedImage) {
+			document.getElementById('embed-image').src = vars.thumbnail;
+			document.getElementById('embed-image').style.display = 'block';
+		} else {
+			document.getElementById('embed-image').style.display = 'none';
+		}
+	}
+
+	document.getElementById('embed_color').addEventListener('input', function(e) {
+		document.getElementById('embed_color_text').value = e.target.value.substring(1).toUpperCase();
+		updatePreview();
+	});
+
+	document.getElementById('embed_color_text').addEventListener('input', function(e) {
+		const val = e.target.value.replace(/[^0-9A-Fa-f]/g, '').substring(0, 6);
+		e.target.value = val;
+		if (val.length === 6) {
+			document.getElementById('embed_color').value = '#' + val;
+			updatePreview();
+		}
+	});
+
+	const formFields = ['embed_title', 'embed_description', 'embed_author_name', 'embed_author_icon', 'embed_footer', 'embed_thumbnail', 'embed_image'];
+	formFields.forEach(field => {
+		const el = document.getElementById(field);
+		if (el) {
+			el.addEventListener('input', updatePreview);
+			el.addEventListener('change', updatePreview);
+		}
+	});
+
+	updatePreview();
+</script>
+
+<p>
+	<strong>Variables disponibles pour l'embed :</strong>
+	<ul>
+		<li><code>{channel_name}</code> : nom de la chaîne YouTube</li>
+		<li><code>{video_title}</code> : titre de la vidéo</li>
+		<li><code>{video_url}</code> : lien vers la vidéo</li>
+		<li><code>{video_id}</code> : ID de la vidéo</li>
+		<li><code>{thumbnail}</code> : URL de la miniature</li>
+		<li><code>{published_at}</code> : date de publication</li>
+		<li><code>{is_short}</code> : True si c'est un short, False sinon</li>
+	</ul>
+</p>
 
 {% endblock %}

webapp/youtube.py

@@ -93,12 +93,24 @@ def addYouTube():
 	except ValueError:
 		return redirect(url_for("openYouTube") + "?" + urlencode({'msg': "Canal Discord invalide.", 'type': 'error'}))
 	
+	embed_color = request.form.get('embed_color', 'FF0000').strip().lstrip('#')
+	if len(embed_color) != 6:
+		embed_color = 'FF0000'
+	
 	notification = YouTubeNotification(
 		enable=True,
 		channel_id=channel_id,
 		notify_channel=notify_channel,
 		message=request.form.get('message'),
-		video_type=request.form.get('video_type', 'all')
+		video_type=request.form.get('video_type', 'all'),
+		embed_title=request.form.get('embed_title') or None,
+		embed_description=request.form.get('embed_description') or None,
+		embed_color=embed_color,
+		embed_footer=request.form.get('embed_footer') or None,
+		embed_author_name=request.form.get('embed_author_name') or None,
+		embed_author_icon=request.form.get('embed_author_icon') or None,
+		embed_thumbnail=request.form.get('embed_thumbnail') == 'on',
+		embed_image=request.form.get('embed_image') == 'on'
 	)
 	db.session.add(notification)
 	db.session.commit()
@@ -141,10 +153,22 @@ def submitEditYouTube(id):
 	except ValueError:
 		return redirect(url_for("openEditYouTube", id=id) + "?" + urlencode({'msg': "Canal Discord invalide.", 'type': 'error'}))
 	
+	embed_color = request.form.get('embed_color', 'FF0000').strip().lstrip('#')
+	if len(embed_color) != 6:
+		embed_color = 'FF0000'
+	
 	notification.channel_id = channel_id
 	notification.notify_channel = notify_channel
 	notification.message = request.form.get('message')
 	notification.video_type = request.form.get('video_type', 'all')
+	notification.embed_title = request.form.get('embed_title') or None
+	notification.embed_description = request.form.get('embed_description') or None
+	notification.embed_color = embed_color
+	notification.embed_footer = request.form.get('embed_footer') or None
+	notification.embed_author_name = request.form.get('embed_author_name') or None
+	notification.embed_author_icon = request.form.get('embed_author_icon') or None
+	notification.embed_thumbnail = request.form.get('embed_thumbnail') == 'on'
+	notification.embed_image = request.form.get('embed_image') == 'on'
 	db.session.commit()
 	return redirect(url_for("openYouTube") + "?" + urlencode({'msg': "Notification modifiée avec succès", 'type': 'success'}))