Merging JDA611b to master

.github/workflows/gradle.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 17
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

.github/workflows/jda611.yml

@@ -0,0 +1,48 @@
+name: JDA611 Branch Publish
+permissions:
+  contents: read
+
+on:
+  push:
+    branches: [ jda611b ]
+
+jobs:
+  publish-docker-image:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # Login to Docker Hub
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.SOUNDBOARD_GHCR }}
+
+      # Generate tags + labels for BOTH registries
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            davefurrer/discordsoundboard
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,value=jda611
+
+      # Build & push using metadata
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/publish.yml

@@ -9,33 +9,38 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: Log in to Docker Hub
-      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_TOKEN }}
+      # Login to Docker Hub
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
 
-    - name: Log in to the Container registry
-      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-      with:
-        registry: ghcr.io
-        username: Darkside138
-        password: ${{ secrets.SOUNDBOARD_GHCR }}
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.SOUNDBOARD_GHCR }}
 
-    - name: Extract metadata (tags, labels) for Docker
-      id: meta
-      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-      with:
-        images: |
-          davefurrer/discordsoundboard
-          ghcr.io/${{ github.repository }}
+      # Generate tags + labels for BOTH registries
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            davefurrer/discordsoundboard
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,value=master
 
-    - name: Build and push Docker images
-      uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-      with:
-        context: .
-        push: true
-        tags: davefurrer/discordsoundboard:latest
-        labels: ${{ steps.meta.outputs.labels }}
+      # Build & push using metadata
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/version.yml

@@ -44,28 +44,36 @@ jobs:
           push: true
           tags: ${{ secrets.DOCKER_USERNAME }}/discordsoundboard:${{ steps.get_version.outputs.VERSION }}
 
-      - name: Discord Soundboard Notification
-        uses: meisnate12/discord-notifications@master
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.BUILD_WEBHOOK_TOKEN }}
+        uses: Ilshidur/action-discord@master
         if: success()
         with:
-          webhook_id: ${{ secrets.BUILD_WEBHOOK_ID }}
-          webhook_token: ${{ secrets.BUILD_WEBHOOK_TOKEN }}
-          title: "Docker Image ${{ steps.get_version.outputs.VERSION }} build: **Success**"
-          url: https://github.com/Darkside138/DiscordSoundboard/actions/runs/${{ github.run_id }}
-          username: Docker Release Notifier
-          avatar_url: https://raw.githubusercontent.com/Darkside138/DiscordSoundboard/master/distFiles/avatar.jpg
-          author: Docker
-          author_icon_url: https://raw.githubusercontent.com/Darkside138/DiscordSoundboard/master/.github/docker.png
+          args: 'Discord Soundboard: {{ EVENT_PAYLOAD.repository.full_name }} has been deployed.'
 
-      - name: Discord Soundboard Notification
-        uses: meisnate12/discord-notifications@master
-        if: success()
-        with:
-          webhook_id: ${{ secrets.BUILD_WEBHOOK_ID }}
-          webhook_token: ${{ secrets.BUILD_WEBHOOK_TOKEN }}
-          title: "Discord Soundboard ${{ steps.get_version.outputs.VERSION }} Released"
-          url: https://github.com/Darkside138/DiscordSoundboard/releases/tag/${{ steps.get_version.outputs.VERSION }}
-          username: Release Notifier
-          avatar_url: https://raw.githubusercontent.com/Darkside138/DiscordSoundboard/master/distFiles/avatar.jpg
-          author: Discord Soundboard
-          author_icon_url: https://raw.githubusercontent.com/Darkside138/DiscordSoundboard/master/distFiles/avatar.jpg
+      # - name: Discord Soundboard Notification
+      #   uses: meisnate12/discord-notifications@master
+      #   if: success()
+      #   with:
+      #     webhook_id: ${{ secrets.BUILD_WEBHOOK_ID }}
+      #     webhook_token: ${{ secrets.BUILD_WEBHOOK_TOKEN }}
+      #     title: "Docker Image ${{ steps.get_version.outputs.VERSION }} build: **Success**"
+      #     url: https://github.com/Darkside138/DiscordSoundboard/actions/runs/${{ github.run_id }}
+      #     username: Docker Release Notifier
+      #     avatar_url: https://raw.githubusercontent.com/Darkside138/DiscordSoundboard/master/distFiles/avatar.jpg
+      #     author: Docker
+      #     author_icon_url: https://raw.githubusercontent.com/Darkside138/DiscordSoundboard/master/.github/docker.png
+
+      # - name: Discord Soundboard Notification
+      #   uses: meisnate12/discord-notifications@master
+      #   if: success()
+      #   with:
+      #     webhook_id: ${{ secrets.BUILD_WEBHOOK_ID }}
+      #     webhook_token: ${{ secrets.BUILD_WEBHOOK_TOKEN }}
+      #     title: "Discord Soundboard ${{ steps.get_version.outputs.VERSION }} Released"
+      #     url: https://github.com/Darkside138/DiscordSoundboard/releases/tag/${{ steps.get_version.outputs.VERSION }}
+      #     username: Release Notifier
+      #     avatar_url: https://raw.githubusercontent.com/Darkside138/DiscordSoundboard/master/distFiles/avatar.jpg
+      #     author: Discord Soundboard
+      #     author_icon_url: https://raw.githubusercontent.com/Darkside138/DiscordSoundboard/master/distFiles/avatar.jpg

.gitignore

@@ -1,9 +1,9 @@
-/app.properties
 *.iml
-tokens.json
 .idea/
-src/main/resources/app.properties
 build
 .gradle/
-/src/main/resources/application.properties
-/discordDB/
+/discordDB/
+/src/frontend/node_modules/
+/src/main/resources/application-local.properties
+/src/frontend/coverage/
+/.gitattributes

.run/BootRun Local.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="BootRun Local" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="local" />
+    <option name="ALTERNATIVE_JRE_PATH" value="openjdk-25" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <module name="DiscordSoundboard.main" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="net.dirtydeeds.discordsoundboard.MainController" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/DiscordSoundboard [assembleBootDist].run.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DiscordSoundboard [assembleBootDist]" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="--info --warning-mode all" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="clean" />
+          <option value="assembleBootDist" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/DiscordSoundboard [bootRun].run.xml

@@ -0,0 +1,32 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DiscordSoundboard [bootRun]" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="SPRING_PROFILES_ACTIVE" value="local" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="bootRun" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <GradleProfilingDisabled>false</GradleProfilingDisabled>
+    <GradleCoverageDisabled>false</GradleCoverageDisabled>
+    <method v="2" />
+  </configuration>
+</component>