feat: extract quote formatting code

lesesalen · May 18, 2020 · b644dd2 · b644dd2
1 parent 9585a5b
commit b644dd2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/commands/fun/quote.ts b/src/commands/fun/quote.ts
@@ -1,9 +1,8 @@
 import { Command, CommandoClient, CommandoMessage } from "discord.js-commando";
 import { Message } from "discord.js";
-import dateFormat from "dateformat";
 
 import { Quote } from "../../types";
-import { loadMergedQuotes } from "../../modules/quotes";
+import { loadMergedQuotes, formatQuote } from "../../modules/quotes";
 
 class QuoteCommand extends Command {
   constructor(client: CommandoClient) {
@@ -19,9 +18,8 @@ class QuoteCommand extends Command {
   run = async (message: CommandoMessage): Promise<Message | Message[]> => {
     const quotes = await this.load();
     const quote = quotes[Math.floor(Math.random() * quotes.length)];
-    const date = dateFormat(new Date(quote.date), "fullDate");
 
-    return await message.say(`${quote.quote} -- ${quote.author} (${date})`);
+    return await message.say(formatQuote(quote));
   };
 
   load = async (): Promise<Quote[]> => {

diff --git a/src/commands/utils/listquotes.ts b/src/commands/utils/listquotes.ts
@@ -1,7 +1,7 @@
 import { Command, CommandoClient, CommandoMessage } from "discord.js-commando";
 import { Message } from "discord.js";
 
-import { loadMergedQuotes } from "../../modules/quotes";
+import { loadMergedQuotes, formatQuote } from "../../modules/quotes";
 
 class ListQuotesCommand extends Command {
   constructor(client: CommandoClient) {
@@ -17,13 +17,13 @@ class ListQuotesCommand extends Command {
   run = async (message: CommandoMessage): Promise<Message | Message[]> => {
     const quotes = await loadMergedQuotes();
 
-    let reply = "";
-    reply += `You requested all of our quotes, enjoy!\n`;
-    for (const quote of quotes) {
-      reply += `> ${quote.quote} -- ${quote.author} (${quote.date})\n\n`;
-    }
-
     await message.say("Alright! Sneaking the list into your DMs");
+
+    await message.author.send(`You requested all of our quotes, enjoy! (its limited to the last 25 sadly)\n`);
+    const reply = quotes
+      .slice(quotes.length - 25, quotes.length)
+      .map((q) => `> ${formatQuote(q)}\n`)
+      .join("\n");
     return await message.author.send(reply);
   };
 }

diff --git a/src/modules/quotes.ts b/src/modules/quotes.ts
@@ -1,4 +1,5 @@
 import path from "path";
+import dateFormat from "dateformat";
 
 import { Quote } from "../types";
 import { loadJson } from "../utils";
@@ -20,3 +21,9 @@ export const loadMergedQuotes = async (): Promise<Quote[]> => {
 
   return q1.concat(q2);
 };
+
+export const formatQuote = (quote: Quote): string => {
+  const date = dateFormat(new Date(quote.date), "fullDate");
+
+  return `${quote.quote} -- ${quote.author} (${date})`;
+};