From c15a5fc90fa882f4c149669026e5d64b03626428 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 10 Oct 2022 14:23:22 -0400 Subject: [PATCH] Fix reblog statuses being selected in timeline --- Tusker/Screens/Timeline/TimelineViewController.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tusker/Screens/Timeline/TimelineViewController.swift b/Tusker/Screens/Timeline/TimelineViewController.swift index 5d5d62e1..ccc872d1 100644 --- a/Tusker/Screens/Timeline/TimelineViewController.swift +++ b/Tusker/Screens/Timeline/TimelineViewController.swift @@ -368,7 +368,9 @@ extension TimelineViewController: UICollectionViewDelegate { case .publicTimelineDescription: removeTimelineDescriptionCell() case .status(id: let id, state: let state): - selected(status: id, state: state.copy()) + let status = mastodonController.persistentContainer.status(for: id)! + // if the status in the timeline is a reblog, show the status that it is a reblog of + selected(status: status.reblog?.id ?? id, state: state.copy()) case .loadingIndicator, .confirmLoadMore: fatalError("unreachable") }