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

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request illegitimate/illegitimate-bot!103
This commit is contained in:
Taken
2023-11-30 11:47:21 +00:00
parent 31217182a1 c298eb5f45
commit 5ebebda067
24 changed files with 108 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/options.json
View File

@@ -1,5 +1,6 @@
{
"color": "#eeaadb",
"devMessage": "Developed by taken.lua",
"applicationsChannel": "776705352456470550",
"staffApplicationsChannel": "1039258641393520700",
"inactivityLogChannel": "829742524796239882",

3
src/commands/ban.js
View File

@@ -93,9 +93,10 @@ module.exports = {
"**Messages Deleted:** " + messageDeletionDays + " days",
color: embedColor,
footer: {
text: member.user.id,
text: "ID: " + member.user.id,
icon_url: member.user.avatarURL({ dynamic: true })
},
timestamp: new Date()
}]
})

4
src/commands/check.js
View File

@@ -1,6 +1,6 @@
const { SlashCommandBuilder } = require("discord.js")
const { bwfkdr, bwstars, bwwins, swstars, swkdr, duelswins, duelswlr } = require("../../config/reqs.json")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
const { hypixelLevel, bedwarsLevel, skywarsLevel, getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js")
module.exports = {
@@ -216,7 +216,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL()
},
fields: statsFields

4
src/commands/forceunverify.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
const verify = require("../schemas/verifySchema.js")
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]
@@ -46,7 +46,7 @@ module.exports = {
description: "Successfully unverified " + userMention(member1.id),
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by taken.lua",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]

20
src/commands/forceupdate.js
View File

@@ -1,6 +1,6 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
const { getGuild, getHeadURL, getIGN } = require("../utils/utils.js")
const { hypixelGuildID, color } = require("../../config/options.json")
const { hypixelGuildID, color, devMessage } = require("../../config/options.json")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const verify = require("../schemas/verifySchema.js")
const removeThese = [gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff]
@@ -41,7 +41,7 @@ module.exports = {
description: "User is not verified.",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -74,7 +74,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -108,7 +108,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -135,7 +135,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -162,7 +162,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -189,7 +189,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -216,7 +216,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -243,7 +243,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -270,7 +270,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]

4
src/commands/forceverify.js
View File

@@ -1,6 +1,6 @@
const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js")
const { getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js")
const { color, hypixelGuildID } = require("../../config/options.json")
const { color, hypixelGuildID, devMessage } = require("../../config/options.json")
const verify = require("../schemas/verifySchema.js")
const { mongoose } = require("mongoose")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
@@ -161,7 +161,7 @@ module.exports = {
},
footer: {
icon_url: interaction.guild.iconURL(),
text: interaction.guild.name + " | Developed by Taken#0002"
text: interaction.guild.name + " | " + devMessage
}
}]
})

4
src/commands/guild.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder } = require("discord.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
const { guildMember } = require("./guild/member.js")
const { guildInfo } = require("./guild/info.js")
@@ -59,7 +59,7 @@ module.exports = {
description: "This command is currently under development",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by taken.lua",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]

4
src/commands/guild/info.js
View File

@@ -1,5 +1,5 @@
const { getUUID, getIGN, getPlayer, getGuild, guildLevel } = require("../../utils/utils.js")
const { color } = require("../../../config/options.json")
const { color, devMessage } = require("../../../config/options.json")
/** @param { import('discord.js').ChatInputCommandInteraction } interaction */
@@ -95,7 +95,7 @@ async function guildInfo(interaction) {
],
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by taken.lua",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]

12
src/commands/guild/member.js
View File

@@ -1,5 +1,5 @@
const { getUUID, getPlayer, getGuild, getHeadURL } = require("../../utils/utils.js")
const { color } = require("../../../config/options.json")
const { color, devMessage } = require("../../../config/options.json")
/** @param { import('discord.js').ChatInputCommandInteraction } interaction */
@@ -14,10 +14,6 @@ async function guildMember(interaction) {
{
description: "This user does not exist",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by taken.lua",
icon_url: interaction.guild.iconURL({ dynamic: true }),
},
},
],
})
@@ -36,7 +32,7 @@ async function guildMember(interaction) {
url: head,
},
footer: {
text: interaction.guild.name + " | Developed by taken.lua",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true }),
},
},
@@ -73,7 +69,7 @@ async function guildMember(interaction) {
url: head,
},
footer: {
text: interaction.guild.name + " | Developed by taken.lua",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true }),
},
},
@@ -139,7 +135,7 @@ async function guildMember(interaction) {
},
],
footer: {
text: interaction.guild.name + " | Developed by taken.lua",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true }),
},
},

