Updates

Author: billsonnn

Turbo.Players/Grains/PlayerPresenceGrain.Room.cs

@@ -108,9 +108,11 @@ await _grainFactory
         }
     }
 
-    public async Task SetPendingRoomAsync(RoomId roomId, bool approved)
+    public Task SetPendingRoomAsync(RoomId roomId, bool approved)
     {
         _state.PendingRoomId = roomId;
         _state.PendingRoomApproved = approved;
+
+        return Task.CompletedTask;
     }
 }

Turbo.Players/Grains/PlayerWalletGrain.cs

@@ -91,14 +91,13 @@ CancellationToken ct
         return WalletDebitResult.Success();
     }
 
-    public async Task RollbackUpdatesAsync(
+    public Task RollbackUpdatesAsync(
         List<WalletCurrencyUpdateSnapshot> updates,
         CancellationToken ct
     )
     {
         if (updates.Count == 0)
-            return;
-
+            return Task.CompletedTask;
         foreach (var update in updates)
         {
             if (update is null || update.ChangedBy == 0)
@@ -112,14 +111,16 @@ CancellationToken ct
                 };
             }
         }
+
+        return Task.CompletedTask;
     }
 
     public Task<int> GetAmountForCurrencyAsync(CurrencyKind kind, CancellationToken ct) =>
         Task.FromResult(
             _currenciesByKind.TryGetValue(kind, out var snapshot) ? snapshot.Amount : 0
         );
 
-    public async Task<Dictionary<int, int>> GetActivityPointsAsync(CancellationToken ct)
+    public Task<Dictionary<int, int>> GetActivityPointsAsync(CancellationToken ct)
     {
         var result = new Dictionary<int, int>();
 
@@ -134,7 +135,7 @@ currency is null
             result[currency.CurrencyKind.ActivityPointType ?? -1] = currency.Amount;
         }
 
-        return result;
+        return Task.FromResult(result);
     }
 
     private static bool TryNormalizeRequests(

Turbo.Primitives/Messages/Incoming/Room/Chat/ChatMessage.cs

@@ -2,4 +2,9 @@
 
 namespace Turbo.Primitives.Messages.Incoming.Room.Chat;
 
-public record ChatMessage : IMessageEvent { }
+public sealed record ChatMessage : IMessageEvent
+{
+    public required string Text { get; init; }
+    public required int StyleId { get; init; }
+    public required int TrackingId { get; init; }
+}

Turbo.Primitives/Messages/Incoming/Room/Chat/ShoutMessage.cs

@@ -2,4 +2,8 @@
 
 namespace Turbo.Primitives.Messages.Incoming.Room.Chat;
 
-public record ShoutMessage : IMessageEvent { }
+public sealed record ShoutMessage : IMessageEvent
+{
+    public required string Text { get; init; }
+    public required int StyleId { get; init; }
+}

Turbo.Primitives/Messages/Incoming/Room/Chat/WhisperMessage.cs

@@ -2,4 +2,9 @@
 
 namespace Turbo.Primitives.Messages.Incoming.Room.Chat;
 
-public record WhisperMessage : IMessageEvent { }
+public sealed record WhisperMessage : IMessageEvent
+{
+    public required string Text { get; init; }
+    public required string RecipientName { get; init; }
+    public required int StyleId { get; init; }
+}

Turbo.Primitives/Messages/Outgoing/Room/Chat/ChatMessageComposer.cs

@@ -1,10 +1,28 @@
+using System.Collections.Generic;
 using Orleans;
 using Turbo.Primitives.Networking;
+using Turbo.Primitives.Rooms.Enums;
 
 namespace Turbo.Primitives.Messages.Outgoing.Room.Chat;
 
 [GenerateSerializer, Immutable]
-public sealed record ChatMessageComposer : IComposer
+public record ChatMessageComposer : IComposer
 {
-    // TODO: add properties if/when identified
+    [Id(0)]
+    public required int UserId { get; init; }
+
+    [Id(1)]
+    public required string Text { get; init; }
+
+    [Id(2)]
+    public required AvatarGestureType Gesture { get; init; }
+
+    [Id(3)]
+    public required int StyleId { get; init; }
+
+    [Id(4)]
+    public required List<(string, string, bool)> Links { get; init; }
+
+    [Id(5)]
+    public required int TrackingId { get; init; }
 }

Turbo.Primitives/Messages/Outgoing/Room/Chat/FloodControlMessageComposer.cs

@@ -6,5 +6,6 @@ namespace Turbo.Primitives.Messages.Outgoing.Room.Chat;
 [GenerateSerializer, Immutable]
 public sealed record FloodControlMessageComposer : IComposer
 {
-    // TODO: add properties if/when identified
+    [Id(0)]
+    public required int Seconds { get; init; }
 }

Turbo.Primitives/Messages/Outgoing/Room/Chat/RemainingMutePeriodMessageComposer.cs

@@ -6,5 +6,6 @@ namespace Turbo.Primitives.Messages.Outgoing.Room.Chat;
 [GenerateSerializer, Immutable]
 public sealed record RemainingMutePeriodMessageComposer : IComposer
 {
-    // TODO: add properties if/when identified
+    [Id(0)]
+    public required int SecondsRemaining { get; init; }
 }

Turbo.Primitives/Messages/Outgoing/Room/Chat/ShoutMessageComposer.cs

@@ -1,10 +1,6 @@
 using Orleans;
-using Turbo.Primitives.Networking;
 
 namespace Turbo.Primitives.Messages.Outgoing.Room.Chat;
 
 [GenerateSerializer, Immutable]
-public sealed record ShoutMessageComposer : IComposer
-{
-    // TODO: add properties if/when identified
-}
+public sealed record ShoutMessageComposer : ChatMessageComposer;

Turbo.Primitives/Messages/Outgoing/Room/Chat/UserTypingMessageComposer.cs

@@ -6,5 +6,9 @@ namespace Turbo.Primitives.Messages.Outgoing.Room.Chat;
 [GenerateSerializer, Immutable]
 public sealed record UserTypingMessageComposer : IComposer
 {
-    // TODO: add properties if/when identified
+    [Id(0)]
+    public required int UserId { get; init; }
+
+    [Id(1)]
+    public required bool IsTyping { get; init; }
 }