From c93d7ca8d34b43b95d3581c811c3fa4fc9848a3a Mon Sep 17 00:00:00 2001 From: Macintosh II Date: Thu, 28 Sep 2023 21:27:06 +0300 Subject: [PATCH] Add PremiumSince field Signed-off-by: Macintosh II --- locale/Messages.resx | 3 +++ locale/Messages.ru.resx | 3 +++ locale/Messages.tt-ru.resx | 3 +++ src/Commands/ToolsCommandGroup.cs | 10 ++++++++-- src/Messages.Designer.cs | 6 ++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/locale/Messages.resx b/locale/Messages.resx index 1caa63a..fc38c71 100644 --- a/locale/Messages.resx +++ b/locale/Messages.resx @@ -645,4 +645,7 @@ Roles + + Guild Nitro booster since + diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx index 734b02a..871b965 100644 --- a/locale/Messages.ru.resx +++ b/locale/Messages.ru.resx @@ -645,4 +645,7 @@ Роли + + Nitro бустер сервера с + diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx index 098775f..54f10a2 100644 --- a/locale/Messages.tt-ru.resx +++ b/locale/Messages.tt-ru.resx @@ -645,4 +645,7 @@ рольки + + бустит сервер со времен + diff --git a/src/Commands/ToolsCommandGroup.cs b/src/Commands/ToolsCommandGroup.cs index 545ee50..b0f3169 100644 --- a/src/Commands/ToolsCommandGroup.cs +++ b/src/Commands/ToolsCommandGroup.cs @@ -96,6 +96,8 @@ public class ToolsCommandGroup : CommandGroup var memberData = data.GetOrCreateMemberData(user.ID); + var embedColor = ColorsList.Cyan; + var guildMemberResult = await _guildApi.GetGuildMemberAsync(guildId, user.ID, ct); DateTimeOffset? communicationDisabledUntil = null; if (guildMemberResult.IsDefined(out var guildMember)) @@ -110,8 +112,6 @@ public class ToolsCommandGroup : CommandGroup var existingBanResult = await _guildApi.GetGuildBanAsync(guildId, user.ID, ct); - var embedColor = ColorsList.Cyan; - if (isMuted || existingBanResult.IsDefined()) { builder.Append("### ") @@ -162,6 +162,12 @@ public class ToolsCommandGroup : CommandGroup builder.Append("- ").AppendLine(Messages.ShowInfoGuildMemberSince) .AppendLine(Markdown.Timestamp(guildMember.JoinedAt)); + if (guildMember.PremiumSince.IsDefined(out var premiumSince)) + { + builder.Append("- ").AppendLine(Messages.ShowInfoGuildMemberPremiumSince) + .AppendLine(Markdown.Timestamp(premiumSince.Value)); + } + if (guildMember.Roles.Count > 0) { builder.Append("- ").AppendLine(Messages.ShowInfoGuildRoles); diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs index 8209b2c..63e8106 100644 --- a/src/Messages.Designer.cs +++ b/src/Messages.Designer.cs @@ -1103,5 +1103,11 @@ namespace Boyfriend { return ResourceManager.GetString("ShowInfoGuildRoles", resourceCulture); } } + + internal static string ShowInfoGuildMemberPremiumSince { + get { + return ResourceManager.GetString("ShowInfoGuildMemberPremiumSince", resourceCulture); + } + } } }