From eafe3dfc4578dac6d4481040f47121ee37ab0e40 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Fri, 11 Jul 2025 11:28:13 +0200 Subject: [PATCH] fix: Handle empty list of announcements --- .../youtube/patches/announcements/AnnouncementsPatch.java | 5 +++-- .../patches/announcements/requests/AnnouncementsRoutes.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java index ec1f12e2a..8358824f4 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java @@ -59,10 +59,11 @@ public final class AnnouncementsPatch { int id = Settings.ANNOUNCEMENT_LAST_ID.defaultValue; try { final var announcementIds = new JSONArray(jsonString); + if (announcementIds.length() == 0) return true; + id = announcementIds.getJSONObject(0).getInt("id"); - } catch (Throwable ex) { - Logger.printException(() -> "Failed to parse announcement IDs", ex); + Logger.printException(() -> "Failed to parse announcement ID", ex); } // Do not show the announcement, if the last announcement id is the same as the current one. diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java index 6f5261056..d3a64513b 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java @@ -10,8 +10,8 @@ import static app.revanced.extension.shared.requests.Route.Method.GET; public class AnnouncementsRoutes { private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v4"; - public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id?tag=youtube"); - public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=youtube"); + public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id?tag=\uD83C\uDF9E\uFE0F YouTube"); + public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=\uD83C\uDF9E\uFE0F YouTube"); private AnnouncementsRoutes() { }