🔨 change env

UniPro-tech · Aug 27, 2024 · 69f4f94 · 69f4f94
1 parent 34f56dd
commit 69f4f94
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 77 deletions.
diff --git a/argoCD/bot-env.yaml b/argoCD/bot-env.yaml
@@ -3,17 +3,17 @@ apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
   creationTimestamp: null
-  name: unibot-env
+  name: bot-env
   namespace: unibot
 spec:
   encryptedData:
-    DISCORD_TOKEN: AgB694B5STTG+zQbk2efF2jzUzEJMgbX1wdTsCnTfoAR0Y9V7SqLeLQ/Bn9GL/8uoGxixr5foT5yeKEMrHa29Xzp1bIxHAdkUKFc8hAbgFnim0wKOUs8SIDw+w9VBP9RAsBrvKlXt3Bt6MRuLx44aZ/OASZmIV4Nc3YBle2z6nOGs3hgYG1LGu/73N1aR7qNSqjWbOUwSqM2Ni7p/5+QvqXnpStoQPdIpxbIJEgWIzhKn1mZK1agxM3Kk5kfUsayJVuLWz0OnzNcPpyew7BwU6ld768dJAdJ/0cXgZdK+6Qr5QccsYdt3s2oQpX5q5QBZLqtnPrVpbTGF1fpJ4rSoFy7xmJnFmq4C9hx/ozcJAiuNxtBGdGoU+D/sd15an19/fzVaXDoRjCoou0sC5LHRVoWHWa23SGX0tt4wgk+Dc6q7ftZutAe+rzmcQprdtq8xrmLUPPEZUz0hNkotD+rCt7vZG8ojJROFwG8OUJVC4XGXgF++yGsDDng9dnT12asbOsXXSRS7/YX9ToI94e9LonRNjhQ10+kdNlI1DsJgHHrxkAvoON7k/CaRCVOJK1nF+5p44cXaZaHhe+hFzH16s6hXQZZhAp/ar1WWDe38qwYvOMOW1iJi8tLwxLOj4ck7iize+Ebhnzl0ngpiCwBfTvt6+rj8aAo+Is9BDrAiH6A/babl6UboseaaSlpYOXn3fIh5YBX+UxSlYTDSsMiRzeTIQ+8PlDgR28PwT/a/Q+JZKUO9HJXACNoxsh7v/Ho7QoUMZ0ok/+WIYoKp9CZq+pYjBqioR4Ywok=
-    LOG_ERROR_ID: AgCaMAXAWx98hXfBb6zgwoiX3+6uT7qORCsoDDorxNkFOvFuGvUL0A7B8UPeIUVcH1ONutcxDlqIZ2dCaQ8JZLNLjRFriXAtlYfd5jacOTQGtaTwINkwYwZhm0AhokydcpyVESzpZmRqr2d/wCyR7krGNI4gSIly1odrm8TdSv5CZc/NorGdB2vFyNJ78R47gNQClrGxbpCvVHCZUAr8kxaJzU/p0LQT1JbIWZp74vvepiJo6OssTE8R1+mZGb7+/MiT/ksiVpXIhksAzdD9jHxRYmvhUCBpM/q7a4QqtUSf3ErWU//ta811yjQXnrN4ULsw6CQuSi9aGvzrSLYuwVANNMsH5y4DMJSn/HDLX0OFvNu8Y8v386R1b6GdTrpz0KF9KuMCSye6kNPTkUOdhnD8pyzAZvYisvUHo7ueCc6CUDkjClNQ9MPy70xxRE8D7V4JsazYois8mEr14vGjIl2ErK6C8ceFgBQ1+4qZFa51mQu51jDw/Gig6i0nHPcufKdXgJu9ib+oAyxcYtn7Zj7mHaSYUPJJs+bwxedP3Xd+4xATescyavFDr/X2Bru2gChM+Nfv4KnrBMdJ9Dvm4FcJvb6nY6q+17+oNgPRCLPYPh/t+AAMyuNrI3xPKOp5TnHv3oifbyQe5d9eH2azqoYs5R3MuFEtBhrnF8CtGGX8CQUKCMlJNni17VKqrkIdnUIyaHc7mX+vqEkahq7YEChNN7TF
-    LOG_GUILD_ID: AgADYWSHL5/rQ6w1tc1mK48I1v58k30Pi1VkV4WXJiDD7F6ZlRZZIqcc8HCaVFL0P6AXKQsN32M6OvU67NT96qiMQA46xjoJUqrSsFnTjy8kBl9TSZmof6UvgsrYOidv0xIPa+yV/iyzSz7vBZm6MR+cTO5eIinich85QKFrP3mx5nq+iu1BYRKQXdwzByPjlQAdrssjrGHVtcTfsmDlR6dmxLsc1StjXVlkoHyB8r9EEhYrPJwULuRU4NLvgnDyXV6RaQ437LDBv78m4/kX0UlRh8cpWuk3oDntN6izufoEDfqoha1ytGtE9ZCsn1TBS8ugJsoRDIrT5VB7Kz5euWF+NsUZL27GZtHw2wAaRoJOG73BoaMV0ckYnJ9TOjQvjk95RHnlzinasF9lLZll+i3wLpZOshZD5dCDtgMx3UY73HiP54hWiGHHFmRBIWy7A4eQlWXIOy783Lo2udr22cdiyOXXBLGU51+B+qsR9DrJ2T9Lowxa8FfHPaccsNOC/2b4qyvtIHh6LQ3mY/7HCJCqExBwVR+d9BP5pTrp9rJS+Rpl59o3wVSW39+GangbRqzF4si9M3cKRNRNnWc0l1eKkf/hl8vSlNPZ0CXhVyFRpHa0yosJbhfaV49OUFpKySgiiPzohmJm3mgzsWdiy3B2KlrwlNIx4v4y0Nqc+0WlJEq1w53gvJDTEHrxcV0aBV3SzF6PJcClmqSjLNpNUlvlptcE
-    LOG_SUCCESS_ID: AgAdAXdQ3LBQTMPJO4W/Dx5Urfx/KQp/1Zg3jFr9se12wM18ePesA4z8VNwF/jZmxCWDco2DV4RP19BSqKYGtDWtfpWPapUuDnuA7kHj3IrXJ4YfRnZJZP31k3aePVb/exzaRvI1j6f81D9Fqs3tKKeTVyec6iSmwzZxm9q5AA1ChQEgPLuQCC6oO61tKGN4CwNz1UrHUxa09QHngDfzMiwXI2RG11cewTNM5Q98Q9nDmUCtPvBqz1HIfyTgpR/9+wso8/VG5eOr+rRWzdKkEr7JxQhl01lOkUwYvMJFhbt7TAyekRptvods165aJskVs8gs0fs5iyjsfDR5xj+0hZF0q2kpVMEL0rgihfjMpndWL5xZZJJnUr3Ng/95e40YmAHJZuR8TuN0fSbVB4qJrdZT0V4pNdGS/2oSw+pJZtEMQfvvW97lR603nKRfwZppZ34lKJZz8xC/7GayJ5n/IqaIKiBf1c3BdcgQZTkVxvpbH5Hh10ZrLbdN43GuOCwi63p38vMUaES79ILjXg3r3s2yf6unBt/UiulaV7FGOQzQGqznGgxpjA6Q88rgviE5nBtCYyyh3Qg6UWtoIj8I7H95B0yQL/I28wHiWPKgj3f9GE0OTV3/li+wKXqKcpdmh184zT+rc7Gbnu+ES1OQwEtEhSDK/tivTaEseG4R70d9EZLfR5d70vwgAnQBdru9/zwD29UDqKpK54Pel4gALdlWGsgz
+    DISCORD_TOKEN: AgBi5q7bqLTxSjzm42w8dliVLXFmEGp9cBy90HsPwV7WRFq8gLk+1IsbFFneibF6WY4DlkOmb5Prg6gbaM0Jjd/CWm5tcRnjhO+hnTAQimbDbDpIE/NFfRUlTrqwVqlK6QRIxEPB+muCX2l+/kO4+bYatz62XV4VrWajlaWRTp+J6HPNujM543O4X9Ey0rrWpN8LXbbbCencx1Vetjftms/4w4I1iXv/5fqVDOZVrkQw4YhfefZNPGo32HebCTN+TKK+woBwPh4j7M5wS/bq0itQPrMsJvJ58wVEupWCWrSZTQLWjlgThLgDdmyu7nWhZLNcXD9YNJx+Ouw6r0221BxJJ7tTyUCfeNvDo8dGygAqwdMi+UMTG3eT7jC9Vv9ZhX3hdum9X8kGDJ2Yc5igHkq2qvXabgYsCizGHBPwJ47/MhXKcJt+BCKE3JG2xsea/CQLvgOJa4WQIXl48098fGA40J1W/TxnLZDmA8OSIo8+UR0vKzVqaUSRZ4RGUFsZ4l69OE0DSDwX8azyfV8hdThqEGyg0Z0Oiv8QzidIZNhGpMxJdS6dX8h3LdPRgICXmcQWCnL3UbUg9/R/8LOH/qGHrlbpN6HdxshABKOne9DHfFP1b9E8GABY+dl8uAdsfJUZJntXtlbDqVXG07IdsMKjgB9uISq2A2XgG0U0giMM2JNBOMropZj3UhR5ZaOGnFJZvNl6jIgkqcMRHh0kcIVOlYRJ6Jb1F42eNrY0vgibGp0jXDr5UeatZm+xbPHP0aUNKXEn5vaAgbE/5nTI8w1loLzB/Vu3nJo=
+    LOG_ERROR_ID: AgBGO7U2XKBTm+9dM0EJ6idTyEIPTVOYqeqWqIZy1Ir7A0NFqBFTdT4V7FZcnmRjs7RpBwjWxZe9s3Bskil/e/74hRR6JdpWVBcn1RkM6KSfDR9FWs3Ob0khR5DE0XO5bFy9FN1eKeXXh8zYmxVz8AargAkd9Y75wEKnas3kwXu+NwE4EDk/TwF4DM8VA6rqhNYbVp5gb4p7/luBnKZTmE2G3P43XRYP0zo7fZYcHKncoi7tPBKSqk9GGdytmbYr38Vvbqfj4LPS4+DGV7+7gcscMLKgxlmDy8rk8HCnvxtXu1q3QzCR2b3r0lnCLwSo0T65674vlXEmPCDnLb0gEt6+22WXHgcbWHaHnfnaWSayUxlwA8kHyotybqmtECKB0nGIQtVTvcmVCWUq9Lkj4oTPM0mXGflEE9szGJs7f0GET/yeNzhDyxys00od/seZJNNGyZ48wHOAx90okAwZ0Adx/sAETkxJmk+IdvCnsLFbO9MTXuqIxahN0+JmmBCzXD9sh00wwij87ZcEaua7oiWgmiiO3g9be0ZX11TSrYbX+7d5tSq1UKhCd5te3v2K54Z/ElRc/SdaAH+2nhXhnUCBo+RyZeZXG2OgFI5NwN/++ZX7vJF2XfGBWyrrA+/jIJHkNdBvavFGwYdK8wKkZBZgmKFglhowNPsg6D29g09Fz/pAepptmNCYtlQ1dQa7mWkEc2zM39lRx+FLyHIKMhcPYT1x
+    LOG_GUILD_ID: AgCNeoBN9VXuzZDYnKOVxuI0ionW2j90yufebLUoljOZkK9Xn3Y3c/aSuiTv5KsS5NHSVz/GSXwzHcKIPf3Jj/iLAso/rqE9XdA3O/zU1a2ec/vgxUc5i7VmE+8pPT53l7s1WhRrziOq9NPvcou1jdMunzYPqp0blLSe+wTMe9Jbg7JZR77CkD1NinxPLa0CsCA7FSLhUqxeqx0vPGzc79A+TsG6pxz7PzWqQaK/54syGlwPKqeFepk/QItRGW/zsGLTDkufLo6u7fDtkYFiR2ACNRbfO/gJpKBI7oZL3LJUIT1/rBAw+SmYPEa8QvZQDIlCefqyJNnsaI1vHwZQs8iA6j+S4ampdwCTCTyHe7tWnP4xoiNuXH0E+LXU08zt3OWJdISLvLjpQuBtCvD3zmgFwB/ltWbsk3EbJ63bjRN+g7boId6VTTw9SG4qgXzawAZCblnaTXKFS8L2RcQL6rwIGtU9477kEgXpLAWeA0/jyDNl2fnusUsLw2FoaVhq01F4DzceXe1gOrZIWLSXNHAZ/8SjQhaYRkzE5AGNT40lwmSpk9hx/EWr3w60aG7YPrblf9nJCS6XzvoYuwVoDOCBQZtLm89KP30SkTL0uj1PJljgoQRzOp0kNQNmlxxO/VB4ExRTbGjaIJjwKX+p/ZiyJrdTVfttwkcbGk03caTLFR7GlwX93dpOdt3/uQH7ghBtMeaQdjdGec7CkDEbo44u8wR1
+    LOG_SUCCESS_ID: AgB0D1ks8Py3qAiTe62WnMx9LWf+zD1Htjpd/BpWSro85YE89BJfI7E5YIQZgvPdu/DuomnGUM1oJuK/2e4Yszd3/NBUbUJz4AmzLnsZF8mrDQBpQ00ua4s2NhtoF5tY3MuSj+MJFT0w5Gf/tRsj5tx9B/kldKhSlvkY4sP/aBzspFPnYLnCGvj55D0kbICBubDYDjERyugNcFr9hOAN2ZOev9z86e8kC/931K9AGjdoN0ax1uAlwDqVy/vSrn4AZX6TzAQU+hnH8Pkv6cfmLICGiP/vhTMw7WDK8r2Uc3u0cYJoH+DSX+JXURGzF2wqsCKzgc+38VNh2WppwpONpfFWKg7c+VG/4OYeDsj8GH5r7IVmvH/i6/t3Pb3MT3h9t/7aAVypIN6thKkCkHUurvEAax455D8OQ+mTtTFlRQztK1NvAz4ow5G5Vj4heDQcDrZlqYU8NBlY+KZBwrVyiZybcZ1I6YNujQeXTs9fDvFSibqqNiu9sWhAW5XozHDavEANUwACJGaIsKJxLwJIn7VaqbdpI41MPybqDcpANohGneYkoKt6QzgdzY1O04O7iJnuf6VEgsnmohpJa0l/2cPTKO7+rvtnBUJIt8hvMiLwf2KeT/Fuj7wWuuO4xMy9xorXpmyB15hWCV0PzD1ayDv9D8RPl37nA8TZX7Zqm10gxTILCqJfNTJKUDATcRO6F20fZ4Jp4U+Og4D1mTYQ0hzqkCzy
   template:
     metadata:
       creationTimestamp: null
