From 48342a289053ff193a3dfbc2349d7f0c2af4c678 Mon Sep 17 00:00:00 2001 From: Ske Date: Wed, 12 Feb 2020 23:18:31 +0100 Subject: [PATCH] Fix spurious empty-string-description errors --- PluralKit.Bot/Services/EmbedService.cs | 8 ++++---- PluralKit.Core/Utils/StringUtils.cs | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/PluralKit.Bot/Services/EmbedService.cs b/PluralKit.Bot/Services/EmbedService.cs index a5492ee8..75366d3a 100644 --- a/PluralKit.Bot/Services/EmbedService.cs +++ b/PluralKit.Bot/Services/EmbedService.cs @@ -115,14 +115,14 @@ namespace PluralKit.Bot { if (avatar != null) eb.WithThumbnailUrl(avatar); - if (member.DisplayName != null) eb.AddField("Display Name", member.DisplayName.Truncate(1024), true); + if (!member.DisplayName.EmptyOrNull()) eb.AddField("Display Name", member.DisplayName.Truncate(1024), true); if (guild != null && guildDisplayName != null) eb.AddField($"Server Nickname (for {guild.Name})", guildDisplayName.Truncate(1024), true); if (member.Birthday != null && member.MemberPrivacy.CanAccess(ctx)) eb.AddField("Birthdate", member.BirthdayString, true); - if (member.Pronouns != null && member.MemberPrivacy.CanAccess(ctx)) eb.AddField("Pronouns", member.Pronouns.Truncate(1024), true); + if (!member.Pronouns.EmptyOrNull() && member.MemberPrivacy.CanAccess(ctx)) eb.AddField("Pronouns", member.Pronouns.Truncate(1024), true); if (messageCount > 0 && member.MemberPrivacy.CanAccess(ctx)) eb.AddField("Message Count", messageCount, true); if (member.HasProxyTags) eb.AddField("Proxy Tags", string.Join('\n', proxyTagsStr).Truncate(1024), true); - if (member.Color != null && member.MemberPrivacy.CanAccess(ctx)) eb.AddField("Color", $"#{member.Color}", true); - if (member.Description != null && member.MemberPrivacy.CanAccess(ctx)) eb.AddField("Description", member.Description, false); + if (!member.Color.EmptyOrNull() && member.MemberPrivacy.CanAccess(ctx)) eb.AddField("Color", $"#{member.Color}", true); + if (!member.Description.EmptyOrNull() && member.MemberPrivacy.CanAccess(ctx)) eb.AddField("Description", member.Description, false); return eb.Build(); } diff --git a/PluralKit.Core/Utils/StringUtils.cs b/PluralKit.Core/Utils/StringUtils.cs index c6878c82..9c1dd667 100644 --- a/PluralKit.Core/Utils/StringUtils.cs +++ b/PluralKit.Core/Utils/StringUtils.cs @@ -53,5 +53,12 @@ namespace PluralKit.Core if (input.Trim().Length == 0) return null; return input; } + + public static bool EmptyOrNull(this string input) + { + if (input == null) return true; + if (input.Trim().Length == 0) return true; + return false; + } } } \ No newline at end of file