Add some commands

KC-2001MS · Dec 9, 2024 · 0d4f3d1 · 0d4f3d1
1 parent 557c33d
commit 0d4f3d1
Show file tree

Hide file tree

Showing 14 changed files with 130 additions and 88 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/atpctrlTests.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/atpctrlTests.xcscheme
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/MasterJ93/ATProtoKit.git",
       "state" : {
-        "revision" : "c0622712ade49a04b24d2384083b3d99444b540b",
-        "version" : "0.20.3"
+        "revision" : "990851d7fd48b90bade9631cbb1c58071d3591be",
+        "version" : "0.21.0"
       }
     },
     {

diff --git a/Sources/Subcommands/BlockedAccounts.swift b/Sources/Subcommands/BlockedAccounts.swift
@@ -24,11 +24,18 @@ struct BlockedAccounts: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
         //Get a list of blocked accounts
         //FIXME: It seems to be a bug in the ATProtoKit framework. It could be fixed with an update.
-        let result  = try await atProto.getListBlocks()
-        let users = result.blocks
+        let result  = try? await atProto.getListBlocks()
+        let users = result?.blocks ?? []
         //Display process
         Group {
             Text("Blocked Accounts")

diff --git a/Sources/Subcommands/Feeds.swift b/Sources/Subcommands/Feeds.swift
@@ -25,10 +25,20 @@ struct Feeds: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
         //Get a list of suggested feeds
-        let getSuggestedFeedsItem  = try await atProto.getSuggestedFeeds()
-        let suggestions = getSuggestedFeedsItem.feeds
+        let feeds: [AppBskyLexicon.Feed.GeneratorViewDefinition]
+
+        let getSuggestedFeedsItem  = try? await atProto.getSuggestedFeeds()
+        feeds = getSuggestedFeedsItem?.feeds ?? []
+
 
         //Display process
         Group {
@@ -42,14 +52,20 @@ struct Feeds: AsyncParsableCommand {
                 .forgroundColor(.eight_bit(244))
                 .newLine()
 
-            for suggestion in suggestions {
-                Text(suggestion.displayName.isEmpty ? "No display Name" : suggestion.displayName)
+            if feeds.isEmpty {
+                Text("No Feeds")
+                    .forgroundColor(.red)
+                    .newLine()
+            } else {
+                for suggestion in feeds {
+                    Text(suggestion.displayName.isEmpty ? "No display Name" : suggestion.displayName)
                         .newLine()
 
-                if let displayName = suggestion.creator.displayName {
-                    Text("Created by \(displayName)")
-                        .forgroundColor(.eight_bit(244))
-                        .newLine()
+                    if let displayName = suggestion.creator.displayName {
+                        Text("Created by \(displayName)")
+                            .forgroundColor(.eight_bit(244))
+                            .newLine()
+                    }
                 }
             }
 

diff --git a/Sources/Subcommands/Followers.swift b/Sources/Subcommands/Followers.swift
@@ -25,7 +25,14 @@ struct Followers: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
         //Get a list of blocked accounts
         //FIXME: It seems to be a bug in the ATProtoKit framework. It could be fixed with an update.
         let result = try await atProto.getFollowers(by: text.isEmpty ? atProto.session?.handle ?? text : text)

diff --git a/Sources/Subcommands/Following.swift b/Sources/Subcommands/Following.swift
@@ -25,7 +25,14 @@ struct Following: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
         //Get a list of blocked accounts
         //FIXME: It seems to be a bug in the ATProtoKit framework. It could be fixed with an update.
         let result = try await atProto.getFollows(from: text.isEmpty ? atProto.session?.handle ?? text : text)

diff --git a/Sources/Subcommands/Lists.swift b/Sources/Subcommands/Lists.swift
@@ -25,7 +25,15 @@ struct Lists: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
+
         let profile  = try await atProto.getProfile(text.isEmpty ? atProto.session?.handle ?? text : text)
         //FIXME: I do not know how to specify the DID for the argument of the getLists function. It does not work.
         let result  = try await atProto.getLists(from: profile.actorDID)

diff --git a/Sources/Subcommands/MutesAccounts.swift b/Sources/Subcommands/MutesAccounts.swift
@@ -24,10 +24,17 @@ struct MutesAccounts: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
         //Get a list of mutes accounts
-        let result  = try await atProto.getMutes()
-        let users = result.mutes
+        let result  = try? await atProto.getMutes()
+        let users = result?.mutes ?? []
         //Display process
         Group {
             Text("Mutes Accounts")

diff --git a/Sources/Subcommands/Notifications.swift b/Sources/Subcommands/Notifications.swift
@@ -23,10 +23,17 @@ struct Notifications: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
         //Get a list of notifications
-        let result  = try await atProto.listNotifications(priority: nil)
-        let notifications = result.notifications
+        let result  = try? await atProto.listNotifications(priority: nil)
+        let notifications = result?.notifications ?? []
 
         Group {
             Text("Notifications")

diff --git a/Sources/Subcommands/Post.swift b/Sources/Subcommands/Post.swift
@@ -26,7 +26,14 @@ struct Post: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
 
         Group {
             Text("Please enter the content of your submission.")

diff --git a/Sources/Subcommands/User.swift b/Sources/Subcommands/User.swift
@@ -25,7 +25,14 @@ struct User: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
         //Retrieve user profiles
         let result: AppBskyLexicon.Actor.ProfileViewDetailedDefinition?  = try? await atProto.getProfile(text.isEmpty ? atProto.session?.handle ?? text : text)
 

diff --git a/Sources/Subcommands/Users.swift b/Sources/Subcommands/Users.swift
@@ -25,15 +25,22 @@ struct Users: AsyncParsableCommand {
     )
 
     mutating func run() async throws {
-        let atProto = try await restoreLogin()
+        let atProto: ATProtoKit
+
+        do {
+            atProto = try await restoreLogin()
+        } catch {
+            LoginErrorView().render()
+            return
+        }
         //Get account list
         let users: Array<AppBskyLexicon.Actor.ProfileViewDefinition>
         if text.isEmpty {
-            let result  = try await atProto.getSuggestedFollowsByActor(atProto.session?.sessionDID ?? "")
-            users = result.suggestions
+            let result  = try? await atProto.getSuggestedFollowsByActor(atProto.session?.sessionDID ?? "")
+            users = result?.suggestions ?? []
         } else {
-            let result  = try await atProto.searchUsers(matching: text)
-            users = result.actors
+            let result  = try? await atProto.searchUsers(matching: text)
+            users = result?.actors ?? []
         }
         //Display process
         Group {

diff --git a/Sources/View/LoginErrorView.swift b/Sources/View/LoginErrorView.swift
@@ -0,0 +1,16 @@
+//
+//  LoginErrorView.swift
+//  atpctrl
+//
+//  Created by 茅根啓介 on 2024/12/08.
+//
+
+import SwiftLI
+
+struct LoginErrorView: View {
+    var body:  [View] {
+        Text("Login with stored password failed.")
+            .forgroundColor(.red)
+            .newLine()
+    }
+}
diff --git a/Sources/loginLogic.swift b/Sources/loginLogic.swift
@@ -9,20 +9,20 @@
 
 import ATProtoKit
 
-func restoreLogin() async throws -> (ATProtoKit) {
+func restoreLogin() async throws -> ATProtoKit {
     let atProto: ATProtoKit
 
     if let account = try? FileHelper.loadLoginData() {
         let config = ATProtocolConfiguration(handle: account.handle, appPassword: account.password)
         do {
-            let result = try await config.authenticate()
-            atProto = ATProtoKit(session: result)
+            try await config.authenticate()
         } catch {
             throw(RuntimeError("\(error)"))
         }
+        atProto = ATProtoKit(sessionConfiguration: config)
     } else {
         print("There is no login record. Please login with the login command.")
         throw(RuntimeError("There is no login record. Please login with the login command."))
     }
-    return (atProto)
+    return atProto
 }