chore(YouTube - Announcements): Use API v4 to get announcements (#3869)

Author: oSumAtrIX

extensions/shared/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java

@@ -2,7 +2,8 @@
 
 import static android.text.Html.FROM_HTML_MODE_COMPACT;
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT;
+import static app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENTS;
+import static app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT_IDS;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -13,11 +14,14 @@
 
 import androidx.annotation.RequiresApi;
 
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.time.LocalDateTime;
 import java.util.Locale;
+import java.util.logging.Level;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
@@ -30,6 +34,45 @@ public final class AnnouncementsPatch {
     private AnnouncementsPatch() {
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private static boolean isLatestAlready() throws IOException {
+        HttpURLConnection connection =
+                AnnouncementsRoutes.getAnnouncementsConnectionFromRoute(GET_LATEST_ANNOUNCEMENT_IDS);
+
+        Logger.printDebug(() -> "Get latest announcement IDs route connection url: " + connection.getURL());
+
+        try {
+            // Do not show the announcement if the request failed.
+            if (connection.getResponseCode() != 200) {
+                if (Settings.ANNOUNCEMENT_LAST_ID.isSetToDefault())
+                    return true;
+
+                Settings.ANNOUNCEMENT_LAST_ID.resetToDefault();
+                Utils.showToastLong(str("revanced_announcements_connection_failed"));
+
+                return true;
+            }
+        } catch (IOException ex) {
+            Logger.printException(() -> "Could not connect to announcements provider", ex);
+            return true;
+        }
+
+        var jsonString = Requester.parseStringAndDisconnect(connection);
+
+        // Parse the ID. Fall-back to raw string if it fails.
+        int id = Settings.ANNOUNCEMENT_LAST_ID.defaultValue;
+        try {
+            final var announcementIds = new JSONArray(jsonString);
+            id = announcementIds.getJSONObject(0).getInt("id");
+
+        } catch (Throwable ex) {
+            Logger.printException(() -> "Failed to parse announcement IDs", ex);
+        }
+
+        // Do not show the announcement, if the last announcement id is the same as the current one.
+        return Settings.ANNOUNCEMENT_LAST_ID.get() == id;
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.O)
     public static void showAnnouncement(final Activity context) {
         if (!Settings.ANNOUNCEMENTS.get()) return;
@@ -39,51 +82,45 @@ public static void showAnnouncement(final Activity context) {
 
         Utils.runOnBackgroundThread(() -> {
             try {
-                HttpURLConnection connection = AnnouncementsRoutes.getAnnouncementsConnectionFromRoute(
-                        GET_LATEST_ANNOUNCEMENT, Locale.getDefault().toLanguageTag());
-
-                Logger.printDebug(() -> "Get latest announcement route connection url: " + connection.getURL());
+                if (isLatestAlready()) return;
 
-                try {
-                    // Do not show the announcement if the request failed.
-                    if (connection.getResponseCode() != 200) {
-                        if (Settings.ANNOUNCEMENT_LAST_ID.isSetToDefault())
-                            return;
+                HttpURLConnection connection = AnnouncementsRoutes.getAnnouncementsConnectionFromRoute(
+                        GET_LATEST_ANNOUNCEMENTS, Locale.getDefault().toLanguageTag());
 
-                        Settings.ANNOUNCEMENT_LAST_ID.resetToDefault();
-                        Utils.showToastLong(str("revanced_announcements_connection_failed"));
-
-                        return;
-                    }
-                } catch (IOException ex) {
-                    Logger.printException(() -> "Could not connect to announcements provider", ex);
-                    return;
-                }
+                Logger.printDebug(() -> "Get latest announcements route connection url: " + connection.getURL());
 
                 var jsonString = Requester.parseStringAndDisconnect(connection);
 
                 // Parse the announcement. Fall-back to raw string if it fails.
                 int id = Settings.ANNOUNCEMENT_LAST_ID.defaultValue;
                 String title;
                 String message;
+                LocalDateTime archivedAt = LocalDateTime.MAX;
                 Level level = Level.INFO;
                 try {
                     final var announcement = new JSONObject(jsonString);
 
                     id = announcement.getInt("id");
                     title = announcement.getString("title");
                     message = announcement.getJSONObject("content").getString("message");
-                    if (!announcement.isNull("level")) level = Level.fromInt(announcement.getInt("level"));
-
+                    if (!announcement.isNull("archived_at")) {
+                        archivedAt = LocalDateTime.parse(announcement.getString("archived_at"));
+                    }
+                    if (!announcement.isNull("level")) {
+                        level = Level.fromInt(announcement.getInt("level"));
+                    }
                 } catch (Throwable ex) {
                     Logger.printException(() -> "Failed to parse announcement. Fall-backing to raw string", ex);
 
                     title = "Announcement";
                     message = jsonString;
                 }
 
-                // Do not show the announcement, if the last announcement id is the same as the current one.
-                if (Settings.ANNOUNCEMENT_LAST_ID.get() == id) return;
+                // If the announcement is archived, do not show it.
+                if (archivedAt.isBefore(LocalDateTime.now())) {
+                    Settings.ANNOUNCEMENT_LAST_ID.save(id);
+                    return;
+                }
 
                 int finalId = id;
                 final var finalTitle = title;

extensions/shared/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java

@@ -9,12 +9,9 @@
 import static app.revanced.extension.youtube.requests.Route.Method.GET;
 
 public class AnnouncementsRoutes {
-    private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v2";
-
-    /**
-     * 'language' parameter is IETF format (for USA it would be 'en-us').
-     */
-    public static final Route GET_LATEST_ANNOUNCEMENT = new Route(GET, "/announcements/youtube/latest?language={language}");
+    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=youtube");
+    private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v4";
 
     private AnnouncementsRoutes() {
     }