1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00

resolving conversations...

Signed-off-by: Macintosh II <mctaylxrs@outlook.com>
This commit is contained in:
Macintxsh 2023-09-28 22:57:54 +03:00
parent 93b290d87f
commit 40b8b27ca3
Signed by: mctaylors
GPG key ID: 361D326747B61E65
5 changed files with 40 additions and 58 deletions

View file

@ -603,9 +603,6 @@
<data name="ShowInfoDisplayName" xml:space="preserve">
<value>Display name</value>
</data>
<data name="NotPresent" xml:space="preserve">
<value>Not present</value>
</data>
<data name="ShowInfoTitle" xml:space="preserve">
<value>Information about {0}</value>
</data>
@ -615,9 +612,6 @@
<data name="ShowInfoDiscordUserSince" xml:space="preserve">
<value>Discord user since</value>
</data>
<data name="ShowInfoMentionedAs" xml:space="preserve">
<value>Mentioned as</value>
</data>
<data name="ShowInfoBanned" xml:space="preserve">
<value>Banned</value>
</data>
@ -627,14 +621,14 @@
<data name="ShowInfoBannedPermanently" xml:space="preserve">
<value>Banned permanently</value>
</data>
<data name="ShowInfoNotOnServer" xml:space="preserve">
<value>Not on the server</value>
<data name="ShowInfoNotOnGuild" xml:space="preserve">
<value>Not on the guild</value>
</data>
<data name="ShowInfoMutedWithTimeout" xml:space="preserve">
<value>Muted with a timeout</value>
<data name="ShowInfoMutedByTimeout" xml:space="preserve">
<value>Muted by timeout</value>
</data>
<data name="ShowInfoMutedWithMuteRole" xml:space="preserve">
<value>Muted with a mute role</value>
<data name="ShowInfoMutedByMuteRole" xml:space="preserve">
<value>Muted by mute role</value>
</data>
<data name="ShowInfoGuildMemberSince" xml:space="preserve">
<value>Guild member since</value>
@ -646,6 +640,6 @@
<value>Roles</value>
</data>
<data name="ShowInfoGuildMemberPremiumSince" xml:space="preserve">
<value>Guild Nitro booster since</value>
<value>Nitro booster since</value>
</data>
</root>

View file

@ -603,9 +603,6 @@
<data name="ShowInfoDisplayName" xml:space="preserve">
<value>Отображаемое имя</value>
</data>
<data name="NotPresent" xml:space="preserve">
<value>Отсутствует</value>
</data>
<data name="ShowInfoTitle" xml:space="preserve">
<value>Информация о {0}</value>
</data>
@ -613,10 +610,7 @@
<value>Заглушен</value>
</data>
<data name="ShowInfoDiscordUserSince" xml:space="preserve">
<value>Пользователь Discord с</value>
</data>
<data name="ShowInfoMentionedAs" xml:space="preserve">
<value>Упоминается как</value>
<value>Вступил в Discord</value>
</data>
<data name="ShowInfoBanned" xml:space="preserve">
<value>Забанен</value>
@ -627,17 +621,17 @@
<data name="ShowInfoBannedPermanently" xml:space="preserve">
<value>Забанен навсегда</value>
</data>
<data name="ShowInfoNotOnServer" xml:space="preserve">
<data name="ShowInfoNotOnGuild" xml:space="preserve">
<value>Не на сервере</value>
</data>
<data name="ShowInfoMutedWithTimeout" xml:space="preserve">
<data name="ShowInfoMutedByTimeout" xml:space="preserve">
<value>Заглушен с помощью тайм-аута</value>
</data>
<data name="ShowInfoMutedWithMuteRole" xml:space="preserve">
<data name="ShowInfoMutedByMuteRole" xml:space="preserve">
<value>Заглушен с помощью роли мута</value>
</data>
<data name="ShowInfoGuildMemberSince" xml:space="preserve">
<value>Участник сервера с</value>
<value>Вступил на сервер</value>
</data>
<data name="ShowInfoGuildNickname" xml:space="preserve">
<value>Никнейм</value>
@ -646,6 +640,6 @@
<value>Роли</value>
</data>
<data name="ShowInfoGuildMemberPremiumSince" xml:space="preserve">
<value>Nitro бустер сервера с</value>
<value>Начал бустить сервер</value>
</data>
</root>

View file

@ -603,9 +603,6 @@
<data name="ShowInfoDisplayName" xml:space="preserve">
<value>дисплейнейм</value>
</data>
<data name="NotPresent" xml:space="preserve">
<value>нету такого</value>
</data>
<data name="ShowInfoTitle" xml:space="preserve">
<value>деанон {0}</value>
</data>
@ -615,9 +612,6 @@
<data name="ShowInfoDiscordUserSince" xml:space="preserve">
<value>юзер Discord со времен</value>
</data>
<data name="ShowInfoMentionedAs" xml:space="preserve">
<value>пинается как</value>
</data>
<data name="ShowInfoBanned" xml:space="preserve">
<value>забанен</value>
</data>
@ -627,13 +621,13 @@
<data name="ShowInfoBannedPermanently" xml:space="preserve">
<value>забанен</value>
</data>
<data name="ShowInfoNotOnServer" xml:space="preserve">
<data name="ShowInfoNotOnGuild" xml:space="preserve">
<value>вышел из сервера</value>
</data>
<data name="ShowInfoMutedWithTimeout" xml:space="preserve">
<data name="ShowInfoMutedByTimeout" xml:space="preserve">
<value>замучен таймаутом</value>
</data>
<data name="ShowInfoMutedWithMuteRole" xml:space="preserve">
<data name="ShowInfoMutedByMuteRole" xml:space="preserve">
<value>замучен ролькой</value>
</data>
<data name="ShowInfoGuildMemberSince" xml:space="preserve">

View file

@ -43,10 +43,22 @@ public class ToolsCommandGroup : CommandGroup
}
/// <summary>
/// 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.
/// </summary>
/// <remarks>
/// Information on the output:
/// <list type="bullet">
/// <item>Display name</item>
/// <item>Discord user since</item>
/// <item>Guild nickname</item>
/// <item>Guild member since</item>
/// <item>Nitro booster since</item>
/// <item>Guild roles</item>
/// <item>Active mute information</item>
/// <item>Active ban information</item>
/// <item>Is on guild status</item>
/// </list>
/// </remarks>
/// <param name="target">The user to show info about.</param>
/// <returns>
/// 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)));
}

View file

@ -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);
}
}