From 3b86da0af8e0168b4099ec6ce72005fa3f99a208 Mon Sep 17 00:00:00 2001 From: toast-ts <96593068+toast-ts@users.noreply.github.com> Date: Tue, 3 Oct 2023 04:05:51 +1100 Subject: [PATCH] Add PalletLibrary helper --- src/commands/mp.ts | 25 ++++++++++++++++++++----- src/helpers/PalletLibrary.ts | 12 ++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 src/helpers/PalletLibrary.ts diff --git a/src/commands/mp.ts b/src/commands/mp.ts index 3f445a8..8e95c9b 100644 --- a/src/commands/mp.ts +++ b/src/commands/mp.ts @@ -2,6 +2,7 @@ import Discord from 'discord.js'; import TClient from '../client.js'; import path from 'node:path'; import canvas from 'canvas'; +import PalletLibrary from '../helpers/PalletLibrary.js'; import FormatPlayer from '../helpers/FormatPlayer.js'; import MessageTool from '../helpers/MessageTool.js'; import Logger from '../helpers/Logger.js'; @@ -15,7 +16,7 @@ const serverChoices = [ export default { async run(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){ - if (client.uptime < 35000) return interaction.reply('I have just restarted, please wait for MPLoop to finish initializing.') + if (client.uptime < 35000) return interaction.reply('I have just restarted, please wait for MPLoop to finish initializing.'); const serverSelector = interaction.options.getString('server'); if (['468835769092669461', '1149238561934151690'].includes(interaction.channelId) && !client.isStaff(interaction.member) && ['status', 'players'].includes(interaction.options.getSubcommand())) return interaction.reply('Please use <#739084625862852715> for `/mp status/players` commands to prevent clutter in this channel.').then(()=>setTimeout(()=>interaction.deleteReply(), 6000)); @@ -214,6 +215,12 @@ export default { .catch((err:Error)=>interaction.reply(`I got hit by a flying brick while trying to populate the server data:\n\`\`\`${err.message}\`\`\``)) } } + }, + pallets: async()=>{ + if (!endpoint) return console.log('Endpoint failed - pallets'); + const filter = endpoint.vehicles.filter(v=>v.type === 'pallet'); + if (filter.length < 1) return interaction.reply('There are no pallets on the server.'); + else interaction.reply(`There are currently ${filter.length} pallets on the server.\`\`\`\n${Object.values(PalletLibrary(endpoint)).map(t=>`${t.name.padEnd(12)}${t.size}`).join('\n')}\`\`\``) } })[interaction.options.getSubcommand()](); }, @@ -227,7 +234,7 @@ export default { .setName('server') .setDescription('The server to update') .setRequired(true) - .setChoices(serverChoices[0], serverChoices[1]))) + .setChoices(...serverChoices))) .addSubcommand(x=>x .setName('players') .setDescription('Display players on server') @@ -235,7 +242,7 @@ export default { .setName('server') .setDescription('The server to display players for') .setRequired(true) - .setChoices(serverChoices[0], serverChoices[1]))) + .setChoices(...serverChoices))) .addSubcommand(x=>x .setName('url') .setDescription('View or update the server URL') @@ -243,7 +250,7 @@ export default { .setName('server') .setDescription('The server to update') .setRequired(true) - .setChoices(serverChoices[0], serverChoices[1])) + .setChoices(...serverChoices)) .addStringOption(x=>x .setName('address') .setDescription('The URL to the dedicated-server-stats.json file') @@ -255,5 +262,13 @@ export default { .setName('server') .setDescription('The server to display information for') .setRequired(true) - .setChoices(serverChoices[0], serverChoices[1]))) + .setChoices(...serverChoices))) + .addSubcommand(x=>x + .setName('pallets') + .setDescription('Check total amount of pallets on the server') + .addStringOption(x=>x + .setName('server') + .setDescription('The server to get amount of pallets from') + .setRequired(true) + .setChoices(...serverChoices))) } diff --git a/src/helpers/PalletLibrary.ts b/src/helpers/PalletLibrary.ts new file mode 100644 index 0000000..43353e3 --- /dev/null +++ b/src/helpers/PalletLibrary.ts @@ -0,0 +1,12 @@ +import {FSData} from 'src/typings/interfaces'; + +export default (serverEndpoint:FSData)=>{ + const getAmount =(type:string)=>serverEndpoint.vehicles.filter(v=>v.type === 'pallet').map(v=>v.fills).flat().map(t=>t.type).filter(t=>t===type).length; + let palletTypeName = serverEndpoint.vehicles.filter(v=>v.type === 'pallet').map(v=>v.fills).flat().map(t=>t.type).filter((t,i,a)=>a.indexOf(t)===i).map(t=>({ + [t]:{ + name: t.toLowerCase().slice(0,1).toUpperCase()+t.toLowerCase().slice(1), + size: getAmount(t.toUpperCase()) + }, + })).reduce((a,b)=>({...a,...b})); + return palletTypeName; +}