From 664fdfcdb69636f046a13dde96e2a8fdfd117729 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 7 Jun 2021 00:02:34 +0200 Subject: [PATCH] =?UTF-8?q?d=C3=A9placement=20de=20citation=20vers=20son?= =?UTF-8?q?=20cogs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cogs/citation.py | 96 ++++++++++++++++++++++++++++++++++++++++++++ src/main.py | 82 +------------------------------------ 2 files changed, 97 insertions(+), 81 deletions(-) create mode 100644 src/cogs/citation.py diff --git a/src/cogs/citation.py b/src/cogs/citation.py new file mode 100644 index 0000000..34757e2 --- /dev/null +++ b/src/cogs/citation.py @@ -0,0 +1,96 @@ +import discord +import re +import os +from discord.ext import commands +customTimezone = os.environ['TIMEZONE'] +from utils.core import goodTimezone, userOrNick + +def setup(client): + client.add_cog(Citation(client)) + +class Citation(commands.Cog): + """Gère le système de citation.""" + def __init__(self, client): + self.client = client + + @commands.Cog.listener() + async def on_message(self, message): + urls = re.findall(r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', message.content) + httpsString = "https://" + channelsString = "discord.com/channels/" + for i in range(len(urls)): + if urls[i].startswith(f"{httpsString}{channelsString}") or urls[i].startswith(f"{httpsString}ptb.{channelsString}") or urls[i].startswith(f"{httpsString}canary.{channelsString}"): + link = urls[i] + linkURL = link + if link.startswith(f"{httpsString}{channelsString}"): + link = f'000{link}' + if link.startswith(f"{httpsString}ptb.{channelsString}"): + link = link[1:] + if link.startswith(f"{httpsString}canary.{channelsString}"): + link = link[4:] + if "@me" in urls[i]: + return await message.channel.send("Je ne cite pas les messages privés.", delete_after = 5) + try: + if int(link[32:-38]) == message.guild.id: + msgID = await self.client.get_channel(int(link[51:-19])).fetch_message(int(link[70:])) + couleur = 0x2f3136 + msgFiles = msgID.attachments + imageExtensions = ["jpg", "jpeg", "png", "webp", "gif"] + desc = msgID.content + if len(msgFiles) > 1: + listOfFiles = "" + for i in range(0, len(msgFiles)): + listOfFiles = f"{listOfFiles}, {msgFiles[i].filename}" + listOfFiles = listOfFiles[2:] + if len(msgID.content) > 0: + desc = f"{msgID.content}\n\nIl y a plusieurs fichiers dans ce message : {listOfFiles}" + else: + desc = f"Il y a plusieurs fichiers dans ce message : {listOfFiles}" + else: + if len(msgFiles) == 1: + if msgFiles[0].filename[-4:].split('.')[1] in imageExtensions: + if not len(msgID.content) > 0: + desc = f"Une image jointe : {msgFiles[0].filename}" + else: + linkFile = msgFiles[0].url + if not len(msgID.content) > 0: + desc = f"Un fichier joint : {msgFiles[0].filename}" + embed = discord.Embed(description = desc, colour = couleur) + auteur = "Auteur" + if message.author == msgID.author: + auteur = "Auteur & Citateur" + embed.add_field(name = auteur, value = msgID.author.mention, inline=True) + try: + if len(msgFiles) == 1: + if msgFiles[0].filename[-4:].split('.')[1] in imageExtensions: + embed.set_image(url=msgFiles[0].url) + else: + embed.add_field(name = "Fichier", value = f"[Lien]({linkFile})", inline=True) + except: + pass + embed.add_field(name = "Message", value = f"{msgID.channel.mention} - [Lien Message]({linkURL})", inline=True) + embed.set_author(name = "Citation", icon_url = msgID.author.avatar_url) + icon_url = message.author.avatar_url + + date_1 = goodTimezone(msgID.created_at, customTimezone) + edit = "" + if msgID.edited_at: + date_edit = goodTimezone(msgID.edited_at, customTimezone) + edit = f" et modifié le {date_edit[0][8:]}/{date_edit[0][5:-3]}/{date_edit[0][:4]} à {date_edit[1]}" + messageDuBas = f"Posté le {date_1[0][8:]}/{date_1[0][5:-3]}/{date_1[0][:4]} à {date_1[1]}{edit}" + + date_2 = goodTimezone(message.created_at, customTimezone) + date_2 = f"{date_2[0][8:]}/{date_2[0][5:-3]}/{date_2[0][:4]} à {date_2[1]}" + + if auteur == "Auteur": + messageDuBas = messageDuBas + f"\nCité par {userOrNick(message.author)} le {date_2}" + embed.set_footer(icon_url = icon_url, text = messageDuBas) + if message.content == linkURL.replace(' ',''): + await message.channel.send(embed = embed) + await message.delete() + else: + await message.reply(embed = embed, mention_author = False) + except Exception as e: + e = str(e) + if not "invalid literal for int() with base 10:" in e or not "404 Not Found (error code: 10008)" in e: # faute de frappe / message supprimé + print(e) diff --git a/src/main.py b/src/main.py index 3adaaf1..bc5d479 100644 --- a/src/main.py +++ b/src/main.py @@ -20,6 +20,7 @@ client.load_extension("cogs.music") client.load_extension("cogs.games") client.load_extension("cogs.fun") client.load_extension("cogs.school") +client.load_extension("cogs.citation") client.load_extension("cogs.confreriedukassoulait") # you can remove this cogs, only for my private guild Reminder().creationTable() print("Terminé !") @@ -51,87 +52,6 @@ async def on_message(message): ctx = await client.get_context(message) prefix = await client.get_prefix(message) await ctx.send(f">>> Coucou !\nMon préfix est `{prefix}` et ma commande d'aide est `{prefix}help`") - - """citation""" - urls = re.findall(r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', message.content) - httpsString = "https://" - channelsString = "discord.com/channels/" - for i in range(len(urls)): - if urls[i].startswith(f"{httpsString}{channelsString}") or urls[i].startswith(f"{httpsString}ptb.{channelsString}") or urls[i].startswith(f"{httpsString}canary.{channelsString}"): - link = urls[i] - linkURL = link - if link.startswith(f"{httpsString}{channelsString}"): - link = f'000{link}' - if link.startswith(f"{httpsString}ptb.{channelsString}"): - link = link[1:] - if link.startswith(f"{httpsString}canary.{channelsString}"): - link = link[4:] - if "@me" in urls[i]: - return await message.channel.send("Je ne cite pas les messages privés.", delete_after = 5) - try: - if int(link[32:-38]) == message.guild.id: - msgID = await client.get_channel(int(link[51:-19])).fetch_message(int(link[70:])) - couleur = 0x2f3136 - msgFiles = msgID.attachments - imageExtensions = ["jpg", "jpeg", "png", "webp", "gif"] - desc = msgID.content - if len(msgFiles) > 1: - listOfFiles = "" - for i in range(0, len(msgFiles)): - listOfFiles = f"{listOfFiles}, {msgFiles[i].filename}" - listOfFiles = listOfFiles[2:] - if len(msgID.content) > 0: - desc = f"{msgID.content}\n\nIl y a plusieurs fichiers dans ce message : {listOfFiles}" - else: - desc = f"Il y a plusieurs fichiers dans ce message : {listOfFiles}" - else: - if len(msgFiles) == 1: - if msgFiles[0].filename[-4:].split('.')[1] in imageExtensions: - if not len(msgID.content) > 0: - desc = f"Une image jointe : {msgFiles[0].filename}" - else: - linkFile = msgFiles[0].url - if not len(msgID.content) > 0: - desc = f"Un fichier joint : {msgFiles[0].filename}" - embed = discord.Embed(description = desc, colour = couleur) - auteur = "Auteur" - if message.author == msgID.author: - auteur = "Auteur & Citateur" - embed.add_field(name = auteur, value = msgID.author.mention, inline=True) - try: - if len(msgFiles) == 1: - if msgFiles[0].filename[-4:].split('.')[1] in imageExtensions: - embed.set_image(url=msgFiles[0].url) - else: - embed.add_field(name = "Fichier", value = f"[Lien]({linkFile})", inline=True) - except: - pass - embed.add_field(name = "Message", value = f"{msgID.channel.mention} - [Lien Message]({linkURL})", inline=True) - embed.set_author(name = "Citation", icon_url = msgID.author.avatar_url) - icon_url = message.author.avatar_url - - date_1 = goodTimezone(msgID.created_at, customTimezone) - edit = "" - if msgID.edited_at: - date_edit = goodTimezone(msgID.edited_at, customTimezone) - edit = f" et modifié le {date_edit[0][8:]}/{date_edit[0][5:-3]}/{date_edit[0][:4]} à {date_edit[1]}" - messageDuBas = f"Posté le {date_1[0][8:]}/{date_1[0][5:-3]}/{date_1[0][:4]} à {date_1[1]}{edit}" - - date_2 = goodTimezone(message.created_at, customTimezone) - date_2 = f"{date_2[0][8:]}/{date_2[0][5:-3]}/{date_2[0][:4]} à {date_2[1]}" - - if auteur == "Auteur": - messageDuBas = messageDuBas + f"\nCité par {userOrNick(message.author)} le {date_2}" - embed.set_footer(icon_url = icon_url, text = messageDuBas) - if message.content == linkURL.replace(' ',''): - await message.channel.send(embed = embed) - await message.delete() - else: - await message.reply(embed = embed, mention_author = False) - except Exception as e: - e = str(e) - if not "invalid literal for int() with base 10:" in e or not "404 Not Found (error code: 10008)" in e: # faute de frappe / message supprimé - print(e) print("Connexion à Discord...", end = " ") client.run(os.environ['TOKEN_DISCORD'])