diff --git a/locale/Messages.resx b/locale/Messages.resx index fc38c71..6349097 100644 --- a/locale/Messages.resx +++ b/locale/Messages.resx @@ -603,9 +603,6 @@ Display name - - Not present - Information about {0} @@ -615,9 +612,6 @@ Discord user since - - Mentioned as - Banned @@ -627,14 +621,14 @@ Banned permanently - - Not on the server + + Not on the guild - - Muted with a timeout + + Muted by timeout - - Muted with a mute role + + Muted by mute role Guild member since @@ -646,6 +640,6 @@ Roles - Guild Nitro booster since + Nitro booster since diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx index 871b965..3f20dd0 100644 --- a/locale/Messages.ru.resx +++ b/locale/Messages.ru.resx @@ -603,9 +603,6 @@ Отображаемое имя - - Отсутствует - Информация о {0} @@ -613,10 +610,7 @@ Заглушен - Пользователь Discord с - - - Упоминается как + Вступил в Discord Забанен @@ -627,17 +621,17 @@ Забанен навсегда - + Не на сервере - + Заглушен с помощью тайм-аута - + Заглушен с помощью роли мута - Участник сервера с + Вступил на сервер Никнейм @@ -646,6 +640,6 @@ Роли - Nitro бустер сервера с + Начал бустить сервер diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx index 54f10a2..a564e1c 100644 --- a/locale/Messages.tt-ru.resx +++ b/locale/Messages.tt-ru.resx @@ -603,9 +603,6 @@ дисплейнейм - - нету такого - деанон {0} @@ -615,9 +612,6 @@ юзер Discord со времен - - пинается как - забанен @@ -627,13 +621,13 @@ забанен - + вышел из сервера - + замучен таймаутом - + замучен ролькой diff --git a/src/Commands/ToolsCommandGroup.cs b/src/Commands/ToolsCommandGroup.cs index ea119dd..98364fc 100644 --- a/src/Commands/ToolsCommandGroup.cs +++ b/src/Commands/ToolsCommandGroup.cs @@ -43,10 +43,22 @@ public class ToolsCommandGroup : CommandGroup } /// - /// A slash command that shows user's display name & guild nickname, - /// joined Discord & joined server dates, Nitro boosting status, guild roles - /// and current punishments. + /// A slash command that shows information about user. /// + /// + /// Information on the output: + /// + /// Display name + /// Discord user since + /// Guild nickname + /// Guild member since + /// Nitro booster since + /// Guild roles + /// Active mute information + /// Active ban information + /// Is on guild status + /// + /// /// The user to show info about. /// /// A feedback sending result which may or may not have succeeded. @@ -137,7 +149,7 @@ public class ToolsCommandGroup : CommandGroup if (!guildMemberResult.IsSuccess && !existingBanResult.IsDefined()) { builder.Append("### ") - .AppendLine(Markdown.Bold(Messages.ShowInfoNotOnServer)); + .AppendLine(Markdown.Bold(Messages.ShowInfoNotOnGuild)); embedColor = ColorsList.Default; } @@ -204,14 +216,14 @@ public class ToolsCommandGroup : CommandGroup builder.Append("- ").AppendLine(Messages.ShowInfoMuted); if (memberData.MutedUntil is not null && DateTimeOffset.UtcNow <= memberData.MutedUntil) { - builder.Append(" - ").AppendLine(Messages.ShowInfoMutedWithMuteRole) + builder.Append(" - ").AppendLine(Messages.ShowInfoMutedByMuteRole) .Append(" - ").AppendLine(string.Format( Messages.DescriptionActionExpiresAt, Markdown.Timestamp(memberData.MutedUntil.Value))); } if (communicationDisabledUntil is not null) { - builder.Append(" - ").AppendLine(Messages.ShowInfoMutedWithTimeout) + builder.Append(" - ").AppendLine(Messages.ShowInfoMutedByTimeout) .Append(" - ").AppendLine(string.Format( Messages.DescriptionActionExpiresAt, Markdown.Timestamp(communicationDisabledUntil.Value))); } diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs index 63e8106..884cfd4 100644 --- a/src/Messages.Designer.cs +++ b/src/Messages.Designer.cs @@ -1014,24 +1014,12 @@ namespace Boyfriend { } } - internal static string NotPresent { - get { - return ResourceManager.GetString("NotPresent", resourceCulture); - } - } - internal static string ShowInfoTitle { get { return ResourceManager.GetString("ShowInfoTitle", resourceCulture); } } - internal static string ShowInfoMentionedAs { - get { - return ResourceManager.GetString("ShowInfoMentionedAs", resourceCulture); - } - } - internal static string ShowInfoDisplayName { get { return ResourceManager.GetString("ShowInfoDisplayName", resourceCulture); @@ -1068,21 +1056,21 @@ namespace Boyfriend { } } - internal static string ShowInfoNotOnServer { + internal static string ShowInfoNotOnGuild { get { - return ResourceManager.GetString("ShowInfoNotOnServer", resourceCulture); + return ResourceManager.GetString("ShowInfoNotOnGuild", resourceCulture); } } - internal static string ShowInfoMutedWithTimeout { + internal static string ShowInfoMutedByTimeout { get { - return ResourceManager.GetString("ShowInfoMutedWithTimeout", resourceCulture); + return ResourceManager.GetString("ShowInfoMutedByTimeout", resourceCulture); } } - internal static string ShowInfoMutedWithMuteRole { + internal static string ShowInfoMutedByMuteRole { get { - return ResourceManager.GetString("ShowInfoMutedWithMuteRole", resourceCulture); + return ResourceManager.GetString("ShowInfoMutedByMuteRole", resourceCulture); } }