Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-10-23 13:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve @handle channel links on Invidious

Browse Source 
Invidious' channel endpoints take only UC… IDs and return 500 for a
youtube.com/@handle, so channels opened from handle links (and the
subscribe link action) failed with "Could not get channel info". Resolve
the handle through /api/v1/resolveurl first, cached per instance.
This commit is contained in:
Arkadiusz Fal
2026-10-06 23:43:03 +02:00
parent 9f4170ac00
commit 77b09ea802
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Yattee/Services/API/InvidiousAPI.swift
View File

@@ -116,7 +116,24 @@ actor InvidiousAPI: InstanceAPI {
return response.toVideo(baseURL: instance.url)
}
/// `@handle` channel IDs (youtube.com/@name links) resolved to UC… IDs, per instance.
private var resolvedChannelHandles: [String: String] = [:]
/// Invidious' channel endpoints only take UC… IDs, so a `@handle` is resolved first.
private func channelID(for id: String, instance: Instance) async throws -> String {
guard id.hasPrefix("@") else { return id }
let key = "\(instance.url.absoluteString)|\(id.lowercased())"
if let cached = resolvedChannelHandles[key] { return cached }
let endpoint = GenericEndpoint.get("/api/v1/resolveurl", query: ["url": "https://www.youtube.com/\(id)"])
let response: InvidiousResolvedURL = try await httpClient.fetch(endpoint, baseURL: instance.url)
guard let ucid = response.ucid, !ucid.isEmpty else { return id }
resolvedChannelHandles[key] = ucid
return ucid
}
func channel(id: String, instance: Instance) async throws -> Channel {
let id = try await channelID(for: id, instance: instance)
let endpoint = GenericEndpoint.get("/api/v1/channels/\(id)")
let response: InvidiousChannel = try await httpClient.fetch(endpoint, baseURL: instance.url)
return response.toChannel(baseURL: instance.url)
@@ -127,6 +144,7 @@ actor InvidiousAPI: InstanceAPI {
if let continuation {
query["continuation"] = continuation
}
let id = try await channelID(for: id, instance: instance)
let endpoint = GenericEndpoint.get("/api/v1/channels/\(id)/videos", query: query)
let response: InvidiousChannelVideosWithContinuation = try await httpClient.fetch(endpoint, baseURL: instance.url)
return ChannelVideosPage(
@@ -140,6 +158,7 @@ actor InvidiousAPI: InstanceAPI {
if let continuation {
query["continuation"] = continuation
}
let id = try await channelID(for: id, instance: instance)
let endpoint = GenericEndpoint.get("/api/v1/channels/\(id)/playlists", query: query)
let response: InvidiousChannelPlaylists = try await httpClient.fetch(endpoint, baseURL: instance.url)
return ChannelPlaylistsPage(
@@ -153,6 +172,7 @@ actor InvidiousAPI: InstanceAPI {
if let continuation {
query["continuation"] = continuation
}
let id = try await channelID(for: id, instance: instance)
let endpoint = GenericEndpoint.get("/api/v1/channels/\(id)/shorts", query: query)
let response: InvidiousChannelVideosWithContinuation = try await httpClient.fetch(endpoint, baseURL: instance.url)
return ChannelVideosPage(
@@ -166,6 +186,7 @@ actor InvidiousAPI: InstanceAPI {
if let continuation {
query["continuation"] = continuation
}
let id = try await channelID(for: id, instance: instance)
let endpoint = GenericEndpoint.get("/api/v1/channels/\(id)/streams", query: query)
let response: InvidiousChannelVideosWithContinuation = try await httpClient.fetch(endpoint, baseURL: instance.url)
return ChannelVideosPage(
@@ -408,6 +429,7 @@ actor InvidiousAPI: InstanceAPI {
}
func channelSearch(id: String, query: String, instance: Instance, page: Int) async throws -> ChannelSearchPage {
let id = try await channelID(for: id, instance: instance)
let endpoint = GenericEndpoint.get("/api/v1/channels/\(id)/search", query: [
"q": query,
"page": String(page)
@@ -2085,3 +2107,8 @@ private struct InvidiousSuggestions: Decodable, Sendable {
let query: String
let suggestions: [String]
}
/// Response of `/api/v1/resolveurl`.
private struct InvidiousResolvedURL: Decodable, Sendable {
let ucid: String?
}