feat: tags

.env.example

@@ -16,6 +16,7 @@ ARCHIVE_CATEGORY_ID=archive_category_id_here
 MODERATORS_ROLE_IDS=role_id_1,role_id_2,role_id_3
 REPEL_ROLE_ID=your_repel_role_id_here
 ONBOARDING_ROLE_ID=onboarding_role_id_here
+TAG_ACCESS_ROLE_ID=tag_access_role_id_here
 
 # Optional Role IDs
 # ROLE_A_ID=optional_role_a_id
@@ -29,4 +30,7 @@ GUIDES_TRACKER_PATH=guides-tracker.json
 ADVENT_OF_CODE_TRACKER_PATH=advent-of-code-tracker.json
 
 
+DATABASE_URL=file:./data/webdev.db
+
+
 

.env.production

@@ -19,6 +19,7 @@ ARCHIVE_CATEGORY_ID=837507969859977258
 REPEL_ROLE_ID=1002411741776461844
 MODERATORS_ROLE_IDS=849481536654803004
 REGULAR_ROLE_ID=1383170370634514544
+TAG_ACCESS_ROLE_ID=1502128862224711805
 
 # Other
 GUIDES_TRACKER_PATH=/app/data/guides-tracker.json

.env.test

@@ -25,7 +25,10 @@ ARCHIVE_CATEGORY_ID=your-archived-category-id
 REPEL_ROLE_ID=your-repel-role-id
 MODERATORS_ROLE_IDS=your-moderator-role-id
 REGULAR_ROLE_ID=your-regular-role-id
+TAG_ACCESS_ROLE_ID=your-tag-access-role-id
 
 # Other
 GUIDES_TRACKER_PATH=guides-tracker.json
-ADVENT_OF_CODE_TRACKER_PATH=test-advent-tracker.json
+ADVENT_OF_CODE_TRACKER_PATH=test-advent-tracker.json
+
+DATABASE_URL=test.db

.github/workflows/deploy-commands.yml

@@ -32,6 +32,6 @@ jobs:
             # 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/scripts/deploy-commands.js
+            docker compose exec bot node dist/scripts/deploy-commands.js
 
             echo "Discord commands deployment completed!"

.github/workflows/deploy.yml

@@ -1,58 +1,126 @@
-name: Build, Test and Deploy Discord Bot to VPS
-
+name: Deploy
 on:
   push:
-    branches: ['main']
-  workflow_dispatch: # Allow manual deployment
+    branches: [main]
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Git ref (commit SHA or tag) to deploy. Leave blank for latest main.'
+        required: false
+        default: ''
+
+concurrency:
+  group: deploy-${{ github.ref }}
+  cancel-in-progress: false
+
+env:
+  MAX_BACKUPS: 4
+  DIR: /home/${{ secrets.VPS_USER }}/webdev-bot-deploy
 
 jobs:
-  deploy:
+  lint:
+    name: Lint & Format Check
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout code
+      - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Read Node version
-        run: |
-          NODE_VERSION=$(cat .nvmrc | sed 's/v//')
-          echo "NODE_VERSION=$NODE_VERSION" >> $GITHUB_ENV
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Prisma generate (sanity check schema)
+        run: pnpm run prisma:generate
+        env:
+          DATABASE_URL: file:/tmp/ci.db
 
-      - name: Deploy to VPS
-        uses: appleboy/ssh-action@v1.0.3
+      - name: Lint
+        run: pnpm lint
+
+      - name: Format
+        run: pnpm fmt:check
+
+      - name: Typecheck
+        run: pnpm typecheck
+
+  deploy:
+    name: Deploy to VPS
+    runs-on: ubuntu-latest
+    needs: [lint]
+    permissions:
+      contents: read
+    steps:
+      - name: Deploy via SSH
+        uses: appleboy/ssh-action@v1
         with:
           host: ${{ secrets.VPS_HOST }}
           username: ${{ secrets.VPS_USER }}
           key: ${{ secrets.VPS_SSH_KEY }}
+          envs: REPO_URL,REF
           script: |
-            cd /home/${{ secrets.VPS_USER }}/webdev-bot-deploy
+            set -eu
+            mkdir -p ${{ env.DIR }}
+            cd ${{ env.DIR }}
 
-            # Stash any local changes
-            git stash push -m "Auto-deploy $(date)" 2>/dev/null || true
+            if [ -d .git ]; then
+              git stash push -m "Auto-deploy $(date)" 2>/dev/null || true
+              git fetch origin
+              git checkout "$REF"
+              git reset --hard "origin/$REF" 2>/dev/null || git reset --hard "$REF"
+            else
+              git clone "$REPO_URL" .
+              git checkout "$REF"
+            fi
 
-            # Pull latest changes
-            git checkout main
-            git pull origin main
+            mkdir -p ${{ env.DIR }}/backups
 
-            # Read NODE_VERSION from .nvmrc
-            export NODE_VERSION=$(cat .nvmrc | sed 's/v//')
+            export NODE_VERSION=$(cat .nvmrc | tr -d 'v')
             echo "Using Node version: $NODE_VERSION"
 
