New Post Tracker

Mlem/API/APIClient/APIClient+Comment.swift

@@ -12,7 +12,7 @@ extension APIClient {
     func loadComments(
         for postId: Int,
         maxDepth: Int = 15,
-        type: FeedType = .all,
+        type: APIListingType = .all,
         sort: CommentSortType? = nil,
         page: Int? = nil,
         limit: Int? = nil,

Mlem/API/APIClient/APIClient+Post.swift

@@ -14,7 +14,7 @@ extension APIClient {
         page: Int,
         cursor: String?,
         sort: PostSortType?,
-        type: FeedType,
+        type: APIListingType,
         limit: Int?,
         savedOnly: Bool?,
         communityName: String?

Mlem/API/APIClient/APIClient.swift

@@ -389,7 +389,7 @@ extension APIClient {
         query: String,
         searchType: SearchType,
         sortOption: PostSortType,
-        listingType: FeedType,
+        listingType: APIListingType,
         page: Int?,
         limit: Int?
     ) async throws -> SearchResponse {

Mlem/API/Models/ListingType.swift

@@ -11,10 +11,11 @@ enum APIListingType: String, Codable {
     case all = "All"
     case local = "Local"
     case subscribed = "Subscribed"
+    case moderatorView = "ModeratorView"
 
     // Pre 0.18.0 it appears that they used integers instead of strings here. We can remove this intialiser once we drop support for old versions. To fully support both systems, we'd also need to *encode* back into the correct integer or string format. I'd rather not go through the effort for instance versions that most people don't use any more, so I've disabled the option to edit account settings on instances running <0.18.0
     // - sjmarf
-    
+
     // TODO: 0.17 deprecation remove this initialiser
 
     init(from decoder: Decoder) throws {
@@ -28,7 +29,7 @@ enum APIListingType: String, Codable {
             }
             self = value
         } else if let intValue = try? container.decode(Int.self) {
-            guard 0...2 ~= intValue else {
+            guard 0 ... 2 ~= intValue else {
                 throw DecodingError.dataCorruptedError(
                     in: container,
                     debugDescription: "Must be an integer in range 0...2."

Mlem/API/Requests/Comment/GetComments.swift

@@ -19,7 +19,7 @@ struct GetCommentsRequest: APIGetRequest {
         session: APISession,
         postId: Int,
         maxDepth: Int,
-        type: FeedType,
+        type: APIListingType,
         sort: CommentSortType?,
         page: Int?,
         limit: Int?,

Mlem/API/Requests/Post/GetPosts.swift

@@ -21,7 +21,7 @@ struct GetPostsRequest: APIGetRequest {
         page: Int,
         cursor: String?,
         sort: PostSortType?,
-        type: FeedType,
+        type: APIListingType,
         limit: Int? = nil,
         savedOnly: Bool? = nil,
         communityName: String? = nil

Mlem/API/Requests/SearchRequest.swift

@@ -29,7 +29,7 @@ struct SearchRequest: APIGetRequest {
         query: String,
         searchType: SearchType,
         sortOption: PostSortType,
-        listingType: FeedType,
+        listingType: APIListingType,
         page: Int?,
         communityId: Int?,
         communityName: String?,

Mlem/ContentView.swift

@@ -53,7 +53,7 @@ struct ContentView: View {
     var body: some View {
         FancyTabBar(selection: $tabSelection, navigationSelection: $tabNavigation, dragUpGestureCallback: showAccountSwitcherDragCallback) {
             Group {
-                FeedRoot()
+                FeedsView()
                     .fancyTabItem(tag: TabSelection.feeds) {
                         FancyTabBarLabel(
                             tag: TabSelection.feeds,
@@ -76,18 +76,18 @@ struct ContentView: View {
                 }
 
                 ProfileView(user: myUser)
-                .fancyTabItem(tag: TabSelection.profile) {
-                    FancyTabBarLabel(
-                        tag: TabSelection.profile,
-                        customText: appState.tabDisplayName,
-                        symbolConfiguration: .init(
-                            symbol: FancyTabBarLabel.SymbolConfiguration.profile.symbol,
-                            activeSymbol: FancyTabBarLabel.SymbolConfiguration.profile.activeSymbol,
-                            remoteSymbolUrl: appState.profileTabRemoteSymbolUrl
+                    .fancyTabItem(tag: TabSelection.profile) {
+                        FancyTabBarLabel(
+                            tag: TabSelection.profile,
+                            customText: appState.tabDisplayName,
+                            symbolConfiguration: .init(
+                                symbol: FancyTabBarLabel.SymbolConfiguration.profile.symbol,
+                                activeSymbol: FancyTabBarLabel.SymbolConfiguration.profile.activeSymbol,
+                                remoteSymbolUrl: appState.profileTabRemoteSymbolUrl
+                            )
                         )
-                    )
-                    .simultaneousGesture(accountSwitchLongPress)
-                }
+                        .simultaneousGesture(accountSwitchLongPress)
+                    }
 
                 SearchRoot()
                     .fancyTabItem(tag: TabSelection.search) {

Mlem/Enums/FeedType.swift

@@ -2,76 +2,144 @@
 //  FeedType.swift
 //  Mlem
 //
-//  Created by Jonathan de Jong on 12.06.2023.
+//  Created by Eric Andrews on 2024-01-08.
 //
 
+import Foundation
 import SwiftUI
 
-enum FeedType: String, Encodable, SettingsOptions, AssociatedColor {
-    var id: Self { self }
-
+enum FeedType {
+    case all, local, subscribed, saved
+    case community(CommunityModel)
+
+    static var allAggregateFeedCases: [FeedType] = [.all, .local, .subscribed, .saved]
+
     var label: String {
-        return rawValue
+        switch self {
+        case .all: "All"
+        case .local: "Local"
+        case .subscribed: "Subscribed"
+        case .saved: "Saved"
+        case let .community(communityModel): communityModel.name
+        }
     }
 
-    var description: String {
+    /// Maps FeedType to APIListingType
+    var toApiListingType: APIListingType {
         switch self {
-        case .all:
-            return "Subscribed communities from all instances"
-        case .local:
-            return "Local communities from your server"
-        case .subscribed:
-            return "All communities that federate with your server"
+        case .all: .all
+        case .local: .local
+        case .subscribed: .subscribed
+        case .saved: .all // TODO: change this?
+        case .community: .subscribed
         }
     }
 
-    var color: Color? {
+    /// String for use in shortcuts
+    var toShortcutString: String {
+        switch self {
+        case .all: "All"
+        case .local: "Local"
+        case .subscribed: "Subscribed"
+        case .saved: "Saved" // TODO: change this?
+        case .community: "Subscribed"
+        }
+    }
+
+    static func fromShortcutString(shortcut: String?) -> FeedType? {
+        switch shortcut {
+        case "All":
+            return .all
+        case "Local":
+            return .local
+        case "Subscribed":
+            return .subscribed
+        case "Saved":
+            return .saved
+        default:
+            return nil
+        }
+    }
+
+    var communityId: Int? {
+        switch self {
+        case let .community(communityModel): communityModel.communityId
+        default: nil
+        }
+    }
+}
+
+extension FeedType: Hashable, Identifiable {
+    func hash(into hasher: inout Hasher) {
         switch self {
         case .all:
-            return .blue
+            hasher.combine("all")
         case .local:
-            return .green
+            hasher.combine("local")
         case .subscribed:
-            return .red
+            hasher.combine("subscribed")
+        case .saved:
+            hasher.combine("saved")
+        case let .community(communityModel):
+            hasher.combine("community")
+            hasher.combine(communityModel.communityId)
         }
     }
-
-    case subscribed = "Subscribed"
-    case local = "Local"
-    case all = "All"
+
+    var id: Int { hashValue }
 }
 
 extension FeedType: AssociatedIcon {
     var iconName: String {
         switch self {
-        case .all: return Icons.federatedFeed
-        case .local: return Icons.localFeed
-        case .subscribed: return Icons.subscribedFeed
+        case .all: Icons.federatedFeed
+        case .local: Icons.localFeed
+        case .subscribed: Icons.subscribedFeed
+        case .saved: Icons.savedFeed
+        case .community: Icons.community
         }
     }
 
     var iconNameFill: String {
         switch self {
-        case .all: return Icons.federatedFeedFill
-        case .local: return Icons.localFeedFill
-        case .subscribed: return Icons.subscribedFeedFill
+        case .all: Icons.federatedFeedFill
+        case .local: Icons.localFeedFill
+        case .subscribed: Icons.subscribedFeedFill
+        case .saved: Icons.savedFeedFill
+        case .community: Icons.communityFill
         }
     }
 
     var iconNameCircle: String {
         switch self {
-        case .all: return Icons.federatedFeedCircle
-        case .local: return Icons.localFeedCircle
-        case .subscribed: return Icons.subscribedFeedCircle
+        case .all: Icons.federatedFeedCircle
+        case .local: Icons.localFeedCircle
+        case .subscribed: Icons.subscribedFeedCircle
+        case .saved: Icons.savedFeedCircle
+        case .community: Icons.community
         }
     }
 
     /// Icon to use in system settings. This should be removed when the "unified symbol handling" is closed
     var settingsIconName: String {
         switch self {
-        case .all: return "circle.hexagongrid"
-        case .local: return "house"
-        case .subscribed: return "newspaper"
+        case .all: "circle.hexagongrid"
+        case .local: "house"
+        case .subscribed: "newspaper"
+        case .saved: Icons.save
+        case .community: Icons.community
+        }
+    }
+}
+
+extension FeedType: AssociatedColor {
+    var color: Color? {
+        switch self {
+        case .all: .blue
+        case .local: .purple
+        case .subscribed: .red
+        case .saved: .green
+        case .community: .blue
         }
     }
 }

Mlem/Enums/Settings/DefaultFeedType.swift

@@ -0,0 +1,34 @@
+//
+//  DefaultFeedType.swift
+//  Mlem
+//
+//  Created by Eric Andrews on 2024-01-22.
+//
+
+import Foundation
+
+enum DefaultFeedType: String, SettingsOptions, CaseIterable {
+    case all, local, subscribed, saved
+
+    var label: String { rawValue.capitalized }
+
+    var settingsIconName: String {
+        switch self {
+        case .all: Icons.federatedFeed
+        case .local: Icons.localFeed
+        case .subscribed: Icons.subscribedFeed
+        case .saved: Icons.savedFeed
+        }
+    }
+
+    var toFeedType: FeedType {
+        switch self {
+        case .all: .all
+        case .local: .local
+        case .subscribed: .subscribed
+        case .saved: .saved
+        }
+    }
+
+    var id: Self { self }
+}

Mlem/Enums/User/UserViewTab.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 enum UserViewTab: String, CaseIterable, Identifiable {
-    case overview, comments, posts, communities, saved
+    case overview, comments, posts, communities
 
     var id: Self { self }
 

Mlem/Extensions/Tracker Items/PostModel+TrackerItem.swift

@@ -0,0 +1,17 @@
+//
+//  PostModel+TrackerItem.swift
+//  Mlem
+//
+//  Created by Eric Andrews on 2024-01-04.
+//
+
+import Foundation
+
+extension PostModel: TrackerItem {
+    func sortVal(sortType: TrackerSortType) -> TrackerSortVal {
+        switch sortType {
+        case .published:
+            return .published(published)
+        }
+    }
+}