Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/remove btr restock #272

Merged
merged 3 commits into from
Jan 16, 2024
Merged

Fix/remove btr restock #272

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84936d8
fix(restock): remove btr driver from restock alerts
MiguelMachado-dev Jan 14, 2024
a314175
refactor(restock): trader blacklist
MiguelMachado-dev Jan 14, 2024
3326574
Merge branch 'main' into fix/remove-btr-restock
Razzmatazzz Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions commands/restock.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const subCommands = {
const t = getFixedT(interaction.locale);
try {
//let prog = progress.getProgress(interaction.user.id);
const traders = await gameData.traders.getAll();
const traders = (await gameData.traders.getAll()).filter(trader => trader.normalizedName !== 'lightkeeper' && trader.normalizedName !== 'btr-driver');
const embed = new EmbedBuilder();
embed.setTitle(`${t('Trader restocks')} 🛒`);
//embed.setDescription(``);
Expand Down Expand Up @@ -118,7 +118,7 @@ const defaultFunction = {
.setNameLocalizations(getCommandLocalizations('trader'))
.setDescriptionLocalizations(getCommandLocalizations('trader_desc'))
.setRequired(true)
.setChoices(...gameData.traders.choices({all: true, blacklist: ['Fence', 'Lightkeeper']}))
.setChoices(...gameData.traders.choices({all: true, blacklist: ['Fence', 'Lightkeeper', 'BTR Driver']}))
)
.addBooleanOption(option => option
.setName('send_alert')
Expand All @@ -133,7 +133,7 @@ const defaultFunction = {
.setDescription('Announce trader restocks in a Discord channel')
.setNameLocalizations(getCommandLocalizations('channel'))
.setDescriptionLocalizations(getCommandLocalizations('restock_channel_desc'))
.addChannelOption(option =>
.addChannelOption(option =>
option.setName('channel')
.setDescription('The channel on this server in which to make announcements')
.setNameLocalizations(getCommandLocalizations('channel'))
Expand Down