lasers
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

searchfilters: Peertube restore different endpoints to fix peertube content filter search

This commit is contained in:
evermind 2023-12-30 17:29:12 +01:00
parent dd252d342e
commit 70a2b63900
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java
View File

@ -319,7 +319,7 @@ public class PeertubeStreamExtractor extends StreamExtractor {
@Nonnull
private String getRelatedItemsUrl(@Nonnull final List<String> tags)
throws UnsupportedEncodingException {
final String url = baseUrl + PeertubeSearchQueryHandlerFactory.SEARCH_ENDPOINT;
final String url = baseUrl + PeertubeSearchQueryHandlerFactory.SEARCH_ENDPOINT_VIDEOS;
final StringBuilder params = new StringBuilder();
params.append("start=0&count=8&sort=-createdAt");
for (final String tag : tags) {

43
extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeSearchQueryHandlerFactory.java
View File

@ -23,7 +23,9 @@ public final class PeertubeSearchQueryHandlerFactory extends SearchQueryHandlerF
public static final String VIDEOS = "videos";
// sepia is the global index
public static final String SEPIA_BASE_URL = "https://sepiasearch.org";
public static final String SEARCH_ENDPOINT = "/api/v1/search/videos";
public static final String SEARCH_ENDPOINT_PLAYLISTS = "/api/v1/search/video-playlists";
public static final String SEARCH_ENDPOINT_VIDEOS = "/api/v1/search/videos";
public static final String SEARCH_ENDPOINT_CHANNELS = "/api/v1/search/video-channels";
private PeertubeSearchQueryHandlerFactory() {
super(new PeertubeFilters());
@ -39,9 +41,7 @@ public final class PeertubeSearchQueryHandlerFactory extends SearchQueryHandlerF
@Nullable final List<FilterItem> selectedSortFilters)
throws ParsingException, UnsupportedOperationException {
final String baseUrl;
final Optional<FilterItem> sepiaFilter =
PeertubeHelpers.getSepiaFilter(selectedContentFilter);
if (sepiaFilter.isPresent()) {
if (isSepiaContentFilterPresent(selectedContentFilter)) {
baseUrl = SEPIA_BASE_URL;
} else {
baseUrl = ServiceList.PeerTube.getBaseUrl();
@ -62,10 +62,43 @@ public final class PeertubeSearchQueryHandlerFactory extends SearchQueryHandlerF
final String filterQuery = searchFilters.evaluateSelectedFilters(null);
return baseUrl + SEARCH_ENDPOINT + "?search=" + Utils.encodeUrlUtf8(searchString)
final String endpoint = getContentFilterDependingEndpoint(selectedContentFilter);
return baseUrl + endpoint + "?search=" + Utils.encodeUrlUtf8(searchString)
+ filterQuery;
} catch (final UnsupportedEncodingException e) {
throw new ParsingException("Could not encode query", e);
}
}
private boolean isSepiaContentFilterPresent(
@Nullable final List<FilterItem> selectedContentFilter) {
boolean isSepiaFilterPresent = false;
if (selectedContentFilter != null) {
final Optional<FilterItem> sepiaFilter =
PeertubeHelpers.getSepiaFilter(selectedContentFilter);
if (sepiaFilter.isPresent()) {
isSepiaFilterPresent = true;
}
}
return isSepiaFilterPresent;
}
private String getContentFilterDependingEndpoint(
@Nullable final List<FilterItem> selectedContentFilter) {
// default to video search endpoint
String endpoint = SEARCH_ENDPOINT_VIDEOS;
if (selectedContentFilter != null
&& // SepiaFilter only supports SEARCH_ENDPOINT_VIDEOS
!isSepiaContentFilterPresent(selectedContentFilter)) {
final Optional<FilterItem> contentFilter = selectedContentFilter.stream()
.filter(PeertubeFilters.PeertubeContentFilterItem.class::isInstance)
.findFirst();
if (contentFilter.isPresent()) {
endpoint = ((PeertubeFilters.PeertubeContentFilterItem) contentFilter.get())
.getEndpoint();
}
}
return endpoint;
}
}