Skip to content

[YouTube] Remove combined Trending kiosk #1402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: dev
Choose a base branch
from
+88 −972
Draft

[YouTube] Remove combined Trending kiosk #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6486e8
[YouTube] Remove deprecated combined trending kiosk
TobiGr Nov 14, 2025
a396a55
Update mocks for changed tests
TobiGr Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeSubscriptionExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeSuggestionExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeTrendingExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeLiveExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeTrendingGamingVideosExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeTrendingMoviesAndShowsTrailersExtractor;
Expand All @@ -49,7 +48,6 @@
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeStreamLinkHandlerFactory;
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeTrendingGamingVideosLinkHandlerFactory;
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeTrendingLinkHandlerFactory;
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeTrendingMoviesAndShowsTrailersLinkHandlerFactory;
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeTrendingMusicLinkHandlerFactory;
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeTrendingPodcastsEpisodesLinkHandlerFactory;
Expand Down Expand Up @@ -164,7 +162,6 @@ public SuggestionExtractor getSuggestionExtractor() {
@Override
public KioskList getKioskList() throws ExtractionException {
final KioskList list = new KioskList(this);
final ListLinkHandlerFactory trendingLHF = YoutubeTrendingLinkHandlerFactory.INSTANCE;
final ListLinkHandlerFactory runningLivesLHF =
YoutubeLiveLinkHandlerFactory.INSTANCE;
final ListLinkHandlerFactory trendingPodcastsEpisodesLHF =
Expand Down Expand Up @@ -218,16 +215,6 @@ public KioskList getKioskList() throws ExtractionException {
trendingMusicLHF,
YoutubeTrendingMusicLinkHandlerFactory.KIOSK_ID
);
// Deprecated (i.e. removed from the interface of YouTube) since July 21, 2025
list.addKioskEntry(
(streamingService, url, id) -> new YoutubeTrendingExtractor(
YoutubeService.this,
trendingLHF.fromUrl(url),
id
),
trendingLHF,
YoutubeTrendingExtractor.KIOSK_ID
);
list.setDefaultKiosk(YoutubeLiveLinkHandlerFactory.KIOSK_ID);
} catch (final Exception e) {
throw new ExtractionException(e);
Expand Down
177 changes: 0 additions & 177 deletions .../schabi/newpipe/extractor/services/youtube/extractors/kiosk/YoutubeTrendingExtractor.java
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions ...abi/newpipe/extractor/services/youtube/linkHandler/YoutubeTrendingLinkHandlerFactory.java
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions ...rc/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeKioskExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
import static org.schabi.newpipe.extractor.services.DefaultTests.defaultTestRelatedItems;

import org.junit.jupiter.api.Test;
import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.services.BaseListExtractorTest;
import org.schabi.newpipe.extractor.services.DefaultSimpleExtractorTest;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeLiveExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeTrendingExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeTrendingGamingVideosExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeTrendingMoviesAndShowsTrailersExtractor;
import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeTrendingMusicExtractor;
Expand Down Expand Up @@ -294,56 +292,4 @@ public void testMoreRelatedItems() throws Exception {
}
}

// Deprecated (i.e. removed from the interface of YouTube) since July 21, 2025
public static class Trending extends DefaultSimpleExtractorTest<YoutubeTrendingExtractor>
implements BaseListExtractorTest, InitYoutubeTest {

@Override
protected YoutubeTrendingExtractor createExtractor() throws Exception {
return (YoutubeTrendingExtractor) YouTube.getKioskList().getExtractorById(
"Trending", null);
}

@Override
@Test
public void testServiceId() {
assertEquals(YouTube.getServiceId(), extractor().getServiceId());
}

@Override
@Test
public void testName() throws Exception {
assertEquals("Trending", extractor().getName());
}

@Override
@Test
public void testId() throws Exception {
assertEquals("Trending", extractor().getId());
}

@Override
@Test
public void testUrl() throws ParsingException {
assertEquals("https://www.youtube.com/feed/trending", extractor().getUrl());
}

@Override
@Test
public void testOriginalUrl() throws ParsingException {
assertEquals("https://www.youtube.com/feed/trending", extractor().getOriginalUrl());
}

@Override
@Test
public void testRelatedItems() throws Exception {
defaultTestRelatedItems(extractor());
}

@Override
@Test
public void testMoreRelatedItems() throws Exception {
assertNoMoreItems(extractor());
}
}
}
8 changes: 4 additions & 4 deletions ...test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
* along with NewPipe Extractor. If not, see <http://www.gnu.org/licenses/>.
*/

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
Expand All @@ -41,9 +42,9 @@ class YoutubeTrendingKioskInfoTest implements InitYoutubeTest {
public void setUp() throws Exception {
InitYoutubeTest.super.setUp();

final LinkHandlerFactory linkHandlerFactory = YouTube.getKioskList().getListLinkHandlerFactoryByType("Trending");
final LinkHandlerFactory linkHandlerFactory = YouTube.getKioskList().getListLinkHandlerFactoryByType("trending_podcasts_episodes");

kioskInfo = KioskInfo.getInfo(YouTube, linkHandlerFactory.fromId("Trending").getUrl());
kioskInfo = KioskInfo.getInfo(YouTube, linkHandlerFactory.fromId("trending_podcasts_episodes").getUrl());
}

@Test
Expand All @@ -53,8 +54,7 @@ void getStreams() {

@Test
void getId() {
assertTrue(kioskInfo.getId().equals("Trending")
|| kioskInfo.getId().equals("Trends"));
assertEquals("trending_podcasts_episodes", kioskInfo.getId());
}

@Test
Expand Down
Loading