ID addr/fix incorrect var names

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

No files matched your search

+23 -23
View File
@@ -181,7 +181,7 @@ module.exports = {
inventory = {
userID: interaction.member.user.id,
guilds: {
[guildDB.serverID]: {
[GuildDB.serverID]: {
items: [{
name: 'Wallet',
type: 'wallet',
@@ -213,8 +213,8 @@ module.exports = {
});
} else inventory = inventory.inventory
if (!client.exists(inventory.guilds[guildDB.serverID])) {
const success = addInventory(inventory.guilds, guildDB.serverID, interaction.member.user.id, client);
if (!client.exists(inventory.guilds[GuildDB.serverID])) {
const success = addInventory(inventory.guilds, GuildDB.serverID, interaction.member.user.id, client);
if (!success) {
client.log(err);
const embed = new MessageEmbed()
@@ -233,9 +233,9 @@ module.exports = {
.setTitle('Your Inventory')
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++) {
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`
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`;
else description += `${i+1}. ${inventory.guilds[GuildDB.serverID].items[i].name} - ${inventory.guilds[GuildDB.serverID].items[i].description}\n`
}
description += "```"
@@ -246,8 +246,8 @@ module.exports = {
} else if (args[0].name == 'wallet') {
// Display wallet
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 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'} | ${client.exists(item.ID.addr) ? item.ID.addr : 'N/A'}`
let walletEmbed = new MessageEmbed()
.setTitle(`Your Wallet`)
@@ -261,7 +261,7 @@ module.exports = {
} else if (args[0].name == 'item') {
// 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()
.setTitle("Please provide a valid item number")
.setColor("RED")
@@ -269,12 +269,12 @@ module.exports = {
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);
if (item.type == '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.addFields(
@@ -314,7 +314,7 @@ module.exports = {
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) {
client.log(err);
const embed = new MessageEmbed()
@@ -341,7 +341,7 @@ module.exports = {
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) {
client.log(err);
const embed = new MessageEmbed()
@@ -362,7 +362,7 @@ module.exports = {
} else if (args[0].name == 'drop') {
// 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()
.setTitle("Please provide a valid item number")
.setColor("RED")
@@ -378,9 +378,9 @@ module.exports = {
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) {
client.log(err);
const embed = new MessageEmbed()
@@ -400,7 +400,7 @@ module.exports = {
} else if (args[0].name == 'give') {
// 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()
.setTitle("Please provide a valid item number")
.setColor("RED")
@@ -408,7 +408,7 @@ module.exports = {
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') {
let embed = new MessageEmbed()
.setTitle("Cannot Give Wallet")
@@ -422,7 +422,7 @@ module.exports = {
if (!targetUserInventory) {
// Register inventory for user with item givn
let newInventory = new Inventory();
newInventory.createInventory(targetUserID, guildDB.serverID);
newInventory.createInventory(targetUserID, GuildDB.serverID);
newInventory.addItem(item);
newInventory.save()
.catch(err => {
@@ -436,7 +436,7 @@ module.exports = {
}
});
} 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) {
client.log(err);
const embed = new MessageEmbed()
@@ -446,7 +446,7 @@ module.exports = {
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) {
client.log(err);
const embed = new MessageEmbed()
@@ -497,8 +497,8 @@ module.exports = {
let action = ''
if (queryString==`yes-${interaction.member.user.id}`) {
action = 'cleared';
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) {
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) {
if (err) {
client.log(err);
const embed = new MessageEmbed()