ID addr/fix incorrect var names
This commit is contained in:
7 files changed
+90
-87
No files matched your search
+38
-38
@@ -143,8 +143,8 @@ module.exports = {
|
||||
|
||||
} else banking = banking.banking;
|
||||
|
||||
if (!client.exists(banking.guilds[guildDB.serverID])) {
|
||||
const success = addBank(banking.guilds, guildDB.serverID, interaction.member.user.id, client, guildDB.startingBalance);
|
||||
if (!client.exists(banking.guilds[GuildDB.serverID])) {
|
||||
const success = addBank(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance);
|
||||
if (!success) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -174,8 +174,8 @@ module.exports = {
|
||||
});
|
||||
}
|
||||
|
||||
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()
|
||||
@@ -187,7 +187,7 @@ module.exports = {
|
||||
}
|
||||
|
||||
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()
|
||||
.setDescription('**Bank Notice:** NSF. Non sufficient funds')
|
||||
.setColor("RED");
|
||||
@@ -195,10 +195,10 @@ module.exports = {
|
||||
return interaction.send({ embeds: [nsf] });
|
||||
}
|
||||
|
||||
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);
|
||||
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);
|
||||
|
||||
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) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -208,8 +208,8 @@ module.exports = {
|
||||
return interaction.send({ embeds: [embed] });
|
||||
}
|
||||
});
|
||||
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) {
|
||||
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) {
|
||||
if (err) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -228,7 +228,7 @@ module.exports = {
|
||||
return interaction.send({ embeds: [successEmbed] });
|
||||
|
||||
} 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()
|
||||
.setDescription('**Bank Notice:** NSF. Non sufficient funds')
|
||||
.setColor("RED");
|
||||
@@ -236,10 +236,10 @@ module.exports = {
|
||||
return interaction.send({ embeds: [nsf] });
|
||||
}
|
||||
|
||||
newBalance = banking.guilds[guildDB.serverID].account.balance - args[0].options[0].value;
|
||||
newCash = banking.guilds[guildDB.serverID].account.cash + 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;
|
||||
|
||||
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) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -249,8 +249,8 @@ module.exports = {
|
||||
return interaction.send({ embeds: [embed] });
|
||||
}
|
||||
});
|
||||
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) {
|
||||
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) {
|
||||
if (err) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -308,8 +308,8 @@ module.exports = {
|
||||
|
||||
} else banking = banking.banking;
|
||||
|
||||
if (!client.exists(targetUserBanking.guilds[guildDB.serverID])) {
|
||||
const success = addBank(targetUserBanking.guilds, guildDB.serverID, targetUserID, client, guildDB.startingBalance);
|
||||
if (!client.exists(targetUserBanking.guilds[GuildDB.serverID])) {
|
||||
const success = addBank(targetUserBanking.guilds, GuildDB.serverID, targetUserID, client, GuildDB.startingBalance);
|
||||
if (!success) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -333,9 +333,9 @@ module.exports = {
|
||||
|
||||
balanceEmbed.setTitle('Personal Bank Records');
|
||||
balanceEmbed.addFields(
|
||||
{ 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: '**Total**', value: `$${banking.guilds[guildDB.serverID].account.cash.toFixed(2)+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: '**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] });
|
||||
@@ -343,7 +343,7 @@ module.exports = {
|
||||
} else if (args[0].name == 'give') {
|
||||
// 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()
|
||||
.setTitle('Non sufficient funds! Withdraw more cash')
|
||||
.setColor("RED");
|
||||
@@ -351,9 +351,9 @@ module.exports = {
|
||||
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) {
|
||||
client.log(err);
|
||||
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"},
|
||||
{$set:{[`inventory.guilds.${guildDB.serverID}.items.$.cash`]:newCash}}, function(err, res) {
|
||||
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) {
|
||||
if (err) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -382,8 +382,8 @@ module.exports = {
|
||||
if (!targetUserInventory) {
|
||||
// Register inventory for user
|
||||
let newInventory = new Inventory();
|
||||
newInventory.createInventory(targetUserID, guildDB.serverID);
|
||||
newInventory.inventory.guilds[guildDB.serverID].items[0].cash = args[0].options[1].value;
|
||||
newInventory.createInventory(targetUserID, GuildDB.serverID);
|
||||
newInventory.inventory.guilds[GuildDB.serverID].items[0].cash = args[0].options[1].value;
|
||||
newInventory.save()
|
||||
.catch(err => {
|
||||
if (err) {
|
||||
@@ -397,8 +397,8 @@ module.exports = {
|
||||
});
|
||||
}
|
||||
|
||||
if (!client.exists(targetUserInventory.guilds[guildDB.serverID])) {
|
||||
const success = addInventory(targetUserInventory.guilds, guildDB.serverID, targetUserID, client);
|
||||
if (!client.exists(targetUserInventory.guilds[GuildDB.serverID])) {
|
||||
const success = addInventory(targetUserInventory.guilds, GuildDB.serverID, targetUserID, client);
|
||||
if (!success) {
|
||||
client.log(err);
|
||||
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;
|
||||
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) {
|
||||
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"},
|
||||
{$set:{[`inventory.guilds.${GuildDB.serverID}.items.$.cash`]:newTargetCash}}, function(err, res) {
|
||||
if (err) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -447,7 +447,7 @@ module.exports = {
|
||||
} else {
|
||||
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) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -469,7 +469,7 @@ module.exports = {
|
||||
} else if (args[0].name == 'transfer') {
|
||||
// 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()
|
||||
.setTitle('Non sufficient funds! Withdraw more cash')
|
||||
.setColor("RED");
|
||||
@@ -477,9 +477,9 @@ module.exports = {
|
||||
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) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
@@ -515,7 +515,7 @@ module.exports = {
|
||||
} else {
|
||||
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) {
|
||||
client.log(err);
|
||||
const embed = new MessageEmbed()
|
||||
|
||||
Reference in new issue
Block a user