SowinskiBraeden/dayz-reforger
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor/remove mongoose + quality of life

Browse Source
This commit is contained in:
SowinskiBraeden committed 2023-10-21 15:03:45 -07:00
1 parent ae2f651c83
commit 37aff39490
26 files changed
+235 -329
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

commands/admin.js
+6 -19
View File
@@ -2,8 +2,8 @@ const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelect
const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
const bitfieldCalculator = require('discord-bitfield-calculator');
const { BanPlayer, UnbanPlayer, RestartServer, CheckServerStatus, DisableBaseDamage } = require('../util/NitradoAPI');
const { Armbands } = require('../config/armbandsdb.js');
const { User, addUser } = require('../structures/user');
const { Armbands } = require('../database/armbands.js');
const { createUser, addUser } = require('../database/user')
module.exports = {
name: "admin",
@@ -404,23 +404,10 @@ module.exports = {
let banking = await client.dbo.collection("users").findOne({"user.userID": targetUserID}).then(banking => banking);
if (!banking) {
banking = {
userID: targetUserID,
guilds: {
[GuildDB.serverID]: {
balance: GuildDB.startingBalance,
}
}
}
// Register bank for user
let newBank = new User();
newBank.createUser(targetUserID, GuildDB.serverID, GuildDB.startingBalance);
newBank.save().catch(err => {
if (err) return client.sendInternalError(interaction, err);
});
} else banking = banking.user;
banking = await createUser(targetUserID, GuildDB.serverID, GuildDB.startingBalance, client)
if (!client.exists(banking)) return client.sendInternalError(interaction, err);
}
banking = banking.user;
if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addUser(banking.guilds, GuildDB.serverID, targetUserID, client, GuildDB.startingBalance);
commands/armbands.js
+1 -1
View File
@@ -1,5 +1,5 @@
const { StringSelectMenuBuilder, EmbedBuilder, ActionRowBuilder } = require('discord.js');
const { Armbands } = require('../config/armbandsdb.js');
const { Armbands } = require('../database/armbands.js');
module.exports = {
name: "armbands",
commands/bank.js
+23 -56
View File
@@ -1,6 +1,6 @@
const { EmbedBuilder } = require('discord.js');
const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
const { User, addUser } = require('../structures/user');
const { createUser, addUser } = require('../database/user');
module.exports = {
name: "bank",
@@ -64,25 +64,12 @@ module.exports = {
}
let banking = await client.dbo.collection("users").findOne({"user.userID": interaction.member.user.id}).then(banking => banking);
if (!banking) {
banking = {
userID: interaction.member.user.id,
guilds: {
[GuildDB.serverID]: {
balance: GuildDB.startingBalance,
}
}
}
// Register bank for user
let newBank = new User();
newBank.createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance);
newBank.save().catch(err => {
if (err) return client.sendInternalError(interaction, err);
});
} else banking = banking.user;
banking = await createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance, client)
if (!client.exists(banking)) return client.sendInternalError(interaction, err);
}
banking = banking.user;
if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addUser(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance);
@@ -97,29 +84,16 @@ module.exports = {
// Show target users balance
let targetUserID = args[0].options[0].value.replace('<@!', '').replace('>', '');
let targetUserBanking = await client.dbo.collection("users").findOne({"user.userID": targetUserID}).then(banking => banking);
let targetUserBanking = await client.dbo.collection("users").findOne({"user.userID": targetUserID}).then(targetUserBanking => targetUserBanking);
if (!targetUserBanking) {
targetUserBanking = {
userID: targetUserID,
guilds: {
[GuildDB.serverID]: {
balance: GuildDB.startingBalance,
}
}
}
// Register bank for user
let newBank = new User();
newBank.createUser(targetUserID, GuildDB.serverID, GuildDB.startingBalance, 0);
newBank.save().catch(err => {
if (err) return client.sendInternalError(interaction, err);
});
} else targetUserBanking = targetUserBanking.user;
targetUserBanking = await createUser(targetUserID, GuildDB.serverID, GuildDB.startingBalance, client)
if (!client.exists(banking)) return client.sendInternalError(interaction, err);
}
targetUserBanking = targetUserBanking.user;
if (!client.exists(targetUserBanking.guilds[GuildDB.serverID])) {
const success = addUser(targetUserBanking.guilds, GuildDB.serverID, targetUserID, client, GuildDB.startingBalance);
const success = addUser(banking.guilds, GuildDB.serverID, targetUserID, client, GuildDB.startingBalance);
if (!success) return client.sendInternalError(interaction, 'Failed to add bank');
}
@@ -160,25 +134,18 @@ module.exports = {
if (err) return client.sendInternalError(interaction, err);
});
let targetUserBanking = await client.dbo.collection("users").findOne({"user.userID": targetUserID}).then(banking => banking);
let targetUserBanking = await client.dbo.collection("users").findOne({"user.userID": targetUserID}).then(targetUserBanking => targetUserBanking);
if (!targetUserBanking) {
targetUserBanking = {
userID: targetUserID,
guilds: {
[GuildDB.serverID]: {
balance: (GuildDB.startingBalance + args[0].options[1].value),
}
}
}
// Register bank for user
let newBank = new User();
newBank.createUser(targetUserID, GuildDB.serverID, GuildDB.startingBalance, 0);
newBank.save().catch(err => {
if (err) return client.sendInternalError(interaction, err);
});
} else targetUserBanking = targetUserBanking.user;
targetUserBanking = await createUser(targetUserID, GuildDB.serverID, GuildDB.startingBalance, client)
if (!client.exists(banking)) return client.sendInternalError(interaction, err);
}
targetUserBanking = targetUserBanking.user;
if (!client.exists(targetUserBanking.guilds[GuildDB.serverID])) {
const success = addUser(banking.guilds, GuildDB.serverID, targetUserID, client, GuildDB.startingBalance);
if (!success) return client.sendInternalError(interaction, 'Failed to add bank');
}
const newTargetBalance = targetUserBanking.guilds[GuildDB.serverID].balance + args[0].options[1].value;
commands/bounty.js
+6 -18
View File
@@ -1,5 +1,6 @@
const { EmbedBuilder } = require('discord.js');
const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
const { createUser, addUser } = require('../database/user');
module.exports = {
name: "bounty",
@@ -60,25 +61,12 @@ module.exports = {
let banking;
if (args[0].name == 'set' || args[0].name == 'pay') {
banking = await client.dbo.collection("users").findOne({"user.userID": interaction.member.user.id}).then(banking => banking);
if (!banking) {
banking = {
userID: interaction.member.user.id,
guilds: {
[GuildDB.serverID]: {
balance: GuildDB.startingBalance,
}
}
}
// Register bank for user
let newBank = new User();
newBank.createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance);
newBank.save().catch(err => {
if (err) return client.sendInternalError(interaction, err);
});
} else banking = banking.user;
banking = await createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance, client)
if (!client.exists(banking)) return client.sendInternalError(interaction, err);
}
banking = banking.user;
if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addUser(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance);
commands/claim.js
+1 -1
View File
@@ -1,6 +1,6 @@
const { ActionRowBuilder, EmbedBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder } = require('discord.js');
const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
const { Armbands } = require('../config/armbandsdb.js');
const { Armbands } = require('../database/armbands.js');
module.exports = {
name: "claim",
commands/collect-income.js
+6 -19
View File
@@ -1,5 +1,5 @@
const { EmbedBuilder, } = require('discord.js');
const { User, addUser } = require('../structures/user');
const { createUser, addUser } = require('../database/user');
module.exports = {
name: "collect-income",
@@ -41,25 +41,12 @@ module.exports = {
let banking = await client.dbo.collection("users").findOne({"user.userID": interaction.member.user.id}).then(banking => banking);
if (!banking) {
banking = {
userID: interaction.member.user.id,
guilds: {
[GuildDB.serverID]: {
balance: GuildDB.startingBalance,
lastIncome: new Date('2000-01-01T00:00:00'),
}
}
}
// Register bank for user
let newBank = new User();
newBank.createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance);
newBank.save().catch(err => {
if (err) return client.sendInternalError(interaction, err);
});
} else banking = banking.user;
banking = await createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance, client)
if (!client.exists(banking)) return client.sendInternalError(interaction, err);
}
banking = banking.user;
if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addUser(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance);
commands/config.js
+2 -1
View File
@@ -1,6 +1,7 @@
const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js');
const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
const bitfieldCalculator = require('discord-bitfield-calculator');
const { getDefaultSettings } = require('../database/guildSettings');
module.exports = {
name: "config",
@@ -832,7 +833,7 @@ module.exports = {
let action = '';
if (interaction.customId.split('-')[1]=='yes') {
action = 'reset';
const defaultGuildConfig = client.getDefaultSettings(GuildDB.serverID);
const defaultGuildConfig = getDefaultSettings(GuildDB.serverID);
client.dbo.collection("guilds").updateOne({"server.serverID":GuildDB.serverID}, {$set: {"server": defaultGuildConfig}}, (err, res) => {
if (err) return client.sendInternalError(interaction, err);
});
commands/factions.js
+1 -1
View File
@@ -1,6 +1,6 @@
const { EmbedBuilder } = require('discord.js');
const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
const { Armbands } = require('../config/armbandsdb.js');
const { Armbands } = require('../database/armbands.js');
module.exports = {
name: "factions",
commands/location.js
-1
View File
@@ -1,5 +1,4 @@
const { EmbedBuilder } = require('discord.js');
const bitfieldCalculator = require('discord-bitfield-calculator');
module.exports = {
name: "location",
commands/purchase-emp.js
+6 -18
View File
@@ -1,5 +1,5 @@
const { EmbedBuilder, ActionRowBuilder, StringSelectMenuBuilder } = require('discord.js');
const { User, addUser } = require('../structures/user');
const { createUser, addUser } = require('../database/user');
module.exports = {
name: "purchase-emp",
@@ -24,24 +24,12 @@ module.exports = {
let banking = await client.dbo.collection("users").findOne({"user.userID": interaction.member.user.id}).then(banking => banking);
if (!banking) {
banking = {
userID: interaction.member.user.id,
guilds: {
[GuildDB.serverID]: {
balance: GuildDB.startingBalance,
}
}
}
// Register bank for user
let newBank = new User();
newBank.createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance);
newBank.save().catch(err => {
if (err) return client.sendInternalError(interaction, err);
});
} else banking = banking.user;
banking = await createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance, client)
if (!client.exists(banking)) return client.sendInternalError(interaction, err);
}
banking = banking.user;
if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addUser(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance);
commands/purchase-uav.js
+6 -18
View File
@@ -1,6 +1,6 @@
const { EmbedBuilder } = require('discord.js');
const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
const { User, addUser } = require('../structures/user')
const { createUser, addUser } = require('../database/user')
module.exports = {
name: "purchase-uav",
@@ -42,24 +42,12 @@ module.exports = {
let banking = await client.dbo.collection("users").findOne({"user.userID": interaction.member.user.id}).then(banking => banking);
if (!banking) {
banking = {
userID: interaction.member.user.id,
guilds: {
[GuildDB.serverID]: {
balance: GuildDB.startingBalance,
}
}
}
// Register bank for user
let newBank = new User();
newBank.createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance, 0);
newBank.save().catch(err => {
if (err) return client.sendInternalError(interaction, err);
});
} else banking = banking.user;
banking = await createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance, client)
if (!client.exists(banking)) return client.sendInternalError(interaction, err);
}
banking = banking.user;
if (!client.exists(banking.guilds[GuildDB.serverID])) {
const success = addUser(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance);
commands/reset.js
+1 -1
View File
@@ -1,6 +1,6 @@
const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js');
const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
const { addUser } = require('../structures/user');
const { addUser } = require('../database/user');
const bitfieldCalculator = require('discord-bitfield-calculator');
module.exports = {