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
- Bump version to 3.0.5

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

.gitea/workflows/deploy.yml

@@ -6,7 +6,7 @@ on:
       - main 
 
 env:
-  VERSION: 3.1.1
+  VERSION: 3.0.5
 
 jobs:
   # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>3.1.1</Version>
+    <Version>3.0.5</Version>
     <TargetFramework>net10.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>

compose.yaml

@@ -49,7 +49,7 @@ services:
         crond -f
 
   bot:
-    image: git.codeanddice.ru/toutsu/gmrelay-bot:3.1.1
+    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.1.1
+    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.1.1
+    image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.5
     restart: always
     depends_on:
       db:

src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs

@@ -42,13 +42,12 @@ public sealed class CancelSessionHandler(
                        FROM group_managers gm
                        JOIN players p ON p.id = gm.player_id
                        WHERE gm.group_id = s.group_id
-                         AND p.platform = 'Telegram'
-                         AND p.external_user_id = @ExternalUserId
+                         AND p.telegram_id = @TelegramUserId
                    ) AS CanManage
             FROM sessions s
             WHERE s.id = @SessionId
             """,
-            new { command.SessionId, ExternalUserId = command.TelegramUserId.ToString() }, transaction);
+            new { command.SessionId, command.TelegramUserId }, transaction);
 
         if (session == null)
         {
@@ -90,7 +89,7 @@ public sealed class CancelSessionHandler(
 
         var directRecipients = (await connection.QueryAsync<DirectNotificationRecipient>(
             """
-            SELECT p.external_user_id::BIGINT AS TelegramId,
+            SELECT p.telegram_id AS TelegramId,
                    p.display_name AS DisplayName
             FROM session_participants sp
             JOIN players p ON sp.player_id = p.id

src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs

@@ -77,15 +77,16 @@ public sealed class CreateSessionHandler(
         {
             await connection.ExecuteAsync(
                 """
-                INSERT INTO players (display_name, platform, external_user_id, external_username)
-                VALUES (@Name, 'Telegram', @ExternalId, @Username)
-                ON CONFLICT (platform, external_user_id)
-                WHERE platform IS NOT NULL AND external_user_id IS NOT NULL
-                DO UPDATE
+                INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
+                VALUES (@TgId, @Name, @Username, 'Telegram', @TgId::TEXT, @Username)
+                ON CONFLICT (telegram_id) DO UPDATE
                 SET display_name = EXCLUDED.display_name,
-                    external_username = EXCLUDED.external_username;
+                    telegram_username = EXCLUDED.telegram_username,
+                    platform = COALESCE(players.platform, 'Telegram'),
+                    external_user_id = COALESCE(players.external_user_id, EXCLUDED.telegram_id::TEXT),
+                    external_username = COALESCE(players.external_username, EXCLUDED.telegram_username);
                 """,
-                new { ExternalId = gmId.ToString(), Name = gmName, Username = gmUsername },
+                new { TgId = gmId, Name = gmName, Username = gmUsername },
                 transaction);
 
             var existingGroup = await connection.QuerySingleOrDefaultAsync<SessionCreationGroupAccessDto>(
@@ -96,14 +97,12 @@ public sealed class CreateSessionHandler(
                            FROM group_managers gm
                            JOIN players p ON p.id = gm.player_id
                            WHERE gm.group_id = g.id
-                             AND p.platform = 'Telegram'
-                             AND p.external_user_id = @ExternalGmId
+                             AND COALESCE(p.external_user_id, p.telegram_id::TEXT) = @GmId::TEXT
                        ) AS CanManage
                 FROM game_groups g
-                WHERE g.platform = 'Telegram'
-                  AND g.external_group_id = @ExternalChatId
+                WHERE COALESCE(g.external_group_id, g.telegram_chat_id::TEXT) = @ChatId::TEXT
                 """,
-                new { ExternalChatId = chatId.ToString(), ExternalGmId = gmId.ToString() },
+                new { ChatId = chatId, GmId = gmId },
                 transaction);
 
             Guid groupId;
@@ -111,11 +110,11 @@ public sealed class CreateSessionHandler(
             {
                 groupId = await connection.ExecuteScalarAsync<Guid>(
                     """
-                    INSERT INTO game_groups (name, platform, external_group_id)
-                    VALUES (@ChatName, 'Telegram', @ExternalChatId)
+                    INSERT INTO game_groups (telegram_chat_id, name, gm_telegram_id, platform, external_group_id)
+                    VALUES (@ChatId, @ChatName, @GmId, 'Telegram', @ChatId::TEXT)
                     RETURNING id;
                     """,
-                    new { ExternalChatId = chatId.ToString(), ChatName = chatTitle },
+                    new { ChatId = chatId, ChatName = chatTitle, GmId = gmId },
                     transaction);
 
                 await connection.ExecuteAsync(
@@ -123,11 +122,10 @@ public sealed class CreateSessionHandler(
                     INSERT INTO group_managers (group_id, player_id, role)
                     SELECT @GroupId, p.id, @OwnerRole
                     FROM players p
-                    WHERE p.platform = 'Telegram'
-                      AND p.external_user_id = @ExternalGmId
+                    WHERE COALESCE(p.external_user_id, p.telegram_id::TEXT) = @GmId::TEXT
                     ON CONFLICT (group_id, player_id) DO NOTHING
                     """,
-                    new { GroupId = groupId, ExternalGmId = gmId.ToString(), OwnerRole = GroupManagerRoleExtensions.OwnerValue },
+                    new { GroupId = groupId, GmId = gmId, OwnerRole = GroupManagerRoleExtensions.OwnerValue },
                     transaction);
             }
             else

src/GmRelay.Bot/Features/Sessions/CreateSession/PromoteWaitlistedPlayerHandler.cs

@@ -41,14 +41,13 @@ public sealed class PromoteWaitlistedPlayerHandler(
                            FROM group_managers gm
                            JOIN players p ON p.id = gm.player_id
                            WHERE gm.group_id = s.group_id
-                             AND p.platform = 'Telegram'
-                             AND p.external_user_id = @ExternalUserId
+                             AND p.telegram_id = @TelegramUserId
                        ) AS CanManage
                 FROM sessions s
                 WHERE s.id = @SessionId
                 FOR UPDATE
                 """,
-                new { command.SessionId, ExternalUserId = command.TelegramUserId.ToString() },
+                new { command.SessionId, command.TelegramUserId },
                 transaction);
 
             if (session is null)
@@ -151,7 +150,7 @@ public sealed class PromoteWaitlistedPlayerHandler(
                 """
                 SELECT sp.session_id AS SessionId,
                        p.display_name AS DisplayName,
-                       p.external_username AS TelegramUsername,
+                       p.telegram_username AS TelegramUsername,
                        sp.registration_status AS RegistrationStatus
                 FROM session_participants sp
                 JOIN players p ON sp.player_id = p.id

src/GmRelay.Bot/Features/Sessions/ExportCalendar/ExportCalendarHandler.cs

@@ -24,12 +24,11 @@ public sealed class ExportCalendarHandler(
             @"SELECT s.id as Id, s.title as Title, s.scheduled_at as ScheduledAt"
             + " FROM sessions s"
             + " JOIN game_groups g ON s.group_id = g.id"
-            + " WHERE g.platform = 'Telegram'"
-            + " AND g.external_group_id = @ExternalChatId"
+            + " WHERE g.telegram_chat_id = @ChatId"
             + " AND s.status = @Planned"
             + " AND s.scheduled_at > NOW()"
             + " ORDER BY s.scheduled_at ASC",
-            new { ExternalChatId = message.Chat.Id.ToString(), Planned = SessionStatus.Planned });
+            new { ChatId = message.Chat.Id, Planned = SessionStatus.Planned });
 
         var sessionsList = sessions.ToList();
 
@@ -76,13 +75,13 @@ public sealed class ExportCalendarHandler(
             {
                 var token = Guid.NewGuid().ToString("N");
                 var groupId = await connection.QueryFirstOrDefaultAsync<Guid?>(
-                    @"SELECT id FROM game_groups WHERE platform = 'Telegram' AND external_group_id = @ExternalChatId",
-                    new { ExternalChatId = message.Chat.Id.ToString() });
+                    @"SELECT id FROM game_groups WHERE telegram_chat_id = @ChatId",
+                    new { ChatId = message.Chat.Id });
 
                 await connection.ExecuteAsync(
-                    @"INSERT INTO calendar_subscriptions (id, token, user_platform, user_external_id, group_id, filter_type, created_at, expires_at)
-                      VALUES (gen_random_uuid(), @token, 'Telegram', @userExternalId, @groupId, @filterType, now(), NULL)",
-                    new { token, userExternalId = senderId.Value.ToString(), groupId, filterType = (int)CalendarSubscriptionFilter.SpecificGroup });
+                    @"INSERT INTO calendar_subscriptions (id, token, user_telegram_id, group_id, filter_type, created_at, expires_at)
+                      VALUES (gen_random_uuid(), @token, @userTelegramId, @groupId, @filterType, now(), NULL)",
+                    new { token, userTelegramId = senderId.Value, groupId, filterType = (int)CalendarSubscriptionFilter.SpecificGroup });
 
                 subscriptionUrl = $"{baseUrl.TrimEnd('/')}/calendar/{token}.ics";
             }

src/GmRelay.Bot/Features/Sessions/ListSessions/DeleteSessionHandler.cs

@@ -44,13 +44,12 @@ public sealed class DeleteSessionHandler(
                        FROM group_managers gm
                        JOIN players p ON p.id = gm.player_id
                        WHERE gm.group_id = s.group_id
-                         AND p.platform = 'Telegram'
-                       AND p.external_user_id = @ExternalUserId
+                         AND p.telegram_id = @TelegramUserId
                    ) AS CanManage
             FROM sessions s
             WHERE s.id = @SessionId
             """,
-            new { command.SessionId, ExternalUserId = command.TelegramUserId.ToString() }, transaction);
+            new { command.SessionId, command.TelegramUserId }, transaction);
 
         if (session == null)
         {
@@ -110,22 +109,18 @@ public sealed class DeleteSessionHandler(
                          FROM group_managers gm
                          JOIN players manager_player ON manager_player.id = gm.player_id
                          WHERE gm.group_id = s.group_id
-                           AND manager_player.platform = 'Telegram'
-                           AND manager_player.external_user_id = @ExternalUserId
+                           AND manager_player.telegram_id = @TelegramUserId
                      ) AS CanManage
               FROM sessions s
               JOIN game_groups g ON s.group_id = g.id
               LEFT JOIN session_participants sp ON s.id = sp.session_id
-              WHERE g.platform = 'Telegram'
-                AND g.external_group_id = @ExternalChatId
-                AND s.status != @Cancelled
-                AND s.scheduled_at > NOW()
+              WHERE g.telegram_chat_id = @ChatId AND s.status != @Cancelled AND s.scheduled_at > NOW()
               GROUP BY s.id, s.title, s.scheduled_at, s.status, s.max_players, s.group_id
               ORDER BY s.scheduled_at ASC",
             new
             {
-                ExternalChatId = command.ChatId.ToString(),
-                ExternalUserId = command.TelegramUserId.ToString(),
+                ChatId = command.ChatId,
+                command.TelegramUserId,
                 Cancelled = SessionStatus.Cancelled,
                 Active = ParticipantRegistrationStatus.Active,
                 Waitlisted = ParticipantRegistrationStatus.Waitlisted

src/GmRelay.Bot/Features/Sessions/ListSessions/ListSessionsHandler.cs

@@ -74,22 +74,18 @@ public sealed class ListSessionsHandler(
                          FROM group_managers gm
                          JOIN players manager_player ON manager_player.id = gm.player_id
                          WHERE gm.group_id = s.group_id
-                           AND manager_player.platform = 'Telegram'
-                           AND manager_player.external_user_id = @ExternalUserId
+                           AND manager_player.telegram_id = @TelegramUserId
                      ) AS CanManage
               FROM sessions s
               JOIN game_groups g ON s.group_id = g.id
               LEFT JOIN session_participants sp ON s.id = sp.session_id
-              WHERE g.platform = 'Telegram'
-                AND g.external_group_id = @ExternalChatId
-                AND s.status != @Cancelled
-                AND s.scheduled_at > NOW()
+              WHERE g.telegram_chat_id = @ChatId AND s.status != @Cancelled AND s.scheduled_at > NOW()
               GROUP BY s.id, s.title, s.scheduled_at, s.status, s.max_players, s.group_id
               ORDER BY s.scheduled_at ASC",
             new
             {
-                ExternalChatId = message.Chat.Id.ToString(),
-                ExternalUserId = message.From?.Id.ToString(),
+                ChatId = message.Chat.Id,
+                TelegramUserId = message.From?.Id,
                 Cancelled = SessionStatus.Cancelled,
                 Active = ParticipantRegistrationStatus.Active,
                 Waitlisted = ParticipantRegistrationStatus.Waitlisted

src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs

@@ -53,28 +53,26 @@ public sealed class HandleRescheduleTimeInputHandler(
             """
             SELECT rp.id AS Id, rp.session_id AS SessionId, s.title AS Title, s.scheduled_at AS CurrentScheduledAt,
                    s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
-                   g.external_group_id::BIGINT AS TelegramChatId,
+                   g.telegram_chat_id AS TelegramChatId,
                    s.thread_id AS ThreadId,
                    s.notification_mode AS NotificationMode
             FROM reschedule_proposals rp
             JOIN sessions s ON s.id = rp.session_id
             JOIN game_groups g ON g.id = s.group_id
-            WHERE rp.proposed_by_external_user_id = @ExternalGmId
+            WHERE rp.proposed_by = @GmId
               AND rp.status = 'AwaitingTime'
-              AND g.platform = 'Telegram'
-              AND g.external_group_id = @ExternalChatId
+              AND g.telegram_chat_id = @ChatId
               AND EXISTS (
                   SELECT 1
                   FROM group_managers gm
                   JOIN players manager_player ON manager_player.id = gm.player_id
                   WHERE gm.group_id = s.group_id
-                    AND manager_player.platform = 'Telegram'
-                    AND manager_player.external_user_id = @ExternalGmId
+                    AND manager_player.telegram_id = @GmId
               )
             ORDER BY rp.created_at DESC
             LIMIT 1
             """,
-            new { ExternalGmId = gmTelegramId.ToString(), ExternalChatId = chatId.ToString() });
+            new { GmId = gmTelegramId, ChatId = chatId });
 
         if (proposal is null)
             return false;
@@ -94,8 +92,8 @@ public sealed class HandleRescheduleTimeInputHandler(
             """
             SELECT p.id AS PlayerId,
                    p.display_name AS DisplayName,
-                   p.external_username AS TelegramUsername,
-                   p.external_user_id::BIGINT AS TelegramId
+                   p.telegram_username AS TelegramUsername,
+                   p.telegram_id AS TelegramId
             FROM session_participants sp
             JOIN players p ON p.id = sp.player_id
             WHERE sp.session_id = @SessionId
@@ -365,7 +363,7 @@ public sealed class HandleRescheduleTimeInputHandler(
                 """
                 SELECT sp.session_id AS SessionId,
                        p.display_name AS DisplayName,
-                       p.external_username AS TelegramUsername,
+                       p.telegram_username AS TelegramUsername,
                        sp.registration_status AS RegistrationStatus
                 FROM session_participants sp
                 JOIN players p ON sp.player_id = p.id

src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleVoteHandler.cs

@@ -58,12 +58,11 @@ public sealed class HandleRescheduleVoteHandler(
             FROM session_participants sp
             JOIN players p ON p.id = sp.player_id
             WHERE sp.session_id = @SessionId
-              AND p.platform = 'Telegram'
-              AND p.external_user_id = @ExternalUserId
+              AND p.telegram_id = @TelegramUserId
               AND sp.is_gm = false
               AND sp.registration_status = @Active
             """,
-            new { proposal.SessionId, ExternalUserId = command.TelegramUserId.ToString(), Active = ParticipantRegistrationStatus.Active },
+            new { proposal.SessionId, command.TelegramUserId, Active = ParticipantRegistrationStatus.Active },
             transaction);
 
         if (playerId is null)
