fix(deps): update dependency net.fellbaum:jemoji to v1.7.6

.dockerignore

@@ -1,5 +1,5 @@
 .git
-.github
+.gitlab-ci.yml
 .idea
 .mvn
 src

.github/workflows/ci.yml

@@ -1,125 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - "main"
-    tags:
-      - '*'
-  pull_request:
-    branches:
-      - "main"
-
-jobs:
-  package:
-    name: Package
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Set up JDK
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
-        with:
-          distribution: 'temurin'
-          java-version: '25'
-          cache: 'maven'
-
-      - name: Build package
-        run: |
-          chmod +x ./mvnw
-          ./mvnw --batch-mode --update-snapshots verify
-
-      - name: Upload test reports
-        if: always()
-        uses: actions/upload-artifact@c6a366c94c3e0affe28c06c8df20a878f24da3cf # v3
-        with:
-          name: junit-reports
-          path: |
-            **/target/*-reports/TEST-*.xml
-          if-no-files-found: ignore
-
-      - name: Upload Maven artifacts
-        uses: actions/upload-artifact@c6a366c94c3e0affe28c06c8df20a878f24da3cf # v3
-        with:
-          name: maven-artifacts
-          path: |
-            target/netneutrality.jar
-            startup.sh
-          if-no-files-found: error
-
-  docker-main:
-    name: Docker Build and Push (main)
-    runs-on: ubuntu-latest
-    needs: package
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@a9bc5e6ef2cb54c177f32aa5726adaa15e7e2d59 # v3
-        with:
-          name: maven-artifacts
-          path: .
-
-      - name: Log in to registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
-        with:
-          registry: ${{ secrets.REGISTRY_URL }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Build and push (main)
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: "${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality:main"
-
-  docker-release:
-    name: Docker Build and Push (release)
-    runs-on: ubuntu-latest
-    needs: package
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@a9bc5e6ef2cb54c177f32aa5726adaa15e7e2d59 # v3
-        with:
-          name: maven-artifacts
-          path: .
-
-      - name: Compute release version
-        id: rel
-        shell: bash
-        run: |
-          # Strip leading 'v' if present (e.g., v1.2.3 -> 1.2.3)
-          ver="${GITHUB_REF_NAME#v}"
-          echo "version=$ver" >> "$GITHUB_OUTPUT"
-
-      - name: Log in to registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
-        with:
-          registry: ${{ secrets.REGISTRY_URL }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Build and push (release + latest)
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality:${{ steps.rel.outputs.version }}
-            ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality:latest

.gitlab-ci.yml

@@ -0,0 +1,101 @@
+image: docker.io/library/eclipse-temurin:25-jdk-alpine@sha256:da683f4f02f9427597d8fa162b73b8222fe08596dcebaf23e4399576ff8b037e
+
+variables:
+  MAVEN_OPTS: >-
+    -Dhttps.protocols=TLSv1.2
+    -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository
+    -Dorg.slf4j.simpleLogger.showDateTime=true
+    -Djava.awt.headless=true
+
+  MAVEN_CLI_OPTS: >-
+    --batch-mode
+    --errors
+    --fail-at-end
+    --show-version
+    --no-transfer-progress
+    -DinstallAtEnd=true
+    -DdeployAtEnd=true
+
+cache:
+  key: ${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG}
+  paths:
+    - .m2/repository
+    - .mvn
+  policy: pull-push
+
+stages:
+  - compile
+  - test
+  - package
+  - docker-build
+
+compile:
+  stage: compile
+  script:
+    - "chmod +x ./mvnw"
+    - "./mvnw $MAVEN_CLI_OPTS compile"
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_TAG'
+
+test:
+  stage: test
+  script:
+    - "chmod +x ./mvnw"
+    - "./mvnw $MAVEN_CLI_OPTS test"
+  artifacts:
+    when: always
+    reports:
+      junit:
+        - "**/target/*-reports/TEST-*.xml"
+      codequality:
+        - "target/gl-code-quality-report.json"
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_TAG'
+
+package:
+  stage: package
+  script:
+    - "chmod +x ./mvnw"
+    - "./mvnw $MAVEN_CLI_OPTS package -DskipTests=true"
+  artifacts:
+    name: "Maven artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"
+    paths:
+      - target/netneutrality.jar
+      - startup.sh
+    expire_in: 1 week
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_TAG'
+
+docker-build-main:
+  stage: docker-build
+  image: quay.io/buildah/stable
+  needs:
+    - job: package
+      artifacts: true
+  script:
+    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+    - buildah bud -f Dockerfile -t $CI_REGISTRY_IMAGE:main .
+    - buildah push $CI_REGISTRY_IMAGE:main
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+
+docker-build-release:
+  stage: docker-build
+  image: quay.io/buildah/stable
+  needs:
+    - job: package
+      artifacts: true
+  script:
+    - export RELEASE_VERSION="${CI_COMMIT_TAG#v}"
+    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+    - buildah bud -f Dockerfile -t $CI_REGISTRY_IMAGE:$RELEASE_VERSION .
+    - buildah push $CI_REGISTRY_IMAGE:$RELEASE_VERSION
+    - buildah tag $CI_REGISTRY_IMAGE:$RELEASE_VERSION $CI_REGISTRY_IMAGE:latest
+    - buildah push $CI_REGISTRY_IMAGE:latest
+  rules:
+    - if: '$CI_COMMIT_TAG'

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:25-jre@sha256:ff82c74a630c08b417502c4c18189e62074edbb28eb1f2d31b799ac138c01058
+FROM docker.io/library/eclipse-temurin:25-jre@sha256:0a9c973778b03b88f39ccae4f8cc26022d84a3237a818cb98770369eb6c5daf9
 
 RUN apt-get update && apt-get install -y --no-install-recommends netcat-openbsd curl && rm -rf /var/lib/apt/lists/*
 

docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - MARIADB_AUTO_UPGRADE=1
 
   netneutrality-bot:
-    image: gitea.bobert.me/anthorob/netneutrality:${NETNEUTRALITY_TAG:-latest}
+    image: registry.bobert.me/anthorob/netneutrality:${NETNEUTRALITY_TAG:-latest}
     container_name: bot
     restart: unless-stopped
     env_file: .env

mvnw.cmd

@@ -1,189 +1,189 @@
-<# : batch portion
+<# : batch portion
-@REM ----------------------------------------------------------------------------
+@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
+@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
+@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
+@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
+@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
+@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
+@REM with the License.  You may obtain a copy of the License at
-@REM
+@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
+@REM
-@REM Unless required by applicable law or agreed to in writing,
+@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
+@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
+@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
+@REM specific language governing permissions and limitations
-@REM under the License.
+@REM under the License.
-@REM ----------------------------------------------------------------------------
+@REM ----------------------------------------------------------------------------
-
+
-@REM ----------------------------------------------------------------------------
+@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.3.4
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
-@REM
+@REM
-@REM Optional ENV vars
+@REM Optional ENV vars
-@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
-@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
-@REM ----------------------------------------------------------------------------
+@REM ----------------------------------------------------------------------------
-
+
-@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
-@SET __MVNW_CMD__=
+@SET __MVNW_CMD__=
-@SET __MVNW_ERROR__=
+@SET __MVNW_ERROR__=
-@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
-@SET PSModulePath=
+@SET PSModulePath=
-@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
-  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
-)
+)
-@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
-@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_PSMODULEP_SAVE=
-@SET __MVNW_ARG0_NAME__=
+@SET __MVNW_ARG0_NAME__=
-@SET MVNW_USERNAME=
+@SET MVNW_USERNAME=
-@SET MVNW_PASSWORD=
+@SET MVNW_PASSWORD=
-@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
-@echo Cannot start maven from wrapper >&2 && exit /b 1
+@echo Cannot start maven from wrapper >&2 && exit /b 1
-@GOTO :EOF
+@GOTO :EOF
-: end batch / begin powershell #>
+: end batch / begin powershell #>
-
+
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = "Stop"
-if ($env:MVNW_VERBOSE -eq "true") {
+if ($env:MVNW_VERBOSE -eq "true") {
-  $VerbosePreference = "Continue"
+  $VerbosePreference = "Continue"
-}
+}
-
+
-# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
-$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
-if (!$distributionUrl) {
+if (!$distributionUrl) {
-  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
-}
+}
-
+
-switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
-  "maven-mvnd-*" {
+  "maven-mvnd-*" {
-    $USE_MVND = $true
+    $USE_MVND = $true
-    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
-    $MVN_CMD = "mvnd.cmd"
+    $MVN_CMD = "mvnd.cmd"
-    break
+    break
-  }
+  }
-  default {
+  default {
-    $USE_MVND = $false
+    $USE_MVND = $false
-    $MVN_CMD = $script -replace '^mvnw','mvn'
+    $MVN_CMD = $script -replace '^mvnw','mvn'
-    break
+    break
-  }
+  }
-}
+}
-
+
-# apply MVNW_REPOURL and calculate MAVEN_HOME
+# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-if ($env:MVNW_REPOURL) {
+if ($env:MVNW_REPOURL) {
-  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
-  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
-}
+}
-$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlName = $distributionUrl -replace '^.*/',''
-$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
-
+
-$MAVEN_M2_PATH = "$HOME/.m2"
+$MAVEN_M2_PATH = "$HOME/.m2"
-if ($env:MAVEN_USER_HOME) {
+if ($env:MAVEN_USER_HOME) {
-  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
-}
+}
-
+
-if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
-    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
-}
+}
-
+
-$MAVEN_WRAPPER_DISTS = $null
+$MAVEN_WRAPPER_DISTS = $null
-if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
-  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
-} else {
+} else {
-  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
-}
+}
-
+
-$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
-$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
-$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
-
+
-if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
-  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
-  exit $?
+  exit $?
-}
+}
-
+
-if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
-  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
-}
+}
-
+
-# prepare tmp dir
+# prepare tmp dir
-$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
-$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
-$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
-trap {
+trap {
-  if ($TMP_DOWNLOAD_DIR.Exists) {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
-    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-  }
+  }
-}
+}
-
+
-New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
-
+
-# Download and Install Apache Maven
+# Download and Install Apache Maven
-Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading from: $distributionUrl"
-Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
+
-$webclient = New-Object System.Net.WebClient
+$webclient = New-Object System.Net.WebClient
-if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
-  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
-}
+}
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
-
+
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
-$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
-if ($distributionSha256Sum) {
+if ($distributionSha256Sum) {
-  if ($USE_MVND) {
+  if ($USE_MVND) {
-    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
-  }
+  }
-  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
-  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
-    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
-  }
+  }
-}
+}
-
+
-# unzip and move
+# unzip and move
-Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
-
+
-# Find the actual extracted directory name (handles snapshots where filename != directory name)
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
-$actualDistributionDir = ""
+$actualDistributionDir = ""
-
+
-# First try the expected directory name (for regular distributions)
+# First try the expected directory name (for regular distributions)
-$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
-$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
-if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
-  $actualDistributionDir = $distributionUrlNameMain
+  $actualDistributionDir = $distributionUrlNameMain
-}
+}
-
+
-# If not found, search for any directory with the Maven executable (for snapshots)
+# If not found, search for any directory with the Maven executable (for snapshots)
-if (!$actualDistributionDir) {
+if (!$actualDistributionDir) {
-  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
-    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
-    if (Test-Path -Path $testPath -PathType Leaf) {
+    if (Test-Path -Path $testPath -PathType Leaf) {
-      $actualDistributionDir = $_.Name
+      $actualDistributionDir = $_.Name
-    }
+    }
-  }
+  }
-}
+}
-
+
-if (!$actualDistributionDir) {
+if (!$actualDistributionDir) {
-  Write-Error "Could not find Maven distribution directory in extracted archive"
+  Write-Error "Could not find Maven distribution directory in extracted archive"
-}
+}
-
+
-Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
-Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
-try {
+try {
-  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
-} catch {
+} catch {
-  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
-    Write-Error "fail to move MAVEN_HOME"
+    Write-Error "fail to move MAVEN_HOME"
-  }
+  }
-} finally {
+} finally {
-  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-}
+}
-
+
-Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"