4
src/commands/help.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder } = require("discord.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
module.exports = {
name: "help",
@@ -47,7 +47,7 @@ module.exports = {
},
footer: {
icon_url: interaction.guild.iconURL({ dynamic: true }),
text: interaction.guild.name + " | Developed by: @Taken#0001"
text: interaction.guild.name + " | " + devMessage
}
}]
})

3
src/commands/kick.js
View File

@@ -74,9 +74,10 @@ module.exports = {
"**Moderator:** " + mod.user.username,
color: embedColor,
footer: {
text: member.user.id,
text: "ID: " + member.user.id,
icon_url: member.user.avatarURL({ dynamic: true })
},
timestamp: new Date()
}]
})

37
src/commands/ping.js Normal file
View File

@@ -0,0 +1,37 @@
const { SlashCommandBuilder } = require("discord.js")
const { color, devMessage } = require("../../config/options.json")
module.exports = {
name: "ping",
description: "Get the bot's ping.",
type: "slash",
data: new SlashCommandBuilder()
.setName("ping")
.setDescription("Get the bot's ping."),
/**
* @param { import("discord.js").ChatInputCommandInteraction } interaction
* @param { import("discord.js").Client } client}
*/
async execute(interaction, client) {
await interaction.deferReply()
const embedColor = Number(color.replace("#", "0x"))
console.log(client.ws.ping)
await interaction.editReply({
embeds: [{
description: "Ping of the bot is " + client.ws.ping + "ms.",
color: embedColor,
footer: {
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.user.displayAvatarURL({ dynamic: true })
},
timestamp: new Date()
}]
})
}
}

5
src/commands/remove.js
View File

@@ -56,6 +56,11 @@ module.exports = {
"**Reason:** `" + reason + "`\n" +
"**Moderator:** " + userMention(mod.id),
color: embedColor,
footer: {
text: "User ID: " + user.id,
icon_url: user.displayAvatarURL( { dynamic: true })
},
timestamp: new Date()
}]
})
}

4
src/commands/reqs.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder } = require("discord.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require("../../config/reqs.json")
module.exports = {
@@ -44,7 +44,7 @@ module.exports = {
}
],
footer: {
text: interaction.guild.name + " | Developed by: @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL()
}
}]

5
src/commands/send.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
module.exports = {
name: "send",
@@ -50,7 +50,8 @@ module.exports = {
url: interaction.guild.iconURL({ dynamic: true })
},
footer: {
text: "Developed by @Taken#0002"
text: interaction.guild.id + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}
]

