From ed98ff7e2679f362f2657e77a6cf8dd3ce9b3d43 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Wed, 7 Sep 2022 21:33:37 -0400
Subject: clean up

---
 src/commands/utilities/price.ts      | 4 ++--
 src/commands/utilities/whoHasRole.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/commands/utilities')

diff --git a/src/commands/utilities/price.ts b/src/commands/utilities/price.ts
index 06afe3b..6f08aaa 100644
--- a/src/commands/utilities/price.ts
+++ b/src/commands/utilities/price.ts
@@ -1,4 +1,4 @@
-import { ArgType, BotCommand, colors, emojis, format, oxford, type CommandMessage } from '#lib';
+import { ArgType, BotCommand, colors, emojis, format, formatList, type CommandMessage } from '#lib';
 import assert from 'assert/strict';
 import { ApplicationCommandOptionType, AutocompleteInteraction, EmbedBuilder } from 'discord.js';
 import { default as Fuse } from 'fuse.js';
@@ -68,7 +68,7 @@ export default class PriceCommand extends BotCommand {
 		if (bazaar?.success === false) errors.push('bazaar');
 
 		if (errors.length) {
-			priceEmbed.setFooter({ text: `Could not fetch data for ${oxford(errors, 'and')}` });
+			priceEmbed.setFooter({ text: `Could not fetch data for ${formatList(errors, 'and')}` });
 		}
 
 		// create a set from all the item names so that there are no duplicates for the fuzzy search
diff --git a/src/commands/utilities/whoHasRole.ts b/src/commands/utilities/whoHasRole.ts
index 9b12a1c..c01a0c3 100644
--- a/src/commands/utilities/whoHasRole.ts
+++ b/src/commands/utilities/whoHasRole.ts
@@ -4,8 +4,8 @@ import {
 	chunk,
 	colors,
 	emojis,
+	formatList,
 	OptArgType,
-	oxford,
 	type CommandMessage,
 	type SlashMessage
 } from '#lib';
@@ -60,7 +60,7 @@ export default class WhoHasRoleCommand extends BotCommand {
 
 		const title = `Members with ${
 			roles.length < 4
-				? oxford(
+				? formatList(
 						rawRoles.map((r) => r.name),
 						'and'
 				  )
-- 
cgit