SowinskiBraeden/quarksBot
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

ID addr/fix incorrect var names

Browse Source
This commit is contained in:
SowinskiBraeden committed 2022-08-23 20:28:59 -07:00
1 parent 1c210d311f
commit 0b05a4339f
7 files changed
+90 -87
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

commands/bank.js
+38 -38
View File
@@ -143,8 +143,8 @@ module.exports = {
} else banking = banking.banking; } else banking = banking.banking;
if (!client.exists(banking.guilds[guildDB.serverID])) { if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addBank(banking.guilds, guildDB.serverID, interaction.member.user.id, client, guildDB.startingBalance); const success = addBank(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance);
if (!success) { if (!success) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -174,8 +174,8 @@ module.exports = {
}); });
} }
if (!client.exists(inventory.guilds[guildDB.serverID])) { if (!client.exists(inventory.guilds[GuildDB.serverID])) {
const success = addInventory(inventory.guilds, guildDB.serverID, interaction.member.user.id, client); const success = addInventory(inventory.guilds, GuildDB.serverID, interaction.member.user.id, client);
if (!success) { if (!success) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -187,7 +187,7 @@ module.exports = {
} }
if (args[0].name == 'deposit') { if (args[0].name == 'deposit') {
if (banking.guilds[guildDB.serverID].account.cash.toFixed(2) - args[0].options[0].value < 0) { if (banking.guilds[GuildDB.serverID].account.cash.toFixed(2) - args[0].options[0].value < 0) {
const nsf = new MessageEmbed() const nsf = new MessageEmbed()
.setDescription('**Bank Notice:** NSF. Non sufficient funds') .setDescription('**Bank Notice:** NSF. Non sufficient funds')
.setColor("RED"); .setColor("RED");
@@ -195,10 +195,10 @@ module.exports = {
return interaction.send({ embeds: [nsf] }); return interaction.send({ embeds: [nsf] });
} }
newBalance = banking.guilds[guildDB.serverID].account.balance + args[0].options[0].value; newBalance = banking.guilds[GuildDB.serverID].account.balance + args[0].options[0].value;
newCash = Math.abs(banking.guilds[guildDB.serverID].account.cash.toFixed(2) - args[0].options[0].value); newCash = Math.abs(banking.guilds[GuildDB.serverID].account.cash.toFixed(2) - args[0].options[0].value);
client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${guildDB.serverID}.account.balance`]:newBalance,[`banking.guilds.${guildDB.serverID}.account.cash`]:newCash}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newBalance,[`banking.guilds.${GuildDB.serverID}.account.cash`]:newCash}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -208,8 +208,8 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
}); });
client.dbo.collection("inventories").updateOne({"inventory.userID":interaction.member.user.id, [`inventory.guilds.${guildDB.serverID}.items.type`]:"wallet"}, client.dbo.collection("inventories").updateOne({"inventory.userID":interaction.member.user.id, [`inventory.guilds.${GuildDB.serverID}.items.type`]:"wallet"},
{$set:{[`inventory.guilds.${guildDB.serverID}.items.$.cash`]:newCash}}, function(err, res) { {$set:{[`inventory.guilds.${GuildDB.serverID}.items.$.cash`]:newCash}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -228,7 +228,7 @@ module.exports = {
return interaction.send({ embeds: [successEmbed] }); return interaction.send({ embeds: [successEmbed] });
} else if (args[0].name == 'withdraw') { } else if (args[0].name == 'withdraw') {
if (args[0].options[0].value > banking.guilds[guildDB.serverID].account.balance) { if (args[0].options[0].value > banking.guilds[GuildDB.serverID].account.balance) {
let nsf = new MessageEmbed() let nsf = new MessageEmbed()
.setDescription('**Bank Notice:** NSF. Non sufficient funds') .setDescription('**Bank Notice:** NSF. Non sufficient funds')
.setColor("RED"); .setColor("RED");
@@ -236,10 +236,10 @@ module.exports = {
return interaction.send({ embeds: [nsf] }); return interaction.send({ embeds: [nsf] });
} }
newBalance = banking.guilds[guildDB.serverID].account.balance - args[0].options[0].value; newBalance = banking.guilds[GuildDB.serverID].account.balance - args[0].options[0].value;
newCash = banking.guilds[guildDB.serverID].account.cash + args[0].options[0].value; newCash = banking.guilds[GuildDB.serverID].account.cash + args[0].options[0].value;
client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${guildDB.serverID}.account.balance`]:newBalance,[`banking.guilds.${guildDB.serverID}.account.cash`]:newCash}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newBalance,[`banking.guilds.${GuildDB.serverID}.account.cash`]:newCash}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -249,8 +249,8 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
}); });
client.dbo.collection("inventories").updateOne({"inventory.userID":interaction.member.user.id, [`inventory.guilds.${guildDB.serverID}.items.type`]:"wallet"}, client.dbo.collection("inventories").updateOne({"inventory.userID":interaction.member.user.id, [`inventory.guilds.${GuildDB.serverID}.items.type`]:"wallet"},
{$set:{[`inventory.guilds.${guildDB.serverID}.items.$.cash`]:newCash}}, function(err, res) { {$set:{[`inventory.guilds.${GuildDB.serverID}.items.$.cash`]:newCash}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -308,8 +308,8 @@ module.exports = {
} else banking = banking.banking; } else banking = banking.banking;
if (!client.exists(targetUserBanking.guilds[guildDB.serverID])) { if (!client.exists(targetUserBanking.guilds[GuildDB.serverID])) {
const success = addBank(targetUserBanking.guilds, guildDB.serverID, targetUserID, client, guildDB.startingBalance); const success = addBank(targetUserBanking.guilds, GuildDB.serverID, targetUserID, client, GuildDB.startingBalance);
if (!success) { if (!success) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -333,9 +333,9 @@ module.exports = {
balanceEmbed.setTitle('Personal Bank Records'); balanceEmbed.setTitle('Personal Bank Records');
balanceEmbed.addFields( balanceEmbed.addFields(
{ name: '**Bank**', value: `$${banking.guilds[guildDB.serverID].account.balance.toFixed(2)}`, inline: true }, { name: '**Bank**', value: `$${banking.guilds[GuildDB.serverID].account.balance.toFixed(2)}`, inline: true },
{ name: '**Cash**', value: `$${banking.guilds[guildDB.serverID].account.cash.toFixed(2)}`, inline: true }, { name: '**Cash**', value: `$${banking.guilds[GuildDB.serverID].account.cash.toFixed(2)}`, inline: true },
{ name: '**Total**', value: `$${banking.guilds[guildDB.serverID].account.cash.toFixed(2)+banking.guilds[guildDB.serverID].account.balance.toFixed(2)}`, inline: true }); { name: '**Total**', value: `$${banking.guilds[GuildDB.serverID].account.cash.toFixed(2)+banking.guilds[GuildDB.serverID].account.balance.toFixed(2)}`, inline: true });
} }
return interaction.send({ embeds: [balanceEmbed] }); return interaction.send({ embeds: [balanceEmbed] });
@@ -343,7 +343,7 @@ module.exports = {
} else if (args[0].name == 'give') { } else if (args[0].name == 'give') {
// send money from wallet // send money from wallet
if (banking.guilds[guildDB.serverID].account.cash.toFixed(2) - args[0].options[1].value < 0) { if (banking.guilds[GuildDB.serverID].account.cash.toFixed(2) - args[0].options[1].value < 0) {
let embed = new MessageEmbed() let embed = new MessageEmbed()
.setTitle('Non sufficient funds! Withdraw more cash') .setTitle('Non sufficient funds! Withdraw more cash')
.setColor("RED"); .setColor("RED");
@@ -351,9 +351,9 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
newCash = banking.guilds[guildDB.serverID].account.cash - args[0].options[1].value; newCash = banking.guilds[GuildDB.serverID].account.cash - args[0].options[1].value;
client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${guildDB.serverID}.account.cash`]:newCash}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${GuildDB.serverID}.account.cash`]:newCash}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -364,8 +364,8 @@ module.exports = {
} }
}); });
client.dbo.collection("inventories").updateOne({"inventory.userID":interaction.member.user.id, [`inventory.guilds.${guildDB.serverID}.items.type`]:"wallet"}, client.dbo.collection("inventories").updateOne({"inventory.userID":interaction.member.user.id, [`inventory.guilds.${GuildDB.serverID}.items.type`]:"wallet"},
{$set:{[`inventory.guilds.${guildDB.serverID}.items.$.cash`]:newCash}}, function(err, res) { {$set:{[`inventory.guilds.${GuildDB.serverID}.items.$.cash`]:newCash}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -382,8 +382,8 @@ module.exports = {
if (!targetUserInventory) { if (!targetUserInventory) {
// Register inventory for user // Register inventory for user
let newInventory = new Inventory(); let newInventory = new Inventory();
newInventory.createInventory(targetUserID, guildDB.serverID); newInventory.createInventory(targetUserID, GuildDB.serverID);
newInventory.inventory.guilds[guildDB.serverID].items[0].cash = args[0].options[1].value; newInventory.inventory.guilds[GuildDB.serverID].items[0].cash = args[0].options[1].value;
newInventory.save() newInventory.save()
.catch(err => { .catch(err => {
if (err) { if (err) {
@@ -397,8 +397,8 @@ module.exports = {
}); });
} }
if (!client.exists(targetUserInventory.guilds[guildDB.serverID])) { if (!client.exists(targetUserInventory.guilds[GuildDB.serverID])) {
const success = addInventory(targetUserInventory.guilds, guildDB.serverID, targetUserID, client); const success = addInventory(targetUserInventory.guilds, GuildDB.serverID, targetUserID, client);
if (!success) { if (!success) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -409,9 +409,9 @@ module.exports = {
} }
} }
let newTargetCash = targetUserInventory.inventory.guilds[guildDB.serverID].items[0].cash + args[0].options[1].value; let newTargetCash = targetUserInventory.inventory.guilds[GuildDB.serverID].items[0].cash + args[0].options[1].value;
client.dbo.collection("inventories").updateOne({"inventory.userID":targetUserID, [`inventory.guilds.${guildDB.serverID}.items.type`]:"wallet"}, client.dbo.collection("inventories").updateOne({"inventory.userID":targetUserID, [`inventory.guilds.${GuildDB.serverID}.items.type`]:"wallet"},
{$set:{[`inventory.guilds.${guildDB.serverID}.items.$.cash`]:newTargetCash}}, function(err, res) { {$set:{[`inventory.guilds.${GuildDB.serverID}.items.$.cash`]:newTargetCash}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -447,7 +447,7 @@ module.exports = {
} else { } else {
let newTargetCash = targetUserBanking.account.cash + args[0].options[1].value; let newTargetCash = targetUserBanking.account.cash + args[0].options[1].value;
client.dbo.collection("banks").updateOne({"account.userID": targetUserID}, {$set: {[`banking.guilds.${guildDB.serverID}.account.cash`]: newTargetCash}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID": targetUserID}, {$set: {[`banking.guilds.${GuildDB.serverID}.account.cash`]: newTargetCash}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -469,7 +469,7 @@ module.exports = {
} else if (args[0].name == 'transfer') { } else if (args[0].name == 'transfer') {
// send money from bank // send money from bank
if (banking.guilds[guildDB.serverID].account.balance.toFixed(2) - args[0].options[1].value < 0) { if (banking.guilds[GuildDB.serverID].account.balance.toFixed(2) - args[0].options[1].value < 0) {
let embed = new MessageEmbed() let embed = new MessageEmbed()
.setTitle('Non sufficient funds! Withdraw more cash') .setTitle('Non sufficient funds! Withdraw more cash')
.setColor("RED"); .setColor("RED");
@@ -477,9 +477,9 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
newBalance = banking.guilds[guildDB.serverID].account.balance - args[0].options[1].value; newBalance = banking.guilds[GuildDB.serverID].account.balance - args[0].options[1].value;
client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${guildDB.serverID}.account.balance`]:newBalance}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newBalance}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -515,7 +515,7 @@ module.exports = {
} else { } else {
let newTargetBalance = targetUserBanking.account.balance + args[0].options[1].value; let newTargetBalance = targetUserBanking.account.balance + args[0].options[1].value;
client.dbo.collection("banks").updateOne({"account.userID":targetUserID},{$set:{[`banking.guilds.${guildDB.serverID}.account.balance`]:newTargetBalance}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":targetUserID},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newTargetBalance}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
commands/fine.js
+4 -4
View File
@@ -88,8 +88,8 @@ module.exports = {
} else banking = banking.banking; } else banking = banking.banking;
if (!client.exists(banking.guilds[guildDB.serverID])) { if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addBank(banking.guilds, guildDB.serverID, targetUserID, client, guildDB.startingBalance); const success = addBank(banking.guilds, GuildDB.serverID, targetUserID, client, GuildDB.startingBalance);
if (!success) { if (!success) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -100,9 +100,9 @@ module.exports = {
} }
} }
const newTargetBalance = banking.guilds[guildDB.serverID].account.balance - args[0].options[1].value; const newTargetBalance = banking.guilds[GuildDB.serverID].account.balance - args[0].options[1].value;
client.dbo.collection("banks").updateOne({"account.userID":targetUserID},{$set:{[`banking.guilds.${guildDB.serverID}.account.balance`]:newTargetBalance}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":targetUserID},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newTargetBalance}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
commands/id-set.js
+8 -5
View File
@@ -18,7 +18,7 @@ module.exports = {
type: 3, type: 3,
required: true, required: true,
choices: [ choices: [
{ name: "firstname", value: "firstname" }, { name: "lastname", value: "lastname" }, { name: "date-of-birth", value: "dob" }, { name: "firstname", value: "firstname" }, { name: "lastname", value: "lastname" }, { name: "date-of-birth", value: "dob" }, { name: "address", value: "address" },
], ],
}, },
{ {
@@ -41,15 +41,15 @@ module.exports = {
return interaction.send(`You are not allowed to use the bot in this channel.`); return interaction.send(`You are not allowed to use the bot in this channel.`);
} }
const query = {"inventory.userID":interaction.member.user.id, [`inventory.guilds.${guildDB.serverID}.items.type`]:"wallet"}; const query = {"inventory.userID":interaction.member.user.id, [`inventory.guilds.${GuildDB.serverID}.items.type`]:"wallet"};
let update, updateAction; let update, updateAction;
if (args[0].value == "firstname") { if (args[0].value == "firstname") {
update = {$set: {[`inventory.guilds.${guildDB.serverID}.ID.firstname`]: args[1].value}}; update = {$set: {[`inventory.guilds.${GuildDB.serverID}.ID.firstname`]: args[1].value}};
updateAction = "firstname"; updateAction = "firstname";
} else if (args[0].value == "lastname") { } else if (args[0].value == "lastname") {
update = {$set: {[`inventory.guilds.${guildDB.serverID}.ID.lastname`]: args[1].value}}; update = {$set: {[`inventory.guilds.${GuildDB.serverID}.ID.lastname`]: args[1].value}};
updateAction = "lastname"; updateAction = "lastname";
} else if (args[0].value == "dob") { } else if (args[0].value == "dob") {
@@ -65,8 +65,11 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
update = {$set: {[`inventory.guilds.${guildDB.serverID}.ID.dob`]: args[1].value}}; update = {$set: {[`inventory.guilds.${GuildDB.serverID}.ID.dob`]: args[1].value}};
updateAction = "date of birth"; updateAction = "date of birth";
} else if (args[0].value == "address") {
update = {$set: {[`inventory.guilds.${GuildDB.serverID}.ID.addr`]: args[1].value}};
updateAction = "address";
} }
client.dbo.collection("inventories").updateOne(query, update, function (err, res) { client.dbo.collection("inventories").updateOne(query, update, function (err, res) {
commands/inventory.js
+23 -23
View File
@@ -181,7 +181,7 @@ module.exports = {
inventory = { inventory = {
userID: interaction.member.user.id, userID: interaction.member.user.id,
guilds: { guilds: {
[guildDB.serverID]: { [GuildDB.serverID]: {
items: [{ items: [{
name: 'Wallet', name: 'Wallet',
type: 'wallet', type: 'wallet',
@@ -213,8 +213,8 @@ module.exports = {
}); });
} else inventory = inventory.inventory } else inventory = inventory.inventory
if (!client.exists(inventory.guilds[guildDB.serverID])) { if (!client.exists(inventory.guilds[GuildDB.serverID])) {
const success = addInventory(inventory.guilds, guildDB.serverID, interaction.member.user.id, client); const success = addInventory(inventory.guilds, GuildDB.serverID, interaction.member.user.id, client);
if (!success) { if (!success) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -233,9 +233,9 @@ module.exports = {
.setTitle('Your Inventory') .setTitle('Your Inventory')
let description = `To see detials on an Item use \`/inventory item [item number]\`\n\n\`\`\`` let description = `To see detials on an Item use \`/inventory item [item number]\`\n\n\`\`\``
for (let i = 0; i < inventory.guilds[guildDB.serverID].items.length; i++) { for (let i = 0; i < inventory.guilds[GuildDB.serverID].items.length; i++) {
if (inventory.guilds[guildDB.serverID].items[i].type == 'firearm') description += `${i+1}. ${inventory.guilds[guildDB.serverID].items[i].weaponType} - ${inventory.guilds[guildDB.serverID].items[i].description}\n`; if (inventory.guilds[GuildDB.serverID].items[i].type == 'firearm') description += `${i+1}. ${inventory.guilds[GuildDB.serverID].items[i].weaponType} - ${inventory.guilds[GuildDB.serverID].items[i].description}\n`;
else description += `${i+1}. ${inventory.guilds[guildDB.serverID].items[i].name} - ${inventory.guilds[guildDB.serverID].items[i].description}\n` else description += `${i+1}. ${inventory.guilds[GuildDB.serverID].items[i].name} - ${inventory.guilds[GuildDB.serverID].items[i].description}\n`
} }
description += "```" description += "```"
@@ -246,8 +246,8 @@ module.exports = {
} else if (args[0].name == 'wallet') { } else if (args[0].name == 'wallet') {
// Display wallet // Display wallet
let item = inventory.guilds[guildDB.serverID].items[0]; let item = inventory.guilds[GuildDB.serverID].items[0];
let ID = `${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'}` let ID = `${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'} | ${client.exists(item.ID.addr) ? item.ID.addr : 'N/A'}`
let walletEmbed = new MessageEmbed() let walletEmbed = new MessageEmbed()
.setTitle(`Your Wallet`) .setTitle(`Your Wallet`)
@@ -261,7 +261,7 @@ module.exports = {
} else if (args[0].name == 'item') { } else if (args[0].name == 'item') {
// Display Item Data // Display Item Data
if (args[0].options[0].value < 1 || args[0].options[0].value > inventory.guilds[guildDB.serverID].items.length) { if (args[0].options[0].value < 1 || args[0].options[0].value > inventory.guilds[GuildDB.serverID].items.length) {
let embed = new MessageEmbed() let embed = new MessageEmbed()
.setTitle("Please provide a valid item number") .setTitle("Please provide a valid item number")
.setColor("RED") .setColor("RED")
@@ -269,12 +269,12 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
let item = inventory.guilds[guildDB.serverID].items[args[0].options[0].value-1]; let item = inventory.guilds[GuildDB.serverID].items[args[0].options[0].value-1];
let itemEmbed = new MessageEmbed().setColor(client.config.EmbedColor); let itemEmbed = new MessageEmbed().setColor(client.config.EmbedColor);
if (item.type == 'wallet') { if (item.type == 'wallet') {
// Display wallet // Display wallet
let ID = `${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'}` let ID = `${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'} | ${client.exists(item.ID.addr) ? item.ID.addr : 'N/A'}`
itemEmbed.setTitle(`Your Wallet`); itemEmbed.setTitle(`Your Wallet`);
itemEmbed.addFields( itemEmbed.addFields(
@@ -314,7 +314,7 @@ module.exports = {
quantity: 1, quantity: 1,
} }
client.dbo.collection('inventories').updateOne({'inventory.userID': interaction.member.user.id}, {$push: {[`inventory.guilds.${guildDB.serverID}.items`]: firearm}}, function(err, res) { client.dbo.collection('inventories').updateOne({'inventory.userID': interaction.member.user.id}, {$push: {[`inventory.guilds.${GuildDB.serverID}.items`]: firearm}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -341,7 +341,7 @@ module.exports = {
quantity: args[0].options[0].options[2].value, quantity: args[0].options[0].options[2].value,
} }
client.dbo.collection('inventories').updateOne({'inventory.userID': interaction.member.user.id}, {$push: {[`inventory.guilds.${guildDB.serverID}.items`]: item}}, function(err, res) { client.dbo.collection('inventories').updateOne({'inventory.userID': interaction.member.user.id}, {$push: {[`inventory.guilds.${GuildDB.serverID}.items`]: item}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -362,7 +362,7 @@ module.exports = {
} else if (args[0].name == 'drop') { } else if (args[0].name == 'drop') {
// Remove Item from inventory // Remove Item from inventory
if (args[0].options[0].value < 1 || args[0].options[0].value > inventory.guilds[guildDB.serverID].items.length) { if (args[0].options[0].value < 1 || args[0].options[0].value > inventory.guilds[GuildDB.serverID].items.length) {
let embed = new MessageEmbed() let embed = new MessageEmbed()
.setTitle("Please provide a valid item number") .setTitle("Please provide a valid item number")
.setColor("RED") .setColor("RED")
@@ -378,9 +378,9 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
let item = inventory.guilds[guildDB.serverID].items[args[0].options[0].value-1]; let item = inventory.guilds[GuildDB.serverID].items[args[0].options[0].value-1];
client.dbo.collection('inventories').updateOne({'inventory.userID': interaction.member.user.id}, {$pull: {[`inventory.guilds.${guildDB.serverID}.items`]: item}}, function(err, res) { client.dbo.collection('inventories').updateOne({'inventory.userID': interaction.member.user.id}, {$pull: {[`inventory.guilds.${GuildDB.serverID}.items`]: item}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -400,7 +400,7 @@ module.exports = {
} else if (args[0].name == 'give') { } else if (args[0].name == 'give') {
// Give user Item from inventory // Give user Item from inventory
if (args[0].options[0].value < 1 || args[0].options[0].value > inventory.guilds[guildDB.serverID].items.length) { if (args[0].options[0].value < 1 || args[0].options[0].value > inventory.guilds[GuildDB.serverID].items.length) {
let embed = new MessageEmbed() let embed = new MessageEmbed()
.setTitle("Please provide a valid item number") .setTitle("Please provide a valid item number")
.setColor("RED") .setColor("RED")
@@ -408,7 +408,7 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
let item = inventory.guilds[guildDB.serverID].items[args[0].options[0].value-1]; let item = inventory.guilds[GuildDB.serverID].items[args[0].options[0].value-1];
if (item.type == 'wallet') { if (item.type == 'wallet') {
let embed = new MessageEmbed() let embed = new MessageEmbed()
.setTitle("Cannot Give Wallet") .setTitle("Cannot Give Wallet")
@@ -422,7 +422,7 @@ module.exports = {
if (!targetUserInventory) { if (!targetUserInventory) {
// Register inventory for user with item givn // Register inventory for user with item givn
let newInventory = new Inventory(); let newInventory = new Inventory();
newInventory.createInventory(targetUserID, guildDB.serverID); newInventory.createInventory(targetUserID, GuildDB.serverID);
newInventory.addItem(item); newInventory.addItem(item);
newInventory.save() newInventory.save()
.catch(err => { .catch(err => {
@@ -436,7 +436,7 @@ module.exports = {
} }
}); });
} else { } else {
client.dbo.collection('inventories').updateOne({'inventory.userID': interaction.member.user.id}, {$pull: {[`inventory.guilds.${guildDB.serverID}.items`]: item}}, function(err, res) { client.dbo.collection('inventories').updateOne({'inventory.userID': interaction.member.user.id}, {$pull: {[`inventory.guilds.${GuildDB.serverID}.items`]: item}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -446,7 +446,7 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
}); });
client.dbo.collection('inventories').updateOne({'inventory.userID': targetUserID}, {$push: {[`inventory.guilds.${guildDB.serverID}.items`]: item}}, function(err, res) { client.dbo.collection('inventories').updateOne({'inventory.userID': targetUserID}, {$push: {[`inventory.guilds.${GuildDB.serverID}.items`]: item}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -497,8 +497,8 @@ module.exports = {
let action = '' let action = ''
if (queryString==`yes-${interaction.member.user.id}`) { if (queryString==`yes-${interaction.member.user.id}`) {
action = 'cleared'; action = 'cleared';
const tempWallet = inventory.guilds[guildDB.serverID].items[0]; const tempWallet = inventory.guilds[GuildDB.serverID].items[0];
client.dbo.collection("inventories").updateOne({"inventory.userID":inventory.userID},{$set:{[`inventory.guilds.${guildDB.serverID}.items`]: [tempWallet]}},function(err, res) { client.dbo.collection("inventories").updateOne({"inventory.userID":inventory.userID},{$set:{[`inventory.guilds.${GuildDB.serverID}.items`]: [tempWallet]}},function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
commands/money.js
+6 -6
View File
@@ -108,8 +108,8 @@ module.exports = {
} else banking = banking.banking; } else banking = banking.banking;
if (!client.exists(banking.guilds[guildDB.serverID])) { if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addBank(banking.guilds, guildDB.serverID, targetUserID, client, guildDB.startingBalance); const success = addBank(banking.guilds, GuildDB.serverID, targetUserID, client, GuildDB.startingBalance);
if (!success) { if (!success) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -123,9 +123,9 @@ module.exports = {
if (args[0].name == "add") { if (args[0].name == "add") {
// add money to user // add money to user
let newBalance = banking.guilds[guildDB.serverID].account.balance + args[0].options[1].value; let newBalance = banking.guilds[GuildDB.serverID].account.balance + args[0].options[1].value;
client.dbo.collection("banks").updateOne({"account.userID":targetUserID},{$set:{[`banking.guilds.${guildDB.serverID}.account.balance`]:newBalance}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":targetUserID},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newBalance}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -145,9 +145,9 @@ module.exports = {
} else if (args[0].name == "remove") { } else if (args[0].name == "remove") {
// remove money from user // remove money from user
let newBalance = banking.guilds[guildDB.serverID].account.balance - args[0].options[1].value; let newBalance = banking.guilds[GuildDB.serverID].account.balance - args[0].options[1].value;
client.dbo.collection("banks").updateOne({"account.userID":targetUserID},{$set:{[`banking.guilds.${guildDB.serverID}.account.balance`]:newBalance}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":targetUserID},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newBalance}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
commands/search.js
+5 -5
View File
@@ -64,7 +64,7 @@ module.exports = {
// Register inventory for user with item givn // Register inventory for user with item givn
let newInventory = new Inventory(); let newInventory = new Inventory();
newInventory.createInventory(targetUserID, guildDB.serverID); newInventory.createInventory(targetUserID, GuildDB.serverID);
newInventory.save() newInventory.save()
.catch(err => { .catch(err => {
if (err) { if (err) {
@@ -80,7 +80,7 @@ module.exports = {
// Display Inventory // Display Inventory
if (args[1]) { if (args[1]) {
if (args[1].value < 0 || args[1].value > inventory.guilds[guildDB.serverID].items.length) { if (args[1].value < 0 || args[1].value > inventory.guilds[GuildDB.serverID].items.length) {
let embed = new MessageEmbed() let embed = new MessageEmbed()
.setTitle("Please provide a valid item number") .setTitle("Please provide a valid item number")
.setColor("RED") .setColor("RED")
@@ -88,7 +88,7 @@ module.exports = {
return interaction.send({ embeds: [embed] }); return interaction.send({ embeds: [embed] });
} }
let item = inventory.guilds[guildDB.serverID].items[args[1].value-1]; let item = inventory.guilds[GuildDB.serverID].items[args[1].value-1];
let itemEmbed = new MessageEmbed().setColor(client.config.EmbedColor); let itemEmbed = new MessageEmbed().setColor(client.config.EmbedColor);
if (item.type == 'wallet') { if (item.type == 'wallet') {
// Display wallet // Display wallet
@@ -125,8 +125,8 @@ module.exports = {
.setTitle(`${User.tag.split('#')[0]}'s Inventory`); .setTitle(`${User.tag.split('#')[0]}'s Inventory`);
let description = "```"; let description = "```";
for (let i = 0; i < inventory.guilds[guildDB.serverID].items.length; i++) { for (let i = 0; i < inventory.guilds[GuildDB.serverID].items.length; i++) {
description += `${i+1}. ${inventory.guilds[guildDB.serverID].items[i].name} - ${inventory.guilds[guildDB.serverID].items[i].description}\n`; description += `${i+1}. ${inventory.guilds[GuildDB.serverID].items[i].name} - ${inventory.guilds[GuildDB.serverID].items[i].description}\n`;
} }
description += "```"; description += "```";
inventoryEmbed.setDescription(description); inventoryEmbed.setDescription(description);
commands/work.js
+6 -6
View File
@@ -46,7 +46,7 @@ module.exports = {
// Register inventory for user // Register inventory for user
let newInventory = new Inventory(); let newInventory = new Inventory();
newInventory.createInventory(interaction.member.user.id, guildDB.serverID); newInventory.createInventory(interaction.member.user.id, GuildDB.serverID);
newInventory.save() newInventory.save()
.catch(err => { .catch(err => {
if (err) { if (err) {
@@ -106,8 +106,8 @@ module.exports = {
} else banking = banking.banking; } else banking = banking.banking;
if (!client.exists(banking.guilds[guildDB.serverID])) { if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addBank(banking.guilds, guildDB.serverID, interaction.member.user.id, client, guildDB.startingBalance); const success = addBank(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance);
if (!success) { if (!success) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -125,9 +125,9 @@ module.exports = {
let highestPayIndex = workPays.indexOf(Math.max(workPays)) let highestPayIndex = workPays.indexOf(Math.max(workPays))
job = workRoles[highestPayIndex] job = workRoles[highestPayIndex]
earned = workPays[highestPayIndex] earned = workPays[highestPayIndex]
newBalance = banking.guilds[guildDB.serverID].account.balance + earned newBalance = banking.guilds[GuildDB.serverID].account.balance + earned
client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${guildDB.serverID}.account.balance`]:newBalance}}, function(err, res) { client.dbo.collection("banks").updateOne({"account.userID":interaction.member.user.id},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newBalance}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()
@@ -138,7 +138,7 @@ module.exports = {
} }
}); });
client.dbo.collection("inventories").updateOne({"inventory.userID":interaction.member.user.id}, {$set: {[`inventory.guilds.${guildDB.serverID}.lastWork`]: now}}, function(err, res) { client.dbo.collection("inventories").updateOne({"inventory.userID":interaction.member.user.id}, {$set: {[`inventory.guilds.${GuildDB.serverID}.lastWork`]: now}}, function(err, res) {
if (err) { if (err) {
client.log(err); client.log(err);
const embed = new MessageEmbed() const embed = new MessageEmbed()