Server (Phase A): - CustomLobby: +HostReady/GuestReady/HostFirstTurnPref/GuestFirstTurnPref/MaxPlayers - Migration: AddReadyUpSystem — applied to prod DB - GameJoinCustomLobbyHandler: no longer auto-creates session; sets Full status, resets readiness, pushes CustomLobbyGuestJoinedPush to host - GameLobbyReadyHandler (NEW): game.custom.lobby.ready — marks caller ready, resolves first-turn, creates session + pushes game.custom.started when all ready - GameUnreadyHandler (NEW): game.custom.lobby.unready - GameChangeLobbyDeckHandler (NEW): game.custom.lobby.change_deck - GameUpdateLobbyRulesHandler (NEW): game.custom.update_rules (host only) - GameListActiveLobbiesHandler (NEW): game.custom.list_active (Status==Started) - GameListCustomLobbiesHandler: now batch-loads host/guest display names - GameMessages: +LobbyReadyRequest/Response, UnreadyInLobbyRequest/Response, ChangeLobbyDeckRequest/Response, UpdateLobbyRulesRequest/Response, ListActiveLobbiesRequest/Response, LobbyReadyStatusPush, LobbyDeckChangedPush, ActiveLobbyDto; CustomLobbyDto +HostDisplayName/GuestDisplayName - ServiceRegistration: register 5 new handlers Client (Phase B): - CustomLobby.gd: new autoload for Free Play lobby state + all server calls - project.godot: register CustomLobby autoload - MainScreen: +Free Play button → FreePlayScreen.tscn - FreePlayScreen (NEW): Open Lobbies tab + Active Games tab + Create dialog - LobbyRoomScreen (NEW): ready-up UI, first-turn selector, preset voting - Game.gd: +is_spectating, +start_spectating(), +stop_spectating() - game_screen.gd: spectator mode — SPECTATING label, hidden action buttons, neutral HUD labels, stop_spectating() on exit Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering>
113 lines
5.3 KiB
C#
113 lines
5.3 KiB
C#
namespace SOR.Game.Handlers;
|
|
|
|
using Microsoft.EntityFrameworkCore;
|
|
using SOR.Database.Contexts;
|
|
using SOR.Database.Enums;
|
|
using SOR.Networking.Abstractions.Messaging;
|
|
using SOR.Networking.Abstractions.Transport;
|
|
using SOR.Shared.Networking;
|
|
|
|
/// <summary>
|
|
/// game.custom.list — returns a paged list of open custom lobbies.
|
|
/// Supports optional NameSearch filter and ShowPasswordProtected toggle.
|
|
/// Batch-loads host/guest display names from the identity database.
|
|
/// </summary>
|
|
internal sealed class GameListCustomLobbiesHandler : GameHandlerBase, IMessageHandler
|
|
{
|
|
private readonly IMessageSerializer _serializer;
|
|
private readonly GameDbContext _gameDb;
|
|
private readonly SorIdentityDbContext _identityDb;
|
|
|
|
public GameListCustomLobbiesHandler(
|
|
IMessageSerializer serializer,
|
|
GameDbContext gameDb,
|
|
SorIdentityDbContext identityDb)
|
|
{
|
|
_serializer = serializer;
|
|
_gameDb = gameDb;
|
|
_identityDb = identityDb;
|
|
}
|
|
|
|
public string MessageType => "game.custom.list";
|
|
|
|
public async Task<IServerMessage?> HandleAsync(
|
|
IClientMessage message,
|
|
AuthenticatedConnection connection,
|
|
CancellationToken ct)
|
|
{
|
|
var req = _serializer.DeserializePayload<ListCustomLobbiesRequest>(message.Payload);
|
|
|
|
var page = Math.Max(1, req.Page);
|
|
var pageSize = Math.Clamp(req.PageSize, 1, 100);
|
|
|
|
var query = _gameDb.CustomLobbies
|
|
.AsNoTracking()
|
|
.Where(l => l.Status == CustomLobbyStatus.Open);
|
|
|
|
if (!string.IsNullOrWhiteSpace(req.NameSearch))
|
|
query = query.Where(l => l.Name.ToLower().Contains(req.NameSearch.ToLower()));
|
|
|
|
if (!req.ShowPasswordProtected)
|
|
query = query.Where(l => l.Password == null);
|
|
|
|
query = query.OrderByDescending(l => l.CreatedAt);
|
|
|
|
var total = await query.CountAsync(ct);
|
|
var lobbies = await query
|
|
.Skip((page - 1) * pageSize)
|
|
.Take(pageSize)
|
|
.ToListAsync(ct);
|
|
|
|
// Batch-load display names for all participants in the result set.
|
|
var accountIds = lobbies
|
|
.SelectMany(l => l.GuestAccountId.HasValue
|
|
? new[] { l.HostAccountId, l.GuestAccountId.Value }
|
|
: new[] { l.HostAccountId })
|
|
.Distinct()
|
|
.ToList();
|
|
|
|
var displayNames = await _identityDb.Users
|
|
.AsNoTracking()
|
|
.Where(a => accountIds.Contains(a.Id))
|
|
.Select(a => new { a.Id, Name = a.DisplayName ?? a.UserName ?? a.Id.ToString() })
|
|
.ToDictionaryAsync(a => a.Id, a => a.Name, ct);
|
|
|
|
var dtos = lobbies.Select(l => new CustomLobbyDto(
|
|
LobbyId : l.Id,
|
|
LobbyName : l.Name,
|
|
HostAccountId : l.HostAccountId,
|
|
HostDisplayName : displayNames.GetValueOrDefault(l.HostAccountId, l.HostAccountId.ToString()[..8]),
|
|
HasGuest : l.GuestAccountId.HasValue,
|
|
GuestDisplayName: l.GuestAccountId.HasValue
|
|
? displayNames.GetValueOrDefault(l.GuestAccountId.Value, l.GuestAccountId.Value.ToString()[..8])
|
|
: null,
|
|
Rules : new CustomRulesDto(
|
|
OpeningHandSize : l.OpeningHandSizeOverride ?? GameRules.Default.OpeningHandSize,
|
|
FirstPlayerSkipsDraw : l.FirstPlayerSkipsDrawOverride ?? GameRules.Default.FirstPlayerSkipsDraw,
|
|
SpAccumulationPerTurn : l.SpAccumulationPerTurnOverride ?? GameRules.Default.SpAccumulationPerTurn,
|
|
DrawPerTurn : l.DrawPerTurnOverride ?? GameRules.Default.DrawPerTurn,
|
|
SpHasCap : l.SpHasCapOverride ?? GameRules.Default.SpHasCap,
|
|
SpCap : l.SpCapOverride ?? GameRules.Default.SpCap,
|
|
BoardWidth : l.BoardWidthOverride ?? GameRules.Default.BoardWidth,
|
|
BoardHeight : l.BoardHeightOverride ?? GameRules.Default.BoardHeight,
|
|
HandSizeCap : l.HandSizeCapOverride ?? GameRules.Default.HandSizeCap,
|
|
DiscardOnMaxHand : l.DiscardOnMaxHandOverride ?? GameRules.Default.DiscardOnMaxHand,
|
|
MaxDeckSize : l.MaxDeckSizeOverride ?? GameRules.Default.MaxDeckSize,
|
|
MinDeckSize : l.MinDeckSizeOverride ?? GameRules.Default.MinDeckSize,
|
|
MaxArchTier1 : l.MaxArchTier1Override ?? GameRules.Default.MaxArchTier1,
|
|
TurnTimerSeconds : l.TurnTimerSecondsOverride ?? GameRules.Default.TurnTimerSeconds,
|
|
TimeLimitMinutes : l.TimeLimitMinutesOverride ?? GameRules.Default.TimeLimitMinutes,
|
|
TurnLimit : l.TurnLimitOverride ?? GameRules.Default.TurnLimit,
|
|
MpBuff : l.MpBuffOverride ?? GameRules.Default.MpBuff,
|
|
HasPassword : l.Password != null),
|
|
CreatedAt : l.CreatedAt));
|
|
|
|
return ServerMessage.Reply("game.custom.list.ack", message.Seq,
|
|
new ListCustomLobbiesResponse(
|
|
Lobbies : dtos,
|
|
TotalCount : total,
|
|
Page : page,
|
|
PageSize : pageSize));
|
|
}
|
|
}
|