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

fix: time related issues #179

Merged
Anri merged 5 commits from fix-time into main 2024-09-24 18:07:27 +02:00
Conversation 0 Commits 5 Files changed 5 +82 -80
1 changed files with 82 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4667b668d5 - Show all commits

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

@ -98,21 +98,23 @@ export default async (message: Message, client: Client) => {
const loc = getLocale(client, client.config.default_lang);
// Remove duplicates then map the quoted posts
[...new Set(messages)].map((quoted_post) => {
[...new Set(messages)]
.filter((p) => p !== undefined)
.map((quoted_post) => {
const embed = new EmbedBuilder().setColor("#2f3136").setAuthor({
name: "Citation",
iconURL: quoted_post?.author.displayAvatarURL(),
iconURL: quoted_post.author.displayAvatarURL(),
});
// Handle attachments
if (quoted_post?.attachments.size !== 0) {
if (quoted_post?.attachments.size === 1 && isImage(quoted_post.attachments.first()!.name)) {
if (quoted_post.attachments.size !== 0) {
if (quoted_post.attachments.size === 1 && isImage(quoted_post.attachments.first()!.name)) {
// Only contains one image
embed.setImage(quoted_post.attachments.first()!.url);
} else {
// Contains more than one image and/or other files
let files = "";
quoted_post?.attachments.forEach((file) => (files += `[${file.name}](${file.url}), `));
quoted_post.attachments.forEach((file) => (files += `[${file.name}](${file.url}), `));
embed.addFields({
// TODO: Don't pluralize when there is only one file.
// TODO: Locales
@ -125,19 +127,19 @@ export default async (message: Message, client: Client) => {
}
// Description as post content
if (quoted_post?.content) {
if (quoted_post.content) {
// Only if content exists and length > 0
embed.setDescription(quoted_post?.content);
embed.setDescription(quoted_post.content);
}
// Footer
let footer = `Posté le ${showDate(loc, quoted_post!.createdAt)}`;
if (quoted_post?.editedAt) {
let footer = `Posté le ${showDate(loc, quoted_post.createdAt)}`;
if (quoted_post.editedAt) {
footer += ` et modifié le ${showDate(loc, quoted_post.editedAt)}`;
}
let author = "Auteur";
if (message.author === quoted_post?.author) {
if (message.author === quoted_post.author) {
author += " & Citateur";
} else {
footer += `\nCité par ${userWithNickname(message.member!) ?? "?"} le ${showDate(
@ -155,12 +157,12 @@ export default async (message: Message, client: Client) => {
embed.addFields(
{
name: author,
value: `${quoted_post?.author}`,
value: `${quoted_post.author}`,
inline: true,
},
{
name: "Message",
value: `${quoted_post?.channel} - [Lien Message](${quoted_post?.url})`,
value: `${quoted_post.channel} - [Lien Message](${quoted_post.url})`,
inline: true,
},
);