Skip to content

Commit db44609

Browse files
committed
[Core] Add null fallback for all string entity fields
We are safe... for now.
1 parent 76ff0e2 commit db44609

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

Lagrange.Core/Common/Entity/BotFriend.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ public class BotFriend(long uin, string nickname, string uid, string remarks, st
44
{
55
public override long Uin { get; } = uin;
66

7-
public override string Nickname { get; } = nickname;
7+
public override string Nickname { get; } = nickname ?? string.Empty;
88

9-
public override string Uid { get; } = uid;
9+
public override string Uid { get; } = uid ?? string.Empty;
1010

1111
public int Age { get; init; }
1212

1313
public BotGender Gender { get; init; }
1414

15-
public string Remarks { get; } = remarks;
15+
public string Remarks { get; } = remarks ?? string.Empty;
1616

17-
public string PersonalSign { get; } = personalSign;
17+
public string PersonalSign { get; } = personalSign ?? string.Empty;
1818

19-
public string Qid { get; } = qid;
19+
public string Qid { get; } = qid ?? string.Empty;
2020

2121
public BotFriendCategory Category { get; } = category;
2222
}

Lagrange.Core/Common/Entity/BotFriendCategory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class BotFriendCategory(int id, string name, int count, int sortId)
44
{
55
public int Id { get; } = id;
66

7-
public string Name { get; } = name;
7+
public string Name { get; } = name ?? string.Empty;
88

99
public int Count { get; } = count;
1010

Lagrange.Core/Common/Entity/BotGroup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class BotGroup(
1212
{
1313
public long GroupUin { get; } = groupUin;
1414

15-
public string GroupName { get; } = groupName;
15+
public string GroupName { get; } = groupName ?? string.Empty;
1616

1717
public int MemberCount { get; } = memberCount;
1818

Lagrange.Core/Common/Entity/BotGroupMember.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public class BotGroupMember(
1717

1818
public override long Uin { get; } = uin;
1919

20-
public override string Uid { get; } = uid;
20+
public override string Uid { get; } = uid ?? string.Empty;
2121

22-
public override string Nickname { get; } = nickname;
22+
public override string Nickname { get; } = nickname ?? string.Empty;
2323

2424
public int Age { get; init; }
2525

Lagrange.Core/Common/Entity/BotStranger.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ public class BotStranger(long uin, string nickname, string uid) : BotContact
44
{
55
public override long Uin { get; } = uin;
66

7-
public override string Nickname { get; } = nickname;
7+
public override string Nickname { get; } = nickname ?? string.Empty;
88

9-
public override string Uid { get; } = uid;
9+
public override string Uid { get; } = uid ?? string.Empty;
1010

1111
public long Source { get; init; }
1212
}

0 commit comments

Comments
 (0)