Merge branch 'dev' into 'main'

Modifing update and forceupdate

See merge request illegitimate/illegitimate-bot!8
This commit is contained in:
2023-08-12 22:53:25 +00:00
3 changed files with 370 additions and 373 deletions

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@ node_modules/*
.env .env
.prettierrc .prettierrc
.editorconfig .editorconfig
dev-deploy.js

View File

@@ -1,4 +1,6 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js'); const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js');
const env = require('dotenv').config();
const { hypixelAPIKey } = process.env.HYPIXELAPIKEY;
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')
@@ -27,47 +29,41 @@ module.exports = {
const user = interaction.options.getUser('user'); const user = interaction.options.getUser('user');
const usermentioned = userMention(user.id); const usermentioned = userMention(user.id);
const guild = interaction.guild;
const verifyData = await verify.findOne({ userID: user.id }) const verifyData = await verify.findOne({ userID: user.id })
const embedColor = Number(color.replace("#", "0x")); const embedColor = Number(color.replace("#", "0x"));
const user1 = guild.members.cache.get(user.id); const user1 = interaction.guild.members.cache.get(user.id);
const roleManage = user1.roles; const roleManage = user1.roles;
if (!verifyData) { if (!verifyData) {
for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
}
await interaction.editReply({ await interaction.editReply({
embeds: [{ embeds: [{
description: usermentioned + " was given the the Default Member role.", 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 })
} }
}] }]
}) })
await roleManage.add(defaultMember, "User was force updated.")
return return
} }
const slothPixel = "https://api.slothpixel.me/api/players/";
const guildAPI = "https://api.slothpixel.me/api/guilds/"
const mojangAPI = "https://api.mojang.com/user/profile/" const mojangAPI = "https://api.mojang.com/user/profile/"
const guildlAPI = "https://api.hypixel.net/guild"
const minotar = "https://minotar.net/helm/"; const minotar = "https://minotar.net/helm/";
const guild = guildlAPI + "?key=" + hypixelAPIKey + "&player=" + verifyData.uuid;
const userCheck = await fetch(mojangAPI + verifyData.uuid); const userCheck = await fetch(mojangAPI + verifyData.uuid);
const hypixelCheck = await fetch(slothPixel + verifyData.uuid); const guildCheck = await fetch(guild);
const head = minotar + userCheck.data.name; const head = minotar + userCheck.data.name;
try { if (!guildCheck.data.guild) {
const guildCheck = await fetch(guildAPI + verifyData.uuid); var responseGuildID = null
var responseGuildID = guildCheck.data.id; } else {
} catch (err) { var responseGuildID = guildCheck.data.guild._id
var responseGuildID = null;
} }
if (responseGuildID !== hypixelGuildID) { if (responseGuildID !== hypixelGuildID) {
@@ -93,11 +89,12 @@ module.exports = {
return return
} }
const guildCheck = await fetch(guildAPI + verifyData.uuid); if (responseGuildID === hypixelGuildID) {
const GuildMembers = await guildCheck.data.members; const GuildMembers = await guildCheck.data.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' && responseGuildID === hypixelGuildID) { if (guildRank === 'Guild Master') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
@@ -124,7 +121,7 @@ module.exports = {
}) })
} }
if (guildRank === 'Manager' && responseGuildID === hypixelGuildID) { if (guildRank === 'Manager') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
@@ -151,7 +148,7 @@ module.exports = {
}) })
} }
if (guildRank === 'Moderator' && responseGuildID === hypixelGuildID) { if (guildRank === 'Moderator') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
@@ -179,7 +176,7 @@ module.exports = {
} }
if (guildRank === 'Beast' && responseGuildID === hypixelGuildID) { if (guildRank === 'Beast') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
@@ -206,7 +203,7 @@ module.exports = {
return return
} }
if (guildRank === 'Elite' && responseGuildID === hypixelGuildID) { if (guildRank === 'Elite') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
@@ -233,7 +230,7 @@ module.exports = {
return return
} }
if (guildRank === 'Member' && responseGuildID === hypixelGuildID) { if (guildRank === 'Member') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
@@ -260,7 +257,7 @@ module.exports = {
return return
} }
if (guildRank === 'Trial Member' && responseGuildID === hypixelGuildID) { if (guildRank === 'Trial Member') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
@@ -288,3 +285,4 @@ module.exports = {
} }
} }
} }
}

View File

@@ -45,14 +45,10 @@ module.exports = {
} }
const mojangAPI = "https://api.mojang.com/user/profile/" const mojangAPI = "https://api.mojang.com/user/profile/"
const hypixel = "https://api.hypixel.net/player"
const guildAPI = "https://api.hypixel.net/guild" const guildAPI = "https://api.hypixel.net/guild"
const minotar = "https://minotar.net/helm/"; const minotar = "https://minotar.net/helm/";
const player = hypixel + "?key=" + hypixelApiKey + "&uuid=" + verifyData.uuid
const userCheck = await fetch(mojangAPI + verifyData.uuid); const userCheck = await fetch(mojangAPI + verifyData.uuid);
const head = minotar + userCheck.data.name; const head = minotar + userCheck.data.name;
const guild = guildAPI + "?key=" + hypixelApiKey + "&player=" + verifyData.uuid const guild = guildAPI + "?key=" + hypixelApiKey + "&player=" + verifyData.uuid
const guildCheck = await fetch(guild); const guildCheck = await fetch(guild);
@@ -86,10 +82,12 @@ module.exports = {
return return
} }
if (guildID === hypixelGuildID) {
const GuildMembers = guildCheck.data.guild.members; const GuildMembers = guildCheck.data.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' && guildID === hypixelGuildID) { if (guildRank === 'Guild Master') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -116,7 +114,7 @@ module.exports = {
}) })
} }
if (guildRank === 'Manager' && guildID === hypixelGuildID) { if (guildRank === 'Manager') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -143,7 +141,7 @@ module.exports = {
}) })
} }
if (guildRank === 'Moderator' && guildID === hypixelGuildID) { if (guildRank === 'Moderator') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -171,7 +169,7 @@ module.exports = {
} }
if (guildRank === 'Beast' && guildID === hypixelGuildID) { if (guildRank === 'Beast') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -198,7 +196,7 @@ module.exports = {
return return
} }
if (guildRank === 'Elite' && guildID === hypixelGuildID) { if (guildRank === 'Elite') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -225,7 +223,7 @@ module.exports = {
return return
} }
if (guildRank === 'Member' && guildID === hypixelGuildID) { if (guildRank === 'Member') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -252,7 +250,7 @@ module.exports = {
return return
} }
if (guildRank === 'Trial Member' && guildID === hypixelGuildID) { if (guildRank === 'Trial Member') {
for (let i = 0; i < removeThese.length; i++) { for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Update)") await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -278,6 +276,6 @@ module.exports = {
}) })
return return
} }
}
} }
}; };