From 44ba958b87d32747a213165e8bd6eb69fd92982c Mon Sep 17 00:00:00 2001 From: Dominic Fellbaum Date: Tue, 24 Oct 2023 23:20:15 +0200 Subject: [PATCH] Fix including URL query params as file name when sending an attachment --- .../src/main/java/org/javacord/core/util/FileContainer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javacord-core/src/main/java/org/javacord/core/util/FileContainer.java b/javacord-core/src/main/java/org/javacord/core/util/FileContainer.java index 08464fd456..8f5d8f14e8 100644 --- a/javacord-core/src/main/java/org/javacord/core/util/FileContainer.java +++ b/javacord-core/src/main/java/org/javacord/core/util/FileContainer.java @@ -238,7 +238,10 @@ public FileContainer(URL file, boolean isSpoiler, String description) { fileAsUrl = file; fileAsByteArray = null; fileAsInputStream = null; - fileTypeOrName = (isSpoiler ? "SPOILER_" : "") + new File(file.getFile()).getName(); + fileTypeOrName = (isSpoiler ? "SPOILER_" : "") + + (null == file.getQuery() + ? new File(file.getFile()).getName() + : new File(file.getFile().replace("?" + file.getQuery(), "")).getName()); fileDescription = description; }