From c1cd172021a399ec7f590da206cc4bef2cb17254 Mon Sep 17 00:00:00 2001
From: Alexander Legotin <mrproz@yandex.ru>
Date: Wed, 15 Nov 2017 08:32:49 -0800
Subject: [PATCH] #83. #88, #94

---
 InstaSharper.Tests/Utils/TestHelpers.cs | 10 ----------
 InstaSharper/API/InstaApi.cs            | 23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/InstaSharper.Tests/Utils/TestHelpers.cs b/InstaSharper.Tests/Utils/TestHelpers.cs
index 5212cddd..83f26f0e 100644
--- a/InstaSharper.Tests/Utils/TestHelpers.cs
+++ b/InstaSharper.Tests/Utils/TestHelpers.cs
@@ -12,16 +12,6 @@ namespace InstaSharper.Tests.Utils
 {
     public class TestHelpers
     {
-        public static IInstaApi GetDefaultInstaApiInstance(string username)
-        {
-            var apiInstance = InstaApiBuilder.CreateBuilder()
-                .SetUserName(username)
-                .UseLogger(new DebugLogger(LogLevel.All))
-                .SetSignatureKey("b4946d296abf005163e72346a6d33dd083cadde638e6ad9c5eb92e381b35784a")
-                .Build();
-            return apiInstance;
-        }
-
         public static IInstaApi GetDefaultInstaApiInstance(UserSessionData user)
         {
             var apiInstance = InstaApiBuilder.CreateBuilder()
diff --git a/InstaSharper/API/InstaApi.cs b/InstaSharper/API/InstaApi.cs
index 5148fce9..9e618363 100644
--- a/InstaSharper/API/InstaApi.cs
+++ b/InstaSharper/API/InstaApi.cs
@@ -508,7 +508,6 @@ public async Task<IResult<InstaUserShortList>> GetUserFollowersAsync(string user
                 followers.AddRange(
                     followersResponse.Value.Items.Select(ConvertersFabric.GetUserShortConverter)
                         .Select(converter => converter.Convert()));
-                if (!followersResponse.Value.IsBigList) return Result.Success(followers);
                 var pages = 1;
                 while (!string.IsNullOrEmpty(followersResponse.Value.NextMaxId) && pages < maxPages)
                 {
@@ -593,7 +592,15 @@ public async Task<IResult<InstaUserShortList>> GetUserFollowingAsync(string user
         public async Task<IResult<InstaUserShortList>> GetCurrentUserFollowersAsync(int maxPages = 0)
         {
             ValidateUser();
-            return await GetUserFollowersAsync(_user.UserName, maxPages);
+            try
+            {
+                return await GetUserFollowersAsync(_user.UserName, maxPages);
+            }
+            catch (Exception exception)
+            {
+                LogException(exception);
+                return Result.Fail<InstaUserShortList>(exception);
+            }
         }
 
         /// <summary>
@@ -1714,13 +1721,15 @@ private async Task<IResult<InstaUserListShortResponse>> GetUserListByURIAsync(Ur
                 var request = HttpHelper.GetDefaultRequest(HttpMethod.Get, uri, _deviceInfo);
                 var response = await _httpRequestProcessor.SendAsync(request);
                 var json = await response.Content.ReadAsStringAsync();
-                if (response.StatusCode == HttpStatusCode.OK)
+                if (response.StatusCode != HttpStatusCode.OK)
+                    return Result.UnExpectedResponse<InstaUserListShortResponse>(response, json);
+                var instaUserListResponse = JsonConvert.DeserializeObject<InstaUserListShortResponse>(json);
+                if (!instaUserListResponse.IsOk())
                 {
-                    var instaUserListResponse = JsonConvert.DeserializeObject<InstaUserListShortResponse>(json);
-                    if (!instaUserListResponse.IsOk()) Result.Fail("", (InstaUserListShortResponse) null);
-                    return Result.Success(instaUserListResponse);
+                    var status = ErrorHandlingHelper.GetBadStatusFromJsonString(json);
+                    Result.Fail(new ResultInfo(status.Message), (InstaUserListShortResponse) null);
                 }
-                return Result.UnExpectedResponse<InstaUserListShortResponse>(response, json);
+                return Result.Success(instaUserListResponse);
             }
             catch (Exception exception)
             {