From ae09d529409154e148a079cd3b511278f718a7a1 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Sun, 17 Apr 2022 15:26:37 -0500 Subject: [PATCH] Return [Article] from articlesForIndexes() instead of Set
--- Mac/MainWindow/Timeline/TimelineViewController.swift | 2 +- Shared/Timeline/ArticleArray.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift index e3fdc0895..e6c33b597 100644 --- a/Mac/MainWindow/Timeline/TimelineViewController.swift +++ b/Mac/MainWindow/Timeline/TimelineViewController.swift @@ -85,7 +85,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr var showsSearchResults = false var selectedArticles: [Article] { - return Array(articles.articlesForIndexes(tableView.selectedRowIndexes)) + return articles.articlesForIndexes(tableView.selectedRowIndexes) } var hasAtLeastOneSelectedArticle: Bool { diff --git a/Shared/Timeline/ArticleArray.swift b/Shared/Timeline/ArticleArray.swift index 104f06f8c..2f8d69e06 100644 --- a/Shared/Timeline/ArticleArray.swift +++ b/Shared/Timeline/ArticleArray.swift @@ -44,10 +44,10 @@ extension Array where Element == Article { return nil } - func articlesForIndexes(_ indexes: IndexSet) -> Set
{ - return Set(indexes.compactMap{ (oneIndex) -> Article? in + func articlesForIndexes(_ indexes: IndexSet) -> [Article] { + return indexes.compactMap{ (oneIndex) -> Article? in return articleAtRow(oneIndex) - }) + } } func sortedByDate(_ sortDirection: ComparisonResult, groupByFeed: Bool = false) -> ArticleArray {