From f6d5281af81591cd04ff9f4a983876c991975ae9 Mon Sep 17 00:00:00 2001
From: Toutsu <Hegin4@yandex.ru>
Date: Mon, 25 May 2026 17:53:40 +0300
Subject: [PATCH] fix(discord): resolve slash commands from interaction payload
 instead of gateway cache

Context.Guild in NetCord resolves the Guild object from the gateway client cache
(cache.Guilds.GetValueOrDefault(guildId)), not from the interaction JSON payload.
After a bot restart, the guild may not yet be cached when the first slash command
arrives, causing Context.Guild to be null even though the command is invoked
inside a guild channel. This produced "This command can only be used in a guild."

Changes:
- DiscordListSessionsCommand: use Context.Interaction.GuildId instead of Context.Guild.Id
- DiscordNewSessionCommand: use Context.Interaction.GuildId + REST GetGuildAsync/GetGuildUserAsync
- DiscordRescheduleCommand: same as above
- DiscordSessionInteractionModule: same fix for button interactions (CreateInput)
- Add null guard in GetResolvedPermissions for safety
- Bump version to 3.0.5

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .gitea/workflows/deploy.yml                        |  2 +-
 Directory.Build.props                              |  2 +-
 compose.yaml                                       |  6 +++---
 .../Sessions/DiscordListSessionsCommand.cs         |  2 +-
 .../Features/Sessions/DiscordNewSessionCommand.cs  | 13 +++++++------
 .../Features/Sessions/DiscordRescheduleCommand.cs  | 13 ++++++++-----
 .../Sessions/DiscordSessionInteractionModule.cs    |  4 ++--
 src/GmRelay.Web/Components/Layout/NavMenu.razor    |  2 +-
 .../Discord/DiscordProjectStructureTests.cs        | 14 +++++++-------
 9 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 34f1f77..b82e209 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -6,7 +6,7 @@ on:
       - main 
 
 env:
-  VERSION: 3.0.4
+  VERSION: 3.0.5
 
 jobs:
   # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
diff --git a/Directory.Build.props b/Directory.Build.props
index 933ddd6..a468115 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>3.0.4</Version>
+    <Version>3.0.5</Version>
     <TargetFramework>net10.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
diff --git a/compose.yaml b/compose.yaml
index f49d434..aa6da7a 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -49,7 +49,7 @@ services:
         crond -f
 
   bot:
-    image: git.codeanddice.ru/toutsu/gmrelay-bot:3.0.4
+    image: git.codeanddice.ru/toutsu/gmrelay-bot:3.0.5
     restart: always
     depends_on:
       db:
@@ -67,7 +67,7 @@ services:
       retries: 3
 
   discord:
-    image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.0.4
+    image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.0.5
     restart: always
     depends_on:
       db:
@@ -84,7 +84,7 @@ services:
       retries: 3
 
   web:
-    image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.4
+    image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.5
     restart: always
     depends_on:
       db:
diff --git a/src/GmRelay.DiscordBot/Features/Sessions/DiscordListSessionsCommand.cs b/src/GmRelay.DiscordBot/Features/Sessions/DiscordListSessionsCommand.cs
index 5ce9d6f..e04a1cb 100644
--- a/src/GmRelay.DiscordBot/Features/Sessions/DiscordListSessionsCommand.cs
+++ b/src/GmRelay.DiscordBot/Features/Sessions/DiscordListSessionsCommand.cs
@@ -15,7 +15,7 @@ public class DiscordListSessionsCommand : ApplicationCommandModule<SlashCommandC
     [SlashCommand("listsessions", "Show upcoming game sessions in this server")]
     public async Task ExecuteAsync()
     {
-        var guildId = Context.Guild?.Id.ToString()
+        var guildId = Context.Interaction.GuildId?.ToString()
             ?? throw new InvalidOperationException("This command can only be used in a guild.");
         var channelId = Context.Channel.Id.ToString();
 
diff --git a/src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs b/src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs
index 7f5ada8..9445e4b 100644
--- a/src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs
+++ b/src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs
@@ -22,8 +22,10 @@ public class DiscordNewSessionCommand : ApplicationCommandModule<SlashCommandCon
         [SlashCommandParameter(Name = "seats", Description = "Maximum number of players")] long? seats = null,
         [SlashCommandParameter(Name = "link", Description = "Join link")] string? link = null)
     {
-        var guild = Context.Guild
+        var guildId = Context.Interaction.GuildId
             ?? throw new InvalidOperationException("This command can only be used in a guild.");
+        var guild = await Context.Client.Rest.GetGuildAsync(guildId);
+        var member = await Context.Client.Rest.GetGuildUserAsync(guildId, Context.User.Id);
 
         var timeResult = DiscordNewSessionHandler.ParseTimeInput(time);
         if (!timeResult.IsSuccess)
@@ -33,7 +35,7 @@ public class DiscordNewSessionCommand : ApplicationCommandModule<SlashCommandCon
             return;
         }
 
-        var resolvedPermissions = GetResolvedPermissions(guild, Context.User.Id);
+        var resolvedPermissions = GetResolvedPermissions(guild, member);
 
         try
         {
@@ -70,18 +72,17 @@ public class DiscordNewSessionCommand : ApplicationCommandModule<SlashCommandCon
         }
     }
 
