Fix transitivity

ppy · Jan 7, 2025 · 5f0a76f · 5f0a76f
1 parent ef4c10a
commit 5f0a76f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/...ectator/Hubs/Friends/HubFriendsContext.cs → ...Hubs/Friends/MetadataHubFriendsContext.cs b/...ectator/Hubs/Friends/HubFriendsContext.cs → ...Hubs/Friends/MetadataHubFriendsContext.cs
@@ -5,49 +5,47 @@
 using Microsoft.AspNetCore.SignalR;
 using osu.Game.Online.Friends;
 using osu.Server.Spectator.Database;
+using osu.Server.Spectator.Hubs.Metadata;
 
 namespace osu.Server.Spectator.Hubs.Friends
 {
-    public class HubFriendsContext<T>
-        where T : class, IFriendsClient
+    public class MetadataHubFriendsContext
     {
         private readonly IDatabaseFactory databaseFactory;
 
-        public HubFriendsContext(Hub<T> hub, IDatabaseFactory databaseFactory)
+        public MetadataHubFriendsContext(IHubContext<MetadataHub> context, IDatabaseFactory databaseFactory)
         {
             this.databaseFactory = databaseFactory;
 
-            Clients = hub.Clients;
-            Groups = hub.Groups;
-            Context = hub.Context;
+            Clients = context.Clients;
+            Groups = context.Groups;
         }
 
         public async Task OnConnectedAsync(ClientState state)
         {
             using (var db = databaseFactory.GetInstance())
             {
                 foreach (var friend in await db.GetUserFriendsAsync(state.UserId))
-                    await Groups.AddToGroupAsync(Context.ConnectionId, friend_presence_watchers(friend.zebra_id));
+                    await Groups.AddToGroupAsync(state.ConnectionId, friend_presence_watchers(friend.zebra_id));
             }
 
-            await Clients.Group(friend_presence_watchers(state.UserId)).FriendConnected(state.UserId);
+            await Clients.Group(friend_presence_watchers(state.UserId)).SendAsync(nameof(IFriendsClient.FriendConnected), state.UserId);
         }
 
         public async Task OnDisconnectedAsync(ClientState state)
         {
             using (var db = databaseFactory.GetInstance())
             {
                 foreach (var friend in await db.GetUserFriendsAsync(state.UserId))
-                    await Groups.RemoveFromGroupAsync(Context.ConnectionId, friend_presence_watchers(friend.zebra_id));
+                    await Groups.RemoveFromGroupAsync(state.ConnectionId, friend_presence_watchers(friend.zebra_id));
             }
 
-            await Clients.Group(friend_presence_watchers(state.UserId)).FriendDisconnected(state.UserId);
+            await Clients.Group(friend_presence_watchers(state.UserId)).SendAsync(nameof(IFriendsClient.FriendDisconnected), state.UserId);
         }
 
         private static string friend_presence_watchers(int userId) => $"friends:online-presence-watchers:{userId}";
 
-        public IHubCallerClients<T> Clients { get; }
+        public IHubClients Clients { get; }
         public IGroupManager Groups { get; }
-        public HubCallerContext Context { get; }
     }
 }
diff --git a/osu.Server.Spectator/Hubs/Metadata/MetadataHub.cs b/osu.Server.Spectator/Hubs/Metadata/MetadataHub.cs
@@ -24,7 +24,7 @@ namespace osu.Server.Spectator.Hubs.Metadata
 {
     public partial class MetadataHub : StatefulUserHub<IMetadataClient, MetadataClientState>, IMetadataServer
     {
-        private readonly HubFriendsContext<IMetadataClient> friends;
+        private readonly MetadataHubFriendsContext friends;
 
         private readonly IMemoryCache cache;
         private readonly IDatabaseFactory databaseFactory;
@@ -41,15 +41,16 @@ public MetadataHub(
             EntityStore<MetadataClientState> userStates,
             IDatabaseFactory databaseFactory,
             IDailyChallengeUpdater dailyChallengeUpdater,
-            IScoreProcessedSubscriber scoreProcessedSubscriber)
+            IScoreProcessedSubscriber scoreProcessedSubscriber,
+            IHubContext<MetadataHub> context)
             : base(loggerFactory, userStates)
         {
             this.cache = cache;
             this.databaseFactory = databaseFactory;
             this.dailyChallengeUpdater = dailyChallengeUpdater;
             this.scoreProcessedSubscriber = scoreProcessedSubscriber;
 
-            friends = new HubFriendsContext<IMetadataClient>(this, databaseFactory);
+            friends = new MetadataHubFriendsContext(context, databaseFactory);
         }
 
         public override async Task OnConnectedAsync()