lapatatedouce/MamieHenriette
1
0
Fork 0
mirror of https://github.com/skylanix/MamieHenriette.git synced 2026-02-06 14:50:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from skylanix/humblebundlev3

Browse Source 
Humblebundlev3
This commit is contained in:
skylanix
2025-11-16 22:25:12 +01:00
committed by GitHub
parent 499fac9c12 559a780a4f
commit 54b014c4c8
3 changed files with 80 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
discordbot/__init__.py
View File

@@ -178,7 +178,13 @@ async def on_message(message: Message):
logging.error(f"Échec de la gestion du message d'aide ProtonDB : {e}") logging.error(f"Échec de la gestion du message d'aide ProtonDB : {e}")
return return
try:
searching_msg = await message.channel.send(f"🔍 Recherche en cours pour **{name}**...")
games = searhProtonDb(name) games = searhProtonDb(name)
await searching_msg.delete()
except:
games = searhProtonDb(name)
if (len(games)==0) : if (len(games)==0) :
msg = f'{mention} Je n\'ai pas trouvé de jeux correspondant à **{name}**. Es-tu sûr que le jeu est disponible sur Steam ?' msg = f'{mention} Je n\'ai pas trouvé de jeux correspondant à **{name}**. Es-tu sûr que le jeu est disponible sur Steam ?'
try: try:
@@ -187,52 +193,58 @@ async def on_message(message: Message):
logging.error(f"Échec de l'envoi du message ProtonDB : {e}") logging.error(f"Échec de l'envoi du message ProtonDB : {e}")
return return
total_games = len(games) total_games = len(games)
embed = discord.Embed( tier_colors = {'platinum': '🟣', 'gold': '🟡', 'silver': '⚪', 'bronze': '🟤', 'borked': '🔴'}
title=f"**{total_games} jeu{'x' if total_games > 1 else ''} trouvé{'s' if total_games > 1 else ''}**", content = ""
color=discord.Color.blurple() max_games = 15
)
max_fields = 10 for count, game in enumerate(games[:max_games]):
count = 0
for game in games:
if count >= max_fields:
break
g_name = str(game.get('name')) g_name = str(game.get('name'))
g_id = str(game.get('id')) g_id = str(game.get('id'))
tier = str(game.get('tier') or 'N/A') tier = str(game.get('tier') or 'N/A').lower()
tier_icon = tier_colors.get(tier, '⚫')
new_entry = f"**[{g_name}](<https://www.protondb.com/app/{g_id}>)**\n{tier_icon} Classé **{tier.capitalize()}**"
ac_status = game.get('anticheat_status') ac_status = game.get('anticheat_status')
ac_text = ''
if ac_status: if ac_status:
status_lower = str(ac_status).lower() status_lower = str(ac_status).lower()
if status_lower == 'supported': ac_map = {
ac_emoji, ac_label = '✅', 'Supporté' 'supported': ('✅', 'Supporté'),
elif status_lower == 'running': 'running': ('⚠️', 'Fonctionne'),
ac_emoji, ac_label = '⚠️', 'Fonctionne' 'broken': ('❌', 'Cassé'),
elif status_lower == 'broken': 'denied': ('🚫', 'Refusé'),
ac_emoji, ac_label = '❌', 'Cassé' 'planned': ('📅', 'Planifié')
elif status_lower == 'denied': }
ac_emoji, ac_label = '🚫', 'Refusé' ac_emoji, ac_label = ac_map.get(status_lower, ('❔', str(ac_status)))
elif status_lower == 'planned':
ac_emoji, ac_label = '📅', 'Planifié'
else:
ac_emoji, ac_label = '❔', str(ac_status)
acs = game.get('anticheats') or [] acs = game.get('anticheats') or []
ac_list = ', '.join([str(ac) for ac in acs if ac]) ac_list = ', '.join([str(ac) for ac in acs if ac])
ac_text = f" | [Anti-cheat: {ac_emoji} {ac_label}" new_entry += f" • [Anti-cheat {ac_emoji} {ac_label}"
if ac_list: if ac_list:
ac_text += f" ({ac_list})" new_entry += f" ({ac_list})"
ac_text += f"](<https://areweanticheatyet.com/game/{g_id}>)" new_entry += f"](<https://areweanticheatyet.com/game/{g_id}>)"
field_value = f"[{g_name}](<https://www.protondb.com/app/{g_id}>) - **Classé**: {tier}{ac_text}" new_entry += "\n\n"
embed.add_field(name="\u200b", value=field_value, inline=False)
count += 1
rest = max(0, len(games) - count) # Vérifier la limite avant d'ajouter
if len(content) + len(new_entry) > 3900:
rest = len(games) - count
content += f"*... et {rest} autre{'s' if rest > 1 else ''} jeu{'x' if rest > 1 else ''}*"
break
content += new_entry
else:
rest = max(0, len(games) - max_games)
if rest > 0: if rest > 0:
embed.add_field(name="…", value=f"et encore {rest} autres jeux", inline=False) content += f"*... et {rest} autre{'s' if rest > 1 else ''} jeu{'x' if rest > 1 else ''}*"
embed = discord.Embed(
title=f"🎮 Résultats ProtonDB - **{total_games} jeu{'x' if total_games > 1 else ''} trouvé{'s' if total_games > 1 else ''}**",
description=content,
color=0x5865F2
)
try : try :
await message.channel.send(content=mention, embed=embed) await message.channel.send(embed=embed)
except Exception as e: except Exception as e:
logging.error(f"Échec de l'envoi de l'embed ProtonDB : {e}") logging.error(f"Échec de l'envoi de l'embed ProtonDB : {e}")

