Skip to content

Commit

Permalink
Update dependencies for bot
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexemanuelol
alexemanuelol committed Aug 4, 2022
1 parent fb07279 commit 735d041
Show file tree
Hide file tree
Showing 9 changed files with 5,178 additions and 5,064 deletions.
10,013 changes: 5,000 additions & 5,013 deletions package-lock.json
View file

Large diffs are not rendered by default.

17 changes: 11 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"description": "A NodeJS Discord Bot that uses the rustplus.js library to utilize the power of the Rust+ Companion App with additional Quality-of-Life features.",
"main": "index.js",
"scripts": {
"run": "node ."
"run": "node .",
"preinstall": "npx npm-force-resolutions"
},
"repository": {
"type": "git",
Expand All @@ -17,16 +18,20 @@
},
"homepage": "https://github.com/alexemanuelol/rustPlusPlus#readme",
"dependencies": {
"@discordjs/builders": "^0.6.0",
"@discordjs/rest": "^0.1.1-canary.0",
"discord.js": "^13.6.0",
"discord-api-types": "^0.23.1",
"@discordjs/builders": "^1.1.0",
"@discordjs/rest": "^1.0.1",
"discord.js": "^13.9.2",
"discord-api-types": "^0.37.1",
"colors": "^1.4.0",
"rustplus.js": "github:liamcottle/rustplus.js",
"winston": "^3.3.3",
"push-receiver": "^2.1.1",
"lodash": "^4.0.0",
"axios": "^0.26.1",
"jimp": "^0.16.1"
},
"resolutions": {
"uuid": "^8.3.2",
"jpeg-js": "^0.4.4"
}
}
}
82 changes: 66 additions & 16 deletions src/commands/alarm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,72 @@ module.exports = {
option.setName('image')
.setDescription('Set the image that best represent the Smart Alarm.')
.setRequired(false)
.addChoice('Autoturret', 'autoturret')
.addChoice('Boom Box', 'boombox')
.addChoice('Broadcaster', 'broadcaster')
.addChoice('Ceiling Light', 'ceiling_light')
.addChoice('Discofloor', 'discofloor')
.addChoice('Door Controller', 'door_controller')
.addChoice('Elevator', 'elevator')
.addChoice('HBHF Sensor', 'hbhf_sensor')
.addChoice('Heater', 'heater')
.addChoice('SAM site', 'samsite')
.addChoice('Siren Light', 'siren_light')
.addChoice('Smart Alarm', 'smart_alarm')
.addChoice('Smart Switch', 'smart_switch')
.addChoice('Sprinkler', 'sprinkler')
.addChoice('Storage Monitor', 'storage_monitor')
.addChoice('Christmas Lights', 'xmas_light'))),
.addChoices(
{
name: 'Autoturret',
value: 'autoturret'
},
{
name: 'Boom Box',
value: 'boombox'
},
{
name: 'Broadcaster',
value: 'broadcaster'
},
{
name: 'Ceiling Light',
value: 'ceiling_light'
},
{
name: 'Discofloor',
value: 'discofloor'
},
{
name: 'Door Controller',
value: 'door_controller'
},
{
name: 'Elevator',
value: 'elevator'
},
{
name: 'HBHF Sensor',
value: 'hbhf_sensor'
},
{
name: 'Heater',
value: 'heater'
},
{
name: 'SAM site',
value: 'samsite'
},
{
name: 'Siren Light',
value: 'siren_light'
},
{
name: 'Smart Alarm',
value: 'smart_alarm'
},
{
name: 'Smart Switch',
value: 'smart_switch'
},
{
name: 'Sprinkler',
value: 'sprinkler'
},
{
name: 'Storage Monitor',
value: 'storage_monitor'
},
{
name: 'Christmas Lights',
value: 'xmas_light'
}
))),

async execute(client, interaction) {
let instance = client.readInstanceFile(interaction.guildId);
Expand Down
18 changes: 12 additions & 6 deletions src/commands/players.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,22 @@ module.exports = {
}
}
else if (playerIndex === 1) {
embed.addField('Players', playerColumns[0], true);
embed.addFields({
name: 'Players', value: playerColumns[0], inline: true
});
}
else if (playerIndex === 2) {
embed.addField('Players', playerColumns[0], true);
embed.addField('\u200B', playerColumns[1], true);
embed.addFields(
{ name: 'Players', value: playerColumns[0], inline: true },
{ name: '\u200B', value: playerColumns[1], inline: true }
);
}
else if (playerIndex >= 3) {
embed.addField('Players', playerColumns[0], true);
embed.addField('\u200B', playerColumns[1], true);
embed.addField('\u200B', playerColumns[2], true);
embed.addFields(
{ name: 'Players', value: playerColumns[0], inline: true },
{ name: '\u200B', value: playerColumns[1], inline: true },
{ name: '\u200B', value: playerColumns[2], inline: true }
);
}

