From 9a2e90cd68fe1002fc1485c1636e849cb8ccee55 Mon Sep 17 00:00:00 2001 From: Taken Date: Sat, 12 Aug 2023 20:10:58 +0200 Subject: [PATCH 1/4] Fixed reqs command --- commands/reqs.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/commands/reqs.js b/commands/reqs.js index a0deece..679e052 100644 --- a/commands/reqs.js +++ b/commands/reqs.js @@ -1,6 +1,6 @@ const { SlashCommandBuilder } = require('discord.js'); const { color } = require('../config/options.json'); -const { bwfdkr, bwstars, bwwins, duelswins, swstars } = require('../config/reqs.json'); +const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require('../config/reqs.json'); module.exports = { name: 'reqs', @@ -29,7 +29,7 @@ module.exports = { name: '**Bedwars**', value: '**Stars:** `' + bwstars.toString() + '`\n**Wins:** `' + bwwins.toString() + - '`\n**FKDR:** `' + bwfdkr.toString() + '`' + '`\n**FKDR:** `' + bwfkdr.toString() + '`' }, { name: '**Skywars**', @@ -37,7 +37,8 @@ module.exports = { }, { name: '**Duels**', - value: '**Wins:** `' + duelswins.toString() + '`' + value: '**Wins:** `' + duelswins.toString() + + '`\n**WLR:** `' + duelswlr.toString() + '`' } ], footer: { @@ -47,4 +48,4 @@ module.exports = { }] }) } -} \ No newline at end of file +} From 1c642c5106a387fc0cb8001913cd8732b84d5f49 Mon Sep 17 00:00:00 2001 From: Taken Date: Sat, 12 Aug 2023 20:12:30 +0200 Subject: [PATCH 2/4] Nicer error message --- commands/verify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/verify.js b/commands/verify.js index 5074c0c..2c4292e 100644 --- a/commands/verify.js +++ b/commands/verify.js @@ -37,7 +37,7 @@ module.exports = { const verifyData = await verify.findOne({ userID: user.id }); if (verifyData) { - interaction.editReply("You are already verified."); + interaction.editReply("You are already verified.\n" + "Try running /update to update your roles.") return; } From fb66c2b7e4d9e20cfc2e43ce1161a6f7f41670bd Mon Sep 17 00:00:00 2001 From: Taken Date: Sat, 12 Aug 2023 20:38:17 +0200 Subject: [PATCH 3/4] Working on forceverify Signed-off-by: Taken --- commands/forceverify.js | 117 +++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 69 deletions(-) diff --git a/commands/forceverify.js b/commands/forceverify.js index ae4b806..4354457 100644 --- a/commands/forceverify.js +++ b/commands/forceverify.js @@ -35,10 +35,13 @@ module.exports = { const user = interaction.guild.members.cache.get(user1.id); const ign = interaction.options.getString('ign'); const mod = interaction.user + + // const slothPixel = "https://api.slothpixel.me/api/players/"; + // const guildAPI = "https://api.slothpixel.me/api/guilds/" const mojang = "https://api.mojang.com/users/profiles/minecraft/" - const slothPixel = "https://api.slothpixel.me/api/players/"; - const guildAPI = "https://api.slothpixel.me/api/guilds/" + const hypixelApi = "https://api.hypixel.net/player" + const guildApi = "https://api.hypixel.net/guild" const minotar = "https://minotar.net/helm/"; const embedColor = Number(color.replace("#", "0x")); @@ -81,84 +84,60 @@ module.exports = { const userCheck = await fetch(mojang + ign); const userUUID = userCheck.data.id; - try { - await fetch(slothPixel + userUUID); - } catch (err) { - interaction.editReply('That player doesn\'t exist. [Hypixel]') - return - } + const player = hypixelApi + "?key=" + hypixelApiKey + "&uuid=" + userUUID + const guild = guildApi + "?key=" + hypixelApiKey + "&player=" + userUUID - const hypixelCheck = await fetch(slothPixel + userUUID); + const hypixelCheck = await fetch(player); + const guildCheck = await fetch(guild) const head = minotar + ign; - try { - const guildCheck = await fetch(guildAPI + userUUID); - var responseGuildID = guildCheck.data.id; - } catch (err) { - var responseGuildID = null; + if (!guildCheck.data.guild) { + var responseGuildID = null + } else { + var responseGuildID = guildCheck.data.guild._id } - if (responseGuildID !== hypixelGuildID) { + const GuildMembers = guildCheck.data.guild.members; + const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.player.uuid).rank; - await user.roles.add(defaultMember, "User was force verified by " + modName); + if (responseGuildID === hypixelGuildID) { + if (guildRank === "Guild Master") { + await user.roles.add(gm, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - await interaction.editReply({ - embeds: [{ - title: interaction.guild.name, - description: "You have successfully force verified `" + username + "` with the account `" + hypixelCheck.data.username + "`.", - color: embedColor, - thumbnail: { - url: head - }, - footer: { - icon_url: interaction.guild.iconURL(), - text: interaction.guild.name + " | Developed by Taken#0002" - } - }] - }); - return - } + if (guildRank === "Manager") { + await user.roles.add(manager, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - const guildCheck = await fetch(guildAPI + userUUID); - const GuildMembers = await guildCheck.data.members; - const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.uuid).rank; + if (guildRank === "Moderator") { + await user.roles.add(moderator, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - if (guildRank === "Guild Master" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(gm, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } + if (guildRank === "Beast") { + await user.roles.add(beast, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } - if (guildRank === "Manager" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(manager, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } + if (guildRank === "Elite") { + await user.roles.add(elite, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } - if (guildRank === "Moderator" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(moderator, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } - - if (guildRank === "Beast" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(beast, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } + if (guildRank === "Member") { + await user.roles.add(member, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } - if (guildRank === "Elite" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(elite, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } - - if (guildRank === "Member" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(member, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } - - if (guildRank === "Trial Member" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(trialmember, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) + if (guildRank === "Trial Member") { + await user.roles.add(trialmember, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } } await user.roles.add(defaultMember, "User was force verified by " + modName); @@ -174,7 +153,7 @@ module.exports = { await interaction.editReply({ embeds: [{ title: interaction.guild.name, - description: "You have successfully force verified `" + username + "` with the account `" + hypixelCheck.data.username + "`.", + description: "You have successfully force verified `" + username + "` with the account `" + hypixelCheck.data.displayName + "`.", color: embedColor, thumbnail: { url: head From 6ac142f16e85fc3d5171ca626b318358a3d70be0 Mon Sep 17 00:00:00 2001 From: Taken Date: Sun, 13 Aug 2023 00:20:53 +0200 Subject: [PATCH 4/4] Moving forceverify to hypixel api Verify formating changes --- commands/forceverify.js | 87 +++++++++++++++++++++++------------------ commands/verify.js | 72 +++++++++++++++++----------------- 2 files changed, 85 insertions(+), 74 deletions(-) diff --git a/commands/forceverify.js b/commands/forceverify.js index 4354457..6ec021d 100644 --- a/commands/forceverify.js +++ b/commands/forceverify.js @@ -86,10 +86,21 @@ module.exports = { const player = hypixelApi + "?key=" + hypixelApiKey + "&uuid=" + userUUID const guild = guildApi + "?key=" + hypixelApiKey + "&player=" + userUUID + const head = minotar + ign; const hypixelCheck = await fetch(player); + + if (!hypixelCheck.data.player) { + interaction.editReply({ + embeds: [{ + description: " That player hasn't played Hypixel before.", + color: embedColor + }] + }); + return; + } + const guildCheck = await fetch(guild) - const head = minotar + ign; if (!guildCheck.data.guild) { var responseGuildID = null @@ -97,48 +108,48 @@ module.exports = { var responseGuildID = guildCheck.data.guild._id } - const GuildMembers = guildCheck.data.guild.members; - const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.player.uuid).rank; - if (responseGuildID === hypixelGuildID) { - if (guildRank === "Guild Master") { - await user.roles.add(gm, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } + const GuildMembers = guildCheck.data.guild.members; + const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.player.uuid).rank; - if (guildRank === "Manager") { - await user.roles.add(manager, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } + if (guildRank === "Guild Master") { + await user.roles.add(gm, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - if (guildRank === "Moderator") { - await user.roles.add(moderator, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } + if (guildRank === "Manager") { + await user.roles.add(manager, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - if (guildRank === "Beast") { - await user.roles.add(beast, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } + if (guildRank === "Moderator") { + await user.roles.add(moderator, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - if (guildRank === "Elite") { - await user.roles.add(elite, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } + if (guildRank === "Beast") { + await user.roles.add(beast, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } - if (guildRank === "Member") { - await user.roles.add(member, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } + if (guildRank === "Elite") { + await user.roles.add(elite, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } - if (guildRank === "Trial Member") { - await user.roles.add(trialmember, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } - } + if (guildRank === "Member") { + await user.roles.add(member, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } + + if (guildRank === "Trial Member") { + await user.roles.add(trialmember, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } + } await user.roles.add(defaultMember, "User was force verified by " + modName); @@ -153,7 +164,7 @@ module.exports = { await interaction.editReply({ embeds: [{ title: interaction.guild.name, - description: "You have successfully force verified `" + username + "` with the account `" + hypixelCheck.data.displayName + "`.", + description: "You have successfully force verified `" + username + "` with the account `" + hypixelCheck.data.player.displayname + "`.", color: embedColor, thumbnail: { url: head @@ -166,4 +177,4 @@ module.exports = { }); } -}; +}; \ No newline at end of file diff --git a/commands/verify.js b/commands/verify.js index 2c4292e..f776511 100644 --- a/commands/verify.js +++ b/commands/verify.js @@ -121,48 +121,48 @@ module.exports = { var guildID = guildCheck.data.guild._id } - if (guildID === hypixelGuildID) { - const GuildMembers = guildCheck.data.guild.members - const guildRank = GuildMembers.find((member) => member.uuid === stats.data.player.uuid).rank; + if (guildID === hypixelGuildID) { + const GuildMembers = guildCheck.data.guild.members + const guildRank = GuildMembers.find((member) => member.uuid === stats.data.player.uuid).rank; - if (guildRank === "Guild Master" && guildID === hypixelGuildID) { - await user.roles.add(gm, "Verification"); - await user.roles.add(guildRole, "Verification"); - await user.roles.add(guildStaff, "Verification"); - } + if (guildRank === "Guild Master" && guildID === hypixelGuildID) { + await user.roles.add(gm, "Verification"); + await user.roles.add(guildRole, "Verification"); + await user.roles.add(guildStaff, "Verification"); + } - if (guildRank === "Manager" && guildID === hypixelGuildID) { - await user.roles.add(manager, "Verification"); - await user.roles.add(guildRole, "Verification"); - await user.roles.add(guildStaff, "Verification"); - } + if (guildRank === "Manager" && guildID === hypixelGuildID) { + await user.roles.add(manager, "Verification"); + await user.roles.add(guildRole, "Verification"); + await user.roles.add(guildStaff, "Verification"); + } - if (guildRank === "Moderator" && guildID === hypixelGuildID) { - await user.roles.add(moderator, "Verification"); - await user.roles.add(guildRole, "Verification"); - await user.roles.add(guildStaff, "Verification"); - } + if (guildRank === "Moderator" && guildID === hypixelGuildID) { + await user.roles.add(moderator, "Verification"); + await user.roles.add(guildRole, "Verification"); + await user.roles.add(guildStaff, "Verification"); + } - if (guildRank === "Beast" && guildID === hypixelGuildID) { - await user.roles.add(beast, "Verification"); - await user.roles.add(guildRole, "Verification"); - } + if (guildRank === "Beast" && guildID === hypixelGuildID) { + await user.roles.add(beast, "Verification"); + await user.roles.add(guildRole, "Verification"); + } - if (guildRank === "Elite" && guildID === hypixelGuildID) { - await user.roles.add(elite, "Verification"); - await user.roles.add(guildRole, "Verification"); - } + if (guildRank === "Elite" && guildID === hypixelGuildID) { + await user.roles.add(elite, "Verification"); + await user.roles.add(guildRole, "Verification"); + } - if (guildRank === "Member" && guildID === hypixelGuildID) { - await user.roles.add(member, "Verification"); - await user.roles.add(guildRole, "Verification"); - } + if (guildRank === "Member" && guildID === hypixelGuildID) { + await user.roles.add(member, "Verification"); + await user.roles.add(guildRole, "Verification"); + } - if (guildRank === "Trial Member" && guildID === hypixelGuildID) { - await user.roles.add(trialmember, "Verification"); - await user.roles.add(guildRole, "Verification"); - } - } + if (guildRank === "Trial Member" && guildID === hypixelGuildID) { + await user.roles.add(trialmember, "Verification"); + await user.roles.add(guildRole, "Verification"); + } + } await user.roles.add(defaultMember, "Verification"); @@ -191,4 +191,4 @@ module.exports = { ] }); } -}; +}; \ No newline at end of file