diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ad2edf7..8627ba9 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -6,7 +6,7 @@ on: - main env: - VERSION: 3.0.1 + VERSION: 3.0.2 jobs: # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами) diff --git a/Directory.Build.props b/Directory.Build.props index 8f22da9..e14bc3a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 3.0.1 + 3.0.2 net10.0 preview enable diff --git a/README.md b/README.md index 6c4fc47..51a0430 100644 --- a/README.md +++ b/README.md @@ -85,8 +85,10 @@ TELEGRAM_BOT_TOKEN=ваш_токен_здесь # Токен Discord application bot DISCORD_BOT_TOKEN=ваш_discord_токен_здесь -# Client ID Discord application (используется для slash-команд) -DISCORD_BOT_CLIENT_ID=ваш_discord_client_id_здесь +# Discord OAuth (для Web Dashboard) +DISCORD_CLIENT_ID=ваш_discord_client_id_здесь +DISCORD_CLIENT_SECRET=ваш_discord_client_secret_здесь +DISCORD_REDIRECT_URI=https://your-domain.example/auth/discord/callback # Имя бота без @ (для Telegram Login Widget) TELEGRAM_BOT_USERNAME=ваше_имя_бота_здесь @@ -119,7 +121,7 @@ docker compose up -d 1. Напишите боту `/start`. 2. Создайте группу через `/newgroup`. 3. Откройте Mini App или Web Dashboard для расширенного управления. -4. Для Discord пригласите application bot на сервер с правами `bot` и `applications.commands`. Скопируйте `DISCORD_BOT_TOKEN` и `DISCORD_BOT_CLIENT_ID` в `.env`. +4. Для Discord пригласите application bot на сервер с правами `bot` и `applications.commands`. Скопируйте `DISCORD_BOT_TOKEN` в `.env`; `DISCORD_CLIENT_ID`, `DISCORD_CLIENT_SECRET` и `DISCORD_REDIRECT_URI` нужны только для входа в Web Dashboard через Discord. 5. Перезапустите Docker Compose (`docker compose up -d`), а затем в Discord создайте сессию через `/newsession` или опубликуйте расписание через `/listsessions`; игроки записываются и выходят кнопками в опубликованном сообщении. ## 💾 Backup и восстановление diff --git a/compose.yaml b/compose.yaml index 4299938..ea51a2f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -49,7 +49,7 @@ services: crond -f bot: - image: git.codeanddice.ru/toutsu/gmrelay-bot:3.0.1 + image: git.codeanddice.ru/toutsu/gmrelay-bot:3.0.2 restart: always depends_on: db: @@ -67,7 +67,7 @@ services: retries: 3 discord: - image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.0.1 + image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.0.2 restart: always depends_on: db: @@ -84,7 +84,7 @@ services: retries: 3 web: - image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.1 + image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.2 restart: always depends_on: db: diff --git a/src/GmRelay.DiscordBot/Program.cs b/src/GmRelay.DiscordBot/Program.cs index 59ccd05..92ceca9 100644 --- a/src/GmRelay.DiscordBot/Program.cs +++ b/src/GmRelay.DiscordBot/Program.cs @@ -18,6 +18,7 @@ using Microsoft.Extensions.DependencyInjection; using NetCord; using NetCord.Gateway; using NetCord.Hosting.Gateway; +using NetCord.Hosting.Services; using NetCord.Hosting.Services.ApplicationCommands; using NetCord.Hosting.Services.ComponentInteractions; using NetCord.Services.ComponentInteractions; @@ -89,5 +90,6 @@ builder.Services var host = builder.Build(); host.AddSlashCommand("ping", "Checks whether GM-Relay Discord is online.", () => "Pong!"); +host.AddModules(typeof(Program).Assembly); await host.RunAsync(); diff --git a/src/GmRelay.Web/Components/Layout/NavMenu.razor b/src/GmRelay.Web/Components/Layout/NavMenu.razor index 99ec7fb..c6b393c 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 3c13e35..7eaff1b 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.1", compose); + Assert.Contains("gmrelay-discord-bot:3.0.2", 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.1", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props"))); - Assert.Contains("VERSION: 3.0.1", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"))); - Assert.Contains("gmrelay-bot:3.0.1", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); - Assert.Contains("gmrelay-web:3.0.1", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); - Assert.Contains("gmrelay-discord-bot:3.0.1", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("3.0.2", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props"))); + Assert.Contains("VERSION: 3.0.2", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"))); + Assert.Contains("gmrelay-bot:3.0.2", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("gmrelay-web:3.0.2", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("gmrelay-discord-bot:3.0.2", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); Assert.Contains( - "v3.0.1", + "v3.0.2", File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor"))); } @@ -94,6 +94,16 @@ public sealed class DiscordProjectStructureTests Assert.Contains("DISCORD_BOT_TOKEN", envExample); } + [Fact] + public void Readme_ShouldNotAskForUnusedDiscordBotClientId() + { + var repoRoot = GetRepoRoot(); + var readme = File.ReadAllText(Path.Combine(repoRoot, "README.md")); + + Assert.DoesNotContain("DISCORD_BOT_CLIENT_ID", readme); + Assert.Contains("DISCORD_CLIENT_ID", readme); + } + [Fact] public void Compose_ShouldIncludeDiscordHealthcheck() { diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs index cadff0a..84c7cbe 100644 --- a/tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs +++ b/tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs @@ -47,6 +47,7 @@ public sealed class DiscordStartupTests Assert.Contains(".AddComponentInteractions", program); Assert.Contains(".AddGatewayHandlers", program); Assert.Contains("AddSlashCommand", program); + Assert.Contains("AddModules(typeof(Program).Assembly)", program); } [Fact]