Merge branch 'master' into dev

Author: h1divp

.github/workflows/dev-build-deploy-discord-bot.yml

@@ -0,0 +1,44 @@
+name: Deploy Discord Bot to Development
+
+on:
+  push:
+    branches:
+      - dev
+    paths:
+      - "apps/discord-bot/**"
+      - "infra/docker-compose.dev.yml"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-and-push:
+    name: Build and Push Docker Image to GHCR
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU for cross-platform builds
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push multi-arch image
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --push \
+            -t ghcr.io/${{ github.repository_owner }}/core-discord-bot:dev \
+            ./apps/discord-bot

.gitignore

@@ -41,5 +41,3 @@ venv
 
 .env.dev.discord
 uv.lock
-
-uv.lock

apps/discord-bot/.env.example

@@ -5,4 +5,4 @@ API_URL=https://api.swamphacks.com
 SESSION_COOKIE=
 WEBHOOK_URL=
 WEBHOOK_PORT=
-EVENT_ID=
+EVENT_ID=

apps/discord-bot/components/support_thread_buttons.py

@@ -294,6 +294,21 @@ async def callback(self, interaction: Interaction):
         except Exception as e:
             await interaction.response.send_message(f"❌ Error joining thread: {str(e)}", ephemeral=True)
 
+class JoinThreadButton(Button):
+    """Button to join a claimed support thread for additional mentor assistance."""
+    def __init__(self, thread: discord.Thread):
+        super().__init__(label="Join Thread", style=ButtonStyle.primary, custom_id="join_thread", emoji="➡️")
+        self.thread = thread
+
+    async def callback(self, interaction: Interaction):
+        try:
+            await self.thread.add_user(interaction.user)
+            await interaction.response.send_message(f"You've joined the thread {self.thread.mention}", ephemeral=True)
+        except NotFound:
+            await interaction.response.send_message("❌ This thread no longer exists.", ephemeral=True)
+        except Exception as e:
+            await interaction.response.send_message(f"❌ Error joining thread: {str(e)}", ephemeral=True)
+
 class ClaimThreadButton(Button):
     """Button to claim a support thread and add the mentor to it."""
     def __init__(self, thread: discord.Thread, description_input: discord.ui.TextInput):