Fix Discord webhook implementation: move to per-response design, resolve editorconfig violations #1
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -143,5 +143,6 @@ private static class Controls2 extends Entry { | |
| )); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| /* | ||
| * Copyright 2026 TerminalMC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package dev.terminalmc.chatnotify.util; | ||
|
|
||
| import com.google.gson.JsonObject; | ||
| import dev.terminalmc.chatnotify.ChatNotify; | ||
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.network.chat.Component; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.net.URI; | ||
| import java.net.http.HttpClient; | ||
| import java.net.http.HttpRequest; | ||
| import java.net.http.HttpResponse; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.time.Duration; | ||
|
|
||
| /** | ||
| * Handles sending messages to Discord webhooks. | ||
| */ | ||
| public class DiscordWebhookHandler { | ||
|
|
||
| private static final HttpClient HTTP_CLIENT = HttpClient.newBuilder() | ||
| .connectTimeout(Duration.ofSeconds(10)) | ||
| .build(); | ||
|
|
||
| private DiscordWebhookHandler() { | ||
| } | ||
|
|
||
| /** | ||
| * Sends a message to a Discord webhook asynchronously. | ||
| * | ||
| * @param webhookUrl the Discord webhook URL | ||
| * @param content the message content to send | ||
| * @param triggerMessage the original message that triggered the notification | ||
| */ | ||
| public static void sendAsync( | ||
| String webhookUrl, | ||
| String content, | ||
| @Nullable Component triggerMessage | ||
| ) { | ||
| if (webhookUrl == null || webhookUrl.isBlank()) { | ||
| ChatNotify.LOG.warn("Discord webhook URL is empty, skipping webhook send"); | ||
| return; | ||
| } | ||
|
|
||
| if (content == null || content.isBlank()) { | ||
| ChatNotify.LOG.warn("Discord webhook content is empty, skipping webhook send"); | ||
| return; | ||
| } | ||
|
|
||
| // Validate webhook URL format | ||
| if (!isValidWebhookUrl(webhookUrl)) { | ||
| ChatNotify.LOG.error("Invalid Discord webhook URL format: {}", webhookUrl); | ||
| return; | ||
| } | ||
|
|
||
| // Build JSON payload with embed | ||
| JsonObject embed = new JsonObject(); | ||
| embed.addProperty("title", "Chat triggered"); | ||
|
|
||
| // Use the trigger message content if available, otherwise use the response content | ||
| String description = triggerMessage != null | ||
| ? triggerMessage.getString() | ||
| : content; | ||
| embed.addProperty("description", description); | ||
| embed.addProperty("color", 3303592); // #3268a8 | ||
|
|
||
| JsonObject footer = new JsonObject(); | ||
| // Get server/world name | ||
| Minecraft mc = Minecraft.getInstance(); | ||
| String serverName = "Minecraft"; | ||
| if (mc.level != null) { | ||
| if (mc.getCurrentServer() != null) { | ||
| // Multiplayer - use server name | ||
| serverName = mc.getCurrentServer().name; | ||
| } else if (mc.getSingleplayerServer() != null) { | ||
| // Singleplayer - use world name | ||
| serverName = mc.getSingleplayerServer() | ||
| .getWorldData() | ||
| .getLevelSettings() | ||
| .levelName(); | ||
| } | ||
| } | ||
| footer.addProperty("text", serverName); | ||
| embed.add("footer", footer); | ||
|
|
||
| JsonObject payload = new JsonObject(); | ||
| com.google.gson.JsonArray embeds = new com.google.gson.JsonArray(); | ||
| embeds.add(embed); | ||
| payload.add("embeds", embeds); | ||
|
|
||
| String jsonPayload = payload.toString(); | ||
|
|
||
| HttpRequest request = HttpRequest.newBuilder() | ||
| .uri(URI.create(webhookUrl)) | ||
| .timeout(Duration.ofSeconds(10)) | ||
| .header("Content-Type", "application/json") | ||
| .POST(HttpRequest.BodyPublishers.ofString(jsonPayload, StandardCharsets.UTF_8)) | ||
| .build(); | ||
|
|
||
| // Send asynchronously | ||
| HTTP_CLIENT.sendAsync(request, HttpResponse.BodyHandlers.ofString()) | ||
| .thenApply(HttpResponse::statusCode) | ||
| .thenAccept(statusCode -> { | ||
| if (statusCode >= 200 && statusCode < 300) { | ||
| ChatNotify.LOG.info("Successfully sent Discord webhook message"); | ||
| } else if (statusCode == 429) { | ||
| ChatNotify.LOG.warn("Discord webhook rate limited (HTTP {})", statusCode); | ||
| } else { | ||
| ChatNotify.LOG.error( | ||
| "Failed to send Discord webhook message (HTTP {})", | ||
| statusCode | ||
| ); | ||
| } | ||
| }) | ||
| .exceptionally(throwable -> { | ||
| ChatNotify.LOG.error("Error sending Discord webhook message", throwable); | ||
| return null; | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Validates that a webhook URL is a valid Discord webhook URL. | ||
| * | ||
| * @param webhookUrl the URL to validate | ||
| * @return true if the URL is a valid Discord webhook URL | ||
| */ | ||
| private static boolean isValidWebhookUrl(String webhookUrl) { | ||
| try { | ||
| URI uri = URI.create(webhookUrl); | ||
| String scheme = uri.getScheme(); | ||
| String host = uri.getHost(); | ||
| String path = uri.getPath(); | ||
|
|
||
| // Discord webhook URLs must use HTTPS for secure transmission | ||
| // Format: https://discord.com/api/webhooks/... | ||
| // or: https://discordapp.com/api/webhooks/... | ||
| return "https".equals(scheme) | ||
| && (host != null | ||
| && (host.equals("discord.com") | ||
| || host.equals("discordapp.com"))) | ||
| && path != null && path.startsWith("/api/webhooks/"); | ||
| } catch (Exception e) { | ||
| return false; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change to "D" for discord