From 9f30df1f80ba3b087b60ce21d646732c39270d97 Mon Sep 17 00:00:00 2001 From: FineFindus Date: Thu, 4 Jan 2024 21:21:35 +0100 Subject: [PATCH] feat(sponsorblock): handle nullable actionType --- .../java/me/kavin/piped/utils/SponsorBlockUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/kavin/piped/utils/SponsorBlockUtils.java b/src/main/java/me/kavin/piped/utils/SponsorBlockUtils.java index 32afd51..4c78976 100644 --- a/src/main/java/me/kavin/piped/utils/SponsorBlockUtils.java +++ b/src/main/java/me/kavin/piped/utils/SponsorBlockUtils.java @@ -30,11 +30,14 @@ public class SponsorBlockUtils { String hash = DigestUtils.sha256Hex(id); - for (String url : Constants.SPONSORBLOCK_SERVERS) { + for (String apiUrl : Constants.SPONSORBLOCK_SERVERS) { try { + String url =apiUrl + "/api/skipSegments/" + URLUtils.silentEncode(hash.substring(0, 4)) + + "?categories=" + URLUtils.silentEncode(categories); + if (actionType != null && !actionType.isBlank()) + url += "&actionTypes=" + URLUtils.silentEncode(actionType); - var resp = RequestUtils.sendGetRaw(url + "/api/skipSegments/" + URLUtils.silentEncode(hash.substring(0, 4)) - + "?categories=" + URLUtils.silentEncode(categories) + "&actionTypes=" + URLUtils.silentEncode(actionType)).get(); + var resp = RequestUtils.sendGetRaw(url).get(); if (resp.status() == 200) { var any = mapper.readTree(resp.body());