pom.xml

@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>25</maven.compiler.source>
         <maven.compiler.target>25</maven.compiler.target>
-        <mockito.version>5.23.0</mockito.version>
+        <mockito.version>5.20.0</mockito.version>
     </properties>
 
     <build>
@@ -42,7 +42,7 @@
             <plugin>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-maven-plugin</artifactId>
-                <version>11.20.3</version>
+                <version>11.14.1</version>
                 <configuration>
                     <url>${env.FLYWAY_URL}</url>
                     <user>${env.FLYWAY_USER}</user>
@@ -52,7 +52,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.4.0</version>
                 <configuration>
                     <propertiesEncoding>UTF-8</propertiesEncoding>
                 </configuration>
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.2</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -119,6 +119,20 @@
                     <outputFormat>xml</outputFormat>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>de.chkal.maven</groupId>
+                <artifactId>gitlab-code-quality-plugin</artifactId>
+                <version>1.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -144,7 +158,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>6.4.1</version>
+            <version>6.3.1</version>
         </dependency>
         <dependency>
             <groupId>dev.arbjerg</groupId>
@@ -154,33 +168,33 @@
         <dependency>
             <groupId>dev.lavalink.youtube</groupId>
             <artifactId>v2</artifactId>
-            <version>1.18.1</version>
+            <version>1.18.0</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>jdave-api</artifactId>
-            <version>0.1.8</version>
+            <version>0.1.7</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>jdave-native-linux-x86-64</artifactId>
-            <version>0.1.8</version>
+            <version>0.1.7</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>jdave-native-win-x86-64</artifactId>
-            <version>0.1.8</version>
+            <version>0.1.7</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>jdave-native-darwin</artifactId>
-            <version>0.1.8</version>
+            <version>0.1.7</version>
         </dependency>
 
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp-jvm</artifactId>
-            <version>5.3.2</version>
+            <version>5.3.0</version>
         </dependency>
 
         <dependency>
