diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ff1df68..b6141dc 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -6,7 +6,7 @@ on: - main env: - VERSION: 3.0.7 + VERSION: 3.0.8 jobs: # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами) diff --git a/Directory.Build.props b/Directory.Build.props index 5420796..9c4aac7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 3.0.7 + 3.0.8 net10.0 preview enable diff --git a/compose.yaml b/compose.yaml index 415da8b..3013a39 100644 --- a/compose.yaml +++ b/compose.yaml @@ -49,7 +49,7 @@ services: crond -f bot: - image: git.codeanddice.ru/toutsu/gmrelay-bot:3.0.7 + image: git.codeanddice.ru/toutsu/gmrelay-bot:3.0.8 restart: always depends_on: db: @@ -67,7 +67,7 @@ services: retries: 3 discord: - image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.0.7 + image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.0.8 restart: always depends_on: db: @@ -84,7 +84,7 @@ services: retries: 3 web: - image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.7 + image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.8 restart: always depends_on: db: diff --git a/src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs b/src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs index 7670b6a..1acfdf6 100644 --- a/src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs +++ b/src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs @@ -1,4 +1,4 @@ -using GmRelay.DiscordBot.Rendering; +using GmRelay.DiscordBot.Rendering; using NetCord; using NetCord.Rest; using NetCord.Services.ApplicationCommands; @@ -23,18 +23,32 @@ public class DiscordNewSessionCommand : ApplicationCommandModule + { + message.Content = ":white_check_mark: **Session created successfully!**"; + message.Embeds = embeds; + message.Components = actionRows; + }); + + _logger.LogInformation("Success response sent."); } catch (UnauthorizedAccessException ex) { - await Context.Interaction.SendResponseAsync( - InteractionCallback.Message($":no_entry: {ex.Message}")); + _logger.LogWarning(ex, "Unauthorized session creation attempt by user {UserId}", Context.User.Id); + await Context.Interaction.ModifyResponseAsync(message => + { + message.Content = $":no_entry: {ex.Message}"; + }); } catch (Exception ex) { _logger.LogError(ex, "Failed to create session for user {UserId} in guild {GuildId}", Context.User.Id, guildId); - await Context.Interaction.SendResponseAsync( - InteractionCallback.Message(":boom: An error occurred while creating the session.")); + await Context.Interaction.ModifyResponseAsync(message => + { + message.Content = ":boom: An error occurred while creating the session."; + }); } } } diff --git a/src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs b/src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs index 21ea914..09ffc8e 100644 --- a/src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs +++ b/src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs @@ -23,18 +23,31 @@ public class DiscordRescheduleCommand : ApplicationCommandModule + { + message.Content = $"🗳 Голосование за перенос запущено! Дедлайн: {deadlineResult.Value:yyyy-MM-dd HH:mm} UTC."; + }); } catch (UnauthorizedAccessException ex) { - await Context.Interaction.SendResponseAsync( - InteractionCallback.Message($":no_entry: {ex.Message}")); + _logger.LogWarning(ex, "Unauthorized reschedule attempt by user {UserId}", Context.User.Id); + await Context.Interaction.ModifyResponseAsync(message => + { + message.Content = $":no_entry: {ex.Message}"; + }); } catch (InvalidOperationException ex) { - await Context.Interaction.SendResponseAsync( - InteractionCallback.Message($":warning: {ex.Message}")); + _logger.LogWarning(ex, "Invalid reschedule request by user {UserId}", Context.User.Id); + await Context.Interaction.ModifyResponseAsync(message => + { + message.Content = $":warning: {ex.Message}"; + }); } catch (Exception ex) { _logger.LogError(ex, "Failed to initiate reschedule for session {SessionId}", sessionId); - await Context.Interaction.SendResponseAsync( - InteractionCallback.Message(":boom: Ошибка при запуске голосования.")); + await Context.Interaction.ModifyResponseAsync(message => + { + message.Content = ":boom: Ошибка при запуске голосования."; + }); } } } diff --git a/src/GmRelay.DiscordBot/Program.cs b/src/GmRelay.DiscordBot/Program.cs index 52bbc1b..bf8f8e5 100644 --- a/src/GmRelay.DiscordBot/Program.cs +++ b/src/GmRelay.DiscordBot/Program.cs @@ -36,6 +36,8 @@ discordOptions.Validate(); builder.Services.AddSingleton(discordOptions); +builder.Logging.AddConsole(); + builder.Services.AddSingleton(sp => { var config = sp.GetRequiredService(); diff --git a/src/GmRelay.Web/Components/Layout/NavMenu.razor b/src/GmRelay.Web/Components/Layout/NavMenu.razor index 80c3473..8624368 100644 --- a/src/GmRelay.Web/Components/Layout/NavMenu.razor +++ b/src/GmRelay.Web/Components/Layout/NavMenu.razor @@ -73,7 +73,7 @@ - + diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs index 9ce41cd..701bbb6 100644 --- a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs +++ b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs @@ -61,7 +61,7 @@ public sealed class DiscordProjectStructureTests var prChecks = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "pr-checks.yml")); var deploy = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")); - Assert.Contains("gmrelay-discord-bot:3.0.7", compose); + Assert.Contains("gmrelay-discord-bot:3.0.8", compose); Assert.Contains("Discord__Token=${DISCORD_BOT_TOKEN:?Set DISCORD_BOT_TOKEN in .env}", compose); Assert.Contains("src/GmRelay.DiscordBot/Dockerfile", deploy); Assert.Contains("DISCORD_BOT_TOKEN", deploy); @@ -75,13 +75,13 @@ public sealed class DiscordProjectStructureTests { var repoRoot = GetRepoRoot(); - Assert.Contains("3.0.7", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props"))); - Assert.Contains("VERSION: 3.0.7", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"))); - Assert.Contains("gmrelay-bot:3.0.7", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); - Assert.Contains("gmrelay-web:3.0.7", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); - Assert.Contains("gmrelay-discord-bot:3.0.7", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("3.0.8", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props"))); + Assert.Contains("VERSION: 3.0.8", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"))); + Assert.Contains("gmrelay-bot:3.0.8", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("gmrelay-web:3.0.8", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("gmrelay-discord-bot:3.0.8", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); Assert.Contains( - "v3.0.7", + "v3.0.8", File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor"))); }