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

feat: implement Blazor web interface for GM session management
Deploy Telegram Bot / deploy (push) Has been cancelled
Details

Browse Source 
- Created GmRelay.Web project (Blazor Server)
- Created GmRelay.Shared library for domain models and rendering
- Refactored GmRelay.Bot to use the Shared library
- Integrated Telegram Login widget with server-side HMAC verification
- Added Dashboard, Group Details, and Edit Session pages
- Enabled bot notifications and in-place message updates from web actions
- Updated .NET Aspire orchestration and Docker Compose configuration
This commit is contained in:
Toutsu
2026-04-17 11:06:59 +03:00
parent c27456e726
commit 988133e389
93 changed files with 61016 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GmRelay.Bot/Domain/MoscowTime.cs
-42
View File
@@ -1,42 +0,0 @@
namespace GmRelay.Bot.Domain;
/// <summary>
/// Hardcoded Moscow timezone (UTC+3) for display purposes.
/// All DB storage is UTC (timestamptz). Conversion happens only at display layer.
/// Npgsql returns timestamptz as DateTime (Kind=Utc) under AOT, so we provide DateTime overloads.
/// </summary>
public static class MoscowTime
{
private static readonly TimeSpan MoscowOffset = TimeSpan.FromHours(3);
public static DateTimeOffset Now => DateTimeOffset.UtcNow.ToOffset(MoscowOffset);
public static DateTimeOffset ToMoscow(this DateTimeOffset utc) => utc.ToOffset(MoscowOffset);
public static string FormatMoscow(this DateTimeOffset utc)
=> utc.ToOffset(MoscowOffset).ToString("d MMMM yyyy, HH:mm", System.Globalization.CultureInfo.GetCultureInfo("ru-RU"));
// ── DateTime overloads (for Dapper AOT compatibility) ────────────
public static DateTime ToMoscow(this DateTime utcDt) => utcDt.Add(MoscowOffset);
public static string FormatMoscow(this DateTime utcDt)
=> utcDt.Add(MoscowOffset).ToString("d MMMM yyyy, HH:mm", System.Globalization.CultureInfo.GetCultureInfo("ru-RU"));
public static string FormatMoscowShort(this DateTime utcDt)
=> utcDt.Add(MoscowOffset).ToString("dd.MM");
public static bool TryParseMoscow(string text, out DateTimeOffset utcTime)
{
if (DateTime.TryParseExact(text, new[] { "dd.MM.yyyy HH:mm", "dd.MM.yyyy H:mm", "d.MM.yyyy HH:mm" },
System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out var localDt))
{
// Treat the parsed local time as UTC+3
utcTime = new DateTimeOffset(localDt, MoscowOffset).ToUniversalTime();
return true;
}
utcTime = default;
return false;
}
}
src/GmRelay.Bot/Domain/RsvpStatus.cs
-8
View File
@@ -1,8 +0,0 @@
namespace GmRelay.Bot.Domain;
public static class RsvpStatus
{
public const string Pending = "Pending";
public const string Confirmed = "Confirmed";
public const string Declined = "Declined";
}
src/GmRelay.Bot/Domain/SessionStatus.cs
-9
View File
@@ -1,9 +0,0 @@
namespace GmRelay.Bot.Domain;
public static class SessionStatus
{
public const string Planned = "Planned";
public const string ConfirmationSent = "ConfirmationSent";
public const string Confirmed = "Confirmed";
public const string Cancelled = "Cancelled";
}
src/GmRelay.Bot/Features/Confirmation/HandleRsvp/HandleRsvpHandler.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using GmRelay.Bot.Features.Confirmation.SendConfirmation;
using Npgsql;
using Telegram.Bot;
src/GmRelay.Bot/Features/Confirmation/SendConfirmation/SendConfirmationHandler.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using Npgsql;
using Telegram.Bot;
using Telegram.Bot.Types.ReplyMarkups;
src/GmRelay.Bot/Features/Reminders/SendJoinLink/SendJoinLinkHandler.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using Npgsql;
using Telegram.Bot;
src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs
+2 -1
View File
@@ -1,5 +1,6 @@
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using GmRelay.Shared.Rendering;
using Npgsql;
using Telegram.Bot;
using Telegram.Bot.Types;
src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs
+2 -1
View File
@@ -1,6 +1,7 @@
using System.Text.RegularExpressions;
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using GmRelay.Shared.Rendering;
using Npgsql;
using Telegram.Bot;
using Telegram.Bot.Types;
src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs
+2 -1
View File
@@ -3,7 +3,8 @@ using Npgsql;
using Telegram.Bot;
using Telegram.Bot.Types;
using Telegram.Bot.Types.ReplyMarkups;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using GmRelay.Shared.Rendering;
namespace GmRelay.Bot.Features.Sessions.CreateSession;
src/GmRelay.Bot/Features/Sessions/CreateSession/SessionBatchRenderer.cs
-63
View File
@@ -1,63 +0,0 @@
using GmRelay.Bot.Domain;
using Telegram.Bot.Types.ReplyMarkups;
namespace GmRelay.Bot.Features.Sessions.CreateSession;
internal sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status);
internal sealed record ParticipantBatchDto(Guid SessionId, string DisplayName, string? TelegramUsername);
internal static class SessionBatchRenderer
{
public static (string Text, InlineKeyboardMarkup Markup) Render(
string title,
IReadOnlyList<SessionBatchDto> sessions,
IReadOnlyList<ParticipantBatchDto> participants)
{
var activeSessions = sessions.OrderBy(s => s.ScheduledAt).ToList();
var messageText = $"🎲 <b>Новые игры:</b> {System.Net.WebUtility.HtmlEncode(title)}\n\n" +
$"<b>Расписание:</b>\n\n";
var buttons = new List<InlineKeyboardButton[]>();
foreach (var session in activeSessions)
{
var sessionPlayers = participants.Where(p => p.SessionId == session.SessionId).ToList();
messageText += $"📅 <b>{session.ScheduledAt.FormatMoscow()}</b>\n";
messageText += $"👥 Игроки ({sessionPlayers.Count}):\n";
if (sessionPlayers.Count > 0)
{
messageText += string.Join("\n", sessionPlayers.Select(p => $" 👤 {(p.TelegramUsername != null ? "@" + p.TelegramUsername : p.DisplayName)}")) + "\n";
}
else
{
messageText += " <i>Пока никто не записался</i>\n";
}
if (session.Status == "Cancelled")
{
messageText += "❌ <i>Сессия отменена</i>\n\n";
}
else if (session.Status == "RecruitmentClosed") // custom state we can derive or use
{
messageText += "🔒 <i>Набор завершен</i>\n\n";
}
else
{
messageText += "\n";
// Add buttons for this specific session
var dateTitle = session.ScheduledAt.FormatMoscowShort();
buttons.Add(new[]
{
InlineKeyboardButton.WithCallbackData($"✋ На {dateTitle}", $"join_session:{session.SessionId}"),
InlineKeyboardButton.WithCallbackData($"❌ Отменить {dateTitle} (ГМ)", $"cancel_session:{session.SessionId}"),
InlineKeyboardButton.WithCallbackData($"⏰ (ГМ)", $"reschedule_session:{session.SessionId}")
});
}
}
return (messageText, new InlineKeyboardMarkup(buttons));
}
}
src/GmRelay.Bot/Features/Sessions/ListSessions/DeleteSessionHandler.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Dapper;
using Npgsql;
using Telegram.Bot;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
namespace GmRelay.Bot.Features.Sessions.ListSessions;
src/GmRelay.Bot/Features/Sessions/ListSessions/ListSessionsHandler.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using Npgsql;
using Telegram.Bot;
using Telegram.Bot.Types;
src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs
+5 -4
View File
@@ -1,5 +1,6 @@
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using GmRelay.Shared.Rendering;
using Npgsql;
using Telegram.Bot;
using Telegram.Bot.Types;
@@ -212,11 +213,11 @@ public sealed class HandleRescheduleTimeInputHandler(
{
await using var conn = await dataSource.OpenConnectionAsync(ct);
var batchSessions = (await conn.QueryAsync<GmRelay.Bot.Features.Sessions.CreateSession.SessionBatchDto>(
var batchSessions = (await conn.QueryAsync<SessionBatchDto>(
"SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
new { proposal.BatchId })).ToList();
var batchParticipants = (await conn.QueryAsync<GmRelay.Bot.Features.Sessions.CreateSession.ParticipantBatchDto>(
var batchParticipants = (await conn.QueryAsync<ParticipantBatchDto>(
"""
SELECT sp.session_id AS SessionId, p.display_name AS DisplayName, p.telegram_username AS TelegramUsername
FROM session_participants sp
@@ -229,7 +230,7 @@ public sealed class HandleRescheduleTimeInputHandler(
if (proposal.BatchMessageId.HasValue)
{
var renderResult = GmRelay.Bot.Features.Sessions.CreateSession.SessionBatchRenderer.Render(
var renderResult = SessionBatchRenderer.Render(
proposal.Title, batchSessions, batchParticipants);
await bot.EditMessageText(
src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleVoteHandler.cs
+2 -1
View File
@@ -1,5 +1,6 @@
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using GmRelay.Shared.Rendering;
using GmRelay.Bot.Features.Sessions.CreateSession;
using Npgsql;
using Telegram.Bot;
src/GmRelay.Bot/GmRelay.Bot.csproj
+1
View File
@@ -33,5 +33,6 @@
<ItemGroup>
<ProjectReference Include="..\GmRelay.ServiceDefaults\GmRelay.ServiceDefaults.csproj" />
<ProjectReference Include="..\GmRelay.Shared\GmRelay.Shared.csproj" />
</ItemGroup>
</Project>
src/GmRelay.Bot/Infrastructure/Scheduling/SessionSchedulerService.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Dapper;
using GmRelay.Bot.Domain;
using GmRelay.Shared.Domain;
using GmRelay.Bot.Features.Confirmation.SendConfirmation;
using GmRelay.Bot.Features.Reminders.SendJoinLink;
using Npgsql;
src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs
+4 -2
View File
@@ -1,4 +1,6 @@
// ... UpdateRouter will have CancelSessionHandler and cancel_session route instead of close_recruitment
using GmRelay.Shared.Domain;
using GmRelay.Shared.Rendering;
using GmRelay.Bot.Features.Confirmation.HandleRsvp;
using GmRelay.Bot.Features.Sessions.CreateSession;
using GmRelay.Bot.Features.Sessions.ListSessions;
@@ -134,8 +136,8 @@ public sealed class UpdateRouter(
var status = parts[1] switch
{
"confirm" => Domain.RsvpStatus.Confirmed,
"decline" => Domain.RsvpStatus.Declined,
"confirm" => RsvpStatus.Confirmed,
"decline" => RsvpStatus.Declined,
_ => (string?)null
};