From e47d54d5060fbdc9a8627965b5f332b6c3c10dcf Mon Sep 17 00:00:00 2001 From: shannon Date: Mon, 6 Jan 2025 10:24:14 -0500 Subject: [PATCH] Rename for clarity --- .../HomeTimelineViewModel+LoadLatestState.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift index 72980f15a..6348c06cd 100644 --- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift +++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift @@ -48,7 +48,8 @@ extension HomeTimelineViewModel.LoadLatestState { } override func didEnter(from previousState: GKState?) { - didEnter(from: previousState, viewModel: viewModel, isUserInitiated: false) + super.didEnter(from: previousState) + loadLatest(viewModel: viewModel, isUserInitiated: false, isContextSwitch: previousState is HomeTimelineViewModel.LoadLatestState.ContextSwitch) } } @@ -58,7 +59,8 @@ extension HomeTimelineViewModel.LoadLatestState { } override func didEnter(from previousState: GKState?) { - didEnter(from: previousState, viewModel: viewModel, isUserInitiated: true) + super.didEnter(from: previousState) + loadLatest(viewModel: viewModel, isUserInitiated: true, isContextSwitch: previousState is HomeTimelineViewModel.LoadLatestState.ContextSwitch) } } @@ -100,9 +102,7 @@ extension HomeTimelineViewModel.LoadLatestState { } } - private func didEnter(from previousState: GKState?, viewModel: HomeTimelineViewModel?, isUserInitiated: Bool) { - super.didEnter(from: previousState) - + private func loadLatest(viewModel: HomeTimelineViewModel?, isUserInitiated: Bool, isContextSwitch: Bool) { guard let viewModel else { return } Task { @MainActor in @@ -197,7 +197,7 @@ extension HomeTimelineViewModel.LoadLatestState { return statuses.isNotEmpty }() - if hasNewStatuses && (previousState is HomeTimelineViewModel.LoadLatestState.ContextSwitch) == false { + if hasNewStatuses && !isContextSwitch { viewModel.hasNewPosts.value = true }