Toutsu/GmRelayBot
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

fix: resolve session edit crashes and rendering mode bugs
Deploy Telegram Bot / build-and-push (push) Successful in 3m29s
Details
Deploy Telegram Bot / deploy (push) Successful in 11s
Details

Browse Source
This commit is contained in:
Toutsu
2026-04-17 15:13:57 +03:00
parent d71a84b8aa
commit 55bc0dedb7
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GmRelay.Web/Components/App.razor
+2 -2
View File
@@ -11,11 +11,11 @@
<link rel="stylesheet" href="@Assets["GmRelay.Web.styles.css"]" /> <link rel="stylesheet" href="@Assets["GmRelay.Web.styles.css"]" />
<ImportMap /> <ImportMap />
<link rel="icon" type="image/png" href="favicon.png" /> <link rel="icon" type="image/png" href="favicon.png" />
<HeadOutlet /> <HeadOutlet @rendermode="InteractiveServer" />
</head> </head>
<body> <body>
<Routes /> <Routes @rendermode="InteractiveServer" />
<ReconnectModal /> <ReconnectModal />
<script src="@Assets["_framework/blazor.web.js"]"></script> <script src="@Assets["_framework/blazor.web.js"]"></script>
</body> </body>
src/GmRelay.Web/Dockerfile
+1
View File
@@ -18,6 +18,7 @@ RUN dotnet publish "GmRelay.Web.csproj" -c Release -o /app/publish /p:UseAppHost
# Stage 2: Runtime # Stage 2: Runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS final FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS final
WORKDIR /app WORKDIR /app
RUN apt-get update && apt-get install -y libgssapi-krb5-2 && rm -rf /var/lib/apt/lists/*
COPY --from=build /app/publish . COPY --from=build /app/publish .
ENV ASPNETCORE_URLS=http://+:8080 ENV ASPNETCORE_URLS=http://+:8080
EXPOSE 8080 EXPOSE 8080
src/GmRelay.Web/Services/SessionService.cs
+10 -10
View File
@@ -53,23 +53,23 @@ public sealed class SessionService(
await using var conn = await dataSource.OpenConnectionAsync(); await using var conn = await dataSource.OpenConnectionAsync();
await using var transaction = await conn.BeginTransactionAsync(); await using var transaction = await conn.BeginTransactionAsync();
// 1. Update Session // 1. Fetch current session with all required columns for WebSession record
var oldSession = await conn.QuerySingleAsync<WebSession>( var oldSession = await conn.QuerySingleAsync<WebSession>(
"SELECT title, scheduled_at AS ScheduledAt, join_link AS JoinLink, batch_id AS BatchId, batch_message_id AS BatchMessageId FROM sessions WHERE id = @Id", @"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.telegram_chat_id AS TelegramChatId
FROM sessions s
JOIN game_groups g ON g.id = s.group_id
WHERE s.id = @Id",
new { Id = sessionId }, transaction); new { Id = sessionId }, transaction);
// 2. Update Session
await conn.ExecuteAsync( await conn.ExecuteAsync(
@"UPDATE sessions SET title = @Title, scheduled_at = @ScheduledAt, join_link = @JoinLink, updated_at = now() @"UPDATE sessions SET title = @Title, scheduled_at = @ScheduledAt, join_link = @JoinLink, updated_at = now()
WHERE id = @Id", WHERE id = @Id",
new { Id = sessionId, Title = title, ScheduledAt = scheduledAt, JoinLink = joinLink }, new { Id = sessionId, Title = title, ScheduledAt = scheduledAt, JoinLink = joinLink },
transaction); transaction);
// 2. Fetch context for notification
var group = await conn.QuerySingleAsync<WebGameGroup>(
@"SELECT telegram_chat_id AS TelegramChatId FROM game_groups g
JOIN sessions s ON s.group_id = g.id WHERE s.id = @Id",
new { Id = sessionId }, transaction);
// 3. Update all sessions in the same batch with new title (optional, usually batch shares title) // 3. Update all sessions in the same batch with new title (optional, usually batch shares title)
await conn.ExecuteAsync( await conn.ExecuteAsync(
"UPDATE sessions SET title = @Title WHERE batch_id = @BatchId", "UPDATE sessions SET title = @Title WHERE batch_id = @BatchId",
@@ -84,12 +84,12 @@ public sealed class SessionService(
$"📌 <b>{System.Net.WebUtility.HtmlEncode(title)}</b>\n" + $"📌 <b>{System.Net.WebUtility.HtmlEncode(title)}</b>\n" +
$"📅 Время: <b>{scheduledAt.FormatMoscow()}</b> (МСК)" + (timeChanged ? " (изменено)" : ""); $"📅 Время: <b>{scheduledAt.FormatMoscow()}</b> (МСК)" + (timeChanged ? " (изменено)" : "");
await bot.SendMessage(group.TelegramChatId, notification, parseMode: Telegram.Bot.Types.Enums.ParseMode.Html); await bot.SendMessage(oldSession.TelegramChatId, notification, parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
// 5. Update Original Batch Message // 5. Update Original Batch Message
if (oldSession.BatchMessageId.HasValue) if (oldSession.BatchMessageId.HasValue)
{ {
await TryUpdateBatchMessageAsync(oldSession.BatchId, group.TelegramChatId, oldSession.BatchMessageId.Value, title); await TryUpdateBatchMessageAsync(oldSession.BatchId, oldSession.TelegramChatId, oldSession.BatchMessageId.Value, title);
} }
} }