From 2ec9343868693f45f7650e2209271b157222d973 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 17:35:10 +0900
Subject: [PATCH 1/2] Add the ability to spectate a user by right clicking
 their user panel

---
 osu.Game/Localisation/ContextMenuStrings.cs |  9 +++--
 osu.Game/Users/UserPanel.cs                 | 39 +++++++++++++--------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Localisation/ContextMenuStrings.cs b/osu.Game/Localisation/ContextMenuStrings.cs
index 029fba67d8..cb18a2159c 100644
--- a/osu.Game/Localisation/ContextMenuStrings.cs
+++ b/osu.Game/Localisation/ContextMenuStrings.cs
@@ -20,9 +20,14 @@ namespace osu.Game.Localisation
         public static LocalisableString ViewBeatmap => new TranslatableString(getKey(@"view_beatmap"), @"View beatmap");
 
         /// <summary>
-        /// "Invite player"
+        /// "Invite to room"
         /// </summary>
-        public static LocalisableString InvitePlayer => new TranslatableString(getKey(@"invite_player"), @"Invite player");
+        public static LocalisableString InvitePlayer => new TranslatableString(getKey(@"invite_player"), @"Invite to room");
+
+        /// <summary>
+        /// "Spectate"
+        /// </summary>
+        public static LocalisableString SpectatePlayer => new TranslatableString(getKey(@"spectate_player"), @"Spectate");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 273faf9bd1..b6a77e754d 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -13,6 +13,7 @@ using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
@@ -20,6 +21,8 @@ using osu.Game.Online.Chat;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Localisation;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Users
 {
@@ -60,6 +63,9 @@ namespace osu.Game.Users
         [Resolved]
         protected OverlayColourProvider? ColourProvider { get; private set; }
 
+        [Resolved]
+        private IPerformFromScreenRunner? performer { get; set; }
+
         [Resolved]
         protected OsuColour Colours { get; private set; } = null!;
 
@@ -113,23 +119,26 @@ namespace osu.Game.Users
                     new OsuMenuItem(ContextMenuStrings.ViewProfile, MenuItemType.Highlighted, ViewProfile)
                 };
 
-                if (!User.Equals(api.LocalUser.Value))
-                {
-                    items.Add(new OsuMenuItem(UsersStrings.CardSendMessage, MenuItemType.Standard, () =>
-                    {
-                        channelManager?.OpenPrivateChannel(User);
-                        chatOverlay?.Show();
-                    }));
-                }
+                if (User.Equals(api.LocalUser.Value))
+                    return items.ToArray();
 
-                if (
-                    // TODO: uncomment this once lazer / osu-web is updating online states
-                    // User.IsOnline &&
-                    multiplayerClient?.Room != null &&
-                    multiplayerClient.Room.Users.All(u => u.UserID != User.Id)
-                )
+                items.Add(new OsuMenuItem(UsersStrings.CardSendMessage, MenuItemType.Standard, () =>
                 {
-                    items.Add(new OsuMenuItem(ContextMenuStrings.InvitePlayer, MenuItemType.Standard, () => multiplayerClient.InvitePlayer(User.Id)));
+                    channelManager?.OpenPrivateChannel(User);
+                    chatOverlay?.Show();
+                }));
+
+                if (User.IsOnline)
+                {
+                    items.Add(new OsuMenuItem(ContextMenuStrings.SpectatePlayer, MenuItemType.Standard, () =>
+                    {
+                        performer?.PerformFromScreen(s => s.Push(new SoloSpectatorScreen(User)));
+                    }));
+
+                    if (multiplayerClient?.Room?.Users.All(u => u.UserID != User.Id) == true)
+                    {
+                        items.Add(new OsuMenuItem(ContextMenuStrings.InvitePlayer, MenuItemType.Standard, () => multiplayerClient.InvitePlayer(User.Id)));
+                    }
                 }
 
                 return items.ToArray();

From 22eced33006f959af2bc17198eafd46779a4923b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 17:40:07 +0900
Subject: [PATCH 2/2] Show local user in online users

---
 osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
index 37ea3f9c38..ee277ff538 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
@@ -131,9 +131,6 @@ namespace osu.Game.Overlays.Dashboard
                     {
                         int userId = kvp.Key;
 
-                        if (userId == api.LocalUser.Value.Id)
-                            continue;
-
                         users.GetUserAsync(userId).ContinueWith(task =>
                         {
                             APIUser user = task.GetResultSafely();