[PeerTube]

Author: Stypox

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java

@@ -115,9 +115,9 @@ public boolean isVerified() throws ParsingException {
     public List<ListLinkHandler> getTabs() throws ParsingException {
         return List.of(
                 PeertubeChannelTabLinkHandlerFactory.getInstance().fromQuery(getId(),
-                        List.of(ChannelTabs.VIDEOS), "", getBaseUrl()),
+                        List.of(ChannelTabs.VIDEOS), List.of(), getBaseUrl()),
                 PeertubeChannelTabLinkHandlerFactory.getInstance().fromQuery(getId(),
-                        List.of(ChannelTabs.CHANNELS), "", getBaseUrl()));
+                        List.of(ChannelTabs.CHANNELS), List.of(), getBaseUrl()));
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java

@@ -89,9 +89,9 @@ public boolean isVerified() throws ParsingException {
     public List<ListLinkHandler> getTabs() throws ParsingException {
         return List.of(
                 PeertubeChannelTabLinkHandlerFactory.getInstance().fromQuery(getId(),
-                        List.of(ChannelTabs.VIDEOS), "", getBaseUrl()),
+                        List.of(ChannelTabs.VIDEOS), List.of(), getBaseUrl()),
                 PeertubeChannelTabLinkHandlerFactory.getInstance().fromQuery(getId(),
-                        List.of(ChannelTabs.PLAYLISTS), "", getBaseUrl()));
+                        List.of(ChannelTabs.PLAYLISTS), List.of(), getBaseUrl()));
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelTabExtractor.java

@@ -44,8 +44,8 @@ public void onFetchPage(@Nonnull final Downloader downloader) {
     @Override
     public InfoItemsPage<InfoItem> getInitialPage() throws IOException, ExtractionException {
         return getPage(new Page(baseUrl + PeertubeChannelLinkHandlerFactory.API_ENDPOINT
-                + getId() + getUrlSuffix(getName()) + "?" + START_KEY + "=0&" + COUNT_KEY + "="
-                + ITEMS_PER_PAGE));
+                + getId() + getUrlSuffix(getChannelTabType()) + "?" + START_KEY + "=0&"
+                + COUNT_KEY + "=" + ITEMS_PER_PAGE));
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeChannelTabLinkHandlerFactory.java

@@ -4,8 +4,11 @@
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.UnsupportedTabException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import java.util.List;
 
 public final class PeertubeChannelTabLinkHandlerFactory extends ListLinkHandlerFactory {
@@ -20,15 +23,14 @@ public static PeertubeChannelTabLinkHandlerFactory getInstance() {
     }
 
     @Nonnull
-    public static String getUrlSuffix(@Nonnull final String tab)
+    public static String getUrlSuffix(@Nonnull final FilterItem tab)
             throws UnsupportedTabException {
-        switch (tab) {
-            case ChannelTabs.VIDEOS:
-                return "/videos";
-            case ChannelTabs.CHANNELS: // only available on accounts
-                return "/video-channels";
-            case ChannelTabs.PLAYLISTS: // only available on channels
-                return "/video-playlists";
+        if (tab.equals(ChannelTabs.VIDEOS)) {
+            return "/videos";
+        } else if (tab.equals(ChannelTabs.CHANNELS)) { // only available on accounts
+            return "/video-channels";
+        } else if (tab.equals(ChannelTabs.PLAYLISTS)) { // only available on channels
+            return "/video-playlists";
         }
         throw new UnsupportedTabException(tab);
     }
@@ -39,33 +41,27 @@ public String getId(final String url) throws ParsingException, UnsupportedOperat
     }
 
     @Override
-    public String getUrl(final String id, final List<String> contentFilter, final String sortFilter)
+    public String getUrl(final String id,
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         return PeertubeChannelLinkHandlerFactory.getInstance().getUrl(id)
                 + getUrlSuffix(contentFilter.get(0));
     }
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilter,
-                         final String sortFilter,
+                         final List<FilterItem> contentFilter,
+                         final List<FilterItem> sortFilter,
                          final String baseUrl)
             throws ParsingException, UnsupportedOperationException {
-        return PeertubeChannelLinkHandlerFactory.getInstance().getUrl(id, null, null, baseUrl)
+        return PeertubeChannelLinkHandlerFactory.getInstance()
+                .getUrl(id, null, null, baseUrl)
                 + getUrlSuffix(contentFilter.get(0));
     }
 
     @Override
     public boolean onAcceptUrl(final String url) throws ParsingException {
         return PeertubeChannelLinkHandlerFactory.getInstance().onAcceptUrl(url);
     }
-
-    @Override
-    public String[] getAvailableContentFilter() {
-        return new String[] {
-                ChannelTabs.VIDEOS,
-                ChannelTabs.CHANNELS,
-                ChannelTabs.PLAYLISTS,
-        };
-    }
 }