From 6b99c9def350d358f5e045191a2d22e4a447c36f Mon Sep 17 00:00:00 2001
From: Nathan Mattes <hallo@bullenscheisse.de>
Date: Thu, 23 May 2024 15:45:17 +0200
Subject: [PATCH] Load more statuses from hashtag-timeline right away (IOS-272)

---
 .../HashtagTimelineViewController.swift       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift
index 5d88e9b43..e26eac6a6 100644
--- a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift
+++ b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift
@@ -95,17 +95,7 @@ extension HashtagTimelineViewController {
                 self.refreshControl.endRefreshing()
             }
             .store(in: &disposeBag)
-        
-        // setup batch fetch
-        viewModel.listBatchFetchViewModel.setup(scrollView: tableView)
-        viewModel.listBatchFetchViewModel.shouldFetch
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] _ in
-                guard let self = self else { return }
-                self.viewModel.stateMachine.enter(HashtagTimelineViewModel.State.Loading.self)
-            }
-            .store(in: &disposeBag)
-        
+
         viewModel.hashtagEntity
             .receive(on: DispatchQueue.main)
             .sink { [weak self] tag in
@@ -257,3 +247,13 @@ extension HashtagTimelineViewController: StatusTableViewControllerNavigateable {
         statusKeyCommandHandler(sender)
     }
 }
+
+// MARK: - UIScrollViewDelegate
+
+extension HashtagTimelineViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        ListBatchFetchViewModel.scrollViewdidScrollToEnd(scrollView) {
+            viewModel.stateMachine.enter(HashtagTimelineViewModel.State.Loading.self)
+        }
+    }
+}