@@ -196,24 +210,24 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>9.7.0</version>
+            <version>9.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>11.20.3</version>
+            <version>11.14.1</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-mysql</artifactId>
-            <version>11.20.3</version>
+            <version>11.14.1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry</artifactId>
-            <version>8.41.0</version>
+            <version>8.25.0</version>
         </dependency>
         <dependency>
             <groupId>org.gitlab4j</groupId>
@@ -226,11 +240,6 @@
             <artifactId>jemoji</artifactId>
             <version>1.7.6</version>
         </dependency>
-        <dependency>
-            <groupId>net.fellbaum</groupId>
-            <artifactId>jemoji</artifactId>
-            <version>1.7.0</version>
-        </dependency>
 
         <dependency>
             <groupId>org.json</groupId>
@@ -240,7 +249,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.14.0</version>
+            <version>2.13.2</version>
         </dependency>
 
         <dependency>
@@ -252,17 +261,17 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.26.0</version>
+            <version>2.25.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.26.0</version>
+            <version>2.25.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
-            <version>2.26.0</version>
+            <version>2.25.2</version>
         </dependency>
 
         <dependency>
@@ -279,7 +288,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>6.0.3</version>
+            <version>6.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

renovate.json

@@ -6,6 +6,12 @@
     "group:flyway"
   ],
   "packageRules": [
+    {
+      "matchPackageNames": [
+        "quay.io/buildah/stable"
+      ],
+      "enabled": false
+    },
     {
       "matchPackageNames": [
         "mariadb"
@@ -13,51 +19,18 @@
       "automerge": false,
       "dependencyDashboardApproval": true
     },
-    {
-      "matchManagers": ["maven"],
-      "extends": ["schedule:monthly"]
-    },
-    {
-      "groupName": "maven plugins",
-      "matchManagers": ["maven"],
-      "matchDepTypes": ["plugin"],
-      "extends": ["schedule:weekly"]
-    },
     {
       "groupName": "hibernate orm",
       "matchPackageNames": [
         "org.hibernate.orm:**"
-      ],
+      ]
-      "extends": ["schedule:monthly"]
     },
     {
       "groupName": "apache commons",
       "matchPackageNames": [
         "commons-**",
         "org.apache.commons:**"
-      ],
+      ]
-      "extends": ["schedule:monthly"]
-    },
-    {
-      "matchManagers": ["maven"],
-      "matchDepTypes": ["dependency", "parentPom"],
-      "matchPackageNames": [
-        "net.dv8tion:JDA",
-        "dev.arbjerg:lavaplayer",
-        "dev.lavalink.youtube:**",
-        "club.minnced:jdave-*"
-      ],
-      "schedule": ["at any time"]
-    },
-    {
-      "groupName": "github actions (minor/patch)",
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch", "digest"]
-    },
-    {
-      "groupName": "github actions (major)",
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["major"]
     }
   ]
 }

src/main/java/me/bobert/netneutrality/NetNeutrality.java

@@ -49,7 +49,7 @@ public class NetNeutrality {
                 options.setEnvironment(env);
                 options.setTracesSampleRate(1.0);
                 options.setDebug(false);
-                options.setRelease(Settings.getVersion());
+                options.setRelease(VERSION);
             });
         }
 

src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java

