From b4a82c745dee0f840a766683de54bce325b93fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Sun, 17 Mar 2024 09:33:49 +0100 Subject: [PATCH] Only send ntfy-msg when ntfy-data is specified --- .../services/ntfy/TaskSchedulingService.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/core/services/ntfy/TaskSchedulingService.java b/backend/src/main/java/core/services/ntfy/TaskSchedulingService.java index 62702b5..4f8cbd9 100644 --- a/backend/src/main/java/core/services/ntfy/TaskSchedulingService.java +++ b/backend/src/main/java/core/services/ntfy/TaskSchedulingService.java @@ -55,19 +55,22 @@ public class TaskSchedulingService { public void sendRunningTaskNotification(AbstractSchedule abstractSchedule) { HttpClient httpClient = HttpClient.newHttpClient(); User user = abstractSchedule.getTask().getTaskgroup().getUser(); - try { - HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(user.getNtfy_host()+ "/" + user.getNtfy_topic())) - .POST(HttpRequest.BodyPublishers.ofString("Running Task " + abstractSchedule.getTask().getTaskName())) - .header("Tags", "heavy_check_mark") - .header("Title", "Task Running") - .header("Actions", "view, Open TimeScheduler, "+frontend_domain+", clear=true") - .build(); + if(user.getNtfy_host() != null && user.getNtfy_topic() != null) { + try { + HttpRequest request = HttpRequest.newBuilder() + .uri(new URI(user.getNtfy_host()+ "/" + user.getNtfy_topic())) + .POST(HttpRequest.BodyPublishers.ofString("Running Task " + abstractSchedule.getTask().getTaskName())) + .header("Tags", "heavy_check_mark") + .header("Title", "Task Running") + .header("Actions", "view, Open TimeScheduler, "+frontend_domain+", clear=true") + .build(); - httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString()); - } catch (URISyntaxException e) { - throw new RuntimeException(e); + httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString()); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } } + } private static Date calculateDelayInMillis(LocalDateTime executionTime) {