From 5ec35b600948037bbe23b2f36886e4a340b7388d Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sun, 16 Apr 2023 18:20:16 -0400
Subject: [PATCH] Fix reblogged statuses appearing Bookmarks

Closes #359
---
 .../Local Predicate Statuses List/BookmarksViewController.swift | 2 +-
 .../Local Predicate Statuses List/FavoritesViewController.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tusker/Screens/Local Predicate Statuses List/BookmarksViewController.swift b/Tusker/Screens/Local Predicate Statuses List/BookmarksViewController.swift
index da759371..8e91d65d 100644
--- a/Tusker/Screens/Local Predicate Statuses List/BookmarksViewController.swift	
+++ b/Tusker/Screens/Local Predicate Statuses List/BookmarksViewController.swift	
@@ -13,7 +13,7 @@ class BookmarksViewController: LocalPredicateStatusesViewController {
     
     init(mastodonController: MastodonController) {
         super.init(
-            predicate: { $0.bookmarked ?? false },
+            predicate: { $0.reblog == nil && $0.bookmarked ?? false },
             predicateTitle: "Bookmarks",
             request: { Client.getBookmarks(range: $0) },
             mastodonController: mastodonController
diff --git a/Tusker/Screens/Local Predicate Statuses List/FavoritesViewController.swift b/Tusker/Screens/Local Predicate Statuses List/FavoritesViewController.swift
index b257bebb..efd9425f 100644
--- a/Tusker/Screens/Local Predicate Statuses List/FavoritesViewController.swift	
+++ b/Tusker/Screens/Local Predicate Statuses List/FavoritesViewController.swift	
@@ -13,7 +13,7 @@ class FavoritesViewController: LocalPredicateStatusesViewController {
 
     init(mastodonController: MastodonController) {
         super.init(
-            predicate: \.favourited,
+            predicate: { $0.reblog == nil && $0.favourited },
             predicateTitle: "Favorites",
             request: { Client.getFavourites(range: $0) },
             mastodonController: mastodonController