ConfrerieDuKassoulait/Botanique
ConfrerieDuKassoulait/Botanique
2
0
Fork 0
Code Issues 22 Pull requests 3 Projects 1 Releases Packages 1 Activity Actions

chore: merge dev to main #177

Merged
Anri merged 6 commits from dev into main 2024-09-23 17:51:22 +02:00
Conversation 0 Commits 6 Files changed 13 +4 -7
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 29c832367f - Show all commits

5
src/events/message/messageCreate.ts
View file

@ -131,9 +131,9 @@ export default async (message: Message, client: Client) => {
} }
// Footer // Footer
let footer = `Posté le ${showDate(client.config.default_lang, loc, quoted_post!.createdAt)}`; let footer = `Posté le ${showDate(loc, quoted_post!.createdAt)}`;
if (quoted_post?.editedAt) { if (quoted_post?.editedAt) {
footer += ` et modifié le ${showDate(client.config.default_lang, loc, quoted_post.editedAt)}`; footer += ` et modifié le ${showDate(loc, quoted_post.editedAt)}`;
} }
let author = "Auteur"; let author = "Auteur";
@ -141,7 +141,6 @@ export default async (message: Message, client: Client) => {
author += " & Citateur"; author += " & Citateur";
} else { } else {
footer += `\nCité par ${userWithNickname(message.member!) ?? "?"} le ${showDate( footer += `\nCité par ${userWithNickname(message.member!) ?? "?"} le ${showDate(
client.config.default_lang,
loc, loc,
message.createdAt, message.createdAt,
)}`; )}`;

1
src/utils/reminder.ts
View file

@ -414,7 +414,6 @@ export const embedListReminders = async (
const expiration = `${loc.get("c_reminder8")} ${timeDeltaToString(remind.expiration_date)}`; const expiration = `${loc.get("c_reminder8")} ${timeDeltaToString(remind.expiration_date)}`;
embed.addFields({ embed.addFields({
name: `#${remind.id} • ${loc.get("c_reminder9")} ${showDate( name: `#${remind.id} • ${loc.get("c_reminder9")} ${showDate(
local,
loc, loc,
new Date(Number(remind.creation_date)), new Date(Number(remind.creation_date)),
)}\n${expiration}`, )}\n${expiration}`,

5
src/utils/time.ts
View file

@ -5,9 +5,8 @@
* @param date Date * @param date Date
* @returns String * @returns String
*/ */
export const showDate = (tz: string, locale: Map<string, unknown>, date: Date) => { export const showDate = (locale: Map<string, unknown>, date: Date) =>
return date.toLocaleString(tz).replace(" ", ` ${locale.get("u_time_at")} `); `${date.toDateString()} ${locale.get("u_time_at")} ${date.toTimeString().split(" ")[0]}`;
};
enum TimeSecond { enum TimeSecond {
Year = 31536000, Year = 31536000,