From 3ce8e29244681116e5ebc7a132f04c4ce73b99b9 Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Mon, 18 Sep 2023 17:32:01 +0200 Subject: [PATCH] Don't prioritize hashtags or users (IOS-141) --- .../SearchHistoryViewModel+Diffable.swift | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistoryViewModel+Diffable.swift b/Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistoryViewModel+Diffable.swift index 26f8f572f..a8af8e845 100644 --- a/Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistoryViewModel+Diffable.swift +++ b/Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistoryViewModel+Diffable.swift @@ -37,21 +37,18 @@ extension SearchHistoryViewModel { do { let managedObjectContext = self.context.managedObjectContext let items: [SearchHistoryItem] = try await managedObjectContext.perform { - var users: [SearchHistoryItem] = [] - var hashtags: [SearchHistoryItem] = [] - + var items: [SearchHistoryItem] = [] + for record in records { guard let searchHistory = record.object(in: managedObjectContext) else { continue } if let user = searchHistory.account { - users.append(.user(.init(objectID: user.objectID))) + items.append(.user(.init(objectID: user.objectID))) } else if let hashtag = searchHistory.hashtag { - hashtags.append(.hashtag(.init(objectID: hashtag.objectID))) - } else { - continue + items.append(.hashtag(.init(objectID: hashtag.objectID))) } } - return users + hashtags + return items } let mostRecentItems = Array(items.prefix(10))