From 8ffa7f4a5ae5087e7c6f3e3e3f44f012fa95e1e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 14:28:20 +0900
Subject: [PATCH] Tidy up code

---
 osu.Game/Overlays/NewsOverlay.cs | 43 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index d4ccf4970b..400505ba52 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -6,7 +6,6 @@ using System.Threading;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.News;
 using osu.Game.Overlays.News.Displays;
@@ -22,9 +21,14 @@ namespace osu.Game.Overlays
         private readonly NewsSidebar sidebar;
         private readonly Container content;
 
-        private APIRequest lastRequest;
+        private GetNewsRequest lastRequest;
+
         private Cursor lastCursor;
-        private int? year;
+
+        /// <summary>
+        /// The year currently being displayed. If null, the main listing is being displayed.
+        /// </summary>
+        private int? displayedYear;
 
         private CancellationTokenSource cancellationToken;
 
@@ -100,7 +104,7 @@ namespace osu.Game.Overlays
 
         public void ShowYear(int year)
         {
-            loadFrontPage(year);
+            loadListing(year);
             Show();
         }
 
@@ -130,18 +134,18 @@ namespace osu.Game.Overlays
         private void onArticleChanged(ValueChangedEvent<string> article)
         {
             if (article.NewValue == null)
-                loadFrontPage();
+                loadListing();
             else
                 loadArticle(article.NewValue);
         }
 
-        private void loadFrontPage(int? year = null)
+        private void loadListing(int? year = null)
         {
             beginLoading();
 
             Header.SetFrontPage();
 
-            this.year = year;
+            displayedYear = year;
             lastCursor = null;
 
             performListingRequest(response =>
@@ -165,19 +169,6 @@ namespace osu.Game.Overlays
             });
         }
 
-        private void performListingRequest(Action<GetNewsResponse> onSuccess)
-        {
-            lastRequest = new GetNewsRequest(year, lastCursor);
-
-            ((GetNewsRequest)lastRequest).Success += response => Schedule(() =>
-            {
-                lastCursor = response.Cursor;
-                onSuccess?.Invoke(response);
-            });
-
-            API.PerformAsync(lastRequest);
-        }
-
         private void loadArticle(string article)
         {
             beginLoading();
@@ -188,6 +179,18 @@ namespace osu.Game.Overlays
             LoadDisplay(Empty());
         }
 
+        private void performListingRequest(Action<GetNewsResponse> onSuccess)
+        {
+            lastRequest = new GetNewsRequest(displayedYear, lastCursor);
+            lastRequest.Success += response => Schedule(() =>
+            {
+                lastCursor = response.Cursor;
+                onSuccess?.Invoke(response);
+            });
+
+            API.PerformAsync(lastRequest);
+        }
+
         private void beginLoading()
         {
             lastRequest?.Cancel();