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!130
This commit is contained in:
Taken
2023-12-15 16:50:17 +00:00
parent 63a70043a4 a6c207a66d
commit 919d0bddad
10 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/commands/guild.js
View File

@@ -10,20 +10,7 @@ module.exports = {
type: "slash",
dev: false,
public: true,
subcommands: [
{
name: "member",
description: "Get info about a guild memeber",
},
{
name: "info",
description: "Get info about a guild.",
},
{
name: "top",
description: "Get the top guild members based on gexp",
}
],
subcommands: true,
data: new SlashCommandBuilder()
.setName("guild")
@@ -89,8 +76,6 @@ module.exports = {
async execute(interaction) {
await interaction.deferReply()
const subcommand = interaction.options.getSubcommand()
const embedColor = Number(color.replace("#", "0x"))
@@ -112,7 +97,7 @@ module.exports = {
const footerText = interaction.guild ? interaction.guild.name : interaction.user.username
const footerIcon = interaction.guild ? interaction.guild.iconURL({ dynamic: true }) : interaction.user.avatarURL({ dynamic: true })
await interaction.editReply({
await interaction.reply({
embeds: [{
description: "This command is currently under development",
color: embedColor,

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

@@ -4,6 +4,7 @@ const { color, devMessage } = require("../../../config/options.json")
/** @param { import('discord.js').ChatInputCommandInteraction } interaction */
async function guildInfo(interaction) {
await interaction.deferReply()
const query = interaction.options.getString("query")
const type = interaction.options.getString("type") || "ign"

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

@@ -4,6 +4,8 @@ const { color, devMessage } = require("../../../config/options.json")
/** @param { import('discord.js').ChatInputCommandInteraction } interaction */
async function guildMember(interaction) {
await interaction.deferReply()
const ign = interaction.options.getString("ign")
const embedColor = Number(color.replace("#", "0x"))

2
src/commands/guild/top.js
View File

@@ -6,6 +6,8 @@ const { redis } = require("../../utils/redis.js")
/** @param { import('discord.js').ChatInputCommandInteraction } interaction */
async function guildTop(interaction) {
await interaction.deferReply()
const query = interaction.options.getString("query")
const type = interaction.options.getString("type") || "ign"
let amount = interaction.options.getNumber("amount") || 10

6
src/commands/help.js
View File

@@ -27,17 +27,15 @@ module.exports = {
if (command.public && !command.subcommands) {
commands.push(command)
} else if (command.public && command.subcommands) {
const commandName = command.name
const commandName = command.data.name
const subcommands = command.subcommands.map((subcommand) => {
const subcommands = command.data.options.map((subcommand) => {
return {
name: commandName + " " + subcommand.name,
description: subcommand.description
}
})
console.log(subcommands)
for (const subcommand of subcommands) {
commands.push(subcommand)
}

1
src/commands/setup.js
View File

@@ -7,6 +7,7 @@ module.exports = {
type: "slash",
dev: true,
public: false,
subcommands: true,
data: new SlashCommandBuilder()
.setName("setup")

5
src/commands/staff.js
View File

@@ -9,6 +9,7 @@ module.exports = {
type: "slash",
dev: false,
public: false,
subcommands: true,
data: new SlashCommandBuilder()
.setName("staff")
@@ -35,8 +36,6 @@ module.exports = {
async execute(interaction) {
await interaction.deferReply()
const subcommand = interaction.options.getSubcommand()
const embedColor = Number(color.replace("#", "0x"))
@@ -53,7 +52,7 @@ module.exports = {
const footerText = interaction.guild ? interaction.guild.name : interaction.user.username
const footerIcon = interaction.guild ? interaction.guild.iconURL({ dynamic: true }) : interaction.user.avatarURL({ dynamic: true })
await interaction.editReply({
await interaction.reply({
embeds: [{
description: "This command is currently under development",
color: embedColor,

1
src/commands/staff/beast.js
View File

@@ -5,6 +5,7 @@ const { hypixelLevel, bedwarsLevel, skywarsLevel, getUUID, getPlayer, getGuild,
/** @param { import('discord.js').ChatInputCommandInteraction } interaction */
async function beast(interaction) {
await interaction.deferReply()
const ign = interaction.options.getString("ign")
const embedColor = Number(color.replace("#", "0x"))

21
src/commands/staff/help.js
View File

@@ -5,13 +5,25 @@ const path = require("path")
/** @param { import("discord.js").ChatInputCommandInteraction } interaction */
async function help(interaction) {
const commands = []
const commandFiles = fs.readdirSync(path.join(__dirname, "..")).filter(file => file.endsWith(".js"))
for (const file of commandFiles) {
const command = require(`../../commands/${file}`)
if (!command.public) {
if (!command.public && !command.subcommands) {
commands.push(command)
} else if (!command.public && command.subcommands) {
const commandName = command.data.name
const subcommands = command.data.options.map((subcommand) => {
return {
name: commandName + " " + subcommand.name,
description: subcommand.description
}
})
for (const subcommand of subcommands) {
commands.push(subcommand)
}
}
}
const commandList = commands.map((command) => {
@@ -25,7 +37,7 @@ async function help(interaction) {
const footerText = interaction.guild ? interaction.guild.name : interaction.user.username
const footerIcon = interaction.guild ? interaction.guild.iconURL({ dynamic: true }) : interaction.user.avatarURL({ dynamic: true })
await interaction.editReply({
await interaction.reply({
embeds: [{
title: "Commands",
description: "List of commands",
@@ -38,7 +50,8 @@ async function help(interaction) {
icon_url: footerIcon,
text: footerText + " | " + devMessage
}
}]
}],
ephemeral: true
})
}

3
src/commands/verify.js
View File

@@ -18,7 +18,8 @@ module.exports = {
.addStringOption((option) =>
option
.setName("ign")
.setDescription("Your in-game name."))
.setDescription("Your in-game name.")
.setRequired(true))
.setDMPermission(false),
/** @param { import('discord.js').ChatInputCommandInteraction } interaction */