illegitimate/illegitimate-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated commands using hypixel api to use utils

Browse Source
This commit is contained in:
Taken
2023-11-17 17:41:20 +01:00
parent 6c7afbe98a
commit d0d9524ae6
6 changed files with 58 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands/forceunverify.js
View File

@@ -1,7 +1,6 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js'); const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js');
const { color } = require("../config/options.json"); const { color } = require("../config/options.json");
const verify = require("../schemas/verifySchema.js"); const verify = require("../schemas/verifySchema.js");
const mongoose = require("mongoose");
const { gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember } = require("../config/roles.json"); const { gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember } = require("../config/roles.json");
const removeThese = [gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember] const removeThese = [gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember]
@@ -28,7 +27,6 @@ module.exports = {
const member = interaction.guild.members.cache.get(member1.id) const member = interaction.guild.members.cache.get(member1.id)
const embedColor = Number(color.replace('#', '0x')) const embedColor = Number(color.replace('#', '0x'))
const verifiedUser = await verify.findOne({ userID: member1.id }) const verifiedUser = await verify.findOne({ userID: member1.id })
const user = interaction.user
if (!verifiedUser) { if (!verifiedUser) {
return interaction.reply({ return interaction.reply({
@@ -45,7 +43,7 @@ module.exports = {
await interaction.reply({ await interaction.reply({
embeds: [{ embeds: [{
description: "Successfully unverified" + userMention(member1.id), description: "Successfully unverified " + userMention(member1.id),
color: embedColor, color: embedColor,
footer: { footer: {
text: interaction.guild.name + " | Developed by taken.lua", text: interaction.guild.name + " | Developed by taken.lua",

19
commands/forceupdate.js
View File

@@ -1,9 +1,8 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js'); const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js');
const hypixelAPIKey = process.env.HYPIXELAPIKEY; const { getGuild, getHeadURL, getIGN } = require('../utils/utils.js')
const { hypixelGuildID, color } = require('../config/options.json'); const { hypixelGuildID, color } = require('../config/options.json');
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require('../config/roles.json'); const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require('../config/roles.json');
const verify = require('../schemas/verifySchema.js') const verify = require('../schemas/verifySchema.js')
const fetch = require('axios');
const removeThese = [gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff] const removeThese = [gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff]
module.exports = { module.exports = {
@@ -50,18 +49,14 @@ module.exports = {
return return
} }
const mojangAPI = "https://api.mojang.com/user/profile/" const ign = await getIGN(verifyData.uuid);
const guildlAPI = "https://api.hypixel.net/guild" const head = await getHeadURL(ign)
const minotar = "https://minotar.net/helm/"; const guild = await getGuild(verifyData.uuid);
const guild = guildlAPI + "?key=" + hypixelAPIKey + "&player=" + verifyData.uuid;
const userCheck = await fetch(mojangAPI + verifyData.uuid);
const guildCheck = await fetch(guild);
const head = minotar + userCheck.data.name;
if (!guildCheck.data.guild) { if (!guild) {
var responseGuildID = null var responseGuildID = null
} else { } else {
var responseGuildID = guildCheck.data.guild._id var responseGuildID = guild._id
} }
if (responseGuildID !== hypixelGuildID) { if (responseGuildID !== hypixelGuildID) {
@@ -89,7 +84,7 @@ module.exports = {
if (responseGuildID === hypixelGuildID) { if (responseGuildID === hypixelGuildID) {
const GuildMembers = guildCheck.data.guild.members; const GuildMembers = guild.members;
const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank; const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank;
if (guildRank === 'Guild Master') { if (guildRank === 'Guild Master') {

62
commands/forceverify.js
View File

@@ -1,6 +1,5 @@
const { SlashCommandBuilder, PermissionFlagsBits } = require('discord.js'); const { SlashCommandBuilder, PermissionFlagsBits } = require('discord.js');
const hypixelApiKey = process.env.HYPIXELAPIKEY; const { getUUID, getPlayer, getGuild, getHeadURL } = require('../utils/utils.js');
const fetch = require('axios');
const { color, hypixelGuildID } = require('../config/options.json'); const { color, hypixelGuildID } = require('../config/options.json');
const verify = require('../schemas/verifySchema.js') const verify = require('../schemas/verifySchema.js')
const { mongoose } = require('mongoose'); const { mongoose } = require('mongoose');
@@ -36,25 +35,16 @@ module.exports = {
const user = interaction.guild.members.cache.get(user1.id); const user = interaction.guild.members.cache.get(user1.id);
const ign = interaction.options.getString('ign'); const ign = interaction.options.getString('ign');
const mod = interaction.user 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 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")); const embedColor = Number(color.replace("#", "0x"));
if (!user) { const verifyData = await verify.findOne({ userID: user.id })
interaction.editReply('Please provide a user to force verify.\nThis can also mean the user is not in the server.') if (verifyData) {
interaction.editReply('That user is already verified.')
return return
} }
const verifyData = await verify.findOne({ userID: user.id }) if (!user) {
interaction.editReply('Please provide a user to force verify.\nThis can also mean the user is not in the server.')
if (verifyData) {
interaction.editReply('That user is already verified.')
return return
} }
@@ -75,23 +65,19 @@ module.exports = {
var modName = mod.username + "#" + mod.discriminator var modName = mod.username + "#" + mod.discriminator
} }
try { const uuid = await getUUID(ign);
await fetch(mojang + ign); if (!uuid) {
} catch (err) { interaction.editReply({
interaction.editReply('That player doesn\'t exist. [Mojang]') embeds: [{
description: "<a:questionmark_pink:1130206038008803488> That player doesn't exist.",
color: embedColor
}]
})
return return
} }
const userCheck = await fetch(mojang + ign); const player = await getPlayer(uuid);
const userUUID = userCheck.data.id; if (!player) {
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({ interaction.editReply({
embeds: [{ embeds: [{
description: "<a:questionmark_pink:1130206038008803488> That player hasn't played Hypixel before.", description: "<a:questionmark_pink:1130206038008803488> That player hasn't played Hypixel before.",
@@ -101,17 +87,17 @@ module.exports = {
return; return;
} }
const guildCheck = await fetch(guild) const guild = await getGuild(uuid);
if (!guild) {
if (!guildCheck.data.guild) {
var responseGuildID = null var responseGuildID = null
} else { } else {
var responseGuildID = guildCheck.data.guild._id var responseGuildID = guild._id
} }
const head = await getHeadURL(ign);
if (responseGuildID === hypixelGuildID) { if (responseGuildID === hypixelGuildID) {
const GuildMembers = guildCheck.data.guild.members; const GuildMembers = guild.members;
const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.player.uuid).rank; const guildRank = GuildMembers.find(member => member.uuid === player.uuid).rank;
if (guildRank === "Guild Master") { if (guildRank === "Guild Master") {
await user.roles.add(gm, "User was force verified by " + modName); await user.roles.add(gm, "User was force verified by " + modName);
@@ -157,7 +143,7 @@ module.exports = {
const newVerify = new verify({ const newVerify = new verify({
_id: new mongoose.Types.ObjectId(), _id: new mongoose.Types.ObjectId(),
userID: user.id, userID: user.id,
uuid: userUUID uuid: uuid
}) })
await newVerify.save(); await newVerify.save();
@@ -165,7 +151,7 @@ module.exports = {
await interaction.editReply({ await interaction.editReply({
embeds: [{ embeds: [{
title: interaction.guild.name, title: interaction.guild.name,
description: "You have successfully force verified `" + username + "` with the account `" + hypixelCheck.data.player.displayname + "`.", description: "You have successfully force verified `" + username + "` with the account `" + player.displayname + "`.",
color: embedColor, color: embedColor,
thumbnail: { thumbnail: {
url: head url: head

23
commands/update.js
View File

@@ -1,6 +1,5 @@
const { SlashCommandBuilder } = require('discord.js'); const { SlashCommandBuilder } = require('discord.js');
const hypixelApiKey = process.env.HYPIXELAPIKEY; const { getGuild, getIGN, getHeadURL } = require('../utils/utils.js');
const fetch = require('axios');
const verify = require('../schemas/verifySchema.js') const verify = require('../schemas/verifySchema.js')
const { color, hypixelGuildID } = require('../config/options.json'); const { color, hypixelGuildID } = require('../config/options.json');
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require('../config/roles.json'); const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require('../config/roles.json');
@@ -33,9 +32,6 @@ module.exports = {
embeds: [{ embeds: [{
description: "You are not verified. Please run `/verify` to verify yourself", description: "You are not verified. Please run `/verify` to verify yourself",
color: embedColor, color: embedColor,
thumbnail: {
url: head
},
footer: { footer: {
text: interaction.guild.name + " | Developed by @Taken#0002", text: interaction.guild.name + " | Developed by @Taken#0002",
icon_url: interaction.guild.iconURL({ dynamic: true }) icon_url: interaction.guild.iconURL({ dynamic: true })
@@ -45,20 +41,15 @@ module.exports = {
return return
} }
const mojangAPI = "https://api.mojang.com/user/profile/" const guild = await getGuild(verifyData.uuid);
const guildAPI = "https://api.hypixel.net/guild" if (!guild) {
const minotar = "https://minotar.net/helm/";
const userCheck = await fetch(mojangAPI + verifyData.uuid);
const head = minotar + userCheck.data.name;
const guild = guildAPI + "?key=" + hypixelApiKey + "&player=" + verifyData.uuid
const guildCheck = await fetch(guild);
if (!guildCheck.data.guild) {
var guildID = null var guildID = null
} else { } else {
var guildID = guildCheck.data.guild._id var guildID = guild._id
} }
const ign = await getIGN(verifyData.uuid);
const head = await getHeadURL(ign);
if (guildID !== hypixelGuildID) { if (guildID !== hypixelGuildID) {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
@@ -85,7 +76,7 @@ module.exports = {
if (guildID === hypixelGuildID) { if (guildID === hypixelGuildID) {
const GuildMembers = guildCheck.data.guild.members; const GuildMembers = guild.members;
const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank; const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank;
if (guildRank === 'Guild Master') { if (guildRank === 'Guild Master') {

46
commands/verify.js
View File

@@ -1,6 +1,5 @@
const { SlashCommandBuilder } = require("discord.js"); const { SlashCommandBuilder } = require("discord.js");
const hypixelApiKey = process.env.HYPIXELAPIKEY; const { getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js");
const fetch = require("axios");
const { color, hypixelGuildID } = require("../config/options.json"); const { color, hypixelGuildID } = require("../config/options.json");
const verify = require("../schemas/verifySchema.js"); const verify = require("../schemas/verifySchema.js");
const mongoose = require("mongoose"); const mongoose = require("mongoose");
@@ -28,15 +27,9 @@ module.exports = {
const user1 = interaction.user const user1 = interaction.user
const user = interaction.guild.members.cache.get(user1.id); const user = interaction.guild.members.cache.get(user1.id);
const ign = interaction.options.getString("ign"); const ign = interaction.options.getString("ign");
const mojang = "https://api.mojang.com/users/profiles/minecraft/";
const hypixel = "https://api.hypixel.net/player"
const guildAPI = "https://api.hypixel.net/guild"
const minotar = "https://minotar.net/helm/";
const embedColor = Number(color.replace("#", "0x")); const embedColor = Number(color.replace("#", "0x"));
const head = minotar + ign;
const verifyData = await verify.findOne({ userID: user.id }); const verifyData = await verify.findOne({ userID: user.id });
if (verifyData) { if (verifyData) {
interaction.editReply("You are already verified.\n" + "Try running /update to update your roles.") interaction.editReply("You are already verified.\n" + "Try running /update to update your roles.")
return; return;
@@ -52,9 +45,8 @@ module.exports = {
return; return;
} }
try { const uuid = await getUUID(ign);
await fetch(mojang + ign); if (!uuid) {
} catch (err) {
interaction.editReply({ interaction.editReply({
embeds: [{ embeds: [{
description: "<a:questionmark_pink:1130206038008803488> That player does not exist.", description: "<a:questionmark_pink:1130206038008803488> That player does not exist.",
@@ -64,13 +56,9 @@ module.exports = {
return; return;
} }
const userCheck = await fetch(mojang + ign); const head = await getHeadURL(ign);
const userUUID = userCheck.data.id; const player = await getPlayer(uuid);
if (!player) {
const player = hypixel + "?key=" + hypixelApiKey + "&uuid=" + userUUID
const stats = await fetch(player);
if (!stats.data.player) {
interaction.editReply({ interaction.editReply({
embeds: [{ embeds: [{
description: "<a:questionmark_pink:1130206038008803488> That player hasn't played Hypixel before.", description: "<a:questionmark_pink:1130206038008803488> That player hasn't played Hypixel before.",
@@ -86,7 +74,7 @@ module.exports = {
var username = user1.username + "#" + user1.discriminator var username = user1.username + "#" + user1.discriminator
} }
if (!stats.data.player.socialMedia) { if (!player.socialMedia) {
interaction.editReply({ interaction.editReply({
embeds: [ embeds: [
{ {
@@ -99,7 +87,7 @@ module.exports = {
return; return;
} }
if (!stats.data.player.socialMedia.links.DISCORD) { if (!player.socialMedia.links.DISCORD) {
interaction.editReply({ interaction.editReply({
embeds: [ embeds: [
{ {
@@ -112,7 +100,7 @@ module.exports = {
return; return;
} }
const linkedDiscord = stats.data.player.socialMedia.links.DISCORD const linkedDiscord = player.socialMedia.links.DISCORD
if (linkedDiscord !== username) { if (linkedDiscord !== username) {
interaction.editReply({ interaction.editReply({
@@ -127,18 +115,16 @@ module.exports = {
return; return;
} }
const guild = guildAPI + "?key=" + hypixelApiKey + "&player=" + userUUID const guild = await getGuild(uuid);
const guildCheck = await fetch(guild); if (!guild) {
if (!guildCheck.data.guild) {
var guildID = null var guildID = null
} else { } else {
var guildID = guildCheck.data.guild._id var guildID = guild._id
} }
if (guildID === hypixelGuildID) { if (guildID === hypixelGuildID) {
const GuildMembers = guildCheck.data.guild.members const GuildMembers = guild.members
const guildRank = GuildMembers.find((member) => member.uuid === stats.data.player.uuid).rank; const guildRank = GuildMembers.find((member) => member.uuid === player.uuid).rank;
if (guildRank === "Guild Master" && guildID === hypixelGuildID) { if (guildRank === "Guild Master" && guildID === hypixelGuildID) {
await user.roles.add(gm, "Verification"); await user.roles.add(gm, "Verification");
@@ -184,7 +170,7 @@ module.exports = {
const newVerify = new verify({ const newVerify = new verify({
_id: new mongoose.Types.ObjectId(), _id: new mongoose.Types.ObjectId(),
userID: user.id, userID: user.id,
uuid: userUUID uuid: uuid
}); });
await newVerify.save(); await newVerify.save();
@@ -193,7 +179,7 @@ module.exports = {
embeds: [ embeds: [
{ {
title: interaction.guild.name, title: interaction.guild.name,
description: "You have successfully verified `" + username + "` with the account `" + stats.data.player.displayname + "`.", description: "You have successfully verified `" + username + "` with the account `" + player.displayname + "`.",
color: embedColor, color: embedColor,
thumbnail: { thumbnail: {
url: head url: head

10
commands/whois.js
View File

@@ -1,7 +1,7 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js'); const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js');
const { getIGN, getHeadURL } = require('../utils/utils.js')
const { color } = require('../config/options.json'); const { color } = require('../config/options.json');
const verify = require('../schemas/verifySchema.js'); const verify = require('../schemas/verifySchema.js');
const fetch = require('axios');
module.exports = { module.exports = {
name: 'whois', name: 'whois',
@@ -27,19 +27,15 @@ module.exports = {
const user = interaction.options.getUser('user'); const user = interaction.options.getUser('user');
const embedColor = Number(color.replace("#", "0x")); const embedColor = Number(color.replace("#", "0x"));
const mojang = "https://api.mojang.com/user/profile/"
const minotar = "https://minotar.net/helm/";
const verifiedUser = await verify.findOne({ userID: user.id }); const verifiedUser = await verify.findOne({ userID: user.id });
if (!verifiedUser) { if (!verifiedUser) {
interaction.editReply({ content: 'This user has not verified their account.' }); interaction.editReply({ content: 'This user has not verified their account.' });
return return
} }
const userCheck = await fetch(mojang + verifiedUser.uuid); const ign = await getIGN(verifiedUser.uuid);
const ign = userCheck.data.name; const head = await getHeadURL(ign)
const head = minotar + ign;
await interaction.editReply({ await interaction.editReply({
embeds: [{ embeds: [{