@@ -37,11 +37,6 @@ public class MusicChannelContext extends AbstractContext implements NoMessageCon
         return true;
     }
 
-    @Override
-    public boolean isFromGuild() {
-        return true;
-    }
-
     @Override
     public void deleteMessage() {
 

src/main/java/me/bobert/netneutrality/core/command/AbstractAdminCommand.java

@@ -1,19 +0,0 @@
-package me.bobert.netneutrality.core.command;
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-public abstract class AbstractAdminCommand extends AbstractCommand {
-
-    @Override
-    public boolean needAdmin() {
-        return true;
-    }
-
-    @Override
-    public CommandCategory getCategory() {
-        return CommandCategory.ADMINISTRATION;
-    }
-}

src/main/java/me/bobert/netneutrality/core/command/AbstractMessageMenuCommand.java

@@ -1,56 +0,0 @@
-package me.bobert.netneutrality.core.command;
-
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.context.command.MessageMenuContext;
-import me.bobert.netneutrality.core.command.options.CommandOptionsBuilder;
-import me.bobert.netneutrality.core.context.CommandContext;
-import net.dv8tion.jda.api.entities.Message;
-
-public abstract class AbstractMessageMenuCommand extends AbstractCommand {
-    @Override
-    public String getDescription() {
-        return null;
-    }
-
-    @Override
-    public boolean isGuildOnly() {
-        return true;
-    }
-
-    @Override
-    public boolean isSlashCommandOnly() {
-        return true;
-    }
-
-    @Override
-    public void registerCommandOptions(CommandOptionsBuilder builder) {
-        // no options for context commands
-    }
-
-    @Override
-    public CommandCategory getCategory() {
-        return CommandCategory.UNLISTED;
-    }
-
-    @Override
-    public Type getType() {
-        return Type.MESSAGE;
-    }
-
-    @Override
-    public CommandExecutionResult execute(CommandContext context) {
-        if (context instanceof MessageMenuContext mc) {
-            Message message = mc.getTarget();
-            return execute(message, context);
-        }
-
-        throw new IllegalArgumentException("Wrong context type for this command");
-    }
-
-    public abstract CommandExecutionResult execute(Message target, CommandContext context);
-}

src/main/java/me/bobert/netneutrality/core/command/AbstractUserMenuCommand.java

@@ -1,46 +0,0 @@
-package me.bobert.netneutrality.core.command;
-
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.context.command.UserMenuContext;
-import me.bobert.netneutrality.core.command.options.CommandOptionsBuilder;
-import me.bobert.netneutrality.core.context.CommandContext;
-import net.dv8tion.jda.api.entities.User;
-
-public abstract class AbstractUserMenuCommand extends AbstractCommand {
-    @Override
-    public String getDescription() {
-        return null;
-    }
-
-    @Override
-    public boolean isSlashCommandOnly() {
-        return false;
-    }
-
-    @Override
-    public void registerCommandOptions(CommandOptionsBuilder builder) {
-        // no options for context commands
-    }
-
-    @Override
-    public Type getType() {
-        return Type.USER;
-    }
-
-    @Override
-    public CommandExecutionResult execute(CommandContext context) {
-        if (context instanceof UserMenuContext uc) {
-            User user = uc.getTarget();
-            return execute(user, context);
-        }
-
-        throw new IllegalArgumentException("Wrong context type for this command");
-    }
-
-    public abstract CommandExecutionResult execute(User target, CommandContext context);
-}

src/main/java/me/bobert/netneutrality/core/command/impl/AbstractCommand.java

@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:src/main/java/me/bobert/netneutrality/core/command/impl/AbstractCommand.java
 package me.bobert.netneutrality.core.command.impl;
-========
-package me.bobert.netneutrality.core.command;
->>>>>>>> 8479f71 (change package of core command classes so it makes more sense and rename getType() to getCategory() in command interface):src/main/java/me/bobert/netneutrality/core/command/AbstractCommand.java
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/core/command/impl/MusicCommand.java

@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:src/main/java/me/bobert/netneutrality/core/command/impl/MusicCommand.java
 package me.bobert.netneutrality.core.command.impl;
-========
-package me.bobert.netneutrality.core.command;
->>>>>>>> 8479f71 (change package of core command classes so it makes more sense and rename getType() to getCategory() in command interface):src/main/java/me/bobert/netneutrality/core/command/AbstractMusicCommand.java
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/core/command/options/CommandOptions.java

@@ -1,170 +0,0 @@
-package me.bobert.netneutrality.core.command.options;
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.core.command.Command;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
-import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData;
-import net.dv8tion.jda.internal.interactions.CommandDataImpl;
-
-import java.util.List;
-import java.util.Set;
-import java.util.StringJoiner;
-
-public class CommandOptions {
-    private final Command command;
-    private final CommandDataImpl commandData;
-    private final List<OptionData> options;
-    private final List<SubcommandData> subcommands;
-    private final List<SubcommandGroupData> subcommandGroups;
-
-    public CommandOptions(Command command, CommandDataImpl commandData) {
-        this.command = command;
-        this.commandData = commandData;
-        this.options = commandData.getOptions();
-        this.subcommands = commandData.getSubcommands();
-        this.subcommandGroups = commandData.getSubcommandGroups();
-    }
-
-    public Command getCommand() {
-        return command;
-    }
-
-    public SlashCommandData getSlashCommandData() {
-        return commandData;
-    }
-
-    public List<OptionData> getOptions() {
-        return options;
-    }
-
-    public List<SubcommandData> getSubcommands() {
-        return subcommands;
-    }
-
-    public List<SubcommandGroupData> getSubcommandGroups() {
-        return subcommandGroups;
-    }
-
-    public boolean isEmpty() {
-        return options.isEmpty() && subcommands.isEmpty() && subcommandGroups.isEmpty();
-    }
-
-    public String printUsage() {
-        StringBuilder usage = new StringBuilder();
-        if (!options.isEmpty()) {
-            usage.append("- Usage: /").append(command.getCommandName());
-            for (OptionData option : options) {
-                usage.append(" <").append(option.getName()).append(">");
-            }
-
-            usage.append(printOptions(options, null, false));
-        }
-
-        if (!subcommands.isEmpty()) {
-            for (SubcommandData subcommand : subcommands) {
-                usage.append("- Usage: /").append(command.getCommandName()).append(" ").append(subcommand.getName());
-
-                for (OptionData option : subcommand.getOptions()) {
-                    usage.append(" <").append(option.getName()).append(">");
-                }
-
-                usage.append(" (").append(subcommand.getDescription()).append(")");
-                usage.append(printOptions(subcommand.getOptions(), null, false));
-
-                usage.append("\n");
-            }
-        }
-
-        if (!subcommandGroups.isEmpty()) {
-            for (SubcommandGroupData subcommandGroup : subcommandGroups) {
-                usage.append("- Subcommand: /").append(command.getCommandName())
-                        .append(" ").append(subcommandGroup.getName())
-                        .append(" (").append(subcommandGroup.getDescription()).append(")")
-                        .append("\n");
-
-                for (SubcommandData subcommand : subcommandGroup.getSubcommands()) {
-                    usage.append("  - Usage: /").append(command.getCommandName())
-                            .append(" ").append(subcommandGroup.getName())
-                            .append(" ").append(subcommand.getName());
-
-                    for (OptionData option : subcommand.getOptions()) {
-                        usage.append(" <").append(option.getName()).append(">");
-                    }
-
-                    usage.append(printOptions(subcommand.getOptions(), subcommand.getDescription(), true));
-
-                    usage.append("\n");
-                }
-            }
-        }
-
-        if (!isEmpty()) {
-            usage.append("\n\n-# *: required argument");
-        }
-
-        return usage.toString();
-    }
-
-    private String printOptions(List<OptionData> options, String description, boolean group) {
-        StringBuilder usage = new StringBuilder();
-
-        if (description != null) {
-            usage.append(" (").append(description).append(")");
-        }
-
-        for (OptionData option : options) {
-            usage.append("\n");
-            if (group) usage.append("  ");
-            usage.append("  - ");
-            if (option.isRequired()) {
-                usage.append("*");
-            }
-            usage.append(option.getName()).append(": ").append(option.getDescription());
-
-            if (option.getMinValue() != null) {
-                usage.append(" [Min value: ").append(option.getMinValue().longValue()).append("]");
-            }
-
-            if (option.getMaxValue() != null) {
-                usage.append(" [Max value: ").append(option.getMaxValue().longValue()).append("]");
-            }
-
-            if (option.getMinLength() != null) {
-                usage.append(" [Min length: ").append(option.getMinLength().longValue()).append("]");
-            }
-
-            if (option.getMaxLength() != null) {
-                usage.append(" [Max length: ").append(option.getMaxLength().longValue()).append("]");
-            }
-
-            List<net.dv8tion.jda.api.interactions.commands.Command.Choice> choices = option.getChoices();
-            if (!choices.isEmpty()) {
-                StringJoiner joiner = new StringJoiner(", ");
-                for (net.dv8tion.jda.api.interactions.commands.Command.Choice choice : choices) {
-                    joiner.add(choice.getAsString());
-                }
-
-                usage.append(" [Available choices: ").append(joiner).append("]");
-            }
-
-            Set<ChannelType> requiredChannelTypes = option.getChannelTypes();
-            if (!requiredChannelTypes.isEmpty()) {
-                StringJoiner joiner = new StringJoiner(", ");
-                for (ChannelType type : requiredChannelTypes) {
-                    joiner.add(type.name());
-                }
-
-                usage.append(" [Required channel types: ").append(joiner).append("]");
-            }
-        }
-
-        return usage.toString();
-    }
-}

src/main/java/me/bobert/netneutrality/core/command/options/CommandOptionsBuilder.java

@@ -1,185 +0,0 @@
-package me.bobert.netneutrality.core.command.options;
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.core.command.Command;
-import net.dv8tion.jda.api.interactions.DiscordLocale;
-import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
-import net.dv8tion.jda.api.interactions.commands.build.*;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationMap;
-import net.dv8tion.jda.api.utils.data.DataObject;
-import net.dv8tion.jda.internal.interactions.CommandDataImpl;
-
-import javax.annotation.Nonnull;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-
-public class CommandOptionsBuilder implements SlashCommandData {
-    private final Command command;
-    private CommandDataImpl commandData;
-
-    public CommandOptionsBuilder(Command.Type type, Command command) {
-        this.command = command;
-
-        if (type == Command.Type.SLASH) {
-            commandData = (CommandDataImpl) Commands.slash(command.getCommandName(), command.getDescription());
-        }
-
-        if (type == Command.Type.USER) {
-            commandData = (CommandDataImpl) Commands.user(command.getCommandName());
-        }
-
-        if (type == Command.Type.MESSAGE) {
-            commandData = (CommandDataImpl) Commands.message(command.getCommandName());
-        }
-    }
-
-    public CommandOptions build() {
-        return new CommandOptions(command, commandData);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setLocalizationFunction(@Nonnull LocalizationFunction localizationFunction) {
-        return commandData.setLocalizationFunction(localizationFunction);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setName(@Nonnull String name) {
-        return commandData.setName(name);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setNameLocalization(@Nonnull DiscordLocale locale, @Nonnull String name) {
-        return commandData.setNameLocalization(locale, name);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setNameLocalizations(@Nonnull Map<DiscordLocale, String> map) {
-        return commandData.setNameLocalizations(map);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setDefaultPermissions(@Nonnull DefaultMemberPermissions permission) {
-        return commandData.setDefaultPermissions(permission);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setGuildOnly(boolean guildOnly) {
-        return commandData.setGuildOnly(guildOnly);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setNSFW(boolean nsfw) {
-        return commandData.setNSFW(nsfw);
-    }
-
-    @Override
-    public @Nonnull String getName() {
-        return commandData.getName();
-    }
-
-    @Override
-    public @Nonnull LocalizationMap getNameLocalizations() {
-        return commandData.getNameLocalizations();
-    }
-
-    @Override
-    public @Nonnull net.dv8tion.jda.api.interactions.commands.Command.Type getType() {
-        return commandData.getType();
-    }
-
-    @Override
-    public @Nonnull DefaultMemberPermissions getDefaultPermissions() {
-        return commandData.getDefaultPermissions();
-    }
-
-    @Override
-    public boolean isGuildOnly() {
-        return commandData.isGuildOnly();
-    }
-
-    @Override
-    public boolean isNSFW() {
-        return commandData.isNSFW();
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setDescription(@Nonnull String description) {
-        return commandData.setDescription(description);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setDescriptionLocalization(@Nonnull DiscordLocale locale, @Nonnull String description) {
-        return commandData.setDescriptionLocalization(locale, description);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData setDescriptionLocalizations(@Nonnull Map<DiscordLocale, String> map) {
-        return commandData.setDescriptionLocalizations(map);
-    }
-
-    @Override
-    public @Nonnull String getDescription() {
-        return commandData.getDescription();
-    }
-
-    @Override
-    public @Nonnull LocalizationMap getDescriptionLocalizations() {
-        return commandData.getDescriptionLocalizations();
-    }
-
-    @Override
-    public boolean removeOptions(@Nonnull Predicate<? super OptionData> condition) {
-        return commandData.removeOptions(condition);
-    }
-
-    @Override
-    public boolean removeSubcommands(@Nonnull Predicate<? super SubcommandData> condition) {
-        return commandData.removeSubcommands(condition);
-    }
-
-    @Override
-    public boolean removeSubcommandGroups(@Nonnull Predicate<? super SubcommandGroupData> condition) {
-        return commandData.removeSubcommandGroups(condition);
-    }
-
-    @Override
-    public @Nonnull List<SubcommandData> getSubcommands() {
-        return commandData.getSubcommands();
-    }
-
-    @Override
-    public @Nonnull List<SubcommandGroupData> getSubcommandGroups() {
-        return commandData.getSubcommandGroups();
-    }
-
-    @Override
-    public @Nonnull List<OptionData> getOptions() {
-        return commandData.getOptions();
-    }
-
-    @Override
-    public @Nonnull SlashCommandData addOptions(@Nonnull OptionData... options) {
-        return commandData.addOptions(options);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData addSubcommands(@Nonnull SubcommandData... subcommands) {
-        return commandData.addSubcommands(subcommands);
-    }
-
-    @Override
-    public @Nonnull SlashCommandData addSubcommandGroups(@Nonnull SubcommandGroupData... groups) {
-        return commandData.addSubcommandGroups(groups);
-    }
-
-    @Override
-    public @Nonnull DataObject toData() {
-        return commandData.toData();
-    }
-}

src/main/java/me/bobert/netneutrality/core/context/AbstractContext.java

@@ -6,7 +6,6 @@ package me.bobert.netneutrality.core.context;
  */
 
 import io.sentry.Sentry;
-import me.bobert.netneutrality.context.command.SlashCommandContext;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/me/bobert/netneutrality/core/tasks/AbstractBuiltInTask.java

@@ -1,40 +0,0 @@
-package me.bobert.netneutrality.core.tasks;
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.core.context.CommandContext;
-import me.bobert.netneutrality.core.context.TaskContext;
-
-public abstract class AbstractBuiltInTask extends AbstractTask implements BuiltInTask {
-
-    @Override
-    public String getName() {
-        return getId();
-    }
-
-    @Override
-    public boolean isInsertable() {
-        return true;
-    }
-
-    @Override
-    public boolean isExpired() {
-        return false;
-    }
-
-    @Override
-    public void replyToInteraction(CommandContext context) {
-        // Task is loaded at runtime, this will never be called
-    }
-
-    @Override
-    public Lifecycle execute(TaskContext context) {
-        executeTask(context);
-        return Lifecycle.BUILTIN;
-    }
-
-    public abstract void executeTask(TaskContext context);
-}

src/main/java/me/bobert/netneutrality/core/tasks/AbstractPersistableTask.java

@@ -1,58 +0,0 @@
-package me.bobert.netneutrality.core.tasks;
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.core.context.CommandContext;
-import org.json.JSONObject;
-
-public abstract class AbstractPersistableTask extends AbstractTask implements PersistableTask {
-
-    @Override
-    public boolean isInsertable() {
-        return true;
-    }
-
-    @Override
-    public boolean isExpired() {
-        return false;
-    }
-
-    @Override
-    public void replyToInteraction(CommandContext context) {
-        // Task loaded from database, this will never be called
-    }
-
-    @Override
-    public void insert(CommandContext context) {
-        if (TaskManager.getInstance().hasTask(getId())) {
-            throw new RuntimeException("Cannot insert a task that already exists");
-        }
-
-        TaskManager.getInstance().insert(context, this);
-    }
-
-    @Override
-    public void save() {
-        if (!TaskManager.getInstance().hasTask(getId())) {
-            throw new RuntimeException("Cannot save a task that doesn't exist yet");
-        }
-
-        TaskManager.getInstance().getTaskService().persistTask(this);
-    }
-
-    @Override
-    public void delete() {
-        TaskManager.getInstance().getTaskService().unpersistTask(this);
-        TaskManager.getInstance().removeTask(this);
-    }
-
-    @Override
-    public String toPayload() {
-        JSONObject payload = new JSONObject(this);
-
-        return payload.toString();
-    }
-}

src/main/java/me/bobert/netneutrality/core/tasks/AbstractTask.java

@@ -1,48 +0,0 @@
-package me.bobert.netneutrality.core.tasks;
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.core.context.CommandContext;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-public abstract class AbstractTask implements Task {
-    private final OffsetDateTime creationTime;
-
-    public AbstractTask() {
-        creationTime = OffsetDateTime.now();
-    }
-
-    @Override
-    public OffsetDateTime getCreationTime() {
-        return creationTime;
-    }
-
-    @Override
-    public void insert(CommandContext context) {
-        TaskManager.getInstance().insert(context, this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        AbstractTask that = (AbstractTask) o;
-        return Objects.equals(getId(), that.getId());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(getId());
-    }
-
-    @Override
-    public String toString() {
-        return String.format("Task{id=%s, lockId=%s, class=%s, name=%s, creationTime=%s}", getId(), getLockId(), getClass().getSimpleName(), getName(), getCreationTime());
-    }
-}

src/main/java/me/bobert/netneutrality/core/tasks/GenericCustomIdTask.java

@@ -1,27 +0,0 @@
-package me.bobert.netneutrality.core.tasks;
-
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-
-public abstract class GenericCustomIdTask extends AbstractTask {
-    private final String customId;
-
-    public GenericCustomIdTask(String id) {
-        this.customId = id;
-    }
-
-    @Override
-    public String getId() {
-        return customId;
-    }
-
-    @Override
-    public Button createButton() {
-        return null;
-    }
-}

src/main/java/me/bobert/netneutrality/core/tasks/GenericRandomIdTask.java

@@ -1,15 +0,0 @@
-package me.bobert.netneutrality.core.tasks;
-
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import java.util.UUID;
-
-public abstract class GenericRandomIdTask extends GenericCustomIdTask {
-    public GenericRandomIdTask() {
-        super(UUID.randomUUID().toString());
-    }
-}

src/main/java/me/bobert/netneutrality/core/tasks/IStepTask.java

@@ -1,147 +0,0 @@
-package me.bobert.netneutrality.core.tasks;
-
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-public interface IStepTask {
-
-    /**
-     * Defines the type of input expected for a step.
-     */
-    enum StepType {
-        /**
-         * Expects a string input from the user.
-         */
-        STRING,
-
-        /**
-         * Expects a valid role ID for the current guild.
-         * The role must exist in the guild where the command was executed.
-         */
-        ROLE,
-
-        /**
-         * Expects a valid emoji.
-         */
-        EMOJI
-    }
-
-    class StepResult {
-        private enum ResultType {
-            SUCCESS, FAILURE
-        }
-
-        private final ResultType type;
-        private final String message;
-        private final Task nextStep;
-
-        /**
-         * Represents the result of a step execution. Each step can either succeed, fail, or transition to another step.
-         */
-        private StepResult(ResultType type, String message, Task nextStep) {
-            this.type = type;
-            this.message = message;
-            this.nextStep = nextStep;
-        }
-
-        /**
-         * Indicates that the step was completed successfully, with an optional follow-up step.
-         *
-         * @param message  the success message
-         * @param nextStep the next step in the workflow, or null if this is the final step
-         * @return a successful result
-         */
-        public static StepResult success(String message, Task nextStep) {
-            return new StepResult(ResultType.SUCCESS, message, nextStep);
-        }
-
-        /**
-         * Indicates that the step was completed successfully.
-         *
-         * @param message the success message
-         * @return a successful result without a next step
-         */
-        public static StepResult success(String message) {
-            return new StepResult(ResultType.SUCCESS, message, null);
-        }
-
-        /**
-         * Indicates that the step has failed.
-         *
-         * @param message the failure message
-         * @return a failed result
-         */
-        public static StepResult failure(String message) {
-            return new StepResult(ResultType.FAILURE, message, null);
-        }
-
-        /**
-         * Moves directly to the next step without displaying a message.
-         *
-         * @param nextTask the next task in the workflow
-         * @return a successful result that advances to the next step
-         */
-        public static StepResult next(Task nextTask) {
-            return new StepResult(ResultType.SUCCESS, null, nextTask);
-        }
-
-        /**
-         * Gets the message associated with the step result.
-         *
-         * @return the result message, or null if there is no message
-         */
-        public String getMessage() {
-            return message;
-        }
-
-        /**
-         * Gets the next step in the task workflow.
-         *
-         * @return the next step, or null if this is the last step
-         */
-        public Task getNextStep() {
-            return nextStep;
-        }
-
-        /**
-         * Checks whether the step execution was successful.
-         *
-         * @return true if the step was successful, false otherwise
-         */
-        public boolean isSuccess() {
-            return type == ResultType.SUCCESS;
-        }
-    }
-
-    /**
-     * Gets the type of step input expected.
-     *
-     * @return the step type
-     */
-    StepType getStepType();
-
-    /**
-     * Provides a general description of the step. This will be displayed before asking the question.
-     *
-     * @return the step description
-     */
-    String getStepDescription();
-
-    /**
-     * Provides the specific question for this step.
-     *
-     * @return the step question
-     */
-    String getStepQuestion();
-
-    /**
-     * Executes the step using the provided answer.
-     *
-     * @param answer the user's input, validated against the expected step type
-     * @return the result of executing this step
-     */
-    StepResult executeStep(Object answer);
-}

src/main/java/me/bobert/netneutrality/core/tasks/impl/StepTask.java

@@ -1,169 +0,0 @@
-package me.bobert.netneutrality.core.tasks.impl;
-
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.core.context.CommandContext;
-import me.bobert.netneutrality.core.context.MessageContext;
-import me.bobert.netneutrality.core.context.TaskContext;
-import me.bobert.netneutrality.core.tasks.AbstractTask;
-import me.bobert.netneutrality.core.tasks.IStepTask;
-import me.bobert.netneutrality.core.tasks.TaskManager;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.fellbaum.jemoji.Emoji;
-import net.fellbaum.jemoji.EmojiManager;
-
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.UUID;
-
-/**
- * Represents a task that consists of multiple sequential steps. The task starts with an initial message (question)
- * and expects a user response. Each step can lead to another step, forming a workflow.
- */
-public abstract class StepTask extends AbstractTask implements IStepTask {
-    private final Object stepLock = new Object();
-    private CommandContext commandContext;
-    private Guild guild;
-    private String id = UUID.randomUUID().toString();
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public boolean isInsertable() {
-        return true;
-    }
-
-    public Guild getGuild() {
-        return guild;
-    }
-
-    @Override
-    public void replyToInteraction(CommandContext context) {
-        synchronized (stepLock) {
-            this.commandContext = context;
-        }
-
-        if (context.isFromGuild()) {
-            guild = context.getGuild();
-        }
-
-        if (guild == null && getStepType() == StepType.ROLE) {
-            throw new IllegalArgumentException("Step task is of type role but it was inserted in a non-guild context");
-        }
-
-        context.replyEphemeral("Please follow the instructions sent in DM.");
-        context.sendMessageInPrivate(getStepDescription() + "\n\n" + getStepQuestion(),
-                asyncContext -> assignId(asyncContext.getMessageId()));
-    }
-    
-    @Override
-    public Lifecycle execute(TaskContext context) {
-        synchronized (stepLock) {
-            if (!context.getDiscordUser().equals(commandContext.getDiscordUser())) {
-                return Lifecycle.KEEP;
-            }
-        }
-
-        if (context instanceof MessageContext messageContext) {
-            Message message = messageContext.getMessage();
-            String input = message.getContentRaw();
-
-
-            Object answer = validateInput(context, input);
-            if (answer == null) {
-                return Lifecycle.KEEP;
-            }
-
-            StepResult result = executeStep(answer);
-            if (!result.isSuccess()) {
-                context.replyEphemeral(result.getMessage());
-                return Lifecycle.KEEP;
-            }
-
-            if (result.getMessage() != null) {
-                context.replyEphemeral(result.getMessage());
-            }
-
-            if (result.getNextStep() != null) {
-                result.getNextStep().insert(commandContext);
-            }
-
-            return Lifecycle.REMOVE_SELF;
-        }
-
-        throw new IllegalArgumentException("Step task is not of type MessageContext");
-    }
-
-    @Override
-    public boolean isExpired() {
-        // is it really needed to expire this type of task?
-        return getCreationTime().plusMinutes(60).isBefore(OffsetDateTime.now());
-    }
-
-    @Override
-    public Button createButton() {
-        return null;
-    }
-
-    /**
-     * Validates the user input against the expected step type.
-     *
-     * @param context the task execution context
-     * @param input   the user-provided input
-     * @return the parsed input if valid, or null if invalid
-     */
-    private Object validateInput(TaskContext context, String input) {
-        switch (getStepType()) {
-            case ROLE -> {
-                try {
-                    Role role = guild.getRoleById(input);
-                    if (role == null) {
-                        context.replyEphemeral("The role doesn't exist");
-                        return null;
-                    }
-
-                    return role;
-                } catch (NumberFormatException e) {
-                    context.replyEphemeral("Not a valid role ID");
-                    return null;
-                }
-            }
-            case EMOJI -> {
-                Optional<Emoji> parsed = EmojiManager.getEmoji(input);
-
-                if (parsed.isPresent()) {
-                    return parsed.get().getEmoji();
-                }
-
-                context.replyEphemeral("Not a valid emoji");
-                return null;
-            }
-            case STRING -> {
-                return input;
-            }
-            default -> throw new IllegalStateException("Unknown step type: " + getStepType());
-        }
-    }
-
-    private void assignId(String newId) {
-        if (newId == null || newId.isBlank()) {
-            throw new IllegalArgumentException("Task ID cannot be null or empty.");
-        }
-
-        String oldId = id;
-        synchronized (this) {
-            this.id = newId;
-            TaskManager.getInstance().activateTask(this, oldId);
-        }
-    }
-}

src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java

@@ -13,7 +13,6 @@ import me.bobert.netneutrality.utils.MessageFunction;
 import me.bobert.netneutrality.utils.MusicUtils;
 import net.dv8tion.jda.api.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
 public class LoadTrackFromPlaylistTask extends AcceptButton<LoadPlaylistTask> {
     private final AudioTrack track;

src/main/java/me/bobert/netneutrality/thread/MusicManagerCleanupThread.java

@@ -1,39 +0,0 @@
-package me.bobert.netneutrality.thread;
-/*
- * Copyright (c) anthorob
- *
- * https://discord.gg/qUa6zNFZsd
- */
-
-import me.bobert.netneutrality.music.MusicManager;
-import me.bobert.netneutrality.music.TrackScheduler;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class MusicManagerCleanupThread implements Runnable {
-    private static final Logger logger = LogManager.getLogger(MusicManagerCleanupThread.class);
-
-    @Override
-    public void run() {
-
-        try {
-
-            for (MusicManager manager : MusicManager.getManagers()) {
-                processManager(manager);
-            }
-
-        } catch (InterruptedException e) {
-            logger.error("Interrupted while running MusicManagerCleanupThread", e);
-        }
-    }
-
-    private void processManager(MusicManager manager) throws InterruptedException {
-        TrackScheduler scheduler = manager.getScheduler();
-
-        // Context is still attached after bot is disconnected, the bot might have been kicked from the channel
-        if (scheduler.getContext() != null && !manager.isConnected()) {
-            manager.disconnect();
-            manager.getQueueManager().clearQueue();
-        }
-    }
-}