functions.ts 쪼개기

src/command/commands/add_nick.ts

@@ -1,7 +1,7 @@
 import { SlashCommandBuilder, ChatInputCommandInteraction } from "discord.js";
 import mojangAPI from "../../wrapper/mojang-api.js";
 import firebase from "../../wrapper/firebase.js";
-import { add_user } from "../../functions.js";
+import { add_user } from "../../functions/add_user.js";
 
 export default {
   data: new SlashCommandBuilder()

src/command/commands/add_nick_super.ts

@@ -6,7 +6,7 @@ import {
 
 import mojangAPI from "../../wrapper/mojang-api.js";
 import firebase from "../../wrapper/firebase.js";
-import { add_user } from "../../functions.js";
+import { add_user } from "../../functions/add_user.js";
 
 export default {
   data: new SlashCommandBuilder()

src/command/commands/del_nick_super.ts

@@ -7,7 +7,7 @@ import {
 
 import mojangAPI from "../../wrapper/mojang-api.js";
 import firebase from "../../wrapper/firebase.js";
-import { embed_to_channel } from "../../functions.js";
+import { send_embed } from "../../functions/send_embed.js";
 
 export default {
   data: new SlashCommandBuilder()
@@ -64,7 +64,8 @@ export default {
         content: `삭제 완료:${discord_tag}(${discord_id})에게서 ${minecraft_id}(${minecraft_uuid})를 제거했습니다.`,
       });
 
-      const embed = new EmbedBuilder()
+      await send_embed(interaction.client, process.env.LOG_CHANNEL_ID, [
+        new EmbedBuilder()
           .setTitle("Nick deleted")
           .setColor(0x0099ff)
           .setFields([
@@ -78,12 +79,8 @@ export default {
             { name: "Minecraft Id", value: minecraft_id },
             { name: "Minecraft Uuid", value: minecraft_uuid },
           ])
-        .setTimestamp(interaction.createdAt);
-      await embed_to_channel(
-        interaction.client,
-        process.env.LOG_CHANNEL_ID,
-        embed
-      );
+          .setTimestamp(interaction.createdAt),
+      ]);
     } else {
       await interaction.editReply({
         content: `\`에러\`: 해당 계정이 없습니다.`,

src/command/commands/del_user_super.ts

@@ -6,7 +6,7 @@ import {
 } from "discord.js";
 
 import firebase from "../../wrapper/firebase.js";
-import { embed_to_channel } from "../../functions.js";
+import { send_embed } from "../../functions/send_embed.js";
 
 export default {
   data: new SlashCommandBuilder()
@@ -44,7 +44,9 @@ export default {
       await interaction.editReply({
         content: `삭제 완료:${discord_tag}의 계정을 모두 제거했습니다.`,
       });
-      const embed = new EmbedBuilder()
+
+      await send_embed(interaction.client, process.env.LOG_CHANNEL_ID, [
+        new EmbedBuilder()
           .setTitle("User deleted")
           .setColor(0x0099ff)
           .setFields([
@@ -55,12 +57,8 @@ export default {
             { name: " ", value: " " },
             { name: "Target Discord Id", value: discord_id },
           ])
-        .setTimestamp(interaction.createdAt);
-      await embed_to_channel(
-        interaction.client,
-        process.env.LOG_CHANNEL_ID,
-        embed
-      );
+          .setTimestamp(interaction.createdAt),
+      ]);
       return;
     } else {
       await interaction.editReply({

src/command/commands/get_blacklist.ts

@@ -1,7 +1,7 @@
 import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js";
 
 import firebase from "../../wrapper/firebase.js";
-import { TUser } from "../../functions.js";
+import { TUser } from "../../types.js";
 import mojangAPI from "../../wrapper/mojang-api.js";
 
 export default {

src/command/commands/get_file.ts

@@ -1,7 +1,7 @@
 import { SlashCommandBuilder, ChatInputCommandInteraction } from "discord.js";
 
 import firebase from "../../wrapper/firebase.js";
-import { TUser } from "../../functions.js";
+import { TUser } from "../../types.js";
 
 export default {
   data: new SlashCommandBuilder()

src/command/commands/get_members.ts

@@ -2,7 +2,8 @@ import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js";
 
 import firebase from "../../wrapper/firebase.js";
 import mojangAPI from "../../wrapper/mojang-api.js";
-import { TUser } from "../../functions.js";
+import { TUser } from "../../types.js";
+import { dm_slice } from "../../functions/dm_slice.js";
 
 export default {
   data: new SlashCommandBuilder()
@@ -64,35 +65,10 @@ export default {
       text = text.slice(0, -1);
       text += "\n\n";
     }
-    const sliced = dmSlice(text);
+    const sliced = dm_slice(text);
     for (const chunk of sliced) {
       await interaction.user.send(chunk);
     }
     await interaction.editReply("dm을 확인해주세요.");
   },
 };
-
-function dmSlice(raw: string): string[] {
-  function slasher(txt: string): { front: string; end: string } {
-    let front = txt.slice(0, 2000);
-    let end = txt.slice(2000);
-    if (end) {
-      const IndexOfLastBlock = front.lastIndexOf("\n\n");
-      end = "ㅤ" /* 공백문자 */ + front.slice(IndexOfLastBlock + 1) + end;
-      front = front.slice(0, IndexOfLastBlock);
-    }
-    return { front, end };
-  }
-
-  const output: string[] = [];
-
-  let slashed = slasher(raw);
-  while (true) {
-    output.push(slashed.front);
-    if (slashed.end) {
-      slashed = slasher(slashed.end);
-    } else {
-      return output;
-    }
-  }
-}

src/command/commands/get_raw_file.ts

@@ -5,7 +5,7 @@ import {
 } from "discord.js";
 
 import firebase from "../../wrapper/firebase.js";
-import { TUser } from "../../functions.js";
+import { TUser } from "../../types.js";
 
 export default {
   data: new SlashCommandBuilder()

src/command/commands/mov_blacklist_super.ts

@@ -6,7 +6,8 @@ import {
 } from "discord.js";
 
 import firebase from "../../wrapper/firebase.js";
-import { TUser, embed_to_channel } from "../../functions.js";
+import { TUser } from "../../types.js";
+import { send_embed } from "../../functions/send_embed.js";
 
 export default {
   data: new SlashCommandBuilder()
@@ -54,7 +55,9 @@ export default {
         UUIDs += uuid;
         UUIDs += "\n";
       });
-    const embed = new EmbedBuilder()
+
+    await send_embed(interaction.client, process.env.LOG_CHANNEL_ID, [
+      new EmbedBuilder()
         .setTitle("User blacklisted")
         .setColor(0x0099ff)
         .setFields([
@@ -66,11 +69,7 @@ export default {
           { name: "Target Discord Id", value: discord_id },
           { name: "UUIDs", value: UUIDs },
         ])
-      .setTimestamp(interaction.createdAt);
-    await embed_to_channel(
-      interaction.client,
-      process.env.LOG_CHANNEL_ID,
-      embed
-    );
+        .setTimestamp(interaction.createdAt),
+    ]);
   },
 };

src/functions.ts

@@ -1,123 +0,0 @@
-import {
-  ChatInputCommandInteraction,
-  Client,
-  EmbedBuilder,
-  Guild,
-} from "discord.js";
-import { Firestore } from "firebase-admin/firestore";
-
-import { MojangAPI } from "./wrapper/mojang-api.js";
-import firebase from "./wrapper/firebase.js";
-
-export type TUser = {
-  discord_id: string; // id
-  minecraft_uuid: string; //uuid
-};
-
-export async function add_user(
-  interaction: ChatInputCommandInteraction,
-  discord_id: string,
-  mcid: string,
-  mojangAPI: MojangAPI,
-  firebase: Firestore
-) {
-  let mcuuid: string;
-  try {
-    mcuuid = await mojangAPI.getUUIDFromId(mcid);
-  } catch {
-    await interaction.editReply({
-      content:
-        "`에러`: 마인크래프트 닉네임 검색을 실패했습니다. 마인크래프트 닉네임을 정확하게 입력했나요?",
-    });
-    return;
-  }
-
-  const members = firebase.collection("members");
-  const blacklist = firebase.collection("blacklist");
-
-  if (!(await blacklist.where("discord_id", "==", discord_id).get()).empty) {
-    await interaction.editReply({
-      content: "`에러`: 해당 디스코드 아이디는 블랙리스트 되었습니다.",
-    });
-    return;
-  }
-  if (!(await blacklist.where("minecraft_uuid", "==", mcuuid).get()).empty) {
-    await interaction.editReply({
-      content: "`에러`: 해당 마인크래프트 계정은 블랙리스트 되었습니다.",
-    });
-    return;
-  }
-  if (!(await members.where("minecraft_uuid", "==", mcuuid).get()).empty) {
-    await interaction.editReply({
-      content: "`에러`: 해당 마인크래프트 아이디는 이미 등록되었습니다.",
-    });
-    return;
-  }
-
-  if ((await members.where("discord_id", "==", discord_id).get()).empty) {
-    await interaction.editReply({
-      content: `${mcid}(${mcuuid})님 2k2r에 오신것을 환영합니다!`,
-    });
-  } else {
-    await interaction.editReply({
-      content: `${mcid}(${mcuuid})이 성공적으로 부계정으로 등록되었습니다!`,
-    });
-  }
-  await members.add({
-    discord_id,
-    minecraft_uuid: mcuuid,
-  });
-
-  const embed = new EmbedBuilder()
-    .setTitle("User Added")
-    .setColor(0x0099ff)
-    .addFields([
-      {
-        name: "Command sender",
-        value: `${interaction.user.tag}(${interaction.user.id})`,
-      },
-      { name: " ", value: " " },
-      { name: "Discord Id", value: discord_id },
-      { name: " ", value: " " },
-      { name: "Minecraft Id", value: mcid },
-      { name: "Minecraft Uuid", value: mcuuid },
-    ])
-    .setTimestamp(interaction.createdAt);
-  await embed_to_channel(interaction.client, process.env.LOG_CHANNEL_ID, embed);
-}
-
-export async function embed_to_channel(
-  client: Client<true>,
-  channel_id: string,
-  embed: EmbedBuilder
-) {
-  const channel = await client.channels.fetch(channel_id);
-  if (!channel.isTextBased()) return;
-  channel.send({ embeds: [embed] });
-}
-
-export async function delete_members_who_left(
-  client: Client<true>,
-  guild: Guild
-) {
-  const members_collection = firebase.collection("members");
-  const members = await members_collection.get();
-  for (const doc of members.docs) {
-    const data = doc.data() as TUser;
-    try {
-      await guild.members.fetch(data.discord_id);
-    } catch {
-      doc.ref.delete();
-
-      const embed = new EmbedBuilder()
-        .setTitle("물갈이")
-        .setColor(0x0099ff)
-        .setFields([
-          { name: "Discord Id", value: data.discord_id },
-          { name: "Minecraft Uuid", value: data.minecraft_uuid },
-        ])
-        .setTimestamp(new Date());
-      await embed_to_channel(client, process.env.LOG_CHANNEL_ID, embed);
-    }
-  }
-}

src/functions/add_user.ts

@@ -0,0 +1,78 @@
+import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js";
+import { Firestore } from "firebase-admin/firestore";
+
+import { MojangAPI } from "./../wrapper/mojang-api.js";
+import { send_embed } from "./send_embed.js";
+
+export async function add_user(
+  interaction: ChatInputCommandInteraction,
+  discord_id: string,
+  mcid: string,
+  mojangAPI: MojangAPI,
+  firebase: Firestore
+) {
+  let mcuuid: string;
+  try {
+    mcuuid = await mojangAPI.getUUIDFromId(mcid);
+  } catch {
+    await interaction.editReply({
+      content:
+        "`에러`: 마인크래프트 닉네임 검색을 실패했습니다. 마인크래프트 닉네임을 정확하게 입력했나요?",
+    });
+    return;
+  }
+
+  const members = firebase.collection("members");
+  const blacklist = firebase.collection("blacklist");
+
+  if (!(await blacklist.where("discord_id", "==", discord_id).get()).empty) {
+    await interaction.editReply({
+      content: "`에러`: 해당 디스코드 아이디는 블랙리스트 되었습니다.",
+    });
+    return;
+  }
+  if (!(await blacklist.where("minecraft_uuid", "==", mcuuid).get()).empty) {
+    await interaction.editReply({
+      content: "`에러`: 해당 마인크래프트 계정은 블랙리스트 되었습니다.",
+    });
+    return;
+  }
+  if (!(await members.where("minecraft_uuid", "==", mcuuid).get()).empty) {
+    await interaction.editReply({
+      content: "`에러`: 해당 마인크래프트 아이디는 이미 등록되었습니다.",
+    });
+    return;
+  }
+
+  if ((await members.where("discord_id", "==", discord_id).get()).empty) {
+    await interaction.editReply({
+      content: `${mcid}(${mcuuid})님 2k2r에 오신것을 환영합니다!`,
+    });
+  } else {
+    await interaction.editReply({
+      content: `${mcid}(${mcuuid})이 성공적으로 부계정으로 등록되었습니다!`,
+    });
+  }
+  await members.add({
+    discord_id,
+    minecraft_uuid: mcuuid,
+  });
+
+  await send_embed(interaction.client, process.env.LOG_CHANNEL_ID, [
+    new EmbedBuilder()
+      .setTitle("User Added")
+      .setColor(0x0099ff)
+      .addFields([
+        {
+          name: "Command sender",
+          value: `${interaction.user.tag}(${interaction.user.id})`,
+        },
+        { name: " ", value: " " },
+        { name: "Discord Id", value: discord_id },
+        { name: " ", value: " " },
+        { name: "Minecraft Id", value: mcid },
+        { name: "Minecraft Uuid", value: mcuuid },
+      ])
+      .setTimestamp(interaction.createdAt),
+  ]);
+}

src/functions/dm_slice.ts

@@ -0,0 +1,24 @@
+export function dm_slice(raw: string): string[] {
+  function slasher(txt: string): { front: string; end: string } {
+    let front = txt.slice(0, 2000);
+    let end = txt.slice(2000);
+    if (end) {
+      const IndexOfLastBlock = front.lastIndexOf("\n\n");
+      end = "ㅤ" /* 공백문자 */ + front.slice(IndexOfLastBlock + 1) + end;
+      front = front.slice(0, IndexOfLastBlock);
+    }
+    return { front, end };
+  }
+
+  const output: string[] = [];
+
+  let slashed = slasher(raw);
+  while (true) {
+    output.push(slashed.front);
+    if (slashed.end) {
+      slashed = slasher(slashed.end);
+    } else {
+      return output;
+    }
+  }
+}

src/functions/send_embed.ts

@@ -0,0 +1,11 @@
+import { Client, EmbedBuilder } from "discord.js";
+
+export async function send_embed(
+  client: Client<true>,
+  channel_id: string,
+  embed: EmbedBuilder[]
+) {
+  const channel = await client.channels.fetch(channel_id);
+  if (!channel.isTextBased()) return;
+  channel.send({ embeds: embed });
+}

src/main.ts

@@ -4,12 +4,9 @@ config();
 
 import { getCommands } from "./command/commands.js";
 import mojangAPI from "./wrapper/mojang-api.js";
-import {
-  TUser,
-  delete_members_who_left,
-  embed_to_channel,
-} from "./functions.js";
+import { TUser } from "./types.js";
 import firebase from "./wrapper/firebase.js";
+import { send_embed } from "./functions/send_embed.js";
 
 await mojangAPI.load_cache_from_firestore();
 
@@ -22,10 +19,29 @@ client.once(Events.ClientReady, async (event) => {
   console.log(`[DISCORD] Ready: discord client as ${event.user.tag}`);
   onTime = new Date();
 
-  delete_members_who_left(
-    client,
-    await client.guilds.fetch(process.env.DISCORD_TARGET_GUILD_ID)
-  );
+  const guild = await client.guilds.fetch(process.env.DISCORD_TARGET_GUILD_ID);
+  {
+    const members_collection = firebase.collection("members");
+    const members = await members_collection.get();
+    for (const doc of members.docs) {
+      const data = doc.data() as TUser;
+      try {
+        await guild.members.fetch(data.discord_id);
+      } catch {
+        doc.ref.delete();
+        await send_embed(client, process.env.LOG_CHANNEL_ID, [
+          new EmbedBuilder()
+            .setTitle("Auto Removed")
+            .setColor(0x0099ff)
+            .setFields([
+              { name: "Discord Id", value: data.discord_id },
+              { name: "Minecraft Uuid", value: data.minecraft_uuid },
+            ])
+            .setTimestamp(new Date()),
+        ]);
+      }
+    }
+  }
 });
 
 client.on(Events.InteractionCreate, async (interaction) => {
@@ -63,15 +79,16 @@ client.on(Events.GuildMemberRemove, async (interaction) => {
   for (const doc of exited_user.docs) {
     const data = doc.data() as TUser;
     doc.ref.delete();
-    const embed = new EmbedBuilder()
-      .setTitle("물갈이")
+    await send_embed(client, process.env.LOG_CHANNEL_ID, [
+      new EmbedBuilder()
+        .setTitle("Auto Removed")
         .setColor(0x0099ff)
         .setFields([
           { name: "Discord Id", value: data.discord_id },
           { name: "Minecraft Uuid", value: data.minecraft_uuid },
         ])
-      .setTimestamp(new Date());
-    await embed_to_channel(client, process.env.LOG_CHANNEL_ID, embed);
+        .setTimestamp(new Date()),
+    ]);
   }
 });
 

src/types.d.ts

@@ -0,0 +1,4 @@
+export type TUser = {
+  discord_id: string; // id
+  minecraft_uuid: string; //uuid
+};