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

3
SVSim.Database/Repositories/Guild/GuildRepository.cs
View File

@@ -70,10 +70,11 @@ public sealed class GuildRepository : IGuildRepository
return await q.Take(resultCap).ToListAsync(ct);
}
public async Task UpdateActivityAndJoinConditionAsync(int guildId, int? activity, int? joinCondition, CancellationToken ct = default)
public async Task UpdateActivityAndJoinConditionAsync(int guildId, int? activity, int? joinCondition, string? name = null, CancellationToken ct = default)
{
var guild = await _db.Guilds.FirstOrDefaultAsync(g => g.GuildId == guildId, ct);
if (guild is null) return;
if (!string.IsNullOrWhiteSpace(name)) guild.Name = name;
if (activity.HasValue) guild.Activity = (Entities.Guild.GuildActivity)activity.Value;
if (joinCondition.HasValue) guild.JoinCondition = (Entities.Guild.GuildJoinCondition)joinCondition.Value;
await _db.SaveChangesAsync(ct);

4
SVSim.Database/Repositories/Guild/IGuildRepository.cs
View File

@@ -25,8 +25,8 @@ public interface IGuildRepository
string name, int activity, int joinCondition, int memberBucket,
int maxMemberCap, int resultCap, CancellationToken ct = default);
/// <summary>Updates activity and/or join_condition. Only non-null fields are written.</summary>
Task UpdateActivityAndJoinConditionAsync(int guildId, int? activity, int? joinCondition, CancellationToken ct = default);
/// <summary>Updates name, activity, and/or join_condition. Only non-null fields are written.</summary>
Task UpdateActivityAndJoinConditionAsync(int guildId, int? activity, int? joinCondition, string? name = null, CancellationToken ct = default);
/// <summary>Overwrites the description field.</summary>
Task UpdateDescriptionAsync(int guildId, string description, CancellationToken ct = default);

4
SVSim.Database/Services/Guild/GuildService.cs
View File

@@ -129,12 +129,14 @@ public sealed class GuildService : IGuildService
if (m is null) return new(GuildOpResultCode.NotInGuild);
if (m.Role != GuildRole.Leader) return new(GuildOpResultCode.PermissionDenied);
if (req.Name is not null && (string.IsNullOrWhiteSpace(req.Name) || req.Name.Length > 64))
return new(GuildOpResultCode.NameInvalid);
if (req.Activity.HasValue && req.Activity.Value is < 1 or > 16)
return new(GuildOpResultCode.NameInvalid);
if (req.JoinCondition.HasValue && req.JoinCondition.Value is < 1 or > 3)
return new(GuildOpResultCode.NameInvalid);
await _guilds.UpdateActivityAndJoinConditionAsync(m.GuildId, req.Activity, req.JoinCondition, ct);
await _guilds.UpdateActivityAndJoinConditionAsync(m.GuildId, req.Activity, req.JoinCondition, req.Name, ct);
return GuildOpResult.Ok;
}

2
SVSim.Database/Services/Guild/GuildServiceTypes.cs
View File

@@ -37,4 +37,4 @@ public sealed record GuildFullView(
public sealed record GuildSearchEntry(Entities.Guild.Guild Guild, int MemberNum);
public sealed record CreateGuildRequest(string Name, int Activity, int JoinCondition);
public sealed record UpdateGuildRequest(int? Activity, int? JoinCondition);
public sealed record UpdateGuildRequest(int? Activity, int? JoinCondition, string? Name = null);