Merge pull request #97 : fix(discord): use correct slash command context type in AddApplicationCommands

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
test: sync version assertions to 3.0.4
2026-05-25 17:23:32 +03:00 · 2026-05-25 17:08:01 +03:00 · 2026-05-25 17:05:51 +03:00 · 2026-05-25 16:37:15 +03:00 · 2026-05-25 16:27:29 +03:00 · 2026-05-25 16:04:42 +03:00
11 changed files with 73 additions and 20 deletions
@@ -6,7 +6,7 @@ on:
      - main 

 env:
-  VERSION: 3.0.1
+  VERSION: 3.0.4

 jobs:
  # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <Version>3.0.1</Version>
+    <Version>3.0.4</Version>
    <TargetFramework>net10.0</TargetFramework>
    <LangVersion>preview</LangVersion>
    <Nullable>enable</Nullable>
@@ -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 и восстановление
@@ -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.4
    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.4
    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.4
    restart: always
    depends_on:
      db:
@@ -3,7 +3,6 @@ using NetCord.Services.ApplicationCommands;

 namespace GmRelay.DiscordBot.Features.Sessions;

-[SlashCommand("listsessions", "Show upcoming game sessions in this server")]
 public class DiscordListSessionsCommand : ApplicationCommandModule<SlashCommandContext>
 {
    private readonly DiscordListSessionsHandler _handler;
@@ -13,6 +12,7 @@ public class DiscordListSessionsCommand : ApplicationCommandModule<SlashCommandC
        _handler = handler;
    }

