From bf273597ea726ef7d493b8db17889b9f0c93561c Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Mon, 6 Feb 2023 00:41:10 +0000
Subject: [PATCH] feat: actually support status also for Replays

---
 osu.Game/Screens/Play/ReplayPlayer.cs        |  3 +++
 osu.Game/Screens/Play/SoloSpectatorPlayer.cs |  2 +-
 osu.Game/Users/UserActivity.cs               | 16 ++++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index c5ef6b1585..e2b8ad7011 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Play
 {
@@ -24,6 +25,8 @@ namespace osu.Game.Screens.Play
 
         private readonly bool replayIsFailedScore;
 
+        protected override UserActivity InitialActivity => new UserActivity.Watching();
+
         // Disallow replays from failing. (see https://github.com/ppy/osu/issues/6108)
         protected override bool CheckModsAllowFailure()
         {
diff --git a/osu.Game/Screens/Play/SoloSpectatorPlayer.cs b/osu.Game/Screens/Play/SoloSpectatorPlayer.cs
index bd9e3917a5..65b66166c0 100644
--- a/osu.Game/Screens/Play/SoloSpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SoloSpectatorPlayer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play
     {
         private readonly Score score;
 
-        protected override UserActivity InitialActivity => new UserActivity.Spectating(score.ScoreInfo.User);
+        protected override UserActivity InitialActivity => new UserActivity.Spectating();
 
         public SoloSpectatorPlayer(Score score, PlayerConfiguration configuration = null)
             : base(score, configuration)
diff --git a/osu.Game/Users/UserActivity.cs b/osu.Game/Users/UserActivity.cs
index 950c486f22..d652730621 100644
--- a/osu.Game/Users/UserActivity.cs
+++ b/osu.Game/Users/UserActivity.cs
@@ -5,7 +5,6 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
@@ -91,16 +90,17 @@ namespace osu.Game.Users
             public override string Status => @"Editing a beatmap";
         }
 
-        public class Spectating : UserActivity
+        public class Watching : UserActivity
         {
-            private readonly APIUser user;
+            protected virtual string Verb => @"Watching";
 
-            public Spectating(APIUser user)
-            {
-                this.user = user;
-            }
+            public override string Status => @$"{Verb} a game";
+        }
 
-            public override string Status => @$"Spectating {user.Username}";
+        public class Spectating : Watching
+        {
+            protected override string Verb => @"Spectating";
+            public override string Status => @$"{Verb} a game";
         }
 
         public class SearchingForLobby : UserActivity