From 249be461d511b10f541ef331b3b1aebe666d74be Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 11:09:55 +0300
Subject: [PATCH] Add "explicit maps" search filter control

---
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs   |  8 +++++++-
 .../BeatmapListing/BeatmapListingFilterControl.cs     |  4 +++-
 .../BeatmapListing/BeatmapListingSearchControl.cs     |  6 +++++-
 osu.Game/Overlays/BeatmapListing/SearchExplicit.cs    | 11 +++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchExplicit.cs

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index bbaa7e745f..939d3c6cb4 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -30,6 +30,8 @@ public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
 
         public SearchPlayed Played { get; }
 
+        public SearchExplicit Explicit { get; }
+
         [CanBeNull]
         public IReadOnlyCollection<ScoreRank> Ranks { get; }
 
@@ -50,7 +52,8 @@ public SearchBeatmapSetsRequest(
             SearchLanguage language = SearchLanguage.Any,
             IReadOnlyCollection<SearchExtra> extra = null,
             IReadOnlyCollection<ScoreRank> ranks = null,
-            SearchPlayed played = SearchPlayed.Any)
+            SearchPlayed played = SearchPlayed.Any,
+            SearchExplicit explicitMaps = SearchExplicit.Hide)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -64,6 +67,7 @@ public SearchBeatmapSetsRequest(
             Extra = extra;
             Ranks = ranks;
             Played = played;
+            Explicit = explicitMaps;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -93,6 +97,8 @@ protected override WebRequest CreateWebRequest()
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());
 
+            req.AddParameter("nsfw", Explicit == SearchExplicit.Show ? "true" : "false");
+
             req.AddCursor(cursor);
 
             return req;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index d991dcfcfb..650adcb4a9 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -141,6 +141,7 @@ protected override void LoadComplete()
             searchControl.Extra.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Ranks.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Explicit.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
@@ -193,7 +194,8 @@ private void performRequest()
                 searchControl.Language.Value,
                 searchControl.Extra,
                 searchControl.Ranks,
-                searchControl.Played.Value);
+                searchControl.Played.Value,
+                searchControl.Explicit.Value);
 
             getSetsRequest.Success += response =>
             {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index e232bf045f..c14d693f7d 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -42,6 +42,8 @@ public class BeatmapListingSearchControl : CompositeDrawable
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
+        public Bindable<SearchExplicit> Explicit => explicitFilter.Current;
+
         public BeatmapSetInfo BeatmapSet
         {
             set
@@ -65,6 +67,7 @@ public BeatmapSetInfo BeatmapSet
         private readonly BeatmapSearchMultipleSelectionFilterRow<SearchExtra> extraFilter;
         private readonly BeatmapSearchScoreFilterRow ranksFilter;
         private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
+        private readonly BeatmapSearchFilterRow<SearchExplicit> explicitFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -125,7 +128,8 @@ public BeatmapListingSearchControl()
                                     languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
                                     extraFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchExtra>(@"Extra"),
                                     ranksFilter = new BeatmapSearchScoreFilterRow(),
-                                    playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played")
+                                    playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played"),
+                                    explicitFilter = new BeatmapSearchFilterRow<SearchExplicit>(@"Explicit Maps"),
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs b/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs
new file mode 100644
index 0000000000..3e57cdd48c
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs
@@ -0,0 +1,11 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public enum SearchExplicit
+    {
+        Hide,
+        Show
+    }
+}