+    [SlashCommand("listsessions", "Show upcoming game sessions in this server")]
    public async Task ExecuteAsync()
    {
        var guildId = Context.Guild?.Id.ToString()
@@ -4,7 +4,6 @@ using NetCord.Services.ApplicationCommands;

 namespace GmRelay.DiscordBot.Features.Sessions;

-[SlashCommand("newsession", "Create a new game session")]
 public class DiscordNewSessionCommand : ApplicationCommandModule<SlashCommandContext>
 {
    private readonly DiscordNewSessionHandler _handler;
@@ -16,6 +15,7 @@ public class DiscordNewSessionCommand : ApplicationCommandModule<SlashCommandCon
        _logger = logger;
    }

+    [SlashCommand("newsession", "Create a new game session")]
    public async Task ExecuteAsync(
        [SlashCommandParameter(Name = "title", Description = "Game title")] string title,
        [SlashCommandParameter(Name = "time", Description = "Session time (YYYY-MM-DD HH:mm or DD.MM.YYYY HH:mm)")] string time,
@@ -3,7 +3,6 @@ namespace GmRelay.DiscordBot.Features.Sessions;
 using NetCord.Rest;
 using NetCord.Services.ApplicationCommands;

-[SlashCommand("reschedule", "Initiate reschedule voting for a session")]
 public class DiscordRescheduleCommand : ApplicationCommandModule<SlashCommandContext>
 {
    private readonly DiscordRescheduleHandler _handler;
@@ -15,6 +14,7 @@ public class DiscordRescheduleCommand : ApplicationCommandModule<SlashCommandCon
        _logger = logger;
    }

+    [SlashCommand("reschedule", "Initiate reschedule voting for a session")]
    public async Task ExecuteAsync(
        [SlashCommandParameter(Name = "session", Description = "Session ID to reschedule")] string sessionIdText,
        [SlashCommandParameter(Name = "option1", Description = "First time option (YYYY-MM-DD HH:mm)")] string option1,
@@ -18,8 +18,10 @@ 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.ApplicationCommands;
 using NetCord.Services.ComponentInteractions;
 using Npgsql;

@@ -82,12 +84,13 @@ builder.Services
        options.Token = discordOptions.Token;
        options.Intents = GatewayIntents.Guilds;
    })
-    .AddApplicationCommands()
+    .AddApplicationCommands<SlashCommandInteraction, SlashCommandContext>()
    .AddComponentInteractions<ButtonInteraction, ButtonInteractionContext>()
    .AddGatewayHandlers(typeof(Program).Assembly);

 var host = builder.Build();

 host.AddSlashCommand("ping", "Checks whether GM-Relay Discord is online.", () => "Pong!");
+host.AddModules(typeof(Program).Assembly);

 await host.RunAsync();
@@ -73,7 +73,7 @@
                    </button>
                </form>

-                <div class="nav-version">v3.0.1</div>
+                <div class="nav-version">v3.0.4</div>
            </div>
        </Authorized>
        <NotAuthorized>
@@ -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.4", 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("<Version>3.0.1</Version>", 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("<Version>3.0.4</Version>", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props")));
+        Assert.Contains("VERSION: 3.0.4", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")));
+        Assert.Contains("gmrelay-bot:3.0.4", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("gmrelay-web:3.0.4", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("gmrelay-discord-bot:3.0.4", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
        Assert.Contains(
-            "v3.0.1",
+            "v3.0.4",
            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()
    {
@@ -1,5 +1,8 @@
 using System;
 using System.IO;
+using System.Reflection;
+using GmRelay.DiscordBot.Features.Sessions;
+using NetCord.Services.ApplicationCommands;

 namespace GmRelay.Bot.Tests.Discord;

@@ -47,6 +50,41 @@ public sealed class DiscordStartupTests
        Assert.Contains(".AddComponentInteractions", program);
        Assert.Contains(".AddGatewayHandlers", program);
        Assert.Contains("AddSlashCommand", program);
+        Assert.Contains("AddModules(typeof(Program).Assembly)", program);
+    }
+
+    [Theory]
+    [InlineData(typeof(DiscordNewSessionCommand), "newsession")]
+    [InlineData(typeof(DiscordListSessionsCommand), "listsessions")]
+    [InlineData(typeof(DiscordRescheduleCommand), "reschedule")]
+    public void DiscordSessionSlashCommands_ShouldBeDeclaredOnModuleMethods(Type moduleType, string commandName)
+    {
+        var executeMethod = moduleType.GetMethod("ExecuteAsync", BindingFlags.Instance | BindingFlags.Public);
+
+        Assert.NotNull(executeMethod);
+
+        var methodAttribute = Assert.Single(executeMethod.GetCustomAttributes<SlashCommandAttribute>(inherit: false));
+        var nameProperty = typeof(SlashCommandAttribute).GetProperty("Name")
+            ?? throw new InvalidOperationException("SlashCommandAttribute should expose command name.");
+
+        Assert.Equal(commandName, nameProperty.GetValue(methodAttribute));
+        Assert.Empty(moduleType.GetCustomAttributes<SlashCommandAttribute>(inherit: false));
+    }
+
+    [Fact]
+    public void DiscordSessionSlashCommands_ShouldBeDiscoverableByNetCordService()
+    {
+        var service = new ApplicationCommandService<SlashCommandContext>();
+
+        service.AddModules(typeof(DiscordNewSessionCommand).Assembly);
+
+        var commandNames = service.GetCommands()
+            .Select(command => command.Name)
+            .ToArray();
+
+        Assert.Contains("newsession", commandNames);
+        Assert.Contains("listsessions", commandNames);
+        Assert.Contains("reschedule", commandNames);
    }

    [Fact]
Author	SHA1	Message	Date
Toutsu	fa63886195	Merge pull request #97 : fix(discord): use correct slash command context type in AddApplicationCommands Deploy Telegram Bot / build-and-push (push) Successful in 5m1s Details Deploy Telegram Bot / scan-images (push) Successful in 2m22s Details Deploy Telegram Bot / deploy (push) Successful in 28s Details Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-25 17:23:32 +03:00
Toutsu	9bd5fe75c9	test: sync version assertions to 3.0.4 PR Checks / test-and-build (pull_request) Successful in 8m35s Details Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-25 17:08:01 +03:00
Toutsu	d931da37ec	fix(discord): use correct slash command context type in AddApplicationCommands PR Checks / test-and-build (pull_request) Failing after 8m7s Details The default AddApplicationCommands() registers ApplicationCommandService<ApplicationCommandContext>, but our modules inherit ApplicationCommandModule<SlashCommandContext>. Because SlashCommandContext does not inherit from ApplicationCommandContext in NetCord, AddModules(typeof(Program).Assembly) failed to discover the modules, so /newsession, /listsessions, /reschedule were never published to Discord. Only /ping worked because it uses the minimal API route. Fix: specify AddApplicationCommands<SlashCommandInteraction, SlashCommandContext>() so the service matches the module context type, allowing module discovery to succeed. Bump version to 3.0.4. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-25 17:05:51 +03:00
Toutsu	9375fa45b2	Merge pull request #96 : fix(discord): declare slash commands on module methods Deploy Telegram Bot / build-and-push (push) Successful in 4m47s Details Deploy Telegram Bot / scan-images (push) Successful in 2m9s Details Deploy Telegram Bot / deploy (push) Successful in 27s Details	2026-05-25 16:37:15 +03:00
Toutsu	0b45aee96d	fix(discord): declare slash commands on module methods PR Checks / test-and-build (pull_request) Successful in 8m26s Details	2026-05-25 16:27:29 +03:00
Toutsu	80e346d6b5	Merge pull request #95 : fix(discord): register slash command modules Deploy Telegram Bot / build-and-push (push) Successful in 4m53s Details Deploy Telegram Bot / scan-images (push) Successful in 2m12s Details Deploy Telegram Bot / deploy (push) Successful in 27s Details	2026-05-25 16:04:42 +03:00
Toutsu	eff0128d29	fix(discord): register slash command modules PR Checks / test-and-build (pull_request) Successful in 8m27s Details Register NetCord application command modules after the host is built so module-based commands are published alongside the minimal /ping command. Update README Discord env guidance to avoid the unused DISCORD_BOT_CLIENT_ID variable. Bump version to 3.0.2.	2026-05-25 15:49:36 +03:00