diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ChannelTabs.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ChannelTabs.java index a7d7f099d..5ff0f06f8 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ChannelTabs.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ChannelTabs.java @@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor.linkhandler; public final class ChannelTabs { public static final String SHORTS = "shorts"; - public static final String LIVE = "live"; + public static final String LIVESTREAMS = "livestreams"; public static final String CHANNELS = "channels"; public static final String PLAYLISTS = "playlists"; public static final String ALBUMS = "albums"; diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java index 5e03c4308..3c49a6872 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java @@ -419,7 +419,7 @@ public class YoutubeChannelExtractor extends ChannelExtractor { addTab.accept(ChannelTabs.PLAYLISTS); break; case "streams": - addTab.accept(ChannelTabs.LIVE); + addTab.accept(ChannelTabs.LIVESTREAMS); break; case "shorts": addTab.accept(ChannelTabs.SHORTS); diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelTabExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelTabExtractor.java index 37590a824..5d7b15817 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelTabExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelTabExtractor.java @@ -54,7 +54,7 @@ public class YoutubeChannelTabExtractor extends ChannelTabExtractor { switch (getTab()) { case ChannelTabs.PLAYLISTS: return "EglwbGF5bGlzdHPyBgQKAkIA"; - case ChannelTabs.LIVE: + case ChannelTabs.LIVESTREAMS: return "EgdzdHJlYW1z8gYECgJ6AA%3D%3D"; case ChannelTabs.SHORTS: return "EgZzaG9ydHPyBgUKA5oBAA%3D%3D"; diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java index 6da052275..2b34067c4 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java @@ -21,7 +21,7 @@ public final class YoutubeChannelTabLinkHandlerFactory extends ListLinkHandlerFa switch (tab) { case ChannelTabs.PLAYLISTS: return "/playlists"; - case ChannelTabs.LIVE: + case ChannelTabs.LIVESTREAMS: return "/streams"; case ChannelTabs.SHORTS: return "/shorts"; @@ -56,7 +56,7 @@ public final class YoutubeChannelTabLinkHandlerFactory extends ListLinkHandlerFa public String[] getAvailableContentFilter() { return new String[] { ChannelTabs.SHORTS, - ChannelTabs.LIVE, + ChannelTabs.LIVESTREAMS, ChannelTabs.CHANNELS, ChannelTabs.PLAYLISTS, }; diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YouTubeChannelTabExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YouTubeChannelTabExtractorTest.java index d97e556fb..0933282b8 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YouTubeChannelTabExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YouTubeChannelTabExtractorTest.java @@ -112,7 +112,7 @@ public class YouTubeChannelTabExtractorTest { YoutubeTestsUtils.ensureStateless(); YoutubeParsingHelper.setVisitorData(YoutubeTestsUtils.VISITOR_DATA_NEW_CHANNEL_LAYOUT); NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "livestreams")); - extractor = (YoutubeChannelTabExtractor) YouTube.getChannelTabExtractorFromId("UCR-DXc1voovS8nhAvccRZhg", ChannelTabs.LIVE); + extractor = (YoutubeChannelTabExtractor) YouTube.getChannelTabExtractorFromId("UCR-DXc1voovS8nhAvccRZhg", ChannelTabs.LIVESTREAMS); extractor.fetchPage(); } @@ -123,7 +123,7 @@ public class YouTubeChannelTabExtractorTest { @Test public void testTab() { - assertEquals(ChannelTabs.LIVE, extractor.getTab()); + assertEquals(ChannelTabs.LIVESTREAMS, extractor.getTab()); } @Test diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java index be0dfd48c..3650e6e22 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java @@ -789,7 +789,7 @@ public class YoutubeChannelExtractorTest { Set tabs = extractor.getTabs().stream() .map(linkHandler -> linkHandler.getContentFilters().get(0)).collect(Collectors.toSet()); assertTrue(tabs.contains(ChannelTabs.SHORTS)); - assertTrue(tabs.contains(ChannelTabs.LIVE)); + assertTrue(tabs.contains(ChannelTabs.LIVESTREAMS)); assertTrue(tabs.contains(ChannelTabs.PLAYLISTS)); assertTrue(tabs.contains(ChannelTabs.CHANNELS)); }