diff --git a/package.json b/package.json index 4033ba9..b460bd6 100755 --- a/package.json +++ b/package.json @@ -12,5 +12,6 @@ "description": "a discord bot for 2k2r", "main": "src/main.ts", "author": "kdh8219 <65698239+kdh8219@users.noreply.github.com>", - "private": true + "private": true, + "type": "module" } diff --git a/src/command/commands.ts b/src/command/commands.ts index 752a151..43e5d3d 100644 --- a/src/command/commands.ts +++ b/src/command/commands.ts @@ -2,6 +2,8 @@ import { TCommand } from "../functions.js"; import add_nick_super from "./commands/add_nick_super.js"; import add_nick from "./commands/add_nick.js"; +import del_nick_super from "./commands/del_nick_super.js"; +import ping from "./commands/ping.js"; -const commands: TCommand[] = [add_nick_super, add_nick]; +const commands: TCommand[] = [add_nick_super, add_nick, del_nick_super, ping]; export default commands; diff --git a/src/command/commands/del_nick_super.js b/src/command/commands/del_nick_super.js deleted file mode 100755 index e5731d0..0000000 --- a/src/command/commands/del_nick_super.js +++ /dev/null @@ -1,75 +0,0 @@ -const { SlashCommandBuilder, PermissionFlagsBits, Client, GatewayIntentBits } = require("discord.js"); -const mojangAPI = new (require("mojang-api-js"))(); - -const firebase_admin = require("firebase-admin"); -const { getDatabase } = require("firebase-admin/database"); -const serviceAccount = require("../firebase/conf.json"); -if (!firebase_admin.apps.length) { - firebase_admin.initializeApp({ - credential: firebase_admin.credential.cert(serviceAccount), - databaseURL: process.env.FIREBASE_URL, - databaseAuthVariableOverride: { - uid: process.env.FIREBASE_UID, - }, - }); -} -const firebase = getDatabase().ref("/"); - -const client = new Client({ intents: [GatewayIntentBits.Guilds] }); -client.login(process.env.DISCORD_TOKEN); - -module.exports = { - data: new SlashCommandBuilder() - .setName("del_nick_super") - .setDescription("del someone nickname on the list") - .addUserOption((option) => option.setName("discord").setDescription("discord account").setRequired(true)) - .addStringOption((option) => option.setName("minecraft_id").setDescription("id of the minecraft account").setRequired(true)) - .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) - .setDMPermission(false), - async execute(interaction) { - await interaction.deferReply({ ephemeral: true }); - let minecraft; - try { - minecraft = await mojangAPI.nameToUuid(interaction.options.getString("minecraft_id")); - } catch (err) { - if (err.message == "204 status code") { - await interaction.editReply({ content: "에러: 닉네임 검색을 실패했어요(닉네임을 정확하게 입력했나요?)", ephemeral: true }); - return; - } - } - let data = await (await firebase.get()).val(); - const discord_id = interaction.options.getUser("discord").id; - for (let discord_search_point in data["members"]) { - if (data["members"][discord_search_point].discord == discord_id) { - //이미 등록된 디코일경우 - for (let minecraft_search_point in data["members"][discord_search_point].minecraft) { - if (data["members"][discord_search_point].minecraft[minecraft_search_point] == minecraft.id) { - //이미 등록된 마크일경우 - data["members"][discord_search_point].minecraft.splice(minecraft_search_point, 1); - if (data["members"][discord_search_point].minecraft.length == 0) { - data["members"].splice(discord_search_point, 1); - } - - await firebase.set(data); - - let discord_tag; - try { - const discord = await client.users.fetch(discord_id); - discord_tag = `${discord.username}#${discord.discriminator}`; - } catch (e) { - discord_tag = `Deleted User#0000`; - } - await interaction.editReply({ - content: `삭제 완료:${discord_tag}(${discord_id})에게서 ${minecraft.name}(${minecraft.id})를 제거했습니다.`, - ephemeral: true, - }); - return; - } - } //신규 마크일경우 - await interaction.editReply({ content: `\`에러\`: 해당 유저에게 해당 마인크래프트 계정이 없습니다.`, ephemeral: true }); - return; - } - } //신규 디코일 경우 - await interaction.editReply({ content: `\`에러\`: 해당 유저를 찾을 수 없습니다.`, ephemeral: true }); - }, -}; diff --git a/src/command/commands/del_nick_super.ts b/src/command/commands/del_nick_super.ts new file mode 100755 index 0000000..eb7bd72 --- /dev/null +++ b/src/command/commands/del_nick_super.ts @@ -0,0 +1,69 @@ +import { + SlashCommandBuilder, + PermissionFlagsBits, + ChatInputCommandInteraction, +} from "discord.js"; + +import mojangAPI from "../../wrapper/mojang-api.js"; +import firebase from "../../wrapper/firebase.js"; + +export default { + data: new SlashCommandBuilder() + .setName("del_nick_super") + .setDescription("delete someone's nickname on the list") + .addUserOption((option) => + option + .setName("discord") + .setDescription("discord account") + .setRequired(true) + ) + .addStringOption((option) => + option + .setName("minecraft_id") + .setDescription("id of the minecraft account") + .setRequired(true) + ) + .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) + .setDMPermission(false), + async execute(interaction: ChatInputCommandInteraction) { + const discord_id = interaction.options.getUser("discord")?.id as string; + + const mcid = interaction.options.getString("minecraft_id") as string; + let mcuuid: string; + try { + mcuuid = await mojangAPI.getUUIDFromId(mcid); + } catch { + await interaction.editReply({ + content: + "`에러`: 마인크래프트 닉네임 검색을 실패했습니다. 마인크래프트 닉네임을 정확하게 입력했나요?", + }); + return; + } + const members = firebase.collection("members"); + if ( + !( + await members + .where("minecraft_uuid", "==", mcuuid) + .where("discord_id", "==", discord_id) + .get() + ).empty + ) { + let discord_tag; + try { + const discord_user = await interaction.client.users.fetch(discord_id); + discord_tag = discord_user.tag; + } catch { + discord_tag = "Deleted User#0000"; + } + interaction.editReply({ + content: `삭제 완료:${discord_tag}(${discord_id})에게서 ${mcid}(${mcuuid})를 제거했습니다.`, + }); + return; + } else { + await interaction.editReply({ + content: `\`에러\`: 해당 계정이 없습니다.`, + }); + return; + } + }, +};