Merge pull request #14010 from peppy/fix-direct-search-ecaping

Fix beatmap search requests double-escaping
This commit is contained in:
Bartłomiej Dach 2021-07-25 11:38:11 +02:00 committed by GitHub
commit ed0e729ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -59,7 +59,7 @@ namespace osu.Game.Online.API.Requests
SearchPlayed played = SearchPlayed.Any, SearchPlayed played = SearchPlayed.Any,
SearchExplicit explicitContent = SearchExplicit.Hide) SearchExplicit explicitContent = SearchExplicit.Hide)
{ {
this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query); this.query = query;
this.ruleset = ruleset; this.ruleset = ruleset;
this.cursor = cursor; this.cursor = cursor;
@ -78,7 +78,9 @@ namespace osu.Game.Online.API.Requests
protected override WebRequest CreateWebRequest() protected override WebRequest CreateWebRequest()
{ {
var req = base.CreateWebRequest(); var req = base.CreateWebRequest();
req.AddParameter("q", query);
if (query != null)
req.AddParameter("q", query);
if (General != null && General.Any()) if (General != null && General.Any())
req.AddParameter("c", string.Join('.', General.Select(e => e.ToString().ToLowerInvariant()))); req.AddParameter("c", string.Join('.', General.Select(e => e.ToString().ToLowerInvariant())));