mir/NewPipeExtractor
2
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipeExtractor synced 2025-08-22 18:07:47 +00:00
Code Issues Releases Wiki Activity

[YT] Correctly resolve redirects when resolving channel ids

Browse Source
This commit is contained in:
litetex 2025-07-26 17:08:42 +02:00 committed by TobiGr
parent 4701c56e86
commit f91454d24f
1 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelHelper.java
View File

@ -1,20 +1,5 @@
package org.schabi.newpipe.extractor.services.youtube; package org.schabi.newpipe.extractor.services.youtube;
import com.grack.nanojson.JsonObject;
import com.grack.nanojson.JsonWriter;
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.localization.ContentCountry;
import org.schabi.newpipe.extractor.localization.Localization;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.defaultAlertsCheck; import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.defaultAlertsCheck;
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getJsonPostResponse; import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getJsonPostResponse;
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getTextFromObject; import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getTextFromObject;
@ -22,6 +7,23 @@ import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.prepareDesktopJsonBuilder; import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.prepareDesktopJsonBuilder;
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
import com.grack.nanojson.JsonObject;
import com.grack.nanojson.JsonWriter;
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.localization.ContentCountry;
import org.schabi.newpipe.extractor.localization.Localization;
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/** /**
* Shared functions for extracting YouTube channel pages and tabs. * Shared functions for extracting YouTube channel pages and tabs.
*/ */
@ -65,25 +67,42 @@ public final class YoutubeChannelHelper {
// URL, then no information about the channel associated with this URL was found, // URL, then no information about the channel associated with this URL was found,
// so the unresolved url will be returned. // so the unresolved url will be returned.
if (!channelId[0].equals("channel")) { if (!channelId[0].equals("channel")) {
final byte[] body = JsonWriter.string( String urlToResolve = "https://www.youtube.com/" + idOrPath;
prepareDesktopJsonBuilder(Localization.DEFAULT, ContentCountry.DEFAULT)
.value("url", "https://www.youtube.com/" + idOrPath) JsonObject endpoint = new JsonObject();
String webPageType = "";
// Try to resolve YT channel redirects
// It works like that:
// @TheDailyShow
// -> resolves to thedailyshow
// -> resolves to the id: UCwWhs_6x42TyRM4Wstoq8HA
for (int tries = 0;
urlToResolve != null && tries < 3;
tries++) {
final byte[] body = JsonWriter.string(
prepareDesktopJsonBuilder(Localization.DEFAULT, ContentCountry.DEFAULT)
.value("url", urlToResolve)
.done()) .done())
.getBytes(StandardCharsets.UTF_8); .getBytes(StandardCharsets.UTF_8);
final JsonObject jsonResponse = getJsonPostResponse( final JsonObject jsonResponse = getJsonPostResponse(
"navigation/resolve_url", body, Localization.DEFAULT); "navigation/resolve_url", body, Localization.DEFAULT);
checkIfChannelResponseIsValid(jsonResponse); checkIfChannelResponseIsValid(jsonResponse);
final JsonObject endpoint = jsonResponse.getObject("endpoint"); endpoint = jsonResponse.getObject("endpoint");
final String webPageType = endpoint.getObject("commandMetadata") webPageType = endpoint.getObject("commandMetadata")
.getObject("webCommandMetadata") .getObject("webCommandMetadata")
.getString("webPageType", ""); .getString("webPageType", "");
final JsonObject browseEndpoint = endpoint.getObject(BROWSE_ENDPOINT); urlToResolve = "WEB_PAGE_TYPE_UNKNOWN".equals(webPageType)
final String browseId = browseEndpoint.getString(BROWSE_ID, ""); ? endpoint.getObject("urlEndpoint").getString("url")
: null;
}
final String browseId = endpoint.getObject(BROWSE_ENDPOINT)
.getString(BROWSE_ID, "");
if (webPageType.equalsIgnoreCase("WEB_PAGE_TYPE_BROWSE") if (webPageType.equalsIgnoreCase("WEB_PAGE_TYPE_BROWSE")
|| webPageType.equalsIgnoreCase("WEB_PAGE_TYPE_CHANNEL") || webPageType.equalsIgnoreCase("WEB_PAGE_TYPE_CHANNEL")
@ -94,6 +113,11 @@ public final class YoutubeChannelHelper {
return browseId; return browseId;
} }
// Otherwise the code after that will run into an IndexOutOfBoundsException
if (channelId.length < 2) {
throw new ExtractionException("Failed to resolve channelId for " + idOrPath);
}
} }
// return the unresolved URL // return the unresolved URL