fix: time related issues #179
5 changed files with 235 additions and 1049 deletions
1105
package-lock.json
generated
1105
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -25,7 +25,6 @@
|
||||||
"discord-player": "^6.7.1",
|
"discord-player": "^6.7.1",
|
||||||
"discord.js": "^14.16.2",
|
"discord.js": "^14.16.2",
|
||||||
"mediaplex": "^0.0.9",
|
"mediaplex": "^0.0.9",
|
||||||
"puppeteer": "^23.4.0",
|
|
||||||
"sqlite3": "^5.1.7",
|
"sqlite3": "^5.1.7",
|
||||||
"typescript": "^5.6.2",
|
"typescript": "^5.6.2",
|
||||||
"uuid": "^10.0.0"
|
"uuid": "^10.0.0"
|
||||||
|
|
|
@ -98,21 +98,23 @@ export default async (message: Message, client: Client) => {
|
||||||
const loc = getLocale(client, client.config.default_lang);
|
const loc = getLocale(client, client.config.default_lang);
|
||||||
|
|
||||||
// Remove duplicates then map the quoted posts
|
// 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({
|
const embed = new EmbedBuilder().setColor("#2f3136").setAuthor({
|
||||||
name: "Citation",
|
name: "Citation",
|
||||||
iconURL: quoted_post?.author.displayAvatarURL(),
|
iconURL: quoted_post.author.displayAvatarURL(),
|
||||||
});
|
});
|
||||||
|
|
||||||
// Handle attachments
|
// Handle attachments
|
||||||
if (quoted_post?.attachments.size !== 0) {
|
if (quoted_post.attachments.size !== 0) {
|
||||||
if (quoted_post?.attachments.size === 1 && isImage(quoted_post.attachments.first()!.name)) {
|
if (quoted_post.attachments.size === 1 && isImage(quoted_post.attachments.first()!.name)) {
|
||||||
// Only contains one image
|
// Only contains one image
|
||||||
embed.setImage(quoted_post.attachments.first()!.url);
|
embed.setImage(quoted_post.attachments.first()!.url);
|
||||||
} else {
|
} else {
|
||||||
// Contains more than one image and/or other files
|
// Contains more than one image and/or other files
|
||||||
let 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({
|
embed.addFields({
|
||||||
// TODO: Don't pluralize when there is only one file.
|
// TODO: Don't pluralize when there is only one file.
|
||||||
// TODO: Locales
|
// TODO: Locales
|
||||||
|
@ -125,22 +127,31 @@ export default async (message: Message, client: Client) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Description as post content
|
// Description as post content
|
||||||
if (quoted_post?.content) {
|
if (quoted_post.content) {
|
||||||
// Only if content exists and length > 0
|
// Only if content exists and length > 0
|
||||||
embed.setDescription(quoted_post?.content);
|
embed.setDescription(quoted_post.content);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Footer
|
// Footer
|
||||||
let footer = `Posté le ${showDate(loc, quoted_post!.createdAt)}`;
|
let footer = `Posté le ${showDate(
|
||||||
if (quoted_post?.editedAt) {
|
message.guild?.preferredLocale ?? client.config.default_lang,
|
||||||
footer += ` et modifié le ${showDate(loc, quoted_post.editedAt)}`;
|
loc,
|
||||||
|
quoted_post.createdAt,
|
||||||
|
)}`;
|
||||||
|
if (quoted_post.editedAt) {
|
||||||
|
footer += ` et modifié le ${showDate(
|
||||||
|
message.guild?.preferredLocale ?? client.config.default_lang,
|
||||||
|
loc,
|
||||||
|
quoted_post.editedAt,
|
||||||
|
)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
let author = "Auteur";
|
let author = "Auteur";
|
||||||
if (message.author === quoted_post?.author) {
|
if (message.author === quoted_post.author) {
|
||||||
author += " & Citateur";
|
author += " & Citateur";
|
||||||
} else {
|
} else {
|
||||||
footer += `\nCité par ${userWithNickname(message.member!) ?? "?"} le ${showDate(
|
footer += `\nCité par ${userWithNickname(message.member!) ?? "?"} le ${showDate(
|
||||||
|
message.guild?.preferredLocale ?? client.config.default_lang,
|
||||||
loc,
|
loc,
|
||||||
message.createdAt,
|
message.createdAt,
|
||||||
)}`;
|
)}`;
|
||||||
|
@ -155,12 +166,12 @@ export default async (message: Message, client: Client) => {
|
||||||
embed.addFields(
|
embed.addFields(
|
||||||
{
|
{
|
||||||
name: author,
|
name: author,
|
||||||
value: `${quoted_post?.author}`,
|
value: `${quoted_post.author}`,
|
||||||
inline: true,
|
inline: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Message",
|
name: "Message",
|
||||||
value: `${quoted_post?.channel} - [Lien Message](${quoted_post?.url})`,
|
value: `${quoted_post.channel} - [Lien Message](${quoted_post.url})`,
|
||||||
inline: true,
|
inline: true,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
@ -414,6 +414,7 @@ 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,10 +5,8 @@
|
||||||
* @param date Date
|
* @param date Date
|
||||||
* @returns String
|
* @returns String
|
||||||
*/
|
*/
|
||||||
export const showDate = (locale: Map<string, unknown>, date: Date) => {
|
export const showDate = (tz: string, locale: Map<string, unknown>, date: Date) =>
|
||||||
const timezoned = new Date(date.getTime());
|
date.toLocaleString(tz).replace(" ", ` ${locale.get("u_time_at")} `);
|
||||||
return `${timezoned.toDateString()} ${locale.get("u_time_at")} ${timezoned.toTimeString().split(" ")[0]}`;
|
|
||||||
};
|
|
||||||
|
|
||||||
enum TimeSecond {
|
enum TimeSecond {
|
||||||
Year = 31536000,
|
Year = 31536000,
|
||||||
|
|
Loading…
Reference in a new issue