@@ -92,8 +91,8 @@ public sealed class HandleRescheduleVoteHandler(
             """
             SELECT p.id AS PlayerId,
                    p.display_name AS DisplayName,
-                   p.external_username AS TelegramUsername,
-                   p.external_user_id::BIGINT AS TelegramId
+                   p.telegram_username AS TelegramUsername,
+                   p.telegram_id AS TelegramId
             FROM session_participants sp
             JOIN players p ON p.id = sp.player_id
             WHERE sp.session_id = @SessionId
@@ -121,7 +120,7 @@ public sealed class HandleRescheduleVoteHandler(
             SELECT rov.option_id AS OptionId,
                    p.id AS PlayerId,
                    p.display_name AS DisplayName,
-                   p.external_username AS TelegramUsername
+                   p.telegram_username AS TelegramUsername
             FROM reschedule_option_votes rov
             JOIN players p ON p.id = rov.player_id
             WHERE rov.proposal_id = @ProposalId

src/GmRelay.Bot/Features/Sessions/RescheduleSession/InitiateRescheduleHandler.cs

@@ -45,13 +45,12 @@ public sealed class InitiateRescheduleHandler(
                        FROM group_managers gm
                        JOIN players p ON p.id = gm.player_id
                        WHERE gm.group_id = s.group_id
-                         AND p.platform = 'Telegram'
-                         AND p.external_user_id = @ExternalUserId
+                         AND p.telegram_id = @TelegramUserId
                    ) AS CanManage
             FROM sessions s
             WHERE s.id = @SessionId AND s.status != @Cancelled
             """,
-            new { command.SessionId, ExternalUserId = command.TelegramUserId.ToString(), Cancelled = SessionStatus.Cancelled });
+            new { command.SessionId, command.TelegramUserId, Cancelled = SessionStatus.Cancelled });
 
         if (session is null)
         {
@@ -84,10 +83,10 @@ public sealed class InitiateRescheduleHandler(
         // 3. Create proposal in AwaitingTime status
         await connection.ExecuteAsync(
             """
-            INSERT INTO reschedule_proposals (session_id, proposed_by_external_user_id, source_platform, status)
-            VALUES (@SessionId, @ProposedBy, 'Telegram', 'AwaitingTime')
+            INSERT INTO reschedule_proposals (session_id, proposed_by, source_platform, status)
+            VALUES (@SessionId, @GmId, 'Telegram', 'AwaitingTime')
             """,
-            new { command.SessionId, ProposedBy = command.TelegramUserId.ToString() });
+            new { command.SessionId, GmId = command.TelegramUserId });
 
         logger.LogInformation("Reschedule initiated for session {SessionId} by GM {GmId}", command.SessionId, command.TelegramUserId);
 

src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs

@@ -79,7 +79,7 @@ public sealed class RescheduleVotingDeadlineService(
             """
             SELECT rp.vote_message_id AS VoteMessageId,
                    s.batch_message_id AS BatchMessageId,
-                   g.external_group_id::BIGINT AS TelegramChatId,
+                   g.telegram_chat_id AS TelegramChatId,
                    s.thread_id AS ThreadId
             FROM reschedule_proposals rp
             JOIN sessions s ON s.id = rp.session_id
@@ -169,7 +169,7 @@ public sealed class RescheduleVotingDeadlineService(
                 """
                 SELECT sp.session_id AS SessionId,
                        p.display_name AS DisplayName,
-                       p.external_username AS TelegramUsername,
+                       p.telegram_username AS TelegramUsername,
                        sp.registration_status AS RegistrationStatus
                 FROM session_participants sp
                 JOIN players p ON sp.player_id = p.id

src/GmRelay.Bot/Migrations/V023__game_groups_telegram_chat_id_nullable.sql

@@ -1,14 +0,0 @@
--- =============================================================
--- V023: Make legacy Telegram columns nullable for multi-platform
--- =============================================================
--- Scope: Allow Discord (and future platforms) to create players
--- and game_groups without legacy telegram_* values.
--- Existing Telegram data was backfilled in V016.
--- =============================================================
-
-ALTER TABLE game_groups
-    ALTER COLUMN telegram_chat_id DROP NOT NULL,
-    ALTER COLUMN gm_telegram_id DROP NOT NULL;
-
-ALTER TABLE players
-    ALTER COLUMN telegram_id DROP NOT NULL;

src/GmRelay.Bot/Migrations/V024__deprecate_telegram_columns.sql

@@ -1,41 +0,0 @@
--- =============================================================
--- V024: Deprecate legacy Telegram-specific columns
--- =============================================================
--- Scope: Complete platform migration by backfilling any remaining
--- external_* gaps and officially deprecating telegram_* columns.
--- No columns are dropped — rollback-safe.
--- =============================================================
-
--- 1. Backfill players platform identity (safeguard for any rows missed in V016)
-UPDATE players
-   SET platform          = 'Telegram',
-       external_user_id  = telegram_id::TEXT,
-       external_username = telegram_username
- WHERE platform IS NULL;
-
--- 2. Backfill game_groups platform identity (safeguard for any rows missed in V016)
-UPDATE game_groups
-   SET platform          = 'Telegram',
-       external_group_id = telegram_chat_id::TEXT
- WHERE platform IS NULL;
-
--- 3. Add platform identity to calendar_subscriptions
-ALTER TABLE calendar_subscriptions
-    ADD COLUMN user_platform   VARCHAR(50),
-    ADD COLUMN user_external_id VARCHAR(255);
-
-UPDATE calendar_subscriptions
-   SET user_external_id = user_telegram_id::TEXT,
-       user_platform    = 'Telegram'
- WHERE user_platform IS NULL;
-
--- 4. Migrate calendar subscription index
-DROP INDEX IF EXISTS ix_calendar_subscriptions_user_telegram_id;
-CREATE INDEX ix_calendar_subscriptions_user_external_id ON calendar_subscriptions (user_external_id);
-
--- 5. Deprecation comments on legacy columns
-COMMENT ON COLUMN players.telegram_id         IS 'DEPRECATED: use platform + external_user_id';
-COMMENT ON COLUMN players.telegram_username   IS 'DEPRECATED: use external_username';
-COMMENT ON COLUMN game_groups.telegram_chat_id IS 'DEPRECATED: use platform + external_group_id';
-COMMENT ON COLUMN game_groups.gm_telegram_id   IS 'DEPRECATED: group ownership is tracked in group_managers';
-COMMENT ON COLUMN calendar_subscriptions.user_telegram_id IS 'DEPRECATED: use user_platform + user_external_id';

src/GmRelay.Bot/Migrations/V025__reschedule_proposals_telegram_external.sql

@@ -1,11 +0,0 @@
--- =============================================================
--- V025: Backfill proposed_by_external_user_id for Telegram proposals
--- =============================================================
--- Scope: Ensure all reschedule_proposals have proposed_by_external_user_id
--- populated so that InitiateRescheduleHandler can stop writing proposed_by.
--- =============================================================
-
-UPDATE reschedule_proposals
-   SET proposed_by_external_user_id = proposed_by::TEXT
- WHERE proposed_by_external_user_id IS NULL
-   AND proposed_by IS NOT NULL;

src/GmRelay.DiscordBot/Features/Sessions/DiscordDeleteSessionHandler.cs

@@ -1,84 +0,0 @@
-using Dapper;
-using GmRelay.DiscordBot.Infrastructure.Discord;
-using GmRelay.Shared.Rendering;
-using Npgsql;
-
-namespace GmRelay.DiscordBot.Features.Sessions;
-
-public sealed record DiscordDeleteSessionResult(
-    string ReplyText,
-    SessionBatchViewModel? UpdatedView,
-    string? EmptyMessage = null);
-
-public sealed class DiscordDeleteSessionHandler(
-    NpgsqlDataSource dataSource,
-    DiscordPermissionChecker permissionChecker,
-    DiscordListSessionsHandler listSessionsHandler,
-    ILogger<DiscordDeleteSessionHandler> logger)
-{
-    public async Task<DiscordDeleteSessionResult> HandleAsync(
-        string guildId,
-        string channelId,
-        ulong userId,
-        ulong resolvedPermissions,
-        ulong guildOwnerId,
-        Guid sessionId,
-        CancellationToken cancellationToken)
-    {
-        await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
-
-        var dbManagerUserIds = await connection.QueryAsync<ulong>(
-            @"SELECT CAST(p.external_user_id AS BIGINT)
-              FROM group_managers gm
-              JOIN players p ON p.id = gm.player_id
-              JOIN game_groups g ON g.id = gm.group_id
-              WHERE g.platform = 'Discord' AND g.external_group_id = @GuildId",
-            new { GuildId = guildId });
-
-        if (!permissionChecker.CanManageSchedule(guildOwnerId, userId, dbManagerUserIds, resolvedPermissions))
-        {
-            return new DiscordDeleteSessionResult(
-                "Только owner, администратор или manager могут удалять сессии.",
-                UpdatedView: null);
-        }
-
-        await using var transaction = await connection.BeginTransactionAsync(cancellationToken);
-        var deletedRows = await connection.ExecuteAsync(
-            """
-            DELETE FROM sessions s
-            USING game_groups g
-            WHERE s.group_id = g.id
-              AND s.id = @SessionId
-              AND g.platform = 'Discord'
-              AND g.external_group_id = @GuildId
-            """,
-            new { SessionId = sessionId, GuildId = guildId },
-            transaction);
-
-        await transaction.CommitAsync(cancellationToken);
-
-        if (deletedRows == 0)
-        {
-            return new DiscordDeleteSessionResult(
-                "Сессия не найдена или уже удалена.",
-                UpdatedView: null);
-        }
-
-        logger.LogInformation("Deleted Discord session {SessionId} in guild {GuildId}", sessionId, guildId);
-
-        var updatedView = await listSessionsHandler.BuildScheduleAsync(
-            guildId,
-            channelId,
-            userId,
-            resolvedPermissions,
-            guildOwnerId,
-            cancellationToken);
-
-        return updatedView is null
-            ? new DiscordDeleteSessionResult(
-                "Сессия удалена.",
-                UpdatedView: null,
-                EmptyMessage: "В этом сервере нет предстоящих игр.")
-            : new DiscordDeleteSessionResult("Сессия удалена.", updatedView);
-    }
-}

src/GmRelay.DiscordBot/Features/Sessions/DiscordListSessionsCommand.cs

@@ -1,4 +1,3 @@
-using NetCord;
 using NetCord.Rest;
 using NetCord.Services.ApplicationCommands;
 
@@ -19,17 +18,8 @@ public class DiscordListSessionsCommand : ApplicationCommandModule<SlashCommandC
         var guildId = Context.Interaction.GuildId?.ToString()
             ?? throw new InvalidOperationException("This command can only be used in a guild.");
         var channelId = Context.Channel.Id.ToString();
-        var member = Context.User as GuildInteractionUser;
-        var resolvedPermissions = member is null ? 0UL : (ulong)member.Permissions;
-        var guildOwnerId = 0UL;
 
-        var view = await _handler.BuildScheduleAsync(
-            guildId,
-            channelId,
-            Context.User.Id,
-            resolvedPermissions,
-            guildOwnerId,
-            CancellationToken.None);
+        var view = await _handler.BuildScheduleAsync(guildId, channelId, CancellationToken.None);
 
         if (view is null)
         {

src/GmRelay.DiscordBot/Features/Sessions/DiscordListSessionsHandler.cs

@@ -1,5 +1,4 @@
 using Dapper;
-using GmRelay.DiscordBot.Infrastructure.Discord;
 using GmRelay.Shared.Domain;
 using GmRelay.Shared.Rendering;
 using Npgsql;
@@ -10,22 +9,11 @@ internal sealed record DiscordSessionListItemDto(
     Guid Id, string Title, DateTime ScheduledAt, string Status, int? MaxPlayers,
     int PlayerCount, int WaitlistCount);
 
-public sealed class DiscordListSessionsHandler(
-    NpgsqlDataSource dataSource,
-    DiscordPermissionChecker permissionChecker)
+public sealed class DiscordListSessionsHandler(NpgsqlDataSource dataSource)
 {
-    public Task<SessionBatchViewModel?> BuildScheduleAsync(
-        string guildId,
-        string channelId,
-        CancellationToken cancellationToken) =>
-        BuildScheduleAsync(guildId, channelId, 0, 0, 0, cancellationToken);
-
     public async Task<SessionBatchViewModel?> BuildScheduleAsync(
         string guildId,
         string channelId,
-        ulong userId,
-        ulong resolvedPermissions,
-        ulong guildOwnerId,
         CancellationToken cancellationToken)
     {
         await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
@@ -33,15 +21,15 @@ public sealed class DiscordListSessionsHandler(
         var sessions = await connection.QueryAsync<DiscordSessionListItemDto>(
             @"SELECT s.id as Id, s.title as Title, s.scheduled_at as ScheduledAt, s.status as Status,
                      s.max_players as MaxPlayers,
-                     COUNT(sp.id) FILTER (WHERE sp.is_gm = false AND sp.registration_status = @Active)::int as PlayerCount,
-                     COUNT(sp.id) FILTER (WHERE sp.is_gm = false AND sp.registration_status = @Waitlisted)::int as WaitlistCount
+                     COUNT(sp.id) FILTER (WHERE sp.is_gm = false AND sp.registration_status = @Active) as PlayerCount,
+                     COUNT(sp.id) FILTER (WHERE sp.is_gm = false AND sp.registration_status = @Waitlisted) as WaitlistCount
               FROM sessions s
               JOIN game_groups g ON s.group_id = g.id
               LEFT JOIN session_participants sp ON s.id = sp.session_id
               WHERE g.platform = 'Discord'
                 AND g.external_group_id = @GuildId
                 AND s.status != @Cancelled
-                AND s.scheduled_at > now() - interval '4 hours'
+                AND s.scheduled_at > NOW()
               GROUP BY s.id, s.title, s.scheduled_at, s.status, s.max_players
               ORDER BY s.scheduled_at ASC",
             new
@@ -56,25 +44,11 @@ public sealed class DiscordListSessionsHandler(
         if (sessionList.Count == 0)
             return null;
 
-        var dbManagerUserIds = await connection.QueryAsync<ulong>(
-            @"SELECT CAST(p.external_user_id AS BIGINT)
-              FROM group_managers gm
-              JOIN players p ON p.id = gm.player_id
-              JOIN game_groups g ON g.id = gm.group_id
-              WHERE g.platform = 'Discord' AND g.external_group_id = @GuildId",
-            new { GuildId = guildId });
-
-        var canManage = permissionChecker.CanManageSchedule(
-            guildOwnerId,
-            userId,
-            dbManagerUserIds,
-            resolvedPermissions);
-
         var sessionIds = sessionList.Select(s => s.Id).ToList();
         var participants = await connection.QueryAsync<ParticipantBatchDto>(
             @"SELECT sp.session_id as SessionId,
                      p.display_name as DisplayName,
-                     p.external_username as TelegramUsername,
+                     COALESCE(p.external_username, p.telegram_username) as TelegramUsername,
                      sp.registration_status as RegistrationStatus
               FROM session_participants sp
               JOIN players p ON p.id = sp.player_id
@@ -86,25 +60,6 @@ public sealed class DiscordListSessionsHandler(
         var batchDtos = sessionList.Select(s => new SessionBatchDto(
             s.Id, s.ScheduledAt, s.Status, s.MaxPlayers, "")).ToList();
 
-        var view = SessionBatchViewBuilder.Build(firstTitle, batchDtos, participants.ToList());
-        return canManage ? AddManagerActions(view) : view;
+        return SessionBatchViewBuilder.Build(firstTitle, batchDtos, participants.ToList());
     }
-
-    internal static SessionBatchViewModel AddManagerActions(SessionBatchViewModel view) =>
-        view with
-        {
-            Sessions = view.Sessions
-                .Select(session =>
-                {
-                    if (SessionStatus.IsCancelled(session.Status))
-                        return session;
-
-                    var actions = session.AvailableActions
-                        .Concat([new AvailableAction("delete_session", $"Удалить {session.ScheduledAt.FormatMoscowShort()}", session.SessionId)])
-                        .ToList();
-
-                    return session with { AvailableActions = actions };
-                })
-                .ToList()
-        };
 }

src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionCommand.cs

@@ -1,5 +1,4 @@
-using GmRelay.DiscordBot.Rendering;
-using NetCord;
+using GmRelay.DiscordBot.Rendering;
 using NetCord.Rest;
 using NetCord.Services.ApplicationCommands;
 
@@ -23,46 +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)
     {
-        _logger.LogInformation(
-            "newsession called by user {UserId} ({UserType}) in guild {GuildId}, channel {ChannelId}",
-            Context.User.Id,
-            Context.User.GetType().Name,
-            Context.Interaction.GuildId,
-            Context.Channel?.Id);
-
         var guildId = Context.Interaction.GuildId
             ?? throw new InvalidOperationException("This command can only be used in a guild.");
-
-        var member = Context.User as GuildInteractionUser;
-        if (member is null)
-        {
-            _logger.LogError("Context.User is not GuildInteractionUser. Actual type: {ActualType}", Context.User.GetType().Name);
-            throw new InvalidOperationException("Guild member data not available in interaction.");
-        }
-
-        var resolvedPermissions = (ulong)member.Permissions;
-        _logger.LogInformation("Resolved permissions for user {UserId}: {Permissions}", Context.User.Id, resolvedPermissions);
-
-        ulong guildOwnerId = 0;
-        var guildName = guildId.ToString();
-        try
-        {
-            var guild = await Context.Client.Rest.GetGuildAsync(guildId);
-            guildOwnerId = guild.OwnerId;
-            guildName = guild.Name;
-            _logger.LogInformation("Guild owner id: {OwnerId}", guildOwnerId);
-        }
-        catch (RestException ex) when (ex.StatusCode == System.Net.HttpStatusCode.NotFound)
-        {
-            _logger.LogWarning(
-                ex,
-                "Bot is not a REST member of guild {GuildId}; using resolved permissions from interaction payload",
-                guildId);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Unexpected error fetching guild {GuildId}", guildId);
-        }
+        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)
@@ -72,57 +35,51 @@ public class DiscordNewSessionCommand : ApplicationCommandModule<SlashCommandCon
             return;
         }
 
-        // Defer the response to avoid Discord 3-second interaction timeout
-        await Context.Interaction.SendResponseAsync(InteractionCallback.DeferredMessage());
+        var resolvedPermissions = GetResolvedPermissions(guild, member);
 
         try
         {
-            _logger.LogInformation("Creating session for guild {GuildId}, user {UserId}", guildId, Context.User.Id);
-
             var view = await _handler.HandleAsync(
-                guildId: guildId.ToString(),
-                channelId: Context.Channel!.Id.ToString(),
-                groupName: guildName,
+                guildId: guild.Id.ToString(),
+                channelId: Context.Channel.Id.ToString(),
                 userId: Context.User.Id,
                 userDisplayName: Context.User.GlobalName ?? Context.User.Username,
                 resolvedPermissions: resolvedPermissions,
-                guildOwnerId: guildOwnerId,
+                guildOwnerId: guild.OwnerId,
                 title: title,
                 scheduledAt: timeResult.Value,
                 maxPlayers: seats is null ? null : (int)seats.Value,
                 joinLink: link,
                 CancellationToken.None);
 
-            _logger.LogInformation("Session created successfully. Building render.");
-
             var (embeds, actionRows) = DiscordSessionBatchRenderer.Render(view);
-
-            _logger.LogInformation("Sending success response.");
-
-            await Context.Interaction.ModifyResponseAsync(message =>
-            {
-                message.Content = ":white_check_mark: **Session created successfully!**";
-                message.Embeds = embeds;
-                message.Components = actionRows;
-            });
-
-            _logger.LogInformation("Success response sent.");
+            await Context.Interaction.SendResponseAsync(
+                InteractionCallback.Message(new InteractionMessageProperties()
+                    .WithContent(":white_check_mark: **Session created successfully!**")
+                    .WithEmbeds(embeds)
+                    .WithComponents(actionRows)));
         }
         catch (UnauthorizedAccessException ex)
         {
-            _logger.LogWarning(ex, "Unauthorized session creation attempt by user {UserId}", Context.User.Id);
-            await Context.Interaction.ModifyResponseAsync(message =>
-            {
-                message.Content = $":no_entry: {ex.Message}";
-            });
+            await Context.Interaction.SendResponseAsync(
+                InteractionCallback.Message($":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.ModifyResponseAsync(message =>
-            {
-                message.Content = ":boom: An error occurred while creating the session.";
-            });
+            _logger.LogError(ex, "Failed to create session for user {UserId} in guild {GuildId}", Context.User.Id, guild.Id);
+            await Context.Interaction.SendResponseAsync(
+                InteractionCallback.Message(":boom: An error occurred while creating the session."));
         }
     }
+
+    private static ulong GetResolvedPermissions(NetCord.Rest.RestGuild guild, NetCord.GuildUser member)
+    {
+        ulong resolved = 0;
+        foreach (var roleId in member.RoleIds)
+        {
+            if (guild.Roles.TryGetValue(roleId, out var role))
+                resolved |= (ulong)role.Permissions;
+        }
+        return resolved;
+    }
 }

src/GmRelay.DiscordBot/Features/Sessions/DiscordNewSessionHandler.cs

@@ -1,9 +1,9 @@
 using Dapper;
 using GmRelay.DiscordBot.Infrastructure.Discord;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using GmRelay.Shared.Rendering;
 using Npgsql;
-using System.Globalization;
 
 namespace GmRelay.DiscordBot.Features.Sessions;
 
@@ -12,40 +12,35 @@ public sealed record TimeParseResult(bool IsSuccess, DateTimeOffset Value, strin
 public sealed class DiscordNewSessionHandler(
     NpgsqlDataSource dataSource,
     DiscordPermissionChecker permissionChecker,
+    IPlatformMessenger messenger,
     ILogger<DiscordNewSessionHandler> logger)
 {
-    private static readonly TimeSpan MoscowOffset = TimeSpan.FromHours(3);
-
     public static TimeParseResult ParseTimeInput(string input)
     {
-        var trimmed = input.Trim();
-
-        if (DateTime.TryParseExact(
-            trimmed,
+        if (DateTimeOffset.TryParseExact(
+            input.Trim(),
             "yyyy-MM-dd HH:mm",
-            CultureInfo.InvariantCulture,
-            DateTimeStyles.None,
-            out var dt1))
+            System.Globalization.CultureInfo.InvariantCulture,
+            System.Globalization.DateTimeStyles.AssumeUniversal,
+            out var result))
         {
-            var offset = new DateTimeOffset(dt1, MoscowOffset).ToUniversalTime();
-            if (offset < DateTimeOffset.UtcNow)
+            if (result < DateTimeOffset.UtcNow)
                 return new TimeParseResult(false, default, "Дата находится в прошлом.");
 
-            return new TimeParseResult(true, offset, null);
+            return new TimeParseResult(true, result.ToUniversalTime(), null);
         }
 
-        if (DateTime.TryParseExact(
-            trimmed,
+        if (DateTimeOffset.TryParseExact(
+            input.Trim(),
             "dd.MM.yyyy HH:mm",
-            CultureInfo.InvariantCulture,
-            DateTimeStyles.None,
-            out var dt2))
+            System.Globalization.CultureInfo.InvariantCulture,
+            System.Globalization.DateTimeStyles.AssumeUniversal,
+            out var altResult))
         {
-            var offset = new DateTimeOffset(dt2, MoscowOffset).ToUniversalTime();
-            if (offset < DateTimeOffset.UtcNow)
+            if (altResult < DateTimeOffset.UtcNow)
                 return new TimeParseResult(false, default, "Дата находится в прошлом.");
 
-            return new TimeParseResult(true, offset, null);
+            return new TimeParseResult(true, altResult.ToUniversalTime(), null);
         }
 
         return new TimeParseResult(false, default, "Некорректный формат даты. Используйте YYYY-MM-DD HH:mm или DD.MM.YYYY HH:mm");
@@ -54,7 +49,6 @@ public sealed class DiscordNewSessionHandler(
     public async Task<SessionBatchViewModel> HandleAsync(
         string guildId,
         string channelId,
-        string groupName,
         ulong userId,
         string userDisplayName,
         ulong resolvedPermissions,
@@ -66,9 +60,6 @@ public sealed class DiscordNewSessionHandler(
         CancellationToken cancellationToken)
     {
         await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
-        var displayGroupName = string.IsNullOrWhiteSpace(groupName) || string.Equals(groupName, guildId, StringComparison.Ordinal)
-            ? title
-            : groupName.Trim();
 
         var dbManagerUserIds = await connection.QueryAsync<ulong>(
             @"SELECT CAST(p.external_user_id AS BIGINT)
@@ -84,7 +75,6 @@ public sealed class DiscordNewSessionHandler(
         }
 
         await using var transaction = await connection.BeginTransactionAsync(cancellationToken);
-        var transactionCommitted = false;
         try
         {
             await connection.ExecuteAsync(
@@ -99,13 +89,13 @@ public sealed class DiscordNewSessionHandler(
 
             var groupId = await connection.ExecuteScalarAsync<Guid>(
                 @"INSERT INTO game_groups (name, platform, external_group_id, external_channel_id)
-                  VALUES (@GroupName, 'Discord', @GuildId, @ChannelId)
+                  VALUES (@GuildId, 'Discord', @GuildId, @ChannelId)
                   ON CONFLICT (platform, external_group_id)
                   WHERE platform IS NOT NULL AND external_group_id IS NOT NULL
                   DO UPDATE SET name = EXCLUDED.name,
                                 external_channel_id = COALESCE(EXCLUDED.external_channel_id, game_groups.external_channel_id)
                   RETURNING id",
-                new { GroupName = displayGroupName, GuildId = guildId, ChannelId = channelId },
+                new { GuildId = guildId, ChannelId = channelId },
                 transaction);
 
             await connection.ExecuteAsync(
@@ -135,19 +125,23 @@ public sealed class DiscordNewSessionHandler(
                 transaction);
 
             await transaction.CommitAsync(cancellationToken);
-            transactionCommitted = true;
             logger.LogInformation("Created session {SessionId} in guild {GuildId}", sessionId, guildId);
 
             var sessions = new[] { new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, maxPlayers, joinLink ?? string.Empty) };
-            return SessionBatchViewBuilder.Build(title, sessions, Array.Empty<ParticipantBatchDto>());
+            var view = SessionBatchViewBuilder.Build(title, sessions, Array.Empty<ParticipantBatchDto>());
+
+            await messenger.SendScheduleAsync(
+                new PlatformScheduleMessage(
+                    new PlatformGroup(PlatformKind.Discord, guildId, guildId, channelId),
+                    view,
+                    null),
+                cancellationToken);
+
+            return view;
         }
         catch
         {
-            if (!transactionCommitted)
-            {
-                await transaction.RollbackAsync(cancellationToken);
-            }
-
+            await transaction.RollbackAsync(cancellationToken);
             throw;
         }
     }

src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleCommand.cs

@@ -1,6 +1,5 @@
 namespace GmRelay.DiscordBot.Features.Sessions;
 
-using NetCord;
 using NetCord.Rest;
 using NetCord.Services.ApplicationCommands;
 
@@ -23,43 +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 = "")
     {
-        _logger.LogInformation(
-            "reschedule called by user {UserId} ({UserType}) in guild {GuildId}",
-            Context.User.Id,
-            Context.User.GetType().Name,
-            Context.Interaction.GuildId);
-
         var guildId = Context.Interaction.GuildId
             ?? throw new InvalidOperationException("This command can only be used in a guild.");
-
-        var member = Context.User as GuildInteractionUser;
-        if (member is null)
-        {
-            _logger.LogError("Context.User is not GuildInteractionUser. Actual type: {ActualType}", Context.User.GetType().Name);
-            throw new InvalidOperationException("Guild member data not available in interaction.");
-        }
-
-        var resolvedPermissions = (ulong)member.Permissions;
-        _logger.LogInformation("Resolved permissions for user {UserId}: {Permissions}", Context.User.Id, resolvedPermissions);
-
-        ulong guildOwnerId = 0;
-        try
-        {
-            var guild = await Context.Client.Rest.GetGuildAsync(guildId);
-            guildOwnerId = guild.OwnerId;
-            _logger.LogInformation("Guild owner id: {OwnerId}", guildOwnerId);
-        }
-        catch (RestException ex) when (ex.StatusCode == System.Net.HttpStatusCode.NotFound)
-        {
-            _logger.LogWarning(
-                ex,
-                "Bot is not a REST member of guild {GuildId}; using resolved permissions from interaction payload",
-                guildId);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Unexpected error fetching guild {GuildId}", guildId);
-        }
+        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))
         {
@@ -100,55 +66,52 @@ public class DiscordRescheduleCommand : ApplicationCommandModule<SlashCommandCon
             return;
         }
 
-        // Defer the response to avoid Discord 3-second interaction timeout
-        await Context.Interaction.SendResponseAsync(InteractionCallback.DeferredMessage());
+        var resolvedPermissions = GetResolvedPermissions(guild, member);
 
         try
         {
-            _logger.LogInformation("Initiating reschedule for session {SessionId} in guild {GuildId}", sessionId, guildId);
-
             var result = await _handler.HandleAsync(
-                guildId: guildId.ToString(),
-                channelId: Context.Channel!.Id.ToString(),
+                guildId: guild.Id.ToString(),
+                channelId: Context.Channel.Id.ToString(),
                 userId: Context.User.Id,
                 userDisplayName: Context.User.GlobalName ?? Context.User.Username,
                 resolvedPermissions: resolvedPermissions,
-                guildOwnerId: guildOwnerId,
+                guildOwnerId: guild.OwnerId,
                 sessionId: sessionId,
                 options: parsedOptions,
                 deadline: deadlineResult.Value,
                 CancellationToken.None);
 
-            _logger.LogInformation("Reschedule voting started for session {SessionId}, proposal {ProposalId}", sessionId, result.ProposalId);
-
-            await Context.Interaction.ModifyResponseAsync(message =>
-            {
-                message.Content = $"🗳 Голосование за перенос запущено! Дедлайн: {deadlineResult.Value:yyyy-MM-dd HH:mm} UTC.";
-            });
+            await Context.Interaction.SendResponseAsync(
+                InteractionCallback.Message(
+                    $"🗳 Голосование за перенос запущено! Дедлайн: {deadlineResult.Value:yyyy-MM-dd HH:mm} UTC."));
         }
         catch (UnauthorizedAccessException ex)
         {
-            _logger.LogWarning(ex, "Unauthorized reschedule attempt by user {UserId}", Context.User.Id);
-            await Context.Interaction.ModifyResponseAsync(message =>
-            {
-                message.Content = $":no_entry: {ex.Message}";
-            });
+            await Context.Interaction.SendResponseAsync(
+                InteractionCallback.Message($":no_entry: {ex.Message}"));
         }
         catch (InvalidOperationException ex)
         {
-            _logger.LogWarning(ex, "Invalid reschedule request by user {UserId}", Context.User.Id);
-            await Context.Interaction.ModifyResponseAsync(message =>
-            {
-                message.Content = $":warning: {ex.Message}";
-            });
+            await Context.Interaction.SendResponseAsync(
+                InteractionCallback.Message($":warning: {ex.Message}"));
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Failed to initiate reschedule for session {SessionId}", sessionId);
-            await Context.Interaction.ModifyResponseAsync(message =>
-            {
-                message.Content = ":boom: Ошибка при запуске голосования.";
-            });
+            await Context.Interaction.SendResponseAsync(
+                InteractionCallback.Message(":boom: Ошибка при запуске голосования."));
         }
     }
+
+    private static ulong GetResolvedPermissions(NetCord.Rest.RestGuild guild, NetCord.GuildUser member)
+    {
+        ulong resolved = 0;
+        foreach (var roleId in member.RoleIds)
+        {
+            if (guild.Roles.TryGetValue(roleId, out var role))
+                resolved |= (ulong)role.Permissions;
+        }
+        return resolved;
+    }
 }

src/GmRelay.DiscordBot/Features/Sessions/DiscordRescheduleVotingDeadlineService.cs

@@ -152,7 +152,7 @@ public sealed class DiscordRescheduleVotingDeadlineService(
                 """
                 SELECT sp.session_id AS SessionId,
                        p.display_name AS DisplayName,
-                       p.external_username AS TelegramUsername,
+                       COALESCE(p.external_username, p.telegram_username) AS TelegramUsername,
                        sp.registration_status AS RegistrationStatus
                 FROM session_participants sp
                 JOIN players p ON p.id = sp.player_id

src/GmRelay.DiscordBot/Features/Sessions/DiscordSessionInteractionModule.cs

@@ -1,10 +1,8 @@
 using GmRelay.DiscordBot.Infrastructure.Discord;
-using GmRelay.DiscordBot.Rendering;
 using GmRelay.Shared.Domain;
 using GmRelay.Shared.Features.Confirmation.HandleRsvp;
 using GmRelay.Shared.Features.Sessions.CreateSession;
 using GmRelay.Shared.Platform;
-using System.Collections;
 using System.Globalization;
 using NetCord;
 using NetCord.Rest;
@@ -16,7 +14,6 @@ public sealed class DiscordSessionInteractionModule(
     JoinSessionHandler joinSessionHandler,
     LeaveSessionHandler leaveSessionHandler,
     HandleRsvpHandler rsvpHandler,
-    DiscordDeleteSessionHandler deleteSessionHandler,
     DiscordRescheduleVoteHandler voteHandler,
     DiscordInteractionReplyCache interactionReplies,
     ILogger<DiscordSessionInteractionModule> logger) : ComponentInteractionModule<ButtonInteractionContext>
@@ -31,22 +28,21 @@ public sealed class DiscordSessionInteractionModule(
         }
 
         var input = CreateInput(parsedSessionId);
-        await RespondAsync(InteractionCallback.DeferredModifyMessage);
-        SessionInteractionResult result;
+        await RespondAsync(InteractionCallback.DeferredMessage(MessageFlags.Ephemeral));
         try
         {
-            result = await joinSessionHandler.HandleAsync(
-                DiscordSessionInteractionMapper.CreateJoinCommand(input) with { DeferScheduleUpdate = true },
+            await joinSessionHandler.HandleAsync(
+                DiscordSessionInteractionMapper.CreateJoinCommand(input),
                 CancellationToken.None);
         }
         catch (Exception ex)
         {
             logger.LogError(ex, "Failed to handle Discord join interaction for session {SessionId}", parsedSessionId);
-            await FollowupEphemeralAsync("Не удалось обработать кнопку.");
+            await CompleteResponseAsync("Не удалось обработать кнопку.");
             return;
         }
 
-        await CompleteScheduleUpdateResponseAsync(input.InteractionId, result);
+        await CompleteWithStoredReplyAsync(input.InteractionId);
     }
 
     [ComponentInteraction("leave_session")]
@@ -59,56 +55,21 @@ public sealed class DiscordSessionInteractionModule(
         }
 
         var input = CreateInput(parsedSessionId);
-        await RespondAsync(InteractionCallback.DeferredModifyMessage);
-        SessionInteractionResult result;
+        await RespondAsync(InteractionCallback.DeferredMessage(MessageFlags.Ephemeral));
         try
         {
-            result = await leaveSessionHandler.HandleAsync(
-                DiscordSessionInteractionMapper.CreateLeaveCommand(input) with { DeferScheduleUpdate = true },
+            await leaveSessionHandler.HandleAsync(
+                DiscordSessionInteractionMapper.CreateLeaveCommand(input),
                 CancellationToken.None);
         }
         catch (Exception ex)
         {
             logger.LogError(ex, "Failed to handle Discord leave interaction for session {SessionId}", parsedSessionId);
-            await FollowupEphemeralAsync("Не удалось обработать кнопку.");
+            await CompleteResponseAsync("Не удалось обработать кнопку.");
             return;
         }
 
-        await CompleteScheduleUpdateResponseAsync(input.InteractionId, result);
-    }
-
-    [ComponentInteraction("delete_session")]
-    public async Task DeleteAsync(string sessionId)
-    {
-        if (!Guid.TryParse(sessionId, out var parsedSessionId))
-        {
-            await RespondAsync(CreateEphemeralReply("Session button is outdated."));
-            return;
-        }
-
-        var input = CreateInput(parsedSessionId);
-        var member = Context.User as GuildInteractionUser;
-        var resolvedPermissions = member is null ? 0UL : (ulong)member.Permissions;
-
-        await RespondAsync(InteractionCallback.DeferredModifyMessage);
-        try
-        {
-            var result = await deleteSessionHandler.HandleAsync(
-                guildId: input.GuildId,
-                channelId: input.ChannelId,
-                userId: input.UserId,
-                resolvedPermissions: resolvedPermissions,
-                guildOwnerId: 0,
-                sessionId: parsedSessionId,
-                CancellationToken.None);
-
-            await CompleteDeleteResponseAsync(result);
-        }
-        catch (Exception ex)
-        {
-            logger.LogError(ex, "Failed to handle Discord delete interaction for session {SessionId}", parsedSessionId);
-            await FollowupEphemeralAsync("Не удалось удалить сессию.");
-        }
+        await CompleteWithStoredReplyAsync(input.InteractionId);
     }
 
     [ComponentInteraction("rsvp")]
@@ -163,7 +124,7 @@ public sealed class DiscordSessionInteractionModule(
         catch (Exception ex)
         {
             logger.LogError(ex, "Failed to handle Discord RSVP interaction for session {SessionId}", parsedSessionId);
-            await CompleteResponseAsync("Не удалось обработать кнопку.");
+            await CompleteResponseAsync("Не удалось обработать кнопку.");
             return;
         }
 
@@ -207,7 +168,7 @@ public sealed class DiscordSessionInteractionModule(
 
     private DiscordSessionInteractionInput CreateInput(Guid sessionId)
     {
-        var guildId = Context.Interaction.GuildId?.ToString(CultureInfo.InvariantCulture)
+        var guild = Context.Guild
             ?? 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.");
@@ -215,7 +176,7 @@ public sealed class DiscordSessionInteractionModule(
         return new DiscordSessionInteractionInput(
             SessionId: sessionId,
             InteractionId: Context.Interaction.Id.ToString(System.Globalization.CultureInfo.InvariantCulture),
-            GuildId: guildId,
+            GuildId: guild.Id.ToString(CultureInfo.InvariantCulture),
             ChannelId: Context.Channel.Id.ToString(CultureInfo.InvariantCulture),
             MessageId: message.Id.ToString(CultureInfo.InvariantCulture),
             UserId: Context.User.Id,
@@ -229,85 +190,9 @@ public sealed class DiscordSessionInteractionModule(
         await CompleteResponseAsync(reply?.Text ?? "Session updated.");
     }
 
-    private async Task CompleteScheduleUpdateResponseAsync(string interactionId, SessionInteractionResult result)
-    {
-        var updatedView = result.UpdatedView;
-        if (updatedView is not null && SourceMessageHasDeleteAction())
-        {
-            updatedView = DiscordListSessionsHandler.AddManagerActions(updatedView);
-        }
-
-        if (updatedView is not null)
-        {
-            var (embeds, actionRows) = DiscordSessionBatchRenderer.Render(updatedView);
-            await ModifyResponseAsync(options =>
-            {
-                options.Embeds = embeds;
-                options.Components = actionRows;
-            });
-        }
-
-        var reply = interactionReplies.Take(interactionId);
-        await FollowupEphemeralAsync(reply?.Text ?? result.ReplyText);
-    }
-
-    private async Task CompleteDeleteResponseAsync(DiscordDeleteSessionResult result)
-    {
-        if (result.UpdatedView is not null)
-        {
-            var (embeds, actionRows) = DiscordSessionBatchRenderer.Render(result.UpdatedView);
-            await ModifyResponseAsync(options =>
-            {
-                options.Embeds = embeds;
-                options.Components = actionRows;
-            });
-        }
-        else if (result.EmptyMessage is not null)
-        {
-            await ModifyResponseAsync(options =>
-            {
-                options.Content = result.EmptyMessage;
-                options.Embeds = [];
-                options.Components = [];
-            });
-        }
-
-        await FollowupEphemeralAsync(result.ReplyText);
-    }
-
     private Task CompleteResponseAsync(string text) =>
         ModifyResponseAsync(options => options.Content = text);
 
-    private Task FollowupEphemeralAsync(string text) =>
-        FollowupAsync(new InteractionMessageProperties()
-            .WithContent(text)
-            .WithFlags(MessageFlags.Ephemeral));
-
-    private bool SourceMessageHasDeleteAction() =>
-        Context.Interaction.Message?.Components.Any(ComponentContainsDeleteAction) == true;
-
-    private static bool ComponentContainsDeleteAction(object? component)
-    {
-        if (component is null)
-            return false;
-
-        if (component is IInteractiveComponent interactive
-            && interactive.CustomId.StartsWith("delete_session:", StringComparison.Ordinal))
-            return true;
-
-        var nestedComponents = component.GetType().GetProperty("Components")?.GetValue(component) as IEnumerable;
-        if (nestedComponents is null)
-            return false;
-
-        foreach (var nestedComponent in nestedComponents)
-        {
-            if (ComponentContainsDeleteAction(nestedComponent))
-                return true;
-        }
-
-        return false;
-    }
-
     private static InteractionCallbackProperties CreateEphemeralReply(string text) =>
         InteractionCallback.Message(
             new InteractionMessageProperties()

src/GmRelay.DiscordBot/GmRelay.DiscordBot.csproj

@@ -6,14 +6,11 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>dotnet-GmRelay.DiscordBot-issue-26</UserSecretsId>
-    <!-- DiscordBot uses vanilla Dapper in its own handlers; DAP005 requires AOT-enabled Dapper -->
-    <NoWarn>$(NoWarn);DAP005</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Aspire.Npgsql" Version="13.2.2" />
     <PackageReference Include="Dapper" Version="2.1.72" />
-    <PackageReference Include="Dapper.AOT" Version="1.0.48" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
     <PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.489" />
     <PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.489" />

src/GmRelay.DiscordBot/Infrastructure/Discord/DiscordPlatformMessenger.cs

@@ -98,34 +98,17 @@ public sealed class DiscordPlatformMessenger : IPlatformMessenger
         CancellationToken ct)
     {
         var channelId = GetChannelId(request.Group);
-        try
-        {
-            var message = await restClient.SendMessageAsync(
-                channelId,
-                new MessageProperties()
-                    .WithEmbeds([BuildConfirmationEmbed(request)])
-                    .WithComponents(BuildRsvpRows(request.SessionId, disabled: false)));
+        var message = await restClient.SendMessageAsync(
+            channelId,
+            new MessageProperties()
+                .WithEmbeds([BuildConfirmationEmbed(request)])
+                .WithComponents(BuildRsvpRows(request.SessionId, disabled: false)));
 
-            logger?.LogInformation(
-                "Confirmation request sent to Discord channel {ChannelId}, message id {MessageId}",
-                channelId,
-                message.Id);
-
-            return new PlatformMessageRef(
-                PlatformKind.Discord,
-                request.Group.ExternalGroupId,
-                null,
-                message.Id.ToString(CultureInfo.InvariantCulture));
-        }
-        catch (Exception ex)
-        {
-            logger?.LogError(
-                ex,
-                "Failed to send confirmation request to Discord channel {ChannelId} for session {SessionId}",
-                channelId,
-                request.SessionId);
-            throw;
-        }
+        return new PlatformMessageRef(
+            PlatformKind.Discord,
+            request.Group.ExternalGroupId,
+            null,
+            message.Id.ToString(CultureInfo.InvariantCulture));
     }
 
     public async Task UpdateConfirmationRequestAsync(PlatformRsvpMessageUpdate update, CancellationToken ct)
@@ -152,32 +135,15 @@ public sealed class DiscordPlatformMessenger : IPlatformMessenger
         CancellationToken ct)
     {
         var channelId = GetChannelId(notification.Group);
-        try
-        {
-            var message = await restClient.SendMessageAsync(
-                channelId,
-                new MessageProperties().WithEmbeds([BuildJoinLinkEmbed(notification)]));
+        var message = await restClient.SendMessageAsync(
+            channelId,
+            new MessageProperties().WithEmbeds([BuildJoinLinkEmbed(notification)]));
 
-            logger?.LogInformation(
-                "Join link sent to Discord channel {ChannelId}, message id {MessageId}",
-                channelId,
-                message.Id);
-
-            return new PlatformMessageRef(
-                PlatformKind.Discord,
-                notification.Group.ExternalGroupId,
-                null,
-                message.Id.ToString(CultureInfo.InvariantCulture));
-        }
-        catch (Exception ex)
-        {
-            logger?.LogError(
-                ex,
-                "Failed to send join link to Discord channel {ChannelId} for session {SessionId}",
-                channelId,
-                notification.SessionId);
-            throw;
-        }
+        return new PlatformMessageRef(
+            PlatformKind.Discord,
+            notification.Group.ExternalGroupId,
+            null,
+            message.Id.ToString(CultureInfo.InvariantCulture));
     }
 
     public async Task SendDirectSessionNotificationAsync(
@@ -306,16 +272,14 @@ public sealed class DiscordPlatformMessenger : IPlatformMessenger
             ? "—"
             : string.Join(", ", notification.ConfirmedPlayers.Select(p => Mention(p.User)));
 
-        var embed = new EmbedProperties()
+        return new EmbedProperties()
             .WithTitle($"Ссылка на игру: {notification.Title}")
             .WithDescription(
                 $"Время: **{notification.ScheduledAt.FormatMoscow()}** (МСК)\n" +
                 $"Ссылка: {notification.JoinLink}\n\n" +
                 $"Участники: {mentions}")
+            .WithUrl(notification.JoinLink)
             .WithColor(new Color(0x57F287));
-
-        var embedUrl = DiscordEmbedUrls.NormalizeHttpUrl(notification.JoinLink);
-        return embedUrl is null ? embed : embed.WithUrl(embedUrl);
     }
 
     private static IReadOnlyList<ActionRowProperties> BuildRsvpRows(Guid sessionId, bool disabled)

src/GmRelay.DiscordBot/Program.cs

@@ -36,8 +36,6 @@ discordOptions.Validate();
 
 builder.Services.AddSingleton(discordOptions);
 
-builder.Logging.AddConsole();
-
 builder.Services.AddSingleton<NpgsqlDataSource>(sp =>
 {
     var config = sp.GetRequiredService<IConfiguration>();
@@ -56,7 +54,6 @@ builder.Services.AddSingleton<NpgsqlDataSource>(sp =>
 
 builder.Services.AddSingleton<DiscordPermissionChecker>();
 builder.Services.AddSingleton<DiscordListSessionsHandler>();
-builder.Services.AddSingleton<DiscordDeleteSessionHandler>();
 builder.Services.AddSingleton<DiscordNewSessionHandler>();
 builder.Services.AddSingleton<DiscordRescheduleHandler>();
 builder.Services.AddSingleton<DiscordRescheduleVoteHandler>();

src/GmRelay.DiscordBot/Rendering/DiscordEmbedUrls.cs

@@ -1,43 +0,0 @@
-namespace GmRelay.DiscordBot.Rendering;
-
-public static class DiscordEmbedUrls
-{
-    public static string? NormalizeHttpUrl(string? value)
-    {
-        if (string.IsNullOrWhiteSpace(value))
-            return null;
-
-        var candidate = value.Trim();
-        if (IsSupportedHttpUrl(candidate, out var normalized))
-            return normalized;
-
-        if (candidate.Contains("://", StringComparison.Ordinal))
-            return null;
-
-        return IsSupportedHttpUrl($"https://{candidate}", out normalized)
-            && HasPublicHost(normalized)
-                ? normalized
-                : null;
-    }
-
-    private static bool IsSupportedHttpUrl(string value, out string normalized)
-    {
-        normalized = string.Empty;
-
-        if (!Uri.TryCreate(value, UriKind.Absolute, out var uri))
-            return false;
-
-        if (!string.Equals(uri.Scheme, Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase)
-            && !string.Equals(uri.Scheme, Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase))
-        {
-            return false;
-        }
-
-        normalized = uri.ToString();
-        return true;
-    }
-
-    private static bool HasPublicHost(string value) =>
-        Uri.TryCreate(value, UriKind.Absolute, out var uri)
-        && uri.Host.Contains('.', StringComparison.Ordinal);
-}

src/GmRelay.DiscordBot/Rendering/DiscordSessionBatchRenderer.cs

@@ -70,10 +70,9 @@ public static class DiscordSessionBatchRenderer
                 .WithInline()
         };
 
-        var embedUrl = DiscordEmbedUrls.NormalizeHttpUrl(session.JoinLink);
-        if (embedUrl is not null)
+        if (!string.IsNullOrEmpty(session.JoinLink))
         {
-            embed = embed.WithUrl(embedUrl);
+            embed = embed.WithUrl(session.JoinLink);
         }
 
         embed = embed.WithColor(GetColor(session));

src/GmRelay.DiscordBot/packages.lock.json

@@ -28,12 +28,6 @@
         "resolved": "2.1.72",
         "contentHash": "ns4mGqQd9a/MhP8m6w556vVlZIa0/MfUu03zrxjZC/jlr1uVCsUac8bkdB+Fs98Llbd56rRSo1eZH5VVmeGZyw=="
       },
-      "Dapper.AOT": {
-        "type": "Direct",
-        "requested": "[1.0.48, )",
-        "resolved": "1.0.48",
-        "contentHash": "rsLM3yKr4g+YKKox9lhc8D+kz67P7Q9+xdyn1LmCsoYr1kYpJSm+Nt6slo5UrfUrcTiGJ57zUlyO8XUdV7G7iA=="
-      },
       "Microsoft.Extensions.Hosting": {
         "type": "Direct",
         "requested": "[10.0.5, )",

src/GmRelay.Shared/Features/Confirmation/HandleRsvp/HandleRsvpHandler.cs

@@ -56,8 +56,8 @@ public sealed class HandleRsvpHandler(
                 FROM session_participants sp
                 JOIN players p ON p.id = sp.player_id
                 WHERE sp.session_id = @SessionId
-                  AND p.platform = @Platform
-                  AND p.external_user_id = @ExternalUserId
+                  AND COALESCE(p.platform, 'Telegram') = @Platform
+                  AND COALESCE(p.external_user_id, p.telegram_id::TEXT) = @ExternalUserId
                   AND sp.is_gm = false
                   AND sp.registration_status = @Active
             )
@@ -90,8 +90,8 @@ public sealed class HandleRsvpHandler(
               AND  player_id = (
                     SELECT id
                     FROM players
-                    WHERE platform = @Platform
-                      AND external_user_id = @ExternalUserId
+                    WHERE COALESCE(platform, 'Telegram') = @Platform
+                      AND COALESCE(external_user_id, telegram_id::TEXT) = @ExternalUserId
                     LIMIT 1
               )
               AND  registration_status = @Active
@@ -265,10 +265,10 @@ public sealed class HandleRsvpHandler(
 
             var participants = (await connection.QueryAsync<ParticipantRsvpRow>(
                 """
-                SELECT p.platform AS Platform,
-                       p.external_user_id AS ExternalUserId,
+                SELECT COALESCE(p.platform, 'Telegram') AS Platform,
+                       COALESCE(p.external_user_id, p.telegram_id::TEXT) AS ExternalUserId,
                        p.display_name AS DisplayName,
-                       p.external_username AS ExternalUsername,
+                       COALESCE(p.external_username, p.telegram_username) AS ExternalUsername,
                        sp.rsvp_status AS RsvpStatus,
                        sp.registration_status AS RegistrationStatus,
                        sp.is_gm AS IsGm
@@ -312,13 +312,23 @@ public sealed class HandleRsvpHandler(
         var rows = await connection.QueryAsync<RsvpRecipientRow>(
             """
             SELECT DISTINCT
-                   p.platform AS Platform,
-                   p.external_user_id AS ExternalUserId,
+                   COALESCE(p.platform, 'Telegram') AS Platform,
+                   COALESCE(p.external_user_id, p.telegram_id::TEXT) AS ExternalUserId,
                    p.display_name AS DisplayName,
-                   p.external_username AS ExternalUsername
+                   COALESCE(p.external_username, p.telegram_username) AS ExternalUsername
             FROM group_managers gm
             JOIN players p ON p.id = gm.player_id
             WHERE gm.group_id = @GroupId
+            UNION
+            SELECT DISTINCT
+                   COALESCE(p.platform, 'Telegram') AS Platform,
+                   COALESCE(p.external_user_id, p.telegram_id::TEXT) AS ExternalUserId,
+                   p.display_name AS DisplayName,
+                   COALESCE(p.external_username, p.telegram_username) AS ExternalUsername
+            FROM game_groups g
+            JOIN players p ON p.telegram_id = g.gm_telegram_id
+            WHERE g.id = @GroupId
+              AND g.gm_telegram_id IS NOT NULL
             """,
             new { GroupId = groupId },
             transaction);

src/GmRelay.Shared/Features/Confirmation/SendConfirmation/SendConfirmationHandler.cs

@@ -45,10 +45,10 @@ public sealed class SendConfirmationHandler(
                    s.title,
                    s.scheduled_at AS ScheduledAt,
                    s.group_id AS GroupId,
-                   g.platform AS Platform,
-                   g.external_group_id AS ExternalGroupId,
+                   COALESCE(g.platform, 'Telegram') AS Platform,
+                   COALESCE(g.external_group_id, g.telegram_chat_id::TEXT) AS ExternalGroupId,
                    g.name AS DisplayName,
-                   g.external_channel_id AS ExternalChannelId,
+                   COALESCE(g.external_channel_id, g.telegram_chat_id::TEXT) AS ExternalChannelId,
                    s.thread_id AS ThreadId,
                    s.notification_mode AS NotificationMode
             FROM sessions s
@@ -65,10 +65,10 @@ public sealed class SendConfirmationHandler(
 
         var participants = (await connection.QueryAsync<ConfirmationParticipantRow>(
             """
-            SELECT p.platform AS Platform,
-                   p.external_user_id AS ExternalUserId,
+            SELECT COALESCE(p.platform, 'Telegram') AS Platform,
+                   COALESCE(p.external_user_id, p.telegram_id::TEXT) AS ExternalUserId,
                    p.display_name AS DisplayName,
-                   p.external_username AS ExternalUsername,
+                   COALESCE(p.external_username, p.telegram_username) AS ExternalUsername,
                    sp.rsvp_status AS RsvpStatus,
                    sp.registration_status AS RegistrationStatus,
                    sp.is_gm AS IsGm

src/GmRelay.Shared/Features/Reminders/SendJoinLink/SendJoinLinkHandler.cs

@@ -47,10 +47,10 @@ public sealed class SendJoinLinkHandler(
                    s.title,
                    s.join_link AS JoinLink,
                    s.scheduled_at AS ScheduledAt,
-                   g.platform AS Platform,
-                   g.external_group_id AS ExternalGroupId,
+                   COALESCE(g.platform, 'Telegram') AS Platform,
+                   COALESCE(g.external_group_id, g.telegram_chat_id::TEXT) AS ExternalGroupId,
                    g.name AS DisplayName,
-                   g.external_channel_id AS ExternalChannelId,
+                   COALESCE(g.external_channel_id, g.telegram_chat_id::TEXT) AS ExternalChannelId,
                    s.thread_id AS ThreadId,
                    s.notification_mode AS NotificationMode
             FROM sessions s
@@ -58,14 +58,14 @@ public sealed class SendJoinLinkHandler(
             WHERE s.id = @SessionId
               AND s.status = @Confirmed
               AND (
-                    (g.platform = 'Telegram' AND s.link_message_id IS NULL)
+                    (COALESCE(g.platform, 'Telegram') = 'Telegram' AND s.link_message_id IS NULL)
                     OR (
-                        g.platform <> 'Telegram'
+                        COALESCE(g.platform, 'Telegram') <> 'Telegram'
                         AND NOT EXISTS (
                             SELECT 1
                             FROM platform_messages pm
                             WHERE pm.session_id = s.id
-                              AND pm.platform = g.platform
+                              AND pm.platform = COALESCE(g.platform, 'Telegram')
                               AND pm.purpose = 'join_link'
                         )
                     )
@@ -81,10 +81,10 @@ public sealed class SendJoinLinkHandler(
 
         var players = (await connection.QueryAsync<JoinLinkPlayerRow>(
             """
-            SELECT p.platform AS Platform,
-                   p.external_user_id AS ExternalUserId,
+            SELECT COALESCE(p.platform, 'Telegram') AS Platform,
+                   COALESCE(p.external_user_id, p.telegram_id::TEXT) AS ExternalUserId,
                    p.display_name AS DisplayName,
-                   p.external_username AS ExternalUsername,
+                   COALESCE(p.external_username, p.telegram_username) AS ExternalUsername,
                    sp.rsvp_status AS RsvpStatus,
                    sp.registration_status AS RegistrationStatus,
                    sp.is_gm AS IsGm

src/GmRelay.Shared/Features/Reminders/SendOneHourReminder/SendOneHourReminderHandler.cs

@@ -56,10 +56,10 @@ public sealed class SendOneHourReminderHandler(
 
         var recipients = (await connection.QueryAsync<OneHourReminderRecipientRow>(
             """
-            SELECT p.platform AS Platform,
-                   p.external_user_id AS ExternalUserId,
+            SELECT COALESCE(p.platform, 'Telegram') AS Platform,
+                   COALESCE(p.external_user_id, p.telegram_id::TEXT) AS ExternalUserId,
                    p.display_name AS DisplayName,
-                   p.external_username AS ExternalUsername
+                   COALESCE(p.external_username, p.telegram_username) AS ExternalUsername
             FROM session_participants sp
             JOIN players p ON p.id = sp.player_id
             WHERE sp.session_id = @SessionId

src/GmRelay.Shared/Features/Sessions/CreateSession/JoinSessionHandler.cs

@@ -13,12 +13,7 @@ public sealed record JoinSessionCommand(
     PlatformUser User,
     string InteractionId,
     PlatformGroup Group,
-    PlatformMessageRef ScheduleMessage,
-    bool DeferScheduleUpdate = false);
-
-public sealed record SessionInteractionResult(
-    string ReplyText,
-    SessionBatchViewModel? UpdatedView = null);
+    PlatformMessageRef ScheduleMessage);
 
 // DTOs for AOT compilation
 internal sealed record JoinSessionBatchDto(Guid BatchId, string Title, string Status, int? MaxPlayers);
@@ -29,7 +24,7 @@ public sealed class JoinSessionHandler(
     IScheduleMessageUpdateLock scheduleUpdateLock,
     ILogger<JoinSessionHandler> logger)
 {
-    public async Task<SessionInteractionResult> HandleAsync(JoinSessionCommand command, CancellationToken ct)
+    public async Task HandleAsync(JoinSessionCommand command, CancellationToken ct)
     {
         await using var updateLock = await scheduleUpdateLock.AcquireAsync(command.ScheduleMessage, ct);
         await using var connection = await dataSource.OpenConnectionAsync(ct);
@@ -40,19 +35,30 @@ public sealed class JoinSessionHandler(
         {
             // 1. Убеждаемся, что игрок есть в базе
             var platform = command.User.Platform.ToString();
+            var legacyTelegramId = command.User.Platform == PlatformKind.Telegram
+                ? long.Parse(command.User.ExternalUserId, CultureInfo.InvariantCulture)
+                : (long?)null;
+            var legacyTelegramUsername = command.User.Platform == PlatformKind.Telegram
+                ? command.User.ExternalUsername
+                : null;
 
             var playerId = await connection.ExecuteScalarAsync<Guid>(
-                @"INSERT INTO players (display_name, platform, external_user_id, external_username)
-                  VALUES (@Name, @Platform, @ExternalUserId, @ExternalUsername)
+                @"INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
+                  VALUES (@LegacyTelegramId, @Name, @LegacyTelegramUsername, @Platform, @ExternalUserId, @ExternalUsername)
                   ON CONFLICT (platform, external_user_id)
                   WHERE platform IS NOT NULL AND external_user_id IS NOT NULL
                   DO UPDATE
                   SET display_name = EXCLUDED.display_name,
+                      telegram_username = COALESCE(EXCLUDED.telegram_username, players.telegram_username),
+                      platform = EXCLUDED.platform,
+                      external_user_id = EXCLUDED.external_user_id,
                       external_username = EXCLUDED.external_username
                   RETURNING id;",
                 new
                 {
+                    LegacyTelegramId = legacyTelegramId,
                     Name = command.User.DisplayName,
+                    LegacyTelegramUsername = legacyTelegramUsername,
                     Platform = platform,
                     command.User.ExternalUserId,
                     command.User.ExternalUsername
@@ -71,13 +77,15 @@ public sealed class JoinSessionHandler(
             if (batchInfo is null)
             {
                 await transaction.RollbackAsync(ct);
-                return await AnswerAsync(command.InteractionId, "Сессия не найдена.", ct);
+                await AnswerAsync(command.InteractionId, "Сессия не найдена.", ct);
+                return;
             }
 
             if (SessionStatus.IsCancelled(batchInfo.Status))
             {
                 await transaction.RollbackAsync(ct);
-                return await AnswerAsync(command.InteractionId, "Сессия уже отменена.", ct);
+                await AnswerAsync(command.InteractionId, "Сессия уже отменена.", ct);
+                return;
             }
 
             var existingRegistrationStatus = await connection.ExecuteScalarAsync<string?>(
@@ -97,7 +105,8 @@ public sealed class JoinSessionHandler(
                 var alreadyText = existingRegistrationStatus == ParticipantRegistrationStatus.Waitlisted
                     ? "Вы уже в листе ожидания!"
                     : "Вы уже записаны!";
-                return await AnswerAsync(command.InteractionId, alreadyText, ct);
+                await AnswerAsync(command.InteractionId, alreadyText, ct);
+                return;
             }
 
             var activeParticipants = await connection.ExecuteScalarAsync<int>(
@@ -130,7 +139,8 @@ public sealed class JoinSessionHandler(
             if (inserted == 0)
             {
                 await transaction.RollbackAsync(ct);
-                return await AnswerAsync(command.InteractionId, "Вы уже записаны!", ct);
+                await AnswerAsync(command.InteractionId, "Вы уже записаны!", ct);
+                return;
             }
 
             // Загружаем весь батч для перерисовки
@@ -144,7 +154,7 @@ public sealed class JoinSessionHandler(
             var batchParticipants = await connection.QueryAsync<ParticipantBatchDto>(
                 @"SELECT sp.session_id as SessionId,
                          p.display_name as DisplayName,
-                         p.external_username as TelegramUsername,
+                         COALESCE(p.external_username, p.telegram_username) as TelegramUsername,
                          sp.registration_status as RegistrationStatus
                   FROM session_participants sp
                   JOIN players p ON sp.player_id = p.id
@@ -158,20 +168,17 @@ public sealed class JoinSessionHandler(
 
             // 4. Перерисовываем сообщение
             var view = SessionBatchViewBuilder.Build(batchInfo.Title, batchSessions.ToList(), batchParticipants.ToList());
-            if (!command.DeferScheduleUpdate)
-            {
-                await messenger.UpdateScheduleAsync(
-                    new PlatformScheduleMessage(
-                        command.Group,
-                        view,
-                        command.ScheduleMessage),
-                    ct);
-            }
+            await messenger.UpdateScheduleAsync(
+                new PlatformScheduleMessage(
+                    command.Group,
+                    view,
+                    command.ScheduleMessage),
+                ct);
 
             var callbackText = registrationStatus == ParticipantRegistrationStatus.Waitlisted
                 ? "Основной состав заполнен. Вы добавлены в лист ожидания."
                 : "Вы успешно записаны!";
-            return await AnswerAsync(command.InteractionId, callbackText, ct, view);
+            await AnswerAsync(command.InteractionId, callbackText, ct);
         }
         catch (Exception ex)
         {
@@ -184,17 +191,10 @@ public sealed class JoinSessionHandler(
             var errorText = transactionCommitted
                 ? "Регистрация сохранена, но не удалось обновить сообщение расписания."
                 : "Произошла ошибка при регистрации.";
-            return await AnswerAsync(command.InteractionId, errorText, ct);
+            await AnswerAsync(command.InteractionId, errorText, ct);
         }
     }
 
-    private async Task<SessionInteractionResult> AnswerAsync(
-        string interactionId,
-        string text,
-        CancellationToken ct,
-        SessionBatchViewModel? updatedView = null)
-    {
-        await messenger.AnswerInteractionAsync(new PlatformInteractionReply(interactionId, text), ct);
-        return new SessionInteractionResult(text, updatedView);
-    }
+    private Task AnswerAsync(string interactionId, string text, CancellationToken ct) =>
+        messenger.AnswerInteractionAsync(new PlatformInteractionReply(interactionId, text), ct);
 }

src/GmRelay.Shared/Features/Sessions/CreateSession/LeaveSessionHandler.cs

@@ -12,8 +12,7 @@ public sealed record LeaveSessionCommand(
     PlatformUser User,
     string InteractionId,
     PlatformGroup Group,
-    PlatformMessageRef ScheduleMessage,
-    bool DeferScheduleUpdate = false);
+    PlatformMessageRef ScheduleMessage);
 
 internal sealed record LeaveSessionInfoDto(string Title, Guid BatchId, string Status, int? MaxPlayers);
 internal sealed record LeaveSessionParticipantDto(Guid ParticipantRowId, string DisplayName, string RegistrationStatus);
@@ -25,7 +24,7 @@ public sealed class LeaveSessionHandler(
     IScheduleMessageUpdateLock scheduleUpdateLock,
     ILogger<LeaveSessionHandler> logger)
 {
-    public async Task<SessionInteractionResult> HandleAsync(LeaveSessionCommand command, CancellationToken ct)
+    public async Task HandleAsync(LeaveSessionCommand command, CancellationToken ct)
     {
         await using var updateLock = await scheduleUpdateLock.AcquireAsync(command.ScheduleMessage, ct);
         await using var connection = await dataSource.OpenConnectionAsync(ct);
@@ -50,13 +49,15 @@ public sealed class LeaveSessionHandler(
             if (session is null)
             {
                 await transaction.RollbackAsync(ct);
-                return await AnswerAsync(command.InteractionId, "Сессия не найдена.", ct);
+                await AnswerAsync(command.InteractionId, "Сессия не найдена.", ct);
+                return;
             }
 
             if (SessionStatus.IsCancelled(session.Status))
             {
                 await transaction.RollbackAsync(ct);
-                return await AnswerAsync(command.InteractionId, "Сессия уже отменена.", ct);
+                await AnswerAsync(command.InteractionId, "Сессия уже отменена.", ct);
+                return;
             }
 
             var platform = command.User.Platform.ToString();
@@ -80,7 +81,8 @@ public sealed class LeaveSessionHandler(
             if (participant is null)
             {
                 await transaction.RollbackAsync(ct);
-                return await AnswerAsync(command.InteractionId, "Вы не записаны на эту сессию.", ct);
+                await AnswerAsync(command.InteractionId, "Вы не записаны на эту сессию.", ct);
+                return;
             }
 
             await connection.ExecuteAsync(
@@ -173,7 +175,7 @@ public sealed class LeaveSessionHandler(
                 """
                 SELECT sp.session_id AS SessionId,
                        p.display_name AS DisplayName,
-                       p.external_username AS TelegramUsername,
+                       COALESCE(p.external_username, p.telegram_username) AS TelegramUsername,
                        sp.registration_status AS RegistrationStatus
                 FROM session_participants sp
                 JOIN players p ON sp.player_id = p.id
@@ -188,15 +190,12 @@ public sealed class LeaveSessionHandler(
             transactionCommitted = true;
 
             var view = SessionBatchViewBuilder.Build(session.Title, batchSessions, batchParticipants);
-            if (!command.DeferScheduleUpdate)
-            {
-                await messenger.UpdateScheduleAsync(
-                    new PlatformScheduleMessage(
-                        command.Group,
-                        view,
-                        command.ScheduleMessage),
-                    ct);
-            }
+            await messenger.UpdateScheduleAsync(
+                new PlatformScheduleMessage(
+                    command.Group,
+                    view,
+                    command.ScheduleMessage),
+                ct);
 
             var callbackText = participant.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted
                 ? "Вы удалены из листа ожидания."
@@ -204,7 +203,7 @@ public sealed class LeaveSessionHandler(
                     ? "Вы отписались от сессии."
                     : $"Вы отписались от сессии. Место получил(а) {promotedDisplayName}.";
 
-            return await AnswerAsync(command.InteractionId, callbackText, ct, view);
+            await AnswerAsync(command.InteractionId, callbackText, ct);
         }
         catch (Exception ex)
         {
@@ -217,17 +216,10 @@ public sealed class LeaveSessionHandler(
             var errorText = transactionCommitted
                 ? "Запись снята, но не удалось обновить сообщение расписания."
                 : "Произошла ошибка при отмене записи.";
-            return await AnswerAsync(command.InteractionId, errorText, ct);
+            await AnswerAsync(command.InteractionId, errorText, ct);
         }
     }
 
-    private async Task<SessionInteractionResult> AnswerAsync(
-        string interactionId,
-        string text,
-        CancellationToken ct,
-        SessionBatchViewModel? updatedView = null)
-    {
-        await messenger.AnswerInteractionAsync(new PlatformInteractionReply(interactionId, text), ct);
-        return new SessionInteractionResult(text, updatedView);
-    }
+    private Task AnswerAsync(string interactionId, string text, CancellationToken ct) =>
+        messenger.AnswerInteractionAsync(new PlatformInteractionReply(interactionId, text), ct);
 }

src/GmRelay.Shared/Features/Sessions/RescheduleSession/RescheduleVotingFinalizer.cs

@@ -78,8 +78,8 @@ public sealed class RescheduleVotingFinalizer(
             """
             SELECT p.id AS PlayerId,
                    p.display_name AS DisplayName,
-                   p.external_username AS TelegramUsername,
-                   p.external_user_id::BIGINT AS TelegramId
+                   p.telegram_username AS TelegramUsername,
+                   p.telegram_id AS TelegramId
             FROM session_participants sp
             JOIN players p ON p.id = sp.player_id
             WHERE sp.session_id = @SessionId
@@ -107,7 +107,7 @@ public sealed class RescheduleVotingFinalizer(
             SELECT rov.option_id AS OptionId,
                    p.id AS PlayerId,
                    p.display_name AS DisplayName,
-                   p.external_username AS TelegramUsername
+                   p.telegram_username AS TelegramUsername
             FROM reschedule_option_votes rov
             JOIN players p ON p.id = rov.player_id
             WHERE rov.proposal_id = @ProposalId

src/GmRelay.Shared/Infrastructure/Scheduling/SessionSchedulerService.cs

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using GmRelay.Shared.Features.Confirmation.SendConfirmation;
 using GmRelay.Shared.Features.Reminders.SendJoinLink;
 using GmRelay.Shared.Features.Reminders.SendOneHourReminder;
@@ -21,11 +20,6 @@ public sealed class SessionSchedulerService(
     ILogger<SessionSchedulerService> logger) : BackgroundService
 {
     private static readonly TimeSpan TickInterval = TimeSpan.FromMinutes(1);
-    private static readonly TimeSpan BackoffDuration = TimeSpan.FromMinutes(15);
-
-    private readonly ConcurrentDictionary<Guid, DateTimeOffset> _confirmationBackoff = new();
-    private readonly ConcurrentDictionary<Guid, DateTimeOffset> _oneHourBackoff = new();
-    private readonly ConcurrentDictionary<Guid, DateTimeOffset> _joinLinkBackoff = new();
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
@@ -77,30 +71,14 @@ public sealed class SessionSchedulerService(
 
         foreach (var sessionId in sessionIds)
         {
-            if (_confirmationBackoff.TryGetValue(sessionId, out var backoffUntil) && backoffUntil > now)
-            {
-                logger.LogDebug(
-                    "Skipping confirmation for session {SessionId} until {Backoff}",
-                    sessionId,
-                    backoffUntil);
-                continue;
-            }
-
             try
             {
                 await confirmationHandler.HandleAsync(sessionId, ct);
-                _confirmationBackoff.TryRemove(sessionId, out _);
                 logger.LogInformation("Confirmation sent for session {SessionId}", sessionId);
             }
             catch (Exception ex)
             {
-                var nextAttempt = now.Add(BackoffDuration);
-                _confirmationBackoff[sessionId] = nextAttempt;
-                logger.LogError(
-                    ex,
-                    "Failed to send confirmation for session {SessionId}, backing off until {Backoff}",
-                    sessionId,
-                    nextAttempt);
+                logger.LogError(ex, "Failed to send confirmation for session {SessionId}", sessionId);
             }
         }
     }
@@ -120,30 +98,14 @@ public sealed class SessionSchedulerService(
 
         foreach (var sessionId in sessionIds)
         {
-            if (_oneHourBackoff.TryGetValue(sessionId, out var backoffUntil) && backoffUntil > now)
-            {
-                logger.LogDebug(
-                    "Skipping one-hour reminder for session {SessionId} until {Backoff}",
-                    sessionId,
-                    backoffUntil);
-                continue;
-            }
-
             try
             {
                 await oneHourReminderHandler.HandleAsync(sessionId, ct);
-                _oneHourBackoff.TryRemove(sessionId, out _);
                 logger.LogInformation("One-hour reminder processed for session {SessionId}", sessionId);
             }
             catch (Exception ex)
             {
-                var nextAttempt = now.Add(BackoffDuration);
-                _oneHourBackoff[sessionId] = nextAttempt;
-                logger.LogError(
-                    ex,
-                    "Failed to process one-hour reminder for session {SessionId}, backing off until {Backoff}",
-                    sessionId,
-                    nextAttempt);
+                logger.LogError(ex, "Failed to process one-hour reminder for session {SessionId}", sessionId);
             }
         }
     }
@@ -163,30 +125,14 @@ public sealed class SessionSchedulerService(
 
         foreach (var sessionId in sessionIds)
         {
-            if (_joinLinkBackoff.TryGetValue(sessionId, out var backoffUntil) && backoffUntil > now)
-            {
-                logger.LogDebug(
-                    "Skipping join link for session {SessionId} until {Backoff}",
-                    sessionId,
-                    backoffUntil);
-                continue;
-            }
-
             try
             {
                 await joinLinkHandler.HandleAsync(sessionId, ct);
-                _joinLinkBackoff.TryRemove(sessionId, out _);
                 logger.LogInformation("Join link sent for session {SessionId}", sessionId);
             }
             catch (Exception ex)
             {
-                var nextAttempt = now.Add(BackoffDuration);
-                _joinLinkBackoff[sessionId] = nextAttempt;
-                logger.LogError(
-                    ex,
-                    "Failed to send join link for session {SessionId}, backing off until {Backoff}",
-                    sessionId,
-                    nextAttempt);
+                logger.LogError(ex, "Failed to send join link for session {SessionId}", sessionId);
             }
         }
     }

src/GmRelay.Web/Components/Layout/NavMenu.razor

@@ -73,7 +73,7 @@
                     </button>
                 </form>
 
-                <div class="nav-version">v3.1.1</div>
+                <div class="nav-version">v3.0.5</div>
             </div>
         </Authorized>
         <NotAuthorized>

src/GmRelay.Web/Components/Pages/Home.razor

@@ -44,14 +44,9 @@
                     <div class="group-card-icon">🎮</div>
                     <h3 class="group-card-title">@group.Name</h3>
                     <p class="group-card-id">ID: @(group.Platform == "Discord" ? group.ExternalGroupId : group.TelegramChatId.ToString())</p>
-                    <div class="group-card-meta">
-                        <span class="status-badge platform-badge">
-                            @FormatPlatform(group.Platform)
-                        </span>
-                        <span class="status-badge @(group.ManagerRole == GroupManagerRoleExtensions.OwnerValue ? "status-success" : "status-info")">
-                            @FormatRole(group.ManagerRole)
-                        </span>
-                    </div>
+                    <span class="status-badge @(group.ManagerRole == GroupManagerRoleExtensions.OwnerValue ? "status-success" : "status-info")" style="align-self: flex-start; margin-bottom: 1rem;">
+                        @FormatRole(group.ManagerRole)
+                    </span>
                     <a href="/group/@group.Id" class="btn-gm btn-gm-primary" style="width: 100%; justify-content: center; margin-top: auto;">
                         Посмотреть игры →
                     </a>
@@ -86,20 +81,6 @@
         font-family: 'Courier New', monospace;
         margin-bottom: 1rem;
     }
-
-    .group-card-meta {
-        display: flex;
-        flex-wrap: wrap;
-        gap: 0.5rem;
-        align-items: center;
-        margin-bottom: 1rem;
-    }
-
-    .platform-badge {
-        background: rgba(88, 101, 242, 0.15);
-        color: #9ea8ff;
-        border-color: rgba(88, 101, 242, 0.35);
-    }
 </style>
 
 @code {
@@ -123,7 +104,4 @@
 
     private static string FormatRole(string role) =>
         GroupManagerRoleExtensions.FromDatabaseValue(role).ToDisplayName();
-
-    private static string FormatPlatform(string? platform) =>
-        string.Equals(platform, "Discord", StringComparison.OrdinalIgnoreCase) ? "Discord" : "Telegram";
 }

src/GmRelay.Web/Services/CalendarSubscriptionService.cs

@@ -12,8 +12,7 @@ public sealed class CalendarSubscriptionService(NpgsqlDataSource dataSource)
     public string GenerateToken() => Guid.NewGuid().ToString("N");
 
     public async Task<string> CreateSubscriptionAsync(
-        string userPlatform,
-        string userExternalId,
+        long userTelegramId,
         Guid? groupId,
         CalendarSubscriptionFilter filter,
         CancellationToken ct = default)
@@ -21,9 +20,9 @@ public sealed class CalendarSubscriptionService(NpgsqlDataSource dataSource)
         var token = GenerateToken();
         await using var connection = await dataSource.OpenConnectionAsync(ct);
         await connection.ExecuteAsync(
-            @"INSERT INTO calendar_subscriptions (id, token, user_platform, user_external_id, group_id, filter_type, created_at, expires_at)
-              VALUES (gen_random_uuid(), @token, @userPlatform, @userExternalId, @groupId, @filterType, now(), NULL)",
-            new { token, userPlatform, userExternalId, groupId, filterType = (int)filter });
+            @"INSERT INTO calendar_subscriptions (id, token, user_telegram_id, group_id, filter_type, created_at, expires_at)
+              VALUES (gen_random_uuid(), @token, @userTelegramId, @groupId, @filterType, now(), NULL)",
+            new { token, userTelegramId, groupId, filterType = (int)filter });
         return token;
     }
 
@@ -32,7 +31,7 @@ public sealed class CalendarSubscriptionService(NpgsqlDataSource dataSource)
         await using var connection = await dataSource.OpenConnectionAsync(ct);
 
         var subscription = await connection.QueryFirstOrDefaultAsync<SubscriptionRecord>(
-            @"SELECT id, group_id as GroupId, filter_type as FilterType
+            @"SELECT id, user_telegram_id as UserTelegramId, group_id as GroupId, filter_type as FilterType
               FROM calendar_subscriptions
               WHERE token = @token
                 AND (expires_at IS NULL OR expires_at > now())",
@@ -89,6 +88,6 @@ public sealed class CalendarSubscriptionService(NpgsqlDataSource dataSource)
         .Replace("\n", "\\n")
         .Replace("\r", "");
 
-    private sealed record SubscriptionRecord(Guid Id, Guid? GroupId, int FilterType);
+    private sealed record SubscriptionRecord(Guid Id, long UserTelegramId, Guid? GroupId, int FilterType);
     private sealed record CalendarSessionDto(Guid Id, string Title, DateTime ScheduledAt);
 }

src/GmRelay.Web/Services/SessionService.cs

@@ -3,7 +3,6 @@ using GmRelay.Shared.Domain;
 using GmRelay.Shared.Rendering;
 using Npgsql;
 using Telegram.Bot;
-using Telegram.Bot.Exceptions;
 using GmRelay.Web.Services;
 
 namespace GmRelay.Web.Services;
@@ -96,7 +95,6 @@ internal sealed record WebBatchSessionRow(
     string NotificationMode,
     bool TopicCreatedByBot = false);
 internal sealed record WebTemplateGroupDto(long TelegramChatId);
-internal sealed record WebTemplateTopicDestination(int? MessageThreadId, bool TopicCreatedByBot);
 
 public sealed class SessionService(
     NpgsqlDataSource dataSource,
@@ -106,45 +104,24 @@ public sealed class SessionService(
     public async Task<List<WebGameGroup>> GetGroupsForUserAsync(string platform, string externalUserId)
     {
         await using var conn = await dataSource.OpenConnectionAsync();
-        var playerIds = await _ResolveLinkedPlayerIdsAsync(conn, platform, externalUserId);
-        if (playerIds.Length == 0)
+        var effectiveId = await _ResolveEffectivePlayerIdAsync(conn, platform, externalUserId);
+        if (effectiveId is null)
             return [];
 
         return (await conn.QueryAsync<WebGameGroup>(
             """
-            WITH visible_groups AS (
-                SELECT gm.group_id,
-                       CASE
-                           WHEN bool_or(gm.role = @OwnerRole) THEN @OwnerRole
-                           ELSE @CoGmRole
-                       END AS ManagerRole
-                FROM group_managers gm
-                WHERE gm.player_id = ANY(@PlayerIds)
-                GROUP BY gm.group_id
-            )
             SELECT g.id,
-                   g.external_group_id::BIGINT AS TelegramChatId,
+                   g.telegram_chat_id AS TelegramChatId,
                    g.external_group_id AS ExternalGroupId,
-                   COALESCE(NULLIF(g.name, g.external_group_id), latest_session.title, g.name) AS Name,
+                   g.name,
                    g.platform AS Platform,
-                   vg.ManagerRole
-            FROM visible_groups vg
-            JOIN game_groups g ON g.id = vg.group_id
-            LEFT JOIN LATERAL (
-                SELECT s.title
-                FROM sessions s
-                WHERE s.group_id = g.id
-                ORDER BY s.scheduled_at DESC
-                LIMIT 1
-            ) latest_session ON true
+                   gm.role AS ManagerRole
+            FROM group_managers gm
+            JOIN game_groups g ON g.id = gm.group_id
+            WHERE gm.player_id = @PlayerId
             ORDER BY g.name
             """,
-            new
-            {
-                PlayerIds = playerIds,
-                OwnerRole = GroupManagerRoleExtensions.OwnerValue,
-                CoGmRole = GroupManagerRoleExtensions.CoGmValue
-            })).ToList();
+            new { PlayerId = effectiveId.Value })).ToList();
     }
 
     public async Task<WebGameGroup?> GetGroupAsync(Guid groupId)
@@ -153,19 +130,12 @@ public sealed class SessionService(
         return await conn.QuerySingleOrDefaultAsync<WebGameGroup>(
             """
             SELECT g.id,
-                   g.external_group_id::BIGINT AS TelegramChatId,
+                   g.telegram_chat_id AS TelegramChatId,
                    g.external_group_id AS ExternalGroupId,
-                   COALESCE(NULLIF(g.name, g.external_group_id), latest_session.title, g.name) AS Name,
+                   g.name,
                    g.platform AS Platform,
                    @OwnerRole AS ManagerRole
             FROM game_groups g
-            LEFT JOIN LATERAL (
-                SELECT s.title
-                FROM sessions s
-                WHERE s.group_id = g.id
-                ORDER BY s.scheduled_at DESC
-                LIMIT 1
-            ) latest_session ON true
             WHERE g.id = @GroupId
             """,
             new { GroupId = groupId, OwnerRole = GroupManagerRoleExtensions.OwnerValue });
@@ -174,8 +144,8 @@ public sealed class SessionService(
     public async Task<bool> IsGroupManagerAsync(Guid groupId, string platform, string externalUserId)
     {
         await using var conn = await dataSource.OpenConnectionAsync();
-        var playerIds = await _ResolveLinkedPlayerIdsAsync(conn, platform, externalUserId);
-        if (playerIds.Length == 0)
+        var effectiveId = await _ResolveEffectivePlayerIdAsync(conn, platform, externalUserId);
+        if (effectiveId is null)
             return false;
 
         return await conn.ExecuteScalarAsync<bool>(
@@ -184,17 +154,17 @@ public sealed class SessionService(
                 SELECT 1
                 FROM group_managers
                 WHERE group_id = @GroupId
-                  AND player_id = ANY(@PlayerIds)
+                  AND player_id = @PlayerId
             )
             """,
-            new { GroupId = groupId, PlayerIds = playerIds });
+            new { GroupId = groupId, PlayerId = effectiveId.Value });
     }
 
     public async Task<bool> IsGroupOwnerAsync(Guid groupId, string platform, string externalUserId)
     {
         await using var conn = await dataSource.OpenConnectionAsync();
-        var playerIds = await _ResolveLinkedPlayerIdsAsync(conn, platform, externalUserId);
-        if (playerIds.Length == 0)
+        var effectiveId = await _ResolveEffectivePlayerIdAsync(conn, platform, externalUserId);
+        if (effectiveId is null)
             return false;
 
         return await conn.ExecuteScalarAsync<bool>(
@@ -203,11 +173,11 @@ public sealed class SessionService(
                 SELECT 1
                 FROM group_managers
                 WHERE group_id = @GroupId
-                  AND player_id = ANY(@PlayerIds)
+                  AND player_id = @PlayerId
                   AND role = @OwnerRole
             )
             """,
-            new { GroupId = groupId, PlayerIds = playerIds, OwnerRole = GroupManagerRoleExtensions.OwnerValue });
+            new { GroupId = groupId, PlayerId = effectiveId.Value, OwnerRole = GroupManagerRoleExtensions.OwnerValue });
     }
 
     public async Task<List<WebGroupManager>> GetGroupManagersAsync(Guid groupId)
@@ -215,11 +185,11 @@ public sealed class SessionService(
         await using var conn = await dataSource.OpenConnectionAsync();
         return (await conn.QueryAsync<WebGroupManager>(
             """
-            SELECT COALESCE(p.external_user_id::BIGINT, 0) AS TelegramId,
-                   p.external_user_id AS ExternalUserId,
+            SELECT COALESCE(p.telegram_id, 0) AS TelegramId,
+                   COALESCE(p.external_user_id, p.telegram_id::TEXT) AS ExternalUserId,
                    p.display_name AS DisplayName,
-                   p.external_username AS TelegramUsername,
-                   p.external_username AS ExternalUsername,
+                   p.telegram_username AS TelegramUsername,
+                   COALESCE(p.external_username, p.telegram_username) AS ExternalUsername,
                    gm.role AS Role,
                    gm.created_at AS AddedAt
             FROM group_managers gm
@@ -240,7 +210,7 @@ public sealed class SessionService(
             SELECT
                 p.id AS PlayerId,
                 p.display_name AS DisplayName,
-                p.external_username AS ExternalUsername,
+                COALESCE(p.external_username, p.telegram_username) AS ExternalUsername,
                 COUNT(DISTINCT s.id) AS TotalSessions,
                 COUNT(DISTINCT CASE WHEN sp.rsvp_status = 'Confirmed' THEN s.id END) AS ConfirmedCount,
                 COUNT(DISTINCT CASE WHEN sp.rsvp_status = 'Declined' THEN s.id END) AS DeclinedCount,
@@ -259,7 +229,7 @@ public sealed class SessionService(
             WHERE s.group_id = @GroupId
               AND s.scheduled_at <= now()
               AND sp.is_gm = false
-            GROUP BY p.id, p.display_name, p.external_username
+            GROUP BY p.id, p.display_name, p.external_username, p.telegram_username
             ORDER BY AttendanceRate DESC, ConfirmedCount DESC
             """,
             new { GroupId = groupId })).ToList();
@@ -358,7 +328,7 @@ public sealed class SessionService(
         return (await conn.QueryAsync<WebSession>(
             @"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
                      s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
-                     g.external_group_id::BIGINT AS TelegramChatId,
+                     g.telegram_chat_id AS TelegramChatId,
                      s.max_players AS MaxPlayers,
                      COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
                      COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount,
@@ -396,7 +366,7 @@ public sealed class SessionService(
         return await conn.QuerySingleOrDefaultAsync<WebSession>(
             @"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
                      s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
-                     g.external_group_id::BIGINT AS TelegramChatId,
+                     g.telegram_chat_id AS TelegramChatId,
                      s.max_players AS MaxPlayers,
                      COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
                      COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount,
@@ -455,7 +425,7 @@ public sealed class SessionService(
         var oldSession = await conn.QuerySingleOrDefaultAsync<WebSession>(
             @"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
                      s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
-                     g.external_group_id::BIGINT AS TelegramChatId,
+                     g.telegram_chat_id AS TelegramChatId,
                      s.max_players AS MaxPlayers,
                      0 AS ActivePlayerCount,
                      0 AS WaitlistedPlayerCount,
@@ -541,7 +511,7 @@ public sealed class SessionService(
         var session = await conn.QuerySingleOrDefaultAsync<WebSession>(
             @"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
                      s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
-                     g.external_group_id::BIGINT AS TelegramChatId,
+                     g.telegram_chat_id AS TelegramChatId,
                      s.max_players AS MaxPlayers,
                      0 AS ActivePlayerCount,
                      0 AS WaitlistedPlayerCount,
@@ -640,11 +610,11 @@ public sealed class SessionService(
         return (await conn.QueryAsync<WebParticipant>(
             """
             SELECT sp.id AS Id,
-                   COALESCE(p.external_user_id::BIGINT, 0) AS TelegramId,
-                   p.external_user_id AS ExternalUserId,
+                   COALESCE(p.telegram_id, 0) AS TelegramId,
+                   COALESCE(p.external_user_id, p.telegram_id::TEXT) AS ExternalUserId,
                    p.display_name AS DisplayName,
-                   p.external_username AS TelegramUsername,
-                   p.external_username AS ExternalUsername,
+                   p.telegram_username AS TelegramUsername,
+                   COALESCE(p.external_username, p.telegram_username) AS ExternalUsername,
                    sp.rsvp_status AS RsvpStatus,
                    sp.registration_status AS RegistrationStatus,
                    sp.is_gm AS IsGm,
@@ -667,7 +637,7 @@ public sealed class SessionService(
         var session = await conn.QuerySingleOrDefaultAsync<WebSession>(
             @"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
                      s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
-                     g.external_group_id::BIGINT AS TelegramChatId,
+                     g.telegram_chat_id AS TelegramChatId,
                      s.max_players AS MaxPlayers,
                      0 AS ActivePlayerCount,
                      0 AS WaitlistedPlayerCount,
@@ -688,9 +658,9 @@ public sealed class SessionService(
         var participant = await conn.QuerySingleOrDefaultAsync<WebParticipant>(
             """
             SELECT sp.id AS Id,
-                   p.external_user_id::BIGINT AS TelegramId,
+                   p.telegram_id AS TelegramId,
                    p.display_name AS DisplayName,
-                   p.external_username AS TelegramUsername,
+                   p.telegram_username AS TelegramUsername,
                    sp.rsvp_status AS RsvpStatus,
                    sp.registration_status AS RegistrationStatus,
                    sp.is_gm AS IsGm,
@@ -873,7 +843,7 @@ public sealed class SessionService(
                    s.status AS Status,
                    s.max_players AS MaxPlayers,
                    s.batch_message_id AS BatchMessageId,
-                   g.external_group_id::BIGINT AS TelegramChatId,
+                   g.telegram_chat_id AS TelegramChatId,
                    s.thread_id AS ThreadId,
                    s.topic_created_by_bot AS TopicCreatedByBot,
                    s.notification_mode AS NotificationMode
@@ -957,7 +927,7 @@ public sealed class SessionService(
                    s.status AS Status,
                    s.max_players AS MaxPlayers,
                    s.batch_message_id AS BatchMessageId,
-                   g.external_group_id::BIGINT AS TelegramChatId,
+                   g.telegram_chat_id AS TelegramChatId,
                    s.thread_id AS ThreadId,
                    s.topic_created_by_bot AS TopicCreatedByBot,
                    s.notification_mode AS NotificationMode
@@ -1179,7 +1149,7 @@ public sealed class SessionService(
         }
 
         var group = await conn.QuerySingleOrDefaultAsync<WebTemplateGroupDto>(
-            "SELECT external_group_id::BIGINT AS TelegramChatId FROM game_groups WHERE id = @GroupId",
+            "SELECT telegram_chat_id AS TelegramChatId FROM game_groups WHERE id = @GroupId",
             new { GroupId = groupId },
             transaction);
 
@@ -1188,10 +1158,6 @@ public sealed class SessionService(
             throw new SessionAccessDeniedException(groupId, "0");
         }
 
-        var topicDestination = await ResolveTemplateBatchTopicAsync(group.TelegramChatId, template.Title);
-        var messageThreadId = topicDestination.MessageThreadId;
-        var topicCreatedByBot = topicDestination.TopicCreatedByBot;
-
         var schedule = BatchSchedulePlanner.BuildRecurringSchedule(
             firstScheduledAt,
             template.SessionCount,
@@ -1203,8 +1169,8 @@ public sealed class SessionService(
         {
             var sessionId = await conn.ExecuteScalarAsync<Guid>(
                 """
-                INSERT INTO sessions (batch_id, group_id, title, join_link, scheduled_at, status, thread_id, topic_created_by_bot, max_players, notification_mode)
-                VALUES (@BatchId, @GroupId, @Title, @JoinLink, @ScheduledAt, @Status, @ThreadId, @TopicCreatedByBot, @MaxPlayers, @NotificationMode)
+                INSERT INTO sessions (batch_id, group_id, title, join_link, scheduled_at, status, max_players, notification_mode)
+                VALUES (@BatchId, @GroupId, @Title, @JoinLink, @ScheduledAt, @Status, @MaxPlayers, @NotificationMode)
                 RETURNING id
                 """,
                 new
@@ -1215,8 +1181,6 @@ public sealed class SessionService(
                     template.JoinLink,
                     ScheduledAt = scheduledAt,
                     Status = SessionStatus.Planned,
-                    ThreadId = messageThreadId,
-                    TopicCreatedByBot = topicCreatedByBot,
                     template.MaxPlayers,
                     template.NotificationMode
                 },
@@ -1231,7 +1195,6 @@ public sealed class SessionService(
         var renderResult = TelegramSessionBatchRenderer.Render(view);
         var batchMessage = await bot.SendMessage(
             chatId: group.TelegramChatId,
-            messageThreadId: messageThreadId,
             text: renderResult.Text,
             parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
             replyMarkup: renderResult.Markup);
@@ -1251,41 +1214,13 @@ public sealed class SessionService(
             template.NotificationMode);
     }
 
-    private async Task<WebTemplateTopicDestination> ResolveTemplateBatchTopicAsync(long telegramChatId, string title)
-    {
-        var chat = await bot.GetChat(chatId: telegramChatId);
-        if (!chat.IsForum)
-        {
-            return new WebTemplateTopicDestination(null, TopicCreatedByBot: false);
-        }
-
-        try
-        {
-            var topic = await bot.CreateForumTopic(
-                chatId: telegramChatId,
-                name: $"🎲 Игры: {title}");
-            return new WebTemplateTopicDestination(topic.MessageThreadId, TopicCreatedByBot: true);
-        }
-        catch (ApiRequestException ex) when (IsMissingForumTopicRightsError(ex.Message))
-        {
-            throw new InvalidOperationException(
-                "Не удалось создать Telegram topic. Сделайте бота admin и включите право Manage Topics, затем повторите действие.",
-                ex);
-        }
-    }
-
-    private static bool IsMissingForumTopicRightsError(string apiError) =>
-        apiError.Contains("not enough rights", StringComparison.OrdinalIgnoreCase) ||
-        apiError.Contains("CHAT_ADMIN_REQUIRED", StringComparison.OrdinalIgnoreCase) ||
-        apiError.Contains("not an administrator", StringComparison.OrdinalIgnoreCase);
-
     private async Task<List<WebDirectNotificationRecipient>> LoadSessionDirectRecipientsAsync(
         Npgsql.NpgsqlConnection conn,
         Guid sessionId)
     {
         return (await conn.QueryAsync<WebDirectNotificationRecipient>(
             """
-            SELECT p.external_user_id::BIGINT AS TelegramId,
+            SELECT p.telegram_id AS TelegramId,
                    p.display_name AS DisplayName
             FROM session_participants sp
             JOIN players p ON p.id = sp.player_id
@@ -1302,7 +1237,7 @@ public sealed class SessionService(
     {
         return (await conn.QueryAsync<WebDirectNotificationRecipient>(
             """
-            SELECT DISTINCT p.external_user_id::BIGINT AS TelegramId,
+            SELECT DISTINCT p.telegram_id AS TelegramId,
                             p.display_name AS DisplayName
             FROM session_participants sp
             JOIN players p ON p.id = sp.player_id
@@ -1355,7 +1290,7 @@ public sealed class SessionService(
             var participants = (await conn.QueryAsync<ParticipantBatchDto>(
                 @"SELECT sp.session_id AS SessionId,
                          p.display_name AS DisplayName,
-                         p.external_username AS TelegramUsername,
+                         p.telegram_username AS TelegramUsername,
                          sp.registration_status AS RegistrationStatus
                   FROM session_participants sp
                   JOIN players p ON sp.player_id = p.id
@@ -1392,7 +1327,7 @@ public sealed class SessionService(
                    s.group_id AS GroupId,
                    (array_agg(s.title ORDER BY s.scheduled_at))[1] AS Title,
                    (array_agg(s.join_link ORDER BY s.scheduled_at))[1] AS JoinLink,
-                   g.external_group_id::BIGINT AS TelegramChatId,
+                   g.telegram_chat_id AS TelegramChatId,
                    (array_agg(s.batch_message_id ORDER BY s.scheduled_at))[1] AS BatchMessageId,
                    (array_agg(s.thread_id ORDER BY s.scheduled_at))[1] AS ThreadId,
                    (array_agg(s.notification_mode ORDER BY s.scheduled_at))[1] AS NotificationMode
@@ -1400,7 +1335,7 @@ public sealed class SessionService(
             JOIN game_groups g ON g.id = s.group_id
             WHERE s.batch_id = @BatchId
               AND s.group_id = @GroupId
-            GROUP BY s.batch_id, s.group_id, g.external_group_id
+            GROUP BY s.batch_id, s.group_id, g.telegram_chat_id
             """,
             new { BatchId = batchId, GroupId = groupId },
             transaction);
@@ -1626,23 +1561,6 @@ public sealed class SessionService(
         return primaryId ?? playerId;
     }
 
-    private static async Task<Guid[]> _ResolveLinkedPlayerIdsAsync(NpgsqlConnection conn, string platform, string externalUserId)
-    {
-        var effectiveId = await _ResolveEffectivePlayerIdAsync(conn, platform, externalUserId);
-        if (effectiveId is null)
-            return [];
-
-        return (await conn.QueryAsync<Guid>(
-            """
-            SELECT @EffectiveId
-            UNION
-            SELECT secondary_player_id
-            FROM player_links
-            WHERE primary_player_id = @EffectiveId
-            """,
-            new { EffectiveId = effectiveId.Value })).ToArray();
-    }
-
     private static async Task<Guid> _UpsertPlayerAndGetIdAsync(
         NpgsqlConnection conn, string platform, string externalUserId,
         string displayName, string? avatarUrl, NpgsqlTransaction? transaction)

tests/GmRelay.Bot.Tests/Discord/DiscordListSessionsHandlerTests.cs

@@ -33,17 +33,7 @@ public sealed class DiscordListSessionsHandlerTests
 
         Assert.Contains("platform = 'Discord'", handler, StringComparison.Ordinal);
         Assert.Contains("external_group_id = @GuildId", handler, StringComparison.Ordinal);
-        Assert.Contains("scheduled_at > now() - interval '4 hours'", handler, StringComparison.Ordinal);
-    }
-
-    [Fact]
-    public void Handler_ShouldIncludeRecentlyStartedSessionsForCleanup()
-    {
-        var repoRoot = GetRepoRoot();
-        var handlerPath = Path.Combine(repoRoot, "src", "GmRelay.DiscordBot", "Features", "Sessions", "DiscordListSessionsHandler.cs");
-        var handler = File.ReadAllText(handlerPath);
-
-        Assert.Contains("now() - interval '4 hours'", handler, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("scheduled_at > NOW()", handler, StringComparison.Ordinal);
     }
 
     [Fact]
@@ -57,17 +47,6 @@ public sealed class DiscordListSessionsHandlerTests
         Assert.DoesNotContain("telegram_id", handler, StringComparison.Ordinal);
     }
 
-    [Fact]
-    public void Handler_ShouldExposeDeleteActionForManagers()
-    {
-        var repoRoot = GetRepoRoot();
-        var handlerPath = Path.Combine(repoRoot, "src", "GmRelay.DiscordBot", "Features", "Sessions", "DiscordListSessionsHandler.cs");
-        var handler = File.ReadAllText(handlerPath);
-
-        Assert.Contains("delete_session", handler, StringComparison.Ordinal);
-        Assert.Contains("CanManageSchedule", handler, StringComparison.Ordinal);
-    }
-
     [Fact]
     public void Command_ShouldExist()
     {
@@ -87,18 +66,4 @@ public sealed class DiscordListSessionsHandlerTests
         Assert.Contains("SlashCommand", command, StringComparison.Ordinal);
         Assert.Contains("listsessions", command, StringComparison.Ordinal);
     }
-
-    [Fact]
-    public void DeleteHandler_ShouldDeleteOnlySessionsFromTheInteractionGuild()
-    {
-        var repoRoot = GetRepoRoot();
-        var handlerPath = Path.Combine(repoRoot, "src", "GmRelay.DiscordBot", "Features", "Sessions", "DiscordDeleteSessionHandler.cs");
-
-        Assert.True(File.Exists(handlerPath), "DiscordDeleteSessionHandler should exist.");
-
-        var handler = File.ReadAllText(handlerPath);
-        Assert.Contains("DELETE FROM sessions", handler, StringComparison.Ordinal);
-        Assert.Contains("external_group_id = @GuildId", handler, StringComparison.Ordinal);
-        Assert.Contains("CanManageSchedule", handler, StringComparison.Ordinal);
-    }
 }

tests/GmRelay.Bot.Tests/Discord/DiscordNewSessionHandlerTests.cs

@@ -17,17 +17,6 @@ public sealed class DiscordNewSessionHandlerTests
 
     // --- Runtime tests for ParseTimeInput (static, no DB) ---
 
-    [Fact]
-    public void ParseTimeInput_ShouldTreatInputAsMoscowTime()
-    {
-        var result = DiscordNewSessionHandler.ParseTimeInput("2026-06-01 15:00");
-        Assert.True(result.IsSuccess);
-        // 15:00 MSK = 12:00 UTC
-        Assert.Equal(12, result.Value.Hour);
-        Assert.Equal(0, result.Value.Minute);
-        Assert.Equal(TimeSpan.Zero, result.Value.Offset);
-    }
-
     [Fact]
     public void ParseTimeInput_ShouldParseDiscordDateFormat()
     {
@@ -39,8 +28,7 @@ public sealed class DiscordNewSessionHandlerTests
         Assert.Equal(expected.Year, result.Value.Year);
         Assert.Equal(expected.Month, result.Value.Month);
         Assert.Equal(expected.Day, result.Value.Day);
-        // Input is treated as Moscow time; 19:30 MSK = 16:30 UTC
-        Assert.Equal(16, result.Value.Hour);
+        Assert.Equal(19, result.Value.Hour);
         Assert.Equal(30, result.Value.Minute);
     }
 
@@ -139,18 +127,6 @@ public sealed class DiscordNewSessionHandlerTests
         Assert.Contains("RollbackAsync", source, StringComparison.Ordinal);
     }
 
-    [Fact]
-    public void Handler_ShouldNotRollbackCommittedTransactionAfterPostCommitFailure()
-    {
-        var repoRoot = GetRepoRoot();
-        var handlerPath = Path.Combine(repoRoot, "src", "GmRelay.DiscordBot", "Features", "Sessions", "DiscordNewSessionHandler.cs");
-        var source = File.ReadAllText(handlerPath);
-
-        Assert.Contains("transactionCommitted = false", source, StringComparison.Ordinal);
-        Assert.Contains("transactionCommitted = true", source, StringComparison.Ordinal);
-        Assert.Contains("if (!transactionCommitted)", source, StringComparison.Ordinal);
-    }
-
     [Fact]
     public void Handler_ShouldRespectCancellationToken()
     {
@@ -169,30 +145,7 @@ public sealed class DiscordNewSessionHandlerTests
         var source = File.ReadAllText(commandPath);
 
         Assert.Contains("DiscordSessionBatchRenderer.Render", source, StringComparison.Ordinal);
-        Assert.Contains("message.Embeds = embeds", source, StringComparison.Ordinal);
-    }
-
-    [Fact]
-    public void Handler_ShouldLeaveScheduleMessageCreationToInteractionResponse()
-    {
-        var repoRoot = GetRepoRoot();
-        var handlerPath = Path.Combine(repoRoot, "src", "GmRelay.DiscordBot", "Features", "Sessions", "DiscordNewSessionHandler.cs");
-        var source = File.ReadAllText(handlerPath);
-
-        Assert.DoesNotContain("SendScheduleAsync", source, StringComparison.Ordinal);
-        Assert.DoesNotContain("PlatformScheduleMessage", source, StringComparison.Ordinal);
-    }
-
-    [Fact]
-    public void Handler_ShouldStoreReadableDiscordGroupNameForWebCards()
-    {
-        var repoRoot = GetRepoRoot();
-        var handlerPath = Path.Combine(repoRoot, "src", "GmRelay.DiscordBot", "Features", "Sessions", "DiscordNewSessionHandler.cs");
-        var source = File.ReadAllText(handlerPath);
-
-        Assert.Contains("groupName", source, StringComparison.Ordinal);
-        Assert.Contains("displayGroupName", source, StringComparison.Ordinal);
-        Assert.Contains("VALUES (@GroupName, 'Discord'", source, StringComparison.Ordinal);
+        Assert.Contains("WithEmbeds", source, StringComparison.Ordinal);
     }
 
     private static DateTimeOffset FutureDateAt1930()

tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs

@@ -40,7 +40,6 @@ public sealed class DiscordProjectStructureTests
         Assert.Contains("GmRelay.Shared.csproj", project);
         Assert.DoesNotContain("Telegram.Bot", project);
         Assert.DoesNotContain("GmRelay.Bot.csproj", project);
-        Assert.Contains("Dapper.AOT", project);
     }
 
     [Fact]
@@ -62,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.1.1", 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);
@@ -76,13 +75,13 @@ public sealed class DiscordProjectStructureTests
     {
         var repoRoot = GetRepoRoot();
 
-        Assert.Contains("<Version>3.1.1</Version>", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props")));
-        Assert.Contains("VERSION: 3.1.1", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")));
-        Assert.Contains("gmrelay-bot:3.1.1", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
-        Assert.Contains("gmrelay-web:3.1.1", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
-        Assert.Contains("gmrelay-discord-bot:3.1.1", 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.1.1",
+            "v3.0.5",
             File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor")));
     }
 

tests/GmRelay.Bot.Tests/Discord/DiscordSessionInteractionModuleSourceTests.cs

@@ -21,26 +21,6 @@ public sealed class DiscordSessionInteractionModuleSourceTests
         Assert.Contains("MessageFlags.Ephemeral", source, StringComparison.Ordinal);
     }
 
-    [Fact]
-    public async Task Module_ShouldUpdateSourceScheduleMessageThroughComponentInteraction()
-    {
-        var source = await ReadRepositoryFileAsync("src/GmRelay.DiscordBot/Features/Sessions/DiscordSessionInteractionModule.cs");
-
-        Assert.Contains("InteractionCallback.DeferredModifyMessage", source, StringComparison.Ordinal);
-        Assert.Contains("DiscordSessionBatchRenderer.Render", source, StringComparison.Ordinal);
-        Assert.Contains("FollowupAsync", source, StringComparison.Ordinal);
-        Assert.Contains("CompleteScheduleUpdateResponseAsync", source, StringComparison.Ordinal);
-    }
-
-    [Fact]
-    public async Task Module_ShouldRouteDeleteSessionButtons()
-    {
-        var source = await ReadRepositoryFileAsync("src/GmRelay.DiscordBot/Features/Sessions/DiscordSessionInteractionModule.cs");
-
-        Assert.Contains("[ComponentInteraction(\"delete_session\")]", source, StringComparison.Ordinal);
-        Assert.Contains("DiscordDeleteSessionHandler", source, StringComparison.Ordinal);
-    }
-
     [Fact]
     public async Task Module_ShouldRouteRsvpButtonsToNeutralHandler()
     {

tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionCommandTests.cs

@@ -13,7 +13,6 @@ public sealed class PlatformNeutralSessionInteractionCommandTests
         AssertProperty<JoinSessionCommand>("InteractionId", typeof(string));
         AssertProperty<JoinSessionCommand>("Group", typeof(PlatformGroup));
         AssertProperty<JoinSessionCommand>("ScheduleMessage", typeof(PlatformMessageRef));
-        AssertProperty<JoinSessionCommand>("DeferScheduleUpdate", typeof(bool));
         AssertNoTelegramSpecificProperties<JoinSessionCommand>();
     }
 
@@ -25,29 +24,12 @@ public sealed class PlatformNeutralSessionInteractionCommandTests
         AssertProperty<LeaveSessionCommand>("InteractionId", typeof(string));
         AssertProperty<LeaveSessionCommand>("Group", typeof(PlatformGroup));
         AssertProperty<LeaveSessionCommand>("ScheduleMessage", typeof(PlatformMessageRef));
-        AssertProperty<LeaveSessionCommand>("DeferScheduleUpdate", typeof(bool));
         AssertNoTelegramSpecificProperties<LeaveSessionCommand>();
     }
 
-    [Fact]
-    public void SessionInteractionResult_ShouldExposeReplyTextAndUpdatedView()
-    {
-        var resultType = typeof(JoinSessionCommand).Assembly.GetType(
-            "GmRelay.Shared.Features.Sessions.CreateSession.SessionInteractionResult");
-
-        Assert.NotNull(resultType);
-        AssertProperty(resultType, "ReplyText", typeof(string));
-        AssertProperty(resultType, "UpdatedView", typeof(GmRelay.Shared.Rendering.SessionBatchViewModel));
-    }
-
     private static void AssertProperty<T>(string name, Type expectedType)
     {
-        AssertProperty(typeof(T), name, expectedType);
-    }
-
-    private static void AssertProperty(Type type, string name, Type expectedType)
-    {
-        var property = Assert.Single(type.GetProperties(), property => property.Name == name);
+        var property = Assert.Single(typeof(T).GetProperties(), property => property.Name == name);
 
         Assert.Equal(expectedType, property.PropertyType);
     }

tests/GmRelay.Bot.Tests/Infrastructure/Database/PlatformIdentityMigrationTests.cs

@@ -91,15 +91,6 @@ public sealed class PlatformIdentityMigrationTests
         Assert.Contains("platform", service, StringComparison.Ordinal);
     }
 
-    [Fact]
-    public async Task WebSessionService_ShouldAuthorizeGroupsAcrossLinkedIdentities()
-    {
-        var service = await ReadRepositoryFileAsync("src/GmRelay.Web/Services/SessionService.cs");
-
-        Assert.Contains("_ResolveLinkedPlayerIdsAsync", service, StringComparison.Ordinal);
-        Assert.Contains("player_id = ANY(@PlayerIds)", service, StringComparison.Ordinal);
-    }
-
     [Fact]
     public async Task AttendanceStatsFunction_ShouldReferenceExternalUsername()
     {
@@ -117,28 +108,6 @@ public sealed class PlatformIdentityMigrationTests
         Assert.Contains("telegram_id DROP NOT NULL", migration, StringComparison.Ordinal);
     }
 
-    [Fact]
-    public async Task MigrationV024_ShouldDeprecateTelegramColumns()
-    {
-        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V024__deprecate_telegram_columns.sql");
-
-        Assert.Contains("UPDATE players", migration, StringComparison.Ordinal);
-        Assert.Contains("UPDATE game_groups", migration, StringComparison.Ordinal);
-        Assert.Contains("DEPRECATED", migration, StringComparison.Ordinal);
-        Assert.Contains("calendar_subscriptions", migration, StringComparison.Ordinal);
-        Assert.Contains("user_platform", migration, StringComparison.Ordinal);
-        Assert.Contains("user_external_id", migration, StringComparison.Ordinal);
-    }
-
-    [Fact]
-    public async Task MigrationV025_ShouldBackfillRescheduleProposals()
-    {
-        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V025__reschedule_proposals_telegram_external.sql");
-
-        Assert.Contains("reschedule_proposals", migration, StringComparison.Ordinal);
-        Assert.Contains("proposed_by_external_user_id", migration, StringComparison.Ordinal);
-    }
-
     private static async Task<string> ReadRepositoryFileAsync(string relativePath)
     {
         var directory = new DirectoryInfo(AppContext.BaseDirectory);

tests/GmRelay.Bot.Tests/Infrastructure/Scheduling/SessionSchedulerServiceTests.cs

@@ -149,68 +149,6 @@ public sealed class SessionSchedulerServiceTests
         Assert.Null(ex);
     }
 
-    [Fact]
-    public async Task TickAsync_WhenHandlerThrows_BackoffsForDuration()
-    {
-        var sessionId = Guid.NewGuid();
-        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
-        _clock.UtcNow = now;
-        _store.SessionsNeedingConfirmation = [sessionId];
-        _confirmationHandler.ThrowFor.Add(sessionId);
-
-        var sut = CreateSut();
-        await sut.TickAsync(CancellationToken.None);
-        Assert.Single(_confirmationHandler.Calls);
-
-        // Second tick immediately — should be backed off
-        await sut.TickAsync(CancellationToken.None);
-        Assert.Single(_confirmationHandler.Calls);
-    }
-
-    [Fact]
-    public async Task TickAsync_WhenHandlerThrows_AfterBackoffRetriesAgain()
-    {
-        var sessionId = Guid.NewGuid();
-        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
-        _clock.UtcNow = now;
-        _store.SessionsNeedingConfirmation = [sessionId];
-        _confirmationHandler.ThrowFor.Add(sessionId);
-
-        var sut = CreateSut();
-        await sut.TickAsync(CancellationToken.None);
-        Assert.Single(_confirmationHandler.Calls);
-
-        // Advance clock past backoff duration (15 min)
-        _clock.UtcNow = now.AddMinutes(16);
-        await sut.TickAsync(CancellationToken.None);
-        Assert.Equal(2, _confirmationHandler.Calls.Count);
-    }
-
-    [Fact]
-    public async Task TickAsync_WhenHandlerSucceedsAfterBackoff_ClearsBackoff()
-    {
-        var sessionId = Guid.NewGuid();
-        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
-        _clock.UtcNow = now;
-        _store.SessionsNeedingConfirmation = [sessionId];
-        _confirmationHandler.ThrowFor.Add(sessionId);
-
-        var sut = CreateSut();
-        await sut.TickAsync(CancellationToken.None);
-        Assert.Single(_confirmationHandler.Calls);
-
-        // Remove throw condition, advance past backoff
-        _confirmationHandler.ThrowFor.Remove(sessionId);
-        _clock.UtcNow = now.AddMinutes(16);
-        await sut.TickAsync(CancellationToken.None);
-        Assert.Equal(2, _confirmationHandler.Calls.Count);
-
-        // Next tick should still call because backoff was cleared on success
-        _clock.UtcNow = now.AddMinutes(17);
-        await sut.TickAsync(CancellationToken.None);
-        Assert.Equal(3, _confirmationHandler.Calls.Count);
-    }
-
     private sealed class FakeSendConfirmationHandler : ISendConfirmationHandler
     {
         public List<Guid> Calls { get; } = [];

tests/GmRelay.Bot.Tests/Infrastructure/Telegram/TelegramTopicIntegrationSmokeTests.cs

@@ -60,19 +60,6 @@ public sealed class TelegramTopicIntegrationSmokeTests
         Assert.Contains("ExternalThreadId", telegramMessenger, StringComparison.Ordinal);
     }
 
-    [Fact]
-    public async Task WebTemplateBatches_ShouldCreateAndPersistForumTopic()
-    {
-        var sessionService = await ReadRepositoryFileAsync("src/GmRelay.Web/Services/SessionService.cs");
-
-        Assert.Contains("GetChat", sessionService, StringComparison.Ordinal);
-        Assert.Contains("CreateForumTopic", sessionService, StringComparison.Ordinal);
-        Assert.Contains("thread_id, topic_created_by_bot", sessionService, StringComparison.Ordinal);
-        Assert.Contains("ThreadId = messageThreadId", sessionService, StringComparison.Ordinal);
-        Assert.Contains("TopicCreatedByBot = topicCreatedByBot", sessionService, StringComparison.Ordinal);
-        Assert.Contains("messageThreadId: messageThreadId", sessionService, StringComparison.Ordinal);
-    }
-
     private static async Task<string> ReadRepositoryFileAsync(string relativePath)
     {
         var directory = new DirectoryInfo(AppContext.BaseDirectory);

tests/GmRelay.Bot.Tests/Rendering/DiscordSessionBatchRendererTests.cs

@@ -176,32 +176,6 @@ public sealed class DiscordSessionBatchRendererTests
         Assert.Equal("https://example.com/game", embeds[0].Url);
     }
 
-    [Fact]
-    public void Render_ShouldNormalizeBareDomainJoinLinkForEmbedUrl()
-    {
-        var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "mobaxterm.mobatek.net/game") };
-        var participants = Array.Empty<ParticipantBatchDto>();
-
-        var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
-        var (embeds, _) = DiscordSessionBatchRenderer.Render(view);
-
-        Assert.Equal("https://mobaxterm.mobatek.net/game", embeds[0].Url);
-    }
-
-    [Fact]
-    public void Render_ShouldNotSetEmbedUrlWhenJoinLinkIsNotHttpUrl()
-    {
-        var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "test") };
-        var participants = Array.Empty<ParticipantBatchDto>();
-
-        var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
-        var (embeds, _) = DiscordSessionBatchRenderer.Render(view);
-
-        Assert.Null(embeds[0].Url);
-    }
-
     [Fact]
     public void Render_ShouldEmbedCorrectFieldValues()
     {

tests/GmRelay.Bot.Tests/Web/HomePageSourceTests.cs

@@ -1,35 +0,0 @@
-namespace GmRelay.Bot.Tests.Web;
-
-public sealed class HomePageSourceTests
-{
-    [Fact]
-    public async Task HomePage_ShouldShowPlatformBadgeForGroups()
-    {
-        var source = await ReadRepositoryFileAsync("src/GmRelay.Web/Components/Pages/Home.razor");
-
-        Assert.Contains("platform-badge", source, StringComparison.Ordinal);
-        Assert.Contains("FormatPlatform", source, StringComparison.Ordinal);
-        Assert.Contains("group.Platform", source, StringComparison.Ordinal);
-    }
-
-    [Fact]
-    public async Task SessionService_ShouldUseSessionTitleWhenDiscordGroupNameIsOnlyId()
-    {
-        var source = await ReadRepositoryFileAsync("src/GmRelay.Web/Services/SessionService.cs");
-
-        Assert.Contains("latest_session.title", source, StringComparison.Ordinal);
-        Assert.Contains("NULLIF(g.name, g.external_group_id)", source, StringComparison.Ordinal);
-    }
-
-    private static async Task<string> ReadRepositoryFileAsync(string relativePath)
-    {
-        var dir = AppContext.BaseDirectory;
-        while (!string.IsNullOrEmpty(dir) && !File.Exists(Path.Combine(dir, "Directory.Build.props")))
-        {
-            dir = Directory.GetParent(dir)?.FullName;
-        }
-
-        var repoRoot = dir ?? throw new InvalidOperationException("Could not find repo root");
-        return await File.ReadAllTextAsync(Path.Combine(repoRoot, relativePath));
-    }
-}

tests/GmRelay.Bot.Tests/packages.lock.json

@@ -392,8 +392,8 @@
           "Aspire.Npgsql": "[13.2.2, )",
           "Dapper": "[2.1.72, )",
           "Dapper.AOT": "[1.0.48, )",
-          "GmRelay.ServiceDefaults": "[3.0.9, )",
-          "GmRelay.Shared": "[3.0.9, )",
+          "GmRelay.ServiceDefaults": "[2.5.0, )",
+          "GmRelay.Shared": "[2.5.0, )",
           "Npgsql": "[10.0.2, )",
           "Telegram.Bot": "[22.9.5.3, )",
           "dbup-postgresql": "[7.0.1, )"
@@ -404,9 +404,8 @@
         "dependencies": {
           "Aspire.Npgsql": "[13.2.2, )",
           "Dapper": "[2.1.72, )",
-          "Dapper.AOT": "[1.0.48, )",
-          "GmRelay.ServiceDefaults": "[3.0.9, )",
-          "GmRelay.Shared": "[3.0.9, )",
+          "GmRelay.ServiceDefaults": "[2.5.0, )",
+          "GmRelay.Shared": "[2.5.0, )",
           "NetCord.Hosting": "[1.0.0-alpha.489, )",
           "NetCord.Hosting.Services": "[1.0.0-alpha.489, )",
           "NetCord.Services": "[1.0.0-alpha.489, )",
@@ -437,8 +436,8 @@
         "dependencies": {
           "Aspire.Npgsql": "[13.2.2, )",
           "Dapper": "[2.1.72, )",
-          "GmRelay.ServiceDefaults": "[3.0.9, )",
-          "GmRelay.Shared": "[3.0.9, )",
+          "GmRelay.ServiceDefaults": "[2.5.0, )",
+          "GmRelay.Shared": "[2.5.0, )",
           "Npgsql": "[10.0.2, )",
           "Telegram.Bot": "[22.9.6.1, )"
         }