mirror of
https://github.com/PluralKit/PluralKit.git
synced 2026-02-04 13:06:50 +00:00
fix(bot): more null/empty-string checks in CV2 cards
This commit is contained in:
parent
06df491c24
commit
44f91efcdc
1 changed files with 20 additions and 14 deletions
|
|
@ -126,7 +126,7 @@ public class EmbedService
|
|||
});
|
||||
}
|
||||
|
||||
if (system.BannerPrivacy.CanAccess(ctx))
|
||||
if (system.BannerPrivacy.CanAccess(ctx) && !string.IsNullOrWhiteSpace(system.BannerImage))
|
||||
descComponents.Add(new()
|
||||
{
|
||||
Type = ComponentType.MediaGallery,
|
||||
|
|
@ -139,23 +139,25 @@ public class EmbedService
|
|||
new MessageComponent()
|
||||
{
|
||||
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,
|
||||
Content = headerText,
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
if (cctx.Guild != null)
|
||||
{
|
||||
var guildAvatar = guildSettings.AvatarUrl.TryGetCleanCdnUrl();
|
||||
if (guildAvatar != null)
|
||||
if (!string.IsNullOrWhiteSpace(guildAvatar))
|
||||
avatar = guildAvatar;
|
||||
}
|
||||
|
||||
if (avatar != null)
|
||||
if (!string.IsNullOrWhiteSpace(avatar))
|
||||
header = [
|
||||
new MessageComponent()
|
||||
{
|
||||
|
|
@ -304,14 +306,16 @@ public class EmbedService
|
|||
Type = ComponentType.Text,
|
||||
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,
|
||||
Content = headerText,
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
if (avatar != null)
|
||||
if (!string.IsNullOrWhiteSpace(avatar))
|
||||
header = [
|
||||
new MessageComponent()
|
||||
{
|
||||
|
|
@ -476,12 +480,14 @@ public class EmbedService
|
|||
Type = ComponentType.Text,
|
||||
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,
|
||||
Content = headerText,
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
if (target.IconFor(pctx) is { } icon)
|
||||
header = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue