Merge branch 'main' into feat/onboarding

Author: wiktoriavh

.dockerignore

@@ -7,6 +7,7 @@ dist/
 # Environment files
 .env
 .env.*
+!.env.production
 
 # Git
 .git/

.env.test

@@ -0,0 +1,24 @@
+# Local Environment Variables (Secrets)
+# Copy this file to .env and fill in your actual values
+# .env is gitignored and should NEVER be committed
+
+# 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
+
+# Override any public config values for local testing
+
+# Discord Server ID (your dev server)
+SERVER_ID=your-server-id
+
+# Channel IDs (from your dev server)
+GUIDES_CHANNEL_ID=your-guide-channel-id
+REPEL_LOG_CHANNEL_ID=your-repel-log-channel-id
+
+# Role IDs (from your dev server)
+REPEL_ROLE_ID=your-repel-role-id
+MODERATORS_ROLE_IDS=your-moderator-role-id
+
+# Other
+GUIDES_TRACKER_PATH=guides-tracker.json

.github/workflows/deploy-commands.yml

@@ -0,0 +1,37 @@
+name: Deploy Discord Commands
+
+on:
+  workflow_dispatch: # Manual trigger only
+
+jobs:
+  deploy-commands:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Read Node version
+      run: |
+        NODE_VERSION=$(cat .nvmrc | sed 's/v//')
+        echo "NODE_VERSION=$NODE_VERSION" >> $GITHUB_ENV
+
+    - name: Deploy Discord Commands to VPS
+      uses: appleboy/[email protected]
+      with:
+        host: ${{ secrets.VPS_HOST }}
+        username: ${{ secrets.VPS_USER }}
+        key: ${{ secrets.VPS_SSH_KEY }}
+        script: |
+          cd /home/${{ secrets.VPS_USER }}/webdev-bot-deploy
+
+          # Read NODE_VERSION from .nvmrc
+          export NODE_VERSION=$(cat .nvmrc | sed 's/v//')
+          echo "Using Node version: $NODE_VERSION"
+
+          # Run deploy script inside the already running Docker container
+          # .env file should already exist from main deployment
+          echo "Deploying Discord commands..."
+          docker compose --profile prod exec bot-prod node dist/util/deploy.js
+
+          echo "Discord commands deployment completed!"

.github/workflows/test.yml

@@ -37,10 +37,7 @@ jobs:
 
       - name: Build
         run: npm run build:ci
-        env:
-          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-          CLIENT_ID: ${{ secrets.CLIENT_ID }}
 
-      - name: Run tests
+      - name: Test
         run: npm run test:ci
 

.gitignore

@@ -18,6 +18,7 @@ yarn-error.log*
 # Public config (committed to repo)
 !.env.production
 !.env.example
+!.env.test
 
 # guides tracker
 guides-tracker.json

biome.json

@@ -33,6 +33,6 @@
     }
   },
   "files": {
-    "includes": ["*.ts", "*.js", "*.json", "src/**/*"]
+    "includes": ["*.ts", "*.js", "*.json", "src/**/*", "test/**/*"]
   }
 }

package.json

@@ -22,7 +22,7 @@
     "check:fix": "biome check --write .",
     "typecheck": "tsc --noEmit",
     "test": "pnpm run build:dev && node --test dist/**/*.test.js",
-    "test:ci": "node --test dist/**/*.test.js",
+    "test:ci": "NODE_ENV=test node --test dist/**/*.test.js",
     "prepare": "husky",
     "pre-commit": "lint-staged",
     "sync-guides": "tsx scripts/sync-guides.js",

src/commands/moderation/repel.ts

@@ -287,11 +287,9 @@ const logRepelAction = async ({
 
   const modMessage = interaction.options.getString(RepelOptions.MESSAGE_FOR_MODS) ?? false;
   const mentionText = modMessage
-    ? `${config.moderatorsRoleIds.map((id) => `<@&${id}>`)} - ${modMessage}`
+    ? `${config.roleIds.moderators.map((id) => `<@&${id}>`)} - ${modMessage}`
     : undefined;
-  const channel = interaction.client.channels.cache.get(
-    config.repel.repelLogChannelId
-  ) as TextChannel;
+  const channel = interaction.client.channels.cache.get(config.channelIds.repelLogs) as TextChannel;
 
   const embed =
     failedChannelsEmbed !== null
@@ -390,7 +388,7 @@ export const repelCommand = createCommand({
     }
     await interaction.deferReply({ flags: MessageFlags.Ephemeral });
 
-    const repelRole = interaction.guild.roles.cache.get(config.repel.repelRoleId);
+    const repelRole = interaction.guild.roles.cache.get(config.roleIds.repel);
     if (!repelRole) {
       await interaction.editReply({
         content: '❌ Repel role is not configured correctly. Please contact an administrator.',

src/env.ts

@@ -20,18 +20,21 @@ export const config = {
     token: requireEnv('DISCORD_TOKEN'),
     clientId: requireEnv('CLIENT_ID'),
   },
-  repel: {
-    repelLogChannelId: requireEnv('REPEL_LOG_CHANNEL_ID'),
-    repelRoleId: requireEnv('REPEL_ROLE_ID'),
-  },
-  fetchAndSyncMessages: true,
   serverId: requireEnv('SERVER_ID'),
-  moderatorsRoleIds: requireEnv('MODERATORS_ROLE_IDS')
-    ? requireEnv('MODERATORS_ROLE_IDS').split(',')
-    : [],
-  guides: {
-    channelId: requireEnv('GUIDES_CHANNEL_ID'),
-    trackerPath: optionalEnv('GUIDES_TRACKER_PATH'),
+  fetchAndSyncMessages: true,
+  guidesTrackerPath: optionalEnv('GUIDES_TRACKER_PATH'),
+  roleIds: {
+    moderators: requireEnv('MODERATORS_ROLE_IDS')
+      ? requireEnv('MODERATORS_ROLE_IDS').split(',')
+      : [],
+    repel: requireEnv('REPEL_ROLE_ID'),
+    a: optionalEnv('ROLE_A_ID'),
+    b: optionalEnv('ROLE_B_ID'),
+    c: optionalEnv('ROLE_C_ID'),
+  },
+  channelIds: {
+    repelLogs: requireEnv('REPEL_LOG_CHANNEL_ID'),
+    guides: requireEnv('GUIDES_CHANNEL_ID'),
   },
   onboarding: {
     channelId: requireEnv('ONBOARDING_CHANNEL_ID'),

src/events/auto-roles.ts

@@ -0,0 +1,23 @@
+import { Events } from 'discord.js';
+import { config } from '../env.js';
+import { createEvent } from '../util/events.js';
+import { hasRoles } from '../util/member.js';
+
+export const autoRoleEvent = createEvent(
+  {
+    name: Events.GuildMemberUpdate,
+  },
+  async (_, newMember) => {
+    const hasRoleC = hasRoles(newMember, config.roleIds.c);
+    if (!hasRoleC) {
+      const hasRequiredRoles = hasRoles(newMember, config.roleIds.a, config.roleIds.b);
+      if (hasRequiredRoles) {
+        try {
+          await newMember.roles.add(config.roleIds.c);
+        } catch (error) {
+          console.error(`Failed to add roleC to ${newMember.user.tag}:`, error);
+        }
+      }
+    }
+  }
+);