diff --git a/Model/Accounts/Instance.swift b/Model/Accounts/Instance.swift index 29049550..8d3d912a 100644 --- a/Model/Accounts/Instance.swift +++ b/Model/Accounts/Instance.swift @@ -9,13 +9,15 @@ struct Instance: Defaults.Serializable, Hashable, Identifiable { let name: String let apiURL: String var frontendURL: String? + var proxiesVideos: Bool - init(app: VideosApp, id: String? = nil, name: String, apiURL: String, frontendURL: String? = nil) { + init(app: VideosApp, id: String? = nil, name: String, apiURL: String, frontendURL: String? = nil, proxiesVideos: Bool = false) { self.app = app self.id = id ?? UUID().uuidString self.name = name self.apiURL = apiURL self.frontendURL = frontendURL + self.proxiesVideos = proxiesVideos } var anonymous: VideosAPI { diff --git a/Model/Accounts/InstancesBridge.swift b/Model/Accounts/InstancesBridge.swift index d3f251e5..7403e9e7 100644 --- a/Model/Accounts/InstancesBridge.swift +++ b/Model/Accounts/InstancesBridge.swift @@ -15,7 +15,8 @@ struct InstancesBridge: Defaults.Bridge { "id": value.id, "name": value.name, "apiURL": value.apiURL, - "frontendURL": value.frontendURL ?? "" + "frontendURL": value.frontendURL ?? "", + "proxiesVideos": value.proxiesVideos ? "true" : "false" ] } @@ -30,8 +31,9 @@ struct InstancesBridge: Defaults.Bridge { } let name = object["name"] ?? "" - let frontendURL: String? = object["frontendURL"]!.isEmpty ? nil : object["frontendURL"] - return Instance(app: app, id: id, name: name, apiURL: apiURL, frontendURL: frontendURL) + let proxiesVideos = object["proxiesVideos"] == "true" + + return Instance(app: app, id: id, name: name, apiURL: apiURL, frontendURL: frontendURL, proxiesVideos: proxiesVideos) } } diff --git a/Model/Accounts/InstancesModel.swift b/Model/Accounts/InstancesModel.swift index f4dd41a6..722d99e4 100644 --- a/Model/Accounts/InstancesModel.swift +++ b/Model/Accounts/InstancesModel.swift @@ -52,6 +52,17 @@ final class InstancesModel: ObservableObject { } } + static func setProxiesVideos(_ instance: Instance, _ proxiesVideos: Bool) { + guard let index = Defaults[.instances].firstIndex(where: { $0.id == instance.id }) else { + return + } + + var instance = Defaults[.instances][index] + instance.proxiesVideos = proxiesVideos + + Defaults[.instances][index] = instance + } + static func remove(_ instance: Instance) { let accounts = Self.accounts(instance.id) if let index = Defaults[.instances].firstIndex(where: { $0.id == instance.id }) { diff --git a/Model/Applications/VideosApp.swift b/Model/Applications/VideosApp.swift index ba5caab8..c4f9b816 100644 --- a/Model/Applications/VideosApp.swift +++ b/Model/Applications/VideosApp.swift @@ -58,4 +58,8 @@ enum VideosApp: String, CaseIterable { var supportsOpeningChannelsByName: Bool { self == .piped } + + var allowsDisablingVidoesProxying: Bool { + self == .invidious + } } diff --git a/Model/Player/PlayerStreams.swift b/Model/Player/PlayerStreams.swift index 0df73db7..2cd8957a 100644 --- a/Model/Player/PlayerStreams.swift +++ b/Model/Player/PlayerStreams.swift @@ -57,7 +57,7 @@ extension PlayerModel { streams.map { stream in stream.instance = instance - if instance.app == .invidious { + if instance.app == .invidious, instance.proxiesVideos { if let audio = stream.audioAsset { stream.audioAsset = InvidiousAPI.proxiedAsset(instance: instance, asset: audio) } diff --git a/Shared/Settings/AccountsNavigationLink.swift b/Shared/Settings/AccountsNavigationLink.swift index 492f33d1..9290f284 100644 --- a/Shared/Settings/AccountsNavigationLink.swift +++ b/Shared/Settings/AccountsNavigationLink.swift @@ -6,7 +6,7 @@ struct AccountsNavigationLink: View { var body: some View { NavigationLink(instance.longDescription) { - InstanceSettings(instanceID: instance.id) + InstanceSettings(instance: instance) } .buttonStyle(.plain) .contextMenu { diff --git a/Shared/Settings/InstanceSettings.swift b/Shared/Settings/InstanceSettings.swift index eec5d9a0..6419b8c8 100644 --- a/Shared/Settings/InstanceSettings.swift +++ b/Shared/Settings/InstanceSettings.swift @@ -1,22 +1,19 @@ import SwiftUI struct InstanceSettings: View { - let instanceID: Instance.ID? + let instance: Instance @State private var accountsChanged = false @State private var presentingAccountForm = false @State private var frontendURL = "" - - var instance: Instance! { - InstancesModel.find(instanceID) - } + @State private var proxiesVideos = false var body: some View { List { Section(header: Text("Accounts")) { if instance.app.supportsAccounts { - ForEach(InstancesModel.accounts(instanceID), id: \.self) { account in + ForEach(InstancesModel.accounts(instance.id), id: \.self) { account in #if os(tvOS) Button(account.description) {} .contextMenu { @@ -80,6 +77,16 @@ struct InstanceSettings: View { .keyboardType(.URL) } } + + if instance.app.allowsDisablingVidoesProxying { + proxiesVideosToggle + .onAppear { + proxiesVideos = instance.proxiesVideos + } + .onChange(of: proxiesVideos) { newValue in + InstancesModel.setProxiesVideos(instance, newValue) + } + } } #if os(tvOS) .frame(maxWidth: 1000) @@ -90,6 +97,10 @@ struct InstanceSettings: View { .navigationTitle(instance.description) } + private var proxiesVideosToggle: some View { + Toggle("Proxy videos", isOn: $proxiesVideos) + } + private func removeAccount(_ account: Account) { AccountsModel.remove(account) accountsChanged.toggle()