Merge pull request #139 from na2na-p/develop

1.2.0.0

.env.example

@@ -0,0 +1,15 @@
+# DiscordBot Token
+TOKEN="YOUR_TOKEN_HERE"
+
+# DiscordBot Owner
+BOT_MASTER_ID="Your Discord ID"
+
+# DiscordBot Prefix
+PREFIX="YOUR_BOT_PREFIX_HERE"
+
+# DeepL API Key
+DEEPL_API_KEY="YOUR_DEEPL_API_KEY_HERE"
+
+# Commands Install Target Server ID
+# e.g. 123456789012345678,123456789012345678,123456789012345678
+SET_COMMANDS_TARGET_SERVERS="YOUR_SERVER_ID_HERE"

.github/workflows/approve.yml

@@ -25,7 +25,6 @@ jobs:
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.PRIVATE_KEY }}
-      # ghコマンドを利用して自身をreviewerに追加
       - name: Approve
         run: gh pr review ${{ env.NUMBER }} --approve
         env:

.vscode/settings.json

@@ -1,6 +1,4 @@
 {
-    "files.eol": "\n",
-    "cSpell.words": [
-        "discordjs"
-    ]
+	"files.eol": "\n",
+	"cSpell.words": ["discordjs", "divitation"]
 }

Dockerfile

@@ -20,6 +20,6 @@ COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/built ./built
 COPY --from=builder /app/package.json ./package.json
 
-ENV NODE_ENV=production
+ENV NODE_ENV=container
 ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD ["yarn", "start"]

docker-compose.yml → compose.yml

@@ -4,5 +4,5 @@ services:
     container_name: app
     image: na2na/2na2-discord:main
     restart: always
-    volumes:
-      - .config:/app/.config
+    env_file:
+      - ./.env

package.json

@@ -8,7 +8,7 @@
 	"license": "MIT",
 	"scripts": {
 		"start": "node built/index.js --trace-warnings",
-		"dev": "nodemon",
+		"dev": "yarn nodemon",
 		"build": "yarn tsc -p tsconfig.json && yarn tsc-alias -p tsconfig.json",
 		"lint": "yarn eslint --ext .js,.ts .",
 		"lint:fix": "yarn eslint --ext .js,.ts . --fix",
@@ -24,22 +24,21 @@
 		"deepl-node": "1.7.1",
 		"discord-api-types": "0.37.16",
 		"discord.js": "14.6.0",
-		"js-yaml": "4.1.0",
+		"dotenv": "^16.0.3",
 		"libsodium-wrappers": "0.7.10",
 		"spotify-web-api-node": "5.0.2",
 		"twemoji-parser": "14.0.0"
 	},
 	"devDependencies": {
-		"@swc/core": "1.3.11",
+		"@swc/core": "1.3.14",
 		"@swc/helpers": "0.4.12",
 		"@types/chai": "4.3.3",
 		"@types/color": "3.0.3",
-		"@types/js-yaml": "4.0.5",
 		"@types/mocha": "10.0.0",
-		"@types/node": "18.11.8",
+		"@types/node": "18.11.9",
 		"@types/twemoji-parser": "13.1.1",
-		"@typescript-eslint/eslint-plugin": "5.41.0",
-		"@typescript-eslint/parser": "5.41.0",
+		"@typescript-eslint/eslint-plugin": "5.42.0",
+		"@typescript-eslint/parser": "5.42.0",
 		"chai": "4.3.6",
 		"eslint": "8.26.0",
 		"eslint-config-google": "0.14.0",

src/client.ts

@@ -1,6 +1,6 @@
 /* eslint-disable require-jsdoc */
 import {CacheType, Client, GatewayIntentBits, Interaction, InteractionType, Message} from 'discord.js';
-import {config} from '@/config.js';
+import {config} from '@/config/index.js';
 import {
 	commandSetType,
 	interactionHookType,

src/config/index.ts

@@ -0,0 +1,59 @@
+import _log from '@utils/log.js';
+// eslint-disable-next-line require-jsdoc
+function log(msg: string): void {
+	_log(`[Config]: ${msg}`);
+}
+
+type configType = {
+	token: string;
+	botMasterId: string;
+	prefix: string;
+	deeplApiKey: string;
+	setCommandsTargetServers: string[];
+}
+
+if (process.env['NODE_ENV'] !== 'container') {
+	log('Running in direct deployment mode. .env file loaded.');
+	const dotenv = await import('dotenv');
+	dotenv.config();
+} else {
+	log('Running in container mode. using environment variables.');
+};
+
+export const config: configType = {
+	token: (() => {
+		if (process.env['TOKEN']) {
+			return process.env['TOKEN'];
+		} else {
+			throw new Error('TOKEN is not defined.');
+		}
+	})(),
+	botMasterId: (() => {
+		if (process.env['BOT_MASTER_ID']) {
+			return process.env['BOT_MASTER_ID'];
+		} else {
+			throw new Error('BOT_MASTER_ID is not defined.');
+		}
+	})(),
+	prefix: (() => {
+		if (process.env['PREFIX']) {
+			return process.env['PREFIX'];
+		} else {
+			throw new Error('PREFIX is not defined.');
+		}
+	})(),
+	deeplApiKey: (() => {
+		if (process.env['DEEPL_API_KEY']) {
+			return process.env['DEEPL_API_KEY'];
+		} else {
+			throw new Error('DEEPL_API_KEY is not defined.');
+		}
+	})(),
+	setCommandsTargetServers: (() => {
+		if (process.env['SET_COMMANDS_TARGET_SERVERS']) {
+			return process.env['SET_COMMANDS_TARGET_SERVERS'].split(',');
+		} else {
+			return [];
+		}
+	})(),
+};

src/index.ts

@@ -11,7 +11,7 @@ function log(msg: string): void {
 import {Ping} from '@modules/hooks/ping/index.js';
 import {Dice} from '@modules/hooks/dice/index.js';
 import {Translate} from '@modules/hooks/translate/index.js';
-import {ColorPicker} from '@/modules/hooks/colorpicker/index.js';
+import {ColorPicker} from '@/modules/hooks/colorPicker/index.js';
 import {Divination} from '@modules/hooks/divination/index.js';
 import {Menu} from '@modules/hooks/menu/index.js';
 import {Search} from '@modules/hooks/search/index.js';
@@ -49,4 +49,5 @@ const commands: commandSetType[] = [
 ];
 
 log('Starting Na2Client...');
+
 new Na2Client(hooks, commands);

src/modules/hooks/divination/index.ts

@@ -2,7 +2,7 @@
 /* eslint-disable require-jsdoc */
 import {boundMethod} from 'autobind-decorator';
 import {queryMessage} from '@/types.js';
-import {config} from '@/config.js';
+import {config} from '@/config/index.js';
 import {EmbedBuilder, ColorResolvable, EmbedFooterData, Message} from 'discord.js';
 import dayjs from 'dayjs';
 import {Translator} from 'deepl-node';

src/modules/hooks/translate/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable require-jsdoc */
 import {queryMessage} from '@/types.js';
-import {config} from '@/config.js';
+import {config} from '@/config/index.js';
 import {Translator} from 'deepl-node';
 import {Message} from 'discord.js';