Cleanup

Dimillian · May 18, 2021 · c8ec43c · c8ec43c
1 parent 8659528
commit c8ec43c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Packages/Backend/Sources/Backend/Network/Models/SubredditPost+Networking.swift b/Packages/Backend/Sources/Backend/Network/Models/SubredditPost+Networking.swift
@@ -11,10 +11,10 @@ import Combine
 extension SubredditPost { 
  static public func fetch(subreddit: String,
  sort: String,
- after: SubredditPost?) -> AnyPublisher<ListingResponse<SubredditPost>, Never> {
+ after: String?) -> AnyPublisher<ListingResponse<SubredditPost>, Never> {
  var params: [String: String] = [:]
  if let listing = after {
- params["after"] = "t3_\(listing.id)"
+ params["after"] = "t3_\(listing)"
  }
  return API.shared.request(endpoint: .subreddit(name: subreddit, sort: sort),
  params: params)

diff --git a/RedditOs/Features/Subreddit/SubredditPostsListView.swift b/RedditOs/Features/Subreddit/SubredditPostsListView.swift
@@ -82,7 +82,7 @@ struct SubredditPostsListView: View, Equatable {
  if !viewModel.searchText.isEmpty && viewModel.searchResults != nil {
  viewModel.fetchSearch(text: viewModel.searchText, after: viewModel.searchResults?.last?.id)
  } else {
- viewModel.fetchListings()
+ viewModel.fetchListings(after: viewModel.listings?.last?.id)
  }
  }
  .equatable()
@@ -142,8 +142,8 @@ struct SubredditPostsListView: View, Equatable {
  viewModel.fetchAbout()
  }
  uiState.selectedSubreddit = viewModel
+ viewModel.fetchListings(after: nil)
  }
- .onAppear(perform: viewModel.fetchListings)
  }
 }
 

diff --git a/RedditOs/Features/Subreddit/SubredditViewModel.swift b/RedditOs/Features/Subreddit/SubredditViewModel.swift
@@ -27,7 +27,7 @@ class SubredditViewModel: ObservableObject {
  @AppStorage(SettingsKey.subreddit_defaut_sort_order) var sortOrder = SortOrder.hot {
  didSet {
  listings = nil
- fetchListings()
+ fetchListings(after: nil)
  }
  }
  @Published var errorLoadingAbout = false
@@ -65,14 +65,14 @@ class SubredditViewModel: ObservableObject {
  .store(in: &cancellableSet)
  }
 
- func fetchListings() {
+ func fetchListings(after: String?) {
  SubredditPost.fetch(subreddit: name,
  sort: sortOrder.rawValue,
- after: listings?.last)
+ after: after)
  .receive(on: DispatchQueue.main)
  .map{ $0.data?.children.map{ $0.data }}
  .sink{ [weak self] listings in
- if self?.listings?.last != nil, let listings = listings {
+ if after != nil, let listings = listings {
  self?.listings?.append(contentsOf: listings)
  } else if self?.listings == nil {
  self?.listings = listings

diff --git a/RedditOs/RedditOsApp.swift b/RedditOs/RedditOsApp.swift
@@ -41,7 +41,7 @@ struct RedditOsApp: App {
  CommandMenu("Subreddit") {
  Button(action: {
  uiState.selectedSubreddit?.listings = nil
- uiState.selectedSubreddit?.fetchListings()
+ uiState.selectedSubreddit?.fetchListings(after: nil)
  }) {
  Text("Refresh")
  }