From 45d2968d9e5f0dd1f8b6aa4979c4ac54fd04e2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toni=20F=C3=B6rster?= Date: Tue, 21 Nov 2023 18:13:42 +0100 Subject: [PATCH] support for private instances closes #552 and some formatting --- Model/Player/PlayerQueue.swift | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Model/Player/PlayerQueue.swift b/Model/Player/PlayerQueue.swift index 129e2cea..e0fca25c 100644 --- a/Model/Player/PlayerQueue.swift +++ b/Model/Player/PlayerQueue.swift @@ -105,6 +105,7 @@ extension PlayerModel { func playerAPI(_ video: Video) -> VideosAPI? { guard let url = video.instanceURL else { return accounts.api } + if accounts.current?.url == url { return accounts.api } switch video.app { case .local: return nil @@ -263,8 +264,7 @@ extension PlayerModel { if let video = currentItem.video, video.isLocal, video.localStreamIsFile, - let localURL = video.localStream?.localURL - { + let localURL = video.localStream?.localURL { logger.info("stopping security scoped resource access for \(localURL)") localURL.stopAccessingSecurityScopedResource() } @@ -293,8 +293,7 @@ extension PlayerModel { var restoredQueue = [PlayerQueueItem?]() if let lastPlayed, - !Defaults[.queue].contains(where: { $0.videoID == lastPlayed.videoID }) - { + !Defaults[.queue].contains(where: { $0.videoID == lastPlayed.videoID }) { restoredQueue.append(lastPlayed) self.lastPlayed = nil } @@ -341,8 +340,7 @@ extension PlayerModel { var message = error.userMessage if let errorDictionary = error.json.dictionaryObject, let errorMessage = errorDictionary["message"] ?? errorDictionary["error"], - let errorString = errorMessage as? String - { + let errorString = errorMessage as? String { message += "\n" message += errorString }