From 85346ae068742eb31486cc6fb3dfbb5c5abbd96e Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Thu, 10 Mar 2022 23:09:32 -0500
Subject: [PATCH] Load .env earlier

---
 packages/skin-database/api/server.ts        | 4 ++++
 packages/skin-database/cli.ts               | 4 ++--
 packages/skin-database/discord-bot/index.js | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/skin-database/api/server.ts b/packages/skin-database/api/server.ts
index 7d673786..c32e5570 100644
--- a/packages/skin-database/api/server.ts
+++ b/packages/skin-database/api/server.ts
@@ -1,4 +1,8 @@
 // import Sentry from "@sentry/node";
+import dotenv from "dotenv";
+
+dotenv.config();
+
 import { createApp } from "./app";
 import DiscordEventHandler from "./DiscordEventHandler";
 
diff --git a/packages/skin-database/cli.ts b/packages/skin-database/cli.ts
index e34674fc..75d6ecce 100755
--- a/packages/skin-database/cli.ts
+++ b/packages/skin-database/cli.ts
@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+import dotenv from "dotenv";
+dotenv.config();
 import fs from "fs";
 import { knex } from "./db";
 import logger from "./logger";
@@ -28,10 +30,8 @@ import _temp from "temp";
 import Shooter from "./shooter";
 import { program } from "commander";
 import * as config from "./config";
-import dotenv from "dotenv";
 import { setHashesForSkin } from "./skinHash";
 
-dotenv.config();
 
 async function withHandler(
   cb: (handler: DiscordEventHandler) => Promise<void>
diff --git a/packages/skin-database/discord-bot/index.js b/packages/skin-database/discord-bot/index.js
index 5b25e131..55e3f13e 100644
--- a/packages/skin-database/discord-bot/index.js
+++ b/packages/skin-database/discord-bot/index.js
@@ -1,3 +1,7 @@
+const dotenv = require("dotenv");
+
+dotenv.config();
+
 const Discord = require("discord.js");
 const logger = require("../logger");
 const DiscordWinstonTransport = require("../DiscordWinstonTransport");