49
discordbot/moderation.py
View File

@@ -231,8 +231,8 @@ async def send_warning_confirmation(channel, target_user, reason: str, original_
color=discord.Color.orange(), color=discord.Color.orange(),
timestamp=datetime.now(timezone.utc) timestamp=datetime.now(timezone.utc)
) )
embed.add_field(name="👤 Utilisateur", value=f"{target_user.mention}\n`{target_user.id}`", inline=True) embed.add_field(name="👤 Utilisateur", value=f"**{target_user.name}**\n`{target_user.id}`", inline=True)
embed.add_field(name="🛡️ Modérateur", value=f"{original_message.author.mention}\n`{original_message.author.name}`", inline=True) embed.add_field(name="🛡️ Modérateur", value=f"**{original_message.author.name}**", inline=True)
embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True) embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True)
if reason != "Sans raison": if reason != "Sans raison":
embed.add_field(name="📝 Raison", value=reason, inline=False) embed.add_field(name="📝 Raison", value=reason, inline=False)
@@ -349,8 +349,8 @@ async def send_timeout_confirmation(channel, target_user, reason: str, timeout_s
color=discord.Color.orange(), color=discord.Color.orange(),
timestamp=datetime.now(timezone.utc) timestamp=datetime.now(timezone.utc)
) )
embed.add_field(name="👤 Utilisateur", value=f"{target_user.mention}\n`{target_user.id}`", inline=True) embed.add_field(name="👤 Utilisateur", value=f"**{target_user.name}**\n`{target_user.id}`", inline=True)
embed.add_field(name="🛡️ Modérateur", value=f"{original_message.author.mention}\n`{original_message.author.name}`", inline=True) embed.add_field(name="🛡️ Modérateur", value=f"**{original_message.author.name}**", inline=True)
embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True) embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True)
embed.add_field(name="⏱️ Durée", value=format_timeout_duration(timeout_seconds), inline=True) embed.add_field(name="⏱️ Durée", value=format_timeout_duration(timeout_seconds), inline=True)
if reason != "Sans raison": if reason != "Sans raison":
@@ -686,8 +686,8 @@ async def _process_ban_success(message: Message, target_user, reason: str, bot):
color=discord.Color.red(), color=discord.Color.red(),
timestamp=datetime.now(timezone.utc) timestamp=datetime.now(timezone.utc)
) )
embed.add_field(name="👤 Utilisateur", value=f"{target_user.mention}\n`{target_user.id}`", inline=True) embed.add_field(name="👤 Utilisateur", value=f"**{target_user.name}**\n`{target_user.id}`", inline=True)
embed.add_field(name="🛡️ Modérateur", value=f"{message.author.mention}\n`{message.author.name}`", inline=True) embed.add_field(name="🛡️ Modérateur", value=f"{message.author.name}", inline=True)
embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True) embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True)
if joined_days is not None: if joined_days is not None:
embed.add_field(name="⏱️ Membre depuis", value=format_days_to_age(joined_days), inline=True) embed.add_field(name="⏱️ Membre depuis", value=format_days_to_age(joined_days), inline=True)
@@ -801,9 +801,9 @@ async def _process_unban_success(message: Message, bot, target_user, discord_id:
color=discord.Color.green(), color=discord.Color.green(),
timestamp=datetime.now(timezone.utc) timestamp=datetime.now(timezone.utc)
) )
user_mention = target_user.mention if target_user else username user_display = f"**{target_user.name}**" if target_user else f"**{username}**"
embed.add_field(name="👤 Utilisateur", value=f"{user_mention}\n`{discord_id}`", inline=True) embed.add_field(name="👤 Utilisateur", value=f"{user_display}\n`{discord_id}`", inline=True)
embed.add_field(name="🛡️ Modérateur", value=f"{message.author.mention}\n`{message.author.name}`", inline=True) embed.add_field(name="🛡️ Modérateur", value=f"**{message.author.name}**", inline=True)
embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True) embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True)
if reason != "Sans raison": if reason != "Sans raison":
embed.add_field(name="📝 Raison", value=reason, inline=False) embed.add_field(name="📝 Raison", value=reason, inline=False)
@@ -1155,8 +1155,8 @@ async def _process_kick_success(message: Message, target_member, reason: str, bo
color=discord.Color.orange(), color=discord.Color.orange(),
timestamp=datetime.now(timezone.utc) timestamp=datetime.now(timezone.utc)
) )
embed.add_field(name="👤 Utilisateur", value=f"{target_member.mention}\n`{target_member.id}`", inline=True) embed.add_field(name="👤 Utilisateur", value=f"**{target_member.name}**\n`{target_member.id}`", inline=True)
embed.add_field(name="🛡️ Modérateur", value=f"{message.author.mention}\n`{message.author.name}`", inline=True) embed.add_field(name="🛡️ Modérateur", value=f"**{message.author.name}**", inline=True)
embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True) embed.add_field(name="📅 Date et heure", value=local_now.strftime('%d/%m/%Y à %H:%M'), inline=True)
if joined_days is not None: if joined_days is not None:
embed.add_field(name="⏱️ Membre depuis", value=format_days_to_age(joined_days), inline=True) embed.add_field(name="⏱️ Membre depuis", value=format_days_to_age(joined_days), inline=True)
@@ -1228,7 +1228,7 @@ def create_inspect_embed(user, member, join_date, days_on_server, account_age, w
) )
embed.set_thumbnail(url=user.display_avatar.url) embed.set_thumbnail(url=user.display_avatar.url)
embed.add_field(name="👤 Utilisateur", value=f"{user.mention}\n`{user.id}`", inline=True) embed.add_field(name="👤 Utilisateur", value=f"**{user.name}**\n`{user.id}`", inline=True)
if account_age is not None: if account_age is not None:
embed.add_field( embed.add_field(
@@ -1355,25 +1355,40 @@ async def handle_say_command(message: Message, bot):
if len(parts) < 3: if len(parts) < 3:
embed = discord.Embed( embed = discord.Embed(
title="📋 Utilisation de la commande", title="📋 Utilisation de la commande",
description="**Syntaxe :** `!say #channel message`", description="**Syntaxe :** `!say #channel message` ou `!say <id_salon> message`",
color=discord.Color.blue() color=discord.Color.blue()
) )
embed.add_field(name="Exemple", value="`!say #general Bonjour à tous !`", inline=False) embed.add_field(name="Exemples", value="`!say #general Bonjour à tous !`\n`!say 123456789 Annonce importante`", inline=False)
msg = await message.channel.send(embed=embed) msg = await message.channel.send(embed=embed)
asyncio.create_task(delete_after_delay(msg)) asyncio.create_task(delete_after_delay(msg))
return return
if not message.channel_mentions: target_channel = None
if message.channel_mentions:
target_channel = message.channel_mentions[0]
else:
try:
channel_id = int(parts[1])
target_channel = bot.get_channel(channel_id)
if not target_channel:
try:
target_channel = await bot.fetch_channel(channel_id)
except discord.NotFound:
pass
except ValueError:
pass
if not target_channel:
embed = discord.Embed( embed = discord.Embed(
title="❌ Erreur", title="❌ Erreur",
description="Vous devez mentionner un canal avec #", description="Vous devez mentionner un canal avec # ou fournir un ID de salon valide.",
color=discord.Color.red() color=discord.Color.red()
) )
msg = await message.channel.send(embed=embed) msg = await message.channel.send(embed=embed)
asyncio.create_task(delete_after_delay(msg)) asyncio.create_task(delete_after_delay(msg))
return return
target_channel = message.channel_mentions[0]
text_to_send = parts[2] text_to_send = parts[2]
try: try:

4
discordbot/welcome.py
View File

@@ -94,7 +94,7 @@ async def sendWelcomeMessage(bot: discord.Client, member: Member):
) )
embed.set_thumbnail(url=member.display_avatar.url) embed.set_thumbnail(url=member.display_avatar.url)
embed.add_field(name='Membre', value=member.mention, inline=True) embed.add_field(name='Membre', value=member.name, inline=True)
embed.add_field(name='Nombre de membres', value=str(member.guild.member_count), inline=True) embed.add_field(name='Nombre de membres', value=str(member.guild.member_count), inline=True)
embed.add_field(name='Invitation utilisée', value=invite_display, inline=False) embed.add_field(name='Invitation utilisée', value=invite_display, inline=False)
embed.set_footer(text=f'ID: {member.id}') embed.set_footer(text=f'ID: {member.id}')
@@ -179,7 +179,7 @@ async def sendLeaveMessage(bot: discord.Client, member: Member):
) )
embed.set_thumbnail(url=member.display_avatar.url) embed.set_thumbnail(url=member.display_avatar.url)
embed.add_field(name='Membre', value=f'{member.mention} ({member.name})', inline=True) embed.add_field(name='Membre', value=f'**{member.name}**', inline=True)
embed.add_field(name='Nombre de membres', value=str(member.guild.member_count), inline=True) embed.add_field(name='Nombre de membres', value=str(member.guild.member_count), inline=True)
embed.add_field(name='Temps sur le serveur', value=duration_text, inline=False) embed.add_field(name='Temps sur le serveur', value=duration_text, inline=False)
embed.set_footer(text=f'ID: {member.id}') embed.set_footer(text=f'ID: {member.id}')