Merge pull request #261 from smoogipoo/local-user-status-update

Always broadcast local user's state back to themselves

Author: peppy

osu.Server.Spectator/Hubs/Metadata/MetadataClientState.cs

@@ -19,10 +19,25 @@ public MetadataClientState(in string connectionId, in int userId, in string? ver
             VersionHash = versionHash;
         }
 
-        public UserPresence ToUserPresence() => new UserPresence
+        /// <summary>
+        /// Creates a <see cref="UserPresence"/> which represents this user's state as it should be broadcast to other users.
+        /// </summary>
+        /// <returns>The representative user presence, or <c>null</c> if the user should appear offline.</returns>
+        public UserPresence? ToUserPresence()
         {
-            Activity = UserActivity,
-            Status = UserStatus,
-        };
+            switch (UserStatus)
+            {
+                case null:
+                case Game.Users.UserStatus.Offline:
+                    return null;
+
+                default:
+                    return new UserPresence
+                    {
+                        Activity = UserActivity,
+                        Status = UserStatus,
+                    };
+            }
+        }
     }
 }

osu.Server.Spectator/Hubs/Metadata/MetadataHub.cs

@@ -136,8 +136,13 @@ public async Task UpdateActivity(UserActivity? activity)
 
                 usage.Item.UserActivity = activity;
 
-                if (shouldBroadcastPresenceToOtherUsers(usage.Item))
-                    await broadcastUserPresenceUpdate(usage.Item.UserId, usage.Item.ToUserPresence());
+                await Task.WhenAll
+                (
+                    shouldBroadcastPresenceToOtherUsers(usage.Item)
+                        ? broadcastUserPresenceUpdate(usage.Item.UserId, usage.Item.ToUserPresence())
+                        : Task.CompletedTask,
+                    Clients.Caller.UserPresenceUpdated(usage.Item.UserId, usage.Item.ToUserPresence())
+                );
             }
         }
 
@@ -147,18 +152,20 @@ public async Task UpdateStatus(UserStatus? status)
             {
                 Debug.Assert(usage.Item != null);
 
-                if (usage.Item.UserStatus != status)
-                {
-                    usage.Item.UserStatus = status;
+                if (usage.Item.UserStatus == status)
+                    return;
 
-                    if (status == UserStatus.Offline)
-                    {
-                        // special case of users that already broadcast that they are online switching to "appear offline".
-                        await broadcastUserPresenceUpdate(usage.Item.UserId, null);
-                    }
-                    else
-                        await broadcastUserPresenceUpdate(usage.Item.UserId, usage.Item.ToUserPresence());
-                }
+                usage.Item.UserStatus = status;
+
+                await Task.WhenAll
+                (
+                    // Of note, we always send status updates to other users.
+                    //
+                    // This is a single special case where we don't check against `shouldBroadcastPresentToOtherUsers` because
+                    // it is required to tell other clients that "we went offline" in the "appears offline" scenario.
+                    broadcastUserPresenceUpdate(usage.Item.UserId, usage.Item.ToUserPresence()),
+                    Clients.Caller.UserPresenceUpdated(usage.Item.UserId, usage.Item.ToUserPresence())
+                );
             }
         }