home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-11 05:45:56 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/CatchChat/Yep into develop

Browse Source
This commit is contained in:
kevinzhow
2015-11-03 16:41:34 +08:00
parent 2552c93aa3 4928ab8825
commit a396da927c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Services/YepService.swift
+5 -1
View File
@@ -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)
Yep/ViewControllers/Feeds/FeedsViewController.swift
+3 -1
View File
@@ -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