fix(guild): emit is_friend / is_friend_apply in /guild/info members
GuildMemberInfo.cs:48-49 re-reads json["is_friend"] / json["is_friend_apply"] UNGUARDED on top of the base-class UserInfoBase's guarded read. Our DTO had them as int? with global WhenWritingNull → keys omitted → LitJson threw KeyNotFoundException, crashing the client right after guild create. Flip the fields to non-nullable int with JsonIgnoreCondition.Never so they always ship, and wire a batched IFriendService.GetFriendRelationsAsync lookup so the values are actually populated (single Contains-batched query per relation table). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -82,3 +82,9 @@ public sealed record BattleParticipationContext(
|
|||||||
int BattleType,
|
int BattleType,
|
||||||
int DeckFormat,
|
int DeckFormat,
|
||||||
int TwoPickType);
|
int TwoPickType);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Caller-relative friend flags for another viewer. Used to badge rows in guild-member,
|
||||||
|
/// invite-candidate, and join-request lists on the wire (<c>is_friend</c>, <c>is_friend_apply</c>).
|
||||||
|
/// </summary>
|
||||||
|
public sealed record FriendRelation(bool IsFriend, bool HasOutgoingApply);
|
||||||
|
|||||||
@@ -313,6 +313,36 @@ public sealed class FriendService : IFriendService, IPlayedTogetherWriter
|
|||||||
await _db.SaveChangesAsync(ct);
|
await _db.SaveChangesAsync(ct);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<IReadOnlyDictionary<long, FriendRelation>> GetFriendRelationsAsync(
|
||||||
|
long viewerId, IReadOnlyList<long> otherViewerIds, CancellationToken ct)
|
||||||
|
{
|
||||||
|
if (otherViewerIds.Count == 0)
|
||||||
|
return new Dictionary<long, FriendRelation>();
|
||||||
|
|
||||||
|
var idSet = otherViewerIds.Where(id => id != viewerId).Distinct().ToList();
|
||||||
|
var friendSet = idSet.Count == 0
|
||||||
|
? new HashSet<long>()
|
||||||
|
: (await _db.ViewerFriends.AsNoTracking()
|
||||||
|
.Where(f => f.OwnerViewerId == viewerId && idSet.Contains(f.FriendViewerId))
|
||||||
|
.Select(f => f.FriendViewerId)
|
||||||
|
.ToListAsync(ct)).ToHashSet();
|
||||||
|
var applySet = idSet.Count == 0
|
||||||
|
? new HashSet<long>()
|
||||||
|
: (await _db.ViewerFriendApplies.AsNoTracking()
|
||||||
|
.Where(a => a.FromViewerId == viewerId && idSet.Contains(a.ToViewerId))
|
||||||
|
.Select(a => a.ToViewerId)
|
||||||
|
.ToListAsync(ct)).ToHashSet();
|
||||||
|
|
||||||
|
var result = new Dictionary<long, FriendRelation>(otherViewerIds.Count);
|
||||||
|
foreach (var id in otherViewerIds)
|
||||||
|
{
|
||||||
|
result[id] = id == viewerId
|
||||||
|
? new FriendRelation(false, false)
|
||||||
|
: new FriendRelation(friendSet.Contains(id), applySet.Contains(id));
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
// --- helpers ---
|
// --- helpers ---
|
||||||
|
|
||||||
private sealed record ViewerProjection(
|
private sealed record ViewerProjection(
|
||||||
|
|||||||
@@ -27,4 +27,12 @@ public interface IFriendService
|
|||||||
|
|
||||||
/// <summary>Deletes both directions of the friendship (A→B and B→A).</summary>
|
/// <summary>Deletes both directions of the friendship (A→B and B→A).</summary>
|
||||||
Task RejectFriendAsync(long viewerId, int targetViewerId, CancellationToken ct);
|
Task RejectFriendAsync(long viewerId, int targetViewerId, CancellationToken ct);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Batched caller-relative friend-relation lookup. For each id in <paramref name="otherViewerIds"/>
|
||||||
|
/// returns whether the caller is already friends with them and/or has an outgoing pending apply
|
||||||
|
/// to them. Self and unknown ids resolve to <c>(false, false)</c>.
|
||||||
|
/// </summary>
|
||||||
|
Task<IReadOnlyDictionary<long, FriendRelation>> GetFriendRelationsAsync(
|
||||||
|
long viewerId, IReadOnlyList<long> otherViewerIds, CancellationToken ct);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -396,17 +396,19 @@ public sealed class GuildController : SVSimController
|
|||||||
|
|
||||||
var viewerIds = members.Select(m => m.ViewerId).ToList();
|
var viewerIds = members.Select(m => m.ViewerId).ToList();
|
||||||
var profiles = await _viewers.LoadGuildProfileBatchAsync(viewerIds, ct);
|
var profiles = await _viewers.LoadGuildProfileBatchAsync(viewerIds, ct);
|
||||||
|
var relations = await _friends.GetFriendRelationsAsync(callerViewerId, viewerIds, ct);
|
||||||
|
|
||||||
var result = new List<GuildMemberInfoDto>(members.Count);
|
var result = new List<GuildMemberInfoDto>(members.Count);
|
||||||
foreach (var m in members)
|
foreach (var m in members)
|
||||||
{
|
{
|
||||||
profiles.TryGetValue(m.ViewerId, out var p);
|
profiles.TryGetValue(m.ViewerId, out var p);
|
||||||
result.Add(ToMemberDto(m, p));
|
relations.TryGetValue(m.ViewerId, out var r);
|
||||||
|
result.Add(ToMemberDto(m, p, r));
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static GuildMemberInfoDto ToMemberDto(GuildMember member, GuildMemberProfile? profile) => new()
|
private static GuildMemberInfoDto ToMemberDto(GuildMember member, GuildMemberProfile? profile, FriendRelation? relation) => new()
|
||||||
{
|
{
|
||||||
ViewerId = member.ViewerId,
|
ViewerId = member.ViewerId,
|
||||||
Name = profile?.Name ?? "",
|
Name = profile?.Name ?? "",
|
||||||
@@ -414,6 +416,8 @@ public sealed class GuildController : SVSimController
|
|||||||
CountryCode = profile?.CountryCode ?? "",
|
CountryCode = profile?.CountryCode ?? "",
|
||||||
Rank = profile?.Rank ?? 1,
|
Rank = profile?.Rank ?? 1,
|
||||||
DegreeId = profile?.DegreeId ?? 0,
|
DegreeId = profile?.DegreeId ?? 0,
|
||||||
|
IsFriend = relation?.IsFriend == true ? 1 : 0,
|
||||||
|
IsFriendApply = relation?.HasOutgoingApply == true ? 1 : 0,
|
||||||
IsOfficialMarkDisplayed = profile?.IsOfficialMarkDisplayed == true ? 1 : 0,
|
IsOfficialMarkDisplayed = profile?.IsOfficialMarkDisplayed == true ? 1 : 0,
|
||||||
Role = (int)member.Role,
|
Role = (int)member.Role,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -30,13 +30,21 @@ public class GuildMemberInfoDto
|
|||||||
[JsonPropertyName("degree_id"), Key("degree_id"), JsonConverter(typeof(StringifiedIntConverter))]
|
[JsonPropertyName("degree_id"), Key("degree_id"), JsonConverter(typeof(StringifiedIntConverter))]
|
||||||
public int DegreeId { get; set; }
|
public int DegreeId { get; set; }
|
||||||
|
|
||||||
/// <summary>Optional — omit when the caller has no friend relationship with this member.</summary>
|
/// <summary>
|
||||||
[JsonPropertyName("is_friend"), Key("is_friend")]
|
/// Client reads unconditionally in GuildMemberInfo.cs:48 (json["is_friend"].ToBoolean()) — always emit.
|
||||||
public int? IsFriend { get; set; }
|
/// Base UserInfoBase guards this, but GuildMemberInfo re-reads it on top, unguarded. 0 = not a friend.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("is_friend"), Key("is_friend"),
|
||||||
|
JsonIgnore(Condition = JsonIgnoreCondition.Never)]
|
||||||
|
public int IsFriend { get; set; }
|
||||||
|
|
||||||
/// <summary>Optional — omit when no pending friend apply.</summary>
|
/// <summary>
|
||||||
[JsonPropertyName("is_friend_apply"), Key("is_friend_apply")]
|
/// Client reads unconditionally in GuildMemberInfo.cs:49 (json["is_friend_apply"].ToBoolean()) — always emit.
|
||||||
public int? IsFriendApply { get; set; }
|
/// 0 = no pending friend apply.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("is_friend_apply"), Key("is_friend_apply"),
|
||||||
|
JsonIgnore(Condition = JsonIgnoreCondition.Never)]
|
||||||
|
public int IsFriendApply { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether the official-account badge is shown for this member.
|
/// Whether the official-account badge is shown for this member.
|
||||||
|
|||||||
Reference in New Issue
Block a user