From a727a9d8bbad3ed8bf16b35f640c533f0ff7fd0f Mon Sep 17 00:00:00 2001
From: mctaylors <95250141+mctaylors@users.noreply.github.com>
Date: Sun, 9 Jul 2023 16:16:57 +0300
Subject: [PATCH] Remora.Discord part 63 out of 63
---
Commands/AboutCommandGroup.cs | 8 ++++----
Commands/BanCommandGroup.cs | 14 +++++++-------
Commands/ClearCommandGroup.cs | 4 ++--
Commands/KickCommandGroup.cs | 6 +++---
Commands/MuteCommandGroup.cs | 14 +++++++-------
Commands/PingCommandGroup.cs | 2 +-
Commands/RemindCommandGroup.cs | 2 +-
Commands/SettingsCommandGroup.cs | 23 ++++++++++++++++++-----
Messages.Designer.cs | 11 ++++++++++-
Messages.resx | 7 +++++--
Messages.ru.resx | 7 +++++--
Messages.tt-ru.resx | 7 +++++--
12 files changed, 68 insertions(+), 37 deletions(-)
diff --git a/Commands/AboutCommandGroup.cs b/Commands/AboutCommandGroup.cs
index 6f02c2c..e4820c6 100644
--- a/Commands/AboutCommandGroup.cs
+++ b/Commands/AboutCommandGroup.cs
@@ -16,7 +16,7 @@ using Remora.Results;
namespace Boyfriend.Commands;
///
-/// Handles the command to show information about this bot: /about
+/// Handles the command to show information about this bot: /about.
///
public class AboutCommandGroup : CommandGroup {
private static readonly string[] Developers = { "Octol1ttle", "mctaylors", "neroduckale" };
@@ -41,7 +41,7 @@ public class AboutCommandGroup : CommandGroup {
/// A feedback sending result which may or may not have succeeded.
///
[Command("about")]
- [Description("отображает список разработчиков")]
+ [Description("Shows Boyfriend's developers")]
public async Task SendAboutBotAsync() {
if (!_context.TryGetContextIDs(out var guildId, out _, out _))
return Result.FromError(
@@ -59,8 +59,8 @@ public class AboutCommandGroup : CommandGroup {
builder.AppendLine($"@{dev} — {$"AboutDeveloper@{dev}".Localized()}");
builder.AppendLine()
- .AppendLine(Markdown.Bold(Messages.AboutTitleWiki))
- .AppendLine("https://github.com/TeamOctolings/Boyfriend/wiki");
+ .AppendLine(Markdown.Bold(Messages.AboutTitleWiki))
+ .AppendLine("https://github.com/TeamOctolings/Boyfriend/wiki");
var embed = new EmbedBuilder().WithSmallTitle(Messages.AboutBot, currentUser)
.WithDescription(builder.ToString())
diff --git a/Commands/BanCommandGroup.cs b/Commands/BanCommandGroup.cs
index e752dc4..a525afb 100644
--- a/Commands/BanCommandGroup.cs
+++ b/Commands/BanCommandGroup.cs
@@ -61,11 +61,11 @@ public class BanCommandGroup : CommandGroup {
[RequireContext(ChannelContext.Guild)]
[RequireDiscordPermission(DiscordPermission.BanMembers)]
[RequireBotDiscordPermissions(DiscordPermission.BanMembers)]
- [Description("банит юзера")]
+ [Description("Ban user")]
public async Task BanUserAsync(
- [Description("юзер кого банить")] IUser target,
- [Description("причина зачем банить")] string reason,
- [Description("продолжительность бана")]
+ [Description("User to ban")] IUser target,
+ [Description("Ban reason")] string reason,
+ [Description("Ban duration")]
TimeSpan? duration = null) {
if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
return Result.FromError(
@@ -197,10 +197,10 @@ public class BanCommandGroup : CommandGroup {
[RequireContext(ChannelContext.Guild)]
[RequireDiscordPermission(DiscordPermission.BanMembers)]
[RequireBotDiscordPermissions(DiscordPermission.BanMembers)]
- [Description("разбанит юзера")]
+ [Description("Unban user")]
public async Task UnbanUserAsync(
- [Description("юзер кого разбанить")] IUser target,
- [Description("причина зачем разбанить")]
+ [Description("User to unban")] IUser target,
+ [Description("Unban reason")]
string reason) {
if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
return Result.FromError(
diff --git a/Commands/ClearCommandGroup.cs b/Commands/ClearCommandGroup.cs
index c869525..de44fbb 100644
--- a/Commands/ClearCommandGroup.cs
+++ b/Commands/ClearCommandGroup.cs
@@ -51,9 +51,9 @@ public class ClearCommandGroup : CommandGroup {
[RequireContext(ChannelContext.Guild)]
[RequireDiscordPermission(DiscordPermission.ManageMessages)]
[RequireBotDiscordPermissions(DiscordPermission.ManageMessages)]
- [Description("удаляет сообщения")]
+ [Description("Remove multiple messages")]
public async Task ClearMessagesAsync(
- [Description("сколько удалять")] [MinValue(2)] [MaxValue(100)]
+ [Description("Number of messages to remove (2-100)")] [MinValue(2)] [MaxValue(100)]
int amount) {
if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
return Result.FromError(
diff --git a/Commands/KickCommandGroup.cs b/Commands/KickCommandGroup.cs
index 1db85f7..e70a903 100644
--- a/Commands/KickCommandGroup.cs
+++ b/Commands/KickCommandGroup.cs
@@ -57,10 +57,10 @@ public class KickCommandGroup : CommandGroup {
[RequireContext(ChannelContext.Guild)]
[RequireDiscordPermission(DiscordPermission.KickMembers)]
[RequireBotDiscordPermissions(DiscordPermission.KickMembers)]
- [Description("кикает юзера")]
+ [Description("Kick member")]
public async Task KickUserAsync(
- [Description("юзер кого кикать")] IUser target,
- [Description("причина зачем кикать")] string reason) {
+ [Description("Member to kick")] IUser target,
+ [Description("Kick reason")] string reason) {
if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
return Result.FromError(
new ArgumentNullError(nameof(_context), "Unable to retrieve necessary IDs from command context"));
diff --git a/Commands/MuteCommandGroup.cs b/Commands/MuteCommandGroup.cs
index ff06fea..cdf750d 100644
--- a/Commands/MuteCommandGroup.cs
+++ b/Commands/MuteCommandGroup.cs
@@ -61,11 +61,11 @@ public class MuteCommandGroup : CommandGroup {
[RequireContext(ChannelContext.Guild)]
[RequireDiscordPermission(DiscordPermission.ModerateMembers)]
[RequireBotDiscordPermissions(DiscordPermission.ModerateMembers)]
- [Description("глушит юзера")]
+ [Description("Mute member")]
public async Task MuteUserAsync(
- [Description("юзер кого глушить")] IUser target,
- [Description("причина зачем глушить")] string reason,
- [Description("продолжительность мута")]
+ [Description("Member to mute")] IUser target,
+ [Description("Mute reason")] string reason,
+ [Description("Mute duration")]
TimeSpan duration) {
if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
return Result.FromError(
@@ -173,11 +173,11 @@ public class MuteCommandGroup : CommandGroup {
[RequireContext(ChannelContext.Guild)]
[RequireDiscordPermission(DiscordPermission.ModerateMembers)]
[RequireBotDiscordPermissions(DiscordPermission.ModerateMembers)]
- [Description("разрешает юзеру снова говорить")]
+ [Description("Unmute member")]
public async Task UnmuteUserAsync(
- [Description("юзер кого раззамучивать")]
+ [Description("Member to unmute")]
IUser target,
- [Description("причина зачем раззамучивать")]
+ [Description("Unmute reason")]
string reason) {
if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
return Result.FromError(
diff --git a/Commands/PingCommandGroup.cs b/Commands/PingCommandGroup.cs
index a5ed739..45d27e2 100644
--- a/Commands/PingCommandGroup.cs
+++ b/Commands/PingCommandGroup.cs
@@ -43,7 +43,7 @@ public class PingCommandGroup : CommandGroup {
/// A feedback sending result which may or may not have succeeded.
///
[Command("ping", "пинг")]
- [Description("получает задержку")]
+ [Description("Get bot latency")]
public async Task SendPingAsync() {
if (!_context.TryGetContextIDs(out var guildId, out var channelId, out _))
return Result.FromError(
diff --git a/Commands/RemindCommandGroup.cs b/Commands/RemindCommandGroup.cs
index 5ac4d19..5ee7a8c 100644
--- a/Commands/RemindCommandGroup.cs
+++ b/Commands/RemindCommandGroup.cs
@@ -34,7 +34,7 @@ public class RemindCommandGroup : CommandGroup {
}
[Command("remind")]
- [Description("крафтит напоминалки")]
+ [Description("Create a reminder")]
public async Task AddReminderAsync(TimeSpan duration, string text) {
if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
return Result.FromError(
diff --git a/Commands/SettingsCommandGroup.cs b/Commands/SettingsCommandGroup.cs
index d949c7e..7e4763f 100644
--- a/Commands/SettingsCommandGroup.cs
+++ b/Commands/SettingsCommandGroup.cs
@@ -21,7 +21,7 @@ using Remora.Results;
namespace Boyfriend.Commands;
///
-/// Handles the command to show information about this bot: /about
+/// Handles the commands to list and modify per-guild settings: /settings and /settings list.
///
public class SettingsCommandGroup : CommandGroup {
private readonly ICommandContext _context;
@@ -38,8 +38,14 @@ public class SettingsCommandGroup : CommandGroup {
_userApi = userApi;
}
- [Command("settingslist")]
- [Description("ХАХАХАХАХАХ я ебанулся")]
+ ///
+ /// A slash command that lists current per-guild settings.
+ ///
+ ///
+ /// A feedback sending result which may or may not have succeeded.
+ ///
+ [Command("settings list")]
+ [Description("Shows settings list for this server")]
[SuppressInteractionResponse(suppress: true)]
public async Task SendSettingsListAsync() {
if (!_context.TryGetContextIDs(out var guildId, out _, out _))
@@ -76,13 +82,13 @@ public class SettingsCommandGroup : CommandGroup {
}
///
- /// A slash command that shows information about this bot.
+ /// A slash command that modifies per-guild settings.
///
///
/// A feedback sending result which may or may not have succeeded.
///
[Command("settings")]
- [Description("редактирует НАСТРОЙКИ ХАХАХАХАХА")]
+ [Description("Change settings for this server")]
public async Task EditSettingsAsync(
[Description("настройка")] string setting,
[Description("значение")] string value) {
@@ -135,7 +141,14 @@ public class SettingsCommandGroup : CommandGroup {
return (Result)await _feedbackService.SendContextualEmbedAsync(failedBuilt, ct: CancellationToken);
}
+ var builder = new StringBuilder();
+
+ builder.Append(Markdown.InlineCode(setting))
+ .Append($" {Messages.SettingIsNow} ")
+ .Append(Markdown.InlineCode(value));
+
var embed = new EmbedBuilder().WithSmallTitle(Messages.SettingSuccessfulyChanged, currentUser)
+ .WithDescription(builder.ToString())
.WithColour(ColorsList.Green)
.Build();
if (!embed.IsDefined(out var built)) return Result.FromError(embed);
diff --git a/Messages.Designer.cs b/Messages.Designer.cs
index 83b9d5b..9f39239 100644
--- a/Messages.Designer.cs
+++ b/Messages.Designer.cs
@@ -699,7 +699,7 @@ namespace Boyfriend {
}
///
- /// Looks up a localized string similar to Language not supported! Supported languages:.
+ /// Looks up a localized string similar to Language not supported!.
///
internal static string LanguageNotSupported {
get {
@@ -896,6 +896,15 @@ namespace Boyfriend {
}
}
+ ///
+ /// Looks up a localized string similar to is now.
+ ///
+ internal static string SettingIsNow {
+ get {
+ return ResourceManager.GetString("SettingIsNow", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Setting not changed.
///
diff --git a/Messages.resx b/Messages.resx
index 4462db5..0bb7ab5 100644
--- a/Messages.resx
+++ b/Messages.resx
@@ -184,8 +184,8 @@
Mute role
- Language not supported! Supported languages:
-
+ Language not supported!
+
Yes
@@ -555,4 +555,7 @@
Setting not changed
+
+ is now
+
diff --git a/Messages.ru.resx b/Messages.ru.resx
index 838201d..1351ea1 100644
--- a/Messages.ru.resx
+++ b/Messages.ru.resx
@@ -181,8 +181,8 @@
Роль мута
- Язык не поддерживается! Поддерживаемые языки:
-
+ Язык не поддерживается!
+
Да
@@ -555,4 +555,7 @@
Настройка не редактирована
+
+ теперь имеет значение
+
diff --git a/Messages.tt-ru.resx b/Messages.tt-ru.resx
index 84e257f..e4a75be 100644
--- a/Messages.tt-ru.resx
+++ b/Messages.tt-ru.resx
@@ -184,8 +184,8 @@
звание замученного
- такого языка нету, ты шо, есть только такие:
-
+ такого языка нету...
+
да
@@ -555,4 +555,7 @@
прикол сдох
+
+ стало
+