-      name: unibot-env
+      name: bot-env
       namespace: unibot
     type: Opaque
diff --git a/config.js b/config.js
@@ -1,3 +1,4 @@
+(require('dotenv')).config();
 module.exports = {
   adminRoleId: process.env.ROLE_ADMIN,
   color: {

diff --git a/events/interactionCreate.js b/events/interactionCreate.js
@@ -3,79 +3,96 @@ const config = require("../config");
 const { GetLogChannel, GetErrorChannel } = require(`../lib/channelUtils`);
 
 module.exports = {
-    name: Events.InteractionCreate,
-    async execute(interaction) {
-        if (interaction.isChatInputCommand()) {
-            console.log(`[!] ${interaction.commandName}`);
-            const command = interaction.client.commands.get(interaction.commandName);
-            if (!command) {
-                console.log(`[-] Not Found: ${interaction.commandName}`);
-                return;
-            }
-            if (!interaction.inGuild() && command.guildOnly) {
-                const embed = new EmbedBuilder()
-                    .setTitle("エラー")
-                    .setDescription("このコマンドはDMでは実行できません。")
-                    .setColor(interaction.client.config.color.e);
-                interaction.reply({ embeds: [embed] });
-                return;
-            }
+  name: Events.InteractionCreate,
+  async execute(interaction) {
+    if (interaction.isChatInputCommand()) {
+      console.log(
+        `[${client.func.timeUtils.timeToJST(Date.now(), true)} - info]-> ${
+          interaction.commandName
+        }`
+      );
+      const command = interaction.client.commands.get(interaction.commandName);
+      if (!command) {
+        console.log(
+          `[${client.func.timeUtils.timeToJST(
+            Date.now(),
+            true
+          )} - info] Not Found: ${interaction.commandName}`
+        );
+        return;
+      }
+      if (!interaction.inGuild() && command.guildOnly) {
+        const embed = new EmbedBuilder()
+          .setTitle("エラー")
+          .setDescription("このコマンドはDMでは実行できません。")
+          .setColor(interaction.client.config.color.e);
+        interaction.reply({ embeds: [embed] });
+        return;
+      }
 
-            try {
-                await command.execute(interaction);
-                console.log(`[Run] ${interaction.commandName}`);
+      try {
+        await command.execute(interaction);
+        console.log(
+          `[${client.func.timeUtils.timeToJST(Date.now(), true)} - info] Run: ${
+            interaction.commandName
+          }`
+        );
 
-                const logEmbed = new EmbedBuilder()
-                    .setTitle("コマンド実行ログ")
-                    .setDescription(`${interaction.user} がコマンドを実行しました。`)
-                    .setColor(config.color.s)
-                    .setTimestamp()
-                    .setThumbnail(interaction.user.displayAvatarURL({ dynamic: true }))
-                    .addFields([
-                        {
-                            name: "コマンド",
-                            value: `\`\`\`\n/${interaction.commandName}\n\`\`\``,
-                        },
-                        {
-                            name: "実行サーバー",
-                            value: "```\n"
-                                + interaction.inGuild() ? `${interaction.guild.name} (${interaction.guild.id})` : "DM"
-                            + "\n```",
-                        },
-                        {
-                            name: "実行ユーザー",
-                            value: "```\n" + `${interaction.user.tag}(${interaction.user.id})` + "\n```",
-                        },
-                    ])
-                    .setFooter({ text: `${interaction.id}` });
-                const channel = await GetLogChannel(interaction);
-                if (channel) {
-                    channel.send({ embeds: [logEmbed] });
-                }
-            } catch (error) {
-                console.error(error);
-                const logEmbed = new EmbedBuilder()
-                    .setTitle("ERROR - cmd")
-                    .setDescription("```\n" + error.toString() + "\n```")
-                    .setColor(config.color.e)
-                    .setTimestamp();
+        const logEmbed = new EmbedBuilder()
+          .setTitle("コマンド実行ログ")
+          .setDescription(`${interaction.user} がコマンドを実行しました。`)
+          .setColor(config.color.s)
+          .setTimestamp()
+          .setThumbnail(interaction.user.displayAvatarURL({ dynamic: true }))
+          .addFields([
+            {
+              name: "コマンド",
+              value: `\`\`\`\n/${interaction.commandName}\n\`\`\``,
+            },
+            {
+              name: "実行サーバー",
+              value:
+                "```\n" + interaction.inGuild()
+                  ? `${interaction.guild.name} (${interaction.guild.id})`
+                  : "DM" + "\n```",
+            },
+            {
+              name: "実行ユーザー",
+              value:
+                "```\n" +
+                `${interaction.user.tag}(${interaction.user.id})` +
+                "\n```",
+            },
+          ])
+          .setFooter({ text: `${interaction.id}` });
+        const channel = await GetLogChannel(interaction);
+        if (channel) {
+          channel.send({ embeds: [logEmbed] });
+        }
+      } catch (error) {
+        console.error(error);
+        const logEmbed = new EmbedBuilder()
+          .setTitle("ERROR - cmd")
+          .setDescription("```\n" + error.toString() + "\n```")
+          .setColor(config.color.e)
+          .setTimestamp();
 
-                const channel = await GetErrorChannel(interaction);
-                if (channel) {
-                    channel.send({ embeds: [logEmbed] });
-                }
-                const messageEmbed = new EmbedBuilder()
-                    .setTitle("すみません、エラーが発生しました...")
-                    .setDescription("```\n" + error + "\n```")
-                    .setColor(config.color.e)
-                    .setTimestamp();
+        const channel = await GetErrorChannel(interaction);
+        if (channel) {
+          channel.send({ embeds: [logEmbed] });
+        }
+        const messageEmbed = new EmbedBuilder()
+          .setTitle("すみません、エラーが発生しました...")
+          .setDescription("```\n" + error + "\n```")
+          .setColor(config.color.e)
+          .setTimestamp();
 
-                await interaction.reply(messageEmbed);
-                const logChannel = await GetLogChannel(interaction);
-                if (logChannel) {
-                    logChannel.send({ embeds: [messageEmbed] });
-                }
-            }
+        await interaction.reply(messageEmbed);
+        const logChannel = await GetLogChannel(interaction);
+        if (logChannel) {
+          logChannel.send({ embeds: [messageEmbed] });
         }
+      }
     }
-};
+  },
+};
diff --git a/events/ready.js b/events/ready.js
@@ -9,7 +9,6 @@ module.exports = {
    */
   async execute(client) {
     const logFile = await client.func.logUtils.readLog("v1/conf/status");
-    console.log(logFile);
     const add = require(`../lib/commandUtils.js`);
 
     add.addCmd(client);