Fix player size handling

Issue appears when app switches layout from tab to sidebar navigation

Fixtures/Video+Fixtures.swift

@@ -1,8 +1,9 @@
 import Foundation
 
 extension Video {
-    static var fixtureID: Video.ID = "video-fixture"
-    static var fixtureChannelID: Channel.ID = "channel-fixture"
+    static var fixtureID: Video.ID {
+        "FIXTURE"
+    }
 
     static var fixture: Video {
         let thumbnailURL = "https://yt3.ggpht.com/ytc/AKedOLR-pT_JEsz_hcaA4Gjx8DHcqJ8mS42aTRqcVy6P7w=s88-c-k-c0x00ffffff-no-rj-mo"
@@ -17,7 +18,7 @@ extension Video {
             description: "Some relaxing live piano music",
             genre: "Music",
             channel: Channel(
-                id: fixtureChannelID,
+                id: "AbCdEFgHI",
                 name: "The Channel",
                 thumbnailURL: URL(string: thumbnailURL)!,
                 subscriptionsCount: 2300,

Model/Accounts/InstancesModel.swift

@@ -53,7 +53,7 @@ final class InstancesModel: ObservableObject {
     }
 
     static func remove(_ instance: Instance) {
-        let accounts = Self.accounts(instance.id)
+        let accounts = InstancesModel.accounts(instance.id)
         if let index = Defaults[.instances].firstIndex(where: { $0.id == instance.id }) {
             Defaults[.instances].remove(at: index)
             accounts.forEach { AccountsModel.remove($0) }

Model/Applications/InvidiousAPI.swift

@@ -160,11 +160,11 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
     }
 
     private func pathPattern(_ path: String) -> String {
-        "**\(Self.basePath)/\(path)"
+        "**\(InvidiousAPI.basePath)/\(path)"
     }
 
     private func basePathAppending(_ path: String) -> String {
-        "\(Self.basePath)/\(path)"
+        "\(InvidiousAPI.basePath)/\(path)"
     }
 
     private var cookieHeader: String {
@@ -172,11 +172,11 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
     }
 
     var popular: Resource? {
-        resource(baseURL: account.url, path: "\(Self.basePath)/popular")
+        resource(baseURL: account.url, path: "\(InvidiousAPI.basePath)/popular")
     }
 
     func trending(country: Country, category: TrendingCategory?) -> Resource {
-        resource(baseURL: account.url, path: "\(Self.basePath)/trending")
+        resource(baseURL: account.url, path: "\(InvidiousAPI.basePath)/trending")
             .withParam("type", category?.name)
             .withParam("region", country.rawValue)
     }
@@ -186,7 +186,7 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
     }
 
     var feed: Resource? {
-        resource(baseURL: account.url, path: "\(Self.basePath)/auth/feed")
+        resource(baseURL: account.url, path: "\(InvidiousAPI.basePath)/auth/feed")
     }
 
     var subscriptions: Resource? {
@@ -239,66 +239,6 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
         playlist(playlistID)?.child("videos").child(videoID)
     }
 
-    func addVideoToPlaylist(
-        _ videoID: String,
-        _ playlistID: String,
-        onFailure: @escaping (RequestError) -> Void = { _ in },
-        onSuccess: @escaping () -> Void = {}
-    ) {
-        let resource = playlistVideos(playlistID)
-        let body = ["videoId": videoID]
-
-        resource?
-            .request(.post, json: body)
-            .onSuccess { _ in onSuccess() }
-            .onFailure(onFailure)
-    }
-
-    func removeVideoFromPlaylist(
-        _ index: String,
-        _ playlistID: String,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping () -> Void
-    ) {
-        let resource = playlistVideo(playlistID, index)
-
-        resource?
-            .request(.delete)
-            .onSuccess { _ in onSuccess() }
-            .onFailure(onFailure)
-    }
-
-    func playlistForm(
-        _ name: String,
-        _ visibility: String,
-        playlist: Playlist?,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping (Playlist?) -> Void
-    ) {
-        let body = ["title": name, "privacy": visibility]
-        let resource = !playlist.isNil ? self.playlist(playlist!.id) : playlists
-
-        resource?
-            .request(!playlist.isNil ? .patch : .post, json: body)
-            .onSuccess { response in
-                if let modifiedPlaylist: Playlist = response.typedContent() {
-                    onSuccess(modifiedPlaylist)
-                }
-            }
-            .onFailure(onFailure)
-    }
-
-    func deletePlaylist(
-        _ playlist: Playlist,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping () -> Void
-    ) {
-        self.playlist(playlist.id)?
-            .request(.delete)
-            .onSuccess { _ in onSuccess() }
-            .onFailure(onFailure)
-    }
-
     func channelPlaylist(_ id: String) -> Resource? {
         resource(baseURL: account.url, path: basePathAppending("playlists/\(id)"))
     }

Model/Applications/PipedAPI.swift

@@ -4,7 +4,7 @@ import Siesta
 import SwiftyJSON
 
 final class PipedAPI: Service, ObservableObject, VideosAPI {
-    static var authorizedEndpoints = ["subscriptions", "subscribe", "unsubscribe", "user/playlists"]
+    static var authorizedEndpoints = ["subscriptions", "subscribe", "unsubscribe"]
 
     @Published var account: Account!
 
@@ -43,11 +43,6 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
             self.extractChannelPlaylist(from: content.json)
         }
 
-        configureTransformer(pathPattern("user/playlists/create")) { (_: Entity<JSON>) in }
-        configureTransformer(pathPattern("user/playlists/delete")) { (_: Entity<JSON>) in }
-        configureTransformer(pathPattern("user/playlists/add")) { (_: Entity<JSON>) in }
-        configureTransformer(pathPattern("user/playlists/remove")) { (_: Entity<JSON>) in }
-
         configureTransformer(pathPattern("streams/*")) { (content: Entity<JSON>) -> Video? in
             self.extractVideo(from: content.json)
         }
@@ -86,10 +81,6 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
             return CommentsPage(comments: comments, nextPage: nextPage, disabled: disabled)
         }
 
-        configureTransformer(pathPattern("user/playlists")) { (content: Entity<JSON>) -> [Playlist] in
-            content.json.arrayValue.map { self.extractUserPlaylist(from: $0)! }
-        }
-
         if account.token.isNil {
             updateToken()
         }
@@ -179,9 +170,7 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
 
     var home: Resource? { nil }
     var popular: Resource? { nil }
-    var playlists: Resource? {
-        resource(baseURL: account.instance.apiURL, path: "user/playlists")
-    }
+    var playlists: Resource? { nil }
 
     func subscribe(_ channelID: String, onCompletion: @escaping () -> Void = {}) {
         resource(baseURL: account.instance.apiURL, path: "subscribe")
@@ -195,79 +184,10 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
             .onCompletion { _ in onCompletion() }
     }
 
-    func playlist(_ id: String) -> Resource? {
-        channelPlaylist(id)
-    }
-
+    func playlist(_: String) -> Resource? { nil }
     func playlistVideo(_: String, _: String) -> Resource? { nil }
     func playlistVideos(_: String) -> Resource? { nil }
 
-    func addVideoToPlaylist(
-        _ videoID: String,
-        _ playlistID: String,
-        onFailure: @escaping (RequestError) -> Void = { _ in },
-        onSuccess: @escaping () -> Void = {}
-    ) {
-        let resource = resource(baseURL: account.instance.apiURL, path: "user/playlists/add")
-        let body = ["videoId": videoID, "playlistId": playlistID]
-
-        resource
-            .request(.post, json: body)
-            .onSuccess { _ in onSuccess() }
-            .onFailure(onFailure)
-    }
-
-    func removeVideoFromPlaylist(
-        _ index: String,
-        _ playlistID: String,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping () -> Void
-    ) {
-        let resource = resource(baseURL: account.instance.apiURL, path: "user/playlists/remove")
-        let body: [String: Any] = ["index": Int(index)!, "playlistId": playlistID]
-
-        resource
-            .request(.post, json: body)
-            .onSuccess { _ in onSuccess() }
-            .onFailure(onFailure)
-    }
-
-    func playlistForm(
-        _ name: String,
-        _: String,
-        playlist: Playlist?,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping (Playlist?) -> Void
-    ) {
-        let body = ["name": name]
-        let resource = playlist.isNil ? resource(baseURL: account.instance.apiURL, path: "user/playlists/create") : nil
-
-        resource?
-            .request(.post, json: body)
-            .onSuccess { response in
-                if let modifiedPlaylist: Playlist = response.typedContent() {
-                    onSuccess(modifiedPlaylist)
-                } else {
-                    onSuccess(nil)
-                }
-            }
-            .onFailure(onFailure)
-    }
-
-    func deletePlaylist(
-        _ playlist: Playlist,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping () -> Void
-    ) {
-        let resource = resource(baseURL: account.instance.apiURL, path: "user/playlists/delete")
-        let body = ["playlistId": playlist.id]
-
-        resource
-            .request(.post, json: body)
-            .onSuccess { _ in onSuccess() }
-            .onFailure(onFailure)
-    }
-
     func comments(_ id: Video.ID, page: String?) -> Resource? {
         let path = page.isNil ? "comments/\(id)" : "nextpage/comments/\(id)"
         let resource = resource(baseURL: account.url, path: path)
@@ -364,7 +284,7 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
         }
         return ChannelPlaylist(
             id: id,
-            title: details["name"]?.stringValue ?? "",
+            title: details["name"]!.stringValue,
             thumbnailURL: thumbnailURL,
             channel: extractChannel(from: json)!,
             videos: videos,
@@ -394,7 +314,6 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
 
         let author = details["uploaderName"]?.stringValue ?? details["uploader"]!.stringValue
         let authorThumbnailURL = details["avatarUrl"]?.url ?? details["uploaderAvatar"]?.url ?? details["avatar"]?.url
-        let subscriptionsCount = details["uploaderSubscriberCount"]?.int
 
         let uploaded = details["uploaded"]?.doubleValue
         var published = uploaded.isNil ? nil : (uploaded! / 1000).formattedAsRelativeTime()
@@ -412,7 +331,7 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
             published: published!,
             views: details["views"]!.intValue,
             description: extractDescription(from: content),
-            channel: Channel(id: channelId, name: author, thumbnailURL: authorThumbnailURL, subscriptionsCount: subscriptionsCount),
+            channel: Channel(id: channelId, name: author, thumbnailURL: authorThumbnailURL),
             thumbnails: thumbnails,
             live: live,
             likes: details["likes"]?.int,
@@ -444,14 +363,6 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
         )!
     }
 
-    private func extractUserPlaylist(from json: JSON) -> Playlist? {
-        let id = json["id"].stringValue
-        let title = json["name"].stringValue
-        let visibility = Playlist.Visibility.private
-
-        return Playlist(id: id, title: title, visibility: visibility)
-    }
-
     private func extractDescription(from content: JSON) -> String? {
         guard var description = content.dictionaryValue["description"]?.string else {
             return nil

Model/Applications/VideosAPI.swift

@@ -27,34 +27,6 @@ protocol VideosAPI {
     func playlistVideo(_ playlistID: String, _ videoID: String) -> Resource?
     func playlistVideos(_ id: String) -> Resource?
 
-    func addVideoToPlaylist(
-        _ videoID: String,
-        _ playlistID: String,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping () -> Void
-    )
-
-    func removeVideoFromPlaylist(
-        _ index: String,
-        _ playlistID: String,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping () -> Void
-    )
-
-    func playlistForm(
-        _ name: String,
-        _ visibility: String,
-        playlist: Playlist?,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping (Playlist?) -> Void
-    )
-
-    func deletePlaylist(
-        _ playlist: Playlist,
-        onFailure: @escaping (RequestError) -> Void,
-        onSuccess: @escaping () -> Void
-    )
-
     func channelPlaylist(_ id: String) -> Resource?
 
     func loadDetails(_ item: PlayerQueueItem, completionHandler: @escaping (PlayerQueueItem) -> Void)

Model/Applications/VideosApp.swift

@@ -32,18 +32,6 @@ enum VideosApp: String, CaseIterable {
     }
 
     var supportsUserPlaylists: Bool {
-        true
-    }
-
-    var userPlaylistsEndpointIncludesVideos: Bool {
-        self == .invidious
-    }
-
-    var userPlaylistsHaveVisibility: Bool {
-        self == .invidious
-    }
-
-    var userPlaylistsAreEditable: Bool {
         self == .invidious
     }
 

Model/NavigationModel.swift

@@ -74,10 +74,6 @@ final class NavigationModel: ObservableObject {
         navigationStyle: NavigationStyle,
         delay: Bool = true
     ) {
-        guard channel.id != Video.fixtureChannelID else {
-            return
-        }
-
         let recent = RecentItem(from: channel)
         #if os(macOS)
             Windows.main.open()

Model/Player/Backends/AVPlayerBackend.swift

@@ -36,9 +36,8 @@ final class AVPlayerBackend: PlayerBackend {
     }
 
     private(set) var avPlayer = AVPlayer()
+
     var controller: AppleAVPlayerViewController?
-    var startPictureInPictureOnPlay = false
-    var switchToMPVOnPipClose = false
 
     private var asset: AVURLAsset?
     private var composition = AVMutableComposition()
@@ -323,8 +322,6 @@ final class AVPlayerBackend: PlayerBackend {
                     }
                 }
             }
-
-            self.setRate(self.model.currentRate)
         }
 
         let replaceItemAndSeek = {
@@ -444,7 +441,7 @@ final class AVPlayerBackend: PlayerBackend {
             self,
             selector: #selector(itemDidPlayToEndTime),
             name: NSNotification.Name.AVPlayerItemDidPlayToEndTime,
-            object: model.playerItem
+            object: playerItem
         )
     }
 
@@ -452,7 +449,7 @@ final class AVPlayerBackend: PlayerBackend {
         NotificationCenter.default.removeObserver(
             self,
             name: NSNotification.Name.AVPlayerItemDidPlayToEndTime,
-            object: model.playerItem
+            object: playerItem
         )
     }
 
@@ -472,9 +469,6 @@ final class AVPlayerBackend: PlayerBackend {
                 model.hide()
             #endif
         } else {
-            if model.playingInPictureInPicture {
-                startPictureInPictureOnPlay = true
-            }
             model.advanceToNextItem()
         }
     }
@@ -541,26 +535,13 @@ final class AVPlayerBackend: PlayerBackend {
             }
 
             if player.timeControlStatus != .waitingToPlayAtSpecifiedRate {
-                if let controller = self.model.pipController {
-                    if controller.isPictureInPicturePossible {
-                        if self.startPictureInPictureOnPlay {
-                            self.startPictureInPictureOnPlay = false
-                            DispatchQueue.main.async {
-                                self.model.pipController?.startPictureInPicture()
-                            }
-                        }
-                    }
-                }
-
                 DispatchQueue.main.async { [weak self] in
                     self?.model.objectWillChange.send()
                 }
             }
 
-            if player.timeControlStatus == .playing {
-                if player.rate != self.model.currentRate {
-                    player.rate = self.model.currentRate
-                }
+            if player.timeControlStatus == .playing, player.rate != self.model.currentRate {
+                player.rate = self.model.currentRate
             }
 
             #if os(macOS)

Model/Player/Backends/MPVBackend.swift

@@ -41,9 +41,7 @@ final class MPVBackend: PlayerBackend {
         updateControlsIsPlaying()
 
         #if !os(macOS)
-            DispatchQueue.main.async {
-                UIApplication.shared.isIdleTimerDisabled = self.model.presentingPlayer && self.isPlaying
-            }
+            UIApplication.shared.isIdleTimerDisabled = model.presentingPlayer && isPlaying
         #endif
     }}
     var playerItemDuration: CMTime?
@@ -69,33 +67,16 @@ final class MPVBackend: PlayerBackend {
         clientTimer.eventHandler = getClientUpdates
     }
 
-    typealias AreInIncreasingOrder = (Stream, Stream) -> Bool
-
     func bestPlayable(_ streams: [Stream], maxResolution: ResolutionSetting) -> Stream? {
         streams
-            .filter { $0.kind != .hls && $0.resolution <= maxResolution.value }
-            .max { lhs, rhs in
-                let predicates: [AreInIncreasingOrder] = [
-                    { $0.resolution < $1.resolution },
-                    { $0.format > $1.format }
-                ]
-
-                for predicate in predicates {
-                    if !predicate(lhs, rhs), !predicate(rhs, lhs) {
-                        continue
-                    }
-
-                    return predicate(lhs, rhs)
-                }
-
-                return false
-            } ??
+            .filter { $0.kind == .adaptive && $0.resolution <= maxResolution.value }
+            .max { $0.resolution < $1.resolution } ??
             streams.first { $0.kind == .hls } ??
             streams.first
     }
 
     func canPlay(_ stream: Stream) -> Bool {
-        stream.resolution != .unknown && stream.format != .av1
+        stream.resolution != .unknown && stream.format != "AV1"
     }
 
     func playStream(_ stream: Stream, of video: Video, preservingTime: Bool, upgrading _: Bool) {
@@ -128,7 +109,7 @@ final class MPVBackend: PlayerBackend {
 
                 if !preservingTime,
                    let segment = self.model.sponsorBlock.segments.first,
-                   segment.start > 4,
+                   segment.start < 3,
                    self.model.lastSkipped.isNil
                 {
                     self.seek(to: segment.endTime) { finished in
@@ -201,8 +182,6 @@ final class MPVBackend: PlayerBackend {
             startControlsUpdates()
         }
 
-        setRate(model.currentRate)
-
         client?.play()
     }
 
@@ -237,8 +216,8 @@ final class MPVBackend: PlayerBackend {
         }
     }
 
-    func setRate(_ rate: Float) {
-        client?.setDoubleAsync("speed", Double(rate))
+    func setRate(_: Float) {
+        // TODO: Implement rate change
     }
 
     func closeItem() {}
@@ -271,8 +250,6 @@ final class MPVBackend: PlayerBackend {
         clientTimer.resume()
     }
 
-    private var handleSegmentsThrottle = Throttle(interval: 1)
-
     private func getClientUpdates() {
         self.logger.info("getting client updates")
 
@@ -285,10 +262,8 @@ final class MPVBackend: PlayerBackend {
 
         model.updateNowPlayingInfo()
 
-        handleSegmentsThrottle.execute {
-            if let currentTime = currentTime {
-                model.handleSegments(at: currentTime)
-            }
+        if let currentTime = currentTime {
+            model.handleSegments(at: currentTime)
         }
 
         timeObserverThrottle.execute {

Model/Player/Backends/MPVClient.swift

@@ -225,11 +225,6 @@ final class MPVClient: ObservableObject {
         mpv_set_property_async(mpv, 0, name, MPV_FORMAT_FLAG, &data)
     }
 
-    func setDoubleAsync(_ name: String, _ value: Double) {
-        var data = value
-        mpv_set_property_async(mpv, 0, name, MPV_FORMAT_DOUBLE, &data)
-    }
-
     private func getDouble(_ name: String) -> Double {
         var data = Double()
         mpv_get_property(mpv, name, MPV_FORMAT_DOUBLE, &data)

Model/Player/PiPDelegate.swift

@@ -1,42 +0,0 @@
-import AVKit
-import Foundation
-
-final class PiPDelegate: NSObject, AVPictureInPictureControllerDelegate {
-    var player: PlayerModel!
-
-    func pictureInPictureController(
-        _: AVPictureInPictureController,
-        failedToStartPictureInPictureWithError error: Error
-    ) {
-        print(error.localizedDescription)
-    }
-
-    func pictureInPictureControllerWillStartPictureInPicture(_: AVPictureInPictureController) {}
-
-    func pictureInPictureControllerDidStartPictureInPicture(_: AVPictureInPictureController) {
-        player?.playingInPictureInPicture = true
-        player?.avPlayerBackend.startPictureInPictureOnPlay = false
-    }
-
-    func pictureInPictureControllerDidStopPictureInPicture(_: AVPictureInPictureController) {
-        if player?.avPlayerBackend.switchToMPVOnPipClose ?? false {
-            DispatchQueue.main.async { [weak player] in
-                player?.avPlayerBackend.switchToMPVOnPipClose = false
-                player?.saveTime { [weak player] in
-                    player?.changeActiveBackend(from: .appleAVPlayer, to: .mpv)
-                }
-            }
-        }
-
-        player?.playingInPictureInPicture = false
-    }
-
-    func pictureInPictureControllerWillStopPictureInPicture(_: AVPictureInPictureController) {}
-
-    func pictureInPictureController(
-        _: AVPictureInPictureController,
-        restoreUserInterfaceForPictureInPictureStopWithCompletionHandler completionHandler: @escaping (Bool) -> Void
-    ) {
-        completionHandler(true)
-    }
-}

Model/Player/PlayerControlsModel.swift

@@ -3,7 +3,7 @@ import Foundation
 import SwiftUI
 
 final class PlayerControlsModel: ObservableObject {
-    @Published var isLoadingVideo = false
+    @Published var isLoadingVideo = true
     @Published var isPlaying = true
     @Published var currentTime = CMTime.zero
     @Published var duration = CMTime.zero

Model/Player/PlayerModel.swift

@@ -66,6 +66,8 @@ final class PlayerModel: ObservableObject {
 
     @Published var returnYouTubeDislike = ReturnYouTubeDislikeAPI()
 
+    @Published var channelWithDetails: Channel?
+
     #if os(iOS)
         @Published var motionManager: CMMotionManager!
         @Published var lockedOrientation: UIInterfaceOrientation?
@@ -83,8 +85,6 @@ final class PlayerModel: ObservableObject {
     var context: NSManagedObjectContext = PersistenceController.shared.container.viewContext
 
     @Published var playingInPictureInPicture = false
-    var pipController: AVPictureInPictureController?
-    var pipDelegate = PiPDelegate()
 
     @Published var presentingErrorDetails = false
     var playerError: Error? { didSet {
@@ -104,9 +104,6 @@ final class PlayerModel: ObservableObject {
     #endif
 
     private var currentArtwork: MPMediaItemArtwork?
-    #if !os(macOS)
-        var playerLayerView: PlayerLayerView!
-    #endif
 
     init(accounts: AccountsModel? = nil, comments: CommentsModel? = nil, controls: PlayerControlsModel? = nil) {
         self.accounts = accounts ?? AccountsModel()
@@ -206,7 +203,7 @@ final class PlayerModel: ObservableObject {
         backend.pause()
     }
 
-    func play(_ video: Video, at time: CMTime? = nil, inNavigationView: Bool = false) {
+    func play(_ video: Video, at time: TimeInterval? = nil, inNavigationView: Bool = false) {
         playNow(video, at: time)
 
         guard !playingInPictureInPicture else {
@@ -234,7 +231,11 @@ final class PlayerModel: ObservableObject {
                 self?.sponsorBlock.loadSegments(
                     videoID: video.videoID,
                     categories: Defaults[.sponsorBlockCategories]
-                )
+                ) {
+                    if Defaults[.showChannelSubscribers] {
+                        self?.loadCurrentItemChannelDetails()
+                    }
+                }
 
                 guard Defaults[.enableReturnYouTubeDislike] else {
                     return
@@ -379,6 +380,36 @@ final class PlayerModel: ObservableObject {
         [activeBackend == PlayerBackendType.mpv ? avPlayerBackend : mpvBackend]
     }
 
+    func loadCurrentItemChannelDetails() {
+        guard let video = currentVideo,
+              !video.channel.detailsLoaded
+        else {
+            return
+        }
+
+        if restoreLoadedChannel() {
+            return
+        }
+
+        accounts.api.channel(video.channel.id).load().onSuccess { [weak self] response in
+            if let channel: Channel = response.typedContent() {
+                self?.channelWithDetails = channel
+                withAnimation {
+                    self?.currentItem?.video?.channel = channel
+                }
+            }
+        }
+    }
+
+    @discardableResult func restoreLoadedChannel() -> Bool {
+        if !currentVideo.isNil, channelWithDetails?.id == currentVideo!.channel.id {
+            currentItem.video.channel = channelWithDetails!
+            return true
+        }
+
+        return false
+    }
+
     func rateLabel(_ rate: Float) -> String {
         let formatter = NumberFormatter()
         formatter.minimumFractionDigits = 0

Model/Player/PlayerQueue.swift

@@ -42,7 +42,7 @@ extension PlayerModel {
         }
     }
 
-    func playNow(_ video: Video, at time: CMTime? = nil) {
+    func playNow(_ video: Video, at time: TimeInterval? = nil) {
         if playingInPictureInPicture, closePiPOnNavigation {
             closePiP()
         }
@@ -54,7 +54,7 @@ extension PlayerModel {
         }
     }
 
-    func playItem(_ item: PlayerQueueItem, video: Video? = nil, at time: CMTime? = nil) {
+    func playItem(_ item: PlayerQueueItem, video: Video? = nil, at time: TimeInterval? = nil) {
         if !playingInPictureInPicture {
             backend.closeItem()
         }
@@ -64,7 +64,7 @@ extension PlayerModel {
         currentItem = item
 
         if !time.isNil {
-            currentItem.playbackTime = time
+            currentItem.playbackTime = .secondsInDefaultTimescale(time!)
         } else if currentItem.playbackTime.isNil {
             currentItem.playbackTime = .zero
         }
@@ -74,6 +74,7 @@ extension PlayerModel {
         }
 
         preservedTime = currentItem.playbackTime
+        restoreLoadedChannel()
 
         DispatchQueue.main.async { [weak self] in
             guard let video = self?.currentVideo else {
@@ -105,12 +106,13 @@ extension PlayerModel {
         }
     }
 
-    func advanceToItem(_ newItem: PlayerQueueItem, at time: CMTime? = nil) {
+    func advanceToItem(_ newItem: PlayerQueueItem, at time: TimeInterval? = nil) {
         prepareCurrentItemForHistory()
 
         remove(newItem)
 
         currentItem = newItem
+        pause()
 
         accounts.api.loadDetails(newItem) { newItem in
             self.playItem(newItem, video: newItem.video, at: time)
@@ -151,6 +153,7 @@ extension PlayerModel {
         if play {
             currentItem = item
             // pause playing current video as it's going to be replaced with next one
+            pause()
         }
 
         queue.insert(item, at: prepending ? 0 : queue.endIndex)
@@ -175,8 +178,8 @@ extension PlayerModel {
         }
     }
 
-    func playHistory(_ item: PlayerQueueItem, at time: CMTime? = nil) {
-        var time = time ?? item.playbackTime
+    func playHistory(_ item: PlayerQueueItem) {
+        var time = item.playbackTime
 
         if item.shouldRestartPlaying {
             time = .zero
@@ -196,17 +199,8 @@ extension PlayerModel {
             return
         }
 
-        var restoredQueue = [PlayerQueueItem?]()
-
-        if let lastPlayed = Defaults[.lastPlayed],
-           !Defaults[.queue].contains(where: { $0.videoID == lastPlayed.videoID })
-        {
-            restoredQueue.append(lastPlayed)
-            Defaults[.lastPlayed] = nil
-        }
-
-        restoredQueue.append(contentsOf: Defaults[.queue])
-        queue = restoredQueue.compactMap { $0 }
+        queue = ([Defaults[.lastPlayed]] + Defaults[.queue]).compactMap { $0 }
+        Defaults[.lastPlayed] = nil
 
         queue.forEach { item in
             accounts.api.loadDetails(item) { newItem in

Model/Player/PlayerSponsorBlock.swift

@@ -50,8 +50,7 @@ extension PlayerModel {
     private func shouldSkip(_ segment: Segment, at time: CMTime) -> Bool {
         guard isPlaying,
               !restoredSegments.contains(segment),
-              Defaults[.sponsorBlockCategories].contains(segment.category),
-              segment.start > 4
+              Defaults[.sponsorBlockCategories].contains(segment.category)
         else {
             return false
         }

Model/Playlist.swift

@@ -18,11 +18,11 @@ struct Playlist: Identifiable, Equatable, Hashable {
     var title: String
     var visibility: Visibility
 
-    var updated: TimeInterval?
+    var updated: TimeInterval
 
     var videos = [Video]()
 
-    init(id: String, title: String, visibility: Visibility, updated: TimeInterval? = nil, videos: [Video] = []) {
+    init(id: String, title: String, visibility: Visibility, updated: TimeInterval, videos: [Video] = []) {
         self.id = id
         self.title = title
         self.visibility = visibility

Model/PlaylistsModel.swift

@@ -4,7 +4,6 @@ import SwiftUI
 
 final class PlaylistsModel: ObservableObject {
     @Published var playlists = [Playlist]()
-    @Published var reloadPlaylists = false
 
     var accounts = AccountsModel()
 
@@ -59,20 +58,24 @@ final class PlaylistsModel: ObservableObject {
         onSuccess: @escaping () -> Void = {},
         onFailure: @escaping (RequestError) -> Void = { _ in }
     ) {
-        accounts.api.addVideoToPlaylist(videoID, playlistID, onFailure: onFailure) {
-            self.load(force: true) {
-                self.reloadPlaylists.toggle()
+        let resource = accounts.api.playlistVideos(playlistID)
+        let body = ["videoId": videoID]
+
+        resource?
+            .request(.post, json: body)
+            .onSuccess { _ in
+                self.load(force: true)
                 onSuccess()
             }
-        }
+            .onFailure(onFailure)
     }
 
-    func removeVideo(index: String, playlistID: Playlist.ID, onSuccess: @escaping () -> Void = {}) {
-        accounts.api.removeVideoFromPlaylist(index, playlistID, onFailure: { _ in }) {
-            self.load(force: true) {
-                self.reloadPlaylists.toggle()
-                onSuccess()
-            }
+    func removeVideo(videoIndexID: String, playlistID: Playlist.ID, onSuccess: @escaping () -> Void = {}) {
+        let resource = accounts.api.playlistVideo(playlistID, videoIndexID)
+
+        resource?.request(.delete).onSuccess { _ in
+            self.load(force: true)
+            onSuccess()
         }
     }
 

Model/SponsorBlock/SponsorBlockAPI.swift

@@ -13,7 +13,7 @@ final class SponsorBlockAPI: ObservableObject {
     @Published var segments = [Segment]()
 
     static func categoryDescription(_ name: String) -> String? {
-        guard Self.categories.contains(name) else {
+        guard SponsorBlockAPI.categories.contains(name) else {
             return nil
         }
 
@@ -30,7 +30,7 @@ final class SponsorBlockAPI: ObservableObject {
     }
 
     static func categoryDetails(_ name: String) -> String? {
-        guard Self.categories.contains(name) else {
+        guard SponsorBlockAPI.categories.contains(name) else {
             return nil
         }
 

Model/Stream.swift

@@ -5,23 +5,12 @@ import Foundation
 // swiftlint:disable:next final_class
 class Stream: Equatable, Hashable, Identifiable {
     enum Resolution: String, CaseIterable, Comparable, Defaults.Serializable {
-        case hd4320p60
-        case hd4320p
-        case hd2160p60
-        case hd2160p50
-        case hd2160p48
         case hd2160p
         case hd1440p60
-        case hd1440p50
-        case hd1440p48
         case hd1440p
         case hd1080p60
-        case hd1080p50
-        case hd1080p48
         case hd1080p
         case hd720p60
-        case hd720p50
-        case hd720p48
         case hd720p
         case sd480p
         case sd360p
@@ -79,49 +68,6 @@ class Stream: Equatable, Hashable, Identifiable {
         }
     }
 
-    enum Format: String, Comparable {
-        case webm
-        case avc1
-        case av1
-        case mp4
-        case unknown
-
-        private var sortOrder: Int {
-            switch self {
-            case .webm:
-                return 0
-            case .mp4:
-                return 1
-            case .avc1:
-                return 2
-            case .av1:
-                return 3
-            case .unknown:
-                return 4
-            }
-        }
-
-        static func < (lhs: Self, rhs: Self) -> Bool {
-            lhs.sortOrder < rhs.sortOrder
-        }
-
-        static func from(_ string: String) -> Self {
-            let lowercased = string.lowercased()
-
-            if lowercased.contains("webm") {
-                return .webm
-            } else if lowercased.contains("avc1") {
-                return .avc1
-            } else if lowercased.contains("av01") {
-                return .av1
-            } else if lowercased.contains("mpeg_4") || lowercased.contains("mp4") {
-                return .mp4
-            } else {
-                return .unknown
-            }
-        }
-    }
-
     let id = UUID()
 
     var instance: Instance!
@@ -131,7 +77,6 @@ class Stream: Equatable, Hashable, Identifiable {
 
     var resolution: Resolution!
     var kind: Kind!
-    var format: Format!
 
     var encoding: String!
     var videoFormat: String!
@@ -153,7 +98,7 @@ class Stream: Equatable, Hashable, Identifiable {
         self.resolution = resolution
         self.kind = kind
         self.encoding = encoding
-        format = .from(videoFormat ?? "")
+        self.videoFormat = videoFormat
     }
 
     var quality: String {
@@ -164,8 +109,23 @@ class Stream: Equatable, Hashable, Identifiable {
         return kind == .hls ? "adaptive (HLS)" : "\(resolution.name)\(kind == .stream ? " (\(kind.rawValue))" : "")"
     }
 
+    var format: String {
+        let lowercasedFormat = (videoFormat ?? "unknown").lowercased()
+        if lowercasedFormat.contains("webm") {
+            return "WEBM"
+        } else if lowercasedFormat.contains("avc1") {
+            return "avc1"
+        } else if lowercasedFormat.contains("av01") {
+            return "AV1"
+        } else if lowercasedFormat.contains("mpeg_4") || lowercasedFormat.contains("mp4") {
+            return "MP4"
+        } else {
+            return lowercasedFormat
+        }
+    }
+
     var description: String {
-        let formatString = format == .unknown ? "" : " (\(format.rawValue))"
+        let formatString = format == "unknown" ? "" : " (\(format))"
         return "\(quality)\(formatString) - \(instance?.description ?? "")"
     }
 

Model/Video.swift

@@ -17,7 +17,7 @@ struct Video: Identifiable, Equatable, Hashable {
     var genre: String?
 
     // index used when in the Playlist
-    var indexID: String?
+    let indexID: String?
 
     var live: Bool
     var upcoming: Bool

README.md

@@ -30,7 +30,7 @@ You can leave your feedback in [discussion on v1.4 release](https://github.com/y
 | User Accounts | ✅ | ✅ |
 | Subscriptions | ✅ | ✅ |
 | Popular | ✅ | 🔴 |
-| User Playlists | ✅ | ✅ |
+| User Playlists | ✅ | 🔴 |
 | Trending | ✅ | ✅ |
 | Channels | ✅ | ✅ |
 | Channel Playlists | ✅ | ✅ |

Shared/Defaults.swift

@@ -51,6 +51,7 @@ extension Defaults.Keys {
     static let playerInstanceID = Key<Instance.ID?>("playerInstance")
     static let showKeywords = Key<Bool>("showKeywords", default: false)
     static let showHistoryInPlayer = Key<Bool>("showHistoryInPlayer", default: false)
+    static let showChannelSubscribers = Key<Bool>("showChannelSubscribers", default: true)
     static let commentsInstanceID = Key<Instance.ID?>("commentsInstance", default: kavinPipedInstanceID)
     #if !os(tvOS)
         static let commentsPlacement = Key<CommentsPlacement>("commentsPlacement", default: .separate)
@@ -96,9 +97,6 @@ extension Defaults.Keys {
 
 enum ResolutionSetting: String, CaseIterable, Defaults.Serializable {
     case best
-    case hd4320p60
-    case hd4320p
-    case hd2160p60
     case hd2160p
     case hd1440p60
     case hd1440p
@@ -114,7 +112,7 @@ enum ResolutionSetting: String, CaseIterable, Defaults.Serializable {
     var value: Stream.Resolution {
         switch self {
         case .best:
-            return .hd4320p60
+            return .hd2160p
         default:
             return Stream.Resolution(rawValue: rawValue)!
         }
@@ -124,14 +122,8 @@ enum ResolutionSetting: String, CaseIterable, Defaults.Serializable {
         switch self {
         case .best:
             return "Best available quality"
-        case .hd4320p60:
-            return "8K, 60fps"
-        case .hd4320p:
-            return "8K"
-        case .hd2160p60:
-            return "4K, 60fps"
         case .hd2160p:
-            return "4K"
+            return "4K, 60fps"
         default:
             return value.name
         }

Shared/Navigation/AppSidebarPlaylists.swift

@@ -11,7 +11,9 @@ struct AppSidebarPlaylists: View {
                 NavigationLink(tag: TabSelection.playlist(playlist.id), selection: $navigation.tabSelection) {
                     LazyView(PlaylistVideosView(playlist))
                 } label: {
-                    playlistLabel(playlist)
+                    Label(playlist.title, systemImage: RecentsModel.symbolSystemImage(playlist.title))
+                        .backport
+                        .badge(Text("\(playlist.videos.count)"))
                 }
                 .id(playlist.id)
                 .contextMenu {
@@ -32,18 +34,6 @@ struct AppSidebarPlaylists: View {
         }
     }
 
-    @ViewBuilder func playlistLabel(_ playlist: Playlist) -> some View {
-        let label = Label(playlist.title, systemImage: RecentsModel.symbolSystemImage(playlist.title))
-
-        if player.accounts.app.userPlaylistsEndpointIncludesVideos {
-            label
-                .backport
-                .badge(Text("\(playlist.videos.count)"))
-        } else {
-            label
-        }
-    }
-
     var newPlaylistButton: some View {
         Button(action: { navigation.presentNewPlaylistForm() }) {
             Label("New Playlist", systemImage: "plus.circle")

Shared/Player/AppleAVPlayerView.swift

@@ -1,14 +1,25 @@
-import AVKit
 import Defaults
 import SwiftUI
 
-struct AppleAVPlayerView: UIViewRepresentable {
+struct AppleAVPlayerView: UIViewControllerRepresentable {
+    @EnvironmentObject<CommentsModel> private var comments
+    @EnvironmentObject<NavigationModel> private var navigation
     @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<SubscriptionsModel> private var subscriptions
 
-    func makeUIView(context _: Context) -> some UIView {
-        player.playerLayerView = PlayerLayerView(frame: .zero)
-        return player.playerLayerView
+    func makeUIViewController(context _: Context) -> UIViewController {
+        let controller = AppleAVPlayerViewController()
+
+        controller.commentsModel = comments
+        controller.navigationModel = navigation
+        controller.playerModel = player
+        controller.subscriptionsModel = subscriptions
+        player.avPlayerBackend.controller = controller
+
+        return controller
     }
 
-    func updateUIView(_: UIViewType, context _: Context) {}
+    func updateUIViewController(_: UIViewController, context _: Context) {
+        player.rebuildTVMenu()
+    }
 }

Shared/Player/Controls/PlayerControls.swift

@@ -29,18 +29,14 @@ struct PlayerControls: View {
             ZStack(alignment: .bottom) {
                 VStack(spacing: 0) {
                     Group {
-                        HStack {
-                            statusBar
-                                .padding(3)
-                            #if os(macOS)
-                                .background(VisualEffectBlur(material: .hudWindow))
-                            #elseif os(iOS)
-                                .background(VisualEffectBlur(blurStyle: .systemThinMaterial))
-                            #endif
-                                .mask(RoundedRectangle(cornerRadius: 3))
-
-                            Spacer()
-                        }
+                        statusBar
+                            .padding(3)
+                        #if os(macOS)
+                            .background(VisualEffectBlur(material: .hudWindow))
+                        #elseif os(iOS)
+                            .background(VisualEffectBlur(blurStyle: .systemThinMaterial))
+                        #endif
+                            .mask(RoundedRectangle(cornerRadius: 3))
 
                         buttonsBar
                             .padding(.top, 4)
@@ -79,11 +75,18 @@ struct PlayerControls: View {
             model.resetTimer()
         }
         #else
-                .background(PlayerGestures())
+                .background(controlsBackground)
         #endif
                 .environment(\.colorScheme, .dark)
     }
 
+    #if !os(tvOS)
+        var controlsBackground: some View {
+            PlayerGestures()
+                .background(Color.black.opacity(model.presentingControls ? 0.5 : 0))
+        }
+    #endif
+
     var timeline: some View {
         TimelineView(duration: durationBinding, current: currentTimeBinding, cornerRadius: 0)
     }
@@ -109,7 +112,7 @@ struct PlayerControls: View {
             #endif
             Text(playbackStatus)
 
-            Text("•")
+            Spacer()
 
             #if !os(tvOS)
                 ToggleBackendButton()
@@ -117,7 +120,7 @@ struct PlayerControls: View {
 
                 StreamControl()
                 #if os(macOS)
-                    .frame(maxWidth: 300)
+                    .frame(maxWidth: 160)
                 #endif
             #else
                 Text(player.stream?.description ?? "")
@@ -173,13 +176,8 @@ struct PlayerControls: View {
         HStack {
             #if !os(tvOS)
                 fullscreenButton
-                #if os(iOS)
-                    pipButton
-                #endif
-                rateButton
-
-                Spacer()
             #endif
+            Spacer()
 //            button("Music Mode", systemImage: "music.note")
         }
     }
@@ -196,68 +194,6 @@ struct PlayerControls: View {
         #endif
     }
 
-    @ViewBuilder private var rateButton: some View {
-        #if os(macOS)
-            ratePicker
-                .labelsHidden()
-                .frame(maxWidth: 70)
-        #elseif os(iOS)
-            Menu {
-                ratePicker
-                    .frame(width: 45, height: 30)
-                #if os(iOS)
-                    .background(VisualEffectBlur(blurStyle: .systemThinMaterial))
-                #endif
-                    .mask(RoundedRectangle(cornerRadius: 3))
-            } label: {
-                Text(player.rateLabel(player.currentRate))
-                    .foregroundColor(.primary)
-            }
-            .buttonStyle(.plain)
-            .foregroundColor(.primary)
-            .frame(width: 50, height: 30)
-            #if os(macOS)
-                .background(VisualEffectBlur(material: .hudWindow))
-            #elseif os(iOS)
-                .background(VisualEffectBlur(blurStyle: .systemThinMaterial))
-            #endif
-                .mask(RoundedRectangle(cornerRadius: 3))
-        #endif
-    }
-
-    var ratePicker: some View {
-        Picker("Rate", selection: rateBinding) {
-            ForEach(PlayerModel.availableRates, id: \.self) { rate in
-                Text(player.rateLabel(rate)).tag(rate)
-            }
-        }
-        .transaction { t in t.animation = .none }
-    }
-
-    private var rateBinding: Binding<Float> {
-        .init(get: { player.currentRate }, set: { rate in player.currentRate = rate })
-    }
-
-    private var pipButton: some View {
-        button("PiP", systemImage: "pip") {
-            if player.activeBackend == .mpv {
-                player.avPlayerBackend.switchToMPVOnPipClose = true
-            }
-
-            if player.activeBackend != PlayerBackendType.appleAVPlayer {
-                player.saveTime {
-                    player.changeActiveBackend(from: .mpv, to: .appleAVPlayer)
-                }
-            }
-
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
-                print(player.pipController?.isPictureInPicturePossible ?? false ? "possible" : "NOT possible")
-                player.avPlayerBackend.startPictureInPictureOnPlay = true
-                player.pipController?.startPictureInPicture()
-            }
-        }
-    }
-
     var mediumButtonsBar: some View {
         HStack {
             #if !os(tvOS)

Shared/Player/PlayerLayerView.swift

@@ -1,23 +0,0 @@
-import AVFoundation
-import Foundation
-import UIKit
-
-final class PlayerLayerView: UIView {
-    var playerLayer = AVPlayerLayer()
-
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-
-        layer.addSublayer(playerLayer)
-    }
-
-    @available(*, unavailable)
-    required init?(coder _: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        playerLayer.frame = bounds
-    }
-}

Shared/Player/PlayerQueueRow.swift

@@ -1,4 +1,3 @@
-import CoreMedia
 import Defaults
 import Foundation
 import SwiftUI
@@ -12,30 +11,15 @@ struct PlayerQueueRow: View {
 
     @Default(.closePiPOnNavigation) var closePiPOnNavigation
 
-    @FetchRequest private var watchRequest: FetchedResults<Watch>
-
-    init(item: PlayerQueueItem, history: Bool = false, fullScreen: Binding<Bool> = .constant(false)) {
-        self.item = item
-        self.history = history
-        _fullScreen = fullScreen
-        _watchRequest = FetchRequest<Watch>(
-            entity: Watch.entity(),
-            sortDescriptors: [],
-            predicate: NSPredicate(format: "videoID = %@", item.videoID)
-        )
-    }
-
     var body: some View {
         Group {
             Button {
                 player.prepareCurrentItemForHistory()
 
-                player.avPlayerBackend.startPictureInPictureOnPlay = player.playingInPictureInPicture
-
                 if history {
-                    player.playHistory(item, at: watchStoppedAt)
+                    player.playHistory(item)
                 } else {
-                    player.advanceToItem(item, at: watchStoppedAt)
+                    player.advanceToItem(item)
                 }
 
                 if fullScreen {
@@ -48,21 +32,9 @@ struct PlayerQueueRow: View {
                     player.closePiP()
                 }
             } label: {
-                VideoBanner(video: item.video, playbackTime: watchStoppedAt, videoDuration: watch?.videoDuration)
+                VideoBanner(video: item.video, playbackTime: item.playbackTime, videoDuration: item.videoDuration)
             }
             .buttonStyle(.plain)
         }
     }
-
-    private var watch: Watch? {
-        watchRequest.first
-    }
-
-    private var watchStoppedAt: CMTime? {
-        guard let seconds = watch?.stoppedAt else {
-            return nil
-        }
-
-        return .secondsInDefaultTimescale(seconds)
-    }
 }

Shared/Player/StreamControl.swift

@@ -15,7 +15,7 @@ struct StreamControl: View {
                             Section(header: Text(instance.longDescription)) {
                                 ForEach(kinds, id: \.self) { key in
                                     ForEach(instanceStreams[key] ?? []) { stream in
-                                        Text(stream.description).tag(Stream?.some(stream))
+                                        Text(stream.quality).tag(Stream?.some(stream))
                                     }
 
                                     if kinds.count > 1 {

Shared/Player/VideoDetails.swift

@@ -30,6 +30,7 @@ struct VideoDetails: View {
     @EnvironmentObject<RecentsModel> private var recents
     @EnvironmentObject<SubscriptionsModel> private var subscriptions
 
+    @Default(.showChannelSubscribers) private var showChannelSubscribers
     @Default(.showKeywords) private var showKeywords
 
     init(
@@ -203,13 +204,15 @@ struct VideoDetails: View {
                                     .font(.system(size: 14))
                                     .bold()
 
-                                Group {
-                                    if let subscribers = video!.channel.subscriptionsString {
-                                        Text("\(subscribers) subscribers")
+                                if showChannelSubscribers {
+                                    Group {
+                                        if let subscribers = video!.channel.subscriptionsString {
+                                            Text("\(subscribers) subscribers")
+                                        }
                                     }
+                                    .foregroundColor(.secondary)
+                                    .font(.caption2)
                                 }
-                                .foregroundColor(.secondary)
-                                .font(.caption2)
                             }
                         }
                     }

Shared/Player/VideoDetailsPaddingModifier.swift

@@ -26,7 +26,7 @@ struct VideoDetailsPaddingModifier: ViewModifier {
         self.geometry = geometry
         self.aspectRatio = aspectRatio ?? VideoPlayerView.defaultAspectRatio
         self.minimumHeightLeft = minimumHeightLeft ?? VideoPlayerView.defaultMinimumHeightLeft
-        self.additionalPadding = additionalPadding ?? Self.defaultAdditionalDetailsPadding
+        self.additionalPadding = additionalPadding ?? VideoDetailsPaddingModifier.defaultAdditionalDetailsPadding
         self.fullScreen = fullScreen
     }
 

Shared/Player/VideoPlayerView.swift

@@ -226,17 +226,6 @@ struct VideoPlayerView: View {
                     })
             case .appleAVPlayer:
                 player.avPlayerView
-                #if os(iOS)
-                    .onAppear {
-                        player.pipController = .init(playerLayer: player.playerLayerView.playerLayer)
-                        let pipDelegate = PiPDelegate()
-                        pipDelegate.player = player
-
-                        player.pipDelegate = pipDelegate
-                        player.pipController!.delegate = pipDelegate
-                        player.playerLayerView.playerLayer.player = player.avPlayerBackend.avPlayer
-                    }
-                #endif
             }
 
             #if !os(tvOS)
@@ -285,7 +274,7 @@ struct VideoPlayerView: View {
             Spacer()
         }
         .contentShape(Rectangle())
-        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: geometry.size.width / Self.defaultAspectRatio)
+        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: geometry.size.width / VideoPlayerView.defaultAspectRatio)
     }
 
     func pictureInPicturePlaceholder(geometry: GeometryProxy) -> some View {
@@ -314,7 +303,7 @@ struct VideoPlayerView: View {
             }
         }
         .contentShape(Rectangle())
-        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: geometry.size.width / Self.defaultAspectRatio)
+        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: geometry.size.width / VideoPlayerView.defaultAspectRatio)
     }
 
     var sidebarQueue: Bool {

Shared/Playlists/AddToPlaylistView.swift

@@ -9,7 +9,6 @@ struct AddToPlaylistView: View {
 
     @State private var error = ""
     @State private var presentingErrorAlert = false
-    @State private var submitButtonDisabled = false
 
     @Environment(\.colorScheme) private var colorScheme
     @Environment(\.presentationMode) private var presentationMode
@@ -123,7 +122,7 @@ struct AddToPlaylistView: View {
         HStack {
             Spacer()
             Button("Add to Playlist", action: addToPlaylist)
-                .disabled(submitButtonDisabled || selectedPlaylist.isNil)
+                .disabled(selectedPlaylist.isNil)
                 .padding(.top, 30)
                 .alert(isPresented: $presentingErrorAlert) {
                     Alert(
@@ -166,8 +165,6 @@ struct AddToPlaylistView: View {
 
         Defaults[.lastUsedPlaylistID] = id
 
-        submitButtonDisabled = true
-
         model.addVideo(
             playlistID: id,
             videoID: video.videoID,
@@ -177,7 +174,6 @@ struct AddToPlaylistView: View {
             onFailure: { requestError in
                 error = "(\(requestError.httpStatusCode ?? -1)) \(requestError.userMessage)"
                 presentingErrorAlert = true
-                submitButtonDisabled = false
             }
         )
     }

Shared/Playlists/PlaylistFormView.swift

@@ -43,12 +43,9 @@ struct PlaylistFormView: View {
                         TextField("Name", text: $name, onCommit: validate)
                             .frame(maxWidth: 450)
                             .padding(.leading, 10)
-                            .disabled(editing && !accounts.app.userPlaylistsAreEditable)
 
-                        if accounts.app.userPlaylistsHaveVisibility {
-                            visibilityFormItem
-                                .pickerStyle(.segmented)
-                        }
+                        visibilityFormItem
+                            .pickerStyle(.segmented)
                     }
                     #if os(macOS)
                     .padding(.horizontal)
@@ -62,7 +59,7 @@ struct PlaylistFormView: View {
                         Spacer()
 
                         Button("Save", action: submitForm)
-                            .disabled(!valid || (editing && !accounts.app.userPlaylistsAreEditable))
+                            .disabled(!valid)
                             .alert(isPresented: $presentingErrorAlert) {
                                 Alert(
                                     title: Text("Error when accessing playlist"),
@@ -78,7 +75,7 @@ struct PlaylistFormView: View {
                 #if os(iOS)
                 .padding(.vertical)
                 #else
-                .frame(width: 400, height: accounts.app.userPlaylistsHaveVisibility ? 150 : 120)
+                .frame(width: 400, height: 150)
                 #endif
 
             #else
@@ -122,24 +119,20 @@ struct PlaylistFormView: View {
                         .frame(maxWidth: .infinity, alignment: .leading)
 
                     TextField("Playlist Name", text: $name, onCommit: validate)
-                        .disabled(editing && !accounts.app.userPlaylistsAreEditable)
                 }
 
-                if accounts.app.userPlaylistsHaveVisibility {
-                    HStack {
-                        Text("Visibility")
-                            .frame(maxWidth: .infinity, alignment: .leading)
+                HStack {
+                    Text("Visibility")
+                        .frame(maxWidth: .infinity, alignment: .leading)
 
-                        visibilityFormItem
-                    }
-                    .padding(.top, 10)
+                    visibilityFormItem
                 }
+                .padding(.top, 10)
 
                 HStack {
                     Spacer()
 
-                    Button("Save", action: submitForm)
-                        .disabled(!valid || (editing && !accounts.app.userPlaylistsAreEditable))
+                    Button("Save", action: submitForm).disabled(!valid)
                 }
                 .padding(.top, 40)
 
@@ -179,15 +172,27 @@ struct PlaylistFormView: View {
             return
         }
 
-        accounts.api.playlistForm(name, visibility.rawValue, playlist: playlist, onFailure: { error in
-            formError = "(\(error.httpStatusCode ?? -1)) \(error.userMessage)"
-            presentingErrorAlert = true
-        }) { modifiedPlaylist in
-            self.playlist = modifiedPlaylist
-            playlists.load(force: true)
+        let body = ["title": name, "privacy": visibility.rawValue]
 
-            presentationMode.wrappedValue.dismiss()
-        }
+        resource?
+            .request(editing ? .patch : .post, json: body)
+            .onSuccess { response in
+                if let modifiedPlaylist: Playlist = response.typedContent() {
+                    playlist = modifiedPlaylist
+                }
+
+                playlists.load(force: true)
+
+                presentationMode.wrappedValue.dismiss()
+            }
+            .onFailure { error in
+                formError = "(\(error.httpStatusCode ?? -1)) \(error.userMessage)"
+                presentingErrorAlert = true
+            }
+    }
+
+    var resource: Resource? {
+        editing ? accounts.api.playlist(playlist.id) : accounts.api.playlists
     }
 
     var visibilityFormItem: some View {
@@ -231,14 +236,17 @@ struct PlaylistFormView: View {
     }
 
     func deletePlaylistAndDismiss() {
-        accounts.api.deletePlaylist(playlist, onFailure: { error in
-            formError = "(\(error.httpStatusCode ?? -1)) \(error.localizedDescription)"
-            presentingErrorAlert = true
-        }) {
-            playlist = nil
-            playlists.load(force: true)
-            presentationMode.wrappedValue.dismiss()
-        }
+        accounts.api.playlist(playlist.id)?
+            .request(.delete)
+            .onSuccess { _ in
+                playlist = nil
+                playlists.load(force: true)
+                presentationMode.wrappedValue.dismiss()
+            }
+            .onFailure { error in
+                formError = "(\(error.httpStatusCode ?? -1)) \(error.localizedDescription)"
+                presentingErrorAlert = true
+            }
     }
 }
 

Shared/Playlists/PlaylistsView.swift

@@ -11,8 +11,6 @@ struct PlaylistsView: View {
     @State private var showingEditPlaylist = false
     @State private var editedPlaylist: Playlist?
 
-    @StateObject private var store = Store<ChannelPlaylist>()
-
     @EnvironmentObject<AccountsModel> private var accounts
     @EnvironmentObject<PlayerModel> private var player
     @EnvironmentObject<PlaylistsModel> private var model
@@ -20,36 +18,7 @@ struct PlaylistsView: View {
     @Namespace private var focusNamespace
 
     var items: [ContentItem] {
-        var videos = currentPlaylist?.videos ?? []
-
-        if videos.isEmpty {
-            videos = store.item?.videos ?? []
-            if !player.accounts.app.userPlaylistsEndpointIncludesVideos {
-                var i = 0
-
-                for index in videos.indices {
-                    var video = videos[index]
-                    video.indexID = "\(i)"
-                    i += 1
-                    videos[index] = video
-                }
-            }
-        }
-
-        return ContentItem.array(of: videos)
-    }
-
-    private var resource: Resource? {
-        guard !player.accounts.app.userPlaylistsEndpointIncludesVideos,
-              let playlist = currentPlaylist
-        else {
-            return nil
-        }
-
-        let resource = player.accounts.api.playlist(playlist.id)
-        resource?.addObserver(store)
-
-        return resource
+        ContentItem.array(of: currentPlaylist?.videos ?? [])
     }
 
     var body: some View {
@@ -122,12 +91,6 @@ struct PlaylistsView: View {
         .onChange(of: accounts.current) { _ in
             model.load(force: true)
         }
-        .onChange(of: selectedPlaylistID) { _ in
-            resource?.load()
-        }
-        .onChange(of: model.reloadPlaylists) { _ in
-            resource?.load()
-        }
         #if os(tvOS)
         .fullScreenCover(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
             PlaylistFormView(playlist: $createdPlaylist)

Shared/Settings/PlayerSettings.swift

@@ -14,6 +14,7 @@ struct PlayerSettings: View {
     @Default(.playerSidebar) private var playerSidebar
     @Default(.showHistoryInPlayer) private var showHistory
     @Default(.showKeywords) private var showKeywords
+    @Default(.showChannelSubscribers) private var channelSubscribers
     @Default(.pauseOnHidingPlayer) private var pauseOnHidingPlayer
     #if os(iOS)
         @Default(.honorSystemOrientationLock) private var honorSystemOrientationLock
@@ -84,6 +85,7 @@ struct PlayerSettings: View {
 
                 keywordsToggle
                 showHistoryToggle
+                channelSubscribersToggle
                 returnYouTubeDislikeToggle
             }
 
@@ -197,6 +199,10 @@ struct PlayerSettings: View {
         Toggle("Show history", isOn: $showHistory)
     }
 
+    private var channelSubscribersToggle: some View {
+        Toggle("Show subscribers count", isOn: $channelSubscribers)
+    }
+
     private var returnYouTubeDislikeToggle: some View {
         Toggle("Enable Return YouTube Dislike", isOn: $enableReturnYouTubeDislike)
     }

Shared/Settings/SettingsView.swift

@@ -179,7 +179,7 @@ struct SettingsView: View {
             case .browsing:
                 return 350
             case .player:
-                return 450
+                return 470
             case .history:
                 return 480
             case .sponsorBlock:

Shared/Trending/TrendingCountry.swift

@@ -16,9 +16,9 @@ struct TrendingCountry: View {
             #if !os(tvOS)
                 HStack {
                     if #available(iOS 15.0, macOS 12.0, *) {
-                        TextField("Country", text: $query, prompt: Text(Self.prompt))
+                        TextField("Country", text: $query, prompt: Text(TrendingCountry.prompt))
                     } else {
-                        TextField(Self.prompt, text: $query)
+                        TextField(TrendingCountry.prompt, text: $query)
                     }
 
                     Button("Done") { selectCountryAndDismiss() }
@@ -30,7 +30,7 @@ struct TrendingCountry: View {
             countriesList
         }
         #if os(tvOS)
-        .searchable(text: $query, placement: .automatic, prompt: Text(Self.prompt))
+        .searchable(text: $query, placement: .automatic, prompt: Text(TrendingCountry.prompt))
         .background(Color.black)
         #endif
     }

Shared/VideoURLParser.swift

@@ -1,4 +1,3 @@
-import CoreMedia
 import Foundation
 
 struct VideoURLParser {
@@ -12,7 +11,7 @@ struct VideoURLParser {
         return queryItemValue("v")
     }
 
-    var time: CMTime? {
+    var time: TimeInterval? {
         guard let time = queryItemValue("t") else {
             return nil
         }
@@ -25,13 +24,13 @@ struct VideoURLParser {
               let seconds = TimeInterval(timeComponents["seconds"] ?? "0")
         else {
             if let time = TimeInterval(time) {
-                return .secondsInDefaultTimescale(time)
+                return time
             }
 
             return nil
         }
 
-        return .secondsInDefaultTimescale(seconds + (minutes * 60) + (hours * 60 * 60))
+        return seconds + (minutes * 60) + (hours * 60 * 60)
     }
 
     func queryItemValue(_ name: String) -> String? {

Shared/Videos/VideoCell.swift

@@ -1,4 +1,3 @@
-import CoreMedia
 import Defaults
 import SDWebImageSwiftUI
 import SwiftUI
@@ -63,38 +62,34 @@ struct VideoCell: View {
     }
 
     private func playAction() {
-        DispatchQueue.main.async {
-            guard video.videoID != Video.fixtureID else {
-                return
-            }
-
-            if watchingNow {
-                if !player.playingInPictureInPicture {
-                    player.show()
-                }
-
-                if !playNowContinues {
-                    player.backend.seek(to: .zero)
-                }
-
-                player.play()
-
-                return
-            }
-
-            var playAt: CMTime?
-
-            if playNowContinues,
-               !watch.isNil,
-               !watch!.finished
-            {
-                playAt = .secondsInDefaultTimescale(watch!.stoppedAt)
-            }
-
-            player.avPlayerBackend.startPictureInPictureOnPlay = player.playingInPictureInPicture
-
-            player.play(video, at: playAt, inNavigationView: inNavigationView)
+        guard video.videoID != Video.fixtureID else {
+            return
         }
+
+        if watchingNow {
+            if !player.playingInPictureInPicture {
+                player.show()
+            }
+
+            if !playNowContinues {
+                player.backend.seek(to: .zero)
+            }
+
+            player.play()
+
+            return
+        }
+
+        var playAt: TimeInterval?
+
+        if playNowContinues,
+           !watch.isNil,
+           !watch!.finished
+        {
+            playAt = watch!.stoppedAt
+        }
+
+        player.play(video, at: playAt, inNavigationView: inNavigationView)
     }
 
     private var playNowContinues: Bool {

Shared/Views/BrowserPlayerControls.swift

@@ -99,7 +99,7 @@ struct BrowserPlayerControls<Content: View, Toolbar: View>: View {
                             }
                         }
                     }
-                    .disabled(playerControls.isLoadingVideo || model.currentItem.isNil)
+                    .disabled(playerControls.isLoadingVideo)
                     .font(.system(size: 30))
                     .frame(minWidth: 30)
 

Shared/Views/PlaylistVideosView.swift

@@ -6,35 +6,9 @@ struct PlaylistVideosView: View {
 
     @Environment(\.inNavigationView) private var inNavigationView
     @EnvironmentObject<PlayerModel> private var player
-    @EnvironmentObject<PlaylistsModel> private var model
-
-    @StateObject private var store = Store<ChannelPlaylist>()
 
     var contentItems: [ContentItem] {
-        var videos = playlist.videos
-
-        if videos.isEmpty {
-            videos = store.item?.videos ?? []
-            if !player.accounts.app.userPlaylistsEndpointIncludesVideos {
-                var i = 0
-
-                for index in videos.indices {
-                    var video = videos[index]
-                    video.indexID = "\(i)"
-                    i += 1
-                    videos[index] = video
-                }
-            }
-        }
-
-        return ContentItem.array(of: videos)
-    }
-
-    private var resource: Resource? {
-        let resource = player.accounts.api.playlist(playlist.id)
-        resource?.addObserver(store)
-
-        return resource
+        ContentItem.array(of: playlist.videos)
     }
 
     var videos: [Video] {
@@ -48,14 +22,6 @@ struct PlaylistVideosView: View {
     var body: some View {
         BrowserPlayerControls {
             VerticalCells(items: contentItems)
-                .onAppear {
-                    if !player.accounts.app.userPlaylistsEndpointIncludesVideos {
-                        resource?.load()
-                    }
-                }
-                .onChange(of: model.reloadPlaylists) { _ in
-                    resource?.load()
-                }
             #if !os(tvOS)
                 .navigationTitle("\(playlist.title) Playlist")
             #endif

Shared/Views/VideoContextMenuView.swift

@@ -111,7 +111,7 @@ struct VideoContextMenuView: View {
 
     private var continueButton: some View {
         Button {
-            player.play(video, at: .secondsInDefaultTimescale(watch!.stoppedAt), inNavigationView: inNavigationView)
+            player.play(video, at: watch!.stoppedAt, inNavigationView: inNavigationView)
         } label: {
             Label("Continue from \(watch!.stoppedAt.formattedAsPlaybackTime() ?? "where I left off")", systemImage: "playpause")
         }
@@ -201,7 +201,7 @@ struct VideoContextMenuView: View {
 
     func removeFromPlaylistButton(playlistID: String) -> some View {
         Button {
-            playlists.removeVideo(index: video.indexID!, playlistID: playlistID)
+            playlists.removeVideo(videoIndexID: video.indexID!, playlistID: playlistID)
         } label: {
             Label("Remove from Playlist", systemImage: "text.badge.minus")
         }

Yattee.xcodeproj/project.pbxproj

@@ -190,11 +190,6 @@
 		372915E62687E3B900F5A35B /* Defaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372915E52687E3B900F5A35B /* Defaults.swift */; };
 		372915E72687E3B900F5A35B /* Defaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372915E52687E3B900F5A35B /* Defaults.swift */; };
 		372915E82687E3B900F5A35B /* Defaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372915E52687E3B900F5A35B /* Defaults.swift */; };
-		372D85DE283841B800FF3C7D /* PiPDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373031F428383A89000CFD59 /* PiPDelegate.swift */; };
-		372D85DF283842EC00FF3C7D /* PiPDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373031F428383A89000CFD59 /* PiPDelegate.swift */; };
-		372D85E0283842EE00FF3C7D /* PlayerLayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373031F22838388A000CFD59 /* PlayerLayerView.swift */; };
-		373031F32838388A000CFD59 /* PlayerLayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373031F22838388A000CFD59 /* PlayerLayerView.swift */; };
-		373031F528383A89000CFD59 /* PiPDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373031F428383A89000CFD59 /* PiPDelegate.swift */; };
 		3730D8A02712E2B70020ED53 /* NowPlayingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3730D89F2712E2B70020ED53 /* NowPlayingView.swift */; };
 		3730F75A2733481E00F385FC /* RelatedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373197D82732015300EF734F /* RelatedView.swift */; };
 		373197D92732015300EF734F /* RelatedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373197D82732015300EF734F /* RelatedView.swift */; };
@@ -869,8 +864,6 @@
 		3727B74927872A920021C15E /* VisualEffectBlur-iOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VisualEffectBlur-iOS.swift"; sourceTree = "<group>"; };
 		3729037D2739E47400EA99F6 /* MenuCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuCommands.swift; sourceTree = "<group>"; };
 		372915E52687E3B900F5A35B /* Defaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Defaults.swift; sourceTree = "<group>"; };
-		373031F22838388A000CFD59 /* PlayerLayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerLayerView.swift; sourceTree = "<group>"; };
-		373031F428383A89000CFD59 /* PiPDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PiPDelegate.swift; sourceTree = "<group>"; };
 		3730D89F2712E2B70020ED53 /* NowPlayingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NowPlayingView.swift; sourceTree = "<group>"; };
 		373197D82732015300EF734F /* RelatedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelatedView.swift; sourceTree = "<group>"; };
 		37319F0427103F94004ECCD0 /* PlayerQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerQueue.swift; sourceTree = "<group>"; };
@@ -1358,7 +1351,6 @@
 				37BE0BCE26A0E2D50092E2DB /* VideoPlayerView.swift */,
 				37E8B0EB27B326C00024006F /* TimelineView.swift */,
 				37F9619A27BD89E000058149 /* TapRecognizerViewModifier.swift */,
-				373031F22838388A000CFD59 /* PlayerLayerView.swift */,
 			);
 			path = Player;
 			sourceTree = "<group>";
@@ -1447,7 +1439,6 @@
 			isa = PBXGroup;
 			children = (
 				37EBD8C227AF0D7C00F1C24B /* Backends */,
-				373031F428383A89000CFD59 /* PiPDelegate.swift */,
 				37B767DA2677C3CA0098BAA8 /* PlayerModel.swift */,
 				37319F0427103F94004ECCD0 /* PlayerQueue.swift */,
 				37CC3F44270CE30600608308 /* PlayerQueueItem.swift */,
@@ -2557,7 +2548,6 @@
 				37EF9A76275BEB8E0043B585 /* CommentView.swift in Sources */,
 				373C8FE4275B955100CB5936 /* CommentsPage.swift in Sources */,
 				3700155B271B0D4D0049C794 /* PipedAPI.swift in Sources */,
-				373031F32838388A000CFD59 /* PlayerLayerView.swift in Sources */,
 				37B044B726F7AB9000E1419D /* SettingsView.swift in Sources */,
 				377FC7E3267A084A00A6BBAF /* VideoCell.swift in Sources */,
 				37C3A251272366440087A57A /* ChannelPlaylistView.swift in Sources */,
@@ -2610,7 +2600,6 @@
 				3788AC2726F6840700F6BAA9 /* FavoriteItemView.swift in Sources */,
 				375DFB5826F9DA010013F468 /* InstancesModel.swift in Sources */,
 				3751BA8327E6914F007B1A60 /* ReturnYouTubeDislikeAPI.swift in Sources */,
-				373031F528383A89000CFD59 /* PiPDelegate.swift in Sources */,
 				37DD9DC62785D63A00539416 /* UIResponder+Extensions.swift in Sources */,
 				37C3A24927235FAA0087A57A /* ChannelPlaylistCell.swift in Sources */,
 				373CFACB26966264003CB2C6 /* SearchQuery.swift in Sources */,
@@ -2769,7 +2758,6 @@
 				37A9965F26D6F9B9006E3224 /* FavoritesView.swift in Sources */,
 				37F4AE7326828F0900BD60EA /* VerticalCells.swift in Sources */,
 				37001560271B12DD0049C794 /* SiestaConfiguration.swift in Sources */,
-				372D85DE283841B800FF3C7D /* PiPDelegate.swift in Sources */,
 				37B81AFD26D2C9C900675966 /* VideoDetailsPaddingModifier.swift in Sources */,
 				37C0697F2725C8D400F7F6CB /* CMTime+DefaultTimescale.swift in Sources */,
 				37A9965B26D6F8CA006E3224 /* HorizontalCells.swift in Sources */,
@@ -3012,8 +3000,6 @@
 				37B17DA0268A1F89006AEE9B /* VideoContextMenuView.swift in Sources */,
 				37BE0BD726A1D4A90092E2DB /* AppleAVPlayerViewController.swift in Sources */,
 				37484C3326FCB8F900287258 /* AccountValidator.swift in Sources */,
-				372D85DF283842EC00FF3C7D /* PiPDelegate.swift in Sources */,
-				372D85E0283842EE00FF3C7D /* PlayerLayerView.swift in Sources */,
 				37CEE4C32677B697005A1EFE /* Stream.swift in Sources */,
 				37F64FE626FE70A60081B69E /* RedrawOnModifier.swift in Sources */,
 				37B2631C2735EAAB00FE0D40 /* FavoriteResourceObserver.swift in Sources */,
@@ -3103,7 +3089,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3116,7 +3102,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -3137,7 +3123,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3150,7 +3136,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -3169,7 +3155,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -3181,7 +3167,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -3201,7 +3187,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -3213,7 +3199,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -3365,7 +3351,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -3389,7 +3375,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Vendor/mpv/iOS/lib",
 				);
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				OTHER_LDFLAGS = "-lstdc++";
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app.alpha;
 				PRODUCT_NAME = Yattee;
@@ -3407,7 +3393,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "GLES_SILENCE_DEPRECATION=1";
@@ -3427,7 +3413,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Vendor/mpv/iOS/lib",
 				);
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				OTHER_LDFLAGS = "-lstdc++";
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app.alpha;
 				PRODUCT_NAME = Yattee;
@@ -3449,7 +3435,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3468,7 +3454,7 @@
 					"$(PROJECT_DIR)/Vendor/mpv/macOS/lib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = macosx;
@@ -3487,7 +3473,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3506,7 +3492,7 @@
 					"$(PROJECT_DIR)/Vendor/mpv/macOS/lib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = macosx;
@@ -3623,7 +3609,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -3643,7 +3629,7 @@
 					"$(PROJECT_DIR)/Vendor/mpv",
 					"$(PROJECT_DIR)/Vendor/mpv/tvOS",
 				);
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app.alpha;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = appletvos;
@@ -3661,7 +3647,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -3681,7 +3667,7 @@
 					"$(PROJECT_DIR)/Vendor/mpv",
 					"$(PROJECT_DIR)/Vendor/mpv/tvOS",
 				);
-				MARKETING_VERSION = "1.4-alpha.4";
+				MARKETING_VERSION = 1.4.alpha.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app.alpha;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = appletvos;

Yattee.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Alamofire/Alamofire.git",
       "state" : {
-        "revision" : "354dda32d89fc8cd4f5c46487f64957d355f53d8",
-        "version" : "5.6.1"
+        "revision" : "f82c23a8a7ef8dc1a49a8bfc6a96883e79121864",
+        "version" : "5.5.0"
       }
     },
     {
@@ -96,7 +96,7 @@
       "location" : "https://github.com/sparkle-project/Sparkle",
       "state" : {
         "branch" : "2.x",
-        "revision" : "503830bf24f679b7a9199be85ee7c8d012528d09"
+        "revision" : "f250bead4b943ef9711c61274a1f52e380afa0e8"
       }
     },
     {

iOS/AppDelegate.swift

@@ -11,7 +11,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { // swiftlint:disable:this discouraged_optional_collection
-        Self.instance = self
+        AppDelegate.instance = self
         return true
     }
 }