From e84c79d14051ecb220429c38cdb321e53f9a0b24 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 2 Aug 2019 13:16:33 -0700
Subject: [PATCH 1/2] Update osu!direct categories sorting with web changes

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index d9d05ff285..c8c36789c4 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -27,24 +27,25 @@ namespace osu.Game.Online.API.Requests
         }
 
         // ReSharper disable once ImpureMethodCallOnReadonlyValueField
-        protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={(int)searchCategory}&sort={sortCriteria.ToString().ToLowerInvariant()}_{directionString}";
+        protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={searchCategory.ToString().ToLowerInvariant()}&sort={sortCriteria.ToString().ToLowerInvariant()}_{directionString}";
     }
 
     public enum BeatmapSearchCategory
     {
-        Any = 7,
+        Any,
 
-        [Description("Ranked & Approved")]
-        RankedApproved = 0,
-        Qualified = 3,
-        Loved = 8,
-        Favourites = 2,
+        [Description("Has Leaderboard")]
+        Leaderboard,
+        Ranked,
+        Qualified,
+        Loved,
+        Favourites,
 
         [Description("Pending & WIP")]
-        PendingWIP = 4,
-        Graveyard = 5,
+        Pending,
+        Graveyard,
 
         [Description("My Maps")]
-        MyMaps = 6,
+        Mine,
     }
 }

From 0082695cd827a574e91a0c8be4d0bd8da1288e8e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 2 Aug 2019 13:22:58 -0700
Subject: [PATCH 2/2] Choose default category sorting instead of being always
 first

---
 osu.Game/Overlays/Direct/FilterControl.cs                     | 1 +
 .../Overlays/SearchableList/SearchableListFilterControl.cs    | 4 ++++
 osu.Game/Overlays/Social/FilterControl.cs                     | 1 +
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs     | 1 +
 4 files changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/Direct/FilterControl.cs b/osu.Game/Overlays/Direct/FilterControl.cs
index 4b43542b43..8b04bf0387 100644
--- a/osu.Game/Overlays/Direct/FilterControl.cs
+++ b/osu.Game/Overlays/Direct/FilterControl.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Overlays.Direct
 
         protected override Color4 BackgroundColour => OsuColour.FromHex(@"384552");
         protected override DirectSortCriteria DefaultTab => DirectSortCriteria.Ranked;
+        protected override BeatmapSearchCategory DefaultCategory => BeatmapSearchCategory.Leaderboard;
 
         protected override Drawable CreateSupplementaryControls() => rulesetSelector = new DirectRulesetSelector();
 
diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
index b0a8a0e77d..a0c4e9a080 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Overlays.SearchableList
 
         protected abstract Color4 BackgroundColour { get; }
         protected abstract T DefaultTab { get; }
+        protected abstract U DefaultCategory { get; }
         protected virtual Drawable CreateSupplementaryControls() => null;
 
         /// <summary>
@@ -109,6 +110,9 @@ namespace osu.Game.Overlays.SearchableList
 
             Tabs.Current.Value = DefaultTab;
             Tabs.Current.TriggerChange();
+
+            DisplayStyleControl.Dropdown.Current.Value = DefaultCategory;
+            DisplayStyleControl.Dropdown.Current.TriggerChange();
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Social/FilterControl.cs b/osu.Game/Overlays/Social/FilterControl.cs
index 6abf6ec98d..1c2cb95dfe 100644
--- a/osu.Game/Overlays/Social/FilterControl.cs
+++ b/osu.Game/Overlays/Social/FilterControl.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Overlays.Social
     {
         protected override Color4 BackgroundColour => OsuColour.FromHex(@"47253a");
         protected override SocialSortCriteria DefaultTab => SocialSortCriteria.Rank;
+        protected override SortDirection DefaultCategory => SortDirection.Ascending;
 
         public FilterControl()
         {
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 8e14f76e4b..d0d983bbff 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
     {
         protected override Color4 BackgroundColour => OsuColour.FromHex(@"362e42");
         protected override PrimaryFilter DefaultTab => PrimaryFilter.Open;
+        protected override SecondaryFilter DefaultCategory => SecondaryFilter.Public;
 
         protected override float ContentHorizontalPadding => base.ContentHorizontalPadding + OsuScreen.HORIZONTAL_OVERFLOW_PADDING;