Fix mentions for articles, change layout a little more

Author: JulianVennen

src/commands/external/ArticleCommand.js

@@ -1,7 +1,6 @@
 import Command from '../Command.js';
 import GuildSettings from '../../settings/GuildSettings.js';
 import {
-    ActionRowBuilder,
     ButtonBuilder,
     ButtonStyle,
     MessageFlags,
@@ -165,54 +164,41 @@ export default class ArticleCommand extends Command {
         const message = new MessageBuilder();
 
         if (mention) {
-            message.content = `${userMention(mention)} this article from our help center might help you:`;
+            message.text(`${userMention(mention)} this article from our help center might help you:`)
+                .separator(false);
         }
 
-        const container = this.appendContent(message, results[index], article.body)
-            .endComponent()
-            .addSeparatorComponents()
-            .addActionRowComponents(
-                new ActionRowBuilder().addComponents(
-                    new StringSelectMenuBuilder()
-                        .setOptions(results)
-                        .setCustomId(`article:${userId}` + (mention ? `:${mention}` : ''))
-                ),
-                new ActionRowBuilder().addComponents(
-                    new ButtonBuilder()
-                        .setStyle(ButtonStyle.Link)
-                        .setURL(article.html_url)
-                        .setLabel('View Article')
-                ),
+        let string = this.#markdownConverter.generate(article.body);
+        let shorten = string.length > ARTICLE_EMBED_PREVIEW_LENGTH;
+        if (shorten) {
+            string = string.substring(0, ARTICLE_EMBED_PREVIEW_LENGTH)
+                .replace(/\n+[^\n]*$/, '');
+        }
+
+        message
+            .heading(article.title)
+            .text(string)
+            .separator()
+            .select(new StringSelectMenuBuilder()
+                .setOptions(results)
+                .setCustomId(`article:${userId}` + (mention ? `:${mention}` : ''))
             )
-            .toJSON();
+            .separator();
 
-        return {
-            components: [container],
-            flags: MessageFlags.IsComponentsV2,
-        };
-    }
 
-    /**
-     * get a description from the HTML body of an article
-     * @param {MessageBuilder} message
-     * @param {import('discord.js').APISelectMenuOption} result
-     * @param {string} body website body
-     * @returns {MessageBuilder}
-     */
-    appendContent(message, result, body) {
-        message.heading(result.label);
-
-        let string = this.#markdownConverter.generate(body);
-        if (string.length > ARTICLE_EMBED_PREVIEW_LENGTH) {
-            string = string.substring(0, ARTICLE_EMBED_PREVIEW_LENGTH);
-            message.text(string.replace(/\.?\n+.*$/, ''))
-                .newLine()
-                .newLine()
-                .subtext('To read more, click \'View Article\' below.');
-        } else {
-            message.text(string);
+        if (shorten) {
+            message.subtext('This is only a short preview of the article, Click \'View Article\' to read more.');
         }
 
-        return message;
+        message.button(new ButtonBuilder()
+            .setStyle(ButtonStyle.Link)
+            .setURL(article.html_url)
+            .setLabel('View Article')
+        );
+
+        return {
+            components: [message.endComponent()],
+            flags: MessageFlags.IsComponentsV2,
+        };
     }
 }

src/formatting/MessageBuilder.js

@@ -211,7 +211,6 @@ export default class MessageBuilder {
      */
     endComponent() {
         if (this.#content) {
-            // noinspection JSCheckFunctionSignatures
             this.#container.addTextDisplayComponents(new TextDisplayBuilder().setContent(this.#content));
             this.#content = '';
         }
@@ -224,7 +223,6 @@ export default class MessageBuilder {
      * @returns {MessageBuilder}
      */
     separator(divider = true, spacing = SeparatorSpacingSize.Small) {
-        // noinspection JSCheckFunctionSignatures
         this.endComponent().addSeparatorComponents(new SeparatorBuilder().setDivider(divider).setSpacing(spacing));
         return this;
     }
@@ -234,7 +232,15 @@ export default class MessageBuilder {
      * @returns {MessageBuilder}
      */
     button(...builder) {
-        // noinspection JSCheckFunctionSignatures
+        this.endComponent().addActionRowComponents(new ActionRowBuilder().addComponents(...builder));
+        return this;
+    }
+
+    /**
+     * @param {import('discord.js').SelectMenuBuilder} builder
+     * @returns {MessageBuilder}
+     */
+    select(...builder) {
         this.endComponent().addActionRowComponents(new ActionRowBuilder().addComponents(...builder));
         return this;
     }
@@ -244,7 +250,6 @@ export default class MessageBuilder {
      * @returns {MessageBuilder}
      */
     image(...builder) {
-        // noinspection JSCheckFunctionSignatures
         this.endComponent().addMediaGalleryComponents(new MediaGalleryBuilder().addItems(...builder));
         return this;
     }