Skip to content

Commit cfda135

Browse files
authored
Merge pull request #12 from Dippys/dev
Fix Ignoring to actually work
2 parents ef53bd0 + 9789aa0 commit cfda135

4 files changed

Lines changed: 20 additions & 4 deletions

File tree

Turbo.PacketHandlers/Users/IgnoreUserMessageHandler.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,15 @@ CancellationToken ct
3535
.ConfigureAwait(false);
3636

3737
await ctx.SendComposerAsync(
38-
new IgnoreResultMessageComposer { Result = result, PlayerName = string.Empty },
38+
new IgnoreResultMessageComposer { Result = result, IgnoredUserId = targetId },
39+
ct
40+
)
41+
.ConfigureAwait(false);
42+
43+
var ignoredIds = await messengerGrain.GetIgnoredUserIdsAsync(ct).ConfigureAwait(false);
44+
45+
await ctx.SendComposerAsync(
46+
new IgnoredUsersMessageComposer { IgnoredUserIds = ignoredIds },
3947
ct
4048
)
4149
.ConfigureAwait(false);

Turbo.PacketHandlers/Users/UnignoreUserMessageHandler.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,18 @@ await ctx.SendComposerAsync(
3232
new IgnoreResultMessageComposer
3333
{
3434
Result = 3, // Unignored
35-
PlayerName = string.Empty,
35+
IgnoredUserId = targetId,
3636
},
3737
ct
3838
)
3939
.ConfigureAwait(false);
40+
41+
var ignoredIds = await messengerGrain.GetIgnoredUserIdsAsync(ct).ConfigureAwait(false);
42+
43+
await ctx.SendComposerAsync(
44+
new IgnoredUsersMessageComposer { IgnoredUserIds = ignoredIds },
45+
ct
46+
)
47+
.ConfigureAwait(false);
4048
}
4149
}

Turbo.Primitives/Messages/Outgoing/Users/IgnoreResultMessageComposer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ public sealed record IgnoreResultMessageComposer : IComposer
1010
public required int Result { get; init; }
1111

1212
[Id(1)]
13-
public required string PlayerName { get; init; }
13+
public required int IgnoredUserId { get; init; }
1414
}

Turbo.Revisions/Revision20260112/Serializers/Users/IgnoreResultMessageComposerSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ internal class IgnoreResultMessageComposerSerializer(int header)
99
protected override void Serialize(IServerPacket packet, IgnoreResultMessageComposer message)
1010
{
1111
packet.WriteInteger(message.Result);
12-
packet.WriteString(message.PlayerName);
12+
packet.WriteInteger(message.IgnoredUserId);
1313
}
1414
}

0 commit comments

Comments
 (0)