Fix sidebar key commands not working on macOS

Closes #253

Packages/Pachyderm/Sources/Pachyderm/Client.swift

@@ -139,13 +139,14 @@ public class Client {
         }
     }
     
-    public func getAccessToken(authorizationCode: String, redirectURI: String, completion: @escaping Callback<LoginSettings>) {
+    public func getAccessToken(authorizationCode: String, redirectURI: String, scopes: [Scope], completion: @escaping Callback<LoginSettings>) {
         let request = Request<LoginSettings>(method: .post, path: "/oauth/token", body: ParametersBody([
                 "client_id" => clientID,
                 "client_secret" => clientSecret,
                 "grant_type" => "authorization_code",
                 "code" => authorizationCode,
-                "redirect_uri" => redirectURI
+                "redirect_uri" => redirectURI,
+                "scope" => scopes.scopeString,
             ]))
         run(request) { result in
             defer { completion(result) }

Tusker/API/MastodonController.swift

@@ -10,6 +10,8 @@ import Foundation
 import Pachyderm
 import Combine
 
+private let oauthScopes = [Scope.read, .write, .follow]
+
 class MastodonController: ObservableObject {
 
     static private(set) var all = [LocalData.UserAccountInfo: MastodonController]()
@@ -128,7 +130,7 @@ class MastodonController: ObservableObject {
             return (clientID, clientSecret)
         } else {
             let app: RegisteredApplication = try await withCheckedThrowingContinuation({ continuation in
-                client.registerApp(name: "Tusker", redirectURI: "tusker://oauth", scopes: [.read, .write, .follow]) { response in
+                client.registerApp(name: "Tusker", redirectURI: "tusker://oauth", scopes: oauthScopes) { response in
                     switch response {
                     case .failure(let error):
                         continuation.resume(throwing: error)
@@ -146,7 +148,7 @@ class MastodonController: ObservableObject {
     /// - Returns: The access token
     func authorize(authorizationCode: String) async throws -> String {
         return try await withCheckedThrowingContinuation({ continuation in
-            client.getAccessToken(authorizationCode: authorizationCode, redirectURI: "tusker://oauth") { response in
+            client.getAccessToken(authorizationCode: authorizationCode, redirectURI: "tusker://oauth", scopes: oauthScopes) { response in
                 switch response {
                 case .failure(let error):
                     continuation.resume(throwing: error)

Tusker/MenuController.swift

@@ -18,33 +18,22 @@ struct MenuController {
         return UIKeyCommand(title: "Refresh", action: #selector(RefreshableViewController.refresh), input: "r", modifierFlags: .command, discoverabilityTitle: discoverabilityTitle)
     }
     
-    static func sidebarCommand(item: MainSidebarViewController.Item, command: String) -> UIKeyCommand {
-        let data: Any
-        if case let .tab(tab) = item {
-            data = tab.rawValue
-        } else if case .explore = item {
-            data = "search"
-        } else if case .bookmarks = item {
-            data = "bookmarks"
-        } else {
-            fatalError()
-        }
+    static func sidebarCommand(item: MainSidebarViewController.Item, command: String, action: Selector) -> UIKeyCommand {
         return UIKeyCommand(
             title: item.title,
             image: UIImage(systemName: item.imageName!),
-            action: #selector(MainSplitViewController.handleSidebarItemCommand(_:)),
+            action: action,
             input: command,
-            modifierFlags: .command,
-            propertyList: data
+            modifierFlags: .command
         )
     }
     
     static let sidebarItemKeyCommands: [UIKeyCommand] = [
-        sidebarCommand(item: .tab(.timelines), command: "1"),
-        sidebarCommand(item: .tab(.notifications), command: "2"),
-        sidebarCommand(item: .explore, command: "3"),
-        sidebarCommand(item: .bookmarks, command: "4"),
-        sidebarCommand(item: .tab(.myProfile), command: "5"),
+        sidebarCommand(item: .tab(.timelines), command: "1", action: #selector(MainSplitViewController.handleSidebarCommandTimelines)),
+        sidebarCommand(item: .tab(.notifications), command: "2", action: #selector(MainSplitViewController.handleSidebarCommandNotifications)),
+        sidebarCommand(item: .explore, command: "3", action: #selector(MainSplitViewController.handleSidebarCommandExplore)),
+        sidebarCommand(item: .bookmarks, command: "4", action: #selector(MainSplitViewController.handleSidebarCommandBookmarks)),
+        sidebarCommand(item: .tab(.myProfile), command: "5", action: #selector(MainSplitViewController.handleSidebarCommandMyProfile)),
     ]
     
     static let nextSubTabCommand = UIKeyCommand(title: "Next Sub Tab", action: #selector(TabbedPageViewController.selectNextPage), input: "]", modifierFlags: [.command, .shift])

Tusker/Screens/Main/MainSplitViewController.swift

@@ -101,27 +101,29 @@ class MainSplitViewController: UISplitViewController {
         }
     }
     
-    @objc func handleSidebarItemCommand(_ sender: AnyObject) {
-        // workaround for crash when sender is not a UICommand, see #253 and FB11804009
-        guard let command = sender as? UICommand else {
-            return
-        }
-        let item: MainSidebarViewController.Item
-        if let index = command.propertyList as? Int {
-            item = .tab(MainTabBarViewController.Tab(rawValue: index)!)
-        } else if let str = command.propertyList as? String {
-            if str == "search" {
-                item = .explore
-            } else if str == "bookmarks" {
-                item = .bookmarks
-            } else {
-                fatalError()
-            }
-        } else {
-            fatalError()
-        }
-        sidebar.select(item: item, animated: false)
-        select(item: item)
+    @objc func handleSidebarCommandTimelines() {
+        sidebar.select(item: .tab(.timelines), animated: false)
+        select(item: .tab(.timelines))
+    }
+    
+    @objc func handleSidebarCommandNotifications() {
+        sidebar.select(item: .tab(.notifications), animated: false)
+        select(item: .tab(.notifications))
+    }
+    
+    @objc func handleSidebarCommandExplore() {
+        sidebar.select(item: .tab(.explore), animated: false)
+        select(item: .tab(.explore))
+    }
+    
+    @objc func handleSidebarCommandBookmarks() {
+        sidebar.select(item: .bookmarks, animated: false)
+        select(item: .bookmarks)
+    }
+    
+    @objc func handleSidebarCommandMyProfile() {
+        sidebar.select(item: .tab(.myProfile), animated: false)
+        select(item: .tab(.myProfile))
     }
     
     @objc private func sidebarTapped() {
@@ -519,7 +521,7 @@ extension MainSplitViewController: TuskerRootViewController {
     
     func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
         guard presentedViewController == nil else {
-            return .stop
+            return .continue
         }
         if traitCollection.horizontalSizeClass == .compact {
             return tabBarViewController.handleStatusBarTapped(xPosition: xPosition)