Updates

Author: billsonnn

Turbo.Catalog/Configuration/CatalogConfig.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Turbo.Catalog.Configuration;
 
 public class CatalogConfig

Turbo.Catalog/Providers/CatalogSnapshotProvider.cs

@@ -6,7 +6,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Turbo.Database.Context;
-using Turbo.Database.Entities.Catalog;
 using Turbo.Primitives.Catalog;
 using Turbo.Primitives.Catalog.Enums;
 using Turbo.Primitives.Catalog.Providers;

Turbo.Database/Entities/Catalog/LtdSeriesEntity.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Turbo.Database.Entities.Catalog;

Turbo.Database/Entities/Messenger/MessengerFriendEntity.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Turbo.Database.Entities.Players;
-using Turbo.Primitives.FriendList.Enums;
+using Turbo.Primitives.Players.Enums.Messenger;
 
 namespace Turbo.Database.Entities.Messenger;
 

Turbo.PacketHandlers/Catalog/PurchaseFromCatalogMessageHandler.cs

@@ -6,7 +6,6 @@
 using Turbo.Messages.Registry;
 using Turbo.Primitives.Catalog;
 using Turbo.Primitives.Catalog.Enums;
-using Turbo.Primitives.Catalog.Grains;
 using Turbo.Primitives.Catalog.Snapshots;
 using Turbo.Primitives.Messages.Incoming.Catalog;
 using Turbo.Primitives.Messages.Outgoing.Catalog;

Turbo.PacketHandlers/FriendList/AcceptFriendMessageHandler.cs

@@ -1,6 +1,5 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
 using Orleans;
 using Turbo.Messages.Registry;
 using Turbo.Primitives.Messages.Incoming.FriendList;
@@ -9,11 +8,10 @@
 
 namespace Turbo.PacketHandlers.FriendList;
 
-public class AcceptFriendMessageHandler(IGrainFactory grainFactory, IConfiguration configuration)
+public class AcceptFriendMessageHandler(IGrainFactory grainFactory)
     : IMessageHandler<AcceptFriendMessage>
 {
     private readonly IGrainFactory _grainFactory = grainFactory;
-    private readonly IConfiguration _configuration = configuration;
 
     public async ValueTask HandleAsync(
         AcceptFriendMessage message,
@@ -24,32 +22,18 @@ CancellationToken ct
         if (ctx.PlayerId <= 0)
             return;
 
-        var friendLimit = _configuration.GetValue<int>("Turbo:FriendList:UserFriendLimit");
-
-        var messengerGrain = _grainFactory.GetMessengerGrain(ctx.PlayerId);
-        var (failures, updates) = await messengerGrain
-            .AcceptFriendRequestsAsync(message.Friends, friendLimit, ct)
+        var failures = await _grainFactory
+            .GetPlayerMessengerGrain(ctx.PlayerId)
+            .AcceptFriendRequestsAsync(message.Friends, ct)
             .ConfigureAwait(false);
 
-        // Send the failures result
+        if (failures.Count == 0)
+            return;
+
         await ctx.SendComposerAsync(
                 new AcceptFriendResultMessageComposer { Failures = failures },
                 ct
             )
             .ConfigureAwait(false);
-
-        // Send the friend list update with newly added friends
-        if (updates.Count > 0)
-        {
-            await ctx.SendComposerAsync(
-                    new FriendListUpdateMessageComposer
-                    {
-                        FriendCategories = [],
-                        Updates = updates,
-                    },
-                    ct
-                )
-                .ConfigureAwait(false);
-        }
     }
 }

Turbo.PacketHandlers/FriendList/DeclineFriendMessageHandler.cs

@@ -21,8 +21,8 @@ CancellationToken ct
         if (ctx.PlayerId <= 0)
             return;
 
-        var messengerGrain = _grainFactory.GetMessengerGrain(ctx.PlayerId);
-        await messengerGrain
+        await _grainFactory
+            .GetPlayerMessengerGrain(ctx.PlayerId)
             .DeclineFriendRequestsAsync(message.Friends, message.DeclineAll, ct)
             .ConfigureAwait(false);
     }

Turbo.PacketHandlers/FriendList/FollowFriendMessageHandler.cs

@@ -3,10 +3,6 @@
 using Orleans;
 using Turbo.Messages.Registry;
 using Turbo.Primitives.Messages.Incoming.FriendList;
-using Turbo.Primitives.Messages.Outgoing.FriendList;
-using Turbo.Primitives.Messages.Outgoing.Room.Session;
-using Turbo.Primitives.Orleans;
-using Turbo.Primitives.Rooms;
 
 namespace Turbo.PacketHandlers.FriendList;
 
@@ -24,7 +20,7 @@ CancellationToken ct
         if (ctx.PlayerId <= 0)
             return;
 
-        var messengerGrain = _grainFactory.GetMessengerGrain(ctx.PlayerId);
+        /* var messengerGrain = _grainFactory.GetMessengerGrain(ctx.PlayerId);
         var (success, roomId, error) = await messengerGrain
             .FollowFriendAsync(message.PlayerId, ct)
             .ConfigureAwait(false);
@@ -47,6 +43,6 @@ await ctx.SendComposerAsync(
                     ct
                 )
                 .ConfigureAwait(false);
-        }
+        } */
     }
 }

Turbo.PacketHandlers/FriendList/FriendListUpdateMessageHandler.cs

@@ -4,7 +4,6 @@
 using Turbo.Messages.Registry;
 using Turbo.Primitives.Messages.Incoming.FriendList;
 using Turbo.Primitives.Messages.Outgoing.FriendList;
-using Turbo.Primitives.Orleans;
 
 namespace Turbo.PacketHandlers.FriendList;
 
@@ -22,10 +21,8 @@ CancellationToken ct
         if (ctx.PlayerId <= 0)
             return;
 
-        // The client sends this as a periodic poll.
-        // We respond with an empty update (real updates are pushed via grain notifications).
         await ctx.SendComposerAsync(
-                new FriendListUpdateMessageComposer { FriendCategories = [], Updates = [] },
+                new FriendListUpdateMessageComposer { Categories = [], Updates = [] },
                 ct
             )
             .ConfigureAwait(false);

Turbo.PacketHandlers/FriendList/GetFriendRequestsMessageHandler.cs

@@ -22,8 +22,10 @@ CancellationToken ct
         if (ctx.PlayerId <= 0)
             return;
 
-        var messengerGrain = _grainFactory.GetMessengerGrain(ctx.PlayerId);
-        var requests = await messengerGrain.GetFriendRequestsAsync(ct).ConfigureAwait(false);
+        var requests = await _grainFactory
+            .GetPlayerMessengerGrain(ctx.PlayerId)
+            .GetRequestsAsync(ct)
+            .ConfigureAwait(false);
 
         await ctx.SendComposerAsync(new FriendRequestsMessageComposer { Requests = requests }, ct)
             .ConfigureAwait(false);