-            # Create .env file with secrets
-            # Public config comes from .env.production (committed to repo)
-            # NODE_ENV=production is set in docker-compose.yml
-            cat > .env << EOF
+            cat > .env <<'EOF'
             DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }}
             CLIENT_ID=${{ secrets.CLIENT_ID }}
             EOF
+            chmod 600 .env
+
+            # Backup the SQLite DB before touching anything
+            if docker volume inspect webdev-bot_guides-data >/dev/null 2>&1; then
+              docker run --rm \
+                -v webdev-bot_guides-data:/data \
+                -v ${{ env.DIR }}/backups:/backup \
+                alpine sh -c "if [ -f /data/db.sqlite ]; then cp /data/db.sqlite /backup/db-\$(date +%Y%m%d%H%M%S).sqlite; fi"
+              ls -1t ${{ env.DIR }}/backups/*.sqlite 2>/dev/null \
+                | tail -n +$((env.MAX_BACKUPS+1)) \
+                | xargs -r rm --
+            fi
+
+            docker compose config >/dev/null
+            docker compose build bot
+
+            if ! docker compose run --rm migrate; then
+              echo "Migration failed — leaving existing bot container untouched."
+              exit 1
+            fi
 
-            # Stop any existing containers
-            docker compose down || true
+            docker compose up -d --remove-orphans bot
 
-            # 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
+            sleep 8
+            if ! docker compose ps bot --status running | grep -q bot; then
+              echo "Bot container is not running after deploy!"
+              docker compose logs --tail=50 bot
+              exit 1
+            fi
 
-            # Check status
-            echo "Deployment completed. Container status:"
             docker compose ps
+            docker image prune -f
+        env:
+          REPO_URL: https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
+          REF: ${{ github.event.inputs.ref != '' && github.event.inputs.ref || 'main' }}

.github/workflows/test.yml

@@ -31,6 +31,11 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
+      - name: Prisma generate (sanity check schema)
+        run: pnpm run prisma:generate
+        env:
+          DATABASE_URL: file:/tmp/ci.db
+
       - name: Lint
         run: pnpm lint
 

.gitignore

@@ -30,4 +30,12 @@ docker-compose.yml
 # terraform
 **/.terraform/
 *.tfstate
-*.tfstate.*
+*.tfstate.*
+
+# prisma
+src/generated
+
+# Database files
+*.db
+*.sqlite
+*.sqlite3

DOCKER.md

@@ -36,7 +36,7 @@ pnpm run docker:dev
 Or using docker-compose directly:
 
 ```bash
-docker compose --profile dev up
+docker compose -f docker-compose.dev.yml up
 ```
 
 In development mode:
@@ -48,9 +48,9 @@ In development mode:
 To stop the development container:
 
 ```bash
-pnpm run docker:stop
+pnpm run docker:dev:stop
 # or
-docker compose --profile dev down
+docker compose -f docker-compose.dev.yml down
 ```
 
 ### Production Mode
@@ -64,7 +64,7 @@ pnpm run docker:prod
 Or using docker-compose directly:
 
 ```bash
-docker compose --profile prod up -d
+docker compose up -d
 ```
 
 In production mode:
@@ -76,7 +76,7 @@ In production mode:
 To stop the production container:
 
 ```bash
-docker compose --profile prod down
+docker compose down
 ```
 
 ## Manual Docker Commands
@@ -128,12 +128,12 @@ docker run -it \
 1. Check if environment variables are set correctly:
 
    ```bash
-   docker compose --profile dev run --rm bot-dev env | grep DISCORD
+   docker compose -f docker-compose.dev.yml run --rm bot-dev env | grep DISCORD
    ```
 
 2. View container logs:
    ```bash
-   docker compose --profile dev logs bot-dev
+   docker compose -f docker-compose.dev.yml logs bot-dev
    # or
    docker logs webdev-bot-dev
    ```
@@ -159,7 +159,7 @@ If code changes aren't being detected in development mode:
 
 2. Restart the container:
    ```bash
-   docker compose --profile dev restart
+   docker compose -f docker-compose.dev.yml restart
    ```
 
 ### Image Size Concerns
@@ -189,8 +189,8 @@ docker compose build --no-cache
 ## Best Practices
 
 1. **Never commit `.env`** - Keep your secrets secure
-2. **Use production profile for deployment** - Smaller, more secure images
-3. **Keep development profile for local testing** - Faster iteration with hot reload
+2. **Use production compose for deployment** - Smaller, more secure images
+3. **Keep development compose for local testing** - Faster iteration with hot reload
 4. **Node version is managed in `.nvmrc`** - Update `.nvmrc` to change Node version for Docker
 5. **Regularly update the base image** - Rebuild images after updating `.nvmrc`
 6. **Monitor container resources** - Use `docker stats` to check resource usage
@@ -218,11 +218,11 @@ docker compose down -v
 View container logs in real-time:
 
 ```bash
-docker compose --profile dev logs -f bot-dev
+docker compose -f docker-compose.dev.yml logs -f bot-dev
 ```
 
 Execute commands inside the container:
 
 ```bash
-docker compose --profile dev exec bot-dev sh
+docker compose -f docker-compose.dev.yml exec bot-dev sh
 ```