Fix test failure.

TeamNewPipe · Nov 30, 2022 · c70e29e · c70e29e
1 parent 9c23326
commit c70e29e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/...tor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/...tor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -793,7 +793,8 @@ public static boolean isHardcodedYoutubeMusicKeyValid() throws IOException,
             .end().done().getBytes(StandardCharsets.UTF_8);
         // @formatter:on
 
-        final var headers = new HashMap<>(getOriginReferrerHeaders("https://music.youtube.com"));
+        final var headers = new HashMap<>(getOriginReferrerHeaders("https://music.youtube.com",
+                "music.youtube.com"));
         headers.put("X-YouTube-Client-Name", List.of(HARDCODED_YOUTUBE_MUSIC_KEY[1]));
         headers.put("X-YouTube-Client-Version", List.of(HARDCODED_YOUTUBE_MUSIC_KEY[2]));
         headers.put("Content-Type", List.of("application/json"));
@@ -1411,8 +1412,19 @@ public static Map<String, List<String>> getClientInfoHeaders()
      * @param url The URL to be set as the origin and referrer.
      */
     public static Map<String, List<String>> getOriginReferrerHeaders(@Nonnull final String url) {
-        final var urlList = List.of(url);
-        return Map.of("Origin", urlList, "Referer", urlList);
+        return getOriginReferrerHeaders(url, url);
+    }
+
+    /**
+     * Returns an unmodifiable {@link Map} containing the {@code Origin} and {@code Referer}
+     * headers set to the given values.
+     *
+     * @param origin The origin.
+     * @param referrer The referrer.
+     */
+    public static Map<String, List<String>> getOriginReferrerHeaders(
+            @Nonnull final String origin, @Nonnull final String referrer) {
+        return Map.of("Origin", List.of(origin), "Referer", List.of(referrer));
     }
 
     /**

diff --git a/...org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java b/...org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java
@@ -42,7 +42,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
@@ -117,8 +116,8 @@ public void onFetchPage(@Nonnull final Downloader downloader)
             .end().done().getBytes(StandardCharsets.UTF_8);
         // @formatter:on
 
-        final Map<String, List<String>> headers = new HashMap<>(getOriginReferrerHeaders(
-                "https://music.youtube.com"));
+        final var headers = new HashMap<>(getOriginReferrerHeaders("https://music.youtube.com",
+                "music.youtube.com"));
         headers.put("X-YouTube-Client-Name", List.of(youtubeMusicKeys[1]));
         headers.put("X-YouTube-Client-Version", List.of(youtubeMusicKeys[2]));
         headers.put("Content-Type", List.of("application/json"));
@@ -251,8 +250,8 @@ public InfoItemsPage<InfoItem> getPage(final Page page)
             .end().done().getBytes(StandardCharsets.UTF_8);
         // @formatter:on
 
-        final Map<String, List<String>> headers = new HashMap<>(getOriginReferrerHeaders(
-                "https://music.youtube.com"));
+        final var headers = new HashMap<>(getOriginReferrerHeaders("https://music.youtube.com",
+                "music.youtube.com"));
         headers.put("X-YouTube-Client-Name", List.of(youtubeMusicKeys[1]));
         headers.put("X-YouTube-Client-Version", List.of(youtubeMusicKeys[2]));
         headers.put("Content-Type", List.of("application/json"));