From 0a9c3c9413e89efaf183793fc781e3bcc7f4a5bc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:39:50 +0300
Subject: [PATCH] Move metadata change logic to it's own method

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs  |  2 +-
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 43 +++++++++++--------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 031a98dd8b..014a9ac7ed 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
-        public void TestMetadata()
+        public void TestVisibility()
         {
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
             AddAssert("Panel is hidden", () => panel.IsPresent == false);
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 75726c5fed..d90b73aa82 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -66,26 +66,35 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             base.LoadComplete();
 
-            Metadata.BindValueChanged(metadata =>
+            Metadata.BindValueChanged(onMetadataChanged, true);
+        }
+
+        private void onMetadataChanged(ValueChangedEvent<APINewsSidebar> metadata)
+        {
+            monthsFlow.Clear();
+
+            if (metadata.NewValue == null)
+                return;
+
+            var allPosts = metadata.NewValue.NewsPosts;
+
+            if (!allPosts?.Any() ?? false)
+                return;
+
+            var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
+
+            var keys = lookup.Select(kvp => kvp.Key);
+            var sortedKeys = keys.OrderByDescending(k => k).ToList();
+
+            for (int i = 0; i < sortedKeys.Count; i++)
             {
-                monthsFlow.Clear();
+                var posts = lookup[sortedKeys[i]];
 
-                if (metadata.NewValue != null)
+                monthsFlow.Add(new MonthPanel(posts)
                 {
-                    var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
-
-                    var keys = lookup.Select(kvp => kvp.Key);
-                    var sortedKeys = keys.OrderByDescending(k => k).ToList();
-
-                    for (int i = 0; i < sortedKeys.Count; i++)
-                    {
-                        monthsFlow.Add(new MonthPanel(lookup[sortedKeys[i]])
-                        {
-                            IsOpen = { Value = i == 0 }
-                        });
-                    }
-                }
-            }, true);
+                    IsOpen = { Value = i == 0 }
+                });
+            }
         }
     }
 }