diff --git a/Server/src/SOR.Game/GameMessages.cs b/Server/src/SOR.Game/GameMessages.cs
index 93294d7..4a77e74 100644
--- a/Server/src/SOR.Game/GameMessages.cs
+++ b/Server/src/SOR.Game/GameMessages.cs
@@ -124,6 +124,9 @@ public sealed record JoinCustomLobbyRequest(Guid LobbyId, Guid DeckId, string? P
/// Leave or cancel a custom lobby.
public sealed record LeaveCustomLobbyRequest(Guid LobbyId);
+/// Fetch full details for a specific custom lobby.
+public sealed record GetCustomLobbyRequest(Guid LobbyId);
+
// ── Preset requests ───────────────────────────────────────────────────────────
/// Save the current lobby's rule overrides as a named preset (participants only).
@@ -207,6 +210,8 @@ public sealed record JoinCustomLobbyResponse(
public sealed record LeaveCustomLobbyResponse(Guid LobbyId);
+public sealed record GetCustomLobbyResponse(CustomLobbyDetailDto Lobby);
+
// ── Preset responses ──────────────────────────────────────────────────────────
public sealed record SavePresetResponse(Guid PresetId, string Name);
@@ -395,6 +400,20 @@ public sealed record CustomLobbyDto(
CustomRulesDto Rules,
DateTimeOffset CreatedAt);
+///
+/// Detailed view of a custom lobby, including full rule set and participant presence.
+/// Returned by game.custom.get.
+///
+public sealed record CustomLobbyDetailDto(
+ Guid LobbyId,
+ string LobbyName,
+ string Status, // Open | Full | Started | Cancelled
+ Guid HostAccountId,
+ Guid? GuestAccountId,
+ CustomRulesDto Rules,
+ DateTimeOffset CreatedAt,
+ Guid? GameSessionId);
+
public sealed record CustomRulesDto(
int OpeningHandSize,
bool FirstPlayerSkipsDraw,
diff --git a/Server/src/SOR.Game/Handlers/GameGetLobbyHandler.cs b/Server/src/SOR.Game/Handlers/GameGetLobbyHandler.cs
new file mode 100644
index 0000000..34e9e77
--- /dev/null
+++ b/Server/src/SOR.Game/Handlers/GameGetLobbyHandler.cs
@@ -0,0 +1,74 @@
+namespace SOR.Game.Handlers;
+
+using Microsoft.EntityFrameworkCore;
+using SOR.Database.Contexts;
+using SOR.Networking.Abstractions.Messaging;
+using SOR.Networking.Abstractions.Transport;
+using SOR.Shared.Networking;
+
+///
+/// game.custom.get — returns full detail for a specific custom lobby.
+/// Includes effective rules (overrides merged with GameRules.Default),
+/// host/guest account IDs, and status.
+///
+internal sealed class GameGetLobbyHandler : GameHandlerBase, IMessageHandler
+{
+ private readonly IMessageSerializer _serializer;
+ private readonly GameDbContext _gameDb;
+
+ public GameGetLobbyHandler(IMessageSerializer serializer, GameDbContext gameDb)
+ {
+ _serializer = serializer;
+ _gameDb = gameDb;
+ }
+
+ public string MessageType => "game.custom.get";
+
+ public async Task HandleAsync(
+ IClientMessage message,
+ AuthenticatedConnection connection,
+ CancellationToken ct)
+ {
+ var req = _serializer.DeserializePayload(message.Payload);
+
+ var lobby = await _gameDb.CustomLobbies
+ .AsNoTracking()
+ .Where(l => l.Id == req.LobbyId)
+ .SingleOrDefaultAsync(ct)
+ ?? throw new GameException("LOBBY_NOT_FOUND");
+
+ var rules = GameCreateCustomLobbyHandler.ToDto(new GameRules
+ {
+ OpeningHandSize = lobby.OpeningHandSizeOverride ?? GameRules.Default.OpeningHandSize,
+ FirstPlayerSkipsDraw = lobby.FirstPlayerSkipsDrawOverride ?? GameRules.Default.FirstPlayerSkipsDraw,
+ SpAccumulationPerTurn = lobby.SpAccumulationPerTurnOverride ?? GameRules.Default.SpAccumulationPerTurn,
+ DrawPerTurn = lobby.DrawPerTurnOverride ?? GameRules.Default.DrawPerTurn,
+ SpHasCap = lobby.SpHasCapOverride ?? GameRules.Default.SpHasCap,
+ SpCap = lobby.SpCapOverride ?? GameRules.Default.SpCap,
+ BoardWidth = lobby.BoardWidthOverride ?? GameRules.Default.BoardWidth,
+ BoardHeight = lobby.BoardHeightOverride ?? GameRules.Default.BoardHeight,
+ HandSizeCap = lobby.HandSizeCapOverride ?? GameRules.Default.HandSizeCap,
+ DiscardOnMaxHand = lobby.DiscardOnMaxHandOverride ?? GameRules.Default.DiscardOnMaxHand,
+ MaxDeckSize = lobby.MaxDeckSizeOverride ?? GameRules.Default.MaxDeckSize,
+ MinDeckSize = lobby.MinDeckSizeOverride ?? GameRules.Default.MinDeckSize,
+ MaxArchTier1 = lobby.MaxArchTier1Override ?? GameRules.Default.MaxArchTier1,
+ TurnTimerSeconds = lobby.TurnTimerSecondsOverride ?? GameRules.Default.TurnTimerSeconds,
+ TimeLimitMinutes = lobby.TimeLimitMinutesOverride ?? GameRules.Default.TimeLimitMinutes,
+ TurnLimit = lobby.TurnLimitOverride ?? GameRules.Default.TurnLimit,
+ MpBuff = lobby.MpBuffOverride ?? GameRules.Default.MpBuff,
+ }, lobby.Password != null);
+
+ var dto = new CustomLobbyDetailDto(
+ LobbyId : lobby.Id,
+ LobbyName : lobby.Name,
+ Status : lobby.Status.ToString(),
+ HostAccountId : lobby.HostAccountId,
+ GuestAccountId: lobby.GuestAccountId,
+ Rules : rules,
+ CreatedAt : lobby.CreatedAt,
+ GameSessionId : lobby.GameSessionId);
+
+ return ServerMessage.Reply("game.custom.get.ack", message.Seq,
+ new GetCustomLobbyResponse(dto));
+ }
+}
diff --git a/Server/src/SOR.Game/ServiceRegistration.cs b/Server/src/SOR.Game/ServiceRegistration.cs
index 2ca8d46..d2be9cb 100644
--- a/Server/src/SOR.Game/ServiceRegistration.cs
+++ b/Server/src/SOR.Game/ServiceRegistration.cs
@@ -56,6 +56,7 @@ public static class ServiceRegistration
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
// Spectator handlers
services.AddTransient();