From 2784fb87716fc04e04d426607a19c993417aa25d Mon Sep 17 00:00:00 2001 From: CMK Date: Fri, 13 May 2022 13:59:54 +0800 Subject: [PATCH 1/2] fix: duplicate auto complete items may crash the app issue --- Mastodon/Scene/Compose/AutoComplete/AutoCompleteViewModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mastodon/Scene/Compose/AutoComplete/AutoCompleteViewModel.swift b/Mastodon/Scene/Compose/AutoComplete/AutoCompleteViewModel.swift index dc6ab178..3110f93e 100644 --- a/Mastodon/Scene/Compose/AutoComplete/AutoCompleteViewModel.swift +++ b/Mastodon/Scene/Compose/AutoComplete/AutoCompleteViewModel.swift @@ -46,7 +46,7 @@ final class AutoCompleteViewModel { var snapshot = NSDiffableDataSourceSnapshot() snapshot.appendSections([.main]) - snapshot.appendItems(items, toSection: .main) + snapshot.appendItems(items.removingDuplicates(), toSection: .main) if let currentState = self.stateMachine.currentState { switch currentState { case is State.Loading, is State.Fail: From ec8e1b8760c51dc40638052a84a6d1d360fb389a Mon Sep 17 00:00:00 2001 From: CMK Date: Fri, 13 May 2022 14:31:53 +0800 Subject: [PATCH 2/2] fix: duplicated tag raise crash issue --- .../Hashtags/DiscoveryHashtagsViewModel+Diffable.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewModel+Diffable.swift b/Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewModel+Diffable.swift index 0370f3f5..19241d2e 100644 --- a/Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewModel+Diffable.swift +++ b/Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewModel+Diffable.swift @@ -32,7 +32,7 @@ extension DiscoveryHashtagsViewModel { snapshot.appendSections([.hashtags]) let items = hashtags.map { DiscoveryItem.hashtag($0) } - snapshot.appendItems(items, toSection: .hashtags) + snapshot.appendItems(items.removingDuplicates(), toSection: .hashtags) diffableDataSource.apply(snapshot) }