feat: simplify env var usage

.env.development

@@ -0,0 +1,16 @@
+# Development Environment Configuration
+# Public values - safe to commit to repository
+# These are Discord IDs for your development/test server
+
+# Discord Server ID (your dev server)
+SERVER_ID=1403539983821963274
+
+# Channel IDs (from your dev server)
+GUIDES_CHANNEL_ID=1426998962635804712
+REPEL_LOG_CHANNEL_ID=1403540596035027045
+
+# Role IDs (from your dev server)
+REPEL_ROLE_ID=1403545113904414842
+MODERATORS_ROLE_IDS=1428151937534005379
+
+# Note: DISCORD_TOKEN & CLIENT_ID should be in .env.local (not committed)

.env.example

@@ -1,9 +1,14 @@
-DISCORD_TOKEN="" # Your bot token
-CLIENT_ID="" # Your bot's application ID
+# Local Environment Variables (Secrets)
+# Copy this file to .env.local and fill in your actual values
+# .env.local is gitignored and should NEVER be committed
 
-SERVER_ID= # Discord Server ID where the bot will operate
-MODERATORS_ROLE_IDS= # Comma separated list of role IDs that are Moderators(Mods, Admins, etc)
+# Discord Bot Token & Application ID (REQUIRED)
+# Get this from: https://discord.com/developers/applications
+DISCORD_TOKEN=your-bot-token-here
+CLIENT_ID=your-bot-application-id
 
-REPEL_LOG_CHANNEL_ID= # Channel ID where the bot will log repel actions
-REPEL_ROLE_ID= # Role ID assigned to users who can use the repel command
-GUIDES_CHANNEL_ID="" # The ID of the channel where guides will be posted
+# Optional: Override any public config values for local testing
+# Uncomment and modify as needed:
+# SERVER_ID=override-server-id
+# CLIENT_ID=override-client-id
+# GUIDES_CHANNEL_ID=override-channel-id

.env.production

@@ -0,0 +1,16 @@
+# Production Environment Configuration
+# Public values - safe to commit to repository
+# These are Discord IDs that are publicly visible anyway
+
+# Discord Server ID
+SERVER_ID=your-prod-server-id
+
+# Channel IDs
+GUIDES_CHANNEL_ID=your-prod-guides-channel-id
+REPEL_LOG_CHANNEL_ID=your-prod-repel-log-channel-id
+
+# Role IDs
+REPEL_ROLE_ID=your-prod-repel-role-id
+MODERATORS_ROLE_IDS=your-prod-moderator-role-id-1,your-prod-moderator-role-id-2
+
+# Note: DISCORD_TOKEN & CLIENT_ID should be in .env.local (not committed)

.github/workflows/deploy.yml

@@ -38,21 +38,19 @@ jobs:
           export NODE_VERSION=$(cat .nvmrc | sed 's/v//')
           echo "Using Node version: $NODE_VERSION"
 
-          # Create .env.local file with secrets
+          # Create .env.local file with secrets only
+          # Public config comes from .env.production (committed to repo)
+          # NODE_ENV=production is set in docker-compose.yml
           cat > .env.local << EOF
           DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }}
           CLIENT_ID=${{ secrets.CLIENT_ID }}
-          GUIDES_CHANNEL_ID=${{ secrets.GUIDES_CHANNEL_ID }}
-          SERVER_ID=${{ secrets.SERVER_ID }}
-          REPEL_LOG_CHANNEL_ID=${{ secrets.REPEL_LOG_CHANNEL_ID }}
-          REPEL_ROLE_ID=${{ secrets.REPEL_ROLE_ID }}
-          MODERATORS_ROLE_IDS=${{ secrets.MODERATORS_ROLE_IDS }}
           EOF
 
           # Stop any existing containers
           docker compose down || true
 
           # Build and start production container with profile
+          # NODE_ENV=production is explicitly set in docker-compose.yml bot-prod service
           docker compose --profile prod up -d --build
 
           # Check status

.gitignore

@@ -12,10 +12,12 @@ yarn-debug.log*
 yarn-error.log*
 
 # Env files
-!.env.example
-.env
 .env.local
 .env.*.local
+# Allow environment-specific configs (public, non-secret)
+!.env.development
+!.env.production
+!.env.example
 
 # guides tracker
 guides-tracker.json

Dockerfile

@@ -41,6 +41,9 @@ COPY --from=deps /app/node_modules ./node_modules
 COPY --from=build /app/dist ./dist
 COPY package.json ./
 
+# Copy environment config files (public, non-secret)
+COPY .env.production .env.development ./
+
 # Create data directory and set permissions for node user
 RUN mkdir -p /app/data && chown -R node:node /app/data
 

docker-compose.yml

@@ -11,6 +11,7 @@ services:
     env_file:
       - .env.local
     environment:
+      - NODE_ENV=production
       - GUIDES_TRACKER_PATH=/app/data/guides-tracker.json
     volumes:
       # Persist guides tracker data
@@ -30,6 +31,7 @@ services:
     env_file:
       - .env.local
     environment:
+      - NODE_ENV=development
       - GUIDES_TRACKER_PATH=/app/data/guides-tracker.json
     volumes:
       # Mount source code for hot reload
@@ -40,6 +42,9 @@ services:
       # Mount package files (in case dependencies change)
       - ./package.json:/app/package.json:ro
       - ./pnpm-lock.yaml:/app/pnpm-lock.yaml:ro
+      # Mount environment config files
+      - ./.env.development:/app/.env.development:ro
+      - ./.env.production:/app/.env.production:ro
       # Persist guides tracker data
       - guides-data:/app/data
     profiles:

src/loadEnvFile.ts

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 // Simple .env loader without external dependencies
 function loadEnvFile(filePath: string) {
   if (!existsSync(filePath)) {
+    console.warn(`Warning: File ${filePath} not found`);
     return;
   }
 
@@ -24,12 +25,22 @@ function loadEnvFile(filePath: string) {
         }
       }
     }
+    console.log(`✅ Loaded: ${filePath}`);
   } catch (error) {
     console.warn(`Warning: Could not load ${filePath}`);
-    console.warn('Make sure a valid .env.local file exists.');
     console.warn(error);
   }
 }
 
-// Load local environment file if it exists
-loadEnvFile(join(process.cwd(), '.env.local'));
+// Determine environment (defaults to development)
+const nodeEnv = process.env.NODE_ENV || 'development';
+console.log(`🌍 Environment: ${nodeEnv}`);
+
+// Load environment-specific config first (public values)
+const envFile = join(process.cwd(), `.env.${nodeEnv}`);
+loadEnvFile(envFile);
+
+// Load local overrides and secrets second (overrides public config)
+// Required in both dev and prod for DISCORD_TOKEN
+const localEnvFile = join(process.cwd(), '.env.local');
+loadEnvFile(localEnvFile);