Merge pull request #738 from stonerl/chore-linter-warnings

chore: address linter warnings

Extensions/UIViewController+HideHomeIndicator.swift

@@ -6,8 +6,10 @@ extension UIViewController {
     }
 
     public class func swizzleHomeIndicatorProperty() {
-        swizzle(origSelector: #selector(getter: UIViewController.prefersHomeIndicatorAutoHidden),
+        swizzle(
+            origSelector: #selector(getter: UIViewController.prefersHomeIndicatorAutoHidden),
             withSelector: #selector(getter: UIViewController.swizzle_prefersHomeIndicatorAutoHidden),
-                forClass: UIViewController.self)
+            forClass: UIViewController.self
+        )
     }
 }

Model/Applications/InvidiousAPI.swift

@@ -81,7 +81,7 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
 
         configureTransformer(pathPattern("search/suggestions"), requestMethods: [.get]) { (content: Entity<JSON>) -> [String] in
             if let suggestions = content.json.dictionaryValue["suggestions"] {
-                return suggestions.arrayValue.map { $0.stringValue.replacingHTMLEntities }
+                return suggestions.arrayValue.map(\.stringValue).map(\.replacingHTMLEntities)
             }
 
             return []

Model/Cache/FeedCacheModel.swift

@@ -22,7 +22,7 @@ struct FeedCacheModel: CacheModel {
             let date = iso8601DateFormatter.string(from: Date())
             logger.info("caching feed \(account.feedCacheKey) -- \(date)")
             let feedTimeObject: JSON = ["date": date]
-            let videosObject: JSON = ["videos": videos.prefix(cacheLimit).map { $0.json.object }]
+            let videosObject: JSON = ["videos": videos.prefix(cacheLimit).map(\.json.object)]
             try? storage?.setObject(feedTimeObject, forKey: feedTimeCacheKey(account.feedCacheKey))
             try? storage?.setObject(videosObject, forKey: account.feedCacheKey)
         }

Model/Cache/PlaylistsCacheModel.swift

@@ -21,7 +21,7 @@ struct PlaylistsCacheModel: CacheModel {
         let date = iso8601DateFormatter.string(from: Date())
         logger.info("caching \(playlistCacheKey(account)) -- \(date)")
         let feedTimeObject: JSON = ["date": date]
-        let playlistsObject: JSON = ["playlists": playlists.map { $0.json.object }]
+        let playlistsObject: JSON = ["playlists": playlists.map(\.json.object)]
         try? storage?.setObject(feedTimeObject, forKey: playlistTimeCacheKey(account))
         try? storage?.setObject(playlistsObject, forKey: playlistCacheKey(account))
     }

Model/Channel.swift

@@ -152,7 +152,7 @@ struct Channel: Identifiable, Hashable {
             "subscriptionsText": subscriptionsText as Any,
             "totalViews": totalViews as Any,
             "verified": verified as Any,
-            "videos": videos.map { $0.json.object }
+            "videos": videos.map(\.json.object)
         ]
     }
 

Model/ChannelPlaylist.swift

@@ -19,7 +19,7 @@ struct ChannelPlaylist: Identifiable {
             "title": title,
             "thumbnailURL": thumbnailURL?.absoluteString ?? "",
             "channel": channel?.json.object ?? "",
-            "videos": videos.map { $0.json.object },
+            "videos": videos.map(\.json.object),
             "videosCount": String(videosCount ?? 0)
         ]
     }

Model/CommentsModel.swift

