From 854c6afe94d40666e06c98dc8cf101e1543d2dc7 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Thu, 31 Oct 2013 21:44:48 -0500 Subject: [PATCH] Don't use parameters beyond first page --- Octokit.Reactive/Helpers/ConnectionExtensions.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Octokit.Reactive/Helpers/ConnectionExtensions.cs b/Octokit.Reactive/Helpers/ConnectionExtensions.cs index b00637b3..2a0fa79c 100644 --- a/Octokit.Reactive/Helpers/ConnectionExtensions.cs +++ b/Octokit.Reactive/Helpers/ConnectionExtensions.cs @@ -9,18 +9,18 @@ namespace Octokit.Reactive.Internal { public static IObservable GetAndFlattenAllPages(this IConnection connection, Uri url, IDictionary parameters = null, string accepts = null) { - return GetPages(url, nextPageUrl => connection.GetAsync>(nextPageUrl, parameters, accepts).ToObservable()); + return GetPages(url, parameters, (pageUrl, pageParams) => connection.GetAsync>(pageUrl, pageParams, accepts).ToObservable()); } - static IObservable GetPages(Uri uri, - Func>>> getPageFunc) + static IObservable GetPages(Uri uri, IDictionary parameters, + Func, IObservable>>> getPageFunc) { - return getPageFunc(uri).Expand(resp => + return getPageFunc(uri, parameters).Expand(resp => { var nextPageUrl = resp.ApiInfo.GetNextPageUrl(); return nextPageUrl == null ? Observable.Empty>>() - : Observable.Defer(() => getPageFunc(nextPageUrl)); + : Observable.Defer(() => getPageFunc(nextPageUrl, null)); }) .Where(resp => resp != null) .SelectMany(resp => resp.BodyAsObject);