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

Let an account change the playlists it owns

Browse Source 
Reading a server-side playlist was all the app could do: the write half of
both APIs was missing, and the only thing that knew which credential to use
was the subscription layer. So playlists arrive here as an account concern —
hand AccountService an account and it finds the instance, reads the secret,
refuses what the backend cannot do, and records what the answer implies
about the login.

Capabilities decide, never the instance type: a privacy setting sent to a
backend that has none is dropped rather than refused, because the playlist
is still perfectly creatable there. Every call captures the credential it
used and re-reads it before recording an outcome, so a late 401 cannot
reject the login the user just fixed, nor a late success clear a rejection
it never earned.

Removal is where the backends stop being alike. Invidious names the row
itself with an indexId that survives refetches, so it removes directly.
Piped removes by position, and a position is only true of the fetch that
minted it — so the playlist is refetched and the position checked to still
hold the same video before anything is deleted. That narrows the window; it
cannot close it, and only the refetch afterwards shows what really happened.

The cache exists so that refetch cannot be forgotten. Every mutation goes
through it and republishes what it touched — on failure as much as on
success, because a write that reported failure may still have landed — and
nothing is ever edited optimistically. It is in memory alone: the data
belongs to a login rather than to this device, and a stored Piped entry id
would be aimed at whatever occupies that slot next launch. A per-account
generation fences results that come back after the account was cleared,
since clearing has never cancelled the request that was filling it.

Along the way, clients minted per instance sent no User-Agent at all —
instances that whitelist the Yattee prefix answered them with a 401 the
shared client never earned. The factory now bakes the app's User-Agent in
at construction, where no request can outrun it.
This commit is contained in:
Arkadiusz Fal
2026-09-02 23:29:13 +02:00
parent de4ee9a728
commit b2741bbb32
12 changed files with 1926 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

231
Yattee/Services/API/ContentService.swift
View File

