From 1a78c0b7c2ba8a669f36855e437800c3de6be32a Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Mon, 8 Jul 2024 16:54:16 +0200
Subject: [PATCH] Fix webhook avatar, simplify message title

---
 .../hangar/components/webhook/model/DiscordWebhook.java      | 5 +++--
 .../hangar/components/webhook/service/WebhookService.java    | 4 ++--
 .../java/io/papermc/hangar/service/internal/JobService.java  | 2 +-
 .../hangar/service/internal/versions/VersionFactory.java     | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/papermc/hangar/components/webhook/model/DiscordWebhook.java b/backend/src/main/java/io/papermc/hangar/components/webhook/model/DiscordWebhook.java
index b77f97f27..8c67e7852 100644
--- a/backend/src/main/java/io/papermc/hangar/components/webhook/model/DiscordWebhook.java
+++ b/backend/src/main/java/io/papermc/hangar/components/webhook/model/DiscordWebhook.java
@@ -1,13 +1,14 @@
 package io.papermc.hangar.components.webhook.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRawValue;
 import java.util.List;
 
 public record DiscordWebhook(
     String username,
-    String avatarUrl,
+    @JsonProperty("avatar_url") String avatarUrl,
     @JsonRawValue String embeds,
-    AllowedMentions allowedMentions
+    @JsonProperty("allowed_mentions") AllowedMentions allowedMentions
 ) {
 
     public DiscordWebhook(final String embeds) {
diff --git a/backend/src/main/java/io/papermc/hangar/components/webhook/service/WebhookService.java b/backend/src/main/java/io/papermc/hangar/components/webhook/service/WebhookService.java
index 8253c268a..c80cde731 100644
--- a/backend/src/main/java/io/papermc/hangar/components/webhook/service/WebhookService.java
+++ b/backend/src/main/java/io/papermc/hangar/components/webhook/service/WebhookService.java
@@ -31,7 +31,7 @@ public class WebhookService {
         [
           {
             "id": {{id}},
-            "title": "{{author}} / {{name}} is now available on Hangar!",
+            "title": "{{author}}/{{name}}",
             "description": "{{description}}",
             "color": 2326507,
             "fields": [],
@@ -50,7 +50,7 @@ public class WebhookService {
         [
           {
             "id": {{id}},
-            "title": "Version {{version}} for {{author}} / {{name}} has been released!",
+            "title": "Version {{version}} - {{author}}/{{name}}",
             "description": "{{description}}",
             "color": 2326507,
             "fields": [],
diff --git a/backend/src/main/java/io/papermc/hangar/service/internal/JobService.java b/backend/src/main/java/io/papermc/hangar/service/internal/JobService.java
index 9ef8f134a..c160b5c67 100644
--- a/backend/src/main/java/io/papermc/hangar/service/internal/JobService.java
+++ b/backend/src/main/java/io/papermc/hangar/service/internal/JobService.java
@@ -61,7 +61,7 @@ public List<JobTable> getErroredJobs() {
     @Transactional
     public void schedule(final Job... jobs) {
         for (final Job job : jobs) {
-            logger.info("Scheduling job: {}", job);
+            this.logger.info("Scheduling job: {}", job);
             this.jobsDAO.save(job.toTable());
         }
     }
diff --git a/backend/src/main/java/io/papermc/hangar/service/internal/versions/VersionFactory.java b/backend/src/main/java/io/papermc/hangar/service/internal/versions/VersionFactory.java
index e034046dc..bf7a300c1 100644
--- a/backend/src/main/java/io/papermc/hangar/service/internal/versions/VersionFactory.java
+++ b/backend/src/main/java/io/papermc/hangar/service/internal/versions/VersionFactory.java
@@ -472,7 +472,7 @@ private void verifyPendingPlatforms(final PendingVersion pendingVersion, final S
                 final Platform platform = entry.getKey();
                 final Set<String> versionsForPlatform = new HashSet<>(this.platformService.getFullVersionsForPlatform(platform));
                 if (!versionsForPlatform.containsAll(entry.getValue())) {
-                    throw new HangarApiException(HttpStatus.BAD_REQUEST, "version.new.error.invalidPlatformVersion", entry.getValue());
+                    throw new HangarApiException(HttpStatus.BAD_REQUEST, "version.new.error.invalidPlatformVersionList", entry.getValue());
                 }
             }
         }