From 4928ab8825ccc8e26985b969017e9eaba4586f7e Mon Sep 17 00:00:00 2001 From: nixzhu Date: Tue, 3 Nov 2015 15:49:02 +0800 Subject: [PATCH] maxFeedID in discoverFeeds for Time --- Yep/Services/YepService.swift | 6 +++++- Yep/ViewControllers/Feeds/FeedsViewController.swift | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift index 8a80b883..10cd5408 100644 --- a/Yep/Services/YepService.swift +++ b/Yep/Services/YepService.swift @@ -2517,7 +2517,7 @@ let parseFeeds: JSONDictionary -> [DiscoveredFeed]? = { data in return [] } -func discoverFeedsWithSortStyle(sortStyle: FeedSortStyle, skill: Skill?, pageIndex: Int, perPage: Int, failureHandler: ((Reason, String?) -> Void)?,completion: [DiscoveredFeed] -> Void) { +func discoverFeedsWithSortStyle(sortStyle: FeedSortStyle, skill: Skill?, pageIndex: Int, perPage: Int, maxFeedID: String?, failureHandler: ((Reason, String?) -> Void)?,completion: [DiscoveredFeed] -> Void) { var requestParameters: JSONDictionary = [ "sort": sortStyle.rawValue, @@ -2529,6 +2529,10 @@ func discoverFeedsWithSortStyle(sortStyle: FeedSortStyle, skill: Skill?, pageInd requestParameters["skill_id"] = skill.id } + if let maxFeedID = maxFeedID { + requestParameters["max_id"] = maxFeedID + } + let parse = parseFeeds let resource = authJsonResource(path: "/api/v1/topics/discover", method: .GET, requestParameters: requestParameters, parse: parse) diff --git a/Yep/ViewControllers/Feeds/FeedsViewController.swift b/Yep/ViewControllers/Feeds/FeedsViewController.swift index db9ca38c..15717288 100644 --- a/Yep/ViewControllers/Feeds/FeedsViewController.swift +++ b/Yep/ViewControllers/Feeds/FeedsViewController.swift @@ -238,7 +238,9 @@ class FeedsViewController: UIViewController { currentPageIndex = 1 } - discoverFeedsWithSortStyle(feedSortStyle, skill: skill, pageIndex: currentPageIndex, perPage: 25, failureHandler: { reason, errorMessage in + let maxFeedID = (feedSortStyle == FeedSortStyle.Time) ? feeds.last?.id : nil + + discoverFeedsWithSortStyle(feedSortStyle, skill: skill, pageIndex: currentPageIndex, perPage: 25, maxFeedID: maxFeedID, failureHandler: { reason, errorMessage in dispatch_async(dispatch_get_main_queue()) { [weak self] in