ConfrerieDuKassoulait/KassouBot
ConfrerieDuKassoulait/KassouBot
Archived
2
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

replace deprecated method

Browse source
This commit is contained in:
Mylloon 2021-06-07 21:58:34 +02:00
parent f697ff0643
commit b9393a87e0
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/cogs/citation.py
View file

@ -4,7 +4,7 @@ import os
from discord.ext import commands from discord.ext import commands
customTimezone = os.environ['TIMEZONE'] customTimezone = os.environ['TIMEZONE']
from utils.core import userOrNick from utils.core import userOrNick
from utils.time import goodTimezone from utils.time import timestampScreen
def setup(client): def setup(client):
client.add_cog(Citation(client)) client.add_cog(Citation(client))
@ -73,18 +73,14 @@ class Citation(commands.Cog):
embed.set_author(name = "Citation", icon_url = msgID.author.avatar_url) embed.set_author(name = "Citation", icon_url = msgID.author.avatar_url)
icon_url = message.author.avatar_url icon_url = message.author.avatar_url
date_1 = goodTimezone(msgID.created_at, customTimezone)
edit = ""
if msgID.edited_at: if msgID.edited_at:
date_edit = goodTimezone(msgID.edited_at, customTimezone) edit = f" et modifié le {timestampScreen(msgID.edited_at)}"
edit = f" et modifié le {date_edit[0][8:]}/{date_edit[0][5:-3]}/{date_edit[0][:4]} à {date_edit[1]}" else:
messageDuBas = f"Posté le {date_1[0][8:]}/{date_1[0][5:-3]}/{date_1[0][:4]} à {date_1[1]}{edit}" edit = ""
messageDuBas = f"Posté le {timestampScreen(msgID.created_at)}{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": if auteur == "Auteur":
messageDuBas = messageDuBas + f"\nCité par {userOrNick(message.author)} le {date_2}" messageDuBas = messageDuBas + f"\nCité par {userOrNick(message.author)} le {timestampScreen(message.created_at)}"
embed.set_footer(icon_url = icon_url, text = messageDuBas) embed.set_footer(icon_url = icon_url, text = messageDuBas)
if message.content == linkURL.replace(' ',''): if message.content == linkURL.replace(' ',''):
await message.channel.send(embed = embed) await message.channel.send(embed = embed)

7
src/utils/time.py
View file

@ -105,10 +105,3 @@ def ageLayout(tuple):
for i in affichage: for i in affichage:
message = message + f", {tuple[i]} {time[i]}" message = message + f", {tuple[i]} {time[i]}"
return message[2:] return message[2:]
def goodTimezone(date, tz, type = 0):
"""Renvoie une date en fonction d'un timezone"""
if type == 0:
return str(timezone(tz).fromutc(date))[:-13].replace('-', '/').split()
elif type == 1:
return str(timezone(tz).fromutc(date))[:-13].replace('-', '/').replace(' ', ' à ')