@@ -42,7 +42,7 @@ final class CommentsModel: ObservableObject {
             .comments(video.videoID, page: page)?
             .load()
             .onSuccess { [weak self] response in
-                guard let self = self else { return }
+                guard let self else { return }
                 if let commentsPage: CommentsPage = response.typedContent() {
                     self.all += commentsPage.comments
                     self.nextPage = commentsPage.nextPage

Model/Country.swift

@@ -274,7 +274,7 @@ extension Country {
 
     private static func filteredCountries(_ predicate: (String) -> Bool) -> [Country] {
         Country.allCases
-            .map { $0.name }
+            .map(\.name)
             .filter(predicate)
             .compactMap { string in Country.allCases.first { $0.name == string } }
     }

Model/FeedModel.swift

@@ -121,7 +121,7 @@ final class FeedModel: ObservableObject, CacheModel {
         backgroundContext.perform { [weak self] in
             guard let self else { return }
 
-            let watched = self.watchFetchRequestResult(feed, context: self.backgroundContext).filter { $0.finished }
+            let watched = self.watchFetchRequestResult(feed, context: self.backgroundContext).filter(\.finished)
             let unwatched = feed.filter { video in !watched.contains { $0.videoID == video.videoID } }
             let unwatchedCount = max(0, feed.count - watched.count)
 

Model/Player/PlayerModel.swift

@@ -90,7 +90,7 @@ final class PlayerModel: ObservableObject {
     }}
     @Published var aspectRatio = VideoPlayerView.defaultAspectRatio
     @Published var stream: Stream?
-    @Published var currentRate: Double = 1.0 { didSet { handleCurrentRateChange() } }
+    @Published var currentRate = 1.0 { didSet { handleCurrentRateChange() } }
 
     @Published var qualityProfileSelection: QualityProfile? { didSet { handleQualityProfileChange() } }
 

Model/Player/PlayerQueue.swift

@@ -74,7 +74,7 @@ extension PlayerModel {
         preservedTime = currentItem.playbackTime
 
         DispatchQueue.main.async { [weak self] in
-            guard let self = self else { return }
+            guard let self else { return }
             guard let video = item.video else {
                 return
             }

Model/Player/ScreenSaverManager.swift

@@ -16,10 +16,12 @@ struct ScreenSaverManager {
             return false
         }
 
-        noSleepReturn = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep as CFString,
+        noSleepReturn = IOPMAssertionCreateWithName(
+            kIOPMAssertionTypeNoDisplaySleep as CFString,
             IOPMAssertionLevel(kIOPMAssertionLevelOn),
             reason as CFString,
-                                                    &noSleepAssertion)
+            &noSleepAssertion
+        )
         return noSleepReturn == kIOReturnSuccess
     }
 

Model/QualityProfile.swift

@@ -100,7 +100,7 @@ struct QualityProfileBridge: Defaults.Bridge {
             "name": value.name ?? "",
             "backend": value.backend.rawValue,
             "resolution": value.resolution.rawValue,
-            "formats": value.formats.map { $0.rawValue }.joined(separator: Self.formatsSeparator),
+            "formats": value.formats.map(\.rawValue).joined(separator: Self.formatsSeparator),
             "order": value.order.map { String($0) }.joined(separator: Self.formatsSeparator) // New line
         ]
     }

Shared/Defaults.swift

@@ -609,7 +609,7 @@ enum SponsorBlockColors: String {
     case music_offtopic = "#FF9900" // Orange
 
     // Define all cases, can be used to iterate over the colors
-    static let allCases: [SponsorBlockColors] = [.sponsor, .selfpromo, .interaction, .intro, .outro, .preview, .filler, .music_offtopic]
+    static let allCases: [SponsorBlockColors] = [Self.sponsor, Self.selfpromo, Self.interaction, Self.intro, Self.outro, Self.preview, Self.filler, Self.music_offtopic]
 
     // Create a dictionary with the category names as keys and colors as values
     static let dictionary: [String: String] = {

Shared/LanguageCodes.swift

@@ -51,59 +51,108 @@ enum LanguageCodes: String, CaseIterable {
 
     var description: String {
         switch self {
-        case .Afrikaans: return "Afrikaans"
-        case .Arabic: return "Arabic"
-        case .Azerbaijani: return "Azerbaijani"
-        case .Bengali: return "Bengali"
-        case .Catalan: return "Catalan"
-        case .Czech: return "Czech"
-        case .Welsh: return "Welsh"
-        case .Danish: return "Danish"
-        case .German: return "German"
-        case .Greek: return "Greek"
-        case .English: return "English"
-        case .English_GB: return "English (United Kingdom)"
-        case .Spanish: return "Spanish"
-        case .Persian: return "Persian"
-        case .Finnish: return "Finnish"
-        case .Filipino: return "Filipino"
-        case .French: return "French"
-        case .Irish: return "Irish"
-        case .Hebrew: return "Hebrew"
-        case .Hindi: return "Hindi"
-        case .Hungarian: return "Hungarian"
-        case .Indonesian: return "Indonesian"
-        case .Italian: return "Italian"
-        case .Japanese: return "Japanese"
-        case .Javanese: return "Javanese"
-        case .Korean: return "Korean"
-        case .Lithuanian: return "Lithuanian"
-        case .Malay: return "Malay"
-        case .Maltese: return "Maltese"
-        case .Dutch: return "Dutch"
-        case .Norwegian: return "Norwegian"
-        case .Polish: return "Polish"
-        case .Portuguese: return "Portuguese"
-        case .Romanian: return "Romanian"
-        case .Russian: return "Russian"
-        case .Slovak: return "Slovak"
-        case .Slovene: return "Slovene"
-        case .Swedish: return "Swedish"
-        case .Swahili: return "Swahili"
-        case .Thai: return "Thai"
-        case .Tagalog: return "Tagalog"
-        case .Turkish: return "Turkish"
-        case .Ukrainian: return "Ukrainian"
-        case .Urdu: return "Urdu"
-        case .Uzbek: return "Uzbek"
-        case .Vietnamese: return "Vietnamese"
-        case .Xhosa: return "Xhosa"
-        case .Chinese: return "Chinese"
-        case .Zulu: return "Zulu"
+        case .Afrikaans:
+            return "Afrikaans"
+        case .Arabic:
+            return "Arabic"
+        case .Azerbaijani:
+            return "Azerbaijani"
+        case .Bengali:
+            return "Bengali"
+        case .Catalan:
+            return "Catalan"
+        case .Czech:
+            return "Czech"
+        case .Welsh:
+            return "Welsh"
+        case .Danish:
+            return "Danish"
+        case .German:
+            return "German"
+        case .Greek:
+            return "Greek"
+        case .English:
+            return "English"
+        case .English_GB:
+            return "English (United Kingdom)"
+        case .Spanish:
+            return "Spanish"
+        case .Persian:
+            return "Persian"
+        case .Finnish:
+            return "Finnish"
+        case .Filipino:
+            return "Filipino"
+        case .French:
+            return "French"
+        case .Irish:
+            return "Irish"
+        case .Hebrew:
+            return "Hebrew"
+        case .Hindi:
+            return "Hindi"
+        case .Hungarian:
+            return "Hungarian"
+        case .Indonesian:
+            return "Indonesian"
+        case .Italian:
+            return "Italian"
+        case .Japanese:
+            return "Japanese"
+        case .Javanese:
+            return "Javanese"
+        case .Korean:
+            return "Korean"
+        case .Lithuanian:
+            return "Lithuanian"
+        case .Malay:
+            return "Malay"
+        case .Maltese:
+            return "Maltese"
+        case .Dutch:
+            return "Dutch"
+        case .Norwegian:
+            return "Norwegian"
+        case .Polish:
+            return "Polish"
+        case .Portuguese:
+            return "Portuguese"
+        case .Romanian:
+            return "Romanian"
+        case .Russian:
+            return "Russian"
+        case .Slovak:
+            return "Slovak"
+        case .Slovene:
+            return "Slovene"
+        case .Swedish:
+            return "Swedish"
+        case .Swahili:
+            return "Swahili"
+        case .Thai:
+            return "Thai"
+        case .Tagalog:
+            return "Tagalog"
+        case .Turkish:
+            return "Turkish"
+        case .Ukrainian:
+            return "Ukrainian"
+        case .Urdu:
+            return "Urdu"
+        case .Uzbek:
+            return "Uzbek"
+        case .Vietnamese:
+            return "Vietnamese"
+        case .Xhosa:
+            return "Xhosa"
+        case .Chinese:
+            return "Chinese"
+        case .Zulu:
+            return "Zulu"
         }
     }
 
     static func languageName(for code: String) -> String {
-        return LanguageCodes(rawValue: code)?.description ?? "Unknown"
+        return Self(rawValue: code)?.description ?? "Unknown"
     }
 }

Shared/OpenURLHandler.swift

@@ -209,7 +209,7 @@ struct OpenURLHandler {
             return accounts.api.channelByName(name)
         }
 
-        if let instance = InstancesModel.shared.all.first(where: { $0.app.supportsOpeningChannelsByName }) {
+        if let instance = InstancesModel.shared.all.first(where: \.app.supportsOpeningChannelsByName) {
             return instance.anonymous.channelByName(name)
         }
 
@@ -223,7 +223,7 @@ struct OpenURLHandler {
             return accounts.api.channelByUsername(username)
         }
 
-        if let instance = InstancesModel.shared.all.first(where: { $0.app.supportsOpeningChannelsByName }) {
+        if let instance = InstancesModel.shared.all.first(where: \.app.supportsOpeningChannelsByName) {
             return instance.anonymous.channelByUsername(username)
         }
 

Shared/Player/AppleAVPlayerViewController.swift

@@ -61,7 +61,8 @@ final class AppleAVPlayerViewController: UIViewController {
         _ sections: [NowPlayingView.ViewSection],
         title: String
     ) -> UIHostingController<AnyView> {
-        let controller = UIHostingController(rootView:
+        let controller = UIHostingController(
+            rootView:
             AnyView(
                 NowPlayingView(sections: sections, inInfoViewController: true)
                     .frame(maxHeight: 600)

Shared/Player/Controls/TimelineView.swift

@@ -33,7 +33,7 @@ struct TimelineView: View {
     @State private var dragOffset: Double = 0
     @State private var draggedFrom: Double = 0
 
-    private var start: Double = 0.0
+    private var start = 0.0
     private var height = 8.0
 
     var cornerRadius: Double

Shared/Player/PlayerViewController.swift

@@ -90,8 +90,9 @@ final class PlayerViewController: UIViewController {
             _ sections: [NowPlayingView.ViewSection],
             title: String
         ) -> UIHostingController<AnyView> {
-            let controller = UIHostingController(rootView:
-                AnyView(
+            let controller = UIHostingController(
+                rootView:
+                AnyV‚iew(
                     NowPlayingView(sections: sections, inInfoViewController: true)
                         .frame(maxHeight: 600)
                         .environmentObject(commentsModel)

Shared/Player/Video Details/VideoDetails.swift

@@ -222,6 +222,7 @@ struct VideoDetails: View {
             .frame(maxWidth: .infinity, alignment: .leading)
             .contentShape(Rectangle())
             .padding(.horizontal, 16)
+            // swiftlint:disable trailing_closure
             // TODO: when setting tvOS minimum to 16, the platform modifier can be removed
             #if !os(tvOS)
                 .simultaneousGesture( // Simultaneous gesture to prioritize button tap
@@ -232,6 +233,7 @@ struct VideoDetails: View {
                     }
                 )
             #endif
+            // swiftlint:enable trailing_closure
 
             VideoActions(video: player.videoForDisplay)
                 .padding(.vertical, 5)

Shared/Player/VideoPlayerView.swift

@@ -281,7 +281,7 @@ struct VideoPlayerView: View {
                             }
                             .gesture(player.controls.presentingOverlays ? nil : playerDragGesture)
                         #if os(macOS)
-                            .onAppear(perform: {
+                            .onAppear {
                                 NSEvent.addLocalMonitorForEvents(matching: [.mouseMoved]) {
                                     hoverThrottle.execute {
                                         if !player.currentItem.isNil, hoveringPlayer {
@@ -291,7 +291,7 @@ struct VideoPlayerView: View {
 
                                     return $0
                                 }
-                            })
+                            }
                         #endif
 
                             .background(Color.black)

Shared/Search/SearchTextField.swift

@@ -15,7 +15,7 @@ struct SearchTextField: View {
                 #if os(macOS)
                     Image(systemName: "magnifyingglass")
                         .resizable()
-                        .aspectRatio(contentMode: .fill)
+                        .scaledToFill()
                         .frame(width: 12, height: 12)
                         .padding(.horizontal, 8)
                         .opacity(0.8)

Shared/Settings/QualityProfileForm.swift

@@ -380,7 +380,7 @@ struct QualityProfileForm: View {
     func submitForm() {
         guard valid else { return }
 
-        let activeFormats = orderedFormats.filter { $0.isActive }.map { $0.format }
+        let activeFormats = orderedFormats.filter(\.isActive).map(\.format)
 
         let formProfile = QualityProfile(
             id: qualityProfile?.id ?? UUID().uuidString,

Shared/Subscriptions/FeedView.swift

@@ -15,7 +15,7 @@ struct FeedView: View {
     #endif
 
     var videos: [ContentItem] {
-        guard let selectedChannel = selectedChannel else {
+        guard let selectedChannel else {
             return ContentItem.array(of: feed.videos)
         }
         return ContentItem.array(of: feed.videos.filter {
@@ -24,9 +24,7 @@ struct FeedView: View {
     }
 
     var channels: [Channel] {
-        feed.videos.map {
-            $0.channel
-        }.unique()
+        feed.videos.map(\.channel).unique()
     }
 
     @State private var selectedChannel: Channel?
@@ -272,7 +270,7 @@ struct FeedView: View {
     }
 
     var channelHeaderView: some View {
-        guard let selectedChannel = selectedChannel else {
+        guard let selectedChannel else {
             return AnyView(
                 Text("All Channels")
                     .font(.caption)

Shared/Trending/TrendingCountry.swift

@@ -6,7 +6,7 @@ struct TrendingCountry: View {
 
     @StateObject private var store = Store(Country.allCases)
 
-    @State private var query: String = ""
+    @State private var query = ""
     @State private var selection: Country?
 
     @Environment(\.colorScheme) private var colorScheme

Shared/URLParser.swift

@@ -26,8 +26,7 @@ struct URLParser {
            urlString.contains("youtube.com") ||
            urlString.contains("youtu.be") ||
            urlString.contains("youtube-nocookie.com"),
-           let url = URL(string: "https://\(urlString)"
-           )
+           let url = URL(string: "https://\(urlString)")
         {
             self.url = url
         }
@@ -176,11 +175,9 @@ struct URLParser {
     private func removePrefixes(_ value: String, _ prefixes: [String]) -> String {
         var value = value
 
-        for prefix in prefixes {
-            if value.hasPrefix(prefix) {
+        for prefix in prefixes where value.hasPrefix(prefix) {
             value.removeFirst(prefix.count)
         }
-        }
 
         return value
     }

Shared/YatteeApp.swift

@@ -100,7 +100,7 @@ struct YatteeApp: App {
         .commands {
             SidebarCommands()
 
-            CommandGroup(replacing: .newItem, addition: {})
+            CommandGroup(replacing: .newItem) {}
 
             MenuCommands(model: Binding<MenuModel>(get: { MenuModel.shared }, set: { _ in }))
         }

iOS/OrientationTracker.swift

@@ -65,9 +65,11 @@ public class OrientationTracker {
             guard newDeviceOrientation != self.currentDeviceOrientation else { return }
             self.currentDeviceOrientation = newDeviceOrientation
 
-            NotificationCenter.default.post(name: Self.deviceOrientationChangedNotification,
+            NotificationCenter.default.post(
+                name: Self.deviceOrientationChangedNotification,
                 object: nil,
-                                            userInfo: nil)
+                userInfo: nil
+            )
         }
     }
 

iOS/ShareSheet.swift

@@ -4,7 +4,7 @@ import SwiftUI
 struct ShareSheet: UIViewControllerRepresentable {
     typealias Callback = (_ activityType: UIActivity.ActivityType?,
                           _ completed: Bool,
-                          _ returnedItems: [Any]?,
+                          _ returnedItems: [Any],
                           _ error: Error?) -> Void
 
     let activityItems: [Any]
@@ -19,7 +19,10 @@ struct ShareSheet: UIViewControllerRepresentable {
         )
 
         controller.excludedActivityTypes = excludedActivityTypes
-        controller.completionWithItemsHandler = callback
+
+        controller.completionWithItemsHandler = { activityType, completed, returnedItems, error in
+            callback?(activityType, completed, returnedItems ?? [], error)
+        }
 
         return controller
     }

macOS/VideoLayer.swift

@@ -38,10 +38,12 @@ final class VideoLayer: CAOpenGLLayer {
         glGetIntegerv(GLenum(GL_DRAW_FRAMEBUFFER_BINDING), &i)
 
         if client.mpvGL != nil {
-            var data = mpv_opengl_fbo(fbo: Int32(i),
+            var data = mpv_opengl_fbo(
+                fbo: Int32(i),
                 w: Int32(bounds.size.width),
                 h: Int32(bounds.size.height),
-                                      internal_format: 0)
+                internal_format: 0
+            )
             var params: [mpv_render_param] = [
                 mpv_render_param(type: MPV_RENDER_PARAM_OPENGL_FBO, data: &data),
                 mpv_render_param(type: MPV_RENDER_PARAM_FLIP_Y, data: &flip),
@@ -106,8 +108,10 @@ final class VideoLayer: CAOpenGLLayer {
         let displayId = UInt32(NSScreen.main?.deviceDescription[NSDeviceDescriptionKey("NSScreenNumber")] as! Int)
 
         CVDisplayLinkCreateWithCGDisplay(displayId, &client.link)
-        CVDisplayLinkSetOutputCallback(client.link!, displayLinkCallback,
-                                       UnsafeMutableRawPointer(Unmanaged.passUnretained(client.layer).toOpaque()))
+        CVDisplayLinkSetOutputCallback(
+            client.link!, displayLinkCallback,
+            UnsafeMutableRawPointer(Unmanaged.passUnretained(client.layer).toOpaque())
+        )
         CVDisplayLinkStart(client.link!)
     }