-    private static ulong GetResolvedPermissions(NetCord.Gateway.Guild guild, ulong userId)
+    private static ulong GetResolvedPermissions(NetCord.Rest.RestGuild guild, NetCord.GuildUser member)
     {
-        if (!guild.Users.TryGetValue(userId, out var guildUser))
+        if (member is null)
             return 0;
 
         ulong resolved = 0;
-        foreach (var roleId in guildUser.RoleIds)
+        foreach (var roleId in member.RoleIds)
         {
             if (guild.Roles.TryGetValue(roleId, out var role))
                 resolved |= (ulong)role.Permissions;
         }
-
         return resolved;
     }
 }
diff --git a/src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs b/src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs
index 1f8502c..8487031 100644
--- a/src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs
+++ b/src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs
@@ -22,8 +22,10 @@ public class DiscordRescheduleCommand : ApplicationCommandModule<SlashCommandCon
         [SlashCommandParameter(Name = "option3", Description = "Third time option (optional)")] string? option3 = null,
         [SlashCommandParameter(Name = "deadline", Description = "Voting deadline (YYYY-MM-DD HH:mm)")] string deadline = "")
     {
-        var guild = Context.Guild
+        var guildId = Context.Interaction.GuildId
             ?? throw new InvalidOperationException("This command can only be used in a guild.");
+        var guild = await Context.Client.Rest.GetGuildAsync(guildId);
+        var member = await Context.Client.Rest.GetGuildUserAsync(guildId, Context.User.Id);
 
         if (!Guid.TryParse(sessionIdText, out var sessionId))
         {
@@ -64,7 +66,7 @@ public class DiscordRescheduleCommand : ApplicationCommandModule<SlashCommandCon
             return;
         }
 
-        var resolvedPermissions = GetResolvedPermissions(guild, Context.User.Id);
+        var resolvedPermissions = GetResolvedPermissions(guild, member);
 
         try
         {
@@ -102,12 +104,13 @@ public class DiscordRescheduleCommand : ApplicationCommandModule<SlashCommandCon
         }
     }
 
-    private static ulong GetResolvedPermissions(NetCord.Gateway.Guild guild, ulong userId)
+    private static ulong GetResolvedPermissions(NetCord.Rest.RestGuild guild, NetCord.GuildUser member)
     {
-        if (!guild.Users.TryGetValue(userId, out var guildUser))
+        if (member is null)
             return 0;
+
         ulong resolved = 0;
-        foreach (var roleId in guildUser.RoleIds)
+        foreach (var roleId in member.RoleIds)
         {
             if (guild.Roles.TryGetValue(roleId, out var role))
                 resolved |= (ulong)role.Permissions;
diff --git a/src/GmRelay.DiscordBot/Features/Sessions/DiscordSessionInteractionModule.cs b/src/GmRelay.DiscordBot/Features/Sessions/DiscordSessionInteractionModule.cs
index ab44406..2156abf 100644
--- a/src/GmRelay.DiscordBot/Features/Sessions/DiscordSessionInteractionModule.cs
+++ b/src/GmRelay.DiscordBot/Features/Sessions/DiscordSessionInteractionModule.cs
@@ -168,7 +168,7 @@ public sealed class DiscordSessionInteractionModule(
 
     private DiscordSessionInteractionInput CreateInput(Guid sessionId)
     {
-        var guild = Context.Guild
+        var guildId = Context.Interaction.GuildId?.ToString(CultureInfo.InvariantCulture)
             ?? throw new InvalidOperationException("Session buttons can only be used in a guild.");
         var message = Context.Interaction.Message
             ?? throw new InvalidOperationException("Session button interaction must include a message.");
@@ -176,7 +176,7 @@ public sealed class DiscordSessionInteractionModule(
         return new DiscordSessionInteractionInput(
             SessionId: sessionId,
             InteractionId: Context.Interaction.Id.ToString(System.Globalization.CultureInfo.InvariantCulture),
-            GuildId: guild.Id.ToString(CultureInfo.InvariantCulture),
+            GuildId: guildId,
             ChannelId: Context.Channel.Id.ToString(CultureInfo.InvariantCulture),
             MessageId: message.Id.ToString(CultureInfo.InvariantCulture),
             UserId: Context.User.Id,
diff --git a/src/GmRelay.Web/Components/Layout/NavMenu.razor b/src/GmRelay.Web/Components/Layout/NavMenu.razor
index f559b16..0c4d49e 100644
--- a/src/GmRelay.Web/Components/Layout/NavMenu.razor
+++ b/src/GmRelay.Web/Components/Layout/NavMenu.razor
@@ -73,7 +73,7 @@
                     </button>
                 </form>
 
-                <div class="nav-version">v3.0.4</div>
+                <div class="nav-version">v3.0.5</div>
             </div>
         </Authorized>
         <NotAuthorized>
diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs
index 64f156e..9ad6047 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.4", compose);
+        Assert.Contains("gmrelay-discord-bot:3.0.5", 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.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("<Version>3.0.5</Version>", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props")));
+        Assert.Contains("VERSION: 3.0.5", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")));
+        Assert.Contains("gmrelay-bot:3.0.5", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("gmrelay-web:3.0.5", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("gmrelay-discord-bot:3.0.5", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
         Assert.Contains(
-            "v3.0.4",
+            "v3.0.5",
             File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor")));
     }