if (description === '' && isFull) {
Expand Down
22 changes: 18 additions & 4 deletions src/commands/storagemonitor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,24 @@ module.exports = {
option.setName('image')
.setDescription('Set the image that best represent the Storage Monitor.')
.setRequired(false)
.addChoice('Storage Monitor', 'storage_monitor')
.addChoice('Tool Cupboard', 'tool_cupboard')
.addChoice('Large Wood Box', 'large_wood_box')
.addChoice('Vending Machine', 'vending_machine')))
.addChoices(
{
name: 'Storage Monitor',
value: 'storage_monitor'
},
{
name: 'Tool Cupboard',
value: 'tool_cupboard'
},
{
name: 'Large Wood Box',
value: 'large_wood_box'
},
{
name: 'Vending Machine',
value: 'vending_machine'
}
)))
.addSubcommand(subcommand =>
subcommand
.setName('recycle')
Expand Down
81 changes: 65 additions & 16 deletions src/commands/switch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,71 @@ module.exports = {
option.setName('image')
.setDescription('Set the image that best represent the Smart Switch.')
.setRequired(false)
.addChoice('Autoturret', 'autoturret')
.addChoice('Boom Box', 'boombox')
.addChoice('Broadcaster', 'broadcaster')
.addChoice('Ceiling Light', 'ceiling_light')
.addChoice('Discofloor', 'discofloor')
.addChoice('Door Controller', 'door_controller')
.addChoice('Elevator', 'elevator')
.addChoice('HBHF Sensor', 'hbhf_sensor')
.addChoice('Heater', 'heater')
.addChoice('SAM site', 'samsite')
.addChoice('Siren Light', 'siren_light')
.addChoice('Smart Alarm', 'smart_alarm')
.addChoice('Smart Switch', 'smart_switch')
.addChoice('Sprinkler', 'sprinkler')
.addChoice('Storage Monitor', 'storage_monitor')
.addChoice('Christmas Lights', 'xmas_light')))
.addChoices(
{
name: 'Autoturret',
value: 'autoturret'
},
{
name: 'Boom Box',
value: 'boombox'
},
{
name: 'Broadcaster',
value: 'broadcaster'
},
{
name: 'Ceiling Light',
value: 'ceiling_light'
},
{
name: 'Discofloor',
value: 'discofloor'
},
{
name: 'Door Controller',
value: 'door_controller'
},
{
name: 'Elevator',
value: 'elevator'
},
{
name: 'HBHF Sensor',
value: 'hbhf_sensor'
},
{
name: 'Heater',
value: 'heater'
},
{
name: 'SAM site',
value: 'samsite'
},
{
name: 'Siren Light',
value: 'siren_light'
},
{
name: 'Smart Alarm',
value: 'smart_alarm'
},
{
name: 'Smart Switch',
value: 'smart_switch'
},
{
name: 'Sprinkler',
value: 'sprinkler'
},
{
name: 'Storage Monitor',
value: 'storage_monitor'
},
{
name: 'Christmas Lights',
value: 'xmas_light'
})))
.addSubcommand(subcommand =>
subcommand
.setName('create_group')
Expand Down
1 change: 0 additions & 1 deletion src/credentialApplication/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,4 @@
"got": "^12.3.0",
"glob-parent": "^6.0.2"
}

}
6 changes: 5 additions & 1 deletion src/discordTools/discordTools.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,11 @@ module.exports = {
.setThumbnail(`${instance.serverList[id].img}`);

if (instance.serverList[id].connect !== null) {
embed.addField('Connect', `\`${instance.serverList[id].connect}\``, true);
embed.addFields({
name: 'Connect',
value: `\`${instance.serverList[id].connect}\``,
inline: true
});
}

return embed;
Expand Down
2 changes: 1 addition & 1 deletion src/handlers/informationHandler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ module.exports = {
{ name: '\u200B', value: '\u200B', inline: true });
}
else {
embed.addField('\u200B', '\u200B');
embed.addFields({ name: '\u200B', value: '\u200B', inline: false });
}

embed.addFields(
Expand Down

0 comments on commit 735d041

Please sign in to comment.