My Feeds

Author: Dimillian

App/IcySkyApp.swift

@@ -17,8 +17,6 @@ struct IcySkyApp: App {
   @State var router: Router = .init()
 
   var body: some Scene {
-    @Bindable var router = router
-
     WindowGroup {
       TabView(selection: $router.selectedTab) {
         if client != nil && currentUser != nil {

IcySky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,13 +1,13 @@
 {
-  "originHash" : "3bc05e95b69742072e775dc6308bc6c4782949bf33e94229acf20f9c710c7286",
+  "originHash" : "9ac06be7ae7f8f8aef52ec90b389ab7cb9d8262eafdb10a92352b2b2be3ddb66",
   "pins" : [
     {
       "identity" : "atprotokit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/MasterJ93/ATProtoKit",
       "state" : {
         "branch" : "develop",
-        "revision" : "b2027acf40b1947affb4c52db768dd1163c574ac"
+        "revision" : "d82a9b89584c129cc5afb2bb08b6913b4a1536a7"
       }
     },
     {

Packages/Features/Sources/FeedUI/List/FeedsListFilter.swift

@@ -2,16 +2,14 @@ import Foundation
 
 public enum FeedsListFilter: String, CaseIterable, Identifiable {
   case suggested = "Suggested"
-  case savedFeeds = "Saved"
-  case pinned = "Pinned"
+  case myFeeds = "My Feeds"
 
   public var id: Self { self }
 
   var icon: String {
     switch self {
     case .suggested: return "sparkles.rectangle.stack"
-    case .savedFeeds: return "person.crop.rectangle.stack"
-    case .pinned: return "pin"
+    case .myFeeds: return "person.crop.rectangle.stack"
     }
   }
 }

Packages/Features/Sources/FeedUI/List/FeedsListView.swift

@@ -42,7 +42,7 @@ public struct FeedsListView: View {
       switch filter {
       case .suggested:
         await fetchSuggestedFeed()
-      case .savedFeeds, .pinned:
+      case .myFeeds:
         await fetchMyFeeds()
       }
     }
@@ -71,33 +71,34 @@ public struct FeedsListView: View {
   @ViewBuilder
   private var recentViewedSection: some View {
     if !isInSearch {
-      Section(
-        content: {
-          if isRecentFeedExpanded {
-            TimelineFeedRowView()
-            ForEach(recentFeedItems) { item in
-              RecentlyViewedFeedRowView(item: item)
-            }
-            .onDelete { indexSet in
-              for index in indexSet {
-                modelContext.delete(recentFeedItems[index])
-              }
-            }
-            dividerView
+      HStack {
+        Image(systemName: "chevron.right")
+          .rotationEffect(.degrees(isRecentFeedExpanded ? 90 : 0))
+        Text("Recently Viewed")
+      }
+      .font(.subheadline)
+      .fontWeight(.semibold)
+      .foregroundStyle(.secondary)
+      .listRowSeparator(.hidden)
+      .onTapGesture {
+        withAnimation {
+          isRecentFeedExpanded.toggle()
+        }
+      }
+      Section {
+        if isRecentFeedExpanded {
+          TimelineFeedRowView()
+          ForEach(recentFeedItems) { item in
+            RecentlyViewedFeedRowView(item: item)
           }
-        },
-        header: {
-          Label(
-            "Recently Viewed",
-            systemImage: isRecentFeedExpanded ? "chevron.down" : "chevron.right"
-          )
-          .onTapGesture {
-            withAnimation {
-              isRecentFeedExpanded.toggle()
+          .onDelete { indexSet in
+            for index in indexSet {
+              modelContext.delete(recentFeedItems[index])
             }
           }
+          dividerView
         }
-      )
+      }
     }
   }
 
@@ -173,14 +174,14 @@ extension FeedsListView {
   }
 
   private func fetchMyFeeds() async {
-    guard let savedFeeds = currentUser.savedFeeds else { return }
     do {
-      let feeds = try await client.protoClient.getFeedGenerators(
-        filter == .savedFeeds ? savedFeeds.saved : savedFeeds.pinned)
+      let feeds = try await client.protoClient.getFeedGenerators(currentUser.savedFeeds.map{ $0.value })
       withAnimation {
         self.feeds = feeds.feeds.map { $0.feedItem }
       }
-    } catch {}
+    } catch {
+      print(error)
+    }
   }
 
   private func searchFeed(query: String) async {

Packages/Features/Sources/PostUI/Detail/PostDetailView.swift

@@ -43,7 +43,9 @@ public struct PostDetailView: View {
       .screenContainer()
       .task {
         await fetchThread()
-        scrollToId = "focusedPost"
+        if !parents.isEmpty {
+          scrollToId = "focusedPost"
+        }
       }
       .onChange(of: scrollToId) {
         if let scrollToId {

Packages/Model/Package.resolved

@@ -7,7 +7,7 @@
       "location" : "https://github.com/MasterJ93/ATProtoKit",
       "state" : {
         "branch" : "develop",
-        "revision" : "b2027acf40b1947affb4c52db768dd1163c574ac"
+        "revision" : "d82a9b89584c129cc5afb2bb08b6913b4a1536a7"
       }
     },
     {

Packages/Model/Sources/User/CurrentUser.swift

@@ -8,7 +8,7 @@ public class CurrentUser {
   public let client: BSkyClient
 
   public private(set) var profile: AppBskyLexicon.Actor.ProfileViewDetailedDefinition?
-  public private(set) var savedFeeds: AppBskyLexicon.Actor.SavedFeedsPreferencesDefinition?
+  public private(set) var savedFeeds: [AppBskyLexicon.Actor.SavedFeed] = []
 
   public init(client: BSkyClient) {
     self.client = client
@@ -20,6 +20,7 @@ public class CurrentUser {
   }
 
   public func refreshCurrentUser() async {
+    await fetchProfile()
     await fetchPreferences()
   }
 
@@ -36,7 +37,9 @@ public class CurrentUser {
       let preferences = try await client.protoClient.getPreferences().preferences
       for preference in preferences {
         switch preference {
-        case .savedFeeds(let feeds):
+        case .savedFeedsVersion2(let feeds):
+          var feeds = feeds.items
+          feeds.removeAll(where: { $0.value == "following"})
           self.savedFeeds = feeds
         default:
           break