diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift index 4a79c36b8..ab1e9642d 100644 --- a/Mac/MainWindow/Timeline/TimelineViewController.swift +++ b/Mac/MainWindow/Timeline/TimelineViewController.swift @@ -96,7 +96,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr if let representedObjects = representedObjects, representedObjects.count == 1 && representedObjects.first is WebFeed { showFeedNames = { for article in articles { - if article.authors?.contains(where: { $0.name != nil }) ?? false { + if !article.byline().isEmpty { return .byline } } @@ -955,11 +955,16 @@ private extension TimelineViewController { } func updateShowIcons() { - if showFeedNames != .none { + if showFeedNames == .feed { self.showIcons = true return } + if showFeedNames == .none { + self.showIcons = false + return + } + for article in articles { if let authors = article.authors { for author in authors { diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index d384f53ee..509a42425 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1462,7 +1462,7 @@ private extension SceneCoordinator { if timelineFeed is WebFeed { showFeedNames = { for article in articles { - if article.authors?.contains(where: { $0.name != nil }) ?? false { + if !article.byline().isEmpty { return .byline } } @@ -1477,6 +1477,11 @@ private extension SceneCoordinator { return } + if showFeedNames == .none { + self.showIcons = false + return + } + for article in articles { if let authors = article.authors { for author in authors {