From d11467bd1bcd28dc6cdfa4caa3736830c72e5a23 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 15 May 2026 15:09:28 +0200 Subject: [PATCH 1/6] Test Backporting Signed-off-by: Chaoscaot --- CommonCore/SQL/src/de/steamwar/sql/Script.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonCore/SQL/src/de/steamwar/sql/Script.kt b/CommonCore/SQL/src/de/steamwar/sql/Script.kt index 12bda03a..a48610a0 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/Script.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/Script.kt @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2025 SteamWar.de-Serverteam + * Copyright (C) 2026 SteamWar.de-Serverteam * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by From eea9abdc56afdd6780dac2c944b54dbeae8b5993 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 15 May 2026 15:37:29 +0200 Subject: [PATCH 2/6] Add Templates Signed-off-by: Chaoscaot --- .gitea/ISSUE_TEMPLATE/bug-report.yaml | 60 ++++++++++++++++++++++ .gitea/ISSUE_TEMPLATE/feature-request.yaml | 17 ++++++ 2 files changed, 77 insertions(+) create mode 100644 .gitea/ISSUE_TEMPLATE/bug-report.yaml create mode 100644 .gitea/ISSUE_TEMPLATE/feature-request.yaml diff --git a/.gitea/ISSUE_TEMPLATE/bug-report.yaml b/.gitea/ISSUE_TEMPLATE/bug-report.yaml new file mode 100644 index 00000000..7ce1c896 --- /dev/null +++ b/.gitea/ISSUE_TEMPLATE/bug-report.yaml @@ -0,0 +1,60 @@ +name: Bug Report +about: Du hast einen Fehler gefunden? Melde ihn hier! +labels: [ "typ/bug" ] +body: + - type: markdown + attributes: + value: | + ACHTUNG: Sollte es bei dem Bug ein Sicherheitsrisiko geben, melde es bitte auf unserem Discord Server + - type: textarea + id: description + attributes: + label: Description + description: | + Beschreibe deinen Bug in kurzer Form. + - type: input + id: mc-ver + attributes: + label: Minecraft Version + description: Minecraft Version des Clients + validations: + required: true + - type: input + id: mc-ver-ser + attributes: + label: Minecraft Version Server + description: Minecraft Version des Servers, nur bei Bau oder Arenen Servern + - type: dropdown + id: can-reproduce + attributes: + label: Kannst du den Fehler wiederholen? + description: | + Wenn du den Fehler wiederholen kannst, können wir dieses Problem schneller beheben. + Solltest du den Fehler nicht wiederholen können, melde dich bitte auf unserem Discord Server. + options: + - "Yes" + - "No" + validations: + required: true + - type: textarea + id: reproduce-steps + attributes: + label: Wie kannst du den Fehler wiederholen? + description: Welche Schritte musst du ausführen, um den Fehler wiederholen zu können? + validations: + required: true + - type: textarea + id: expected-result + attributes: + label: Was sollte passieren? + description: Was sollte hier deiner Erwartung nach passieren? + - type: input + id: logs + attributes: + label: Auf welchem Server ist der Fehler aufgetreten? + description: Gebe bitte den Namen des Servers an, auf dem der Fehler aufgetreten ist. z.B. "Lobby", "Lixfels Bauserver" etc. + - type: textarea + id: screenshots + attributes: + label: Screenshots + description: Sollte es ein Visuelles Problem geben, kannst du hier Screenshots hinzufügen. \ No newline at end of file diff --git a/.gitea/ISSUE_TEMPLATE/feature-request.yaml b/.gitea/ISSUE_TEMPLATE/feature-request.yaml new file mode 100644 index 00000000..11fccadc --- /dev/null +++ b/.gitea/ISSUE_TEMPLATE/feature-request.yaml @@ -0,0 +1,17 @@ +name: Feature Idee +about: Got an idea for a feature that Gitea doesn't have currently? Submit your idea here! +labels: ["typ/idee"] +body: + - type: textarea + id: description + attributes: + label: Feature Beschreibung + placeholder: | + Ich glaube, dass ... + validations: + required: true + - type: textarea + id: screenshots + attributes: + label: Screenshots + description: Wenn es sich um etwas grafisches handelt, kannst du hier Screenshots hinzufügen. \ No newline at end of file From cfe605508338280bb093dc0882eccf3175369e0e Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 15 May 2026 15:38:11 +0200 Subject: [PATCH 3/6] Disable blank issues in Gitea configuration Signed-off-by: Chaoscaot --- .gitea/ISSUE_TEMPLATE/config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitea/ISSUE_TEMPLATE/config.yml diff --git a/.gitea/ISSUE_TEMPLATE/config.yml b/.gitea/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..ec4bb386 --- /dev/null +++ b/.gitea/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false \ No newline at end of file From a20b1cb263d1fff28905f3efef2aa7b8854e7787 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 15 May 2026 15:39:04 +0200 Subject: [PATCH 4/6] Disable blank issues in Gitea configuration Signed-off-by: Chaoscaot --- .gitea/ISSUE_TEMPLATE/config.yml | 2 +- .gitea/ISSUE_TEMPLATE/feature-request.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/ISSUE_TEMPLATE/config.yml b/.gitea/ISSUE_TEMPLATE/config.yml index ec4bb386..a49eab2f 100644 --- a/.gitea/ISSUE_TEMPLATE/config.yml +++ b/.gitea/ISSUE_TEMPLATE/config.yml @@ -1 +1 @@ -blank_issues_enabled: false \ No newline at end of file +blank_issues_enabled: true \ No newline at end of file diff --git a/.gitea/ISSUE_TEMPLATE/feature-request.yaml b/.gitea/ISSUE_TEMPLATE/feature-request.yaml index 11fccadc..fb8c2a5f 100644 --- a/.gitea/ISSUE_TEMPLATE/feature-request.yaml +++ b/.gitea/ISSUE_TEMPLATE/feature-request.yaml @@ -1,5 +1,5 @@ name: Feature Idee -about: Got an idea for a feature that Gitea doesn't have currently? Submit your idea here! +about: Du hast eine Idee für ein neues Feature, welches SteamWar nicht hat? Stelle sie hier vor. labels: ["typ/idee"] body: - type: textarea From 9a6221b7230538617f647e98f6e70b8cd18aede5 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Fri, 15 May 2026 15:44:23 +0200 Subject: [PATCH 5/6] Fix DiscordChannel --- .../discord/channels/DiscordChannel.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java index 4922d69b..799b3638 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java @@ -26,6 +26,7 @@ import de.steamwar.velocitycore.discord.DiscordBot; import de.steamwar.velocitycore.discord.listeners.ChannelListener; import lombok.AllArgsConstructor; import lombok.Getter; +import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.Webhook; import net.dv8tion.jda.api.entities.WebhookClient; @@ -104,10 +105,16 @@ public class DiscordChannel extends Chatter.PlayerlessChatter { return; } - String avatarUrl; + String avatarUrl = null; if (user.getDiscordId() != null) { - avatarUrl = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId()).complete().getEffectiveAvatarUrl(); - } else { + Member member = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId()) + .onErrorMap(throwable -> null) + .complete(); + if (member != null) { + avatarUrl = member.getEffectiveAvatarUrl(); + } + } + if (avatarUrl == null) { avatarUrl = DiscordBot.getInstance().getJda().getSelfUser().getAvatarUrl(); } From 8b33bf40c3dfb9b9d80d3e978e54046b7135d8f9 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 15 May 2026 15:51:01 +0200 Subject: [PATCH 6/6] Add CLI artifact deployment and service restart steps in build workflow Signed-off-by: Chaoscaot --- .gitea/workflows/build.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 09fa125d..21c988f5 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -67,6 +67,7 @@ jobs: cp "VelocityCore/Dependencies/build/libs/Dependencies-all.jar" "deploy/DependenciesVelocityCore.jar" cp "VelocityCore/build/libs/VelocityCore-all.jar" "deploy/VelocityCore.jar" cp "WebsiteBackend/build/libs/WebsiteBackend-all.jar" "deploy/website-api.jar" + cp "CLI/build/distributions/sw.zip" "deploy/sw.zip" - name: Upload deploy artifacts uses: actions/upload-artifact@v3 @@ -130,3 +131,15 @@ jobs: ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mkdir -p '$DEPLOY_PATH'" scp -i ~/.ssh/deploy_key -P "$port" deploy/* "${DEPLOY_USER}@${DEPLOY_HOST}:$DEPLOY_PATH/" + - name: Restart Services + shell: bash + env: + DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} + DEPLOY_USER: ${{ secrets.DEPLOY_USER }} + DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }} + DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }} + run: | + set -euo pipefail + + ssh -i ~/.ssh/deploy_key -p "$DEPLOY_PORT" "${DEPLOY_USER}@${DEPLOY_HOST}" "sudo systemctl restart api.service" + ssh -i ~/.ssh/deploy_key -p "$DEPLOY_PORT" "${DEPLOY_USER}@${DEPLOY_HOST}" "unzip -o /jars/current/sw.zip -d /jars"