eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-12 08:40:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(bot): more null/empty-string checks in CV2 cards

Browse source
This commit is contained in:
Iris System 2025-08-25 12:22:22 +12:00
parent 06df491c24
commit 44f91efcdc
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
PluralKit.Bot/Services/EmbedService.cs
View file

@ -126,7 +126,7 @@ public class EmbedService
}); });
} }
if (system.BannerPrivacy.CanAccess(ctx)) if (system.BannerPrivacy.CanAccess(ctx) && !string.IsNullOrWhiteSpace(system.BannerImage))
descComponents.Add(new() descComponents.Add(new()
{ {
Type = ComponentType.MediaGallery, Type = ComponentType.MediaGallery,
@ -139,23 +139,25 @@ public class EmbedService
new MessageComponent() new MessageComponent()
{ {
Type = ComponentType.Text, Type = ComponentType.Text,
Content = $"## [{systemName}](https://dash.pluralkit.me/profile/s/{system.Hid}){premiumText}", Content = $"## [{systemName ?? $"`{system.DisplayHid(cctx.Config)}`"}](https://dash.pluralkit.me/profile/s/{system.Hid}){premiumText}",
}, },
new MessageComponent() ];
if (!string.IsNullOrWhiteSpace(headerText))
header.Add(new MessageComponent()
{ {
Type = ComponentType.Text, Type = ComponentType.Text,
Content = headerText, Content = headerText,
}, });
];
if (cctx.Guild != null) if (cctx.Guild != null)
{ {
var guildAvatar = guildSettings.AvatarUrl.TryGetCleanCdnUrl(); var guildAvatar = guildSettings.AvatarUrl.TryGetCleanCdnUrl();
if (guildAvatar != null) if (!string.IsNullOrWhiteSpace(guildAvatar))
avatar = guildAvatar; avatar = guildAvatar;
} }
if (avatar != null) if (!string.IsNullOrWhiteSpace(avatar))
header = [ header = [
new MessageComponent() new MessageComponent()
{ {
@ -304,14 +306,16 @@ public class EmbedService
Type = ComponentType.Text, Type = ComponentType.Text,
Content = $"## [{name}](https://dash.pluralkit.me/profile/m/{member.Hid}){(systemName != null ? $" ({systemName})" : "")}", Content = $"## [{name}](https://dash.pluralkit.me/profile/m/{member.Hid}){(systemName != null ? $" ({systemName})" : "")}",
}, },
new MessageComponent() ];
if (!string.IsNullOrWhiteSpace(headerText))
header.Add(new MessageComponent()
{ {
Type = ComponentType.Text, Type = ComponentType.Text,
Content = headerText, Content = headerText,
}, });
];
if (avatar != null) if (!string.IsNullOrWhiteSpace(avatar))
header = [ header = [
new MessageComponent() new MessageComponent()
{ {
@ -476,12 +480,14 @@ public class EmbedService
Type = ComponentType.Text, Type = ComponentType.Text,
Content = $"## [{name}](https://dash.pluralkit.me/profile/g/{target.Hid}){(systemName != null ? $" ({systemName})" : "")}", Content = $"## [{name}](https://dash.pluralkit.me/profile/g/{target.Hid}){(systemName != null ? $" ({systemName})" : "")}",
}, },
new MessageComponent() ];
if (!string.IsNullOrWhiteSpace(headerText))
header.Add(new MessageComponent()
{ {
Type = ComponentType.Text, Type = ComponentType.Text,
Content = headerText, Content = headerText,
}, });
];
if (target.IconFor(pctx) is { } icon) if (target.IconFor(pctx) is { } icon)
header = [ header = [