toast/Daggerbot-TS
toast/Daggerbot-TS
1
0
Fork 0
mirror of https://github.com/toast-ts/Daggerbot-TS.git synced 2024-11-18 00:31:00 -05:00
Code Activity

Compare commits

base: toast:e0c79f92cd427eff1592834a8884e06516ddc946
Branches Tags
toast:dependabot/npm_and_yarn/napi-rs/canvas-0.1.62
toast:temp
toast:master
toast:old
..
compare: toast:eeb4ed4d80018b129d294e9a1686635d47943897
Branches Tags
toast:dependabot/npm_and_yarn/napi-rs/canvas-0.1.62
toast:temp
toast:master
toast:old

2 Commits
e0c79f92cd ... eeb4ed4d80

Author SHA1 Message Date
toast-ts
eeb4ed4d80 Fix Unknown Interaction flood in console 2024-04-21 13:27:57 +10:00
toast-ts
843df43861 Attempt to fix partial response from Multifarm 2024-04-21 12:53:37 +10:00
2 changed files with 12 additions and 10 deletions
Show Stats Expand all files Collapse all files

20
src/commands/mp.ts
View File

@ -11,12 +11,13 @@ import {requestServerData, mpModuleDisabled, refreshTimerSecs, playtimeStat, MPC
async function fetchData(client:TClient, interaction:Discord.ChatInputCommandInteraction, serverName:string):Promise<FSData|Discord.InteractionResponse> { async function fetchData(client:TClient, interaction:Discord.ChatInputCommandInteraction, serverName:string):Promise<FSData|Discord.InteractionResponse> {
try { try {
await interaction.deferReply();
const db = await client.MPServer.findInCache(); const db = await client.MPServer.findInCache();
const data = await requestServerData(client, db.find(x=>x.serverName === serverName)); const data = await requestServerData(client, db.find(x=>x.serverName === serverName));
return data.dss as FSData; return data.dss as FSData;
} catch { } catch {
Logger.console('error', 'MPDB', 'Function failed - fetchData'); Logger.console('error', 'MPDB', 'Function failed - fetchData');
return interaction.reply('Ran into a '+RanIntoHumor()+' while trying to retrieve server data, please try again later.'); await interaction.editReply(`Ran into a ${RanIntoHumor()} while trying to retrieve server data, please try again later.`);
} }
} }
@ -58,7 +59,7 @@ export default class MP {
for (const player of DSS.slots.players.filter(x=>x.isUsed)) players.push(playtimeStat(player)) for (const player of DSS.slots.players.filter(x=>x.isUsed)) players.push(playtimeStat(player))
let attachmentName:string = 'MPModule.jpg'; let attachmentName:string = 'MPModule.jpg';
await interaction.reply({embeds:[new client.embed() await interaction.editReply({embeds:[new client.embed()
.setTitle(DSS.server?.name.length > 0 ? DSS.server.name : 'Offline') .setTitle(DSS.server?.name.length > 0 ? DSS.server.name : 'Offline')
.setColor(embedColor) .setColor(embedColor)
.setDescription(DSS?.slots?.used < 1 ? '*Nobody is playing*' : players.join('\n\n')) .setDescription(DSS?.slots?.used < 1 ? '*Nobody is playing*' : players.join('\n\n'))
@ -71,6 +72,7 @@ export default class MP {
details: async()=>{ details: async()=>{
const DSS = await fetchData(client, interaction, choiceSelector) as FSData; const DSS = await fetchData(client, interaction, choiceSelector) as FSData;
if (!DSS) return console.log('Endpoint failed - details'); if (!DSS) return console.log('Endpoint failed - details');
const db = await client.MPServer.findInCache(); const db = await client.MPServer.findInCache();
const server = db.find(x=>x.serverName === choiceSelector); const server = db.find(x=>x.serverName === choiceSelector);
if (!server) return; if (!server) return;
@ -86,13 +88,13 @@ export default class MP {
`Please see <#${MPChannels.serverInfo}> for more additional information and rules.` `Please see <#${MPChannels.serverInfo}> for more additional information and rules.`
)); ));
if (DSS.server?.name.length < 1) dEmbed.setFooter({text: 'Server is currently offline'}); if (DSS.server?.name.length < 1) dEmbed.setFooter({text: 'Server is currently offline'});
DSS.server ? await interaction.reply({embeds: [dEmbed]}) : null; DSS.server ? await interaction.editReply({embeds: [dEmbed]}) : null;
}, },
status: async()=>{ status: async()=>{
const DSS = await fetchData(client, interaction, choiceSelector) as FSData; const DSS = await fetchData(client, interaction, choiceSelector) as FSData;
if (!DSS) return console.log('Endpoint failed - status'); if (!DSS) return console.log('Endpoint failed - status');
DSS.server ? await interaction.reply({embeds: [new client.embed().setColor(client.config.embedColor).addFields( DSS.server ? await interaction.editReply({embeds: [new client.embed().setColor(client.config.embedColor).addFields(
{name: 'Name', value: `\`${DSS.server?.name.length > 0 ? DSS.server.name : 'Offline'}\``}, {name: 'Name', value: `\`${DSS.server?.name.length > 0 ? DSS.server.name : 'Offline'}\``},
{name: 'Players', value: `${DSS?.slots.used}/${DSS?.slots.capacity}`}, {name: 'Players', value: `${DSS?.slots.used}/${DSS?.slots.capacity}`},
{name: 'Map', value: DSS.server?.mapName.length > 0 ? DSS.server.mapName : 'No map'} {name: 'Map', value: DSS.server?.mapName.length > 0 ? DSS.server.mapName : 'No map'}
@ -108,10 +110,10 @@ export default class MP {
few: 'pallets', few: 'pallets',
other: 'pallets' other: 'pallets'
}[new Intl.PluralRules('en', {type: 'ordinal'}).select(filter.length)]; }[new Intl.PluralRules('en', {type: 'ordinal'}).select(filter.length)];
if (filter.length < 1) return interaction.reply('No pallets found on the server.'); if (filter.length < 1) return interaction.editReply('No pallets found on the server.');
else { else {
const getLongestName = Object.entries(PalletLibrary(DSS)).map(([name, _])=>name.length).sort((a,b)=>b-a)[0]; const getLongestName = Object.entries(PalletLibrary(DSS)).map(([name, _])=>name.length).sort((a,b)=>b-a)[0];
await interaction.reply(MessageTool.concatMessage( await interaction.editReply(MessageTool.concatMessage(
`There are currently **${filter.length}** ${rules} on the server. Here\'s the breakdown:\`\`\`ansi`, `There are currently **${filter.length}** ${rules} on the server. Here\'s the breakdown:\`\`\`ansi`,
Object.entries(PalletLibrary(DSS)).map(([name, count])=>`${ansi.blue(name.padEnd(getLongestName+3))}${ansi.yellow(count.toString())}`).join('\n'), Object.entries(PalletLibrary(DSS)).map(([name, count])=>`${ansi.blue(name.padEnd(getLongestName+3))}${ansi.yellow(count.toString())}`).join('\n'),
'```' '```'
@ -196,7 +198,7 @@ export default class MP {
code: stripURL[1] code: stripURL[1]
}; };
Logger.console('log', logPrefix, `Updating the IP for "${choiceSelector}" to ${stripped.ip}`) Logger.console('log', logPrefix, `Updating the IP to ${stripped.ip} for "${choiceSelector}"`)
await client.MPServer.addServer(choiceSelector, stripped.ip, stripped.code); await client.MPServer.addServer(choiceSelector, stripped.ip, stripped.code);
await interaction.reply(`**${choiceSelector}**'s entry has been successfully created!`); await interaction.reply(`**${choiceSelector}**'s entry has been successfully created!`);
} }
@ -206,7 +208,7 @@ export default class MP {
if (!interaction.member.roles.cache.has(client.config.dcServer.roles.mpmanager) && !client.config.whitelist.includes(interaction.member.id)) return MessageTool.youNeedRole(interaction, 'mpmanager'); if (!interaction.member.roles.cache.has(client.config.dcServer.roles.mpmanager) && !client.config.whitelist.includes(interaction.member.id)) return MessageTool.youNeedRole(interaction, 'mpmanager');
} }
try { try {
Logger.console('log', logPrefix, `Removing "${choiceSelector}" from database`) Logger.console('log', logPrefix, `Removing "${choiceSelector}" from the database`)
await client.MPServer.removeServer(choiceSelector); await client.MPServer.removeServer(choiceSelector);
await interaction.reply(`**${choiceSelector}**'s entry has been successfully removed!`); await interaction.reply(`**${choiceSelector}**'s entry has been successfully removed!`);
} catch { } catch {
@ -219,7 +221,7 @@ export default class MP {
if (!interaction.member.roles.cache.has(client.config.dcServer.roles.mpmanager) && !client.config.whitelist.includes(interaction.member.id)) return MessageTool.youNeedRole(interaction, 'mpmanager'); if (!interaction.member.roles.cache.has(client.config.dcServer.roles.mpmanager) && !client.config.whitelist.includes(interaction.member.id)) return MessageTool.youNeedRole(interaction, 'mpmanager');
} }
const toggleFlag = interaction.options.getBoolean('is_active'); const toggleFlag = interaction.options.getBoolean('is_active');
Logger.console('log', logPrefix, `Toggling isActive flag for "${choiceSelector}" to ${toggleFlag}`); Logger.console('log', logPrefix, `Setting isActive flag to ${toggleFlag} for "${choiceSelector}"`);
await client.MPServer.toggleServerUsability(choiceSelector, toggleFlag).then(async()=>await interaction.reply(`**${choiceSelector}** is now ${toggleFlag ? 'visible to' : 'hidden from'} public`)); await client.MPServer.toggleServerUsability(choiceSelector, toggleFlag).then(async()=>await interaction.reply(`**${choiceSelector}** is now ${toggleFlag ? 'visible to' : 'hidden from'} public`));
} }
})[interaction.options.getSubcommand() ?? interaction.options.getSubcommandGroup()](); })[interaction.options.getSubcommand() ?? interaction.options.getSubcommandGroup()]();

2
src/modules/MPModule.ts
View File

@ -170,7 +170,7 @@ export async function requestServerData(client:TClient, server:IServerExt):Promi
]); ]);
const dss = DSSR.status === 'fulfilled' && DSSR.value && DSSR.value.server ? DSSR.value : null; const dss = DSSR.status === 'fulfilled' && DSSR.value && DSSR.value.server ? DSSR.value : null;
const csg = CSGR.status === 'fulfilled' && CSGR.value && CSGR.value.slotSystem ? CSGR.value : null; const csg = CSGR.status === 'fulfilled' && CSGR.value && CSGR.value.slotSystem ? CSGR.value : null;
if (dss && csg) return {dss, csg}; if (dss || csg) return {dss, csg};
else return null; else return null;
} catch(err) { } catch(err) {
Logger.console('log', loggingPrefix, `Couldn't request ${server.serverName} for data: ${err.message}`); Logger.console('log', loggingPrefix, `Couldn't request ${server.serverName} for data: ${err.message}`);