diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx
index 212ad16..ec1c886 100644
--- a/locale/Messages.tt-ru.resx
+++ b/locale/Messages.tt-ru.resx
@@ -253,11 +253,11 @@
оъмъомоъемъъео((((
- движуха "{0}" отменен!
-
+ движуха "{0}" отменена!
+
- движуха "{0}" завершен!
-
+ движуха "{0}" завершена!
+
всегда
diff --git a/src/Commands/RemindCommandGroup.cs b/src/Commands/RemindCommandGroup.cs
index d5110e0..8e8b820 100644
--- a/src/Commands/RemindCommandGroup.cs
+++ b/src/Commands/RemindCommandGroup.cs
@@ -153,7 +153,9 @@ public class RemindCommandGroup : CommandGroup
[RequireContext(ChannelContext.Guild)]
[UsedImplicitly]
public async Task ExecuteDeleteReminderAsync(
- [MinValue(0)] int index)
+ [Description("Index of reminder to delete")]
+ [MinValue(0)]
+ int index)
{
if (!_context.TryGetContextIDs(out var guildId, out _, out var userId))
{
diff --git a/src/Commands/SettingsCommandGroup.cs b/src/Commands/SettingsCommandGroup.cs
index ad0d7f4..61be402 100644
--- a/src/Commands/SettingsCommandGroup.cs
+++ b/src/Commands/SettingsCommandGroup.cs
@@ -62,8 +62,9 @@ public class SettingsCommandGroup : CommandGroup
}
///
- /// A slash command that lists current per-guild GuildSettings.
+ /// A slash command that sends a page from the list of current GuildSettings.
///
+ /// The number of the page to send.
///
/// A feedback sending result which may or may not have succeeded.
///
@@ -75,7 +76,9 @@ public class SettingsCommandGroup : CommandGroup
[Description("Shows settings list for this server")]
[UsedImplicitly]
public async Task ExecuteSettingsListAsync(
- [Description("Settings list page")] int page)
+ [Description("Settings list page")]
+ [MinValue(1)]
+ int page)
{
if (!_context.TryGetContextIDs(out var guildId, out _, out _))
{
diff --git a/src/Services/Update/ScheduledEventUpdateService.cs b/src/Services/Update/ScheduledEventUpdateService.cs
index faa8bab..24b68da 100644
--- a/src/Services/Update/ScheduledEventUpdateService.cs
+++ b/src/Services/Update/ScheduledEventUpdateService.cs
@@ -19,18 +19,15 @@ public sealed class ScheduledEventUpdateService : BackgroundService
private readonly IDiscordRestGuildScheduledEventAPI _eventApi;
private readonly GuildDataService _guildData;
private readonly ILogger _logger;
- private readonly IDiscordRestUserAPI _userApi;
private readonly UtilityService _utility;
public ScheduledEventUpdateService(IDiscordRestChannelAPI channelApi, IDiscordRestGuildScheduledEventAPI eventApi,
- GuildDataService guildData, ILogger logger, IDiscordRestUserAPI userApi,
- UtilityService utility)
+ GuildDataService guildData, ILogger logger, UtilityService utility)
{
_channelApi = channelApi;
_eventApi = eventApi;
_guildData = guildData;
_logger = logger;
- _userApi = userApi;
_utility = utility;
}
@@ -345,12 +342,6 @@ public sealed class ScheduledEventUpdateService : BackgroundService
private async Task SendEarlyEventNotificationAsync(
IGuildScheduledEvent scheduledEvent, GuildData data, CancellationToken ct)
{
- var currentUserResult = await _userApi.GetCurrentUserAsync(ct);
- if (!currentUserResult.IsDefined(out var currentUser))
- {
- return Result.FromError(currentUserResult);
- }
-
var contentResult = await _utility.GetEventNotificationMentions(
scheduledEvent, data.Settings, ct);
if (!contentResult.IsDefined(out var content))
@@ -359,11 +350,10 @@ public sealed class ScheduledEventUpdateService : BackgroundService
}
var earlyResult = new EmbedBuilder()
- .WithSmallTitle(
+ .WithDescription(
string.Format(Messages.EventEarlyNotification, scheduledEvent.Name,
- Markdown.Timestamp(scheduledEvent.ScheduledStartTime, TimestampStyle.RelativeTime)), currentUser)
+ Markdown.Timestamp(scheduledEvent.ScheduledStartTime, TimestampStyle.RelativeTime)))
.WithColour(ColorsList.Default)
- .WithCurrentTimestamp()
.Build();
if (!earlyResult.IsDefined(out var earlyBuilt))