Update beatmap search API to match latest osu-web structure

osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs

@@ -1,16 +1,14 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
 using System.ComponentModel;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Direct;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class SearchBeatmapSetsRequest : APIRequest<IEnumerable<APIBeatmapSet>>
+    public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
         private readonly string query;
         private readonly RulesetInfo ruleset;
@@ -35,6 +33,7 @@ public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, BeatmapSearch
     public enum BeatmapSearchCategory
     {
         Any = 7,
+
         [Description("Ranked & Approved")]
         RankedApproved = 0,
         Approved = 1,
@@ -43,6 +42,7 @@ public enum BeatmapSearchCategory
         Qualified = 3,
         Pending = 4,
         Graveyard = 5,
+
         [Description("My Maps")]
         MyMaps = 6,
     }

osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs

@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class SearchBeatmapSetsResponse
+    {
+        public IEnumerable<APIBeatmapSet> BeatmapSets;
+
+        /// <summary>
+        /// A collection of parameters which should be passed to the search endpoint to fetch the next page.
+        /// </summary>
+        [JsonProperty("cursor")]
+        public dynamic CursorJson;
+    }
+}

osu.Game/Overlays/DirectOverlay.cs

@@ -288,7 +288,7 @@ private void updateSearch()
             {
                 Task.Run(() =>
                 {
-                    var sets = response.Select(r => r.ToBeatmapSet(rulesets)).ToList();
+                    var sets = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
 
                     // may not need scheduling; loads async internally.
                     Schedule(() =>