SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(guild): /guild/update response — flat detail under guild (matches GuildUpdateTask.Parse)

Browse Source 
GuildUpdateTask.Parse() reads data[guild] as GuildDetailInfo directly; the previous
GuildDetailSubTree wrapper (data[guild][detail]) caused json[guild_id].ToInt() to
crash on the client. Split GuildUpdateResponse (flat) from GuildUpdateEmblemResponse
(nested, correct for GuildEmblemUpdateTask.Parse). Also surfaces guild_name from the
request through UpdateGuildRequest.Name -> service -> repo so the client rename is honoured.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-06-27 12:54:15 -04:00
parent c0e1c10192
commit 09104f4e73
7 changed files with 78 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SVSim.EmulatedEntrypoint/Controllers/GuildController.cs
View File

@@ -88,7 +88,8 @@ public sealed class GuildController : SVSimController
if (!TryGetViewerId(out var viewerId)) return Unauthorized();
int? activity = req.Activity != 0 ? req.Activity : null;
int? joinCondition = req.JoinCondition != 0 ? req.JoinCondition : null;
var r = await _guild.UpdateAsync(viewerId, new(activity, joinCondition), ct);
string? name = string.IsNullOrWhiteSpace(req.GuildName) ? null : req.GuildName;
var r = await _guild.UpdateAsync(viewerId, new(activity, joinCondition, name), ct);
if (!r.IsOk) return WireError();
var m = await _db.GuildMembers.FirstOrDefaultAsync(m => m.ViewerId == viewerId, ct);
@@ -97,10 +98,8 @@ public sealed class GuildController : SVSimController
if (guild is null) return WireError();
var memberCount = await _db.GuildMembers.CountAsync(x => x.GuildId == guild.GuildId, ct);
var leader = await _db.Viewers.AsNoTracking().FirstOrDefaultAsync(v => v.Id == guild.LeaderViewerId, ct);
return new GuildUpdateResponse
{
Guild = new GuildDetailSubTree { Detail = ToDetailDto(guild, memberCount, leader?.DisplayName ?? "") }
};
// GuildUpdateTask.Parse() reads data["guild"] directly as GuildDetailInfo — flat, no "detail" wrapper.
return new GuildUpdateResponse { Guild = ToDetailDto(guild, memberCount, leader?.DisplayName ?? "") };
}
[HttpPost("update_description")]
@@ -112,7 +111,7 @@ public sealed class GuildController : SVSimController
}
[HttpPost("update_emblem")]
public async Task<ActionResult<GuildUpdateResponse>> UpdateEmblem([FromBody] GuildUpdateEmblemRequest req, CancellationToken ct)
public async Task<ActionResult<GuildUpdateEmblemResponse>> UpdateEmblem([FromBody] GuildUpdateEmblemRequest req, CancellationToken ct)
{
if (!TryGetViewerId(out var viewerId)) return Unauthorized();
var r = await _guild.UpdateEmblemAsync(viewerId, req.EmblemId, ct);
@@ -124,7 +123,8 @@ public sealed class GuildController : SVSimController
if (guild is null) return WireError();
var memberCount = await _db.GuildMembers.CountAsync(x => x.GuildId == guild.GuildId, ct);
var leader = await _db.Viewers.AsNoTracking().FirstOrDefaultAsync(v => v.Id == guild.LeaderViewerId, ct);
return new GuildUpdateResponse
// GuildEmblemUpdateTask.Parse() reads data["guild"]["detail"] — nested wrapper required.
return new GuildUpdateEmblemResponse
{
Guild = new GuildDetailSubTree { Detail = ToDetailDto(guild, memberCount, leader?.DisplayName ?? "") }
};

15
SVSim.EmulatedEntrypoint/Models/Dtos/Guild/GuildUpdateResponse.cs
View File

@@ -5,11 +5,22 @@ using SVSim.EmulatedEntrypoint.Models.Dtos.Common.Guild;
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Guild;
/// <summary>
/// Response for POST /guild/update and POST /guild/update_emblem.
/// Returns the full updated guild detail sub-tree; client merges without re-fetching members.
/// Response for POST /guild/update.
/// GuildUpdateTask.Parse() reads data["guild"] directly as GuildDetailInfo — flat, no "detail" wrapper.
/// </summary>
[MessagePackObject]
public class GuildUpdateResponse
{
[JsonPropertyName("guild"), Key("guild")]
public GuildDetailDto Guild { get; set; } = new();
}
/// <summary>
/// Response for POST /guild/update_emblem.
/// GuildEmblemUpdateTask.Parse() reads data["guild"]["detail"] — requires the nested wrapper.
/// </summary>
[MessagePackObject]
public class GuildUpdateEmblemResponse
{
[JsonPropertyName("guild"), Key("guild")]
public GuildDetailSubTree Guild { get; set; } = new();