2
0
mirror of https://github.com/TeamNewPipe/NewPipeExtractor synced 2025-08-22 09:57:38 +00:00

Merge pull request #1344 from FineFindus/fix/invalid-related-id

[YouTube] Correctly set `uploaderUrl` for lockup content type items
This commit is contained in:
litetex 2025-07-26 15:28:33 +02:00 committed by GitHub
commit af82c7ae0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -179,19 +179,38 @@ public class YoutubeStreamInfoItemLockupExtractor implements StreamInfoItemExtra
@Override
public String getUploaderUrl() throws ParsingException {
final String channelId = channelImageViewModel()
final JsonObject innerTubeCommand = channelImageViewModel()
.forUploaderUrlExtraction()
.getObject("rendererContext")
.getObject("commandContext")
.getObject("onTap")
.getObject("innertubeCommand")
.getObject("browseEndpoint")
.getObject("innertubeCommand");
final JsonObject browseEndpoint = innerTubeCommand
.getObject("browseEndpoint");
final String channelId = browseEndpoint
.getString("browseId");
if (isNullOrEmpty(channelId)) {
throw new ParsingException("Could not get uploader url");
if (channelId != null && channelId.startsWith("UC")) {
return YoutubeChannelLinkHandlerFactory.getInstance().getUrl("channel/" + channelId);
}
return YoutubeChannelLinkHandlerFactory.getInstance().getUrl(channelId);
final String canonicalBaseUrl = browseEndpoint.getString("canonicalBaseUrl");
if (!isNullOrEmpty(canonicalBaseUrl)) {
return resolveUploaderUrlFromRelativeUrl(canonicalBaseUrl);
}
final String webCommandMetadataUrl = innerTubeCommand.getObject("commandMetadata")
.getObject("webCommandMetadata")
.getString("url");
if (!isNullOrEmpty(webCommandMetadataUrl)) {
return resolveUploaderUrlFromRelativeUrl(webCommandMetadataUrl);
}
throw new ParsingException("Could not get uploader url");
}
private String resolveUploaderUrlFromRelativeUrl(final String url) throws ParsingException {
return YoutubeChannelLinkHandlerFactory.getInstance().getUrl("c" + url);
}
@Nonnull