From 1be1cc2bd455e88e219b5489022b9da617913434 Mon Sep 17 00:00:00 2001 From: Dippys Date: Tue, 10 Feb 2026 20:39:30 +0400 Subject: [PATCH] Fix Ignore to actually work --- Turbo.PacketHandlers/Users/IgnoreUserMessageHandler.cs | 10 +++++++++- .../Users/UnignoreUserMessageHandler.cs | 10 +++++++++- .../Outgoing/Users/IgnoreResultMessageComposer.cs | 2 +- .../Users/IgnoreResultMessageComposerSerializer.cs | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Turbo.PacketHandlers/Users/IgnoreUserMessageHandler.cs b/Turbo.PacketHandlers/Users/IgnoreUserMessageHandler.cs index ffc77a64..42a836e9 100644 --- a/Turbo.PacketHandlers/Users/IgnoreUserMessageHandler.cs +++ b/Turbo.PacketHandlers/Users/IgnoreUserMessageHandler.cs @@ -35,7 +35,15 @@ CancellationToken ct .ConfigureAwait(false); await ctx.SendComposerAsync( - new IgnoreResultMessageComposer { Result = result, PlayerName = string.Empty }, + new IgnoreResultMessageComposer { Result = result, IgnoredUserId = targetId }, + ct + ) + .ConfigureAwait(false); + + var ignoredIds = await messengerGrain.GetIgnoredUserIdsAsync(ct).ConfigureAwait(false); + + await ctx.SendComposerAsync( + new IgnoredUsersMessageComposer { IgnoredUserIds = ignoredIds }, ct ) .ConfigureAwait(false); diff --git a/Turbo.PacketHandlers/Users/UnignoreUserMessageHandler.cs b/Turbo.PacketHandlers/Users/UnignoreUserMessageHandler.cs index 05d94dda..eacf7e99 100644 --- a/Turbo.PacketHandlers/Users/UnignoreUserMessageHandler.cs +++ b/Turbo.PacketHandlers/Users/UnignoreUserMessageHandler.cs @@ -32,10 +32,18 @@ await ctx.SendComposerAsync( new IgnoreResultMessageComposer { Result = 3, // Unignored - PlayerName = string.Empty, + IgnoredUserId = targetId, }, ct ) .ConfigureAwait(false); + + var ignoredIds = await messengerGrain.GetIgnoredUserIdsAsync(ct).ConfigureAwait(false); + + await ctx.SendComposerAsync( + new IgnoredUsersMessageComposer { IgnoredUserIds = ignoredIds }, + ct + ) + .ConfigureAwait(false); } } diff --git a/Turbo.Primitives/Messages/Outgoing/Users/IgnoreResultMessageComposer.cs b/Turbo.Primitives/Messages/Outgoing/Users/IgnoreResultMessageComposer.cs index f766e7ac..ee6713d5 100644 --- a/Turbo.Primitives/Messages/Outgoing/Users/IgnoreResultMessageComposer.cs +++ b/Turbo.Primitives/Messages/Outgoing/Users/IgnoreResultMessageComposer.cs @@ -10,5 +10,5 @@ public sealed record IgnoreResultMessageComposer : IComposer public required int Result { get; init; } [Id(1)] - public required string PlayerName { get; init; } + public required int IgnoredUserId { get; init; } } diff --git a/Turbo.Revisions/Revision20260112/Serializers/Users/IgnoreResultMessageComposerSerializer.cs b/Turbo.Revisions/Revision20260112/Serializers/Users/IgnoreResultMessageComposerSerializer.cs index 7286c1d4..ea2920e5 100644 --- a/Turbo.Revisions/Revision20260112/Serializers/Users/IgnoreResultMessageComposerSerializer.cs +++ b/Turbo.Revisions/Revision20260112/Serializers/Users/IgnoreResultMessageComposerSerializer.cs @@ -9,6 +9,6 @@ internal class IgnoreResultMessageComposerSerializer(int header) protected override void Serialize(IServerPacket packet, IgnoreResultMessageComposer message) { packet.WriteInteger(message.Result); - packet.WriteString(message.PlayerName); + packet.WriteInteger(message.IgnoredUserId); } }