diff --git a/commands/update.js b/commands/update.js index 002ded5..a71cbd8 100644 --- a/commands/update.js +++ b/commands/update.js @@ -14,10 +14,6 @@ module.exports = { data: new SlashCommandBuilder() .setName('update') .setDescription('Update your guild rank.') - .addStringOption(option => - option - .setName('user') - .setDescription('The user you want to update.')) .setDMPermission(false), async execute(interaction) { @@ -32,15 +28,8 @@ module.exports = { interaction.reply('You are not verified.') return } - - if (interaction.options.getUser('user') && !memberRoles.has(moderator || manager || gm)) { - await interaction.reply({ content: "Only moderators can update other users", ephemeral: true }) - return - } - - const user = interaction.options.getUser('user') ?? interaction.user; - + const user = interaction.user; const slothPixel = "https://api.slothpixel.me/api/players/"; const guildAPI = "https://api.slothpixel.me/api/guilds/" const mojangAPI = "https://api.mojang.com/user/profile/" @@ -55,6 +44,23 @@ module.exports = { const GuildMembers = await guildCheck.data.members; const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank; + if (guildCheck.data.id !== "5a353a170cf2e529044f2935") { + interaction.reply({ + embeds: [{ + description: "Updating is only available for members of the guild.", + color: embedColor, + thumbnail: { + url: head + }, + footer: { + text: interaction.guild.name + " | Developed by @Taken#0002", + icon_url: interaction.guild.iconURL({ dynamic: true }) + } + }] + }) + return + } + if (guildRank === 'Guild Master') { await roleManage.remove(gm || manager || moderator || beast || member || trialmember || guildRole || guildStaff) await roleManage.add(guildRole) diff --git a/commands/verify.js b/commands/verify.js index cf0590e..e847dca 100644 --- a/commands/verify.js +++ b/commands/verify.js @@ -4,7 +4,7 @@ const fetch = require('axios'); const { color } = require('../config/options.json'); const verify = require('../schemas/verifySchema.js') const mongoose = require('mongoose'); -const { gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff } = require('../config/roles.json'); +const { gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember } = require('../config/roles.json'); module.exports = { @@ -42,7 +42,6 @@ module.exports = { const head = minotar + ign; const GuildMembers = await guildCheck.data.members; - const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.uuid).rank; if (!ign) { @@ -60,11 +59,6 @@ module.exports = { return } - if (guildCheck.data.id !== "5a353a170cf2e529044f2935") { - interaction.reply('You are not a member of the guild.') - return - } - if (hypixelCheck.data.links.DISCORD !== fullUsername) { interaction.reply('Your Discord tag does not match your in-game tag.') return @@ -77,46 +71,47 @@ module.exports = { return } - if (guildRank === "Guild Master") { + if (guildRank === "Guild Master" && guildCheck.data.id == "5a353a170cf2e529044f2935") { await user.roles.add(gm); await user.roles.add(guildRole) await user.roles.add(guildStaff) } - if (guildRank === "Manager") { + if (guildRank === "Manager" && guildCheck.data.id == "5a353a170cf2e529044f2935") { await user.roles.add(manager); await user.roles.add(guildRole) await user.roles.add(guildStaff) } - if (guildRank === "Moderator") { + if (guildRank === "Moderator" && guildCheck.data.id == "5a353a170cf2e529044f2935") { await user.roles.add(moderator); await user.roles.add(guildRole) await user.roles.add(guildStaff) } - if (guildRank === "Beast") { + if (guildRank === "Beast" && guildCheck.data.id == "5a353a170cf2e529044f2935") { await user.roles.add(beast); await user.roles.add(guildRole) } - if (guildRank === "Member") { + if (guildRank === "Member" && guildCheck.data.id == "5a353a170cf2e529044f2935") { await user.roles.add(member); await user.roles.add(guildRole) } - if (guildRank === "Trial Member") { + if (guildRank === "Trial Member" && guildCheck.data.id == "5a353a170cf2e529044f2935") { await user.roles.add(trialmember); await user.roles.add(guildRole) } - // write to database using verifySchema + await user.roles.add(defaultMember) + const newVerify = new verify({ _id: new mongoose.Types.ObjectId(), userID: user.id, - uuid: hypixelCheck.data.uuid, - rank: guildRank + uuid: userUUID }) + await newVerify.save() await interaction.reply({ diff --git a/config/roles.json b/config/roles.json index 0674a25..98d9e72 100644 --- a/config/roles.json +++ b/config/roles.json @@ -5,6 +5,7 @@ "beast": "815880942345519104", "member": "815880984301404190", "trialmember": "815877333532540938", + "guildStaff": "984584711227703336", "guildRole": "1043224015722000514", - "guildStaff": "984584711227703336" + "defaultMember": "722386801930797056" } \ No newline at end of file diff --git a/schemas/verifySchema.js b/schemas/verifySchema.js index 755703f..995c5eb 100644 --- a/schemas/verifySchema.js +++ b/schemas/verifySchema.js @@ -4,7 +4,6 @@ const verifySchema = new Schema({ _id: Schema.Types.ObjectId, userID: { type: String, required: true }, uuid: { type: String, required: true }, - rank: { type: String, required: true }, }); module.exports = model('verify', verifySchema, 'verify'); \ No newline at end of file