subdirectories in utils function, split the attachement handler into a function

src/buttons/misc/reminderList-next.ts

@@ -8,7 +8,7 @@ import {
 import { v4 as uuidv4 } from "uuid";
 import { getLocale } from "../../utils/locales";
 import { getFilename } from "../../utils/misc";
-import { embedListReminders } from "../../utils/reminder";
+import { embedListReminders } from "../../utils/commands/reminder";
 import { collect } from "../loader";
 
 export default {

src/buttons/misc/reminderList-prec.ts

@@ -8,7 +8,7 @@ import {
 import { v4 as uuidv4 } from "uuid";
 import { getLocale } from "../../utils/locales";
 import { getFilename } from "../../utils/misc";
-import { embedListReminders } from "../../utils/reminder";
+import { embedListReminders } from "../../utils/commands/reminder";
 import { collect } from "../loader";
 
 export default {

src/buttons/music/queueList-next.ts

@@ -10,8 +10,8 @@ import {
 import { v4 as uuidv4 } from "uuid";
 import { getLocale } from "../../utils/locales";
 import { getFilename } from "../../utils/misc";
-import { embedListQueue } from "../../utils/music";
 import { collect } from "../loader";
+import { embedListQueue } from "../../utils/commands/music";
 
 export default {
   data: {

src/buttons/music/queueList-prec.ts

@@ -10,8 +10,8 @@ import {
 import { v4 as uuidv4 } from "uuid";
 import { getLocale } from "../../utils/locales";
 import { getFilename } from "../../utils/misc";
-import { embedListQueue } from "../../utils/music";
 import { collect } from "../loader";
+import { embedListQueue } from "../../utils/commands/music";
 
 export default {
   data: {

src/commands/misc/reminder.ts

@@ -19,7 +19,7 @@ import {
   embedListReminders,
   getReminderInfo,
   newReminder,
-} from "../../utils/reminder";
+} from "../../utils/commands/reminder";
 
 export default {
   scope: () => [],

src/commands/music/queue.ts

@@ -12,7 +12,7 @@ import { v4 as uuidv4 } from "uuid";
 import { collect } from "../../buttons/loader";
 import { getLocale, getLocalizations } from "../../utils/locales";
 import { getFilename } from "../../utils/misc";
-import { embedListQueue } from "../../utils/music";
+import { embedListQueue } from "../../utils/commands/music";
 
 export default {
   scope: () => [],

src/events/client/ready.ts

@@ -8,7 +8,7 @@ import {
   sendReminder,
   setTimeoutReminder,
   updateReminder,
-} from "../../utils/reminder";
+} from "../../utils/commands/reminder";
 
 export const once = true;
 

src/events/message/messageCreate.ts

@@ -1,8 +1,9 @@
-import { APIEmbedField, Client, EmbedBuilder, Message, TextBasedChannel } from "discord.js";
+import { Client, EmbedBuilder, Message, TextBasedChannel } from "discord.js";
 import { getLocale } from "../../utils/locales";
-import { isImage, userWithNickname } from "../../utils/misc";
+import { userWithNickname } from "../../utils/misc";
 import { showDate } from "../../utils/time";
 import { RegexC, RegExpFlags } from "../../utils/regex";
+import { handleAttachements } from "../../utils/events/citation";
 
 /** https://discord.js.org/#/docs/discord.js/main/class/Client?scrollTo=e-messageCreate */
 export default async (message: Message, client: Client) => {
@@ -109,44 +110,7 @@ export default async (message: Message, client: Client) => {
 
       // Handle attachments
       if (quoted_post.attachments.size !== 0) {
-        if (quoted_post.attachments.size === 1 && isImage(quoted_post.attachments.first()!.name)) {
+        handleAttachements(loc, embed, quoted_post.attachments);
-          // Only contains one image
-          embed.setImage(quoted_post.attachments.first()!.url);
-        } else {
-          // Contains more than one image and/or other files
-
-          // We are currently losing a link to a file if the link is too long,
-          // but we can't do much about it
-          const maxFieldValueLength = 1024;
-          const files = quoted_post.attachments
-            .map((file) => `[${file.name}](${file.url})`)
-            .filter((link) => link.length <= maxFieldValueLength);
-
-          let currentField = "";
-          const fields: APIEmbedField[] = [];
-          let multiple = 0;
-          files.forEach((file, idx) => {
-            const fieldValue = currentField.length > 0 ? `${currentField}, ${file}` : file;
-
-            if (fieldValue.length > maxFieldValueLength || idx === files.length - 1) {
-              multiple = multiple === 0 && idx !== files.length - 1 ? 1 : multiple + 1;
-              fields.push({
-                name:
-                  loc.get(
-                    quoted_post.attachments.size > 1 && idx !== files.length - 1
-                      ? "e_attachements"
-                      : "e_attachement",
-                  ) + (multiple ? ` (${multiple})` : ""),
-                value: currentField,
-              });
-              currentField = file;
-            } else {
-              currentField = fieldValue;
-            }
-          });
-
-          embed.addFields(fields);
-        }
       }
 
       // Description as post content

src/modals/misc/reminderGUI.ts

@@ -1,6 +1,6 @@
 import { Client, ModalSubmitInteraction } from "discord.js";
 import { getFilename } from "../../utils/misc";
-import { newReminder } from "../../utils/reminder";
+import { newReminder } from "../../utils/commands/reminder";
 
 export default {
   data: {

src/tests/utils/commands/reminder.test.ts

@@ -1,4 +1,4 @@
-import { OptionReminder, splitTime } from "../../utils/reminder";
+import { OptionReminder, splitTime } from "../../../utils/commands/reminder";
 
 describe("Time splitter", () => {
   {

src/utils/commands/music.ts

@@ -1,8 +1,8 @@
 import { EmbedBuilder } from "@discordjs/builders";
 import { GuildQueue, QueueRepeatMode } from "discord-player";
 import { Client } from "discord.js";
-import { getLocale } from "./locales";
+import { getLocale } from "../locales";
-import { blank } from "./misc";
+import { blank } from "../misc";
 
 export const embedListQueue = (
   client: Client,

src/utils/commands/reminder.ts

@@ -1,8 +1,8 @@
 import { Client, Colors, EmbedBuilder, User } from "discord.js";
-import { getLocale } from "./locales";
+import { getLocale } from "../locales";
-import { blank, cleanCodeBlock } from "./misc";
+import { blank, cleanCodeBlock } from "../misc";
-import { showDate, strToSeconds, timeDeltaToString } from "./time";
+import { showDate, strToSeconds, timeDeltaToString } from "../time";
-import { RegexC, RegExpFlags } from "./regex";
+import { RegexC, RegExpFlags } from "../regex";
 
 /**
  * Option possible for reminders

src/utils/events/citation.ts

@@ -0,0 +1,45 @@
+import { APIEmbedField, Attachment, Collection, EmbedBuilder } from "discord.js";
+import { isImage } from "../misc";
+
+export const handleAttachements = (
+  loc: Map<string, string>,
+  embed: EmbedBuilder,
+  attachments: Collection<string, Attachment>,
+) => {
+  if (attachments.size === 1 && isImage(attachments.first()!.name)) {
+    // Only contains one image
+    embed.setImage(attachments.first()!.url);
+  } else {
+    // Contains more than one image and/or other files
+
+    // We are currently losing a link to a file if the link is too long,
+    // but we can't do much about it
+    const maxFieldValueLength = 1024;
+    const files = attachments
+      .map((file) => `[${file.name}](${file.url})`)
+      .filter((link) => link.length <= maxFieldValueLength);
+
+    let currentField = "";
+    const fields: APIEmbedField[] = [];
+    let multiple = 0;
+    files.forEach((file, idx) => {
+      const fieldValue = currentField.length > 0 ? `${currentField}, ${file}` : file;
+
+      if (fieldValue.length > maxFieldValueLength || idx === files.length - 1) {
+        multiple = multiple === 0 && idx !== files.length - 1 ? 1 : multiple + 1;
+        fields.push({
+          name:
+            loc.get(
+              attachments.size > 1 && idx !== files.length - 1 ? "e_attachements" : "e_attachement",
+            ) + (multiple ? ` (${multiple})` : ""),
+          value: currentField,
+        });
+        currentField = file;
+      } else {
+        currentField = fieldValue;
+      }
+    });
+
+    embed.addFields(fields);
+  }
+};