[SoundCloud]

Author: Stypox

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java

@@ -127,10 +127,10 @@ public List<ListLinkHandler> getTabs() throws ParsingException {
 
         return List.of(
                 new ListLinkHandler(urlTracks, urlTracks, id,
-                        List.of(ChannelTabs.TRACKS), ""),
+                        List.of(ChannelTabs.TRACKS), List.of()),
                 new ListLinkHandler(urlPlaylists, urlPlaylists, id,
-                        List.of(ChannelTabs.PLAYLISTS), ""),
+                        List.of(ChannelTabs.PLAYLISTS), List.of()),
                 new ListLinkHandler(urlAlbums, urlAlbums, id,
-                        List.of(ChannelTabs.ALBUMS), ""));
+                        List.of(ChannelTabs.ALBUMS), List.of()));
     }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelTabExtractor.java

@@ -10,6 +10,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
 import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
 
 import javax.annotation.Nonnull;
@@ -32,15 +33,15 @@ public SoundcloudChannelTabExtractor(final StreamingService service,
 
     @Nonnull
     private String getEndpoint() throws ParsingException {
-        switch (getName()) {
-            case ChannelTabs.TRACKS:
-                return "/tracks";
-            case ChannelTabs.PLAYLISTS:
-                return "/playlists_without_albums";
-            case ChannelTabs.ALBUMS:
-                return "/albums";
+        final FilterItem type = getChannelTabType();
+        if (type.equals(ChannelTabs.TRACKS)) {
+            return "/tracks";
+        } else if (type.equals(ChannelTabs.PLAYLISTS)) {
+            return "/playlists_without_albums";
+        } else if (type.equals(ChannelTabs.ALBUMS)) {
+            return "/albums";
         }
-        throw new ParsingException("Unsupported tab: " + getName());
+        throw new ParsingException("Unsupported tab: " + type);
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/linkHandler/SoundcloudChannelTabLinkHandlerFactory.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 SoundcloudChannelTabLinkHandlerFactory extends ListLinkHandlerFactory {
@@ -20,14 +23,13 @@ public static SoundcloudChannelTabLinkHandlerFactory getInstance() {
     }
 
     @Nonnull
-    public static String getUrlSuffix(final String tab) throws UnsupportedOperationException {
-        switch (tab) {
-            case ChannelTabs.TRACKS:
-                return "/tracks";
-            case ChannelTabs.PLAYLISTS:
-                return "/sets";
-            case ChannelTabs.ALBUMS:
-                return "/albums";
+    public static String getUrlSuffix(final FilterItem tab) throws UnsupportedOperationException {
+        if (tab.equals(ChannelTabs.TRACKS)) {
+            return "/tracks";
+        } else if (tab.equals(ChannelTabs.PLAYLISTS)) {
+            return "/sets";
+        } else if (tab.equals(ChannelTabs.ALBUMS)) {
+            return "/albums";
         }
         throw new UnsupportedTabException(tab);
     }
@@ -39,8 +41,8 @@ public String getId(final String url) throws ParsingException {
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilter,
-                         final String sortFilter) throws ParsingException {
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter) throws ParsingException {
         return SoundcloudChannelLinkHandlerFactory.getInstance().getUrl(id)
                 + getUrlSuffix(contentFilter.get(0));
     }
@@ -49,13 +51,4 @@ public String getUrl(final String id,
     public boolean onAcceptUrl(final String url) throws ParsingException {
         return SoundcloudChannelLinkHandlerFactory.getInstance().onAcceptUrl(url);
     }
-
-    @Override
-    public String[] getAvailableContentFilter() {
-        return new String[] {
-                ChannelTabs.TRACKS,
-                ChannelTabs.PLAYLISTS,
-                ChannelTabs.ALBUMS,
-        };
-    }
 }