@@ -243,6 +243,232 @@ actor ContentService: ContentServiceProtocol {
try await api(for: instance).channelSearch(id: id, query: query, instance: instance, page: page)
}
// MARK: - Authenticated Playlists
/// Fetches the playlists the credential's owner has on the instance.
func userPlaylists(instance: Instance, credential: String) async throws -> [Playlist] {
switch instance.type {
case .invidious:
return try await invidiousAPI(for: instance).userPlaylists(instance: instance, sid: credential)
case .piped:
return try await pipedAPI(for: instance).userPlaylists(instance: instance, authToken: credential)
default:
throw APIError.notSupported
}
}
/// Fetches one of the credential owner's playlists along with the per-entry
/// identities its rows can be removed by.
func userPlaylistSnapshot(
id: String,
instance: Instance,
credential: String
) async throws -> RemotePlaylistSnapshot {
switch instance.type {
case .invidious:
return try await invidiousAPI(for: instance).userPlaylistSnapshot(
id: id,
instance: instance,
sid: credential
)
case .piped:
return try await pipedAPI(for: instance).userPlaylistSnapshot(
id: id,
instance: instance,
authToken: credential
)
default:
throw APIError.notSupported
}
}
/// Creates a playlist for the credential's owner.
///
/// The returned playlist is the little the server says about what it just
/// made — an id and a title. Nothing else is invented here: callers refetch
/// the list, which is the only description that is actually the server's.
/// - Parameters:
/// - privacy: Ignored by backends without a visibility concept (Piped),
/// and defaulted to private on those that have one when not given.
func createPlaylist(
title: String,
description: String?,
privacy: PlaylistPrivacy?,
instance: Instance,
credential: String
) async throws -> Playlist {
switch instance.type {
case .invidious:
let api = await invidiousAPI(for: instance)
let playlist = try await api.createPlaylist(
title: title,
privacy: privacy ?? .private,
instance: instance,
sid: credential
)
// Creation takes no description, so a wanted one is a second call.
// Its failure is the caller's to see: a playlist that exists with
// the wrong description is not a silent success.
if let description, !description.isEmpty {
try await api.updatePlaylist(
id: playlist.id.playlistID,
title: title,
description: description,
privacy: privacy ?? .private,
instance: instance,
sid: credential
)
}
return playlist
case .piped:
let api = await pipedAPI(for: instance)
let playlistID = try await api.createPlaylist(
name: title,
instance: instance,
authToken: credential
)
if let description, !description.isEmpty {
try await api.updatePlaylistDescription(
id: playlistID,
description: description,
instance: instance,
authToken: credential
)
}
return Playlist(id: .global(playlistID), title: title, description: description)
default:
throw APIError.notSupported
}
}
/// Edits one of the credential owner's playlists.
///
/// - Parameters:
/// - description: `nil` leaves whatever the playlist has.
/// - privacy: `nil` keeps the private default on backends that have
/// visibility; ignored entirely on those that do not.
func updatePlaylist(
id: String,
title: String,
description: String?,
privacy: PlaylistPrivacy?,
instance: Instance,
credential: String
) async throws {
switch instance.type {
case .invidious:
try await invidiousAPI(for: instance).updatePlaylist(
id: id,
title: title,
description: description,
privacy: privacy ?? .private,
instance: instance,
sid: credential
)
case .piped:
// Two calls, no transaction: Piped edits the name and the
// description through separate endpoints. The rename goes first so
// a failure of the second leaves the visible half applied, and the
// caller's refetch shows exactly what landed.
let api = await pipedAPI(for: instance)
try await api.renamePlaylist(
id: id,
newName: title,
instance: instance,
authToken: credential
)
if let description {
try await api.updatePlaylistDescription(
id: id,
description: description,
instance: instance,
authToken: credential
)
}
default:
throw APIError.notSupported
}
}
/// Deletes one of the credential owner's playlists.
func deletePlaylist(id: String, instance: Instance, credential: String) async throws {
switch instance.type {
case .invidious:
try await invidiousAPI(for: instance).deletePlaylist(id: id, instance: instance, sid: credential)
case .piped:
try await pipedAPI(for: instance).deletePlaylist(id: id, instance: instance, authToken: credential)
default:
throw APIError.notSupported
}
}
/// Appends a video to one of the credential owner's playlists.
func addVideoToPlaylist(
playlistID: String,
videoID: String,
instance: Instance,
credential: String
) async throws {
switch instance.type {
case .invidious:
try await invidiousAPI(for: instance).addVideoToPlaylist(
playlistID: playlistID,
videoID: videoID,
instance: instance,
sid: credential
)
case .piped:
try await pipedAPI(for: instance).addToPlaylist(
id: playlistID,
videoID: videoID,
instance: instance,
authToken: credential
)
default:
throw APIError.notSupported
}
}
/// Removes one row from one of the credential owner's playlists.
///
/// The entry id says which backend minted it, and it has to be the one this
/// instance runs: an Invidious `indexId` means nothing to Piped, and a
/// Piped position sent to Invidious would be a *different row* rather than
/// an error, so a mismatch is refused rather than translated.
func removeEntry(
_ entryID: RemotePlaylistEntryID,
instance: Instance,
credential: String
) async throws {
switch (entryID, instance.type) {
case (.invidious(let playlistID, let indexID), .invidious):
try await invidiousAPI(for: instance).removeVideoFromPlaylist(
playlistID: playlistID,
indexID: indexID,
instance: instance,
sid: credential
)
case (.piped(let playlistID, let position), .piped):
try await pipedAPI(for: instance).removeFromPlaylist(
id: playlistID,
index: position,
instance: instance,
authToken: credential
)
case (_, .invidious), (_, .piped):
throw APIError.invalidRequest
default:
throw APIError.notSupported
}
}
/// Fetches streams with proxy URLs for downloads (Yattee Server: hits /proxy/fast/
/// so the server caches the file on disk; other backends apply Invidious URL rewriting).
func proxyStreams(videoID: String, instance: Instance) async throws -> [Stream] {
@@ -362,6 +588,11 @@ actor ContentService: ContentServiceProtocol {
}
}
/// The real transport behind ``AccountService``. Declared here rather than on
/// the protocol's own file so the conformance is checked next to the methods
/// that satisfy it; the protocol exists so tests can script a server.
extension ContentService: RemotePlaylistTransport {}
// MARK: - Search Result
enum OrderedSearchItem: Sendable {