Merge branch 'dev' into sjmarf/info-stack-default-fix

mlemgroup · Jan 12, 2024 · 15216a1 · 15216a1
2 parents 5a1b2c8 + 589a374
commit 15216a1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Mlem/Models/Content/Community/CommunityModel+MenuFunctions.swift b/Mlem/Models/Content/Community/CommunityModel+MenuFunctions.swift
@@ -96,8 +96,8 @@ extension CommunityModel {
         }
         if let function = try? subscribeMenuFunction(callback) {
             functions.append(.standard(function))
+            functions.append(.standard(favoriteMenuFunction(callback)))
         }
-        functions.append(.standard(favoriteMenuFunction(callback)))
         functions.append(
             .standardMenuFunction(
                 text: "Copy Name",

diff --git a/Mlem/Models/Content/Community/CommunityModel+SwipeActions.swift b/Mlem/Models/Content/Community/CommunityModel+SwipeActions.swift
@@ -78,8 +78,8 @@ extension CommunityModel {
 
         if let subscribeAction {
             trailingActions.append(subscribeAction)
+            trailingActions.append(favoriteAction)
         }
-        trailingActions.append(favoriteAction)
 
         return SwipeConfiguration(leadingActions: [], trailingActions: trailingActions)
     }

diff --git a/Mlem/Views/Tabs/Feeds/PostFeedView.swift b/Mlem/Views/Tabs/Feeds/PostFeedView.swift
@@ -112,6 +112,7 @@ struct PostFeedView: View {
         }
         .onChange(of: showReadPosts) { _ in
             Task(priority: .userInitiated) {
+                postTracker.filter = self.filter
                 await postTracker.refresh(clearBeforeFetch: true)
             }
         }