From 2187523bf3950af6dec5bc113c75a92920130830 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jan 2020 19:21:27 +0900
Subject: [PATCH] Fix json web requests having incorrect user agents

---
 osu.Game/Online/API/APIRequest.cs        | 12 +-----------
 osu.Game/Online/API/OAuth.cs             |  3 +--
 osu.Game/Online/API/OsuJsonWebRequest.cs | 21 +++++++++++++++++++++
 osu.Game/Updater/SimpleUpdateManager.cs  |  4 ++--
 4 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game/Online/API/OsuJsonWebRequest.cs

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 6c9356a9b7..30c1018c1e 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Online.API
     {
         protected override WebRequest CreateWebRequest() => new OsuJsonWebRequest<T>(Uri);
 
-        public T Result => ((JsonWebRequest<T>)WebRequest).ResponseObject;
+        public T Result => ((OsuJsonWebRequest<T>)WebRequest).ResponseObject;
 
         protected APIRequest()
         {
@@ -30,16 +30,6 @@ namespace osu.Game.Online.API
         /// This will be scheduled to the API's internal scheduler (run on update thread automatically).
         /// </summary>
         public new event APISuccessHandler<T> Success;
-
-        private class OsuJsonWebRequest<U> : JsonWebRequest<U>
-        {
-            public OsuJsonWebRequest(string uri)
-                : base(uri)
-            {
-            }
-
-            protected override string UserAgent => "osu!";
-        }
     }
 
     /// <summary>
diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index baf494ebf9..bdc47aab8d 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Net.Http;
 using osu.Framework.Bindables;
-using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API
 {
@@ -166,7 +165,7 @@ namespace osu.Game.Online.API
             }
         }
 
-        private class AccessTokenRequest : JsonWebRequest<OAuthToken>
+        private class AccessTokenRequest : OsuJsonWebRequest<OAuthToken>
         {
             protected string GrantType;
 
diff --git a/osu.Game/Online/API/OsuJsonWebRequest.cs b/osu.Game/Online/API/OsuJsonWebRequest.cs
new file mode 100644
index 0000000000..4a45a8b261
--- /dev/null
+++ b/osu.Game/Online/API/OsuJsonWebRequest.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using osu.Framework.IO.Network;
+
+namespace osu.Game.Online.API
+{
+    public class OsuJsonWebRequest<T> : JsonWebRequest<T>
+    {
+        public OsuJsonWebRequest(string uri)
+            : base(uri)
+        {
+        }
+
+        public OsuJsonWebRequest()
+        {
+        }
+
+        protected override string UserAgent => "osu!";
+    }
+}
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index f76cba7f41..5412b11b33 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -7,8 +7,8 @@ using Newtonsoft.Json;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.IO.Network;
 using osu.Framework.Platform;
+using osu.Game.Online.API;
 using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Updater
@@ -36,7 +36,7 @@ namespace osu.Game.Updater
         {
             try
             {
-                var releases = new JsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
+                var releases = new OsuJsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
 
                 await releases.PerformAsync();