12
src/commands/setup.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder, PermissionFlagsBits, ButtonBuilder, ActionRowBuilder, ButtonStyle, } = require("discord.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
module.exports = {
name: "setup",
@@ -76,7 +76,7 @@ module.exports = {
description: "You can apply for the guild by clicking the button below.",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
iconURL: interaction.guild.iconURL({ dynamic: true })
},
thumbnail: {
@@ -106,7 +106,7 @@ module.exports = {
description: "You can apply for the staff team by clicking the button below.",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
iconURL: interaction.guild.iconURL({ dynamic: true })
},
thumbnail: {
@@ -137,7 +137,7 @@ module.exports = {
description: "You can send an inactivity log by clicking the button below.",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
iconURL: interaction.guild.iconURL({ dynamic: true })
},
thumbnail: {
@@ -167,7 +167,7 @@ module.exports = {
description: "You can verify by clicking the button below.",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
iconURL: interaction.guild.iconURL({ dynamic: true })
},
thumbnail: {
@@ -197,7 +197,7 @@ module.exports = {
"Try to invite them in order.",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
iconURL: interaction.guild.iconURL({ dynamic: true })
},
thumbnail: {

6
src/commands/slowmode.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
module.exports = {
name: "slowmode",
@@ -37,7 +37,7 @@ module.exports = {
description: `Set the slowmode of ${channel} to 21600 seconds.`,
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by: @Taken#0001",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -50,7 +50,7 @@ module.exports = {
description: `Set the slowmode of ${channel} to ${seconds} seconds.`,
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by: @Taken#0001",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]

20
src/commands/update.js
View File

@@ -1,7 +1,7 @@
const { SlashCommandBuilder } = require("discord.js")
const { getGuild, getIGN, getHeadURL } = require("../utils/utils.js")
const verify = require("../schemas/verifySchema.js")
const { color, hypixelGuildID } = require("../../config/options.json")
const { color, hypixelGuildID, devMessage } = require("../../config/options.json")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const removeThese = [gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff]
@@ -33,7 +33,7 @@ module.exports = {
description: "You are not verified. Please run `/verify` to verify yourself",
color: embedColor,
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -67,7 +67,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -100,7 +100,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -127,7 +127,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -154,7 +154,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -181,7 +181,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -208,7 +208,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -235,7 +235,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
@@ -262,7 +262,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]

4
src/commands/uuid.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder } = require("discord.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
const { getUUID, getIGN, getHeadURL, formatUuid } = require("../utils/utils.js")
module.exports = {
@@ -47,7 +47,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by taken.lua",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]

4
src/commands/verify.js
View File

@@ -1,6 +1,6 @@
const { SlashCommandBuilder } = require("discord.js")
const { getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js")
const { color, hypixelGuildID } = require("../../config/options.json")
const { color, hypixelGuildID, devMessage } = require("../../config/options.json")
const verify = require("../schemas/verifySchema.js")
const mongoose = require("mongoose")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
@@ -174,7 +174,7 @@ module.exports = {
},
footer: {
icon_url: interaction.guild.iconURL(),
text: interaction.guild.name + " | Developed by Taken#0002"
text: interaction.guild.name + " | " + devMessage
}
}
]

4
src/commands/whois.js
View File

@@ -1,6 +1,6 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
const { getIGN, getHeadURL } = require("../utils/utils.js")
const { color } = require("../../config/options.json")
const { color, devMessage } = require("../../config/options.json")
const verify = require("../schemas/verifySchema.js")
module.exports = {
@@ -46,7 +46,7 @@ module.exports = {
url: head
},
footer: {
text: interaction.guild.name + " | Developed by: @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]

4
src/events/buttons/checkstats.js
View File

@@ -1,4 +1,4 @@
const { color } = require("../../../config/options.json")
const { color, devMessage } = require("../../../config/options.json")
const guildapp = require("../../schemas/guildAppSchema.js")
const { bwfkdr, bwstars, bwwins, swstars, swkdr, duelswins, duelswlr } = require("../../../config/reqs.json")
const { hypixelLevel, bedwarsLevel, skywarsLevel, getPlayer, getGuild, getHeadURL } = require("../../utils/utils.js")
@@ -174,7 +174,7 @@ module.exports = {
color: embedColor,
thumbnail: { url: head },
footer: {
text: interaction.guild.name + " | Developed by @Taken#0002",
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL()
},
fields: statsFields

4
src/events/modals/verifyModal.js
View File

@@ -1,6 +1,6 @@
const { InteractionType } = require("discord.js")
const { getUUID, getPlayer, getGuild, getHeadURL } = require("../../utils/utils.js")
const { color, hypixelGuildID } = require("../../../config/options.json")
const { color, hypixelGuildID, devMessage } = require("../../../config/options.json")
const verify = require("../../schemas/verifySchema.js")
const mongoose = require("mongoose")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../../config/roles.json")
@@ -154,7 +154,7 @@ module.exports = {
},
footer: {
icon_url: interaction.guild.iconURL(),
text: interaction.guild.name + " | Developed by Taken#0002"
text: interaction.guild.name + " | " + devMessage
}
}
]

2
src/utils/eventHandlers/command.js
View File

@@ -49,7 +49,7 @@ function loadSlashCommandsEvents(client) {
}
try {
await command.execute(interaction)
await command.execute(interaction, client)
} catch (error) {
console.error(error)
await interaction.reply({