Compare commits
65 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c0c8f852d2 | |||
| ac6e2455a1 | |||
| 9374ff16ed | |||
| 17b92b25f4 | |||
| d2edbf16cc | |||
| b16627c2b6 | |||
| 4f7afb3bc9 | |||
| 5baf63e9ad | |||
| a0d9d1bc44 | |||
| f46f2bb5d3 | |||
| 46527fe761 | |||
| d0a25895ab | |||
| 05faa9e32d | |||
| 0dbd4064ac | |||
| 0f03da0a60 | |||
| 6d90ba8274 | |||
| 35894bf89e | |||
| 6394b1fe8c | |||
| d170c83b9e | |||
| 4a2d1d2d38 | |||
| 706f20e403 | |||
| 4d3362d93f | |||
| b03929174a | |||
| 7e2747ec73 | |||
| ae6be912e3 | |||
| 116bed16a8 | |||
| 063de7ee3e | |||
| 5c4ec562d0 | |||
| dbd481566c | |||
| 3f4571d3a7 | |||
| 8c1e7991cd | |||
| c1fdba510b | |||
| 435399dcf2 | |||
| ddaa0f4279 | |||
| b205967f1a | |||
| 7457315d6f | |||
| 59f9904d66 | |||
| 3b91a009ea | |||
| a6ae5aac31 | |||
| dc26b4d7e4 | |||
| bc6136d91e | |||
| 2e95841ca8 | |||
| a7c8127f90 | |||
| cad4e5c30e | |||
| 77647e4bb8 | |||
| 17c631aef2 | |||
| 89b5196676 | |||
| ab1d2f1683 | |||
| 1bcd88db32 | |||
| 63e613c061 | |||
| dbf59c544a | |||
| 14b9bf15f2 | |||
| 5dee2d87f5 | |||
| b71488097e | |||
| 6e92419cff | |||
| fdb3445bec | |||
| c1f5d96e25 | |||
| c874f7b797 | |||
| aefed5abd4 | |||
| 25c22b2ff5 | |||
| cb40c2438d | |||
| 2a76ec0fb8 | |||
| 57c8714889 | |||
| 8220f2060f | |||
| 41f2ea6e90 |
@@ -6,6 +6,10 @@ TELEGRAM_BOT_TOKEN=YOUR_BOT_TOKEN_HERE
|
|||||||
# Найти его можно в информации о боте у @BotFather.
|
# Найти его можно в информации о боте у @BotFather.
|
||||||
TELEGRAM_BOT_USERNAME=YOUR_BOT_USERNAME_HERE
|
TELEGRAM_BOT_USERNAME=YOUR_BOT_USERNAME_HERE
|
||||||
|
|
||||||
|
# HTTPS URL Mini App dashboard, например: https://your-domain.example/miniapp
|
||||||
|
# Используется ботом для кнопки меню Telegram и кнопки /start.
|
||||||
|
TELEGRAM_MINI_APP_URL=
|
||||||
|
|
||||||
# Пароль для базы данных PostgreSQL
|
# Пароль для базы данных PostgreSQL
|
||||||
POSTGRES_PASSWORD=StrongPasswordForDatabase
|
POSTGRES_PASSWORD=StrongPasswordForDatabase
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
VERSION: 1.8.2
|
VERSION: 1.11.0
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
||||||
@@ -64,6 +64,7 @@ jobs:
|
|||||||
echo "TELEGRAM_BOT_TOKEN=${{ secrets.TELEGRAM_BOT_TOKEN }}" > .env
|
echo "TELEGRAM_BOT_TOKEN=${{ secrets.TELEGRAM_BOT_TOKEN }}" > .env
|
||||||
echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" >> .env
|
echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" >> .env
|
||||||
echo "TELEGRAM_BOT_USERNAME=${{ secrets.TELEGRAM_BOT_USERNAME }}" >> .env
|
echo "TELEGRAM_BOT_USERNAME=${{ secrets.TELEGRAM_BOT_USERNAME }}" >> .env
|
||||||
|
echo "TELEGRAM_MINI_APP_URL=${{ secrets.TELEGRAM_MINI_APP_URL }}" >> .env
|
||||||
|
|
||||||
- name: Deploy Containers
|
- name: Deploy Containers
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
name: PR Checks
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test-and-build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup .NET
|
||||||
|
uses: actions/setup-dotnet@v4
|
||||||
|
with:
|
||||||
|
dotnet-version: '10.0.x'
|
||||||
|
|
||||||
|
- name: Restore dependencies
|
||||||
|
run: dotnet restore
|
||||||
|
|
||||||
|
- name: Build Shared
|
||||||
|
run: dotnet build src/GmRelay.Shared/GmRelay.Shared.csproj --no-restore
|
||||||
|
|
||||||
|
- name: Build Bot (compile check)
|
||||||
|
run: dotnet build src/GmRelay.Bot/GmRelay.Bot.csproj --no-restore
|
||||||
|
|
||||||
|
- name: Build Web (compile check)
|
||||||
|
run: dotnet build src/GmRelay.Web/GmRelay.Web.csproj --no-restore
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --verbosity normal
|
||||||
BIN
Binary file not shown.
@@ -0,0 +1,343 @@
|
|||||||
|
# Issue #15: Session Audit Log Implementation Plan
|
||||||
|
|
||||||
|
> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task.
|
||||||
|
|
||||||
|
**Goal:** Add transparent audit history for every session change, visible to GM in Web Dashboard.
|
||||||
|
|
||||||
|
**Architecture:** PostgreSQL audit table + Dapper queries. Automatic logging inside mutating SessionService methods. New Razor page for GM history view.
|
||||||
|
|
||||||
|
**Tech Stack:** C# 12, Blazor SSR, Dapper, PostgreSQL, xUnit.
|
||||||
|
|
||||||
|
**Branch:** `issue-15-session-audit-log` (includes mobile UI bugfix cherry-pick)
|
||||||
|
|
||||||
|
**Version Bump:** `1.10.1` → `1.10.2`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 1: Database Migration (V013)
|
||||||
|
|
||||||
|
**Objective:** Create `session_audit_log` table.
|
||||||
|
|
||||||
|
**File:** Create `src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql`
|
||||||
|
|
||||||
|
```sql
|
||||||
|
CREATE EXTENSION IF NOT EXISTS "pgcrypto";
|
||||||
|
|
||||||
|
CREATE TABLE session_audit_log (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
session_id UUID NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
|
||||||
|
actor_telegram_id BIGINT NOT NULL,
|
||||||
|
actor_name VARCHAR(255) NOT NULL,
|
||||||
|
change_type VARCHAR(50) NOT NULL,
|
||||||
|
CHECK (change_type IN ('Title','Time','Link','MaxPlayers','Status','WaitlistPromote','PlayerRemoved','BatchRescheduled','Cancelled')),
|
||||||
|
old_value TEXT,
|
||||||
|
new_value TEXT,
|
||||||
|
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX ix_session_audit_log_session_id ON session_audit_log(session_id);
|
||||||
|
CREATE INDEX ix_session_audit_log_changed_at ON session_audit_log(changed_at);
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2:** Verify migration compiles: `psql $DATABASE_URL -f src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql` (optional, CI will test)
|
||||||
|
|
||||||
|
**Step 3:** Commit: `git add src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql && git commit -m "chore(#15): add session_audit_log migration"`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 2: Domain Model & Interface Methods
|
||||||
|
|
||||||
|
**Objective:** Add `SessionAuditLogEntry` record and two new methods to `ISessionStore`.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Web/Services/ISessionStore.cs`
|
||||||
|
- Modify: `src/GmRelay.Web/Services/SessionService.cs`
|
||||||
|
|
||||||
|
**Step 1: Add record to ISessionStore.cs** (after PlayerAttendanceStats)
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public sealed record SessionAuditLogEntry(
|
||||||
|
Guid Id,
|
||||||
|
Guid SessionId,
|
||||||
|
long ActorTelegramId,
|
||||||
|
string ActorName,
|
||||||
|
string ChangeType,
|
||||||
|
string? OldValue,
|
||||||
|
string? NewValue,
|
||||||
|
DateTime ChangedAt
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Add methods to ISessionStore interface**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue);
|
||||||
|
Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId);
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Implement in SessionService.cs**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public async Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue)
|
||||||
|
{
|
||||||
|
using var connection = new NpgsqlConnection(connectionString);
|
||||||
|
await connection.ExecuteAsync(
|
||||||
|
"INSERT INTO session_audit_log (session_id, actor_telegram_id, actor_name, change_type, old_value, new_value) VALUES (@sessionId, @actorTelegramId, @actorName, @changeType, @oldValue, @newValue)",
|
||||||
|
new { sessionId, actorTelegramId, actorName, changeType, oldValue, newValue });
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId)
|
||||||
|
{
|
||||||
|
using var connection = new NpgsqlConnection(connectionString);
|
||||||
|
var entries = await connection.QueryAsync<SessionAuditLogEntry>(
|
||||||
|
"SELECT id, session_id as SessionId, actor_telegram_id as ActorTelegramId, actor_name as ActorName, change_type as ChangeType, old_value as OldValue, new_value as NewValue, changed_at as ChangedAt FROM session_audit_log WHERE session_id = @sessionId ORDER BY changed_at DESC",
|
||||||
|
new { sessionId });
|
||||||
|
return entries.ToList();
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 4:** Commit: `git add -A && git commit -m "feat(#15): add SessionAuditLogEntry and audit store methods"`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 3: Instrument Mutating Methods
|
||||||
|
|
||||||
|
**Objective:** Auto-log changes in key methods. Only log when value actually changes.
|
||||||
|
|
||||||
|
**File:** Modify `src/GmRelay.Web/Services/SessionService.cs`
|
||||||
|
|
||||||
|
**Step 1: Instrument UpdateSessionAsync**
|
||||||
|
|
||||||
|
Before executing UPDATE, read current session. After UPDATE, compare and log each changed field:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// After var currentSession = await GetSessionAsync(sessionId);
|
||||||
|
// Before the UPDATE SQL:
|
||||||
|
|
||||||
|
if (currentSession is not null)
|
||||||
|
{
|
||||||
|
if (currentSession.Title != title)
|
||||||
|
await LogSessionChangeAsync(sessionId, /* actor will be passed from caller */ ...);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Problem:** SessionService doesn't know the actor (GM) telegram ID. Solution: add `long actorTelegramId` parameter to mutating methods, or use a decorator pattern.
|
||||||
|
|
||||||
|
**Better approach:** Instrument in `AuthorizedSessionService` which already has `gmId`. That is the authorized wrapper.
|
||||||
|
|
||||||
|
**Revised approach:** Add `IAuditLogger` interface and inject it. Or simpler: change `ISessionStore` mutating methods to accept `long actorTelegramId` and `string actorName` as last parameters.
|
||||||
|
|
||||||
|
**Simpler approach for this plan:** Since all mutating methods in `ISessionStore` are called through `AuthorizedSessionService`, instrument in `AuthorizedSessionService` methods AFTER the underlying `SessionService` call. BUT we need old values.
|
||||||
|
|
||||||
|
**Final approach:** Change `ISessionStore` methods to include `actorTelegramId` parameter, and inside `SessionService` fetch old values and log.
|
||||||
|
|
||||||
|
Let's add `long actorTelegramId` parameter to:
|
||||||
|
- `UpdateSessionAsync`
|
||||||
|
- `PromoteWaitlistedPlayerAsync`
|
||||||
|
- `RemovePlayerFromSessionAsync`
|
||||||
|
- `RescheduleBatchAsync`
|
||||||
|
|
||||||
|
Wait, this is a bigger change. Let's be more pragmatic: add a new `IAuditService` that can be called from `AuthorizedSessionService` after mutations. `IAuditService` just wraps `ISessionStore.LogSessionChangeAsync`.
|
||||||
|
|
||||||
|
Actually, simplest: add `actorTelegramId` and `actorName` parameters to `LogSessionChangeAsync` and call it from `AuthorizedSessionService` after each mutation. For old/new values, read the session before mutation in AuthorizedSessionService.
|
||||||
|
|
||||||
|
**Plan:**
|
||||||
|
- `AuthorizedSessionService.UpdateSessionForGmAsync`: read session before update, call update, then log differences.
|
||||||
|
- Same pattern for other mutating methods.
|
||||||
|
|
||||||
|
**Step 1: Read current session in AuthorizedSessionService.UpdateSessionForGmAsync**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
||||||
|
{
|
||||||
|
var groupId = await EnforceSessionOwnershipAsync(sessionId, gmId);
|
||||||
|
var before = await store.GetSessionAsync(sessionId); // add this
|
||||||
|
await store.UpdateSessionAsync(sessionId, groupId, title, scheduledAt, joinLink, maxPlayers);
|
||||||
|
if (before is not null)
|
||||||
|
{
|
||||||
|
if (before.Title != title)
|
||||||
|
await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Title", before.Title, title);
|
||||||
|
if (before.ScheduledAt != scheduledAt)
|
||||||
|
await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Time", before.ScheduledAt.ToString("O"), scheduledAt.ToString("O"));
|
||||||
|
if (before.JoinLink != joinLink)
|
||||||
|
await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Link", before.JoinLink, joinLink);
|
||||||
|
if (before.MaxPlayers != maxPlayers)
|
||||||
|
await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "MaxPlayers", before.MaxPlayers?.ToString(), maxPlayers?.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Wait, `EnforceSessionOwnershipAsync` returns `groupId` but we need it. Let me check the current AuthorizedSessionService code... We saw earlier it does `await EnforceSessionOwnershipAsync(sessionId, gmId)` then calls `store.UpdateSessionAsync`.
|
||||||
|
|
||||||
|
Actually, looking at the compact output from earlier, `AuthorizedSessionService` has `EnforceSessionOwnershipAsync` as a private helper. Let me verify.
|
||||||
|
|
||||||
|
From the compact output of AuthorizedSessionService earlier:
|
||||||
|
```
|
||||||
|
public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
||||||
|
{
|
||||||
|
var groupId = await EnforceSessionOwnershipAsync(sessionId, gmId);
|
||||||
|
await store.UpdateSessionAsync(sessionId, groupId, title, scheduledAt, joinLink, maxPlayers);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
So it DOES return groupId. Perfect.
|
||||||
|
|
||||||
|
But we need actor name. We can use the GM's display name from `GetGroupManagementForGmAsync` or just hardcode "ГМ" for now. Or we can query the player name. For simplicity, use "ГМ" + telegram ID, or query the player display name.
|
||||||
|
|
||||||
|
Actually, let's query the GM name from the group or just use telegram ID as identifier. Since this is audit log, having human-readable name is better. We can pass `actorName` to the log method.
|
||||||
|
|
||||||
|
Simpler: In `AuthorizedSessionService`, after `EnforceSessionOwnershipAsync`, we already know the group. We can get the GM name from group or just use a generic "ГМ" label. Actually, the telegram ID is sufficient for audit, and the display name can be resolved later in the UI.
|
||||||
|
|
||||||
|
Let's just log `actor_telegram_id` and use "ГМ" as actor_name. Or better, query the player display name if needed.
|
||||||
|
|
||||||
|
For this plan, let's keep it simple: log with `gmId` as actor_telegram_id and `"ГМ"` as actor_name. The UI can resolve the name.
|
||||||
|
|
||||||
|
**Step 2: Instrument all mutating AuthorizedSessionService methods**
|
||||||
|
|
||||||
|
Do this for:
|
||||||
|
- `UpdateSessionForGmAsync` (Title, Time, Link, MaxPlayers)
|
||||||
|
- `RescheduleBatchForGmAsync` (BatchRescheduled)
|
||||||
|
- `PromoteWaitlistedPlayerForGmAsync` (WaitlistPromote)
|
||||||
|
- `RemovePlayerFromSessionForGmAsync` (PlayerRemoved)
|
||||||
|
- `UpdateBatchDetailsForGmAsync` (Title, Link)
|
||||||
|
- `UpdateBatchNotificationModeForGmAsync` (maybe skip, internal)
|
||||||
|
- `DeleteSessionHandler` in Bot features (Cancelled) — this is in Bot layer, not Web
|
||||||
|
|
||||||
|
For Cancelled status, we need to instrument `CancelSessionHandler` in Bot. But the Bot handlers don't use `ISessionStore` directly... they use `SessionService` or direct SQL. Let me check.
|
||||||
|
|
||||||
|
Actually, for this plan, focus on Web layer mutations first. Bot layer can be a follow-up.
|
||||||
|
|
||||||
|
**Step 3: Commit:** `git add -A && git commit -m "feat(#15): instrument audit logging in AuthorizedSessionService"`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 4: Web Page - SessionHistory.razor
|
||||||
|
|
||||||
|
**Objective:** GM-visible timeline of session changes.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `src/GmRelay.Web/Components/Pages/SessionHistory.razor`
|
||||||
|
- Modify: `src/GmRelay.Web/Components/Pages/GroupDetails.razor` (add "История" link)
|
||||||
|
- Modify: `src/GmRelay.Web/Components/Pages/EditSession.razor` (add "История" link)
|
||||||
|
|
||||||
|
**Step 1: Create SessionHistory.razor**
|
||||||
|
|
||||||
|
Route: `@page "/session/{SessionId:guid}/history"`
|
||||||
|
|
||||||
|
Layout: table with columns: Время, Актор, Тип изменения, Было, Стало.
|
||||||
|
|
||||||
|
Colors: use existing CSS variables.
|
||||||
|
|
||||||
|
**Step 2: Add navigation links**
|
||||||
|
|
||||||
|
In GroupDetails.razor sessions table: add 📜 История column/link.
|
||||||
|
In EditSession.razor: add button "📜 История изменений" linking to `/session/{SessionId}/history`.
|
||||||
|
|
||||||
|
**Step 3: Commit:** `git add -A && git commit -m "feat(#15): add SessionHistory.razor page with audit timeline"`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 5: FakeSessionStore + TDD Tests
|
||||||
|
|
||||||
|
**Objective:** Test audit logging. RED-GREEN-REFACTOR.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs`
|
||||||
|
|
||||||
|
**Step 1: RED — Write failing test**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateSessionForGmAsync_LogsAudit_WhenTitleChanges()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups: [new(groupId, 42, "Alpha", gmId)],
|
||||||
|
sessions: [new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
await service.UpdateSessionForGmAsync(sessionId, gmId, "Updated Title", DateTime.UtcNow.AddDays(1), "https://example.test/b", 5);
|
||||||
|
|
||||||
|
Assert.Single(store.LogEntries);
|
||||||
|
Assert.Equal("Title", store.LogEntries[0].ChangeType);
|
||||||
|
Assert.Equal("Session A", store.LogEntries[0].OldValue);
|
||||||
|
Assert.Equal("Updated Title", store.LogEntries[0].NewValue);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Run: `dotnet test tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs --filter "FullyQualifiedName~LogsAudit" -v n`
|
||||||
|
Expected: FAIL (FakeSessionStore doesn't have LogSessionChangeAsync / LogEntries)
|
||||||
|
|
||||||
|
**Step 2: GREEN — Add to FakeSessionStore**
|
||||||
|
|
||||||
|
Add `List<SessionAuditLogEntry> LogEntries` and implement `LogSessionChangeAsync` / `GetSessionHistoryAsync`.
|
||||||
|
|
||||||
|
**Step 3: Refactor — Add more tests**
|
||||||
|
|
||||||
|
- No audit when values unchanged
|
||||||
|
- Audit for time change
|
||||||
|
- Audit for link change
|
||||||
|
- Audit for max players change
|
||||||
|
- GetSessionHistoryAsync returns entries ordered by time desc
|
||||||
|
|
||||||
|
**Step 4: Full suite**
|
||||||
|
Run: `dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj`
|
||||||
|
Expected: all pass
|
||||||
|
|
||||||
|
**Step 5: Commit:** `git add -A && git commit -m "test(#15): add audit logging TDD tests"`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 6: Bump Version & Docs
|
||||||
|
|
||||||
|
**Objective:** Update version and documentation.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `Directory.Build.props`
|
||||||
|
- Modify: `compose.yaml`
|
||||||
|
- Modify: `README.md`
|
||||||
|
- Modify: Wiki «Руководство ГМа»
|
||||||
|
|
||||||
|
**Step 1: Bump version to 1.10.2**
|
||||||
|
|
||||||
|
**Step 2: Update README** — add "📜 История изменений сессии" bullet in Web Dashboard section.
|
||||||
|
|
||||||
|
**Step 3: Update wiki** — add subsection «Журнал действий» with description of how to access `/session/{id}/history`, what change types are tracked, and how to read the timeline.
|
||||||
|
|
||||||
|
**Step 4: Commit:** `git add -A && git commit -m "docs(#15): bump version to 1.10.2 and add audit log docs"`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 7: Push & PR
|
||||||
|
|
||||||
|
**Step 1:** `git push origin issue-15-session-audit-log`
|
||||||
|
|
||||||
|
**Step 2:** Create PR via `mcp_gitea_pull_request_write`
|
||||||
|
|
||||||
|
**Step 3:** Wait CI (`mcp_gitea_actions_run_read`)
|
||||||
|
|
||||||
|
**Step 4:** Merge PR
|
||||||
|
|
||||||
|
**Step 5:** Create tag `v1.10.2` and release
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Verification Checklist
|
||||||
|
|
||||||
|
- [ ] Migration V013 applied successfully
|
||||||
|
- [ ] `SessionAuditLogEntry` record defined in `ISessionStore.cs`
|
||||||
|
- [ ] `LogSessionChangeAsync` and `GetSessionHistoryAsync` implemented in `SessionService.cs`
|
||||||
|
- [ ] `AuthorizedSessionService` logs on value changes only
|
||||||
|
- [ ] `SessionHistory.razor` renders timeline for GM
|
||||||
|
- [ ] Links from GroupDetails and EditSession pages
|
||||||
|
- [ ] `FakeSessionStore` implements audit methods
|
||||||
|
- [ ] TDD tests: RED → GREEN → all pass
|
||||||
|
- [ ] Full `dotnet test` suite: all pass
|
||||||
|
- [ ] Version bumped to 1.10.2
|
||||||
|
- [ ] README and wiki updated
|
||||||
|
- [ ] CI run success
|
||||||
|
- [ ] PR merged to main
|
||||||
|
- [ ] Tag `v1.10.2` created
|
||||||
|
- [ ] Release published
|
||||||
@@ -0,0 +1,480 @@
|
|||||||
|
# Issue #19: выровнять /newsession с batch-сценарием лендинга — Implementation Plan
|
||||||
|
|
||||||
|
> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task.
|
||||||
|
|
||||||
|
**Goal:** Убедиться, что Telegram UX `/newsession` полностью соответствует batch-сценарию лендинга: мастер одной командой создаёт несколько дат, указывает лимит мест и ссылку, получает единую карточку с действиями. Обеспечить покрытие acceptance criteria регрессионными тестами и устранить найденные расхождения.
|
||||||
|
|
||||||
|
**Architecture:** Сценарий уже реализован в `CreateSessionHandler` + `NewSessionCommandParser` + `SessionBatchRenderer`. Основная задача — добавить недостающие тесты на «точный» landing-сценарий (несколько явных дат, не recurring), проверить отсутствие частичных сессий при любых ошибках, и убедиться, что карточка содержит все обещанные элементы.
|
||||||
|
|
||||||
|
**Tech Stack:** .NET 10, xUnit, Dapper, Npgsql, Telegram.Bot, Native AOT.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Контекст кодовой базы
|
||||||
|
|
||||||
|
- `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs` — создание batch, транзакция БД, отправка карточки.
|
||||||
|
- `src/GmRelay.Bot/Features/Sessions/CreateSession/NewSessionCommandParser.cs` — парсинг команды: несколько `Время:`, `Мест:`, `Ссылка:`, `Картинка:`, recurring (`Игр:` + `Интервал:`).
|
||||||
|
- `src/GmRelay.Shared/Rendering/SessionBatchRenderer.cs` — рендеринг HTML-карточки с кнопками.
|
||||||
|
- `src/GmRelay.Shared/Rendering/BatchMessageEditor.cs` — редактирование batch-сообщения (text/photo).
|
||||||
|
- `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs` — роутинг команд, текст `/help`.
|
||||||
|
- `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs` — тесты парсера.
|
||||||
|
- `tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs` — smoke-тест всего landing-флоу через `FakeTelegramMessenger`.
|
||||||
|
- `tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs` — тесты рендерера.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: RED — тест landing-парсинга с несколькими явными датами
|
||||||
|
|
||||||
|
**Objective:** Проверить, что парсер корректно обрабатывает точный формат из лендинга: 2+ явных даты, лимит мест, ссылка, без recurring.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs`
|
||||||
|
|
||||||
|
**Step 1: Write failing test**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public void Parse_ShouldHandleLandingBatchWithMultipleExplicitDates()
|
||||||
|
{
|
||||||
|
var nowUtc = new DateTimeOffset(2026, 4, 23, 12, 0, 0, TimeSpan.Zero);
|
||||||
|
var text = """
|
||||||
|
/newsession
|
||||||
|
Название: Landing Batch Game
|
||||||
|
Время: 15.05.2026 19:30
|
||||||
|
Время: 22.05.2026 19:30
|
||||||
|
Мест: 4
|
||||||
|
Ссылка: https://example.test/landing
|
||||||
|
""";
|
||||||
|
|
||||||
|
var result = NewSessionCommandParser.Parse(text, nowUtc);
|
||||||
|
|
||||||
|
Assert.True(result.IsValid);
|
||||||
|
Assert.Equal("Landing Batch Game", result.Title);
|
||||||
|
Assert.Equal("https://example.test/landing", result.Link);
|
||||||
|
Assert.Equal(4, result.MaxPlayers);
|
||||||
|
Assert.Equal(2, result.ScheduledTimes.Count);
|
||||||
|
Assert.Equal(new DateTimeOffset(2026, 5, 15, 16, 30, 0, TimeSpan.Zero), result.ScheduledTimes[0]);
|
||||||
|
Assert.Equal(new DateTimeOffset(2026, 5, 22, 16, 30, 0, TimeSpan.Zero), result.ScheduledTimes[1]);
|
||||||
|
Assert.Empty(result.PastTimeInputs);
|
||||||
|
Assert.Empty(result.InvalidTimeInputs);
|
||||||
|
Assert.Empty(result.InvalidSeatLimitInputs);
|
||||||
|
Assert.Empty(result.InvalidRecurringInputs);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Run test to verify failure**
|
||||||
|
|
||||||
|
Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Parse_ShouldHandleLandingBatchWithMultipleExplicitDates" -v n`
|
||||||
|
|
||||||
|
Expected: PASS (функциональность уже реализована, но теста не было). Если FAIL — исправить парсер перед продолжением.
|
||||||
|
|
||||||
|
**Step 3: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs
|
||||||
|
git commit -m "test(#19): landing batch parser test with multiple explicit dates"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 2: RED — тест рендеринга landing-карточки
|
||||||
|
|
||||||
|
**Objective:** Проверить, что `SessionBatchRenderer` для landing-сценария выводит название, все даты, лимит, заполненность и кнопки записи/выхода.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs`
|
||||||
|
|
||||||
|
**Step 1: Write failing test**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public void Render_ShouldProduceLandingBatchCardWithAllRequiredElements()
|
||||||
|
{
|
||||||
|
var sessionId1 = Guid.NewGuid();
|
||||||
|
var sessionId2 = Guid.NewGuid();
|
||||||
|
var sessions = new[]
|
||||||
|
{
|
||||||
|
new SessionBatchDto(sessionId1, new DateTime(2026, 5, 15, 16, 30, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
|
||||||
|
new SessionBatchDto(sessionId2, new DateTime(2026, 5, 22, 16, 30, 0, DateTimeKind.Utc), SessionStatus.Planned, 4)
|
||||||
|
};
|
||||||
|
var participants = new[]
|
||||||
|
{
|
||||||
|
new ParticipantBatchDto(sessionId1, "Alice", "alice", ParticipantRegistrationStatus.Active),
|
||||||
|
new ParticipantBatchDto(sessionId1, "Bob", null, ParticipantRegistrationStatus.Active),
|
||||||
|
new ParticipantBatchDto(sessionId2, "Charlie", "charlie", ParticipantRegistrationStatus.Waitlisted)
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = SessionBatchRenderer.Render("Landing Batch Game", sessions, participants);
|
||||||
|
var text = result.Text;
|
||||||
|
var buttons = result.Markup.InlineKeyboard.SelectMany(row => row).ToList();
|
||||||
|
|
||||||
|
Assert.Contains("Landing Batch Game", text);
|
||||||
|
Assert.Contains("15 мая 2026, 19:30", text);
|
||||||
|
Assert.Contains("22 мая 2026, 19:30", text);
|
||||||
|
Assert.Contains("Места: 2/4", text);
|
||||||
|
Assert.Contains("Места: 0/4", text);
|
||||||
|
Assert.Contains("@alice", text);
|
||||||
|
Assert.Contains("Bob", text);
|
||||||
|
Assert.Contains("Лист ожидания (1)", text);
|
||||||
|
Assert.Contains("@charlie", text);
|
||||||
|
|
||||||
|
Assert.Equal(4, buttons.Count);
|
||||||
|
Assert.Contains($"join_session:{sessionId1}", buttons.Select(b => b.CallbackData));
|
||||||
|
Assert.Contains($"leave_session:{sessionId1}", buttons.Select(b => b.CallbackData));
|
||||||
|
Assert.Contains($"join_session:{sessionId2}", buttons.Select(b => b.CallbackData));
|
||||||
|
Assert.Contains($"leave_session:{sessionId2}", buttons.Select(b => b.CallbackData));
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Run test to verify failure**
|
||||||
|
|
||||||
|
Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Render_ShouldProduceLandingBatchCardWithAllRequiredElements" -v n`
|
||||||
|
|
||||||
|
Expected: PASS (рендерер уже реализован, тест отсутствовал).
|
||||||
|
|
||||||
|
**Step 3: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs
|
||||||
|
git commit -m "test(#19): landing batch renderer card elements test"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 3: RED — тест «ошибки ввода не создают частичных сессий»
|
||||||
|
|
||||||
|
**Objective:** Убедиться, что при невалидном вводе `CreateSessionHandler` не создаёт ни одной записи в БД и не публикует карточку.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/CreateSessionHandlerTests.cs`
|
||||||
|
- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs` (если найдена уязвимость)
|
||||||
|
|
||||||
|
**Step 1: Write failing test**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
using GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
using Npgsql;
|
||||||
|
using Telegram.Bot;
|
||||||
|
using Microsoft.Extensions.Logging.Abstractions;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
|
||||||
|
|
||||||
|
public sealed class CreateSessionHandlerTests
|
||||||
|
{
|
||||||
|
// Примечание: полноценный интеграционный тест с реальной БД требует TestContainer.
|
||||||
|
// Для Native AOT проекта используем подход с in-memory фейком через рефакторинг хендлера.
|
||||||
|
// Ниже — тест-спецификация, которую реализуем через FakeDataSource или рефакторинг.
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Поскольку `CreateSessionHandler` напрямую зависит от `NpgsqlDataSource` и `ITelegramBotClient`, для unit-тестирования нужно либо:
|
||||||
|
а) использовать интеграционный тест с PostgreSQL (TestContainers), либо
|
||||||
|
б) рефакторить хендлер, выделив `ISessionRepository`.
|
||||||
|
|
||||||
|
**Рекомендуемый подход (YAGNI):** добавить интеграционный тест в smoke-стиле через `FakeTelegramMessenger`, дополнив `TelegramLandingSmokeScenario` сценарием «invalid command does not publish anything».
|
||||||
|
|
||||||
|
**Step 1 (реализация):** Дописать тест в `TelegramLandingPromisesSmokeTests.cs`:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public void Smoke_InvalidNewSession_ShouldNotPublishAnySessions()
|
||||||
|
{
|
||||||
|
var nowUtc = new DateTimeOffset(2026, 5, 1, 12, 0, 0, TimeSpan.Zero);
|
||||||
|
var invalidText = """
|
||||||
|
/newsession
|
||||||
|
Название: Bad Game
|
||||||
|
Время: 01.01.2020 19:30
|
||||||
|
"""; // нет ссылки
|
||||||
|
|
||||||
|
var parseResult = NewSessionCommandParser.Parse(invalidText, nowUtc);
|
||||||
|
|
||||||
|
Assert.False(parseResult.IsValid);
|
||||||
|
Assert.Empty(parseResult.ScheduledTimes);
|
||||||
|
// Убеждаемся, что smoke-сценарий не может быть опубликован
|
||||||
|
Assert.Throws<InvalidOperationException>(() =>
|
||||||
|
TelegramLandingSmokeScenario.Publish(parseResult, SessionNotificationMode.GroupAndDirect));
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
В `TelegramLandingSmokeScenario.Publish` добавить guard:
|
||||||
|
```csharp
|
||||||
|
if (!parseResult.IsValid)
|
||||||
|
throw new InvalidOperationException("Cannot publish invalid parse result");
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Run test to verify failure**
|
||||||
|
|
||||||
|
Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Smoke_InvalidNewSession_ShouldNotPublishAnySessions" -v n`
|
||||||
|
|
||||||
|
Expected: FAIL — guard ещё не добавлен.
|
||||||
|
|
||||||
|
**Step 3: Write minimal implementation**
|
||||||
|
|
||||||
|
Добавить guard в `TelegramLandingSmokeScenario.Publish`:
|
||||||
|
```csharp
|
||||||
|
if (!parseResult.IsValid)
|
||||||
|
throw new InvalidOperationException("Cannot publish invalid parse result");
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 4: Run test to verify pass**
|
||||||
|
|
||||||
|
Expected: PASS.
|
||||||
|
|
||||||
|
**Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs
|
||||||
|
git add src/GmRelay.Bot/... # если были изменения
|
||||||
|
# (файл CreateSessionHandler.cs не трогаем — валидация происходит ДО транзакции)
|
||||||
|
git commit -m "test(#19): ensure invalid parse does not publish partial sessions"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 4: RED — тест atomicity при сбое отправки batch-сообщения
|
||||||
|
|
||||||
|
**Objective:** В `CreateSessionHandler` `batch_message_id` обновляется ПОСЛЕ `transaction.Commit()`. Если отправка сообщения в Telegram падает, сессии созданы, но `batch_message_id` не записан — игроки не увидят карточку. Нужно либо доказать, что это обработано, либо исправить.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs`
|
||||||
|
|
||||||
|
**Step 1: Анализ кода**
|
||||||
|
|
||||||
|
Текущий порядок в `CreateSessionHandler`:
|
||||||
|
1. Валидация (до транзакции) ✓
|
||||||
|
2. `BEGIN TRANSACTION`
|
||||||
|
3. INSERT players, groups, sessions
|
||||||
|
4. `COMMIT`
|
||||||
|
5. `SessionBatchRenderer.Render`
|
||||||
|
6. `botClient.SendMessage/SendPhoto`
|
||||||
|
7. `UPDATE sessions SET batch_message_id = ...` (вне транзакции!)
|
||||||
|
|
||||||
|
Если шаг 6 падает — сессии «висят» без published message. Это частичное создание.
|
||||||
|
|
||||||
|
**Step 2: Write minimal fix**
|
||||||
|
|
||||||
|
Обернуть отправку сообщения и обновление `batch_message_id` в retry-loop с fallback. Если после N попыток не удалось — отправить GM уведомление об ошибке и оставить сессии (не удалять, чтобы не терять данные), но сделать так, чтобы `batch_message_id` обновлялся только при успешной отправке.
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// Внутри CreateSessionHandler, после Commit:
|
||||||
|
Message? batchMessage = null;
|
||||||
|
var sendAttempts = 0;
|
||||||
|
const int maxAttempts = 3;
|
||||||
|
Exception? lastSendException = null;
|
||||||
|
|
||||||
|
while (batchMessage is null && sendAttempts < maxAttempts)
|
||||||
|
{
|
||||||
|
sendAttempts++;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
batchMessage = await SendBatchMessageAsync(...); // extracted method
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
lastSendException = ex;
|
||||||
|
logger.LogWarning(ex, "Attempt {Attempt} failed to send batch message for {BatchId}", sendAttempts, batchId);
|
||||||
|
if (sendAttempts < maxAttempts)
|
||||||
|
await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (batchMessage is not null)
|
||||||
|
{
|
||||||
|
await connection.ExecuteAsync(
|
||||||
|
"UPDATE sessions SET batch_message_id = @MsgId WHERE batch_id = @BatchId",
|
||||||
|
new { MsgId = batchMessage.MessageId, BatchId = batchId });
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.LogError(lastSendException, "Failed to send batch message for {BatchId} after {MaxAttempts} attempts", batchId, maxAttempts);
|
||||||
|
await botClient.SendMessage(
|
||||||
|
chatId,
|
||||||
|
$"⚠️ Сессии созданы, но не удалось опубликовать карточку. Пожалуйста, используйте /listsessions.\n\nОшибка: {lastSendException?.Message}",
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Extract helper**
|
||||||
|
|
||||||
|
Выделить метод `SendBatchMessageAsync` из текущего inline-кода отправки (строки 117–176 в текущем файле), чтобы логика была читаемой и тестируемой.
|
||||||
|
|
||||||
|
**Step 4: Run tests**
|
||||||
|
|
||||||
|
Run: `dotnet test tests/GmRelay.Bot.Tests/ -v n`
|
||||||
|
|
||||||
|
Expected: все существующие тесты PASS, новая логика не ломает smoke-тест (т.к. smoke-тест не использует реальный `CreateSessionHandler`).
|
||||||
|
|
||||||
|
**Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs
|
||||||
|
git commit -m "fix(#19): retry batch message send and prevent orphaned sessions without batch_message_id"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 5: RED — smoke-тест полного landing-сценария с явными датами
|
||||||
|
|
||||||
|
**Objective:** Дополнить `TelegramLandingPromisesSmokeTests` полным сквозным сценарием: парсинг → публикация → запись → выход → проверка карточки.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs`
|
||||||
|
|
||||||
|
**Step 1: Write failing test**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public void Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle()
|
||||||
|
{
|
||||||
|
var nowUtc = new DateTimeOffset(2026, 5, 1, 12, 0, 0, TimeSpan.Zero);
|
||||||
|
var text = """
|
||||||
|
/newsession
|
||||||
|
Название: Landing Explicit Batch
|
||||||
|
Время: 15.05.2026 19:30
|
||||||
|
Время: 22.05.2026 19:30
|
||||||
|
Мест: 3
|
||||||
|
Ссылка: https://example.test/explicit
|
||||||
|
""";
|
||||||
|
|
||||||
|
var parseResult = NewSessionCommandParser.Parse(text, nowUtc);
|
||||||
|
Assert.True(parseResult.IsValid);
|
||||||
|
Assert.Equal(2, parseResult.ScheduledTimes.Count);
|
||||||
|
Assert.Equal(3, parseResult.MaxPlayers);
|
||||||
|
|
||||||
|
var scenario = TelegramLandingSmokeScenario.Publish(parseResult, SessionNotificationMode.GroupAndDirect);
|
||||||
|
Assert.Contains("Landing Explicit Batch", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("15 мая 2026, 19:30", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("22 мая 2026, 19:30", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("Места: 0/3", scenario.LastMessage.Text);
|
||||||
|
|
||||||
|
var callbacks = CallbackData(scenario.LastMessage.Markup);
|
||||||
|
Assert.Equal(4, callbacks.Count); // join+leave для каждой из 2 сессий
|
||||||
|
|
||||||
|
var firstSessionId = scenario.Sessions[0].Id;
|
||||||
|
var alice = scenario.Join(firstSessionId, 1001, "Alice", "alice");
|
||||||
|
var bob = scenario.Join(firstSessionId, 1002, "Bob", "bob");
|
||||||
|
var carol = scenario.Join(firstSessionId, 1003, "Carol", "carol");
|
||||||
|
|
||||||
|
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, alice));
|
||||||
|
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, bob));
|
||||||
|
Assert.Equal(ParticipantRegistrationStatus.Waitlisted, scenario.RegistrationStatus(firstSessionId, carol));
|
||||||
|
Assert.Contains("Места: 2/3", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@alice", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@bob", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@carol", scenario.LastMessage.Text);
|
||||||
|
|
||||||
|
scenario.Leave(firstSessionId, alice);
|
||||||
|
Assert.False(scenario.HasParticipant(firstSessionId, alice));
|
||||||
|
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, carol));
|
||||||
|
Assert.DoesNotContain("@alice", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@carol", scenario.LastMessage.Text);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Run test to verify failure**
|
||||||
|
|
||||||
|
Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle" -v n`
|
||||||
|
|
||||||
|
Expected: PASS (функциональность уже существует, тест добавляет регрессионное покрытие).
|
||||||
|
|
||||||
|
**Step 3: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs
|
||||||
|
git commit -m "test(#19): full lifecycle smoke test for explicit-dates landing batch"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 6: Проверка и обновление `/help` текста
|
||||||
|
|
||||||
|
**Objective:** Убедиться, что текст `/help` точно отражает landing-формат и упоминает batch-сценарий.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs`
|
||||||
|
|
||||||
|
**Step 1: Read current `/help` text**
|
||||||
|
|
||||||
|
Текущий `/help` уже содержит:
|
||||||
|
```
|
||||||
|
/newsession
|
||||||
|
Название: My Game
|
||||||
|
Время: 15.05.2026 19:30
|
||||||
|
Время: 22.05.2026 19:30
|
||||||
|
Мест: 4
|
||||||
|
Ссылка: https://link
|
||||||
|
Картинка: https://cover
|
||||||
|
|
||||||
|
Для регулярного расписания можно указать одну дату:
|
||||||
|
Игр: 4
|
||||||
|
Интервал: 7
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Verify alignment**
|
||||||
|
|
||||||
|
- Формат совпадает с лендингом ✓
|
||||||
|
- Упоминается `Мест:` ✓
|
||||||
|
- Упоминается несколько `Время:` ✓
|
||||||
|
- Упоминается `Ссылка:` ✓
|
||||||
|
|
||||||
|
Никаких изменений не требуется. Если тестировщик считает, что help недостаточно явно описывает batch-сценарий — добавить заголовок:
|
||||||
|
```
|
||||||
|
<b>Создать набор сессий (batch):</b>
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Commit (если изменения были)**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs
|
||||||
|
git commit -m "docs(#19): clarify batch scenario in /help text"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 7: Финальный прогон и cleanup
|
||||||
|
|
||||||
|
**Objective:** Убедиться, что все тесты проходят, нет warnings, и план соответствует acceptance criteria.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Все изменённые файлы
|
||||||
|
|
||||||
|
**Step 1: Run full test suite**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dotnet test tests/GmRelay.Bot.Tests/ -v n
|
||||||
|
```
|
||||||
|
|
||||||
|
Expected: все тесты PASS.
|
||||||
|
|
||||||
|
**Step 2: Verify checklist**
|
||||||
|
|
||||||
|
- [ ] `Parse_ShouldHandleLandingBatchWithMultipleExplicitDates` — PASS
|
||||||
|
- [ ] `Render_ShouldProduceLandingBatchCardWithAllRequiredElements` — PASS
|
||||||
|
- [ ] `Smoke_InvalidNewSession_ShouldNotPublishAnySessions` — PASS
|
||||||
|
- [ ] `Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle` — PASS
|
||||||
|
- [ ] Все существующие тесты — PASS
|
||||||
|
- [ ] `CreateSessionHandler` обрабатывает сбой отправки batch-сообщения (retry + fallback)
|
||||||
|
- [ ] `/help` текст соответствует landing-формату
|
||||||
|
- [ ] Никаких новых warnings при сборке
|
||||||
|
|
||||||
|
**Step 3: Commit финальный**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add -A
|
||||||
|
git commit -m "feat(#19): align /newsession with landing batch scenario — tests + atomicity fix"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Acceptance Criteria Verification
|
||||||
|
|
||||||
|
| Критерий | Статус | Покрытие |
|
||||||
|
|---|---|---|
|
||||||
|
| Мастер может создать batch из нескольких дат | ✅ Реализовано | Task 1, Task 5 |
|
||||||
|
| Карточка содержит название, даты, лимит, заполненность, действия | ✅ Реализовано | Task 2, Task 5 |
|
||||||
|
| Ошибки ввода не создают частичных сессий | ✅ Реализовано (валидация до транзакции) | Task 3 |
|
||||||
|
| Сбой публикации карточки не оставляет «висячие» сессии без `batch_message_id` | 🔄 Фиксится | Task 4 |
|
||||||
|
|
||||||
|
## Execution Handoff
|
||||||
|
|
||||||
|
Plan complete and saved to `.hermes/plans/gmrelay-issue-19.md`. Ready to execute using subagent-driven-development — dispatch a fresh subagent per task with two-stage review (spec compliance then code quality). Shall I proceed?
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.8.2</Version>
|
<Version>1.11.0</Version>
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
|||||||
@@ -4,195 +4,132 @@
|
|||||||
|
|
||||||
Проект разработан с упором на производительность, архитектуру Vertical Slice, Native AOT (для бота) и удобство развертывания с использованием .NET Aspire.
|
Проект разработан с упором на производительность, архитектуру Vertical Slice, Native AOT (для бота) и удобство развертывания с использованием .NET Aspire.
|
||||||
|
|
||||||
**Текущая версия:** `v1.8.2`.
|
**Текущая версия:** `v1.10.2`.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## ✨ Ключевые возможности
|
## ✨ Key Features
|
||||||
|
|
||||||
### 🤖 Telegram Бот
|
### 🤖 Telegram Bot
|
||||||
- **📅 Создание расписаний (Batch Sessions)**: Создавайте сразу несколько игр одним сообщением (на неделю или месяц вперед).
|
- **📅 Создание расписаний (Batch Sessions)**: Создавайте сразу несколько игр одним сообщением изменения (на недельный месяц в перед).
|
||||||
|
- **🖼 Обложки расписаний**: И batch-посту можно прикрепить фото к `/newsession` или указать строку `Картинка: https://...`; бот отправит обложку перед сообщением записи.
|
||||||
- **⚡ Быстрые повторы расписания**: Для регулярной кампании можно указать одну дату, количество игр и интервал, а бот сам развернёт повторяющийся batch.
|
- **⚡ Быстрые повторы расписания**: Для регулярной кампании можно указать одну дату, количество игр и интервал, а бот сам развернёт повторяющийся batch.
|
||||||
- **✋ Интерактивная запись и выход**: Игроки записываются на конкретные даты и самостоятельно снимают запись нажатием одной кнопки.
|
- **✋ Интерактивная запись и выход**: Игроки записываются на конкретные даты и самостоятельно снимают запись нажатием одной кнопки.
|
||||||
- **👥 Лимит мест и лист ожидания**: ГМ задаёт максимальный состав, бот не переполняет сессию, автоматически ведёт очередь ожидания и освобождённое место отдаёт первому ожидающему.
|
- **👥 Лимит мест и лист ожидания**: ГМ задаёт максимальный состав, бот не переполняет сессию, автоматически ведёт очередь ожидания и освобождённое место отдаёт первому ожидающему.
|
||||||
- **📁 Поддержка Форумов (Telegram Topics)**: Бот автоматически создает тему во вложенных чатах Telegram под каждую новую пачку игр.
|
- **📁 Поддержка Форумов (Telegram Topics)**: Бот автоматически создает тему во вложенных чатах Telegram под каждую новую пачку игр.
|
||||||
- **❌ Управление сессиями**: Owner и назначенные co-GM могут создавать, отменять, удалять и переносить игры прямо из Telegram.
|
- **❌ Управление сессиями**: Owner и назначенные co-GM могут создавать, отменять, удалять и переносить игры из Telegram через `/listsessions`; публичный пост записи показывает только кнопки игроков.
|
||||||
- **🔄 Голосование за перенос**: При переносе сессии GM предлагает 2-3 новых времени и дедлайн, игроки голосуют кнопками, а бот показывает текущие результаты и применяет победивший вариант.
|
- **🔄 Голосование за перенос**: Быстрый поиск свободного места с через свободное недель и кнопками новых времени и дедлайном.
|
||||||
- **🔔 Персональные уведомления**: Игроки получают DM о RSVP за 24 часа, напоминание за 1 час, ссылку перед игрой, отмены и переносы; групповые уведомления при этом остаются.
|
- **🔔 Уведомления**: Игрок получают за 24 часа, напоминание за 1 час, ссылку перед игрой, отмены и переносы; групповые уведомления при этом остаются.
|
||||||
- **🗓 Экспорт в Календарь**: Генерация файла `.ics` для добавления всех игр в Google, Apple или Яндекс Календарь одной командой.
|
- **🕐 Режим уведомлений batch**: Для каждой пачки можно выбрать `В группе и в личку` или `Только в группе`.
|
||||||
- **🚀 Native AOT**: Скомпилирован в нативный бинарный файл. Мгновенный запуск и минимальное потребление памяти. Идеально для **Raspberry Pi**.
|
|
||||||
|
|
||||||
### 🌐 Web Dashboard (Blazor Server)
|
|
||||||
- **🔐 Авторизация через Telegram**: Безопасный вход с использованием Telegram Login Widget (HMAC-SHA256 валидация).
|
|
||||||
- **📝 Удобное редактирование**: Веб-интерфейс для детального редактирования сессий, изменения дат, названий и статусов.
|
|
||||||
- **🤝 Co-GM и делегирование**: Owner группы назначает помощников по Telegram ID, а co-GM получает доступ к управлению расписанием в Telegram и Web Dashboard.
|
|
||||||
- **📋 Шаблоны кампаний**: Owner и co-GM управляют типовыми параметрами кампаний в отдельной вкладке `Шаблоны`, а на странице группы запускают новый повторяющийся batch из выбранного шаблона.
|
|
||||||
- **🧩 Bulk-операции для Batch Sessions**: ГМ может обновить общий title/link, перенести всю пачку на фиксированный шаг и клонировать batch на следующую неделю или месяц.
|
|
||||||
- **🔕 Режим уведомлений batch**: Для каждой пачки можно выбрать `В группе и в личку` или `Только в группе`.
|
|
||||||
- **⬆️ Управление очередью**: Веб-интерфейс показывает заполненность, лист ожидания и позволяет ГМу поднять первого игрока из очереди.
|
- **⬆️ Управление очередью**: Веб-интерфейс показывает заполненность, лист ожидания и позволяет ГМу поднять первого игрока из очереди.
|
||||||
- **🔄 Автоматическая синхронизация**: Любые изменения в веб-интерфейсе мгновенно обновляют сообщения с расписанием в Telegram-чатах игроков.
|
- **🔄 Автоматическая синхронизация**: Любые изменения в веб-интерфейсе мгновенно обновляют сообщения с расписанием в Telegram-чатах игроков.
|
||||||
- **🕒 Управление временем**: UI адаптирован под московское время (UTC+3), в то время как база данных работает в UTC.
|
|
||||||
|
### 🌐 Web Dashboard (Blazor Server)
|
||||||
|
- **🔐 Авторизация через Telegram**: Telegram Login Widget с HMAC-SHA256 валидацией.
|
||||||
|
- **📱 Telegram Mini App Dashboard**: Мобильная панель открывается из Telegram, проверяет `initData` на сервере, учитывает safe-area телефона и верхнюю панель Telegram.
|
||||||
|
- **✏️ Редактирование**: Детальное изменение дат, названий и статусов сессий.
|
||||||
|
- **🤝 Co-GM и делегирование**: Owner назначает помощников по Telegram ID; co-GM управляет расписанием, но **не может назначать других co-GM**.
|
||||||
|
- **📋 Шаблоны кампаний**: Вкладка `Шаблоны` отдельно от страницы группы: сохранение типовых параметров и запуск нового batch из шаблона.
|
||||||
|
- **📦 Bulk-операции для Batch Sessions**:
|
||||||
|
- обновить общий `title`/`link` у всей пачки;
|
||||||
|
- перенести пачку на фиксированный шаг в днях;
|
||||||
|
- клонировать batch на следующую неделю или месяц.
|
||||||
|
- **⬆️ Управление очередью**: Заполненность, лист ожидания и ручное повышение игрока из очереди.
|
||||||
|
- **📜 История изменений сессий**: Страница `/session/{id}/history` показывает аудит-лог всех значимых изменений (время, ссылка, название, участники, статус) с указанием акторов и дат.
|
||||||
|
- **📊 Статистика посещаемости**: Страница `/group/{id}/stats` показывает долю присутствия, количество пропусков и среднюю явку по каждому игроку группы.
|
||||||
|
- **🔄 Автосинхронизация**: Изменения в вебе мгновенно перерисовывают Telegram-сообщения расписания.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 🛠 Технологический стек
|
## 🛠 Технологический стек
|
||||||
|
|
||||||
- **Язык**: C# 14 (.NET 10)
|
| Компонент | Технология |
|
||||||
- **Архитектура**: Vertical Slice Architecture, общая библиотека (`GmRelay.Shared`) для доменной логики.
|
|---|---|
|
||||||
- **Бот**: Telegram.Bot, Native AOT.
|
| Язык | C# 14 (.NET 10) |
|
||||||
- **Веб-интерфейс**: Blazor Server.
|
| Архитектура | Vertical Slice + общая библиотека `GmRelay.Shared` |
|
||||||
- **Оркестрация**: .NET Aspire (`GmRelay.AppHost`).
|
| Бот | Telegram.Bot, **Native AOT** |
|
||||||
- **База данных**: PostgreSQL
|
| Веб | Blazor Server |
|
||||||
- **ORM**: Dapper (с использованием Dapper.AOT для source generators).
|
| Оркестрация | .NET Aspire (`GmRelay.AppHost`) |
|
||||||
- **Миграции**: DbUp.
|
| БД | PostgreSQL |
|
||||||
- **Развертывание**: Docker Compose + Multi-arch (AMD64/ARM64).
|
| ORM | Dapper + **Dapper.AOT** (source generators) |
|
||||||
|
| Миграции | DbUp |
|
||||||
|
| Развёртывание | Docker Compose, Multi-arch (**AMD64/ARM64**) |
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> При использовании Dapper в режиме Native AOT все SQL-запросы используют строго типизированные DTO; динамические типы (`dynamic`) не поддерживаются.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 🚀 Быстрый старт (Docker Compose)
|
## 🚀 Быстрый старт (Docker Compose)
|
||||||
|
|
||||||
Проект использует Docker Compose для одновременного запуска базы данных, бота и веб-интерфейса.
|
**Требования:** Docker и Docker Compose.
|
||||||
|
|
||||||
### 1. Подготовка
|
|
||||||
Убедитесь, что у вас установлены **Docker** и **Docker Compose**.
|
|
||||||
|
|
||||||
### 2. Настройка окружения
|
|
||||||
Скопируйте файл-шаблон и заполните его значениями:
|
|
||||||
|
|
||||||
|
### 1. Настройка окружения
|
||||||
```bash
|
```bash
|
||||||
cp .env.example .env
|
cp .env.example .env
|
||||||
```
|
```
|
||||||
|
|
||||||
Отредактируйте `.env`:
|
**Ключевые переменные `.env`:**
|
||||||
|
|
||||||
```env
|
```env
|
||||||
# Токен вашего бота от @BotFather (используется и для бота, и как секретный ключ для веб-авторизации)
|
# Токен от @BotFather (используется ботом и как секретный ключ веб-авторизации)
|
||||||
TELEGRAM_BOT_TOKEN=ваш_токен_здесь
|
TELEGRAM_BOT_TOKEN=ваш_токен_здесь
|
||||||
|
|
||||||
# Имя вашего бота в Telegram (без @), например: GmRelayBot.
|
# Имя бота без @ (для Telegram Login Widget)
|
||||||
# Найти его можно в информации о боте у @BotFather.
|
|
||||||
# Используется для работы виджета авторизации (Telegram Login Widget).
|
|
||||||
TELEGRAM_BOT_USERNAME=ваше_имя_бота_здесь
|
TELEGRAM_BOT_USERNAME=ваше_имя_бота_здесь
|
||||||
|
|
||||||
# Пароль для базы данных PostgreSQL
|
# HTTPS URL Mini App, например https://your-domain.example/miniapp
|
||||||
POSTGRES_PASSWORD=ваш_надежный_пароль
|
TELEGRAM_MINI_APP_URL=https://your-domain.example/miniapp
|
||||||
|
|
||||||
# Локальный порт веб-интерфейса GM-Relay
|
POSTGRES_PASSWORD=ваш_надежный_пароль
|
||||||
GMRELAY_WEB_PORT=8080
|
GMRELAY_WEB_PORT=8080
|
||||||
```
|
```
|
||||||
|
|
||||||
*(Опционально)* Настройте домен Telegram бота в @BotFather командой `/setdomain` для работы виджета авторизации на вашем сайте.
|
**Настройка в @BotFather:**
|
||||||
|
- Команда `/setdomain` для работы виджета авторизации на вашем домене.
|
||||||
|
- Для Mini App настройте домен Web Dashboard и menu button на URL из `TELEGRAM_MINI_APP_URL`.
|
||||||
|
- Начиная с **v1.9.3** дополнительных действий для фикса входа не требуется: fallback выполняется внутри активного Telegram WebView по тому же HTTPS-адресу `/miniapp`.
|
||||||
|
|
||||||
### 3. Запуск
|
### 2. Запуск
|
||||||
Выполните команду:
|
|
||||||
```bash
|
```bash
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
```
|
```
|
||||||
Инфраструктура автоматически:
|
|
||||||
- Создаст локальную Docker-сеть и volume PostgreSQL, если их ещё нет.
|
**Автоматически выполняется:**
|
||||||
- Поднимет PostgreSQL, доступный для контейнеров как `db:5432`.
|
- создание Docker-сети и volume PostgreSQL;
|
||||||
- Запустит бота (применив миграции БД).
|
- подъём PostgreSQL (`db:5432`);
|
||||||
- Запустит веб-интерфейс на `http://localhost:8080` или другом порту из `GMRELAY_WEB_PORT`.
|
- запуск бота с плавной миграцией (DbUp);
|
||||||
|
- запуск веб-приложения с подключением к БД и Telegram API.
|
||||||
|
|
||||||
|
### 3. Первоначальная настройка
|
||||||
|
1. Напишите боту `/start`.
|
||||||
|
2. Создайте группу через `/newgroup`.
|
||||||
|
3. Откройте Mini App или Web Dashboard для расширенного управления.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## ⚙️ Настройка бота в Telegram
|
## 🗂 Структура репозитория
|
||||||
|
|
||||||
Чтобы бот работал корректно:
|
|
||||||
1. **Добавьте бота в группу** (или Супергруппу/Форум).
|
|
||||||
2. **Назначьте бота Администратором**.
|
|
||||||
3. **Необходимые права**:
|
|
||||||
* `Выбор тем` (Managed Topics) — **обязательно** для Форумов.
|
|
||||||
* `Отправка сообщений`.
|
|
||||||
* `Закрепление сообщений` — рекомендуется.
|
|
||||||
|
|
||||||
> [!TIP]
|
|
||||||
> Owner группы определяется по первому человеку, который создал сессию в этой группе. Owner может назначать co-GM в Web Dashboard; owner и co-GM могут управлять сессиями через кнопки бота и веб-интерфейс.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📝 Инструкция для Мастера
|
|
||||||
|
|
||||||
### Создание расписания игр
|
|
||||||
Используйте команду `/newsession` с описанием в следующем формате:
|
|
||||||
|
|
||||||
```text
|
|
||||||
/newsession
|
|
||||||
Название: Легенды Берега Мечей (D&D 5e)
|
|
||||||
Время: 15.05.2024 19:30
|
|
||||||
Время: 22.05.2024 19:00
|
|
||||||
Мест: 4
|
|
||||||
Ссылка: https://discord.gg/invite-link
|
|
||||||
```
|
```
|
||||||
|
├── src/
|
||||||
Строка `Мест:` необязательна. Если она указана, игроки сверх лимита попадут в лист ожидания, а ГМ сможет повысить первого ожидающего через кнопку в Telegram или Web Dashboard.
|
│ ├── GmRelay.AppHost/ # .NET Aspire orchestrator
|
||||||
|
│ ├── GmRelay.Bot/ # Telegram-бот (Native AOT)
|
||||||
Для регулярной кампании можно не перечислять все даты вручную. Укажите одну строку `Время:`, количество игр и интервал в днях:
|
│ ├── GmRelay.Migrator/ # DbUp-миграции
|
||||||
|
│ ├── GmRelay.ServiceDefaults/ # Aspire service defaults
|
||||||
```text
|
│ ├── GmRelay.Shared/ # Общие доменные модели
|
||||||
/newsession
|
│ ├── GmRelay.Web/ # Blazor Server dashboard
|
||||||
Название: Kingmaker
|
│ └── GmRelay.Worker/ # Background workers
|
||||||
Время: 30.04.2026 19:30
|
├── tests/
|
||||||
Игр: 6
|
│ └── GmRelay.Bot.Tests/ # xUnit + NSubstitute
|
||||||
Интервал: 7
|
├── compose.yaml # Docker Compose (AMD64 + ARM64)
|
||||||
Мест: 5
|
└── .env.example # Шаблон переменных окружения
|
||||||
Ссылка: https://discord.gg/invite-link
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Бот создаст 6 игр с недельным шагом. Вместо `Игр:` также принимается `Сессий:` или `Повторов:`, вместо `Интервал:` — `Шаг:`.
|
|
||||||
|
|
||||||
Игрок может самостоятельно снять запись кнопкой `🚪 Выйти` в сообщении расписания. Если он был в основном составе и в листе ожидания есть игроки, бот автоматически переводит первого ожидающего в основной состав и обновляет сообщение пачки.
|
|
||||||
|
|
||||||
### Делегирование управления
|
|
||||||
На странице группы Web Dashboard показывает owner и список co-GM. Owner может добавить помощника по Telegram ID, имени и username, а также снять роль co-GM. Назначенный co-GM видит группу в панели управления и может редактировать сессии, управлять batch-операциями, очередью, переносами и удалением игр, но не может назначать других co-GM.
|
|
||||||
|
|
||||||
### Перенос сессии голосованием
|
|
||||||
Owner или co-GM нажимает кнопку `⏰ Перенести` у нужной сессии и отправляет в чат 2-3 варианта нового времени вместе с дедлайном:
|
|
||||||
|
|
||||||
```text
|
|
||||||
25.04.2026 19:30
|
|
||||||
26.04.2026 18:00
|
|
||||||
Дедлайн: 25.04.2026 12:00
|
|
||||||
```
|
|
||||||
|
|
||||||
Дедлайн должен быть в будущем и раньше первого предложенного времени. Участники выбирают один вариант кнопкой в Telegram, могут изменить голос до дедлайна и видят текущие результаты в сообщении голосования. По дедлайну бот выбирает вариант с наибольшим числом голосов, переносит сессию, сбрасывает RSVP и обновляет batch-сообщение. Если голосов нет или есть ничья, перенос отклоняется, а время сессии остаётся прежним.
|
|
||||||
|
|
||||||
### Шаблоны и bulk-операции в Web Dashboard
|
|
||||||
Вкладка `Шаблоны` в левом меню вынесена отдельно от страницы группы. Owner и co-GM выбирают группу, сохраняют шаблон кампании с названием, ссылкой, количеством игр, интервалом, лимитом мест и режимом уведомлений, а также удаляют устаревшие шаблоны.
|
|
||||||
|
|
||||||
На странице группы Web Dashboard показывает только применение сохранённых шаблонов и отдельный блок для каждой пачки игр. Owner и co-GM могут:
|
|
||||||
- создать новый batch из шаблона, выбрав только первую дату расписания;
|
|
||||||
- обновить общий `title` и `link` сразу у всех сессий batch;
|
|
||||||
- выбрать режим уведомлений: дублировать важные сообщения игрокам в личку или оставить только групповые уведомления;
|
|
||||||
- перенести пачку, задав новую первую дату и фиксированный шаг между играми в днях;
|
|
||||||
- клонировать batch на следующую неделю или следующий календарный месяц.
|
|
||||||
|
|
||||||
После создания из шаблона или клонирования появляется новая пачка с новым Telegram-сообщением и пустым составом игроков. После редактирования или переноса исходное Telegram-сообщение расписания перерисовывается.
|
|
||||||
|
|
||||||
Если включён режим `В группе и в личку`, бот дополнительно отправляет игрокам персональные сообщения о RSVP за 24 часа, напоминание за 1 час, ссылку перед стартом, отмену и перенос. Если Telegram не позволяет написать игроку в ЛС, бот логирует ошибку и продолжает отправку остальным участникам.
|
|
||||||
|
|
||||||
### Другие команды
|
|
||||||
- `/listsessions` — Показать список всех актуальных игр в этой группе.
|
|
||||||
- `⏰ Перенести` в сообщении расписания — Запустить голосование по 2-3 вариантам нового времени.
|
|
||||||
- `/deletesession` — Удалить сессию.
|
|
||||||
- `/exportcalendar` — Получить `.ics` файл с играми.
|
|
||||||
- `/help` — Справка по формату.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🏗 Разработка и запуск локально (.NET Aspire)
|
|
||||||
|
|
||||||
Для локальной разработки проще всего использовать .NET Aspire:
|
|
||||||
|
|
||||||
1. Установите [.NET 10 SDK](https://dotnet.microsoft.com/download/dotnet/10.0) и workload Aspire.
|
|
||||||
2. Откройте решение `GM-Relay.slnx`.
|
|
||||||
3. Установите переменные окружения (или user secrets) для `GmRelay.AppHost`.
|
|
||||||
4. Запустите проект `GmRelay.AppHost`. Aspire Dashboard запустится автоматически, предоставляя удобный мониторинг БД, бота и веб-интерфейса.
|
|
||||||
|
|
||||||
> [!NOTE]
|
|
||||||
> При использовании **Dapper** в режиме Native AOT, все SQL-запросы используют строго типизированные DTO. Динамические типы (`dynamic`) не поддерживаются.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 📜 Лицензия
|
## 📜 Лицензия
|
||||||
Проект распространяется под лицензией MIT. Использование в некоммерческих целях приветствуется.
|
|
||||||
|
MIT License. См. [LICENSE](./LICENSE).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
*Построено с ❤️ для TTRPG-сообщества.*
|
||||||
|
|||||||
+4
-2
@@ -17,7 +17,7 @@ services:
|
|||||||
retries: 10
|
retries: 10
|
||||||
|
|
||||||
bot:
|
bot:
|
||||||
image: git.codeanddice.ru/toutsu/gmrelay-bot:1.8.2
|
image: git.codeanddice.ru/toutsu/gmrelay-bot:1.11.0
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
@@ -25,11 +25,12 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- "ConnectionStrings__gmrelaydb=Host=db;Port=5432;Database=gmrelay_db;Username=gmrelay;Password=${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in .env}"
|
- "ConnectionStrings__gmrelaydb=Host=db;Port=5432;Database=gmrelay_db;Username=gmrelay;Password=${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in .env}"
|
||||||
- "Telegram__BotToken=${TELEGRAM_BOT_TOKEN:?Set TELEGRAM_BOT_TOKEN in .env}"
|
- "Telegram__BotToken=${TELEGRAM_BOT_TOKEN:?Set TELEGRAM_BOT_TOKEN in .env}"
|
||||||
|
- "Telegram__MiniAppUrl=${TELEGRAM_MINI_APP_URL:-}"
|
||||||
networks:
|
networks:
|
||||||
- gmrelay
|
- gmrelay
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: git.codeanddice.ru/toutsu/gmrelay-web:1.8.2
|
image: git.codeanddice.ru/toutsu/gmrelay-web:1.11.0
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
@@ -38,6 +39,7 @@ services:
|
|||||||
- "ConnectionStrings__gmrelaydb=Host=db;Port=5432;Database=gmrelay_db;Username=gmrelay;Password=${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in .env}"
|
- "ConnectionStrings__gmrelaydb=Host=db;Port=5432;Database=gmrelay_db;Username=gmrelay;Password=${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in .env}"
|
||||||
- "Telegram__BotToken=${TELEGRAM_BOT_TOKEN:?Set TELEGRAM_BOT_TOKEN in .env}"
|
- "Telegram__BotToken=${TELEGRAM_BOT_TOKEN:?Set TELEGRAM_BOT_TOKEN in .env}"
|
||||||
- "Telegram__BotUsername=${TELEGRAM_BOT_USERNAME:?Set TELEGRAM_BOT_USERNAME in .env}"
|
- "Telegram__BotUsername=${TELEGRAM_BOT_USERNAME:?Set TELEGRAM_BOT_USERNAME in .env}"
|
||||||
|
- "Telegram__MiniAppUrl=${TELEGRAM_MINI_APP_URL:-}"
|
||||||
ports:
|
ports:
|
||||||
- "${GMRELAY_WEB_PORT:-8080}:8080"
|
- "${GMRELAY_WEB_PORT:-8080}:8080"
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
# ADR 002: Platform-Neutral Batch Rendering
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
**Accepted** — implemented in v1.10.0 (PR #42).
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
`SessionBatchRenderer` жил в `GmRelay.Shared` и напрямую зависел от `Telegram.Bot` (`InlineKeyboardMarkup`, `ParseMode.Html`). Это создавало проблемы:
|
||||||
|
|
||||||
|
1. **Shared не был platform-neutral.** Любой платформенный проект (Discord, Slack, WebSocket) тащил Telegram-зависимость.
|
||||||
|
2. **Дублирование логики.** `GmRelay.Web` использовал тот же рендерер через прямую зависимость от `Shared`, но Web — это не Telegram-клиент.
|
||||||
|
3. **Невозможно написать unit-тесты без Telegram-объектов.** Smoke-тесты создавали InlineKeyboardMarkup даже для проверки чисто доменной логики.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
Разделить рендеринг на две стадии:
|
||||||
|
|
||||||
|
1. **View Builder (platform-neutral)** — собирает view model из доменных DTO.
|
||||||
|
2. **Platform Renderer (platform-specific)** — превращает view model в платформенное представление.
|
||||||
|
|
||||||
|
```
|
||||||
|
Domain DTOs
|
||||||
|
│
|
||||||
|
▼
|
||||||
|
SessionBatchViewBuilder (Shared)
|
||||||
|
│
|
||||||
|
▼
|
||||||
|
SessionBatchViewModel (platform-neutral)
|
||||||
|
│
|
||||||
|
├──► TelegramSessionBatchRenderer ──► HTML + InlineKeyboardMarkup
|
||||||
|
│
|
||||||
|
└──► DiscordSessionBatchRenderer ──► (issue #26)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Изменённые компоненты
|
||||||
|
|
||||||
|
| Компонент | Было | Стало |
|
||||||
|
|---|---|---|
|
||||||
|
| `SessionBatchRenderer` | `GmRelay.Shared.Rendering` | Удалён |
|
||||||
|
| `SessionBatchViewBuilder` | — | `GmRelay.Shared.Rendering` |
|
||||||
|
| `SessionBatchViewModel` | — | `GmRelay.Shared.Rendering` |
|
||||||
|
| `TelegramSessionBatchRenderer` | — | `GmRelay.Bot` + `GmRelay.Web` |
|
||||||
|
| `DiscordSessionBatchRenderer` | — | `GmRelay.Shared.Rendering` (stub) |
|
||||||
|
| `BatchMessageEditor` | `GmRelay.Shared.Rendering` | `GmRelay.Bot` + `GmRelay.Web` |
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
### Positive
|
||||||
|
|
||||||
|
- `GmRelay.Shared` больше не зависит от `Telegram.Bot`. Чистый platform-agnostic проект.
|
||||||
|
- Можно добавить `DiscordSessionBatchRenderer` без изменений в `Shared`.
|
||||||
|
- Unit-тесты ViewBuilder не создают `InlineKeyboardMarkup`.
|
||||||
|
- Логика подсчёта игроков, сортировки сессий и генерации действий — в одном месте (ViewBuilder).
|
||||||
|
|
||||||
|
### Negative
|
||||||
|
|
||||||
|
- **Временное дублирование.** `TelegramSessionBatchRenderer` и `BatchMessageEditor` скопированы в `Bot` и `Web`. Планируется вынести в `GmRelay.Shared.Telegram` при появлении третьего Telegram-потребителя.
|
||||||
|
- **Дополнительная стадия.** Теперь два вызова вместо одного: `Build` + `Render`. Этоtrade-off за чистоту абстракции.
|
||||||
|
|
||||||
|
## Related
|
||||||
|
|
||||||
|
- Issue #22 — этот рефакторинг.
|
||||||
|
- Issue #26 — Discord Bot MVP (потребитель новой архитектуры).
|
||||||
|
- ADR 001 — vertical slice, native AOT, Aspire (`docs/adr/0001-use-vertical-slice-native-aot-and-aspire.md`).
|
||||||
@@ -0,0 +1,438 @@
|
|||||||
|
# Player List + Kick + Waitlist Promotion Implementation Plan
|
||||||
|
|
||||||
|
> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task.
|
||||||
|
|
||||||
|
**Goal:** Add a player list (with names) to the Web UI session views, allow GM to kick a specific player, and auto-promote the next waitlisted player.
|
||||||
|
|
||||||
|
**Architecture:** Extend `ISessionStore` with participant queries and a remove method. Update `GroupDetails.razor` to show expandable participant lists. Reuse existing `PromoteWaitlistedPlayerAsync` logic after removal.
|
||||||
|
|
||||||
|
**Tech Stack:** C# 14, Blazor SSR, Dapper, PostgreSQL
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 1: Add domain model for WebParticipant
|
||||||
|
|
||||||
|
**Objective:** Create a DTO to represent a session participant in the web layer.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Web/Services/SessionService.cs`
|
||||||
|
|
||||||
|
**Step 1: Add record**
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public sealed record WebParticipant(
|
||||||
|
Guid Id,
|
||||||
|
long TelegramId,
|
||||||
|
string DisplayName,
|
||||||
|
string? TelegramUsername,
|
||||||
|
string RsvpStatus,
|
||||||
|
string RegistrationStatus,
|
||||||
|
bool IsGm,
|
||||||
|
DateTime? RespondedAt);
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Web/Services/SessionService.cs
|
||||||
|
git commit -m "feat: add WebParticipant record"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 2: Add GetSessionParticipantsAsync to ISessionStore
|
||||||
|
|
||||||
|
**Objective:** Retrieve all participants for a session with full player info.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Web/Services/ISessionStore.cs`
|
||||||
|
- Modify: `src/GmRelay.Web/Services/SessionService.cs`
|
||||||
|
- Modify: `src/GmRelay.Web/Services/AuthorizedSessionService.cs`
|
||||||
|
|
||||||
|
**Step 1: Add to interface**
|
||||||
|
|
||||||
|
In `ISessionStore.cs`, add:
|
||||||
|
```csharp
|
||||||
|
Task<List<WebParticipant>> GetSessionParticipantsAsync(Guid sessionId);
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Implement in SessionService**
|
||||||
|
|
||||||
|
In `SessionService.cs`, add:
|
||||||
|
```csharp
|
||||||
|
public async Task<List<WebParticipant>> GetSessionParticipantsAsync(Guid sessionId)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
return (await conn.QueryAsync<WebParticipant>(
|
||||||
|
"""
|
||||||
|
SELECT sp.id AS Id,
|
||||||
|
p.telegram_id AS TelegramId,
|
||||||
|
p.display_name AS DisplayName,
|
||||||
|
p.telegram_username AS TelegramUsername,
|
||||||
|
sp.rsvp_status AS RsvpStatus,
|
||||||
|
sp.registration_status AS RegistrationStatus,
|
||||||
|
sp.is_gm AS IsGm,
|
||||||
|
sp.responded_at AS RespondedAt
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN players p ON p.id = sp.player_id
|
||||||
|
WHERE sp.session_id = @SessionId
|
||||||
|
ORDER BY sp.is_gm DESC,
|
||||||
|
CASE sp.registration_status WHEN 'Active' THEN 0 ELSE 1 END,
|
||||||
|
sp.created_at
|
||||||
|
""",
|
||||||
|
new { SessionId = sessionId })).ToList();
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Add authorized wrapper**
|
||||||
|
|
||||||
|
In `AuthorizedSessionService.cs`, add:
|
||||||
|
```csharp
|
||||||
|
public async Task<List<WebParticipant>?> GetSessionParticipantsForGmAsync(Guid sessionId, long gmId)
|
||||||
|
{
|
||||||
|
var session = await GetSessionForGmAsync(sessionId, gmId);
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return await sessionStore.GetSessionParticipantsAsync(sessionId);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Web/Services/ISessionStore.cs
|
||||||
|
|
||||||
|
git add src/GmRelay.Web/Services/SessionService.cs
|
||||||
|
|
||||||
|
git add src/GmRelay.Web/Services/AuthorizedSessionService.cs
|
||||||
|
|
||||||
|
git commit -m "feat: add GetSessionParticipantsAsync"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 3: Add RemovePlayerFromSessionAsync with waitlist promotion
|
||||||
|
|
||||||
|
**Objective:** Allow GM to remove a specific player; auto-promote next waitlisted player if conditions met.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Web/Services/ISessionStore.cs`
|
||||||
|
- Modify: `src/GmRelay.Web/Services/SessionService.cs`
|
||||||
|
- Modify: `src/GmRelay.Web/Services/AuthorizedSessionService.cs`
|
||||||
|
|
||||||
|
**Step 1: Add to interface**
|
||||||
|
|
||||||
|
In `ISessionStore.cs`, add:
|
||||||
|
```csharp
|
||||||
|
Task RemovePlayerFromSessionAsync(Guid sessionId, Guid groupId, Guid participantId);
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Implement in SessionService**
|
||||||
|
|
||||||
|
In `SessionService.cs`, add:
|
||||||
|
```csharp
|
||||||
|
public async Task RemovePlayerFromSessionAsync(Guid sessionId, Guid groupId, Guid participantId)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
await using var transaction = await conn.BeginTransactionAsync();
|
||||||
|
|
||||||
|
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.telegram_chat_id AS TelegramChatId,
|
||||||
|
s.max_players AS MaxPlayers,
|
||||||
|
0 AS ActivePlayerCount,
|
||||||
|
0 AS WaitlistedPlayerCount,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
|
FROM sessions s
|
||||||
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
|
WHERE s.id = @SessionId AND s.group_id = @GroupId
|
||||||
|
FOR UPDATE",
|
||||||
|
new { SessionId = sessionId, GroupId = groupId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(sessionId, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify participant exists in this session
|
||||||
|
var participant = await conn.QuerySingleOrDefaultAsync<WebParticipant>(
|
||||||
|
"""
|
||||||
|
SELECT sp.id AS Id,
|
||||||
|
p.telegram_id AS TelegramId,
|
||||||
|
p.display_name AS DisplayName,
|
||||||
|
p.telegram_username AS TelegramUsername,
|
||||||
|
sp.rsvp_status AS RsvpStatus,
|
||||||
|
sp.registration_status AS RegistrationStatus,
|
||||||
|
sp.is_gm AS IsGm,
|
||||||
|
sp.responded_at AS RespondedAt
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN players p ON p.id = sp.player_id
|
||||||
|
WHERE sp.id = @ParticipantId AND sp.session_id = @SessionId
|
||||||
|
""",
|
||||||
|
new { ParticipantId = participantId, SessionId = sessionId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (participant is null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Участник не найден в этой сессии.");
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wasActive = participant.RegistrationStatus == ParticipantRegistrationStatus.Active;
|
||||||
|
|
||||||
|
await conn.ExecuteAsync(
|
||||||
|
"DELETE FROM session_participants WHERE id = @ParticipantId",
|
||||||
|
new { ParticipantId = participantId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
WebPromotedParticipantDto? promoted = null;
|
||||||
|
|
||||||
|
if (wasActive)
|
||||||
|
{
|
||||||
|
promoted = await conn.QuerySingleOrDefaultAsync<WebPromotedParticipantDto>(
|
||||||
|
"""
|
||||||
|
SELECT sp.id AS ParticipantRowId,
|
||||||
|
p.display_name AS DisplayName
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN players p ON p.id = sp.player_id
|
||||||
|
WHERE sp.session_id = @SessionId
|
||||||
|
AND sp.is_gm = false
|
||||||
|
AND sp.registration_status = @Waitlisted
|
||||||
|
ORDER BY sp.created_at ASC, sp.id ASC
|
||||||
|
LIMIT 1
|
||||||
|
FOR UPDATE OF sp
|
||||||
|
""",
|
||||||
|
new { SessionId = sessionId, Waitlisted = ParticipantRegistrationStatus.Waitlisted },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (promoted is not null)
|
||||||
|
{
|
||||||
|
await conn.ExecuteAsync(
|
||||||
|
"""
|
||||||
|
UPDATE session_participants
|
||||||
|
SET registration_status = @Active,
|
||||||
|
rsvp_status = @Pending,
|
||||||
|
responded_at = NULL
|
||||||
|
WHERE id = @ParticipantRowId
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
promoted.ParticipantRowId,
|
||||||
|
Active = ParticipantRegistrationStatus.Active,
|
||||||
|
Pending = RsvpStatus.Pending
|
||||||
|
},
|
||||||
|
transaction);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
|
||||||
|
// Notifications
|
||||||
|
await bot.SendMessage(
|
||||||
|
session.TelegramChatId,
|
||||||
|
$"🚪 <b>{System.Net.WebUtility.HtmlEncode(participant.DisplayName)}</b> удален(а) из сессии «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
|
||||||
|
|
||||||
|
if (promoted is not null)
|
||||||
|
{
|
||||||
|
await bot.SendMessage(
|
||||||
|
session.TelegramChatId,
|
||||||
|
$"⬆️ <b>{System.Net.WebUtility.HtmlEncode(promoted.DisplayName)}</b> переведен(а) из листа ожидания в основной состав «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (session.BatchMessageId.HasValue)
|
||||||
|
{
|
||||||
|
await TryUpdateBatchMessageAsync(session.BatchId, session.TelegramChatId, session.BatchMessageId.Value, session.Title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Add authorized wrapper**
|
||||||
|
|
||||||
|
In `AuthorizedSessionService.cs`, add:
|
||||||
|
```csharp
|
||||||
|
public async Task RemovePlayerFromSessionForGmAsync(Guid sessionId, long gmId, Guid participantId)
|
||||||
|
{
|
||||||
|
var session = await GetSessionForGmAsync(sessionId, gmId);
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(sessionId, gmId);
|
||||||
|
}
|
||||||
|
|
||||||
|
await sessionStore.RemovePlayerFromSessionAsync(sessionId, session.GroupId, participantId);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Web/Services/ISessionStore.cs
|
||||||
|
|
||||||
|
git add src/GmRelay.Web/Services/SessionService.cs
|
||||||
|
|
||||||
|
git add src/GmRelay.Web/Services/AuthorizedSessionService.cs
|
||||||
|
|
||||||
|
git commit -m "feat: add RemovePlayerFromSessionAsync with waitlist promotion"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 4: Modify GroupDetails.razor to show participant list
|
||||||
|
|
||||||
|
**Objective:** Add expandable player lists to each session row with kick buttons.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Web/Components/Pages/GroupDetails.razor`
|
||||||
|
|
||||||
|
**Step 1:** Add `participants` dictionary and `kickingParticipantId` state variables.
|
||||||
|
|
||||||
|
**Step 2:** Add `LoadParticipants(Guid sessionId)` and `KickParticipant(Guid sessionId, Guid participantId)` methods.
|
||||||
|
|
||||||
|
**Step 3:** In desktop table, add a new column or expand row with participant list.
|
||||||
|
|
||||||
|
**Step 4:** In mobile cards, add expandable participant section.
|
||||||
|
|
||||||
|
**Step 5:** Add styles to `app.css` if needed (badge styles are already present).
|
||||||
|
|
||||||
|
**Step 6:** Commit
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Web/Components/Pages/GroupDetails.razor
|
||||||
|
|
||||||
|
git add src/GmRelay.Web/wwwroot/app.css
|
||||||
|
|
||||||
|
git commit -m "feat: show player list and kick button in GroupDetails"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 5: Modify EditSession.razor to show participant list
|
||||||
|
|
||||||
|
**Objective:** Show participant list on the edit page with kick capability.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Web/Components/Pages/EditSession.razor`
|
||||||
|
|
||||||
|
**Step 1:** Load participants in `OnInitializedAsync`.
|
||||||
|
|
||||||
|
**Step 2:** Render participant list below the edit form.
|
||||||
|
|
||||||
|
**Step 3:** Add kick button for each non-GM participant.
|
||||||
|
|
||||||
|
**Step 4:** Commit
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Web/Components/Pages/EditSession.razor
|
||||||
|
|
||||||
|
git commit -m "feat: show player list and kick button in EditSession"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 6: Add backend tests
|
||||||
|
|
||||||
|
**Objective:** Cover new GetSessionParticipants and RemovePlayerFromSession logic.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `tests/GmRelay.Bot.Tests/Web/SessionParticipantTests.cs`
|
||||||
|
|
||||||
|
**Step 1:** Write tests for `GetSessionParticipantsForGmAsync`.
|
||||||
|
|
||||||
|
**Step 2:** Write tests for `RemovePlayerFromSessionForGmAsync` including waitlist promotion.
|
||||||
|
|
||||||
|
**Step 3:** Run tests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj -v n
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 4:** Commit
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add tests/GmRelay.Bot.Tests/Web/SessionParticipantTests.cs
|
||||||
|
|
||||||
|
git commit -m "test: add SessionParticipant service tests"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 7: Update README
|
||||||
|
|
||||||
|
**Objective:** Bump version and document new features.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `README.md`
|
||||||
|
|
||||||
|
**Step 1:** Change version from `v1.9.6` to `v1.9.7`.
|
||||||
|
|
||||||
|
**Step 2:** Add bullet under Web Dashboard: player list with kick and auto-promote.
|
||||||
|
|
||||||
|
**Step 3:** Commit
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add README.md
|
||||||
|
|
||||||
|
git commit -m "docs: bump README to v1.9.7, document player list kick"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 8: Update Wiki
|
||||||
|
|
||||||
|
**Objective:** Update `Руководство ГМа` page with player management instructions.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: Wiki page `Руководство ГМа`
|
||||||
|
|
||||||
|
**Step 1:** Read current wiki content via MCP.
|
||||||
|
|
||||||
|
**Step 2:** Add section about viewing player list and removing players.
|
||||||
|
|
||||||
|
**Step 3:** Update via MCP.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 9: Push branch and run CI
|
||||||
|
|
||||||
|
**Objective:** Push branch, monitor workflow, fix issues.
|
||||||
|
|
||||||
|
**Step 1:** Push
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git push -u origin feat/player-list-kick-waitlist
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2:** Check workflow run via MCP gitea actions.
|
||||||
|
|
||||||
|
**Step 3:** Fix any issues.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Task 10: Merge and create release
|
||||||
|
|
||||||
|
**Objective:** Merge PR (or fast-forward), tag, create release.
|
||||||
|
|
||||||
|
**Step 1:** Merge to main
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git checkout main
|
||||||
|
|
||||||
|
git merge --no-ff feat/player-list-kick-waitlist -m "feat: player list, kick, and waitlist promotion (#X)"
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2:** Tag v1.9.7
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git tag v1.9.7
|
||||||
|
|
||||||
|
git push origin main --tags
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3:** Create release via MCP gitea_create_release.
|
||||||
|
|
||||||
|
---
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
# Telegram Mini App Dashboard Implementation Plan
|
||||||
|
|
||||||
|
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||||
|
|
||||||
|
**Goal:** Add a Telegram Mini App mobile dashboard that reuses the existing Web Dashboard and validates Telegram WebApp `initData` on the server.
|
||||||
|
|
||||||
|
**Architecture:** Extend `TelegramAuthService` for WebApp init data, add a `/miniapp` Blazor entry page plus `/auth/telegram-webapp` endpoint, and add bot entry points through an inline WebApp button and optional menu button setup. Existing application/domain services remain the only write path.
|
||||||
|
|
||||||
|
**Tech Stack:** .NET 10, Blazor Server, Telegram.Bot, xUnit, Dapper/Npgsql-backed existing services.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: Telegram WebApp Authentication
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Web/Services/TelegramAuthService.cs`
|
||||||
|
- Modify: `src/GmRelay.Web/Program.cs`
|
||||||
|
- Test: `tests/GmRelay.Bot.Tests/Web/TelegramAuthServiceTests.cs`
|
||||||
|
|
||||||
|
- [ ] Write failing tests for valid WebApp `initData`, tampered hash, and expired auth date.
|
||||||
|
- [ ] Run `dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter TelegramAuthServiceTests`.
|
||||||
|
- [ ] Implement WebApp HMAC verification using the Telegram `WebAppData` secret derivation.
|
||||||
|
- [ ] Add `/auth/telegram-webapp` endpoint that signs in using the same claims as `/auth/telegram`.
|
||||||
|
- [ ] Re-run the filtered tests.
|
||||||
|
|
||||||
|
### Task 2: Mini App Entry Page
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `src/GmRelay.Web/Components/Pages/MiniApp.razor`
|
||||||
|
- Modify: `src/GmRelay.Web/Components/App.razor`
|
||||||
|
- Modify: `src/GmRelay.Web/wwwroot/app.css`
|
||||||
|
- Test: `tests/GmRelay.Bot.Tests/Web/MiniAppDashboardTests.cs`
|
||||||
|
|
||||||
|
- [ ] Write failing tests that assert `/miniapp`, `telegram-web-app.js`, `authenticateTelegramMiniApp`, and Mini App CSS hooks exist.
|
||||||
|
- [ ] Run `dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter MiniAppDashboardTests`.
|
||||||
|
- [ ] Implement `/miniapp` to post `Telegram.WebApp.initData` to `/auth/telegram-webapp`, expand/ready the Mini App, and show fallback login when opened outside Telegram.
|
||||||
|
- [ ] Add CSS for a mobile-first Mini App shell and compact dashboard spacing.
|
||||||
|
- [ ] Re-run the filtered tests.
|
||||||
|
|
||||||
|
### Task 3: Bot Entry Points
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `src/GmRelay.Bot/Infrastructure/Telegram/TelegramMiniAppMenuButtonService.cs`
|
||||||
|
- Modify: `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs`
|
||||||
|
- Modify: `src/GmRelay.Bot/Program.cs`
|
||||||
|
- Test: `tests/GmRelay.Bot.Tests/Infrastructure/Telegram/TelegramMiniAppEntryPointTests.cs`
|
||||||
|
|
||||||
|
- [ ] Write failing tests that assert `/start` exposes a WebApp button and startup registers the menu button service.
|
||||||
|
- [ ] Run `dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter TelegramMiniAppEntryPointTests`.
|
||||||
|
- [ ] Add a configurable `Telegram:MiniAppUrl` entry point; when missing, keep existing command behavior.
|
||||||
|
- [ ] Add hosted service that calls `SetChatMenuButton` with `MenuButtonWebApp` only when the URL is configured.
|
||||||
|
- [ ] Re-run the filtered tests.
|
||||||
|
|
||||||
|
### Task 4: Docs, Versions, and Release Prep
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `Directory.Build.props`
|
||||||
|
- Modify: `compose.yaml`
|
||||||
|
- Modify: `.gitea/workflows/deploy.yml`
|
||||||
|
- Modify: `src/GmRelay.Web/wwwroot/app.css`
|
||||||
|
- Modify: `src/GmRelay.Web/Components/Layout/NavMenu.razor`
|
||||||
|
- Modify: `README.md`
|
||||||
|
- Wiki: `Home`, `Быстрый старт`, `Руководство ГМа`, `Развёртывание`, `Архитектура`, `Разработка`
|
||||||
|
|
||||||
|
- [ ] Update project/container/workflow/UI versions to `1.9.0`.
|
||||||
|
- [ ] Document `TELEGRAM_MINI_APP_URL`, BotFather `/setmenubutton`, `/miniapp`, and WebApp auth.
|
||||||
|
- [ ] Run `dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --collect:"XPlat Code Coverage"`.
|
||||||
|
- [ ] Run `dotnet build GM-Relay.slnx -c Release`.
|
||||||
|
- [ ] Commit, push, close issue #17, update wiki, create tag/release `v1.9.0`.
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
# Telegram Mini App Dashboard Design
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Issue #17 adds a Telegram Mini App dashboard as the mobile entry point for the existing Web Dashboard. Owner and co-GM users must be able to open the dashboard from Telegram, pass server-side Telegram WebApp `initData` validation, and manage only their own groups.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
- Add Mini App authentication using Telegram WebApp `initData`.
|
||||||
|
- Add a `/miniapp` entry page that signs the user into the existing cookie auth flow, then opens the regular dashboard UI in mobile-first mode.
|
||||||
|
- Reuse `AuthorizedSessionService`, `SessionService`, and existing Blazor pages for groups, sessions, templates, waitlist promotion, edit forms, and bulk batch operations.
|
||||||
|
- Add bot entry points: a Mini App button in `/start` and a configurable default menu button when `Telegram:MiniAppUrl` is set.
|
||||||
|
- Update README, wiki, deployment config, and visible version strings to `1.9.0`.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
The Mini App is not a second dashboard implementation. It is a Telegram-authenticated entrance into the existing Blazor dashboard. This keeps authorization, domain operations, Telegram message synchronization, and Web Dashboard behavior in one place.
|
||||||
|
|
||||||
|
`TelegramAuthService` gains a second verification method for WebApp `initData`. The server accepts the raw URL-encoded init payload at `/auth/telegram-webapp`, verifies the Telegram HMAC with the bot token, extracts the user id/name from the embedded `user` JSON, and issues the same auth cookie as the login widget endpoint.
|
||||||
|
|
||||||
|
`/miniapp` loads `telegram-web-app.js`, posts `window.Telegram.WebApp.initData` to the server endpoint, expands the WebApp viewport, and redirects to `/`. If a user opens `/miniapp` outside Telegram, the page shows the regular login fallback.
|
||||||
|
|
||||||
|
## Data Flow
|
||||||
|
|
||||||
|
1. User opens the Mini App from the bot menu button or `/start` inline button.
|
||||||
|
2. Telegram injects `initData` into the WebApp JavaScript API.
|
||||||
|
3. `/miniapp` posts `{ initData }` to `/auth/telegram-webapp`.
|
||||||
|
4. The server verifies the WebApp signature and expiry.
|
||||||
|
5. The server creates the same claims used by Telegram Login Widget.
|
||||||
|
6. Existing Blazor pages load groups through `AuthorizedSessionService`.
|
||||||
|
7. Any edit, waitlist, template, or batch action still goes through existing services and keeps Telegram messages synchronized.
|
||||||
|
|
||||||
|
## Error Handling
|
||||||
|
|
||||||
|
- Missing or invalid init data returns `401` and leaves the user on the Mini App page.
|
||||||
|
- Expired auth data is rejected with the same 24-hour window used by the Login Widget.
|
||||||
|
- A verified Telegram user with no owner/co-GM groups sees the existing empty dashboard state.
|
||||||
|
- Direct navigation to a foreign group/session still redirects to `/access-denied` through existing authorization checks.
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
- Unit tests cover valid and invalid WebApp `initData`.
|
||||||
|
- File-level regression tests ensure `/miniapp`, `/auth/telegram-webapp`, Telegram WebApp script loading, bot Mini App button, menu button setup, and mobile Mini App CSS hooks remain present.
|
||||||
|
- Existing `AuthorizedSessionServiceTests` continue covering owner/co-GM access behavior.
|
||||||
@@ -5,6 +5,7 @@ using GmRelay.Shared.Rendering;
|
|||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
|
||||||
@@ -16,7 +17,7 @@ public sealed record CancelSessionCommand(
|
|||||||
int MessageId);
|
int MessageId);
|
||||||
|
|
||||||
// DTOs for AOT compilation
|
// DTOs for AOT compilation
|
||||||
internal sealed record CancelSessionInfoDto(string Title, Guid BatchId, bool CanManage, string NotificationMode);
|
internal sealed record CancelSessionInfoDto(string Title, Guid BatchId, int? BatchMessageId, bool CanManage, string NotificationMode);
|
||||||
|
|
||||||
public sealed class CancelSessionHandler(
|
public sealed class CancelSessionHandler(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
@@ -34,6 +35,7 @@ public sealed class CancelSessionHandler(
|
|||||||
"""
|
"""
|
||||||
SELECT s.title AS Title,
|
SELECT s.title AS Title,
|
||||||
s.batch_id AS BatchId,
|
s.batch_id AS BatchId,
|
||||||
|
s.batch_message_id AS BatchMessageId,
|
||||||
s.notification_mode AS NotificationMode,
|
s.notification_mode AS NotificationMode,
|
||||||
EXISTS (
|
EXISTS (
|
||||||
SELECT 1
|
SELECT 1
|
||||||
@@ -67,7 +69,7 @@ public sealed class CancelSessionHandler(
|
|||||||
|
|
||||||
// 3. Загружаем весь батч для перерисовки
|
// 3. Загружаем весь батч для перерисовки
|
||||||
var batchSessions = await connection.QueryAsync<SessionBatchDto>(
|
var batchSessions = await connection.QueryAsync<SessionBatchDto>(
|
||||||
@"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers
|
@"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers, join_link as JoinLink
|
||||||
FROM sessions
|
FROM sessions
|
||||||
WHERE batch_id = @BatchId
|
WHERE batch_id = @BatchId
|
||||||
ORDER BY scheduled_at",
|
ORDER BY scheduled_at",
|
||||||
@@ -101,17 +103,18 @@ public sealed class CancelSessionHandler(
|
|||||||
await transaction.CommitAsync(ct);
|
await transaction.CommitAsync(ct);
|
||||||
|
|
||||||
// 4. Перерисовываем сообщение
|
// 4. Перерисовываем сообщение
|
||||||
var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions.ToList(), batchParticipants.ToList());
|
var view = SessionBatchViewBuilder.Build(session.Title, batchSessions.ToList(), batchParticipants.ToList());
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: command.ChatId,
|
chatId: command.ChatId,
|
||||||
messageId: command.MessageId,
|
messageId: session.BatchMessageId ?? command.MessageId,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
replyMarkup: renderResult.Markup,
|
||||||
replyMarkup: renderResult.Markup,
|
ct);
|
||||||
cancellationToken: ct);
|
|
||||||
|
|
||||||
await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия отменена!", cancellationToken: ct);
|
await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия отменена!", cancellationToken: ct);
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using GmRelay.Shared.Rendering;
|
|||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
|
||||||
@@ -16,7 +17,7 @@ public sealed class CreateSessionHandler(
|
|||||||
{
|
{
|
||||||
public async Task HandleAsync(Message message, CancellationToken cancellationToken)
|
public async Task HandleAsync(Message message, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var parseResult = NewSessionCommandParser.Parse(message.Text, DateTimeOffset.UtcNow);
|
var parseResult = NewSessionCommandParser.Parse(message.Text ?? message.Caption, DateTimeOffset.UtcNow);
|
||||||
|
|
||||||
foreach (var timeInput in parseResult.PastTimeInputs)
|
foreach (var timeInput in parseResult.PastTimeInputs)
|
||||||
{
|
{
|
||||||
@@ -54,13 +55,14 @@ public sealed class CreateSessionHandler(
|
|||||||
{
|
{
|
||||||
await botClient.SendMessage(
|
await botClient.SendMessage(
|
||||||
chatId: message.Chat.Id,
|
chatId: message.Chat.Id,
|
||||||
text: "❌ Не удалось распознать формат. Пожалуйста, используйте шаблон:\n\n/newsession\nНазвание: My Game\nВремя: 15.05.2026 19:30\nВремя: 22.05.2026 19:30\nМест: 4\nСсылка: https://link\n\nДля повтора можно указать одну дату и строки:\nИгр: 4\nИнтервал: 7",
|
text: "❌ Не удалось распознать формат. Пожалуйста, используйте шаблон:\n\n/newsession\nНазвание: My Game\nВремя: 15.05.2026 19:30\nВремя: 22.05.2026 19:30\nМест: 4\nСсылка: https://link\nКартинка: https://cover\n\nДля повтора можно указать одну дату и строки:\nИгр: 4\nИнтервал: 7",
|
||||||
cancellationToken: cancellationToken);
|
cancellationToken: cancellationToken);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var title = parseResult.Title!;
|
var title = parseResult.Title!;
|
||||||
var link = parseResult.Link!;
|
var link = parseResult.Link!;
|
||||||
|
var imageReference = GetBatchImageReference(message, parseResult.ImageUrl);
|
||||||
var gmId = message.From!.Id;
|
var gmId = message.From!.Id;
|
||||||
var gmName = message.From.FirstName + (string.IsNullOrEmpty(message.From.LastName) ? string.Empty : $" {message.From.LastName}");
|
var gmName = message.From.FirstName + (string.IsNullOrEmpty(message.From.LastName) ? string.Empty : $" {message.From.LastName}");
|
||||||
var gmUsername = message.From.Username;
|
var gmUsername = message.From.Username;
|
||||||
@@ -176,21 +178,72 @@ public sealed class CreateSessionHandler(
|
|||||||
},
|
},
|
||||||
transaction);
|
transaction);
|
||||||
|
|
||||||
sessions.Add(new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, parseResult.MaxPlayers));
|
sessions.Add(new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, parseResult.MaxPlayers, link));
|
||||||
}
|
}
|
||||||
|
|
||||||
await transaction.CommitAsync(cancellationToken);
|
await transaction.CommitAsync(cancellationToken);
|
||||||
logger.LogInformation("Создан батч {BatchId} с {Count} сессиями в группе {GroupId}", batchId, sessions.Count, groupId);
|
logger.LogInformation("Создан батч {BatchId} с {Count} сессиями в группе {GroupId}", batchId, sessions.Count, groupId);
|
||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(title, sessions, Array.Empty<ParticipantBatchDto>());
|
var view = SessionBatchViewBuilder.Build(title, sessions, Array.Empty<ParticipantBatchDto>());
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
var batchMessage = await botClient.SendMessage(
|
Message batchMessage;
|
||||||
chatId: chatId,
|
|
||||||
messageThreadId: messageThreadId,
|
if (imageReference is not null && renderResult.Text.Length <= 1024)
|
||||||
text: renderResult.Text,
|
{
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
// Картинка + расписание умещаются в одном Telegram-фото с подписью
|
||||||
replyMarkup: renderResult.Markup,
|
try
|
||||||
cancellationToken: cancellationToken);
|
{
|
||||||
|
batchMessage = await botClient.SendPhoto(
|
||||||
|
chatId: chatId,
|
||||||
|
messageThreadId: messageThreadId,
|
||||||
|
photo: InputFile.FromString(imageReference),
|
||||||
|
caption: renderResult.Text,
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
|
replyMarkup: renderResult.Markup,
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogWarning(ex, "Не удалось отправить картинку для батча {BatchId}, отправляем текстом", batchId);
|
||||||
|
batchMessage = await botClient.SendMessage(
|
||||||
|
chatId: chatId,
|
||||||
|
messageThreadId: messageThreadId,
|
||||||
|
text: renderResult.Text,
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
|
replyMarkup: renderResult.Markup,
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Текст слишком длинный для caption — fallback на два сообщения
|
||||||
|
if (imageReference is not null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await botClient.SendPhoto(
|
||||||
|
chatId: chatId,
|
||||||
|
messageThreadId: messageThreadId,
|
||||||
|
photo: InputFile.FromString(imageReference),
|
||||||
|
caption: $"🎲 {System.Net.WebUtility.HtmlEncode(title)}",
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogWarning(ex, "Не удалось отправить картинку для батча {BatchId}", batchId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
batchMessage = await botClient.SendMessage(
|
||||||
|
chatId: chatId,
|
||||||
|
messageThreadId: messageThreadId,
|
||||||
|
text: renderResult.Text,
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
|
replyMarkup: renderResult.Markup,
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
await connection.ExecuteAsync(
|
await connection.ExecuteAsync(
|
||||||
"UPDATE sessions SET batch_message_id = @MsgId WHERE batch_id = @BatchId",
|
"UPDATE sessions SET batch_message_id = @MsgId WHERE batch_id = @BatchId",
|
||||||
@@ -215,4 +268,20 @@ public sealed class CreateSessionHandler(
|
|||||||
await botClient.SendMessage(chatId, "💥 Произошла ошибка базы данных при создании сессии.", cancellationToken: cancellationToken);
|
await botClient.SendMessage(chatId, "💥 Произошла ошибка базы данных при создании сессии.", cancellationToken: cancellationToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static string? GetBatchImageReference(Message message, string? parsedImageUrl)
|
||||||
|
{
|
||||||
|
var attachedPhotoFileId = message.Photo?
|
||||||
|
.OrderByDescending(photo => photo.FileSize ?? 0)
|
||||||
|
.ThenByDescending(photo => photo.Width * photo.Height)
|
||||||
|
.FirstOrDefault()
|
||||||
|
?.FileId;
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(attachedPhotoFileId))
|
||||||
|
{
|
||||||
|
return attachedPhotoFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return string.IsNullOrWhiteSpace(parsedImageUrl) ? null : parsedImageUrl.Trim();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using Telegram.Bot;
|
|||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
using GmRelay.Shared.Domain;
|
using GmRelay.Shared.Domain;
|
||||||
using GmRelay.Shared.Rendering;
|
using GmRelay.Shared.Rendering;
|
||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
|
||||||
@@ -114,7 +115,7 @@ public sealed class JoinSessionHandler(
|
|||||||
|
|
||||||
// Загружаем весь батч для перерисовки
|
// Загружаем весь батч для перерисовки
|
||||||
var batchSessions = await connection.QueryAsync<SessionBatchDto>(
|
var batchSessions = await connection.QueryAsync<SessionBatchDto>(
|
||||||
@"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers
|
@"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers, join_link as JoinLink
|
||||||
FROM sessions
|
FROM sessions
|
||||||
WHERE batch_id = @BatchId
|
WHERE batch_id = @BatchId
|
||||||
ORDER BY scheduled_at",
|
ORDER BY scheduled_at",
|
||||||
@@ -136,15 +137,16 @@ public sealed class JoinSessionHandler(
|
|||||||
transactionCommitted = true;
|
transactionCommitted = true;
|
||||||
|
|
||||||
// 4. Перерисовываем сообщение
|
// 4. Перерисовываем сообщение
|
||||||
var renderResult = SessionBatchRenderer.Render(batchInfo.Title, batchSessions.ToList(), batchParticipants.ToList());
|
var view = SessionBatchViewBuilder.Build(batchInfo.Title, batchSessions.ToList(), batchParticipants.ToList());
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: command.ChatId,
|
chatId: command.ChatId,
|
||||||
messageId: command.MessageId,
|
messageId: command.MessageId,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
|
||||||
replyMarkup: renderResult.Markup,
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: ct);
|
ct);
|
||||||
|
|
||||||
var callbackText = registrationStatus == ParticipantRegistrationStatus.Waitlisted
|
var callbackText = registrationStatus == ParticipantRegistrationStatus.Waitlisted
|
||||||
? "Основной состав заполнен. Вы добавлены в лист ожидания."
|
? "Основной состав заполнен. Вы добавлены в лист ожидания."
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using GmRelay.Shared.Domain;
|
|||||||
using GmRelay.Shared.Rendering;
|
using GmRelay.Shared.Rendering;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
|
||||||
@@ -156,7 +157,8 @@ public sealed class LeaveSessionHandler(
|
|||||||
SELECT id AS SessionId,
|
SELECT id AS SessionId,
|
||||||
scheduled_at AS ScheduledAt,
|
scheduled_at AS ScheduledAt,
|
||||||
status AS Status,
|
status AS Status,
|
||||||
max_players AS MaxPlayers
|
max_players AS MaxPlayers,
|
||||||
|
join_link AS JoinLink
|
||||||
FROM sessions
|
FROM sessions
|
||||||
WHERE batch_id = @BatchId
|
WHERE batch_id = @BatchId
|
||||||
ORDER BY scheduled_at
|
ORDER BY scheduled_at
|
||||||
@@ -182,15 +184,16 @@ public sealed class LeaveSessionHandler(
|
|||||||
await transaction.CommitAsync(ct);
|
await transaction.CommitAsync(ct);
|
||||||
transactionCommitted = true;
|
transactionCommitted = true;
|
||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
|
var view = SessionBatchViewBuilder.Build(session.Title, batchSessions, batchParticipants);
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: command.ChatId,
|
chatId: command.ChatId,
|
||||||
messageId: command.MessageId,
|
messageId: command.MessageId,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
|
||||||
replyMarkup: renderResult.Markup,
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: ct);
|
ct);
|
||||||
|
|
||||||
var callbackText = participant.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted
|
var callbackText = participant.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted
|
||||||
? "Вы удалены из листа ожидания."
|
? "Вы удалены из листа ожидания."
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
|||||||
internal sealed record NewSessionParseResult(
|
internal sealed record NewSessionParseResult(
|
||||||
string? Title,
|
string? Title,
|
||||||
string? Link,
|
string? Link,
|
||||||
|
string? ImageUrl,
|
||||||
int? MaxPlayers,
|
int? MaxPlayers,
|
||||||
IReadOnlyList<DateTimeOffset> ScheduledTimes,
|
IReadOnlyList<DateTimeOffset> ScheduledTimes,
|
||||||
IReadOnlyList<string> PastTimeInputs,
|
IReadOnlyList<string> PastTimeInputs,
|
||||||
@@ -27,6 +28,12 @@ internal static class NewSessionCommandParser
|
|||||||
private const string TitlePrefix = "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435:";
|
private const string TitlePrefix = "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435:";
|
||||||
private const string TimePrefix = "\u0412\u0440\u0435\u043c\u044f:";
|
private const string TimePrefix = "\u0412\u0440\u0435\u043c\u044f:";
|
||||||
private const string LinkPrefix = "\u0421\u0441\u044b\u043b\u043a\u0430:";
|
private const string LinkPrefix = "\u0421\u0441\u044b\u043b\u043a\u0430:";
|
||||||
|
private static readonly string[] ImagePrefixes =
|
||||||
|
[
|
||||||
|
"\u041a\u0430\u0440\u0442\u0438\u043d\u043a\u0430:",
|
||||||
|
"\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435:",
|
||||||
|
"\u041e\u0431\u043b\u043e\u0436\u043a\u0430:"
|
||||||
|
];
|
||||||
private static readonly string[] SeatLimitPrefixes =
|
private static readonly string[] SeatLimitPrefixes =
|
||||||
[
|
[
|
||||||
"\u041c\u0435\u0441\u0442:",
|
"\u041c\u0435\u0441\u0442:",
|
||||||
@@ -49,6 +56,7 @@ internal static class NewSessionCommandParser
|
|||||||
{
|
{
|
||||||
string? title = null;
|
string? title = null;
|
||||||
string? link = null;
|
string? link = null;
|
||||||
|
string? imageUrl = null;
|
||||||
int? maxPlayers = null;
|
int? maxPlayers = null;
|
||||||
int? recurringCount = null;
|
int? recurringCount = null;
|
||||||
var recurringIntervalDays = 7;
|
var recurringIntervalDays = 7;
|
||||||
@@ -72,6 +80,14 @@ internal static class NewSessionCommandParser
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var imagePrefix = ImagePrefixes.FirstOrDefault(prefix =>
|
||||||
|
line.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
|
||||||
|
if (imagePrefix is not null)
|
||||||
|
{
|
||||||
|
imageUrl = line[imagePrefix.Length..].Trim();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
var seatLimitPrefix = SeatLimitPrefixes.FirstOrDefault(prefix =>
|
var seatLimitPrefix = SeatLimitPrefixes.FirstOrDefault(prefix =>
|
||||||
line.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
|
line.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
|
||||||
if (seatLimitPrefix is not null)
|
if (seatLimitPrefix is not null)
|
||||||
@@ -157,6 +173,7 @@ internal static class NewSessionCommandParser
|
|||||||
return new NewSessionParseResult(
|
return new NewSessionParseResult(
|
||||||
title,
|
title,
|
||||||
link,
|
link,
|
||||||
|
imageUrl,
|
||||||
maxPlayers,
|
maxPlayers,
|
||||||
scheduledTimes,
|
scheduledTimes,
|
||||||
pastTimeInputs,
|
pastTimeInputs,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using GmRelay.Shared.Domain;
|
|||||||
using GmRelay.Shared.Rendering;
|
using GmRelay.Shared.Rendering;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
|
||||||
@@ -13,7 +14,7 @@ public sealed record PromoteWaitlistedPlayerCommand(
|
|||||||
long ChatId,
|
long ChatId,
|
||||||
int MessageId);
|
int MessageId);
|
||||||
|
|
||||||
internal sealed record PromoteWaitlistSessionDto(string Title, Guid BatchId, bool CanManage, int? MaxPlayers);
|
internal sealed record PromoteWaitlistSessionDto(string Title, Guid BatchId, int? BatchMessageId, bool CanManage, int? MaxPlayers);
|
||||||
internal sealed record WaitlistedParticipantDto(Guid ParticipantRowId, string DisplayName);
|
internal sealed record WaitlistedParticipantDto(Guid ParticipantRowId, string DisplayName);
|
||||||
|
|
||||||
public sealed class PromoteWaitlistedPlayerHandler(
|
public sealed class PromoteWaitlistedPlayerHandler(
|
||||||
@@ -33,6 +34,7 @@ public sealed class PromoteWaitlistedPlayerHandler(
|
|||||||
"""
|
"""
|
||||||
SELECT s.title AS Title,
|
SELECT s.title AS Title,
|
||||||
s.batch_id AS BatchId,
|
s.batch_id AS BatchId,
|
||||||
|
s.batch_message_id AS BatchMessageId,
|
||||||
s.max_players AS MaxPlayers,
|
s.max_players AS MaxPlayers,
|
||||||
EXISTS (
|
EXISTS (
|
||||||
SELECT 1
|
SELECT 1
|
||||||
@@ -135,7 +137,8 @@ public sealed class PromoteWaitlistedPlayerHandler(
|
|||||||
SELECT id AS SessionId,
|
SELECT id AS SessionId,
|
||||||
scheduled_at AS ScheduledAt,
|
scheduled_at AS ScheduledAt,
|
||||||
status AS Status,
|
status AS Status,
|
||||||
max_players AS MaxPlayers
|
max_players AS MaxPlayers,
|
||||||
|
join_link AS JoinLink
|
||||||
FROM sessions
|
FROM sessions
|
||||||
WHERE batch_id = @BatchId
|
WHERE batch_id = @BatchId
|
||||||
ORDER BY scheduled_at
|
ORDER BY scheduled_at
|
||||||
@@ -161,15 +164,16 @@ public sealed class PromoteWaitlistedPlayerHandler(
|
|||||||
await transaction.CommitAsync(ct);
|
await transaction.CommitAsync(ct);
|
||||||
transactionCommitted = true;
|
transactionCommitted = true;
|
||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
|
var view = SessionBatchViewBuilder.Build(session.Title, batchSessions, batchParticipants);
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: command.ChatId,
|
chatId: command.ChatId,
|
||||||
messageId: command.MessageId,
|
messageId: session.BatchMessageId ?? command.MessageId,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
|
||||||
replyMarkup: renderResult.Markup,
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: ct);
|
ct);
|
||||||
|
|
||||||
await bot.AnswerCallbackQuery(command.CallbackQueryId, $"{promoted.DisplayName} переведен(а) в основной состав.", cancellationToken: ct);
|
await bot.AnswerCallbackQuery(command.CallbackQueryId, $"{promoted.DisplayName} переведен(а) в основной состав.", cancellationToken: ct);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using Dapper;
|
using Dapper;
|
||||||
using GmRelay.Shared.Domain;
|
using GmRelay.Shared.Domain;
|
||||||
|
using Microsoft.Extensions.Configuration;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.ExportCalendar;
|
namespace GmRelay.Bot.Features.Sessions.ExportCalendar;
|
||||||
|
|
||||||
@@ -11,20 +13,21 @@ internal sealed record CalendarSessionDto(Guid Id, string Title, DateTime Schedu
|
|||||||
|
|
||||||
public sealed class ExportCalendarHandler(
|
public sealed class ExportCalendarHandler(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
ITelegramBotClient botClient)
|
ITelegramBotClient botClient,
|
||||||
|
IConfiguration configuration)
|
||||||
{
|
{
|
||||||
public async Task HandleAsync(Message message, CancellationToken cancellationToken)
|
public async Task HandleAsync(Message message, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
|
await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
|
||||||
|
|
||||||
var sessions = await connection.QueryAsync<CalendarSessionDto>(
|
var sessions = await connection.QueryAsync<CalendarSessionDto>(
|
||||||
@"SELECT s.id as Id, s.title as Title, s.scheduled_at as ScheduledAt
|
@"SELECT s.id as Id, s.title as Title, s.scheduled_at as ScheduledAt"
|
||||||
FROM sessions s
|
+ " FROM sessions s"
|
||||||
JOIN game_groups g ON s.group_id = g.id
|
+ " JOIN game_groups g ON s.group_id = g.id"
|
||||||
WHERE g.telegram_chat_id = @ChatId
|
+ " WHERE g.telegram_chat_id = @ChatId"
|
||||||
AND s.status = @Planned
|
+ " AND s.status = @Planned"
|
||||||
AND s.scheduled_at > NOW()
|
+ " AND s.scheduled_at > NOW()"
|
||||||
ORDER BY s.scheduled_at ASC",
|
+ " ORDER BY s.scheduled_at ASC",
|
||||||
new { ChatId = message.Chat.Id, Planned = SessionStatus.Planned });
|
new { ChatId = message.Chat.Id, Planned = SessionStatus.Planned });
|
||||||
|
|
||||||
var sessionsList = sessions.ToList();
|
var sessionsList = sessions.ToList();
|
||||||
@@ -54,8 +57,6 @@ public sealed class ExportCalendarHandler(
|
|||||||
sb.AppendLine($"DTSTART:{dtStart}");
|
sb.AppendLine($"DTSTART:{dtStart}");
|
||||||
sb.AppendLine($"DTEND:{dtEnd}");
|
sb.AppendLine($"DTEND:{dtEnd}");
|
||||||
sb.AppendLine($"SUMMARY:{s.Title}");
|
sb.AppendLine($"SUMMARY:{s.Title}");
|
||||||
// Escape special chars according to iCal standards (RFC 5545) -- simple escaping for summary
|
|
||||||
// In a fuller implementation we'd escape \r\n, commas, etc. But titles are mostly plain text.
|
|
||||||
sb.AppendLine("END:VEVENT");
|
sb.AppendLine("END:VEVENT");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,11 +67,45 @@ public sealed class ExportCalendarHandler(
|
|||||||
|
|
||||||
var inputFile = InputFile.FromStream(stream, "schedule.ics");
|
var inputFile = InputFile.FromStream(stream, "schedule.ics");
|
||||||
|
|
||||||
|
// Create calendar subscription
|
||||||
|
string? subscriptionUrl = null;
|
||||||
|
var baseUrl = configuration["Web:BaseUrl"];
|
||||||
|
var senderId = message.From?.Id;
|
||||||
|
if (!string.IsNullOrWhiteSpace(baseUrl) && senderId.HasValue)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var token = Guid.NewGuid().ToString("N");
|
||||||
|
var groupId = await connection.QueryFirstOrDefaultAsync<Guid?>(
|
||||||
|
@"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_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";
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Non-critical: if subscription creation fails, still send the file
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var replyMarkup = subscriptionUrl is not null
|
||||||
|
? new InlineKeyboardMarkup(new[]
|
||||||
|
{
|
||||||
|
new[] { InlineKeyboardButton.WithUrl("🔗 Подписаться на календарь", subscriptionUrl) }
|
||||||
|
})
|
||||||
|
: null;
|
||||||
|
|
||||||
await botClient.SendDocument(
|
await botClient.SendDocument(
|
||||||
chatId: message.Chat.Id,
|
chatId: message.Chat.Id,
|
||||||
document: inputFile,
|
document: inputFile,
|
||||||
caption: "📅 <b>Ваш календарь игр!</b>\nОткройте файл на устройстве, чтобы добавить события в свой календарь.",
|
caption: "📅 <b>Ваш календарь игр!</b>\nОткройте файл на устройстве, чтобы добавить события в свой календарь.",
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
|
replyMarkup: replyMarkup,
|
||||||
messageThreadId: message.MessageThreadId,
|
messageThreadId: message.MessageThreadId,
|
||||||
cancellationToken: cancellationToken);
|
cancellationToken: cancellationToken);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,30 +117,16 @@ public sealed class DeleteSessionHandler(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var text = "📅 <b>Ближайшие игры:</b>\n\n";
|
var renderResult = SessionListMessageRenderer.Render(sessionsList);
|
||||||
foreach (var s in sessionsList)
|
|
||||||
{
|
|
||||||
var seats = s.MaxPlayers.HasValue
|
|
||||||
? $"{s.PlayerCount}/{s.MaxPlayers.Value}"
|
|
||||||
: s.PlayerCount.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
|
||||||
var waitlist = s.WaitlistCount > 0 ? $", ожидание: {s.WaitlistCount}" : string.Empty;
|
|
||||||
text += $"🔹 <b>{s.ScheduledAt.FormatMoscow()}</b> — {System.Net.WebUtility.HtmlEncode(s.Title)} (Места: {seats}{waitlist})\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
var canManage = sessionsList.First().CanManage;
|
|
||||||
var keyboard = canManage
|
|
||||||
? new Telegram.Bot.Types.ReplyMarkups.InlineKeyboardMarkup(
|
|
||||||
sessionsList.Select(s => new[] { Telegram.Bot.Types.ReplyMarkups.InlineKeyboardButton.WithCallbackData($"🗑 Удалить {s.ScheduledAt.FormatMoscowShort()}", $"delete_session:{s.Id}") }))
|
|
||||||
: null;
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await bot.EditMessageText(
|
await bot.EditMessageText(
|
||||||
command.ChatId,
|
command.ChatId,
|
||||||
command.MessageId,
|
command.MessageId,
|
||||||
text,
|
renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
replyMarkup: keyboard,
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: ct);
|
cancellationToken: ct);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@@ -3,11 +3,60 @@ using GmRelay.Shared.Domain;
|
|||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.ListSessions;
|
namespace GmRelay.Bot.Features.Sessions.ListSessions;
|
||||||
|
|
||||||
internal sealed record SessionListItemDto(Guid Id, string Title, DateTime ScheduledAt, string Status, int? MaxPlayers, int PlayerCount, int WaitlistCount, bool CanManage);
|
internal sealed record SessionListItemDto(Guid Id, string Title, DateTime ScheduledAt, string Status, int? MaxPlayers, int PlayerCount, int WaitlistCount, bool CanManage);
|
||||||
|
|
||||||
|
internal static class SessionListMessageRenderer
|
||||||
|
{
|
||||||
|
public static (string Text, InlineKeyboardMarkup? Markup) Render(IReadOnlyList<SessionListItemDto> sessions)
|
||||||
|
{
|
||||||
|
var text = "📅 <b>Ближайшие игры:</b>\n\n";
|
||||||
|
foreach (var session in sessions)
|
||||||
|
{
|
||||||
|
var seats = session.MaxPlayers.HasValue
|
||||||
|
? $"{session.PlayerCount}/{session.MaxPlayers.Value}"
|
||||||
|
: session.PlayerCount.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||||
|
var waitlist = session.WaitlistCount > 0 ? $", ожидание: {session.WaitlistCount}" : string.Empty;
|
||||||
|
text += $"🔹 <b>{session.ScheduledAt.FormatMoscow()}</b> — {System.Net.WebUtility.HtmlEncode(session.Title)} (Места: {seats}{waitlist})\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
var canManage = sessions.Count > 0 && sessions.First().CanManage;
|
||||||
|
if (!canManage)
|
||||||
|
{
|
||||||
|
return (text, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var buttons = new List<InlineKeyboardButton[]>();
|
||||||
|
foreach (var session in sessions)
|
||||||
|
{
|
||||||
|
var dateTitle = session.ScheduledAt.FormatMoscowShort();
|
||||||
|
buttons.Add(
|
||||||
|
[
|
||||||
|
InlineKeyboardButton.WithCallbackData($"❌ {dateTitle}", $"cancel_session:{session.Id}"),
|
||||||
|
InlineKeyboardButton.WithCallbackData($"⏰ {dateTitle}", $"reschedule_session:{session.Id}")
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (SessionCapacityRules.CanPromoteWaitlistedPlayer(session.MaxPlayers, session.PlayerCount, session.WaitlistCount))
|
||||||
|
{
|
||||||
|
buttons.Add(
|
||||||
|
[
|
||||||
|
InlineKeyboardButton.WithCallbackData($"⬆️ Из ожидания {dateTitle}", $"promote_waitlist:{session.Id}")
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
buttons.Add(
|
||||||
|
[
|
||||||
|
InlineKeyboardButton.WithCallbackData($"🗑 Удалить {dateTitle}", $"delete_session:{session.Id}")
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (text, new InlineKeyboardMarkup(buttons));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public sealed class ListSessionsHandler(
|
public sealed class ListSessionsHandler(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
ITelegramBotClient botClient)
|
ITelegramBotClient botClient)
|
||||||
@@ -53,27 +102,13 @@ public sealed class ListSessionsHandler(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var text = "📅 <b>Ближайшие игры:</b>\n\n";
|
var renderResult = SessionListMessageRenderer.Render(sessionsList);
|
||||||
foreach (var s in sessionsList)
|
|
||||||
{
|
|
||||||
var seats = s.MaxPlayers.HasValue
|
|
||||||
? $"{s.PlayerCount}/{s.MaxPlayers.Value}"
|
|
||||||
: s.PlayerCount.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
|
||||||
var waitlist = s.WaitlistCount > 0 ? $", ожидание: {s.WaitlistCount}" : string.Empty;
|
|
||||||
text += $"🔹 <b>{s.ScheduledAt.FormatMoscow()}</b> — {System.Net.WebUtility.HtmlEncode(s.Title)} (Места: {seats}{waitlist})\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
var canManage = sessionsList.First().CanManage;
|
|
||||||
var keyboard = canManage
|
|
||||||
? new Telegram.Bot.Types.ReplyMarkups.InlineKeyboardMarkup(
|
|
||||||
sessionsList.Select(s => new[] { Telegram.Bot.Types.ReplyMarkups.InlineKeyboardButton.WithCallbackData($"🗑 Удалить {s.ScheduledAt.FormatMoscowShort()}", $"delete_session:{s.Id}") }))
|
|
||||||
: null;
|
|
||||||
|
|
||||||
await botClient.SendMessage(
|
await botClient.SendMessage(
|
||||||
chatId: message.Chat.Id,
|
chatId: message.Chat.Id,
|
||||||
text: text,
|
text: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
replyMarkup: keyboard,
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: cancellationToken);
|
cancellationToken: cancellationToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-6
@@ -6,6 +6,7 @@ using Npgsql;
|
|||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
using Telegram.Bot.Types.ReplyMarkups;
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
|
namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
|
||||||
|
|
||||||
@@ -356,7 +357,7 @@ public sealed class HandleRescheduleTimeInputHandler(
|
|||||||
await using var conn = await dataSource.OpenConnectionAsync(ct);
|
await using var conn = await dataSource.OpenConnectionAsync(ct);
|
||||||
|
|
||||||
var batchSessions = (await conn.QueryAsync<SessionBatchDto>(
|
var batchSessions = (await conn.QueryAsync<SessionBatchDto>(
|
||||||
"SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
|
"SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
|
||||||
new { proposal.BatchId })).ToList();
|
new { proposal.BatchId })).ToList();
|
||||||
|
|
||||||
var batchParticipants = (await conn.QueryAsync<ParticipantBatchDto>(
|
var batchParticipants = (await conn.QueryAsync<ParticipantBatchDto>(
|
||||||
@@ -375,16 +376,16 @@ public sealed class HandleRescheduleTimeInputHandler(
|
|||||||
|
|
||||||
if (proposal.BatchMessageId.HasValue)
|
if (proposal.BatchMessageId.HasValue)
|
||||||
{
|
{
|
||||||
var renderResult = SessionBatchRenderer.Render(
|
var view = SessionBatchViewBuilder.Build(proposal.Title, batchSessions, batchParticipants);
|
||||||
proposal.Title, batchSessions, batchParticipants);
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: proposal.TelegramChatId,
|
chatId: proposal.TelegramChatId,
|
||||||
messageId: proposal.BatchMessageId.Value,
|
messageId: proposal.BatchMessageId.Value,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
|
||||||
replyMarkup: renderResult.Markup,
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: ct);
|
ct);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
+7
-5
@@ -5,6 +5,7 @@ using GmRelay.Shared.Rendering;
|
|||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
using Telegram.Bot.Types.Enums;
|
using Telegram.Bot.Types.Enums;
|
||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
|
namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
|
||||||
|
|
||||||
@@ -285,7 +286,7 @@ public sealed class RescheduleVotingDeadlineService(
|
|||||||
await using var connection = await dataSource.OpenConnectionAsync(ct);
|
await using var connection = await dataSource.OpenConnectionAsync(ct);
|
||||||
|
|
||||||
var batchSessions = (await connection.QueryAsync<SessionBatchDto>(
|
var batchSessions = (await connection.QueryAsync<SessionBatchDto>(
|
||||||
"SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
|
"SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
|
||||||
new { proposal.BatchId })).ToList();
|
new { proposal.BatchId })).ToList();
|
||||||
|
|
||||||
var batchParticipants = (await connection.QueryAsync<ParticipantBatchDto>(
|
var batchParticipants = (await connection.QueryAsync<ParticipantBatchDto>(
|
||||||
@@ -304,15 +305,16 @@ public sealed class RescheduleVotingDeadlineService(
|
|||||||
|
|
||||||
if (proposal.BatchMessageId.HasValue)
|
if (proposal.BatchMessageId.HasValue)
|
||||||
{
|
{
|
||||||
var renderResult = SessionBatchRenderer.Render(proposal.Title, batchSessions, batchParticipants);
|
var view = SessionBatchViewBuilder.Build(proposal.Title, batchSessions, batchParticipants);
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: proposal.TelegramChatId,
|
chatId: proposal.TelegramChatId,
|
||||||
messageId: proposal.BatchMessageId.Value,
|
messageId: proposal.BatchMessageId.Value,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
parseMode: ParseMode.Html,
|
|
||||||
replyMarkup: renderResult.Markup,
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: ct);
|
ct);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
using Telegram.Bot;
|
||||||
|
using Telegram.Bot.Types.Enums;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Handles editing batch messages that may be either text or photo messages.
|
||||||
|
/// When the batch was created with SendPhoto (image + caption), we need
|
||||||
|
/// EditMessageCaption instead of EditMessageText.
|
||||||
|
/// </summary>
|
||||||
|
public static class BatchMessageEditor
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Edits a batch message, automatically detecting whether it is a text or photo message.
|
||||||
|
/// Tries EditMessageText first; on failure falls back to EditMessageCaption.
|
||||||
|
/// </summary>
|
||||||
|
public static async Task EditBatchMessageAsync(
|
||||||
|
ITelegramBotClient bot,
|
||||||
|
long chatId,
|
||||||
|
int messageId,
|
||||||
|
string text,
|
||||||
|
InlineKeyboardMarkup? replyMarkup,
|
||||||
|
CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await bot.EditMessageText(
|
||||||
|
chatId: chatId,
|
||||||
|
messageId: messageId,
|
||||||
|
text: text,
|
||||||
|
parseMode: ParseMode.Html,
|
||||||
|
replyMarkup: replyMarkup,
|
||||||
|
cancellationToken: ct);
|
||||||
|
}
|
||||||
|
catch (global::Telegram.Bot.Exceptions.ApiRequestException ex)
|
||||||
|
when (ex.Message.Contains("there is no text in the message", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
// The batch message is a photo — use EditMessageCaption instead.
|
||||||
|
// Caption is limited to 1024 chars; if text exceeds that, truncate gracefully.
|
||||||
|
var caption = text.Length <= 1024 ? text : text[..1021] + "...";
|
||||||
|
await bot.EditMessageCaption(
|
||||||
|
chatId: chatId,
|
||||||
|
messageId: messageId,
|
||||||
|
caption: caption,
|
||||||
|
parseMode: ParseMode.Html,
|
||||||
|
replyMarkup: replyMarkup,
|
||||||
|
cancellationToken: ct);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
using Telegram.Bot;
|
||||||
|
using Telegram.Bot.Types;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
|
public sealed class TelegramMiniAppMenuButtonService(
|
||||||
|
ITelegramBotClient bot,
|
||||||
|
IConfiguration configuration,
|
||||||
|
ILogger<TelegramMiniAppMenuButtonService> logger) : IHostedService
|
||||||
|
{
|
||||||
|
public async Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var miniAppUrl = configuration["Telegram:MiniAppUrl"];
|
||||||
|
if (string.IsNullOrWhiteSpace(miniAppUrl))
|
||||||
|
{
|
||||||
|
logger.LogInformation("Telegram Mini App URL is not configured; menu button setup skipped.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Uri.TryCreate(miniAppUrl, UriKind.Absolute, out var uri) ||
|
||||||
|
(uri.Scheme != Uri.UriSchemeHttps && !uri.IsLoopback))
|
||||||
|
{
|
||||||
|
logger.LogWarning("Telegram Mini App URL {MiniAppUrl} is not a valid HTTPS URL.", miniAppUrl);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await bot.SetChatMenuButton(
|
||||||
|
menuButton: new MenuButtonWebApp
|
||||||
|
{
|
||||||
|
Text = "Dashboard",
|
||||||
|
WebApp = new WebAppInfo(miniAppUrl)
|
||||||
|
},
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
|
||||||
|
logger.LogInformation("Telegram Mini App menu button configured for {MiniAppUrl}.", miniAppUrl);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogWarning(ex, "Failed to configure Telegram Mini App menu button.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
// NOTE: duplicated in GmRelay.Web/Services/TelegramSessionBatchRenderer.cs
|
||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
using GmRelay.Shared.Rendering;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
|
public static class TelegramSessionBatchRenderer
|
||||||
|
{
|
||||||
|
public static (string Text, InlineKeyboardMarkup Markup) Render(SessionBatchViewModel view)
|
||||||
|
{
|
||||||
|
var messageText = $"🎲 <b>Новые игры:</b> {System.Net.WebUtility.HtmlEncode(view.Title)}\n\n" +
|
||||||
|
$"<b>Расписание:</b>\n\n";
|
||||||
|
|
||||||
|
var buttons = new List<InlineKeyboardButton[]>();
|
||||||
|
|
||||||
|
foreach (var session in view.Sessions)
|
||||||
|
{
|
||||||
|
messageText += $"📅 <b>{session.ScheduledAt.FormatMoscow()}</b>\n";
|
||||||
|
messageText += session.MaxPlayers.HasValue
|
||||||
|
? $"👥 Места: {session.ActivePlayerCount}/{session.MaxPlayers.Value}\n"
|
||||||
|
: $"👥 Игроки ({session.ActivePlayerCount}):\n";
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(session.JoinLink))
|
||||||
|
{
|
||||||
|
messageText += $"🔗 <a href=\"{System.Net.WebUtility.HtmlEncode(session.JoinLink)}\">Ссылка на игру</a>\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (session.ActivePlayers.Count > 0)
|
||||||
|
{
|
||||||
|
messageText += string.Join("\n", session.ActivePlayers.Select(p =>
|
||||||
|
$" 👤 {(p.TelegramUsername != null ? "@" + p.TelegramUsername : p.DisplayName)}")) + "\n";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
messageText += " <i>Пока никто не записался</i>\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (session.WaitlistedPlayers.Count > 0)
|
||||||
|
{
|
||||||
|
messageText += $"⏳ Лист ожидания ({session.WaitlistedPlayers.Count}):\n";
|
||||||
|
messageText += string.Join("\n", session.WaitlistedPlayers.Select(p =>
|
||||||
|
$" ⏱ {(p.TelegramUsername != null ? "@" + p.TelegramUsername : p.DisplayName)}")) + "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (GmRelay.Shared.Domain.SessionStatus.IsCancelled(session.Status))
|
||||||
|
{
|
||||||
|
messageText += "❌ <i>Сессия отменена</i>\n\n";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
messageText += "\n";
|
||||||
|
var actionRow = session.AvailableActions
|
||||||
|
.Select(a => InlineKeyboardButton.WithCallbackData(a.Label, $"{a.ActionKey}:{a.SessionId}"))
|
||||||
|
.ToArray();
|
||||||
|
if (actionRow.Length > 0)
|
||||||
|
buttons.Add(actionRow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (messageText, new InlineKeyboardMarkup(buttons));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ using GmRelay.Bot.Features.Sessions.RescheduleSession;
|
|||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
using Telegram.Bot.Types.Enums;
|
using Telegram.Bot.Types.Enums;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Infrastructure.Telegram;
|
namespace GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
@@ -30,6 +31,7 @@ public sealed class UpdateRouter(
|
|||||||
HandleRescheduleTimeInputHandler rescheduleTimeInputHandler,
|
HandleRescheduleTimeInputHandler rescheduleTimeInputHandler,
|
||||||
HandleRescheduleVoteHandler rescheduleVoteHandler,
|
HandleRescheduleVoteHandler rescheduleVoteHandler,
|
||||||
ITelegramBotClient bot,
|
ITelegramBotClient bot,
|
||||||
|
IConfiguration configuration,
|
||||||
ILogger<UpdateRouter> logger) : ITelegramUpdateHandler
|
ILogger<UpdateRouter> logger) : ITelegramUpdateHandler
|
||||||
{
|
{
|
||||||
public async Task RouteAsync(Update update, CancellationToken ct)
|
public async Task RouteAsync(Update update, CancellationToken ct)
|
||||||
@@ -40,17 +42,26 @@ public sealed class UpdateRouter(
|
|||||||
await HandleCallbackQueryAsync(query, ct);
|
await HandleCallbackQueryAsync(query, ct);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case { Message: { Text: { } text } message } when text.StartsWith('/'):
|
case { Message: { } message }:
|
||||||
await HandleCommandAsync(message, text, ct);
|
var commandText = GetCommandText(message);
|
||||||
break;
|
if (commandText.StartsWith("/", StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
await HandleCommandAsync(message, commandText, ct);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (message.Text is not null)
|
||||||
|
{
|
||||||
|
await rescheduleTimeInputHandler.TryHandleAsync(message, ct);
|
||||||
|
}
|
||||||
|
|
||||||
// Non-command text messages — check for reschedule time input
|
|
||||||
case { Message: { Text: { } } message } when !message.Text!.StartsWith('/'):
|
|
||||||
await rescheduleTimeInputHandler.TryHandleAsync(message, ct);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static string GetCommandText(Message message)
|
||||||
|
=> (message.Text ?? message.Caption ?? string.Empty).TrimStart();
|
||||||
|
|
||||||
private async Task HandleCallbackQueryAsync(CallbackQuery query, CancellationToken ct)
|
private async Task HandleCallbackQueryAsync(CallbackQuery query, CancellationToken ct)
|
||||||
{
|
{
|
||||||
if (query.Data is not { } data || query.Message is not { } message)
|
if (query.Data is not { } data || query.Message is not { } message)
|
||||||
@@ -188,10 +199,7 @@ public sealed class UpdateRouter(
|
|||||||
switch (command)
|
switch (command)
|
||||||
{
|
{
|
||||||
case "/start":
|
case "/start":
|
||||||
await bot.SendMessage(
|
await SendStartMessageAsync(message, ct);
|
||||||
chatId: message.Chat.Id,
|
|
||||||
text: "GM-Relay Bot ready. Use /help for commands.",
|
|
||||||
cancellationToken: ct);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "/newsession":
|
case "/newsession":
|
||||||
@@ -217,14 +225,15 @@ public sealed class UpdateRouter(
|
|||||||
Время: 15.05.2026 19:30
|
Время: 15.05.2026 19:30
|
||||||
Мест: 4
|
Мест: 4
|
||||||
Ссылка: https://link
|
Ссылка: https://link
|
||||||
|
Картинка: https://cover
|
||||||
|
|
||||||
Для регулярного расписания можно указать одну дату:
|
Для регулярного расписания можно указать одну дату:
|
||||||
Игр: 4
|
Игр: 4
|
||||||
Интервал: 7
|
Интервал: 7
|
||||||
|
|
||||||
/listsessions — список предстоящих сессий
|
/listsessions — список предстоящих сессий
|
||||||
|
Для owner/co-GM /listsessions показывает кнопки отмены, переноса, удаления и повышения из листа ожидания.
|
||||||
Игроки могут записаться кнопкой «На дату» и сняться кнопкой «Выйти».
|
Игроки могут записаться кнопкой «На дату» и сняться кнопкой «Выйти».
|
||||||
Owner и co-GM могут переносить сессии кнопкой «Перенести»: бот попросит 2-3 варианта времени и дедлайн голосования.
|
|
||||||
/help — эта справка
|
/help — эта справка
|
||||||
""",
|
""",
|
||||||
cancellationToken: ct);
|
cancellationToken: ct);
|
||||||
@@ -236,4 +245,24 @@ public sealed class UpdateRouter(
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task SendStartMessageAsync(Message message, CancellationToken ct)
|
||||||
|
{
|
||||||
|
var miniAppUrl = configuration["Telegram:MiniAppUrl"];
|
||||||
|
if (string.IsNullOrWhiteSpace(miniAppUrl))
|
||||||
|
{
|
||||||
|
await bot.SendMessage(
|
||||||
|
chatId: message.Chat.Id,
|
||||||
|
text: "GM-Relay Bot ready. Use /help for commands.",
|
||||||
|
cancellationToken: ct);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await bot.SendMessage(
|
||||||
|
chatId: message.Chat.Id,
|
||||||
|
text: "GM-Relay Bot ready. Откройте dashboard внутри Telegram или используйте /help для команд.",
|
||||||
|
replyMarkup: new InlineKeyboardMarkup(
|
||||||
|
InlineKeyboardButton.WithWebApp("Открыть dashboard", new WebAppInfo(miniAppUrl))),
|
||||||
|
cancellationToken: ct);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
CREATE TABLE calendar_subscriptions (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
token TEXT UNIQUE NOT NULL,
|
||||||
|
user_telegram_id BIGINT NOT NULL,
|
||||||
|
group_id UUID REFERENCES game_groups(id) ON DELETE CASCADE,
|
||||||
|
filter_type SMALLINT NOT NULL DEFAULT 0,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
expires_at TIMESTAMPTZ
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX ix_calendar_subscriptions_user_telegram_id ON calendar_subscriptions (user_telegram_id);
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
-- =============================================================
|
||||||
|
-- Attendance statistics view for GM analytics
|
||||||
|
-- Returns per-player aggregated metrics for a given game group.
|
||||||
|
-- NOTE: waitlist count reflects CURRENT registration_status only.
|
||||||
|
-- Full historical waitlist tracking will come with #15.
|
||||||
|
-- =============================================================
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION get_group_attendance_stats(p_group_id UUID)
|
||||||
|
RETURNS TABLE (
|
||||||
|
player_id UUID,
|
||||||
|
display_name VARCHAR,
|
||||||
|
telegram_username VARCHAR,
|
||||||
|
total_sessions BIGINT,
|
||||||
|
confirmed_count BIGINT,
|
||||||
|
declined_count BIGINT,
|
||||||
|
no_response_count BIGINT,
|
||||||
|
waitlisted_count BIGINT,
|
||||||
|
cancellation_affected_count BIGINT,
|
||||||
|
attendance_rate NUMERIC
|
||||||
|
) AS $$
|
||||||
|
BEGIN
|
||||||
|
RETURN QUERY
|
||||||
|
WITH player_sessions AS (
|
||||||
|
SELECT
|
||||||
|
sp.player_id,
|
||||||
|
s.id AS session_id,
|
||||||
|
sp.rsvp_status,
|
||||||
|
sp.registration_status,
|
||||||
|
s.status AS session_status,
|
||||||
|
s.scheduled_at
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN sessions s ON s.id = sp.session_id
|
||||||
|
WHERE s.group_id = p_group_id
|
||||||
|
),
|
||||||
|
player_totals AS (
|
||||||
|
SELECT
|
||||||
|
ps.player_id,
|
||||||
|
COUNT(*) FILTER (WHERE ps.session_status <> 'Cancelled') AS total_sessions,
|
||||||
|
COUNT(*) FILTER (WHERE ps.rsvp_status = 'Confirmed' AND ps.session_status <> 'Cancelled') AS confirmed_count,
|
||||||
|
COUNT(*) FILTER (WHERE ps.rsvp_status = 'Declined' AND ps.session_status <> 'Cancelled') AS declined_count,
|
||||||
|
COUNT(*) FILTER (WHERE ps.rsvp_status = 'Pending' AND ps.scheduled_at < NOW() AND ps.session_status <> 'Cancelled') AS no_response_count,
|
||||||
|
COUNT(*) FILTER (WHERE ps.registration_status = 'Waitlisted' AND ps.session_status <> 'Cancelled') AS waitlisted_count,
|
||||||
|
COUNT(*) FILTER (WHERE ps.session_status = 'Cancelled') AS cancellation_affected_count
|
||||||
|
FROM player_sessions ps
|
||||||
|
GROUP BY ps.player_id
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
pt.player_id,
|
||||||
|
p.display_name,
|
||||||
|
p.telegram_username,
|
||||||
|
pt.total_sessions,
|
||||||
|
pt.confirmed_count,
|
||||||
|
pt.declined_count,
|
||||||
|
pt.no_response_count,
|
||||||
|
pt.waitlisted_count,
|
||||||
|
pt.cancellation_affected_count,
|
||||||
|
ROUND(
|
||||||
|
100.0 * pt.confirmed_count
|
||||||
|
/ NULLIF(pt.total_sessions, 0),
|
||||||
|
1
|
||||||
|
) AS attendance_rate
|
||||||
|
FROM player_totals pt
|
||||||
|
JOIN players p ON p.id = pt.player_id
|
||||||
|
ORDER BY pt.confirmed_count DESC, pt.total_sessions DESC;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql STABLE;
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
CREATE EXTENSION IF NOT EXISTS "pgcrypto";
|
||||||
|
|
||||||
|
CREATE TABLE session_audit_log (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
session_id UUID NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
|
||||||
|
actor_telegram_id BIGINT NOT NULL,
|
||||||
|
actor_name VARCHAR(255) NOT NULL,
|
||||||
|
change_type VARCHAR(50) NOT NULL
|
||||||
|
CHECK (change_type IN ('Title','Time','Link','MaxPlayers','Status','WaitlistPromote','PlayerRemoved','BatchRescheduled','Cancelled')),
|
||||||
|
old_value TEXT,
|
||||||
|
new_value TEXT,
|
||||||
|
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX ix_session_audit_log_session_id ON session_audit_log(session_id);
|
||||||
|
CREATE INDEX ix_session_audit_log_changed_at ON session_audit_log(changed_at);
|
||||||
@@ -71,6 +71,7 @@ builder.Services.AddSingleton<HandleRescheduleVoteHandler>();
|
|||||||
// ── Telegram infrastructure ──────────────────────────────────────────
|
// ── Telegram infrastructure ──────────────────────────────────────────
|
||||||
builder.Services.AddSingleton<UpdateRouter>();
|
builder.Services.AddSingleton<UpdateRouter>();
|
||||||
builder.Services.AddSingleton<ITelegramUpdateHandler>(sp => sp.GetRequiredService<UpdateRouter>());
|
builder.Services.AddSingleton<ITelegramUpdateHandler>(sp => sp.GetRequiredService<UpdateRouter>());
|
||||||
|
builder.Services.AddHostedService<TelegramMiniAppMenuButtonService>();
|
||||||
builder.Services.AddHostedService<TelegramBotService>();
|
builder.Services.AddHostedService<TelegramBotService>();
|
||||||
|
|
||||||
// ── Session scheduler ────────────────────────────────────────────────
|
// ── Session scheduler ────────────────────────────────────────────────
|
||||||
|
|||||||
@@ -7,6 +7,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Telegram": {
|
"Telegram": {
|
||||||
"BotToken": ""
|
"BotToken": "",
|
||||||
|
"MiniAppUrl": ""
|
||||||
|
},
|
||||||
|
"Web": {
|
||||||
|
"BaseUrl": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace GmRelay.Shared.Domain;
|
||||||
|
|
||||||
|
public enum CalendarSubscriptionFilter
|
||||||
|
{
|
||||||
|
AllMyGroups = 0,
|
||||||
|
SpecificGroup = 1
|
||||||
|
}
|
||||||
@@ -7,8 +7,4 @@
|
|||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Telegram.Bot" Version="22.9.5.3" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
namespace GmRelay.Shared.Rendering;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Заглушка для Discord-рендерера.
|
||||||
|
/// Реальная реализация будет добавлена в проект GmRelay.DiscordBot (issue #26).
|
||||||
|
/// </summary>
|
||||||
|
public static class DiscordSessionBatchRenderer
|
||||||
|
{
|
||||||
|
public static object Render(SessionBatchViewModel view)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException("Discord renderer will be implemented in issue #26.");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
namespace GmRelay.Shared.Rendering;
|
||||||
|
|
||||||
|
public sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status, int? MaxPlayers, string JoinLink);
|
||||||
|
public sealed record ParticipantBatchDto(Guid SessionId, string DisplayName, string? TelegramUsername, string RegistrationStatus);
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
using GmRelay.Shared.Domain;
|
|
||||||
using Telegram.Bot.Types.ReplyMarkups;
|
|
||||||
|
|
||||||
namespace GmRelay.Shared.Rendering;
|
|
||||||
|
|
||||||
public sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status, int? MaxPlayers);
|
|
||||||
public sealed record ParticipantBatchDto(Guid SessionId, string DisplayName, string? TelegramUsername, string RegistrationStatus);
|
|
||||||
|
|
||||||
public 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 && p.RegistrationStatus == ParticipantRegistrationStatus.Active)
|
|
||||||
.ToList();
|
|
||||||
var waitlistedPlayers = participants
|
|
||||||
.Where(p => p.SessionId == session.SessionId && p.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
messageText += $"📅 <b>{session.ScheduledAt.FormatMoscow()}</b>\n";
|
|
||||||
messageText += session.MaxPlayers.HasValue
|
|
||||||
? $"👥 Места: {sessionPlayers.Count}/{session.MaxPlayers.Value}\n"
|
|
||||||
: $"👥 Игроки ({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 (waitlistedPlayers.Count > 0)
|
|
||||||
{
|
|
||||||
messageText += $"⏳ Лист ожидания ({waitlistedPlayers.Count}):\n";
|
|
||||||
messageText += string.Join("\n", waitlistedPlayers.Select(p => $" ⏱ {(p.TelegramUsername != null ? "@" + p.TelegramUsername : p.DisplayName)}")) + "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SessionStatus.IsCancelled(session.Status))
|
|
||||||
{
|
|
||||||
messageText += "❌ <i>Сессия отменена</i>\n\n";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
messageText += "\n";
|
|
||||||
var dateTitle = session.ScheduledAt.FormatMoscowShort();
|
|
||||||
buttons.Add(new[]
|
|
||||||
{
|
|
||||||
InlineKeyboardButton.WithCallbackData(GetJoinButtonText(session, sessionPlayers.Count, dateTitle), $"join_session:{session.SessionId}"),
|
|
||||||
InlineKeyboardButton.WithCallbackData($"🚪 Выйти {dateTitle}", $"leave_session:{session.SessionId}")
|
|
||||||
});
|
|
||||||
|
|
||||||
buttons.Add(new[]
|
|
||||||
{
|
|
||||||
InlineKeyboardButton.WithCallbackData($"❌ Отменить {dateTitle} (ГМ)", $"cancel_session:{session.SessionId}"),
|
|
||||||
InlineKeyboardButton.WithCallbackData($"⏰ (ГМ)", $"reschedule_session:{session.SessionId}")
|
|
||||||
}
|
|
||||||
.Concat(SessionCapacityRules.CanPromoteWaitlistedPlayer(session.MaxPlayers, sessionPlayers.Count, waitlistedPlayers.Count)
|
|
||||||
? [InlineKeyboardButton.WithCallbackData($"⬆️ Из ожидания {dateTitle} (ГМ)", $"promote_waitlist:{session.SessionId}")]
|
|
||||||
: [])
|
|
||||||
.ToArray());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (messageText, new InlineKeyboardMarkup(buttons));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string GetJoinButtonText(SessionBatchDto session, int activePlayers, string dateTitle)
|
|
||||||
{
|
|
||||||
if (session.MaxPlayers.HasValue && activePlayers >= session.MaxPlayers.Value)
|
|
||||||
{
|
|
||||||
return $"⏳ В лист ожидания {dateTitle}";
|
|
||||||
}
|
|
||||||
|
|
||||||
return $"✋ На {dateTitle}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
|
||||||
|
namespace GmRelay.Shared.Rendering;
|
||||||
|
|
||||||
|
public static class SessionBatchViewBuilder
|
||||||
|
{
|
||||||
|
public static SessionBatchViewModel Build(
|
||||||
|
string title,
|
||||||
|
IReadOnlyList<SessionBatchDto> sessions,
|
||||||
|
IReadOnlyList<ParticipantBatchDto> participants)
|
||||||
|
{
|
||||||
|
var orderedSessions = sessions.OrderBy(s => s.ScheduledAt).ToList();
|
||||||
|
var sessionItems = new List<SessionViewItem>();
|
||||||
|
|
||||||
|
foreach (var session in orderedSessions)
|
||||||
|
{
|
||||||
|
var activePlayers = participants
|
||||||
|
.Where(p => p.SessionId == session.SessionId && p.RegistrationStatus == ParticipantRegistrationStatus.Active)
|
||||||
|
.Select(p => new PlayerViewItem(p.DisplayName, p.TelegramUsername, p.RegistrationStatus))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
var waitlistedPlayers = participants
|
||||||
|
.Where(p => p.SessionId == session.SessionId && p.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted)
|
||||||
|
.Select(p => new PlayerViewItem(p.DisplayName, p.TelegramUsername, p.RegistrationStatus))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
var actions = new List<AvailableAction>();
|
||||||
|
if (!SessionStatus.IsCancelled(session.Status))
|
||||||
|
{
|
||||||
|
var dateTitle = session.ScheduledAt.FormatMoscowShort();
|
||||||
|
var joinLabel = GetJoinButtonText(session, activePlayers.Count, dateTitle);
|
||||||
|
actions.Add(new AvailableAction("join_session", joinLabel, session.SessionId));
|
||||||
|
actions.Add(new AvailableAction("leave_session", $"🚪 Выйти {dateTitle}", session.SessionId));
|
||||||
|
}
|
||||||
|
|
||||||
|
sessionItems.Add(new SessionViewItem(
|
||||||
|
session.SessionId,
|
||||||
|
session.ScheduledAt,
|
||||||
|
session.Status,
|
||||||
|
session.MaxPlayers,
|
||||||
|
session.JoinLink,
|
||||||
|
activePlayers.Count,
|
||||||
|
activePlayers,
|
||||||
|
waitlistedPlayers,
|
||||||
|
actions));
|
||||||
|
}
|
||||||
|
|
||||||
|
return new SessionBatchViewModel(title, sessionItems);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetJoinButtonText(SessionBatchDto session, int activePlayers, string dateTitle)
|
||||||
|
{
|
||||||
|
if (session.MaxPlayers.HasValue && activePlayers >= session.MaxPlayers.Value)
|
||||||
|
{
|
||||||
|
return $"⏳ В лист ожидания {dateTitle}";
|
||||||
|
}
|
||||||
|
|
||||||
|
return $"✋ На {dateTitle}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// trigger pr
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
|
||||||
|
namespace GmRelay.Shared.Rendering;
|
||||||
|
|
||||||
|
public sealed record SessionBatchViewModel(
|
||||||
|
string Title,
|
||||||
|
IReadOnlyList<SessionViewItem> Sessions);
|
||||||
|
|
||||||
|
public sealed record SessionViewItem(
|
||||||
|
Guid SessionId,
|
||||||
|
DateTime ScheduledAt,
|
||||||
|
string Status,
|
||||||
|
int? MaxPlayers,
|
||||||
|
string JoinLink,
|
||||||
|
int ActivePlayerCount,
|
||||||
|
IReadOnlyList<PlayerViewItem> ActivePlayers,
|
||||||
|
IReadOnlyList<PlayerViewItem> WaitlistedPlayers,
|
||||||
|
IReadOnlyList<AvailableAction> AvailableActions);
|
||||||
|
|
||||||
|
public sealed record PlayerViewItem(
|
||||||
|
string DisplayName,
|
||||||
|
string? TelegramUsername,
|
||||||
|
string RegistrationStatus);
|
||||||
|
|
||||||
|
public sealed record AvailableAction(
|
||||||
|
string ActionKey,
|
||||||
|
string Label,
|
||||||
|
Guid SessionId);
|
||||||
@@ -13,6 +13,7 @@
|
|||||||
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
|
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
|
||||||
<link rel="stylesheet" href="@Assets["app.css"]" />
|
<link rel="stylesheet" href="@Assets["app.css"]" />
|
||||||
<link rel="stylesheet" href="@Assets["GmRelay.Web.styles.css"]" />
|
<link rel="stylesheet" href="@Assets["GmRelay.Web.styles.css"]" />
|
||||||
|
<script src="https://telegram.org/js/telegram-web-app.js"></script>
|
||||||
<ImportMap />
|
<ImportMap />
|
||||||
<link rel="icon" type="image/png" href="favicon.png" />
|
<link rel="icon" type="image/png" href="favicon.png" />
|
||||||
<HeadOutlet @rendermode="InteractiveServer" />
|
<HeadOutlet @rendermode="InteractiveServer" />
|
||||||
@@ -23,19 +24,275 @@
|
|||||||
<ReconnectModal />
|
<ReconnectModal />
|
||||||
<script src="@Assets["_framework/blazor.web.js"]"></script>
|
<script src="@Assets["_framework/blazor.web.js"]"></script>
|
||||||
<script>
|
<script>
|
||||||
|
window.waitForTelegramMiniApp = async function (timeoutMs) {
|
||||||
|
var deadline = Date.now() + (timeoutMs || 3000);
|
||||||
|
|
||||||
|
while (Date.now() <= deadline) {
|
||||||
|
if (window.Telegram && window.Telegram.WebApp) {
|
||||||
|
return window.Telegram.WebApp;
|
||||||
|
}
|
||||||
|
|
||||||
|
await new Promise(function (resolve) {
|
||||||
|
setTimeout(resolve, 100);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
window.waitForTelegramMiniAppInitData = async function (timeoutMs) {
|
||||||
|
var deadline = Date.now() + (timeoutMs || 3000);
|
||||||
|
|
||||||
|
while (Date.now() <= deadline) {
|
||||||
|
if (window.Telegram && window.Telegram.WebApp && window.Telegram.WebApp.initData) {
|
||||||
|
return window.Telegram.WebApp;
|
||||||
|
}
|
||||||
|
|
||||||
|
await new Promise(function (resolve) {
|
||||||
|
setTimeout(resolve, 100);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
window.syncTelegramMiniAppViewport = function (webApp) {
|
||||||
|
if (!webApp) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var root = document.documentElement;
|
||||||
|
var safeArea = webApp.safeAreaInset || {};
|
||||||
|
var contentSafeArea = webApp.contentSafeAreaInset || {};
|
||||||
|
var setPx = function (name, value) {
|
||||||
|
root.style.setProperty(name, Math.max(0, Number(value) || 0) + 'px');
|
||||||
|
};
|
||||||
|
|
||||||
|
setPx('--gm-tg-safe-top', safeArea.top);
|
||||||
|
setPx('--gm-tg-safe-right', safeArea.right);
|
||||||
|
setPx('--gm-tg-safe-bottom', safeArea.bottom);
|
||||||
|
setPx('--gm-tg-safe-left', safeArea.left);
|
||||||
|
setPx('--gm-tg-content-safe-top', contentSafeArea.top);
|
||||||
|
setPx('--gm-tg-content-safe-right', contentSafeArea.right);
|
||||||
|
setPx('--gm-tg-content-safe-bottom', contentSafeArea.bottom);
|
||||||
|
setPx('--gm-tg-content-safe-left', contentSafeArea.left);
|
||||||
|
|
||||||
|
if (webApp.viewportHeight) {
|
||||||
|
root.style.setProperty('--gm-tg-viewport-height', webApp.viewportHeight + 'px');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
window.prepareTelegramMiniApp = function (webApp) {
|
||||||
|
if (!webApp) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
document.body.classList.add('telegram-mini-app');
|
||||||
|
window.syncTelegramMiniAppViewport(webApp);
|
||||||
|
|
||||||
|
try {
|
||||||
|
webApp.ready();
|
||||||
|
} catch (error) {
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
webApp.expand();
|
||||||
|
} catch (error) {
|
||||||
|
}
|
||||||
|
|
||||||
|
if (webApp.onEvent && !window.gmRelayTelegramMiniAppViewportEventsRegistered) {
|
||||||
|
window.gmRelayTelegramMiniAppViewportEventsRegistered = true;
|
||||||
|
webApp.onEvent('safeAreaChanged', function () {
|
||||||
|
window.syncTelegramMiniAppViewport(webApp);
|
||||||
|
});
|
||||||
|
webApp.onEvent('contentSafeAreaChanged', function () {
|
||||||
|
window.syncTelegramMiniAppViewport(webApp);
|
||||||
|
});
|
||||||
|
webApp.onEvent('viewportChanged', function () {
|
||||||
|
window.syncTelegramMiniAppViewport(webApp);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
(async function () {
|
||||||
|
var webApp = await window.waitForTelegramMiniApp(1000);
|
||||||
|
window.prepareTelegramMiniApp(webApp);
|
||||||
|
})();
|
||||||
|
|
||||||
window.loadTelegramWidget = function (botUsername, authUrl) {
|
window.loadTelegramWidget = function (botUsername, authUrl) {
|
||||||
var container = document.getElementById('telegram-login-container');
|
var container = document.getElementById('telegram-login-container');
|
||||||
if (!container) return;
|
if (!container) return;
|
||||||
container.innerHTML = '';
|
container.innerHTML = '';
|
||||||
|
window.gmRelayTelegramLoginAuthUrl = authUrl || '/auth/telegram-login';
|
||||||
var script = document.createElement('script');
|
var script = document.createElement('script');
|
||||||
script.async = true;
|
script.async = true;
|
||||||
script.src = 'https://telegram.org/js/telegram-widget.js?22';
|
script.src = 'https://telegram.org/js/telegram-widget.js?22';
|
||||||
script.setAttribute('data-telegram-login', botUsername);
|
script.setAttribute('data-telegram-login', botUsername);
|
||||||
script.setAttribute('data-size', 'large');
|
script.setAttribute('data-size', 'large');
|
||||||
script.setAttribute('data-auth-url', authUrl);
|
script.setAttribute('data-onauth', 'window.handleTelegramLogin(user)');
|
||||||
script.setAttribute('data-request-access', 'write');
|
script.setAttribute('data-request-access', 'write');
|
||||||
container.appendChild(script);
|
container.appendChild(script);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
window.handleTelegramLogin = async function (user) {
|
||||||
|
if (!user) {
|
||||||
|
window.location.href = '/login?error=auth_failed';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
var response = await fetch(window.gmRelayTelegramLoginAuthUrl || '/auth/telegram-login', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
credentials: 'same-origin',
|
||||||
|
cache: 'no-store',
|
||||||
|
body: JSON.stringify(user)
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
window.location.href = '/login?error=auth_failed';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var payload = await response.json();
|
||||||
|
window.location.href = payload.redirectUrl || '/';
|
||||||
|
} catch (error) {
|
||||||
|
window.location.href = '/login?error=auth_failed';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
window.watchTelegramMiniAppLogin = function (statusUrl, redirectUrl, reloadOnReturn) {
|
||||||
|
window.gmRelayMiniAppLoginReloadOnReturn =
|
||||||
|
window.gmRelayMiniAppLoginReloadOnReturn || reloadOnReturn === true;
|
||||||
|
|
||||||
|
if (window.gmRelayMiniAppLoginWatcher) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
window.gmRelayMiniAppLoginLeftPage = false;
|
||||||
|
|
||||||
|
var stopWatching = function () {
|
||||||
|
if (window.gmRelayMiniAppLoginWatcher) {
|
||||||
|
window.clearInterval(window.gmRelayMiniAppLoginWatcher);
|
||||||
|
window.gmRelayMiniAppLoginWatcher = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var reloadAfterExternalLogin = function () {
|
||||||
|
if (!window.gmRelayMiniAppLoginReloadOnReturn || !window.gmRelayMiniAppLoginLeftPage) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
window.gmRelayMiniAppLoginLeftPage = false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
var refreshKey = 'gmrelay-miniapp-login-refresh:' + window.location.pathname;
|
||||||
|
if (window.sessionStorage && window.sessionStorage.getItem(refreshKey) === '1') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (window.sessionStorage) {
|
||||||
|
window.sessionStorage.setItem(refreshKey, '1');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
}
|
||||||
|
|
||||||
|
window.location.reload();
|
||||||
|
};
|
||||||
|
|
||||||
|
var allowNextExternalLoginReload = function () {
|
||||||
|
window.gmRelayMiniAppLoginLeftPage = true;
|
||||||
|
|
||||||
|
try {
|
||||||
|
var refreshKey = 'gmrelay-miniapp-login-refresh:' + window.location.pathname;
|
||||||
|
if (window.sessionStorage) {
|
||||||
|
window.sessionStorage.removeItem(refreshKey);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var checkLogin = async function (reloadWhenUnauthenticated) {
|
||||||
|
try {
|
||||||
|
var response = await fetch(statusUrl, {
|
||||||
|
credentials: 'same-origin',
|
||||||
|
cache: 'no-store'
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var payload = await response.json();
|
||||||
|
if (payload.authenticated) {
|
||||||
|
stopWatching();
|
||||||
|
window.location.href = redirectUrl || '/';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (reloadWhenUnauthenticated) {
|
||||||
|
reloadAfterExternalLogin();
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
window.gmRelayMiniAppLoginWatcher = window.setInterval(checkLogin, 1000);
|
||||||
|
window.addEventListener('blur', function () {
|
||||||
|
allowNextExternalLoginReload();
|
||||||
|
});
|
||||||
|
window.addEventListener('focus', function () {
|
||||||
|
void checkLogin(true);
|
||||||
|
});
|
||||||
|
document.addEventListener('visibilitychange', function () {
|
||||||
|
if (document.hidden) {
|
||||||
|
allowNextExternalLoginReload();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
void checkLogin(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
void checkLogin(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
window.authenticateTelegramMiniApp = async function (authUrl, redirectUrl) {
|
||||||
|
var webApp = await window.waitForTelegramMiniApp(3000);
|
||||||
|
if (!webApp) {
|
||||||
|
return { authenticated: false, reason: 'telegram-webapp-missing' };
|
||||||
|
}
|
||||||
|
|
||||||
|
window.prepareTelegramMiniApp(webApp);
|
||||||
|
|
||||||
|
if (!webApp.initData) {
|
||||||
|
return { authenticated: false, reason: 'telegram-init-data-empty' };
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
var response = await fetch(authUrl, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
credentials: 'same-origin',
|
||||||
|
cache: 'no-store',
|
||||||
|
body: JSON.stringify({ initData: webApp.initData })
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
return {
|
||||||
|
authenticated: false,
|
||||||
|
reason: 'telegram-auth-failed',
|
||||||
|
status: response.status
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
var payload = await response.json();
|
||||||
|
window.location.href = payload.redirectUrl || redirectUrl || '/';
|
||||||
|
return { authenticated: true, redirectUrl: payload.redirectUrl || redirectUrl || '/' };
|
||||||
|
} catch (error) {
|
||||||
|
return { authenticated: false, reason: 'telegram-auth-failed' };
|
||||||
|
}
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
|
|||||||
@@ -60,12 +60,17 @@
|
|||||||
/* === Mobile Responsive === */
|
/* === Mobile Responsive === */
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.sidebar {
|
.sidebar {
|
||||||
transform: translateX(-100%);
|
transform: none;
|
||||||
width: 280px;
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
min-height: 0;
|
||||||
|
position: sticky;
|
||||||
|
border-right: none;
|
||||||
|
border-bottom: 1px solid var(--border-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar.open {
|
.page {
|
||||||
transform: translateX(0);
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.main-area {
|
.main-area {
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
<div class="nav-header">
|
<div class="nav-header">
|
||||||
<a class="nav-brand" href="">
|
<a class="nav-brand" href="">
|
||||||
<span class="nav-brand-icon">🎲</span>
|
<img src="logo.png" alt="GM-Relay" class="nav-brand-icon" />
|
||||||
<span class="nav-brand-text">GM-Relay</span>
|
<span class="nav-brand-text">GM-Relay</span>
|
||||||
</a>
|
</a>
|
||||||
<button class="nav-toggle" @onclick="ToggleMenu" aria-label="Навигационное меню">
|
<button class="nav-toggle" @onclick="ToggleMenu" aria-label="Переключить меню">
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
<line x1="3" y1="6" x2="21" y2="6"/>
|
<line x1="3" y1="6" x2="21" y2="6"/>
|
||||||
<line x1="3" y1="12" x2="21" y2="12"/>
|
<line x1="3" y1="12" x2="21" y2="12"/>
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
<path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
|
<path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
|
||||||
<polyline points="9 22 9 12 15 12 15 22"/>
|
<polyline points="9 22 9 12 15 12 15 22"/>
|
||||||
</svg>
|
</svg>
|
||||||
Панель управления
|
Главная страница
|
||||||
</NavLink>
|
</NavLink>
|
||||||
<NavLink class="nav-item" href="templates" @onclick="CloseMenu">
|
<NavLink class="nav-item" href="templates" @onclick="CloseMenu">
|
||||||
<svg class="nav-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="nav-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
@@ -52,11 +52,11 @@
|
|||||||
<polyline points="16 17 21 12 16 7"/>
|
<polyline points="16 17 21 12 16 7"/>
|
||||||
<line x1="21" y1="12" x2="9" y2="12"/>
|
<line x1="21" y1="12" x2="9" y2="12"/>
|
||||||
</svg>
|
</svg>
|
||||||
Выйти
|
Выход
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<div class="nav-version">v1.8.2</div>
|
<div class="nav-version">v1.11.0</div>
|
||||||
</div>
|
</div>
|
||||||
</Authorized>
|
</Authorized>
|
||||||
<NotAuthorized>
|
<NotAuthorized>
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
<polyline points="10 17 15 12 10 7"/>
|
<polyline points="10 17 15 12 10 7"/>
|
||||||
<line x1="15" y1="12" x2="3" y2="12"/>
|
<line x1="15" y1="12" x2="3" y2="12"/>
|
||||||
</svg>
|
</svg>
|
||||||
Войти
|
Вход
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
</NotAuthorized>
|
</NotAuthorized>
|
||||||
@@ -79,4 +79,4 @@
|
|||||||
|
|
||||||
private void ToggleMenu() => isOpen = !isOpen;
|
private void ToggleMenu() => isOpen = !isOpen;
|
||||||
private void CloseMenu() => isOpen = false;
|
private void CloseMenu() => isOpen = false;
|
||||||
}
|
}
|
||||||
@@ -9,14 +9,17 @@
|
|||||||
|
|
||||||
.nav-brand {
|
.nav-brand {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: baseline;
|
||||||
gap: 0.625rem;
|
gap: 0.75rem;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-brand-icon {
|
.nav-brand-icon {
|
||||||
font-size: 1.5rem;
|
width: 1.5rem;
|
||||||
|
height: 1.5rem;
|
||||||
|
object-fit: contain;
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-brand-text {
|
.nav-brand-text {
|
||||||
@@ -184,9 +187,18 @@
|
|||||||
|
|
||||||
.nav-body.open {
|
.nav-body.open {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
z-index: 200;
|
||||||
|
background: linear-gradient(180deg, #0f1629 0%, #1a0a2e 100%);
|
||||||
|
padding-top: 4.5rem;
|
||||||
|
padding-left: 1rem;
|
||||||
|
padding-right: 1rem;
|
||||||
|
padding-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-header {
|
.nav-header {
|
||||||
|
padding-left: 3.75rem;
|
||||||
padding-right: 0.75rem;
|
padding-right: 0.75rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="display: flex; gap: 0.5rem; flex-wrap: wrap; margin-bottom: 1rem;">
|
<div style="display: flex; gap: 0.5rem; flex-wrap: wrap; margin-bottom: 1rem;">
|
||||||
|
<a href="/groupstats/@GroupId" class="btn-gm btn-gm-outline">📊 Статистика</a>
|
||||||
@foreach (var manager in groupManagement.Managers)
|
@foreach (var manager in groupManagement.Managers)
|
||||||
{
|
{
|
||||||
<span class="status-badge @(manager.Role == GroupManagerRoleExtensions.OwnerValue ? "status-success" : "status-info")">
|
<span class="status-badge @(manager.Role == GroupManagerRoleExtensions.OwnerValue ? "status-success" : "status-info")">
|
||||||
@@ -214,7 +215,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
@* Desktop table *@
|
@* Desktop table *@
|
||||||
<div class="glass-card session-table-desktop animate-slide-up" style="padding: 0; overflow: hidden;">
|
<div class="glass-card session-table-desktop session-table-desktop-card animate-slide-up">
|
||||||
<table class="gm-table">
|
<table class="gm-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -229,33 +230,81 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
@foreach (var session in sessions)
|
@foreach (var session in sessions)
|
||||||
{
|
{
|
||||||
|
var isExpanded = expandedSessions.Contains(session.Id);
|
||||||
<tr>
|
<tr>
|
||||||
<td style="color: var(--text-primary); font-weight: 500;">@session.Title</td>
|
<td style="color: var(--text-primary); font-weight: 500;">
|
||||||
|
<button type="button" class="btn-gm btn-gm-link" @onclick="() => ToggleParticipants(session.Id)">
|
||||||
|
@(isExpanded ? "▼" : "▶") @session.Title
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
<td>@session.ScheduledAt.FormatMoscow()</td>
|
<td>@session.ScheduledAt.FormatMoscow()</td>
|
||||||
<td>@FormatSeats(session)</td>
|
<td>@FormatSeats(session)</td>
|
||||||
<td>
|
<td>
|
||||||
<span class="status-badge @GetStatusClass(session.Status)">@TranslateStatus(session.Status)</span>
|
<span class="status-badge @GetStatusClass(session.Status)">@TranslateStatus(session.Status)</span>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="@session.JoinLink" target="_blank" rel="noopener noreferrer"
|
<a href="@session.JoinLink" target="_blank" rel="noopener noreferrer" class="session-join-link">
|
||||||
style="max-width: 150px; display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
|
|
||||||
Подключиться ↗
|
Подключиться ↗
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<div style="display: flex; gap: 0.5rem; flex-wrap: wrap;">
|
<div class="session-table-actions">
|
||||||
<a href="/session/edit/@session.Id" class="btn-gm btn-gm-outline" style="font-size: 0.8125rem; padding: 0.375rem 0.75rem;">
|
<a href="/session/edit/@session.Id" class="btn-gm btn-gm-outline">
|
||||||
✏️ Изменить
|
✏️ Изменить
|
||||||
</a>
|
</a>
|
||||||
|
<a href="/session/@session.Id/history" class="btn-gm btn-gm-outline">📜 История</a>
|
||||||
@if (CanPromote(session))
|
@if (CanPromote(session))
|
||||||
{
|
{
|
||||||
<button type="button" class="btn-gm btn-gm-success" style="font-size: 0.8125rem; padding: 0.375rem 0.75rem;" disabled="@(promotingSessionId == session.Id)" @onclick="() => PromoteWaitlisted(session.Id)">
|
<button type="button" class="btn-gm btn-gm-success" disabled="@(promotingSessionId == session.Id)" @onclick="() => PromoteWaitlisted(session.Id)">
|
||||||
@(promotingSessionId == session.Id ? "⏳ Поднимаем..." : "⬆️ Из ожидания")
|
@(promotingSessionId == session.Id ? "⏳ Поднимаем..." : "⬆️ Из ожидания")
|
||||||
</button>
|
</button>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@if (isExpanded)
|
||||||
|
{
|
||||||
|
<tr>
|
||||||
|
<td colspan="6" style="padding: 0; border: none;">
|
||||||
|
<div class="participant-panel">
|
||||||
|
@if (loadingParticipantsSessionId == session.Id)
|
||||||
|
{
|
||||||
|
<div class="skeleton skeleton-text" style="width: 60%;"></div>
|
||||||
|
}
|
||||||
|
else if (participantsCache.TryGetValue(session.Id, out var participants))
|
||||||
|
{
|
||||||
|
@if (participants.Count == 0)
|
||||||
|
{
|
||||||
|
<div class="empty-state empty-state-compact">
|
||||||
|
<div class="empty-state-title">Нет участников</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<div class="participant-list">
|
||||||
|
@foreach (var p in participants)
|
||||||
|
{
|
||||||
|
<div class="participant-row">
|
||||||
|
<div class="participant-info">
|
||||||
|
<span class="participant-name">@p.DisplayName</span>
|
||||||
|
<span class="participant-username">@FormatParticipantUsername(p)</span>
|
||||||
|
<span class="status-badge @GetParticipantStatusClass(p)">@TranslateParticipantStatus(p)</span>
|
||||||
|
</div>
|
||||||
|
@if (!p.IsGm)
|
||||||
|
{
|
||||||
|
<button type="button" class="btn-gm btn-gm-danger" style="font-size: 0.75rem; padding: 0.25rem 0.5rem;" disabled="@(kickingParticipantId == p.Id)" @onclick="() => KickParticipant(session.Id, p.Id)">
|
||||||
|
@(kickingParticipantId == p.Id ? "⏳..." : "🚪 Исключить")
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@@ -265,9 +314,12 @@
|
|||||||
<div class="session-card-mobile stagger-children">
|
<div class="session-card-mobile stagger-children">
|
||||||
@foreach (var session in sessions)
|
@foreach (var session in sessions)
|
||||||
{
|
{
|
||||||
|
var isExpanded = expandedSessions.Contains(session.Id);
|
||||||
<div class="session-card">
|
<div class="session-card">
|
||||||
<div class="session-card-header">
|
<div class="session-card-header">
|
||||||
<span class="session-card-title">@session.Title</span>
|
<button type="button" class="btn-gm btn-gm-link" style="text-align: left; padding: 0;" @onclick="() => ToggleParticipants(session.Id)">
|
||||||
|
@(isExpanded ? "▼" : "▶") @session.Title
|
||||||
|
</button>
|
||||||
<span class="status-badge @GetStatusClass(session.Status)">@TranslateStatus(session.Status)</span>
|
<span class="status-badge @GetStatusClass(session.Status)">@TranslateStatus(session.Status)</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="session-card-body">
|
<div class="session-card-body">
|
||||||
@@ -288,6 +340,7 @@
|
|||||||
<a href="/session/edit/@session.Id" class="btn-gm btn-gm-outline" style="flex: 1; justify-content: center; font-size: 0.8125rem; padding: 0.5rem;">
|
<a href="/session/edit/@session.Id" class="btn-gm btn-gm-outline" style="flex: 1; justify-content: center; font-size: 0.8125rem; padding: 0.5rem;">
|
||||||
✏️ Изменить
|
✏️ Изменить
|
||||||
</a>
|
</a>
|
||||||
|
<a href="/session/@session.Id/history" class="btn-gm btn-gm-outline" style="flex: 1; justify-content: center; font-size: 0.8125rem; padding: 0.5rem;">📜 История</a>
|
||||||
@if (CanPromote(session))
|
@if (CanPromote(session))
|
||||||
{
|
{
|
||||||
<button type="button" class="btn-gm btn-gm-success" style="flex: 1; justify-content: center; font-size: 0.8125rem; padding: 0.5rem;" disabled="@(promotingSessionId == session.Id)" @onclick="() => PromoteWaitlisted(session.Id)">
|
<button type="button" class="btn-gm btn-gm-success" style="flex: 1; justify-content: center; font-size: 0.8125rem; padding: 0.5rem;" disabled="@(promotingSessionId == session.Id)" @onclick="() => PromoteWaitlisted(session.Id)">
|
||||||
@@ -295,6 +348,45 @@
|
|||||||
</button>
|
</button>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
@if (isExpanded)
|
||||||
|
{
|
||||||
|
<div class="participant-panel" style="margin-top: 0.75rem;">
|
||||||
|
@if (loadingParticipantsSessionId == session.Id)
|
||||||
|
{
|
||||||
|
<div class="skeleton skeleton-text" style="width: 60%;"></div>
|
||||||
|
}
|
||||||
|
else if (participantsCache.TryGetValue(session.Id, out var participants))
|
||||||
|
{
|
||||||
|
@if (participants.Count == 0)
|
||||||
|
{
|
||||||
|
<div class="empty-state empty-state-compact">
|
||||||
|
<div class="empty-state-title">Нет участников</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<div class="participant-list">
|
||||||
|
@foreach (var p in participants)
|
||||||
|
{
|
||||||
|
<div class="participant-row">
|
||||||
|
<div class="participant-info">
|
||||||
|
<span class="participant-name">@p.DisplayName</span>
|
||||||
|
<span class="participant-username">@FormatParticipantUsername(p)</span>
|
||||||
|
<span class="status-badge @GetParticipantStatusClass(p)">@TranslateParticipantStatus(p)</span>
|
||||||
|
</div>
|
||||||
|
@if (!p.IsGm)
|
||||||
|
{
|
||||||
|
<button type="button" class="btn-gm btn-gm-danger" style="font-size: 0.75rem; padding: 0.25rem 0.5rem;" disabled="@(kickingParticipantId == p.Id)" @onclick="() => KickParticipant(session.Id, p.Id)">
|
||||||
|
@(kickingParticipantId == p.Id ? "⏳..." : "🚪 Исключить")
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
@@ -317,6 +409,10 @@
|
|||||||
private string? errorMessage;
|
private string? errorMessage;
|
||||||
private string? successMessage;
|
private string? successMessage;
|
||||||
private CoGmEditModel coGmModel = new();
|
private CoGmEditModel coGmModel = new();
|
||||||
|
private Dictionary<Guid, List<WebParticipant>> participantsCache = new();
|
||||||
|
private HashSet<Guid> expandedSessions = new();
|
||||||
|
private Guid? kickingParticipantId;
|
||||||
|
private Guid? loadingParticipantsSessionId;
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
@@ -448,6 +544,105 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task ToggleParticipants(Guid sessionId)
|
||||||
|
{
|
||||||
|
if (expandedSessions.Contains(sessionId))
|
||||||
|
{
|
||||||
|
expandedSessions.Remove(sessionId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
expandedSessions.Add(sessionId);
|
||||||
|
|
||||||
|
if (!participantsCache.ContainsKey(sessionId))
|
||||||
|
{
|
||||||
|
loadingParticipantsSessionId = sessionId;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var participants = await SessionService.GetSessionParticipantsForGmAsync(sessionId, telegramId);
|
||||||
|
participantsCache[sessionId] = participants ?? [];
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
errorMessage = "Не удалось загрузить участников: " + ex.Message;
|
||||||
|
expandedSessions.Remove(sessionId);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
loadingParticipantsSessionId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task KickParticipant(Guid sessionId, Guid participantId)
|
||||||
|
{
|
||||||
|
errorMessage = null;
|
||||||
|
successMessage = null;
|
||||||
|
kickingParticipantId = participantId;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await SessionService.RemovePlayerFromSessionForGmAsync(sessionId, telegramId, participantId);
|
||||||
|
participantsCache.Remove(sessionId);
|
||||||
|
successMessage = "Игрок исключён.";
|
||||||
|
await LoadSessions();
|
||||||
|
if (expandedSessions.Contains(sessionId))
|
||||||
|
{
|
||||||
|
await ToggleParticipants(sessionId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (SessionAccessDeniedException)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/access-denied");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
errorMessage = ex.Message;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
kickingParticipantId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FormatParticipantUsername(WebParticipant p)
|
||||||
|
{
|
||||||
|
var username = string.IsNullOrWhiteSpace(p.TelegramUsername)
|
||||||
|
? p.TelegramId.ToString(System.Globalization.CultureInfo.InvariantCulture)
|
||||||
|
: "@" + p.TelegramUsername;
|
||||||
|
return $"{username} · {FormatParticipantRsvp(p.RsvpStatus)}";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FormatParticipantRsvp(string rsvp) => rsvp switch
|
||||||
|
{
|
||||||
|
RsvpStatus.Pending => "⏳ не ответил",
|
||||||
|
RsvpStatus.Confirmed => "✅ подтвердил",
|
||||||
|
RsvpStatus.Declined => "❌ отказался",
|
||||||
|
_ => rsvp
|
||||||
|
};
|
||||||
|
|
||||||
|
private static string GetParticipantStatusClass(WebParticipant p)
|
||||||
|
{
|
||||||
|
if (p.IsGm) return "status-success";
|
||||||
|
return p.RegistrationStatus switch
|
||||||
|
{
|
||||||
|
"Active" => "status-info",
|
||||||
|
"Waitlisted" => "status-warning",
|
||||||
|
_ => "status-neutral"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string TranslateParticipantStatus(WebParticipant p)
|
||||||
|
{
|
||||||
|
if (p.IsGm) return "ГМ";
|
||||||
|
return p.RegistrationStatus switch
|
||||||
|
{
|
||||||
|
"Active" => "Основной состав",
|
||||||
|
"Waitlisted" => "Ожидание",
|
||||||
|
_ => p.RegistrationStatus
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
private async Task UpdateBatchDetails(BatchBulkEditModel batch)
|
private async Task UpdateBatchDetails(BatchBulkEditModel batch)
|
||||||
{
|
{
|
||||||
errorMessage = null;
|
errorMessage = null;
|
||||||
|
|||||||
@@ -0,0 +1,235 @@
|
|||||||
|
@page "/group/{GroupId:guid}/stats"
|
||||||
|
@using GmRelay.Web.Services
|
||||||
|
@using GmRelay.Shared.Domain
|
||||||
|
@using Microsoft.AspNetCore.Authorization
|
||||||
|
@using Microsoft.AspNetCore.Components.Authorization
|
||||||
|
@using System.Security.Claims
|
||||||
|
@attribute [Authorize]
|
||||||
|
@inject ISessionStore SessionStore
|
||||||
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
|
||||||
|
<PageTitle>Статистика — GM-Relay</PageTitle>
|
||||||
|
|
||||||
|
<div class="page-container">
|
||||||
|
<ul class="gm-breadcrumb animate-fade-in">
|
||||||
|
<li><a href="/">Главная</a></li>
|
||||||
|
<li><a href="/group/@GroupId">Сессии группы</a></li>
|
||||||
|
<li class="active">Статистика</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div class="page-header animate-fade-in">
|
||||||
|
<h2>📊 Статистика посещаемости</h2>
|
||||||
|
<p class="page-subtitle">Надёжность состава и качество расписания</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (!string.IsNullOrEmpty(errorMessage))
|
||||||
|
{
|
||||||
|
<div class="gm-alert gm-alert-danger" style="margin-bottom: 1rem;">
|
||||||
|
⚠️ @errorMessage
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (stats is null)
|
||||||
|
{
|
||||||
|
<div class="loading-spinner">⏳ Загружаем статистику…</div>
|
||||||
|
}
|
||||||
|
else if (stats.Count == 0)
|
||||||
|
{
|
||||||
|
<div class="empty-state">
|
||||||
|
<div class="empty-icon">📈</div>
|
||||||
|
<h3>Пока нет данных</h3>
|
||||||
|
<p>После первых сессий здесь появится аналитика.</p>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<div class="glass-card animate-slide-up" style="margin-bottom: 1rem;">
|
||||||
|
<div class="stats-summary" style="display: grid; grid-template-columns: repeat(auto-fit, minmax(120px, 1fr)); gap: 1rem; margin-bottom: 1.5rem;">
|
||||||
|
<div class="stat-card">
|
||||||
|
<div class="stat-value">@stats.Count</div>
|
||||||
|
<div class="stat-label">Игроков</div>
|
||||||
|
</div>
|
||||||
|
<div class="stat-card">
|
||||||
|
<div class="stat-value">@TotalSessions</div>
|
||||||
|
<div class="stat-label">Сессий</div>
|
||||||
|
</div>
|
||||||
|
<div class="stat-card">
|
||||||
|
<div class="stat-value">@AvgAttendanceRate%</div>
|
||||||
|
<div class="stat-label">Средняя посещаемость</div>
|
||||||
|
</div>
|
||||||
|
<div class="stat-card">
|
||||||
|
<div class="stat-value">@topPlayer?.DisplayName</div>
|
||||||
|
<div class="stat-label">Самый стабильный</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="table-responsive">
|
||||||
|
<table class="gm-table" style="width: 100%;">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th @onclick="@(() => SortBy("player"))" style="cursor:pointer;" class="sortable">Игрок @(sortColumn == "player" ? (sortDesc ? "▼" : "▲") : "")</th>
|
||||||
|
<th @onclick="@(() => SortBy("total"))" style="cursor:pointer; text-align:center;" class="sortable">Всего @(sortColumn == "total" ? (sortDesc ? "▼" : "▲") : "")</th>
|
||||||
|
<th @onclick="@(() => SortBy("confirmed"))" style="cursor:pointer; text-align:center;" class="sortable">✅ @(sortColumn == "confirmed" ? (sortDesc ? "▼" : "▲") : "")</th>
|
||||||
|
<th @onclick="@(() => SortBy("declined"))" style="cursor:pointer; text-align:center;" class="sortable">❌ @(sortColumn == "declined" ? (sortDesc ? "▼" : "▲") : "")</th>
|
||||||
|
<th @onclick="@(() => SortBy("noresponse"))" style="cursor:pointer; text-align:center;" class="sortable">💤 @(sortColumn == "noresponse" ? (sortDesc ? "▼" : "▲") : "")</th>
|
||||||
|
<th @onclick="@(() => SortBy("waitlist"))" style="cursor:pointer; text-align:center;" class="sortable">⏳ @(sortColumn == "waitlist" ? (sortDesc ? "▼" : "▲") : "")</th>
|
||||||
|
<th @onclick="@(() => SortBy("rate"))" style="cursor:pointer; text-align:center;" class="sortable">% @(sortColumn == "rate" ? (sortDesc ? "▼" : "▲") : "")</th>
|
||||||
|
<th @onclick="@(() => SortBy("cancelled"))" style="cursor:pointer; text-align:center;" class="sortable">🚫 @(sortColumn == "cancelled" ? (sortDesc ? "▼" : "▲") : "")</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@foreach (var s in sortedStats)
|
||||||
|
{
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<div class="player-info">
|
||||||
|
<span class="player-name">@s.DisplayName</span>
|
||||||
|
@if (!string.IsNullOrEmpty(s.TelegramUsername))
|
||||||
|
{
|
||||||
|
<span class="player-username">@@@s.TelegramUsername</span>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td style="text-align:center;">@s.TotalSessions</td>
|
||||||
|
<td style="text-align:center;">@s.ConfirmedCount</td>
|
||||||
|
<td style="text-align:center;">@s.DeclinedCount</td>
|
||||||
|
<td style="text-align:center;">@s.NoResponseCount</td>
|
||||||
|
<td style="text-align:center;">@s.WaitlistedCount</td>
|
||||||
|
<td style="text-align:center;">
|
||||||
|
<span class="rate-badge @AttendanceBadgeClass(s.AttendanceRate)">
|
||||||
|
@s.AttendanceRate%
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td style="text-align:center;">@s.CancellationAffectedCount</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.stat-card {
|
||||||
|
background: var(--card-bg-secondary, rgba(255,255,255,0.05));
|
||||||
|
border-radius: 0.75rem;
|
||||||
|
padding: 1rem;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
.stat-value {
|
||||||
|
font-size: 1.5rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--accent-color, #7cb97a);
|
||||||
|
}
|
||||||
|
.stat-label {
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: var(--text-muted, #94a3b8);
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
}
|
||||||
|
.player-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
.player-name {
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
.player-username {
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: var(--text-muted, #94a3b8);
|
||||||
|
}
|
||||||
|
.rate-badge {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 0.25rem 0.5rem;
|
||||||
|
border-radius: 0.5rem;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
}
|
||||||
|
.rate-excellent { background: rgba(34,197,94,0.15); color: #22c55e; }
|
||||||
|
.rate-good { background: rgba(234,179,8,0.15); color: #eab308; }
|
||||||
|
.rate-poor { background: rgba(239,68,68,0.15); color: #ef4444; }
|
||||||
|
</style>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[Parameter] public Guid GroupId { get; set; }
|
||||||
|
private List<PlayerAttendanceStats>? stats;
|
||||||
|
private List<PlayerAttendanceStats> sortedStats = new();
|
||||||
|
private string? errorMessage;
|
||||||
|
private string sortColumn = "confirmed";
|
||||||
|
private bool sortDesc = true;
|
||||||
|
private int TotalSessions => stats?.Count > 0 ? (int)(stats.Max(s => s.TotalSessions)) : 0;
|
||||||
|
private int AvgAttendanceRate => stats?.Count > 0 ? (int)(stats.Average(s => s.AttendanceRate)) : 0;
|
||||||
|
private PlayerAttendanceStats? topPlayer => stats?.OrderByDescending(s => s.AttendanceRate).ThenByDescending(s => s.ConfirmedCount).FirstOrDefault();
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
var authState = await AuthStateProvider.GetAuthenticationStateAsync();
|
||||||
|
var user = authState.User;
|
||||||
|
if (!user.Identity?.IsAuthenticated ?? true)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/login");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var telegramIdClaim = user.FindFirst("telegram_id")?.Value
|
||||||
|
?? user.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!long.TryParse(telegramIdClaim, out var telegramId))
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/login");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!await SessionStore.IsGroupManagerAsync(GroupId, telegramId))
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/access-denied");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
stats = await SessionStore.GetGroupAttendanceStatsAsync(GroupId) ?? new();
|
||||||
|
UpdateSortedStats();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
errorMessage = $"Ошибка загрузки статистики: {ex.Message}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SortBy(string column)
|
||||||
|
{
|
||||||
|
if (sortColumn == column)
|
||||||
|
sortDesc = !sortDesc;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sortColumn = column;
|
||||||
|
sortDesc = true;
|
||||||
|
}
|
||||||
|
UpdateSortedStats();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateSortedStats()
|
||||||
|
{
|
||||||
|
if (stats is null) { sortedStats = new(); return; }
|
||||||
|
IOrderedEnumerable<PlayerAttendanceStats> ordered = sortColumn switch
|
||||||
|
{
|
||||||
|
"player" => sortDesc ? stats.OrderByDescending(s => s.DisplayName) : stats.OrderBy(s => s.DisplayName),
|
||||||
|
"total" => sortDesc ? stats.OrderByDescending(s => s.TotalSessions) : stats.OrderBy(s => s.TotalSessions),
|
||||||
|
"confirmed" => sortDesc ? stats.OrderByDescending(s => s.ConfirmedCount) : stats.OrderBy(s => s.ConfirmedCount),
|
||||||
|
"declined" => sortDesc ? stats.OrderByDescending(s => s.DeclinedCount) : stats.OrderBy(s => s.DeclinedCount),
|
||||||
|
"noresponse" => sortDesc ? stats.OrderByDescending(s => s.NoResponseCount) : stats.OrderBy(s => s.NoResponseCount),
|
||||||
|
"waitlist" => sortDesc ? stats.OrderByDescending(s => s.WaitlistedCount) : stats.OrderBy(s => s.WaitlistedCount),
|
||||||
|
"rate" => sortDesc ? stats.OrderByDescending(s => s.AttendanceRate) : stats.OrderBy(s => s.AttendanceRate),
|
||||||
|
"cancelled" => sortDesc ? stats.OrderByDescending(s => s.CancellationAffectedCount) : stats.OrderBy(s => s.CancellationAffectedCount),
|
||||||
|
_ => stats.OrderByDescending(s => s.ConfirmedCount)
|
||||||
|
};
|
||||||
|
sortedStats = ordered.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private string SortIndicator(string column) => sortColumn == column ? (sortDesc ? "▼" : "▲") : "";
|
||||||
|
|
||||||
|
private string AttendanceBadgeClass(decimal rate) => rate switch
|
||||||
|
{
|
||||||
|
>= 75m => "rate-excellent",
|
||||||
|
>= 50m => "rate-good",
|
||||||
|
_ => "rate-poor"
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<div class="login-page">
|
<div class="login-page">
|
||||||
<div class="login-card">
|
<div class="login-card">
|
||||||
<div class="login-logo">🎲</div>
|
<img src="logo.png" alt="GM-Relay" class="login-logo" />
|
||||||
<h1 class="login-title">GM-Relay</h1>
|
<h1 class="login-title">GM-Relay</h1>
|
||||||
<p class="login-subtitle">Войдите через Telegram для управления игровыми сессиями</p>
|
<p class="login-subtitle">Войдите через Telegram для управления игровыми сессиями</p>
|
||||||
|
|
||||||
@@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
@code {
|
@code {
|
||||||
private string BotUsername => Configuration["Telegram:BotUsername"] ?? "GmRelayBot";
|
private string BotUsername => Configuration["Telegram:BotUsername"] ?? "GmRelayBot";
|
||||||
private string AuthUrl => Navigation.ToAbsoluteUri("/auth/telegram").ToString();
|
|
||||||
|
|
||||||
[CascadingParameter]
|
[CascadingParameter]
|
||||||
private Task<AuthenticationState>? AuthStateTask { get; set; }
|
private Task<AuthenticationState>? AuthStateTask { get; set; }
|
||||||
@@ -46,7 +45,8 @@
|
|||||||
{
|
{
|
||||||
if (firstRender)
|
if (firstRender)
|
||||||
{
|
{
|
||||||
await JS.InvokeVoidAsync("loadTelegramWidget", BotUsername, AuthUrl);
|
await JS.InvokeVoidAsync("loadTelegramWidget", BotUsername, "/auth/telegram-login");
|
||||||
|
await JS.InvokeVoidAsync("watchTelegramMiniAppLogin", "/auth/status", "/", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,103 @@
|
|||||||
|
@page "/miniapp"
|
||||||
|
@using Microsoft.AspNetCore.Components.Authorization
|
||||||
|
@using System.Text.Json.Serialization
|
||||||
|
@inject IJSRuntime JS
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
|
||||||
|
<PageTitle>Mini App Dashboard — GM-Relay</PageTitle>
|
||||||
|
|
||||||
|
<div class="mini-app-page">
|
||||||
|
<div class="mini-app-auth-card" data-auth-status="@miniAppAuthStatus">
|
||||||
|
<img src="logo.png" alt="GM-Relay" class="mini-app-logo" />
|
||||||
|
<h1>GM-Relay</h1>
|
||||||
|
<p>@statusMessage</p>
|
||||||
|
|
||||||
|
@if (showFallback)
|
||||||
|
{
|
||||||
|
<a href="/login" class="btn-gm btn-gm-primary">Войти через Telegram</a>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
private string statusMessage = "Открываем dashboard внутри Telegram...";
|
||||||
|
private string miniAppAuthStatus = "starting";
|
||||||
|
private bool showFallback;
|
||||||
|
|
||||||
|
[CascadingParameter]
|
||||||
|
private Task<AuthenticationState>? AuthStateTask { get; set; }
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
if (AuthStateTask is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var user = (await AuthStateTask).User;
|
||||||
|
if (user.Identity?.IsAuthenticated == true)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
|
{
|
||||||
|
if (!firstRender)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = await JS.InvokeAsync<MiniAppAuthResult>(
|
||||||
|
"authenticateTelegramMiniApp",
|
||||||
|
"/auth/telegram-webapp",
|
||||||
|
"/");
|
||||||
|
|
||||||
|
if (!result.Authenticated)
|
||||||
|
{
|
||||||
|
miniAppAuthStatus = string.IsNullOrWhiteSpace(result.Reason)
|
||||||
|
? "telegram-auth-failed"
|
||||||
|
: result.Reason;
|
||||||
|
statusMessage = GetStatusMessage(miniAppAuthStatus);
|
||||||
|
showFallback = true;
|
||||||
|
StateHasChanged();
|
||||||
|
await TryWatchLoginAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (JSException)
|
||||||
|
{
|
||||||
|
miniAppAuthStatus = "telegram-auth-failed";
|
||||||
|
statusMessage = "Не удалось получить данные Telegram Mini App. Попробуйте открыть dashboard из бота.";
|
||||||
|
showFallback = true;
|
||||||
|
StateHasChanged();
|
||||||
|
await TryWatchLoginAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task TryWatchLoginAsync()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await JS.InvokeVoidAsync("watchTelegramMiniAppLogin", "/auth/status", "/");
|
||||||
|
}
|
||||||
|
catch (JSException)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetStatusMessage(string reason) => reason switch
|
||||||
|
{
|
||||||
|
"telegram-webapp-missing" => "Mini App API не найден. Если страница открыта в браузере, войдите через Telegram.",
|
||||||
|
"telegram-init-data-empty" => "Telegram открыл страницу без Mini App initData. Попробуйте войти через Telegram на этом экране.",
|
||||||
|
"telegram-auth-failed" => "Не удалось проверить Telegram Mini App. Попробуйте войти через Telegram.",
|
||||||
|
_ => "Mini App доступен из Telegram. Для браузера используйте обычный вход."
|
||||||
|
};
|
||||||
|
|
||||||
|
private sealed record MiniAppAuthResult(
|
||||||
|
[property: JsonPropertyName("authenticated")] bool Authenticated,
|
||||||
|
[property: JsonPropertyName("reason")] string? Reason,
|
||||||
|
[property: JsonPropertyName("status")] int? Status,
|
||||||
|
[property: JsonPropertyName("redirectUrl")] string? RedirectUrl);
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
@page "/session/{SessionId:guid}/history"
|
||||||
|
@using GmRelay.Web.Services
|
||||||
|
@using Microsoft.AspNetCore.Authorization
|
||||||
|
@using Microsoft.AspNetCore.Components.Authorization
|
||||||
|
@attribute [Authorize]
|
||||||
|
@inject AuthorizedSessionService SessionService
|
||||||
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
|
||||||
|
<PageTitle>История изменений — GM-Relay</PageTitle>
|
||||||
|
|
||||||
|
<div class="page-container">
|
||||||
|
<ul class="gm-breadcrumb animate-fade-in">
|
||||||
|
<li><a href="/">Главная</a></li>
|
||||||
|
<li><a href="/group/@groupId">Группа</a></li>
|
||||||
|
<li class="active">История изменений</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div class="page-header animate-fade-in">
|
||||||
|
<h2>📜 История изменений</h2>
|
||||||
|
@if (sessionTitle is not null)
|
||||||
|
{
|
||||||
|
<p style="color: var(--text-muted); margin-top: 0.25rem;">@sessionTitle</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (entries is null)
|
||||||
|
{
|
||||||
|
<div class="glass-card" style="padding: 2rem;">
|
||||||
|
<div class="skeleton skeleton-text" style="width: 50%; margin-bottom: 1.5rem;"></div>
|
||||||
|
<div class="skeleton skeleton-text" style="width: 100%; height: 2.5rem; margin-bottom: 1.5rem;"></div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else if (entries.Count == 0)
|
||||||
|
{
|
||||||
|
<div class="glass-card animate-slide-up" style="padding: 2rem; text-align: center;">
|
||||||
|
<p style="color: var(--text-muted);">История изменений пуста. Значимые изменения (время, ссылка, название, участники) будут отображаться здесь.</p>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<div class="glass-card animate-slide-up">
|
||||||
|
<div class="table-responsive">
|
||||||
|
<table class="gm-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Время</th>
|
||||||
|
<th>Актор</th>
|
||||||
|
<th>Тип изменения</th>
|
||||||
|
<th>Было</th>
|
||||||
|
<th>Стало</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@foreach (var entry in entries)
|
||||||
|
{
|
||||||
|
<tr>
|
||||||
|
<td>@entry.ChangedAt.ToString("dd.MM.yyyy HH:mm") UTC</td>
|
||||||
|
<td>@entry.ActorName (@entry.ActorTelegramId)</td>
|
||||||
|
<td>
|
||||||
|
<span class="status-badge @(GetBadgeClass(entry.ChangeType))">
|
||||||
|
@GetChangeTypeLabel(entry.ChangeType)
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td style="max-width: 200px; overflow-wrap: break-word; color: var(--text-muted);">@(entry.OldValue ?? "—")</td>
|
||||||
|
<td style="max-width: 200px; overflow-wrap: break-word;">@(entry.NewValue ?? "—")</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[Parameter] public Guid SessionId { get; set; }
|
||||||
|
private List<SessionAuditLogEntry>? entries;
|
||||||
|
private string? sessionTitle;
|
||||||
|
private Guid? groupId;
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
var authState = await AuthStateProvider.GetAuthenticationStateAsync();
|
||||||
|
if (!authState.User.TryGetTelegramId(out var telegramId))
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/access-denied");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var session = await SessionService.GetSessionForGmAsync(SessionId, telegramId);
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/access-denied");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
sessionTitle = session.Title;
|
||||||
|
groupId = session.GroupId;
|
||||||
|
entries = await SessionService.GetSessionHistoryForGmAsync(SessionId, telegramId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetChangeTypeLabel(string changeType) => changeType switch
|
||||||
|
{
|
||||||
|
"Title" => "Название",
|
||||||
|
"Time" => "Время",
|
||||||
|
"Link" => "Ссылка",
|
||||||
|
"MaxPlayers" => "Лимит мест",
|
||||||
|
"Status" => "Статус",
|
||||||
|
"WaitlistPromote" => "Продвижение из листа ожидания",
|
||||||
|
"PlayerRemoved" => "Исключение игрока",
|
||||||
|
"BatchRescheduled" => "Перенос батча",
|
||||||
|
"Cancelled" => "Отмена",
|
||||||
|
_ => changeType
|
||||||
|
};
|
||||||
|
|
||||||
|
private string GetBadgeClass(string changeType) => changeType switch
|
||||||
|
{
|
||||||
|
"Cancelled" or "PlayerRemoved" => "status-danger",
|
||||||
|
"WaitlistPromote" => "status-success",
|
||||||
|
"BatchRescheduled" or "Time" => "status-warning",
|
||||||
|
_ => "status-info"
|
||||||
|
};
|
||||||
|
}
|
||||||
+79
-10
@@ -23,6 +23,7 @@ builder.AddNpgsqlDataSource("gmrelaydb");
|
|||||||
builder.Services.AddSingleton<TelegramAuthService>();
|
builder.Services.AddSingleton<TelegramAuthService>();
|
||||||
builder.Services.AddSingleton<ISessionStore, SessionService>();
|
builder.Services.AddSingleton<ISessionStore, SessionService>();
|
||||||
builder.Services.AddScoped<AuthorizedSessionService>();
|
builder.Services.AddScoped<AuthorizedSessionService>();
|
||||||
|
builder.Services.AddScoped<CalendarSubscriptionService>();
|
||||||
|
|
||||||
// Add Bot Client
|
// Add Bot Client
|
||||||
builder.Services.AddSingleton<ITelegramBotClient>(sp =>
|
builder.Services.AddSingleton<ITelegramBotClient>(sp =>
|
||||||
@@ -87,27 +88,95 @@ app.MapGet("/auth/telegram", async (HttpContext context, TelegramAuthService aut
|
|||||||
{
|
{
|
||||||
if (authService.Verify(context.Request.Query, out var telegramId, out var name))
|
if (authService.Verify(context.Request.Query, out var telegramId, out var name))
|
||||||
{
|
{
|
||||||
var claims = new List<Claim>
|
|
||||||
{
|
|
||||||
new Claim(ClaimTypes.NameIdentifier, telegramId.ToString()),
|
|
||||||
new Claim(ClaimTypes.Name, name),
|
|
||||||
new Claim("TelegramId", telegramId.ToString())
|
|
||||||
};
|
|
||||||
|
|
||||||
var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
|
|
||||||
var authProperties = new AuthenticationProperties { IsPersistent = true };
|
var authProperties = new AuthenticationProperties { IsPersistent = true };
|
||||||
|
await context.SignInAsync(
|
||||||
await context.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, new ClaimsPrincipal(claimsIdentity), authProperties);
|
CookieAuthenticationDefaults.AuthenticationScheme,
|
||||||
|
CreateTelegramPrincipal(telegramId, name),
|
||||||
|
authProperties);
|
||||||
return Results.Redirect("/");
|
return Results.Redirect("/");
|
||||||
}
|
}
|
||||||
|
|
||||||
return Results.Redirect("/login?error=auth_failed");
|
return Results.Redirect("/login?error=auth_failed");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.MapPost("/auth/telegram-webapp", async (
|
||||||
|
HttpContext context,
|
||||||
|
TelegramAuthService authService,
|
||||||
|
TelegramWebAppAuthRequest request) =>
|
||||||
|
{
|
||||||
|
if (!authService.VerifyWebAppInitData(request.InitData, out var telegramId, out var name))
|
||||||
|
{
|
||||||
|
return Results.Unauthorized();
|
||||||
|
}
|
||||||
|
|
||||||
|
var authProperties = new AuthenticationProperties { IsPersistent = true };
|
||||||
|
await context.SignInAsync(
|
||||||
|
CookieAuthenticationDefaults.AuthenticationScheme,
|
||||||
|
CreateTelegramPrincipal(telegramId, name),
|
||||||
|
authProperties);
|
||||||
|
|
||||||
|
return Results.Ok(new { redirectUrl = "/" });
|
||||||
|
}).DisableAntiforgery();
|
||||||
|
|
||||||
|
app.MapPost("/auth/telegram-login", async (
|
||||||
|
HttpContext context,
|
||||||
|
TelegramAuthService authService,
|
||||||
|
TelegramLoginPayload request) =>
|
||||||
|
{
|
||||||
|
if (!authService.VerifyLoginPayload(request, out var telegramId, out var name))
|
||||||
|
{
|
||||||
|
return Results.Unauthorized();
|
||||||
|
}
|
||||||
|
|
||||||
|
var authProperties = new AuthenticationProperties { IsPersistent = true };
|
||||||
|
await context.SignInAsync(
|
||||||
|
CookieAuthenticationDefaults.AuthenticationScheme,
|
||||||
|
CreateTelegramPrincipal(telegramId, name),
|
||||||
|
authProperties);
|
||||||
|
|
||||||
|
return Results.Ok(new { redirectUrl = "/" });
|
||||||
|
}).DisableAntiforgery();
|
||||||
|
|
||||||
|
app.MapGet("/auth/status", (HttpContext context) =>
|
||||||
|
Results.Ok(new { authenticated = context.User.Identity?.IsAuthenticated == true }));
|
||||||
|
|
||||||
app.MapPost("/auth/logout", async (HttpContext context) =>
|
app.MapPost("/auth/logout", async (HttpContext context) =>
|
||||||
{
|
{
|
||||||
await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||||
return Results.Redirect("/");
|
return Results.Redirect("/");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Public calendar subscription endpoint (no auth required)
|
||||||
|
app.MapGet("/calendar/{token}.ics", async (
|
||||||
|
string token,
|
||||||
|
CalendarSubscriptionService service,
|
||||||
|
CancellationToken ct) =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var ics = await service.GetIcsAsync(token, ct);
|
||||||
|
var bytes = System.Text.Encoding.UTF8.GetBytes(ics);
|
||||||
|
return Results.File(bytes, "text/calendar", "schedule.ics");
|
||||||
|
}
|
||||||
|
catch (SubscriptionNotFoundException)
|
||||||
|
{
|
||||||
|
return Results.NotFound();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
||||||
|
|
||||||
|
static ClaimsPrincipal CreateTelegramPrincipal(long telegramId, string name)
|
||||||
|
{
|
||||||
|
var claims = new List<Claim>
|
||||||
|
{
|
||||||
|
new(ClaimTypes.NameIdentifier, telegramId.ToString(System.Globalization.CultureInfo.InvariantCulture)),
|
||||||
|
new(ClaimTypes.Name, name),
|
||||||
|
new("TelegramId", telegramId.ToString(System.Globalization.CultureInfo.InvariantCulture))
|
||||||
|
};
|
||||||
|
|
||||||
|
var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
|
||||||
|
return new ClaimsPrincipal(claimsIdentity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record TelegramWebAppAuthRequest(string InitData);
|
||||||
|
|||||||
@@ -66,6 +66,15 @@ public sealed class AuthorizedSessionService(ISessionStore sessionStore)
|
|||||||
}
|
}
|
||||||
|
|
||||||
await sessionStore.UpdateSessionAsync(sessionId, session.GroupId, title, scheduledAt, joinLink, maxPlayers);
|
await sessionStore.UpdateSessionAsync(sessionId, session.GroupId, title, scheduledAt, joinLink, maxPlayers);
|
||||||
|
|
||||||
|
if (session.Title != title)
|
||||||
|
await sessionStore.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Title", session.Title, title);
|
||||||
|
if (session.ScheduledAt != scheduledAt)
|
||||||
|
await sessionStore.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Time", session.ScheduledAt.ToString("O"), scheduledAt.ToString("O"));
|
||||||
|
if (session.JoinLink != joinLink)
|
||||||
|
await sessionStore.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Link", session.JoinLink, joinLink);
|
||||||
|
if (session.MaxPlayers != maxPlayers)
|
||||||
|
await sessionStore.LogSessionChangeAsync(sessionId, gmId, "ГМ", "MaxPlayers", session.MaxPlayers?.ToString(), maxPlayers?.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task PromoteWaitlistedPlayerForGmAsync(Guid sessionId, long gmId)
|
public async Task PromoteWaitlistedPlayerForGmAsync(Guid sessionId, long gmId)
|
||||||
@@ -77,6 +86,7 @@ public sealed class AuthorizedSessionService(ISessionStore sessionStore)
|
|||||||
}
|
}
|
||||||
|
|
||||||
await sessionStore.PromoteWaitlistedPlayerAsync(sessionId, session.GroupId);
|
await sessionStore.PromoteWaitlistedPlayerAsync(sessionId, session.GroupId);
|
||||||
|
await sessionStore.LogSessionChangeAsync(sessionId, gmId, "ГМ", "WaitlistPromote", null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task UpdateBatchDetailsForGmAsync(Guid batchId, long gmId, string title, string joinLink)
|
public async Task UpdateBatchDetailsForGmAsync(Guid batchId, long gmId, string title, string joinLink)
|
||||||
@@ -115,6 +125,7 @@ public sealed class AuthorizedSessionService(ISessionStore sessionStore)
|
|||||||
}
|
}
|
||||||
|
|
||||||
await sessionStore.RescheduleBatchAsync(batchId, batch.GroupId, firstScheduledAt, intervalDays);
|
await sessionStore.RescheduleBatchAsync(batchId, batch.GroupId, firstScheduledAt, intervalDays);
|
||||||
|
await sessionStore.LogSessionChangeAsync(batchId, gmId, "ГМ", "BatchRescheduled", batch.FirstScheduledAt.ToString("O"), firstScheduledAt.ToString("O"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<WebSessionBatch> CloneBatchForGmAsync(Guid batchId, long gmId, BatchCloneInterval interval)
|
public async Task<WebSessionBatch> CloneBatchForGmAsync(Guid batchId, long gmId, BatchCloneInterval interval)
|
||||||
@@ -219,6 +230,40 @@ public sealed class AuthorizedSessionService(ISessionStore sessionStore)
|
|||||||
await sessionStore.RemoveGroupCoGmAsync(groupId, coGmTelegramId);
|
await sessionStore.RemoveGroupCoGmAsync(groupId, coGmTelegramId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<List<WebParticipant>?> GetSessionParticipantsForGmAsync(Guid sessionId, long gmId)
|
||||||
|
{
|
||||||
|
var session = await GetSessionForGmAsync(sessionId, gmId);
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return await sessionStore.GetSessionParticipantsAsync(sessionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<SessionAuditLogEntry>?> GetSessionHistoryForGmAsync(Guid sessionId, long gmId)
|
||||||
|
{
|
||||||
|
var session = await GetSessionForGmAsync(sessionId, gmId);
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return await sessionStore.GetSessionHistoryAsync(sessionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task RemovePlayerFromSessionForGmAsync(Guid sessionId, long gmId, Guid participantId)
|
||||||
|
{
|
||||||
|
var session = await GetSessionForGmAsync(sessionId, gmId);
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(sessionId, gmId);
|
||||||
|
}
|
||||||
|
|
||||||
|
await sessionStore.RemovePlayerFromSessionAsync(sessionId, session.GroupId, participantId);
|
||||||
|
await sessionStore.LogSessionChangeAsync(sessionId, gmId, "ГМ", "PlayerRemoved", participantId.ToString(), null);
|
||||||
|
}
|
||||||
|
|
||||||
private async Task<bool> GroupBelongsToGmAsync(Guid groupId, long gmId)
|
private async Task<bool> GroupBelongsToGmAsync(Guid groupId, long gmId)
|
||||||
{
|
{
|
||||||
return await sessionStore.IsGroupManagerAsync(groupId, gmId);
|
return await sessionStore.IsGroupManagerAsync(groupId, gmId);
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
using Telegram.Bot;
|
||||||
|
using Telegram.Bot.Types.Enums;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
|
||||||
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Handles editing batch messages that may be either text or photo messages.
|
||||||
|
/// When the batch was created with SendPhoto (image + caption), we need
|
||||||
|
/// EditMessageCaption instead of EditMessageText.
|
||||||
|
/// </summary>
|
||||||
|
public static class BatchMessageEditor
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Edits a batch message, automatically detecting whether it is a text or photo message.
|
||||||
|
/// Tries EditMessageText first; on failure falls back to EditMessageCaption.
|
||||||
|
/// </summary>
|
||||||
|
public static async Task EditBatchMessageAsync(
|
||||||
|
ITelegramBotClient bot,
|
||||||
|
long chatId,
|
||||||
|
int messageId,
|
||||||
|
string text,
|
||||||
|
InlineKeyboardMarkup? replyMarkup,
|
||||||
|
CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await bot.EditMessageText(
|
||||||
|
chatId: chatId,
|
||||||
|
messageId: messageId,
|
||||||
|
text: text,
|
||||||
|
parseMode: ParseMode.Html,
|
||||||
|
replyMarkup: replyMarkup,
|
||||||
|
cancellationToken: ct);
|
||||||
|
}
|
||||||
|
catch (Telegram.Bot.Exceptions.ApiRequestException ex)
|
||||||
|
when (ex.Message.Contains("there is no text in the message", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
// The batch message is a photo — use EditMessageCaption instead.
|
||||||
|
// Caption is limited to 1024 chars; if text exceeds that, truncate gracefully.
|
||||||
|
var caption = text.Length <= 1024 ? text : text[..1021] + "...";
|
||||||
|
await bot.EditMessageCaption(
|
||||||
|
chatId: chatId,
|
||||||
|
messageId: messageId,
|
||||||
|
caption: caption,
|
||||||
|
parseMode: ParseMode.Html,
|
||||||
|
replyMarkup: replyMarkup,
|
||||||
|
cancellationToken: ct);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Dapper;
|
||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
using Npgsql;
|
||||||
|
|
||||||
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
|
public sealed class CalendarSubscriptionService(NpgsqlDataSource dataSource)
|
||||||
|
{
|
||||||
|
private const string IcsProdId = "-//GM-Relay//TTRPG Schedule//EN";
|
||||||
|
|
||||||
|
public string GenerateToken() => Guid.NewGuid().ToString("N");
|
||||||
|
|
||||||
|
public async Task<string> CreateSubscriptionAsync(
|
||||||
|
long userTelegramId,
|
||||||
|
Guid? groupId,
|
||||||
|
CalendarSubscriptionFilter filter,
|
||||||
|
CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
var token = GenerateToken();
|
||||||
|
await using var connection = await dataSource.OpenConnectionAsync(ct);
|
||||||
|
await connection.ExecuteAsync(
|
||||||
|
@"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;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<string> GetIcsAsync(string token, CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
await using var connection = await dataSource.OpenConnectionAsync(ct);
|
||||||
|
|
||||||
|
var subscription = await connection.QueryFirstOrDefaultAsync<SubscriptionRecord>(
|
||||||
|
@"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())",
|
||||||
|
new { token });
|
||||||
|
|
||||||
|
if (subscription is null)
|
||||||
|
throw new SubscriptionNotFoundException();
|
||||||
|
|
||||||
|
var sessions = await connection.QueryAsync<CalendarSessionDto>(
|
||||||
|
subscription.FilterType == (int)CalendarSubscriptionFilter.SpecificGroup && subscription.GroupId.HasValue
|
||||||
|
? @"SELECT s.id as Id, s.title as Title, s.scheduled_at as ScheduledAt
|
||||||
|
FROM sessions s
|
||||||
|
WHERE s.group_id = @GroupId
|
||||||
|
AND s.status = @Planned
|
||||||
|
AND s.scheduled_at > NOW()
|
||||||
|
ORDER BY s.scheduled_at ASC"
|
||||||
|
: @"SELECT s.id as Id, s.title as Title, s.scheduled_at as ScheduledAt
|
||||||
|
FROM sessions s
|
||||||
|
WHERE s.status = @Planned
|
||||||
|
AND s.scheduled_at > NOW()
|
||||||
|
ORDER BY s.scheduled_at ASC",
|
||||||
|
new { subscription.GroupId, Planned = SessionStatus.Planned });
|
||||||
|
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
sb.AppendLine("BEGIN:VCALENDAR");
|
||||||
|
sb.AppendLine("VERSION:2.0");
|
||||||
|
sb.AppendLine($"PRODID:{IcsProdId}");
|
||||||
|
sb.AppendLine("CALSCALE:GREGORIAN");
|
||||||
|
sb.AppendLine("METHOD:PUBLISH");
|
||||||
|
|
||||||
|
foreach (var s in sessions)
|
||||||
|
{
|
||||||
|
var dtStart = FormatIcsDate(s.ScheduledAt);
|
||||||
|
var dtEnd = FormatIcsDate(s.ScheduledAt.AddHours(4));
|
||||||
|
sb.AppendLine("BEGIN:VEVENT");
|
||||||
|
sb.AppendLine($"UID:{s.Id}@gmrelay");
|
||||||
|
sb.AppendLine($"DTSTAMP:{FormatIcsDate(DateTime.UtcNow)}");
|
||||||
|
sb.AppendLine($"DTSTART:{dtStart}");
|
||||||
|
sb.AppendLine($"DTEND:{dtEnd}");
|
||||||
|
sb.AppendLine($"SUMMARY:{EscapeIcsText(s.Title)}");
|
||||||
|
sb.AppendLine("END:VEVENT");
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.AppendLine("END:VCALENDAR");
|
||||||
|
return sb.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FormatIcsDate(DateTime dt) => dt.ToUniversalTime().ToString("yyyyMMddTHHmmssZ");
|
||||||
|
|
||||||
|
private static string EscapeIcsText(string text) => text
|
||||||
|
.Replace("\\", "\\\\")
|
||||||
|
.Replace(";", "\\;")
|
||||||
|
.Replace(",", "\\,")
|
||||||
|
.Replace("\n", "\\n")
|
||||||
|
.Replace("\r", "");
|
||||||
|
|
||||||
|
private sealed record SubscriptionRecord(Guid Id, long UserTelegramId, Guid? GroupId, int FilterType);
|
||||||
|
private sealed record CalendarSessionDto(Guid Id, string Title, DateTime ScheduledAt);
|
||||||
|
}
|
||||||
@@ -2,6 +2,30 @@ using GmRelay.Shared.Domain;
|
|||||||
|
|
||||||
namespace GmRelay.Web.Services;
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
|
public sealed record PlayerAttendanceStats(
|
||||||
|
Guid PlayerId,
|
||||||
|
string DisplayName,
|
||||||
|
string? TelegramUsername,
|
||||||
|
long TotalSessions,
|
||||||
|
long ConfirmedCount,
|
||||||
|
long DeclinedCount,
|
||||||
|
long NoResponseCount,
|
||||||
|
long WaitlistedCount,
|
||||||
|
long CancellationAffectedCount,
|
||||||
|
decimal AttendanceRate
|
||||||
|
);
|
||||||
|
|
||||||
|
public sealed record SessionAuditLogEntry(
|
||||||
|
Guid Id,
|
||||||
|
Guid SessionId,
|
||||||
|
long ActorTelegramId,
|
||||||
|
string ActorName,
|
||||||
|
string ChangeType,
|
||||||
|
string? OldValue,
|
||||||
|
string? NewValue,
|
||||||
|
DateTime ChangedAt
|
||||||
|
);
|
||||||
|
|
||||||
public interface ISessionStore
|
public interface ISessionStore
|
||||||
{
|
{
|
||||||
Task<List<WebGameGroup>> GetGroupsForGmAsync(long gmId);
|
Task<List<WebGameGroup>> GetGroupsForGmAsync(long gmId);
|
||||||
@@ -25,4 +49,9 @@ public interface ISessionStore
|
|||||||
Task<WebSessionBatch> CreateBatchFromTemplateAsync(Guid templateId, Guid groupId, DateTime firstScheduledAt);
|
Task<WebSessionBatch> CreateBatchFromTemplateAsync(Guid templateId, Guid groupId, DateTime firstScheduledAt);
|
||||||
Task AddGroupCoGmAsync(Guid groupId, long ownerTelegramId, long coGmTelegramId, string displayName, string? telegramUsername);
|
Task AddGroupCoGmAsync(Guid groupId, long ownerTelegramId, long coGmTelegramId, string displayName, string? telegramUsername);
|
||||||
Task RemoveGroupCoGmAsync(Guid groupId, long coGmTelegramId);
|
Task RemoveGroupCoGmAsync(Guid groupId, long coGmTelegramId);
|
||||||
|
Task<List<WebParticipant>> GetSessionParticipantsAsync(Guid sessionId);
|
||||||
|
Task RemovePlayerFromSessionAsync(Guid sessionId, Guid groupId, Guid participantId);
|
||||||
|
Task<List<PlayerAttendanceStats>> GetGroupAttendanceStatsAsync(Guid groupId);
|
||||||
|
Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue);
|
||||||
|
Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using GmRelay.Shared.Domain;
|
|||||||
using GmRelay.Shared.Rendering;
|
using GmRelay.Shared.Rendering;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
|
using GmRelay.Web.Services;
|
||||||
|
|
||||||
namespace GmRelay.Web.Services;
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
@@ -39,6 +40,16 @@ public sealed record WebSession(
|
|||||||
int WaitlistedPlayerCount,
|
int WaitlistedPlayerCount,
|
||||||
string NotificationMode = SessionNotificationModeExtensions.GroupAndDirectValue);
|
string NotificationMode = SessionNotificationModeExtensions.GroupAndDirectValue);
|
||||||
|
|
||||||
|
public sealed record WebParticipant(
|
||||||
|
Guid Id,
|
||||||
|
long TelegramId,
|
||||||
|
string DisplayName,
|
||||||
|
string? TelegramUsername,
|
||||||
|
string RsvpStatus,
|
||||||
|
string RegistrationStatus,
|
||||||
|
bool IsGm,
|
||||||
|
DateTime? RespondedAt);
|
||||||
|
|
||||||
internal sealed record WebPromotedParticipantDto(Guid ParticipantRowId, string DisplayName);
|
internal sealed record WebPromotedParticipantDto(Guid ParticipantRowId, string DisplayName);
|
||||||
internal sealed record WebDirectNotificationRecipient(long TelegramId, string DisplayName);
|
internal sealed record WebDirectNotificationRecipient(long TelegramId, string DisplayName);
|
||||||
internal sealed record WebBatchInfo(
|
internal sealed record WebBatchInfo(
|
||||||
@@ -158,6 +169,65 @@ public sealed class SessionService(
|
|||||||
new { GroupId = groupId, OwnerRole = GroupManagerRoleExtensions.OwnerValue })).ToList();
|
new { GroupId = groupId, OwnerRole = GroupManagerRoleExtensions.OwnerValue })).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<List<PlayerAttendanceStats>> GetGroupAttendanceStatsAsync(Guid groupId)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
return (await conn.QueryAsync<PlayerAttendanceStats>(
|
||||||
|
"""
|
||||||
|
SELECT
|
||||||
|
p.id AS PlayerId,
|
||||||
|
p.display_name AS DisplayName,
|
||||||
|
p.telegram_username AS TelegramUsername,
|
||||||
|
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,
|
||||||
|
COUNT(DISTINCT CASE WHEN sp.rsvp_status = 'Pending' THEN s.id END) AS NoResponseCount,
|
||||||
|
COUNT(DISTINCT CASE WHEN sp.registration_status = 'Waitlisted' THEN s.id END) AS WaitlistedCount,
|
||||||
|
COUNT(DISTINCT CASE WHEN s.status = 'Cancelled' AND sp.rsvp_status IN ('Confirmed','Declined') THEN s.id END) AS CancellationAffectedCount,
|
||||||
|
CASE WHEN COUNT(DISTINCT s.id) > 0
|
||||||
|
THEN ROUND(
|
||||||
|
COUNT(DISTINCT CASE WHEN sp.rsvp_status = 'Confirmed' THEN s.id END)
|
||||||
|
* 100.0 / COUNT(DISTINCT s.id), 2)
|
||||||
|
ELSE 0
|
||||||
|
END AS AttendanceRate
|
||||||
|
FROM players p
|
||||||
|
JOIN session_participants sp ON sp.player_id = p.id
|
||||||
|
JOIN sessions s ON s.id = sp.session_id
|
||||||
|
WHERE s.group_id = @GroupId
|
||||||
|
AND s.scheduled_at <= now()
|
||||||
|
AND sp.is_gm = false
|
||||||
|
GROUP BY p.id, p.display_name, p.telegram_username
|
||||||
|
ORDER BY AttendanceRate DESC, ConfirmedCount DESC
|
||||||
|
""",
|
||||||
|
new { GroupId = groupId })).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
await conn.ExecuteAsync(
|
||||||
|
"""
|
||||||
|
INSERT INTO session_audit_log (session_id, actor_telegram_id, actor_name, change_type, old_value, new_value)
|
||||||
|
VALUES (@SessionId, @ActorTelegramId, @ActorName, @ChangeType, @OldValue, @NewValue)
|
||||||
|
""",
|
||||||
|
new { SessionId = sessionId, ActorTelegramId = actorTelegramId, ActorName = actorName, ChangeType = changeType, OldValue = oldValue, NewValue = newValue });
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
var entries = await conn.QueryAsync<SessionAuditLogEntry>(
|
||||||
|
"""
|
||||||
|
SELECT id, session_id AS SessionId, actor_telegram_id AS ActorTelegramId, actor_name AS ActorName,
|
||||||
|
change_type AS ChangeType, old_value AS OldValue, new_value AS NewValue, changed_at AS ChangedAt
|
||||||
|
FROM session_audit_log
|
||||||
|
WHERE session_id = @SessionId
|
||||||
|
ORDER BY changed_at DESC
|
||||||
|
""",
|
||||||
|
new { SessionId = sessionId });
|
||||||
|
return entries.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
public async Task AddGroupCoGmAsync(
|
public async Task AddGroupCoGmAsync(
|
||||||
Guid groupId,
|
Guid groupId,
|
||||||
long ownerTelegramId,
|
long ownerTelegramId,
|
||||||
@@ -507,6 +577,148 @@ public sealed class SessionService(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<List<WebParticipant>> GetSessionParticipantsAsync(Guid sessionId)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
return (await conn.QueryAsync<WebParticipant>(
|
||||||
|
"""
|
||||||
|
SELECT sp.id AS Id,
|
||||||
|
p.telegram_id AS TelegramId,
|
||||||
|
p.display_name AS DisplayName,
|
||||||
|
p.telegram_username AS TelegramUsername,
|
||||||
|
sp.rsvp_status AS RsvpStatus,
|
||||||
|
sp.registration_status AS RegistrationStatus,
|
||||||
|
sp.is_gm AS IsGm,
|
||||||
|
sp.responded_at AS RespondedAt
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN players p ON p.id = sp.player_id
|
||||||
|
WHERE sp.session_id = @SessionId
|
||||||
|
ORDER BY sp.is_gm DESC,
|
||||||
|
CASE sp.registration_status WHEN 'Active' THEN 0 ELSE 1 END,
|
||||||
|
sp.created_at
|
||||||
|
""",
|
||||||
|
new { SessionId = sessionId })).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task RemovePlayerFromSessionAsync(Guid sessionId, Guid groupId, Guid participantId)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
await using var transaction = await conn.BeginTransactionAsync();
|
||||||
|
|
||||||
|
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.telegram_chat_id AS TelegramChatId,
|
||||||
|
s.max_players AS MaxPlayers,
|
||||||
|
0 AS ActivePlayerCount,
|
||||||
|
0 AS WaitlistedPlayerCount,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
|
FROM sessions s
|
||||||
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
|
WHERE s.id = @SessionId AND s.group_id = @GroupId
|
||||||
|
FOR UPDATE",
|
||||||
|
new { SessionId = sessionId, GroupId = groupId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(sessionId, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
var participant = await conn.QuerySingleOrDefaultAsync<WebParticipant>(
|
||||||
|
"""
|
||||||
|
SELECT sp.id AS Id,
|
||||||
|
p.telegram_id AS TelegramId,
|
||||||
|
p.display_name AS DisplayName,
|
||||||
|
p.telegram_username AS TelegramUsername,
|
||||||
|
sp.rsvp_status AS RsvpStatus,
|
||||||
|
sp.registration_status AS RegistrationStatus,
|
||||||
|
sp.is_gm AS IsGm,
|
||||||
|
sp.responded_at AS RespondedAt
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN players p ON p.id = sp.player_id
|
||||||
|
WHERE sp.id = @ParticipantId AND sp.session_id = @SessionId
|
||||||
|
""",
|
||||||
|
new { ParticipantId = participantId, SessionId = sessionId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (participant is null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Участник не найден в этой сессии.");
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wasActive = participant.RegistrationStatus == ParticipantRegistrationStatus.Active;
|
||||||
|
|
||||||
|
await conn.ExecuteAsync(
|
||||||
|
"DELETE FROM session_participants WHERE id = @ParticipantId",
|
||||||
|
new { ParticipantId = participantId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
WebPromotedParticipantDto? promoted = null;
|
||||||
|
|
||||||
|
if (wasActive)
|
||||||
|
{
|
||||||
|
promoted = await conn.QuerySingleOrDefaultAsync<WebPromotedParticipantDto>(
|
||||||
|
"""
|
||||||
|
SELECT sp.id AS ParticipantRowId,
|
||||||
|
p.display_name AS DisplayName
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN players p ON p.id = sp.player_id
|
||||||
|
WHERE sp.session_id = @SessionId
|
||||||
|
AND sp.is_gm = false
|
||||||
|
AND sp.registration_status = @Waitlisted
|
||||||
|
ORDER BY sp.created_at ASC, sp.id ASC
|
||||||
|
LIMIT 1
|
||||||
|
FOR UPDATE OF sp
|
||||||
|
""",
|
||||||
|
new { SessionId = sessionId, Waitlisted = ParticipantRegistrationStatus.Waitlisted },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (promoted is not null)
|
||||||
|
{
|
||||||
|
await conn.ExecuteAsync(
|
||||||
|
"""
|
||||||
|
UPDATE session_participants
|
||||||
|
SET registration_status = @Active,
|
||||||
|
rsvp_status = @Pending,
|
||||||
|
responded_at = NULL
|
||||||
|
WHERE id = @ParticipantRowId
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
promoted.ParticipantRowId,
|
||||||
|
Active = ParticipantRegistrationStatus.Active,
|
||||||
|
Pending = RsvpStatus.Pending
|
||||||
|
},
|
||||||
|
transaction);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
|
||||||
|
await bot.SendMessage(
|
||||||
|
session.TelegramChatId,
|
||||||
|
$"🚪 <b>{System.Net.WebUtility.HtmlEncode(participant.DisplayName)}</b> удален(а) из сессии «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
|
||||||
|
|
||||||
|
if (promoted is not null)
|
||||||
|
{
|
||||||
|
await bot.SendMessage(
|
||||||
|
session.TelegramChatId,
|
||||||
|
$"⬆️ <b>{System.Net.WebUtility.HtmlEncode(promoted.DisplayName)}</b> переведен(а) из листа ожидания в основной состав «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
|
||||||
|
|
||||||
|
if (session.BatchMessageId.HasValue)
|
||||||
|
{
|
||||||
|
await TryUpdateBatchMessageAsync(session.BatchId, session.TelegramChatId, session.BatchMessageId.Value, session.Title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (session.BatchMessageId.HasValue)
|
||||||
|
{
|
||||||
|
await TryUpdateBatchMessageAsync(session.BatchId, session.TelegramChatId, session.BatchMessageId.Value, session.Title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async Task UpdateBatchDetailsAsync(Guid batchId, Guid groupId, string title, string joinLink)
|
public async Task UpdateBatchDetailsAsync(Guid batchId, Guid groupId, string title, string joinLink)
|
||||||
{
|
{
|
||||||
await using var conn = await dataSource.OpenConnectionAsync();
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
@@ -726,12 +938,13 @@ public sealed class SessionService(
|
|||||||
},
|
},
|
||||||
transaction);
|
transaction);
|
||||||
|
|
||||||
renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers));
|
renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers, batchJoinLink));
|
||||||
}
|
}
|
||||||
|
|
||||||
await transaction.CommitAsync();
|
await transaction.CommitAsync();
|
||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(batchTitle, renderedSessions, Array.Empty<ParticipantBatchDto>());
|
var view = SessionBatchViewBuilder.Build(batchTitle, renderedSessions, Array.Empty<ParticipantBatchDto>());
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
var batchMessage = await bot.SendMessage(
|
var batchMessage = await bot.SendMessage(
|
||||||
chatId: chatId,
|
chatId: chatId,
|
||||||
messageThreadId: threadId,
|
messageThreadId: threadId,
|
||||||
@@ -934,12 +1147,13 @@ public sealed class SessionService(
|
|||||||
},
|
},
|
||||||
transaction);
|
transaction);
|
||||||
|
|
||||||
renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, template.MaxPlayers));
|
renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, template.MaxPlayers, template.JoinLink));
|
||||||
}
|
}
|
||||||
|
|
||||||
await transaction.CommitAsync();
|
await transaction.CommitAsync();
|
||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(template.Title, renderedSessions, Array.Empty<ParticipantBatchDto>());
|
var view = SessionBatchViewBuilder.Build(template.Title, renderedSessions, Array.Empty<ParticipantBatchDto>());
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
var batchMessage = await bot.SendMessage(
|
var batchMessage = await bot.SendMessage(
|
||||||
chatId: group.TelegramChatId,
|
chatId: group.TelegramChatId,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
@@ -1031,7 +1245,7 @@ public sealed class SessionService(
|
|||||||
await using var conn = await dataSource.OpenConnectionAsync();
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
|
||||||
var sessions = (await conn.QueryAsync<SessionBatchDto>(
|
var sessions = (await conn.QueryAsync<SessionBatchDto>(
|
||||||
"SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
|
"SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
|
||||||
new { BatchId = batchId })).ToList();
|
new { BatchId = batchId })).ToList();
|
||||||
|
|
||||||
var participants = (await conn.QueryAsync<ParticipantBatchDto>(
|
var participants = (await conn.QueryAsync<ParticipantBatchDto>(
|
||||||
@@ -1046,13 +1260,14 @@ public sealed class SessionService(
|
|||||||
ORDER BY sp.registration_status ASC, sp.created_at ASC, sp.responded_at ASC, p.created_at ASC",
|
ORDER BY sp.registration_status ASC, sp.created_at ASC, sp.responded_at ASC, p.created_at ASC",
|
||||||
new { BatchId = batchId })).ToList();
|
new { BatchId = batchId })).ToList();
|
||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(title, sessions, participants);
|
var view = SessionBatchViewBuilder.Build(title, sessions, participants);
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: chatId,
|
chatId: chatId,
|
||||||
messageId: messageId,
|
messageId: messageId,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
|
||||||
replyMarkup: renderResult.Markup);
|
replyMarkup: renderResult.Markup);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
|
public sealed class SubscriptionNotFoundException : Exception
|
||||||
|
{
|
||||||
|
public SubscriptionNotFoundException() : base("Calendar subscription not found.") { }
|
||||||
|
}
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Microsoft.AspNetCore.WebUtilities;
|
||||||
|
|
||||||
namespace GmRelay.Web.Services;
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
@@ -55,4 +58,170 @@ public sealed class TelegramAuthService(IConfiguration configuration)
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool VerifyWebAppInitData(string initData, out long telegramId, out string name)
|
||||||
|
{
|
||||||
|
telegramId = 0;
|
||||||
|
name = string.Empty;
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(initData))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var token = configuration["Telegram__BotToken"] ?? configuration["Telegram:BotToken"];
|
||||||
|
if (string.IsNullOrEmpty(token))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var values = QueryHelpers.ParseQuery(initData);
|
||||||
|
if (!values.TryGetValue("hash", out var hash) || string.IsNullOrWhiteSpace(hash))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var dataCheckString = string.Join(
|
||||||
|
"\n",
|
||||||
|
values
|
||||||
|
.Where(pair => pair.Key != "hash")
|
||||||
|
.OrderBy(pair => pair.Key, StringComparer.Ordinal)
|
||||||
|
.Select(pair => $"{pair.Key}={pair.Value}"));
|
||||||
|
|
||||||
|
var secretKey = HMACSHA256.HashData(Encoding.UTF8.GetBytes("WebAppData"), Encoding.UTF8.GetBytes(token));
|
||||||
|
var computedHashBytes = HMACSHA256.HashData(secretKey, Encoding.UTF8.GetBytes(dataCheckString));
|
||||||
|
|
||||||
|
byte[] hashBytes;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
hashBytes = Convert.FromHexString(hash.ToString());
|
||||||
|
}
|
||||||
|
catch (FormatException)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!CryptographicOperations.FixedTimeEquals(computedHashBytes, hashBytes))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!values.TryGetValue("auth_date", out var authDateStr) ||
|
||||||
|
!long.TryParse(authDateStr, out var authDate))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var now = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
if (now - authDate > 86400)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!values.TryGetValue("user", out var userJson) || string.IsNullOrWhiteSpace(userJson))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return TryReadWebAppUser(userJson.ToString(), out telegramId, out name);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool VerifyLoginPayload(TelegramLoginPayload payload, out long telegramId, out string name)
|
||||||
|
{
|
||||||
|
telegramId = 0;
|
||||||
|
name = string.Empty;
|
||||||
|
|
||||||
|
if (payload.Id <= 0 ||
|
||||||
|
string.IsNullOrWhiteSpace(payload.FirstName) ||
|
||||||
|
payload.AuthDate <= 0 ||
|
||||||
|
string.IsNullOrWhiteSpace(payload.Hash))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var token = configuration["Telegram__BotToken"] ?? configuration["Telegram:BotToken"];
|
||||||
|
if (string.IsNullOrEmpty(token))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var values = new SortedDictionary<string, string>(StringComparer.Ordinal)
|
||||||
|
{
|
||||||
|
["auth_date"] = payload.AuthDate.ToString(System.Globalization.CultureInfo.InvariantCulture),
|
||||||
|
["first_name"] = payload.FirstName,
|
||||||
|
["id"] = payload.Id.ToString(System.Globalization.CultureInfo.InvariantCulture)
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(payload.LastName))
|
||||||
|
values["last_name"] = payload.LastName;
|
||||||
|
if (!string.IsNullOrWhiteSpace(payload.PhotoUrl))
|
||||||
|
values["photo_url"] = payload.PhotoUrl;
|
||||||
|
if (!string.IsNullOrWhiteSpace(payload.Username))
|
||||||
|
values["username"] = payload.Username;
|
||||||
|
|
||||||
|
var dataCheckString = string.Join("\n", values.Select(pair => $"{pair.Key}={pair.Value}"));
|
||||||
|
var secretKey = SHA256.HashData(Encoding.UTF8.GetBytes(token));
|
||||||
|
var computedHashBytes = HMACSHA256.HashData(secretKey, Encoding.UTF8.GetBytes(dataCheckString));
|
||||||
|
|
||||||
|
byte[] hashBytes;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
hashBytes = Convert.FromHexString(payload.Hash);
|
||||||
|
}
|
||||||
|
catch (FormatException)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
catch (ArgumentException)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!CryptographicOperations.FixedTimeEquals(computedHashBytes, hashBytes))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var now = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
if (now - payload.AuthDate > 86400)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
telegramId = payload.Id;
|
||||||
|
name = string.IsNullOrWhiteSpace(payload.LastName)
|
||||||
|
? payload.FirstName
|
||||||
|
: $"{payload.FirstName} {payload.LastName}";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool TryReadWebAppUser(string userJson, out long telegramId, out string name)
|
||||||
|
{
|
||||||
|
telegramId = 0;
|
||||||
|
name = string.Empty;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var document = JsonDocument.Parse(userJson);
|
||||||
|
var root = document.RootElement;
|
||||||
|
|
||||||
|
if (!root.TryGetProperty("id", out var idElement) || !idElement.TryGetInt64(out telegramId))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var firstName = root.TryGetProperty("first_name", out var firstNameElement)
|
||||||
|
? firstNameElement.GetString() ?? string.Empty
|
||||||
|
: string.Empty;
|
||||||
|
var lastName = root.TryGetProperty("last_name", out var lastNameElement)
|
||||||
|
? lastNameElement.GetString() ?? string.Empty
|
||||||
|
: string.Empty;
|
||||||
|
var username = root.TryGetProperty("username", out var usernameElement)
|
||||||
|
? usernameElement.GetString()
|
||||||
|
: null;
|
||||||
|
|
||||||
|
name = (firstName, lastName) switch
|
||||||
|
{
|
||||||
|
({ Length: > 0 }, { Length: > 0 }) => $"{firstName} {lastName}",
|
||||||
|
({ Length: > 0 }, _) => firstName,
|
||||||
|
_ when !string.IsNullOrWhiteSpace(username) => "@" + username,
|
||||||
|
_ => $"Telegram {telegramId.ToString(System.Globalization.CultureInfo.InvariantCulture)}"
|
||||||
|
};
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (JsonException)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public sealed record TelegramLoginPayload(
|
||||||
|
[property: JsonPropertyName("id")] long Id,
|
||||||
|
[property: JsonPropertyName("first_name")] string FirstName,
|
||||||
|
[property: JsonPropertyName("last_name")] string? LastName,
|
||||||
|
[property: JsonPropertyName("username")] string? Username,
|
||||||
|
[property: JsonPropertyName("photo_url")] string? PhotoUrl,
|
||||||
|
[property: JsonPropertyName("auth_date")] long AuthDate,
|
||||||
|
[property: JsonPropertyName("hash")] string Hash);
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
using GmRelay.Shared.Rendering;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
|
||||||
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
|
public static class TelegramSessionBatchRenderer
|
||||||
|
{
|
||||||
|
public static (string Text, InlineKeyboardMarkup Markup) Render(SessionBatchViewModel view)
|
||||||
|
{
|
||||||
|
var messageText = $"🎲 <b>Новые игры:</b> {System.Net.WebUtility.HtmlEncode(view.Title)}\n\n" +
|
||||||
|
$"<b>Расписание:</b>\n\n";
|
||||||
|
|
||||||
|
var buttons = new List<InlineKeyboardButton[]>();
|
||||||
|
|
||||||
|
foreach (var session in view.Sessions)
|
||||||
|
{
|
||||||
|
messageText += $"📅 <b>{session.ScheduledAt.FormatMoscow()}</b>\n";
|
||||||
|
messageText += session.MaxPlayers.HasValue
|
||||||
|
? $"👥 Места: {session.ActivePlayerCount}/{session.MaxPlayers.Value}\n"
|
||||||
|
: $"👥 Игроки ({session.ActivePlayerCount}):\n";
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(session.JoinLink))
|
||||||
|
{
|
||||||
|
messageText += $"🔗 <a href=\"{System.Net.WebUtility.HtmlEncode(session.JoinLink)}\">Ссылка на игру</a>\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (session.ActivePlayers.Count > 0)
|
||||||
|
{
|
||||||
|
messageText += string.Join("\n", session.ActivePlayers.Select(p =>
|
||||||
|
$" 👤 {(p.TelegramUsername != null ? "@" + p.TelegramUsername : p.DisplayName)}")) + "\n";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
messageText += " <i>Пока никто не записался</i>\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (session.WaitlistedPlayers.Count > 0)
|
||||||
|
{
|
||||||
|
messageText += $"⏳ Лист ожидания ({session.WaitlistedPlayers.Count}):\n";
|
||||||
|
messageText += string.Join("\n", session.WaitlistedPlayers.Select(p =>
|
||||||
|
$" ⏱ {(p.TelegramUsername != null ? "@" + p.TelegramUsername : p.DisplayName)}")) + "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (GmRelay.Shared.Domain.SessionStatus.IsCancelled(session.Status))
|
||||||
|
{
|
||||||
|
messageText += "❌ <i>Сессия отменена</i>\n\n";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
messageText += "\n";
|
||||||
|
var actionRow = session.AvailableActions
|
||||||
|
.Select(a => InlineKeyboardButton.WithCallbackData(a.Label, $"{a.ActionKey}:{a.SessionId}"))
|
||||||
|
.ToArray();
|
||||||
|
if (actionRow.Length > 0)
|
||||||
|
buttons.Add(actionRow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (messageText, new InlineKeyboardMarkup(buttons));
|
||||||
|
}
|
||||||
|
}
|
||||||
+256
-52
@@ -1,5 +1,5 @@
|
|||||||
/* ============================================
|
/* ============================================
|
||||||
GM-Relay Design System v1.8.2
|
GM-Relay Design System v1.9.9
|
||||||
Dark RPG Dashboard Theme
|
Dark RPG Dashboard Theme
|
||||||
============================================ */
|
============================================ */
|
||||||
|
|
||||||
@@ -69,6 +69,21 @@
|
|||||||
|
|
||||||
/* Sidebar */
|
/* Sidebar */
|
||||||
--sidebar-width: 260px;
|
--sidebar-width: 260px;
|
||||||
|
|
||||||
|
/* Telegram Mini App safe areas */
|
||||||
|
--gm-tg-safe-top: var(--tg-safe-area-inset-top, env(safe-area-inset-top, 0px));
|
||||||
|
--gm-tg-safe-right: var(--tg-safe-area-inset-right, env(safe-area-inset-right, 0px));
|
||||||
|
--gm-tg-safe-bottom: var(--tg-safe-area-inset-bottom, env(safe-area-inset-bottom, 0px));
|
||||||
|
--gm-tg-safe-left: var(--tg-safe-area-inset-left, env(safe-area-inset-left, 0px));
|
||||||
|
--gm-tg-content-safe-top: var(--tg-content-safe-area-inset-top, 0px);
|
||||||
|
--gm-tg-content-safe-right: var(--tg-content-safe-area-inset-right, 0px);
|
||||||
|
--gm-tg-content-safe-bottom: var(--tg-content-safe-area-inset-bottom, 0px);
|
||||||
|
--gm-tg-content-safe-left: var(--tg-content-safe-area-inset-left, 0px);
|
||||||
|
--gm-mini-app-top-inset: calc(var(--gm-tg-safe-top, 0px) + var(--gm-tg-content-safe-top, 0px));
|
||||||
|
--gm-mini-app-bottom-inset: calc(var(--gm-tg-safe-bottom, 0px) + var(--gm-tg-content-safe-bottom, 0px));
|
||||||
|
--gm-mini-app-left-inset: calc(var(--gm-tg-safe-left, 0px) + var(--gm-tg-content-safe-left, 0px));
|
||||||
|
--gm-mini-app-right-inset: calc(var(--gm-tg-safe-right, 0px) + var(--gm-tg-content-safe-right, 0px));
|
||||||
|
--gm-tg-viewport-height: 100dvh;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* === Reset & Base === */
|
/* === Reset & Base === */
|
||||||
@@ -407,6 +422,46 @@ select option {
|
|||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.session-table-desktop {
|
||||||
|
overflow-x: auto;
|
||||||
|
overflow-y: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-table-desktop-card {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-table-desktop .gm-table {
|
||||||
|
min-width: 760px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-table-desktop .gm-table th:last-child,
|
||||||
|
.session-table-desktop .gm-table td:last-child {
|
||||||
|
width: 8.5rem;
|
||||||
|
min-width: 8.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-join-link {
|
||||||
|
display: inline-block;
|
||||||
|
max-width: 150px;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-table-actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-table-actions .btn-gm {
|
||||||
|
font-size: 0.8125rem;
|
||||||
|
padding: 0.375rem 0.75rem;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
/* === Alerts === */
|
/* === Alerts === */
|
||||||
.gm-alert {
|
.gm-alert {
|
||||||
padding: 0.875rem 1.125rem;
|
padding: 0.875rem 1.125rem;
|
||||||
@@ -822,8 +877,13 @@ select option {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.login-logo {
|
.login-logo {
|
||||||
font-size: 2.5rem;
|
width: 2.5rem;
|
||||||
|
height: 2.5rem;
|
||||||
|
object-fit: contain;
|
||||||
margin-bottom: 0.5rem;
|
margin-bottom: 0.5rem;
|
||||||
|
display: block;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.login-title {
|
.login-title {
|
||||||
@@ -842,12 +902,130 @@ select option {
|
|||||||
margin-bottom: 2rem;
|
margin-bottom: 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* === Telegram Mini App entry === */
|
||||||
|
.mini-app-page {
|
||||||
|
min-height: 100vh;
|
||||||
|
min-height: var(--gm-tg-viewport-height, 100dvh);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 1rem;
|
||||||
|
background: var(--bg-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.mini-app-auth-card {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 360px;
|
||||||
|
padding: 1.5rem;
|
||||||
|
border: 1px solid var(--glass-border);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
background: var(--glass-bg);
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mini-app-logo {
|
||||||
|
width: 2.25rem;
|
||||||
|
height: 2.25rem;
|
||||||
|
object-fit: contain;
|
||||||
|
margin-bottom: 0.75rem;
|
||||||
|
display: block;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mini-app-auth-card h1 {
|
||||||
|
font-size: 1.375rem;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mini-app-auth-card p {
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 0.875rem;
|
||||||
|
margin-bottom: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.telegram-mini-app .page-container {
|
||||||
|
max-width: 720px;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.telegram-mini-app {
|
||||||
|
min-height: var(--gm-tg-viewport-height, 100dvh);
|
||||||
|
}
|
||||||
|
|
||||||
|
body.telegram-mini-app .mini-app-page {
|
||||||
|
padding-top: calc(1rem + var(--gm-mini-app-top-inset, 0px));
|
||||||
|
padding-right: calc(1rem + var(--gm-mini-app-right-inset, 0px));
|
||||||
|
padding-bottom: calc(1rem + var(--gm-mini-app-bottom-inset, 0px));
|
||||||
|
padding-left: calc(1rem + var(--gm-mini-app-left-inset, 0px));
|
||||||
|
}
|
||||||
|
|
||||||
|
body.telegram-mini-app .content {
|
||||||
|
padding-bottom: calc(1.5rem + var(--gm-mini-app-bottom-inset, 0px));
|
||||||
|
}
|
||||||
|
|
||||||
/* === Mobile Sessions Cards (instead of table) === */
|
/* === Mobile Sessions Cards (instead of table) === */
|
||||||
.session-card-mobile {
|
.session-card-mobile {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
body.telegram-mini-app .session-table-desktop {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.telegram-mini-app .session-card-mobile {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-card {
|
||||||
|
background: var(--glass-bg);
|
||||||
|
backdrop-filter: blur(var(--glass-blur));
|
||||||
|
border: 1px solid var(--glass-border);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 1rem;
|
||||||
|
margin-bottom: 0.75rem;
|
||||||
|
transition: all var(--transition-smooth);
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-card:hover {
|
||||||
|
border-color: var(--border-glow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-card-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: flex-start;
|
||||||
|
margin-bottom: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-card-title {
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 0.9375rem;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-card-body {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
font-size: 0.8125rem;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-card-row {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-card-actions {
|
||||||
|
margin-top: 0.75rem;
|
||||||
|
padding-top: 0.75rem;
|
||||||
|
border-top: 1px solid var(--border-color);
|
||||||
|
display: flex;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1024px) {
|
||||||
.session-table-desktop {
|
.session-table-desktop {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
@@ -855,56 +1033,9 @@ select option {
|
|||||||
.session-card-mobile {
|
.session-card-mobile {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.session-card {
|
@media (max-width: 768px) {
|
||||||
background: var(--glass-bg);
|
|
||||||
backdrop-filter: blur(var(--glass-blur));
|
|
||||||
border: 1px solid var(--glass-border);
|
|
||||||
border-radius: var(--radius-md);
|
|
||||||
padding: 1rem;
|
|
||||||
margin-bottom: 0.75rem;
|
|
||||||
transition: all var(--transition-smooth);
|
|
||||||
}
|
|
||||||
|
|
||||||
.session-card:hover {
|
|
||||||
border-color: var(--border-glow);
|
|
||||||
}
|
|
||||||
|
|
||||||
.session-card-header {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: flex-start;
|
|
||||||
margin-bottom: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.session-card-title {
|
|
||||||
font-weight: 600;
|
|
||||||
font-size: 0.9375rem;
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.session-card-body {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.5rem;
|
|
||||||
font-size: 0.8125rem;
|
|
||||||
color: var(--text-secondary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.session-card-row {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.session-card-actions {
|
|
||||||
margin-top: 0.75rem;
|
|
||||||
padding-top: 0.75rem;
|
|
||||||
border-top: 1px solid var(--border-color);
|
|
||||||
display: flex;
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card-grid {
|
.card-grid {
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
@@ -928,6 +1059,26 @@ select option {
|
|||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.telegram-mini-app .content {
|
||||||
|
padding: 0.75rem;
|
||||||
|
padding-bottom: calc(0.75rem + var(--gm-mini-app-bottom-inset, 0px));
|
||||||
|
}
|
||||||
|
|
||||||
|
.telegram-mini-app .page-container {
|
||||||
|
padding: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.telegram-mini-app .nav-header {
|
||||||
|
padding-top: calc(1.25rem + var(--gm-mini-app-top-inset, 0px));
|
||||||
|
padding-left: calc(1rem + var(--gm-mini-app-left-inset, 0px));
|
||||||
|
padding-right: calc(0.75rem + var(--gm-mini-app-right-inset, 0px));
|
||||||
|
}
|
||||||
|
|
||||||
|
body.telegram-mini-app .nav-toggle {
|
||||||
|
top: calc(0.75rem + var(--gm-mini-app-top-inset, 0px));
|
||||||
|
left: calc(0.75rem + var(--gm-mini-app-left-inset, 0px));
|
||||||
|
}
|
||||||
|
|
||||||
h2 {
|
h2 {
|
||||||
font-size: 1.25rem;
|
font-size: 1.25rem;
|
||||||
}
|
}
|
||||||
@@ -974,3 +1125,56 @@ select option {
|
|||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* === Participant list === */
|
||||||
|
.participant-panel {
|
||||||
|
background: rgba(0, 0, 0, 0.2);
|
||||||
|
border-radius: 0.75rem;
|
||||||
|
padding: 0.75rem;
|
||||||
|
margin: 0.5rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.participant-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.participant-row {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
background: rgba(255, 255, 255, 0.03);
|
||||||
|
border-radius: 0.5rem;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.participant-info {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.participant-name {
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.participant-username {
|
||||||
|
font-size: 0.75rem;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-gm-link {
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-weight: 500;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: inherit;
|
||||||
|
font-family: inherit;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 279 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 279 KiB |
@@ -0,0 +1,397 @@
|
|||||||
|
using GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
using GmRelay.Bot.Features.Sessions.RescheduleSession;
|
||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
using GmRelay.Shared.Rendering;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Features.Landing;
|
||||||
|
|
||||||
|
public sealed class TelegramLandingPromisesSmokeTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void Smoke_ShouldCoverTelegramLandingPromisesWithoutExternalTelegramApi()
|
||||||
|
{
|
||||||
|
var nowUtc = new DateTimeOffset(2026, 5, 1, 12, 0, 0, TimeSpan.Zero);
|
||||||
|
var parseResult = NewSessionCommandParser.Parse(BuildRecurringSessionCommand(), nowUtc);
|
||||||
|
|
||||||
|
Assert.True(parseResult.IsValid);
|
||||||
|
Assert.Equal(3, parseResult.ScheduledTimes.Count);
|
||||||
|
Assert.Equal(2, parseResult.MaxPlayers);
|
||||||
|
Assert.Equal(TimeSpan.FromDays(7), parseResult.ScheduledTimes[1] - parseResult.ScheduledTimes[0]);
|
||||||
|
|
||||||
|
var scenario = TelegramLandingSmokeScenario.Publish(parseResult, SessionNotificationMode.GroupAndDirect);
|
||||||
|
var publishedCallbacks = CallbackData(scenario.LastMessage.Markup);
|
||||||
|
|
||||||
|
Assert.Contains("Landing Promise Smoke", scenario.LastMessage.Text);
|
||||||
|
Assert.Equal(6, publishedCallbacks.Count);
|
||||||
|
Assert.All(scenario.Sessions, session =>
|
||||||
|
{
|
||||||
|
Assert.Contains($"join_session:{session.Id}", publishedCallbacks);
|
||||||
|
Assert.Contains($"leave_session:{session.Id}", publishedCallbacks);
|
||||||
|
Assert.Contains(session.ScheduledAt.FormatMoscow(), scenario.LastMessage.Text);
|
||||||
|
});
|
||||||
|
|
||||||
|
var firstSessionId = scenario.Sessions[0].Id;
|
||||||
|
var alice = scenario.Join(firstSessionId, 1001, "Alice", "alice");
|
||||||
|
var bob = scenario.Join(firstSessionId, 1002, "Bob", "bob");
|
||||||
|
var carol = scenario.Join(firstSessionId, 1003, "Carol", "carol");
|
||||||
|
|
||||||
|
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, alice));
|
||||||
|
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, bob));
|
||||||
|
Assert.Equal(ParticipantRegistrationStatus.Waitlisted, scenario.RegistrationStatus(firstSessionId, carol));
|
||||||
|
Assert.Contains("2/2", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@alice", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@bob", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@carol", scenario.LastMessage.Text);
|
||||||
|
|
||||||
|
scenario.Leave(firstSessionId, alice);
|
||||||
|
|
||||||
|
Assert.False(scenario.HasParticipant(firstSessionId, alice));
|
||||||
|
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, carol));
|
||||||
|
Assert.DoesNotContain("@alice", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@carol", scenario.LastMessage.Text);
|
||||||
|
|
||||||
|
scenario.MarkRsvpConfirmed(firstSessionId, bob);
|
||||||
|
scenario.MarkRsvpConfirmed(firstSessionId, carol);
|
||||||
|
|
||||||
|
var option1Id = Guid.NewGuid();
|
||||||
|
var option2Id = Guid.NewGuid();
|
||||||
|
var options = new[]
|
||||||
|
{
|
||||||
|
new RescheduleOptionDto(option1Id, 1, new DateTimeOffset(2026, 5, 29, 16, 30, 0, TimeSpan.Zero)),
|
||||||
|
new RescheduleOptionDto(option2Id, 2, new DateTimeOffset(2026, 5, 30, 15, 0, 0, TimeSpan.Zero))
|
||||||
|
};
|
||||||
|
var deadline = new DateTimeOffset(2026, 5, 20, 18, 0, 0, TimeSpan.Zero);
|
||||||
|
var voteParticipants = scenario.ActiveVoteParticipants(firstSessionId);
|
||||||
|
var voteMessage = HandleRescheduleTimeInputHandler.BuildVotingMessage(
|
||||||
|
scenario.Title,
|
||||||
|
scenario.Sessions[0].ScheduledAt,
|
||||||
|
deadline,
|
||||||
|
options,
|
||||||
|
voteParticipants,
|
||||||
|
[]);
|
||||||
|
var voteKeyboard = HandleRescheduleTimeInputHandler.BuildVotingKeyboard(options);
|
||||||
|
|
||||||
|
Assert.Contains("Landing Promise Smoke", voteMessage);
|
||||||
|
Assert.Contains("0/2", voteMessage);
|
||||||
|
Assert.Contains($"reschedule_vote:{option1Id}", CallbackData(voteKeyboard));
|
||||||
|
Assert.Contains($"reschedule_vote:{option2Id}", CallbackData(voteKeyboard));
|
||||||
|
|
||||||
|
var votes = voteParticipants
|
||||||
|
.Select(participant => new RescheduleOptionVoteDto(
|
||||||
|
option2Id,
|
||||||
|
participant.PlayerId,
|
||||||
|
participant.DisplayName,
|
||||||
|
participant.TelegramUsername))
|
||||||
|
.ToList();
|
||||||
|
var decision = RescheduleVoteRules.SelectWinner(
|
||||||
|
options.Select(option => new RescheduleOptionVoteCount(
|
||||||
|
option.OptionId,
|
||||||
|
votes.Count(vote => vote.OptionId == option.OptionId))).ToList());
|
||||||
|
|
||||||
|
Assert.Equal(RescheduleVoteOutcome.Approved, decision.Outcome);
|
||||||
|
Assert.Equal(option2Id, decision.SelectedOptionId);
|
||||||
|
|
||||||
|
scenario.ApplyReschedule(firstSessionId, options[1].ProposedAt);
|
||||||
|
|
||||||
|
Assert.Equal(options[1].ProposedAt.UtcDateTime, scenario.Sessions[0].ScheduledAt);
|
||||||
|
Assert.Equal(RsvpStatus.Pending, scenario.RsvpStatus(firstSessionId, bob));
|
||||||
|
Assert.Equal(RsvpStatus.Pending, scenario.RsvpStatus(firstSessionId, carol));
|
||||||
|
Assert.Contains(options[1].ProposedAt.UtcDateTime.FormatMoscow(), scenario.LastMessage.Text);
|
||||||
|
Assert.Collection(
|
||||||
|
scenario.Messenger.DirectMessages.Select(message => message.TelegramId).Order(),
|
||||||
|
telegramId => Assert.Equal(1002, telegramId),
|
||||||
|
telegramId => Assert.Equal(1003, telegramId));
|
||||||
|
Assert.All(scenario.Messenger.DirectMessages, message =>
|
||||||
|
{
|
||||||
|
Assert.Contains("Landing Promise Smoke", message.Text);
|
||||||
|
Assert.Contains(options[1].ProposedAt.UtcDateTime.FormatMoscow(), message.Text);
|
||||||
|
});
|
||||||
|
|
||||||
|
var editsBeforeDashboardUpdate = scenario.Messenger.Edits.Count;
|
||||||
|
|
||||||
|
scenario.UpdateBatchFromDashboard("Landing Promise Smoke - Dashboard Sync");
|
||||||
|
|
||||||
|
Assert.True(scenario.Messenger.Edits.Count > editsBeforeDashboardUpdate);
|
||||||
|
Assert.Contains("Landing Promise Smoke - Dashboard Sync", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@bob", scenario.LastMessage.Text);
|
||||||
|
Assert.Contains("@carol", scenario.LastMessage.Text);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string BuildRecurringSessionCommand() =>
|
||||||
|
string.Join(
|
||||||
|
'\n',
|
||||||
|
"/newsession",
|
||||||
|
"\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435: Landing Promise Smoke",
|
||||||
|
"\u0412\u0440\u0435\u043c\u044f: 15.05.2026 19:30",
|
||||||
|
"\u0418\u0433\u0440: 3",
|
||||||
|
"\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b: 7",
|
||||||
|
"\u041c\u0435\u0441\u0442: 2",
|
||||||
|
"\u0421\u0441\u044b\u043b\u043a\u0430: https://example.test/table");
|
||||||
|
|
||||||
|
private static IReadOnlyList<string> CallbackData(InlineKeyboardMarkup markup) =>
|
||||||
|
markup.InlineKeyboard
|
||||||
|
.SelectMany(row => row)
|
||||||
|
.Select(button => button.CallbackData)
|
||||||
|
.OfType<string>()
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
private sealed class TelegramLandingSmokeScenario
|
||||||
|
{
|
||||||
|
private readonly List<SmokeSession> sessions;
|
||||||
|
private readonly List<SmokeParticipant> participants = [];
|
||||||
|
private readonly SessionNotificationMode notificationMode;
|
||||||
|
|
||||||
|
private TelegramLandingSmokeScenario(
|
||||||
|
string title,
|
||||||
|
IReadOnlyList<DateTimeOffset> scheduledTimes,
|
||||||
|
int? maxPlayers,
|
||||||
|
string joinLink,
|
||||||
|
SessionNotificationMode notificationMode)
|
||||||
|
{
|
||||||
|
Title = title;
|
||||||
|
this.notificationMode = notificationMode;
|
||||||
|
sessions = scheduledTimes
|
||||||
|
.Select(scheduledAt => new SmokeSession(
|
||||||
|
Guid.NewGuid(),
|
||||||
|
scheduledAt.UtcDateTime,
|
||||||
|
SessionStatus.Planned,
|
||||||
|
maxPlayers,
|
||||||
|
joinLink))
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Title { get; private set; }
|
||||||
|
public FakeTelegramMessenger Messenger { get; } = new();
|
||||||
|
public IReadOnlyList<SmokeSession> Sessions => sessions;
|
||||||
|
public FakeTelegramMessage LastMessage => Messenger.LastMessage;
|
||||||
|
|
||||||
|
public static TelegramLandingSmokeScenario Publish(
|
||||||
|
NewSessionParseResult parseResult,
|
||||||
|
SessionNotificationMode notificationMode)
|
||||||
|
{
|
||||||
|
var scenario = new TelegramLandingSmokeScenario(
|
||||||
|
parseResult.Title!,
|
||||||
|
parseResult.ScheduledTimes,
|
||||||
|
parseResult.MaxPlayers,
|
||||||
|
parseResult.Link!,
|
||||||
|
notificationMode);
|
||||||
|
|
||||||
|
scenario.RenderBatch();
|
||||||
|
return scenario;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Guid Join(Guid sessionId, long telegramId, string displayName, string? telegramUsername)
|
||||||
|
{
|
||||||
|
var session = sessions.Single(value => value.Id == sessionId);
|
||||||
|
var activeParticipants = participants.Count(participant =>
|
||||||
|
participant.SessionId == sessionId &&
|
||||||
|
participant.RegistrationStatus == ParticipantRegistrationStatus.Active);
|
||||||
|
var registrationStatus = SessionCapacityRules.DecideJoinStatus(
|
||||||
|
session.MaxPlayers,
|
||||||
|
activeParticipants);
|
||||||
|
var playerId = Guid.NewGuid();
|
||||||
|
|
||||||
|
participants.Add(new SmokeParticipant(
|
||||||
|
sessionId,
|
||||||
|
playerId,
|
||||||
|
telegramId,
|
||||||
|
displayName,
|
||||||
|
telegramUsername,
|
||||||
|
registrationStatus,
|
||||||
|
GmRelay.Shared.Domain.RsvpStatus.Pending,
|
||||||
|
participants.Count));
|
||||||
|
|
||||||
|
RenderBatch();
|
||||||
|
return playerId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Leave(Guid sessionId, Guid playerId)
|
||||||
|
{
|
||||||
|
var participant = participants.Single(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.PlayerId == playerId);
|
||||||
|
participants.Remove(participant);
|
||||||
|
|
||||||
|
var session = sessions.Single(value => value.Id == sessionId);
|
||||||
|
var activeParticipantsAfterLeave = participants.Count(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.RegistrationStatus == ParticipantRegistrationStatus.Active);
|
||||||
|
var waitlistedParticipants = participants.Count(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted);
|
||||||
|
|
||||||
|
if (SessionCapacityRules.ShouldPromoteAfterParticipantLeaves(
|
||||||
|
participant.RegistrationStatus,
|
||||||
|
session.MaxPlayers,
|
||||||
|
activeParticipantsAfterLeave,
|
||||||
|
waitlistedParticipants))
|
||||||
|
{
|
||||||
|
var promoted = participants
|
||||||
|
.Where(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted)
|
||||||
|
.OrderBy(value => value.JoinOrder)
|
||||||
|
.First();
|
||||||
|
|
||||||
|
promoted.RegistrationStatus = ParticipantRegistrationStatus.Active;
|
||||||
|
promoted.RsvpStatus = GmRelay.Shared.Domain.RsvpStatus.Pending;
|
||||||
|
}
|
||||||
|
|
||||||
|
RenderBatch();
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool HasParticipant(Guid sessionId, Guid playerId) =>
|
||||||
|
participants.Any(value => value.SessionId == sessionId && value.PlayerId == playerId);
|
||||||
|
|
||||||
|
public string RegistrationStatus(Guid sessionId, Guid playerId) =>
|
||||||
|
participants.Single(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.PlayerId == playerId).RegistrationStatus;
|
||||||
|
|
||||||
|
public string RsvpStatus(Guid sessionId, Guid playerId) =>
|
||||||
|
participants.Single(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.PlayerId == playerId).RsvpStatus;
|
||||||
|
|
||||||
|
public void MarkRsvpConfirmed(Guid sessionId, Guid playerId)
|
||||||
|
{
|
||||||
|
participants.Single(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.PlayerId == playerId).RsvpStatus = GmRelay.Shared.Domain.RsvpStatus.Confirmed;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IReadOnlyList<VoteParticipantDto> ActiveVoteParticipants(Guid sessionId) =>
|
||||||
|
participants
|
||||||
|
.Where(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.RegistrationStatus == ParticipantRegistrationStatus.Active)
|
||||||
|
.OrderBy(value => value.DisplayName)
|
||||||
|
.Select(value => new VoteParticipantDto(
|
||||||
|
value.PlayerId,
|
||||||
|
value.DisplayName,
|
||||||
|
value.TelegramUsername,
|
||||||
|
value.TelegramId))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
public void ApplyReschedule(Guid sessionId, DateTimeOffset newScheduledAt)
|
||||||
|
{
|
||||||
|
sessions.Single(value => value.Id == sessionId).ScheduledAt = newScheduledAt.UtcDateTime;
|
||||||
|
|
||||||
|
foreach (var participant in participants.Where(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.RegistrationStatus == ParticipantRegistrationStatus.Active))
|
||||||
|
{
|
||||||
|
participant.RsvpStatus = GmRelay.Shared.Domain.RsvpStatus.Pending;
|
||||||
|
}
|
||||||
|
|
||||||
|
RenderBatch();
|
||||||
|
|
||||||
|
if (!notificationMode.ShouldSendDirectMessages())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var notification = $"""
|
||||||
|
Reschedule approved
|
||||||
|
{Title}
|
||||||
|
{newScheduledAt.UtcDateTime.FormatMoscow()}
|
||||||
|
""";
|
||||||
|
foreach (var participant in participants.Where(value =>
|
||||||
|
value.SessionId == sessionId &&
|
||||||
|
value.RegistrationStatus == ParticipantRegistrationStatus.Active))
|
||||||
|
{
|
||||||
|
Messenger.SendDirectMessage(participant.TelegramId, notification);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void UpdateBatchFromDashboard(string title)
|
||||||
|
{
|
||||||
|
Title = title;
|
||||||
|
RenderBatch();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RenderBatch()
|
||||||
|
{
|
||||||
|
var view = SessionBatchViewBuilder.Build(
|
||||||
|
Title,
|
||||||
|
sessions
|
||||||
|
.Select(session => new SessionBatchDto(
|
||||||
|
session.Id,
|
||||||
|
session.ScheduledAt,
|
||||||
|
session.Status,
|
||||||
|
session.MaxPlayers,
|
||||||
|
session.JoinLink))
|
||||||
|
.ToList(),
|
||||||
|
participants
|
||||||
|
.Select(participant => new ParticipantBatchDto(
|
||||||
|
participant.SessionId,
|
||||||
|
participant.DisplayName,
|
||||||
|
participant.TelegramUsername,
|
||||||
|
participant.RegistrationStatus))
|
||||||
|
.ToList());
|
||||||
|
var renderResult = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
|
if (Messenger.HasPublishedMessage)
|
||||||
|
{
|
||||||
|
Messenger.EditBatchMessage(renderResult.Text, renderResult.Markup);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Messenger.PublishBatchMessage(renderResult.Text, renderResult.Markup);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class FakeTelegramMessenger
|
||||||
|
{
|
||||||
|
private const int BatchMessageId = 7001;
|
||||||
|
|
||||||
|
public List<FakeTelegramMessage> Sends { get; } = [];
|
||||||
|
public List<FakeTelegramMessage> Edits { get; } = [];
|
||||||
|
public List<FakeDirectMessage> DirectMessages { get; } = [];
|
||||||
|
public bool HasPublishedMessage => Sends.Count > 0;
|
||||||
|
public FakeTelegramMessage LastMessage => Edits.Count > 0 ? Edits[^1] : Sends[^1];
|
||||||
|
|
||||||
|
public void PublishBatchMessage(string text, InlineKeyboardMarkup markup) =>
|
||||||
|
Sends.Add(new FakeTelegramMessage(BatchMessageId, text, markup));
|
||||||
|
|
||||||
|
public void EditBatchMessage(string text, InlineKeyboardMarkup markup) =>
|
||||||
|
Edits.Add(new FakeTelegramMessage(BatchMessageId, text, markup));
|
||||||
|
|
||||||
|
public void SendDirectMessage(long telegramId, string text) =>
|
||||||
|
DirectMessages.Add(new FakeDirectMessage(telegramId, text));
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed record FakeTelegramMessage(
|
||||||
|
int MessageId,
|
||||||
|
string Text,
|
||||||
|
InlineKeyboardMarkup Markup);
|
||||||
|
|
||||||
|
private sealed record FakeDirectMessage(long TelegramId, string Text);
|
||||||
|
|
||||||
|
private sealed record SmokeSession(
|
||||||
|
Guid Id,
|
||||||
|
DateTime ScheduledAt,
|
||||||
|
string Status,
|
||||||
|
int? MaxPlayers,
|
||||||
|
string JoinLink)
|
||||||
|
{
|
||||||
|
public DateTime ScheduledAt { get; set; } = ScheduledAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed record SmokeParticipant(
|
||||||
|
Guid SessionId,
|
||||||
|
Guid PlayerId,
|
||||||
|
long TelegramId,
|
||||||
|
string DisplayName,
|
||||||
|
string? TelegramUsername,
|
||||||
|
string RegistrationStatus,
|
||||||
|
string RsvpStatus,
|
||||||
|
int JoinOrder)
|
||||||
|
{
|
||||||
|
public string RegistrationStatus { get; set; } = RegistrationStatus;
|
||||||
|
public string RsvpStatus { get; set; } = RsvpStatus;
|
||||||
|
}
|
||||||
|
}
|
||||||
+38
@@ -1,4 +1,5 @@
|
|||||||
using GmRelay.Bot.Features.Sessions.CreateSession;
|
using GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
using Telegram.Bot.Types;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
|
namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
|
||||||
|
|
||||||
@@ -33,6 +34,43 @@ public sealed class NewSessionCommandParserTests
|
|||||||
Assert.Empty(result.InvalidTimeInputs);
|
Assert.Empty(result.InvalidTimeInputs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Parse_ShouldExtractOptionalImageUrl()
|
||||||
|
{
|
||||||
|
var nowUtc = new DateTimeOffset(2026, 4, 23, 12, 0, 0, TimeSpan.Zero);
|
||||||
|
var text = """
|
||||||
|
/newsession
|
||||||
|
Название: Curse of Strahd
|
||||||
|
Время: 24.04.2026 19:30
|
||||||
|
Ссылка: https://example.test/room
|
||||||
|
Картинка: https://example.test/strahd.jpg
|
||||||
|
""";
|
||||||
|
|
||||||
|
var result = NewSessionCommandParser.Parse(text, nowUtc);
|
||||||
|
|
||||||
|
Assert.True(result.IsValid);
|
||||||
|
Assert.Equal("https://example.test/strahd.jpg", result.ImageUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void GetBatchImageReference_ShouldPreferAttachedPhotoOverParsedUrl()
|
||||||
|
{
|
||||||
|
var message = new Message
|
||||||
|
{
|
||||||
|
Photo =
|
||||||
|
[
|
||||||
|
new PhotoSize { FileId = "small-photo", Width = 320, Height = 180, FileSize = 10 },
|
||||||
|
new PhotoSize { FileId = "large-photo", Width = 1280, Height = 720, FileSize = 20 }
|
||||||
|
]
|
||||||
|
};
|
||||||
|
|
||||||
|
var imageReference = CreateSessionHandler.GetBatchImageReference(
|
||||||
|
message,
|
||||||
|
"https://example.test/cover.jpg");
|
||||||
|
|
||||||
|
Assert.Equal("large-photo", imageReference);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void Parse_ShouldExpandRecurringSchedule_WhenRepeatCountAndIntervalProvided()
|
public void Parse_ShouldExpandRecurringSchedule_WhenRepeatCountAndIntervalProvided()
|
||||||
{
|
{
|
||||||
|
|||||||
+58
@@ -0,0 +1,58 @@
|
|||||||
|
using GmRelay.Bot.Features.Sessions.ListSessions;
|
||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Features.Sessions.ListSessions;
|
||||||
|
|
||||||
|
public sealed class SessionListMessageRendererTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void Render_ShouldIncludeManagerActions_WhenUserCanManage()
|
||||||
|
{
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[]
|
||||||
|
{
|
||||||
|
new SessionListItemDto(
|
||||||
|
sessionId,
|
||||||
|
"Ravenloft",
|
||||||
|
new DateTime(2026, 5, 7, 16, 30, 0, DateTimeKind.Utc),
|
||||||
|
SessionStatus.Planned,
|
||||||
|
4,
|
||||||
|
3,
|
||||||
|
1,
|
||||||
|
true)
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = SessionListMessageRenderer.Render(sessions);
|
||||||
|
Assert.NotNull(result.Markup);
|
||||||
|
var buttons = result.Markup.InlineKeyboard.SelectMany(row => row).ToList();
|
||||||
|
|
||||||
|
Assert.Contains("Ravenloft", result.Text);
|
||||||
|
Assert.Collection(
|
||||||
|
buttons.Select(button => button.CallbackData),
|
||||||
|
callbackData => Assert.Equal($"cancel_session:{sessionId}", callbackData),
|
||||||
|
callbackData => Assert.Equal($"reschedule_session:{sessionId}", callbackData),
|
||||||
|
callbackData => Assert.Equal($"promote_waitlist:{sessionId}", callbackData),
|
||||||
|
callbackData => Assert.Equal($"delete_session:{sessionId}", callbackData));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Render_ShouldHideManagerActions_WhenUserCannotManage()
|
||||||
|
{
|
||||||
|
var sessions = new[]
|
||||||
|
{
|
||||||
|
new SessionListItemDto(
|
||||||
|
Guid.NewGuid(),
|
||||||
|
"Ravenloft",
|
||||||
|
new DateTime(2026, 5, 7, 16, 30, 0, DateTimeKind.Utc),
|
||||||
|
SessionStatus.Planned,
|
||||||
|
4,
|
||||||
|
3,
|
||||||
|
1,
|
||||||
|
false)
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = SessionListMessageRenderer.Render(sessions);
|
||||||
|
|
||||||
|
Assert.Null(result.Markup);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
|
||||||
|
|
||||||
|
public sealed class TelegramMiniAppEntryPointTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateRouter_ShouldExposeMiniAppButtonInStartCommand()
|
||||||
|
{
|
||||||
|
var updateRouter = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs"));
|
||||||
|
|
||||||
|
Assert.Contains("Telegram:MiniAppUrl", updateRouter, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("InlineKeyboardButton.WithWebApp", updateRouter, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("Открыть dashboard", updateRouter, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task BotStartup_ShouldRegisterMiniAppMenuButtonService()
|
||||||
|
{
|
||||||
|
var program = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Bot/Program.cs"));
|
||||||
|
|
||||||
|
Assert.Contains("TelegramMiniAppMenuButtonService", program, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("AddHostedService<TelegramMiniAppMenuButtonService>", program, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task MiniAppMenuButtonService_ShouldSetTelegramWebAppMenuButtonWhenConfigured()
|
||||||
|
{
|
||||||
|
var service = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Bot/Infrastructure/Telegram/TelegramMiniAppMenuButtonService.cs"));
|
||||||
|
|
||||||
|
Assert.Contains("SetChatMenuButton", service, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("MenuButtonWebApp", service, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("Telegram:MiniAppUrl", service, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FindRepositoryFile(string relativePath)
|
||||||
|
{
|
||||||
|
var directory = new DirectoryInfo(AppContext.BaseDirectory);
|
||||||
|
while (directory is not null)
|
||||||
|
{
|
||||||
|
var candidate = Path.Combine(directory.FullName, relativePath);
|
||||||
|
if (File.Exists(candidate))
|
||||||
|
{
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
|
||||||
|
directory = directory.Parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
using Telegram.Bot.Types;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
|
||||||
|
|
||||||
|
public sealed class UpdateRouterTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void GetCommandText_ShouldUseCaption_WhenMessageHasNoText()
|
||||||
|
{
|
||||||
|
var message = new Message
|
||||||
|
{
|
||||||
|
Caption = """
|
||||||
|
/newsession
|
||||||
|
Название: Curse of Strahd
|
||||||
|
"""
|
||||||
|
};
|
||||||
|
|
||||||
|
var commandText = UpdateRouter.GetCommandText(message);
|
||||||
|
|
||||||
|
Assert.StartsWith("/newsession", commandText);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
using GmRelay.Shared.Domain;
|
|
||||||
using GmRelay.Shared.Rendering;
|
|
||||||
|
|
||||||
namespace GmRelay.Bot.Tests.Rendering;
|
|
||||||
|
|
||||||
public sealed class SessionBatchRendererTests
|
|
||||||
{
|
|
||||||
[Fact]
|
|
||||||
public void Render_ShouldOrderSessionsAndSkipButtonsForCancelledSessions()
|
|
||||||
{
|
|
||||||
var firstSessionId = Guid.NewGuid();
|
|
||||||
var secondSessionId = Guid.NewGuid();
|
|
||||||
var cancelledSessionId = Guid.NewGuid();
|
|
||||||
|
|
||||||
var sessions = new[]
|
|
||||||
{
|
|
||||||
new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
|
|
||||||
new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null),
|
|
||||||
new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2)
|
|
||||||
};
|
|
||||||
var participants = new[]
|
|
||||||
{
|
|
||||||
new ParticipantBatchDto(secondSessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
|
|
||||||
new ParticipantBatchDto(secondSessionId, "Charlie", null, ParticipantRegistrationStatus.Waitlisted),
|
|
||||||
new ParticipantBatchDto(cancelledSessionId, "Bob", null, ParticipantRegistrationStatus.Active)
|
|
||||||
};
|
|
||||||
|
|
||||||
var result = SessionBatchRenderer.Render("Campaign", sessions, participants);
|
|
||||||
var text = result.Text;
|
|
||||||
var buttons = result.Markup.InlineKeyboard.SelectMany(row => row).ToList();
|
|
||||||
|
|
||||||
var firstIndex = text.IndexOf(sessions[2].ScheduledAt.FormatMoscow(), StringComparison.Ordinal);
|
|
||||||
var secondIndex = text.IndexOf(sessions[0].ScheduledAt.FormatMoscow(), StringComparison.Ordinal);
|
|
||||||
var thirdIndex = text.IndexOf(sessions[1].ScheduledAt.FormatMoscow(), StringComparison.Ordinal);
|
|
||||||
|
|
||||||
Assert.Contains("Campaign", text);
|
|
||||||
Assert.True(firstIndex < secondIndex);
|
|
||||||
Assert.True(secondIndex < thirdIndex);
|
|
||||||
Assert.Contains("Места: 0/2", text);
|
|
||||||
Assert.Contains("Места: 1/4", text);
|
|
||||||
Assert.Contains("@alice", text);
|
|
||||||
Assert.Contains("Лист ожидания (1)", text);
|
|
||||||
Assert.Contains("Charlie", text);
|
|
||||||
Assert.Contains("Bob", text);
|
|
||||||
Assert.Equal(4, result.Markup.InlineKeyboard.Count());
|
|
||||||
Assert.Collection(
|
|
||||||
buttons.Select(button => button.CallbackData),
|
|
||||||
callbackData => Assert.Equal($"join_session:{firstSessionId}", callbackData),
|
|
||||||
callbackData => Assert.Equal($"leave_session:{firstSessionId}", callbackData),
|
|
||||||
callbackData => Assert.Equal($"cancel_session:{firstSessionId}", callbackData),
|
|
||||||
callbackData => Assert.Equal($"reschedule_session:{firstSessionId}", callbackData),
|
|
||||||
callbackData => Assert.Equal($"join_session:{secondSessionId}", callbackData),
|
|
||||||
callbackData => Assert.Equal($"leave_session:{secondSessionId}", callbackData),
|
|
||||||
callbackData => Assert.Equal($"cancel_session:{secondSessionId}", callbackData),
|
|
||||||
callbackData => Assert.Equal($"reschedule_session:{secondSessionId}", callbackData),
|
|
||||||
callbackData => Assert.Equal($"promote_waitlist:{secondSessionId}", callbackData));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
using GmRelay.Shared.Rendering;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Rendering;
|
||||||
|
|
||||||
|
public sealed class SessionBatchViewBuilderTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void Build_ShouldOrderSessionsByDate()
|
||||||
|
{
|
||||||
|
var firstSessionId = Guid.NewGuid();
|
||||||
|
var secondSessionId = Guid.NewGuid();
|
||||||
|
var cancelledSessionId = Guid.NewGuid();
|
||||||
|
|
||||||
|
var sessions = new[]
|
||||||
|
{
|
||||||
|
new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4, "https://example.com/game"),
|
||||||
|
new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null, ""),
|
||||||
|
new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2, "https://example.com/game")
|
||||||
|
};
|
||||||
|
var participants = new[]
|
||||||
|
{
|
||||||
|
new ParticipantBatchDto(secondSessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
|
||||||
|
new ParticipantBatchDto(secondSessionId, "Charlie", null, ParticipantRegistrationStatus.Waitlisted),
|
||||||
|
new ParticipantBatchDto(cancelledSessionId, "Bob", null, ParticipantRegistrationStatus.Active)
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = SessionBatchViewBuilder.Build("Campaign", sessions, participants);
|
||||||
|
|
||||||
|
Assert.Equal("Campaign", result.Title);
|
||||||
|
Assert.Equal(3, result.Sessions.Count);
|
||||||
|
Assert.Equal(firstSessionId, result.Sessions[0].SessionId);
|
||||||
|
Assert.Equal(secondSessionId, result.Sessions[1].SessionId);
|
||||||
|
Assert.Equal(cancelledSessionId, result.Sessions[2].SessionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Build_ShouldCalculatePlayerCounts()
|
||||||
|
{
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
|
||||||
|
var participants = new[]
|
||||||
|
{
|
||||||
|
new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
|
||||||
|
new ParticipantBatchDto(sessionId, "Bob", null, ParticipantRegistrationStatus.Active),
|
||||||
|
new ParticipantBatchDto(sessionId, "Charlie", null, ParticipantRegistrationStatus.Waitlisted)
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
|
||||||
|
var session = result.Sessions[0];
|
||||||
|
|
||||||
|
Assert.Equal(2, session.ActivePlayerCount);
|
||||||
|
Assert.Equal(4, session.MaxPlayers);
|
||||||
|
Assert.True(session.ActivePlayers.Count == 2);
|
||||||
|
Assert.True(session.WaitlistedPlayers.Count == 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Build_ShouldIncludeActionsForActiveSessions()
|
||||||
|
{
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
|
||||||
|
var participants = Array.Empty<ParticipantBatchDto>();
|
||||||
|
|
||||||
|
var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
|
||||||
|
var actions = result.Sessions[0].AvailableActions;
|
||||||
|
|
||||||
|
Assert.Equal(2, actions.Count);
|
||||||
|
Assert.Equal("join_session", result.Sessions[0].AvailableActions[0].ActionKey);
|
||||||
|
Assert.Equal("leave_session", result.Sessions[0].AvailableActions[1].ActionKey);
|
||||||
|
Assert.Equal(sessionId, actions[0].SessionId);
|
||||||
|
Assert.Equal(sessionId, actions[1].SessionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Build_ShouldNotIncludeActionsForCancelledSessions()
|
||||||
|
{
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
|
||||||
|
var participants = Array.Empty<ParticipantBatchDto>();
|
||||||
|
|
||||||
|
var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
|
||||||
|
|
||||||
|
Assert.Empty(result.Sessions[0].AvailableActions);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Build_ShouldMarkWaitlistActionWhenFull()
|
||||||
|
{
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1, "https://example.com/game") };
|
||||||
|
var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
|
||||||
|
|
||||||
|
var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
|
||||||
|
var joinAction = result.Sessions[0].AvailableActions.First(a => a.ActionKey == "join_session");
|
||||||
|
|
||||||
|
Assert.Contains("ожидания", joinAction.Label);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Build_ShouldIncludePlayerUsernames()
|
||||||
|
{
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, null, "https://example.com/game") };
|
||||||
|
var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
|
||||||
|
|
||||||
|
var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
|
||||||
|
var player = result.Sessions[0].ActivePlayers[0];
|
||||||
|
|
||||||
|
Assert.Equal("Alice", player.DisplayName);
|
||||||
|
Assert.Equal("alice", player.TelegramUsername);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
using GmRelay.Shared.Rendering;
|
||||||
|
using Telegram.Bot.Types.ReplyMarkups;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Rendering;
|
||||||
|
|
||||||
|
public sealed class TelegramSessionBatchRendererTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void Render_ShouldProduceCorrectHtmlAndButtons()
|
||||||
|
{
|
||||||
|
var firstSessionId = Guid.NewGuid();
|
||||||
|
var secondSessionId = Guid.NewGuid();
|
||||||
|
var cancelledSessionId = Guid.NewGuid();
|
||||||
|
|
||||||
|
var sessions = new[]
|
||||||
|
{
|
||||||
|
new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4, "https://example.com/game2"),
|
||||||
|
new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null, ""),
|
||||||
|
new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2, "https://example.com/game1")
|
||||||
|
};
|
||||||
|
var participants = new[]
|
||||||
|
{
|
||||||
|
new ParticipantBatchDto(secondSessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
|
||||||
|
new ParticipantBatchDto(secondSessionId, "Charlie", null, ParticipantRegistrationStatus.Waitlisted),
|
||||||
|
new ParticipantBatchDto(cancelledSessionId, "Bob", null, ParticipantRegistrationStatus.Active)
|
||||||
|
};
|
||||||
|
|
||||||
|
var view = SessionBatchViewBuilder.Build("Campaign", sessions, participants);
|
||||||
|
var (text, markup) = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
|
Assert.Contains("Campaign", text);
|
||||||
|
Assert.Contains("@alice", text);
|
||||||
|
Assert.Contains("Charlie", text);
|
||||||
|
Assert.Contains("Bob", text);
|
||||||
|
Assert.Contains("Сессия отменена", text);
|
||||||
|
Assert.Contains("Ссылка на игру", text);
|
||||||
|
Assert.Contains("https://example.com/game1", text);
|
||||||
|
Assert.Contains("https://example.com/game2", text);
|
||||||
|
|
||||||
|
var buttons = markup.InlineKeyboard.SelectMany(row => row).ToList();
|
||||||
|
Assert.Equal(4, buttons.Count); // 2 sessions x 2 buttons each
|
||||||
|
|
||||||
|
Assert.Contains(buttons, b => b.CallbackData == $"join_session:{firstSessionId}");
|
||||||
|
Assert.Contains(buttons, b => b.CallbackData == $"leave_session:{firstSessionId}");
|
||||||
|
Assert.Contains(buttons, b => b.CallbackData == $"join_session:{secondSessionId}");
|
||||||
|
Assert.Contains(buttons, b => b.CallbackData == $"leave_session:{secondSessionId}");
|
||||||
|
Assert.DoesNotContain(buttons, b => b.CallbackData?.StartsWith("cancel") == true);
|
||||||
|
Assert.DoesNotContain(buttons, b => b.CallbackData?.StartsWith("reschedule") == true);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Render_ShouldSkipButtonsForCancelledSessions()
|
||||||
|
{
|
||||||
|
var cancelledSessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[] { new SessionBatchDto(cancelledSessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
|
||||||
|
var participants = Array.Empty<ParticipantBatchDto>();
|
||||||
|
|
||||||
|
var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
|
||||||
|
var (_, markup) = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
|
||||||
|
Assert.Empty(markup.InlineKeyboard);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Render_ShouldShowWaitlistButtonWhenFull()
|
||||||
|
{
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1, "https://example.com/game") };
|
||||||
|
var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
|
||||||
|
|
||||||
|
var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
|
||||||
|
var (_, markup) = TelegramSessionBatchRenderer.Render(view);
|
||||||
|
var buttons = markup.InlineKeyboard.SelectMany(row => row).ToList();
|
||||||
|
var joinButton = buttons.First(b => b.CallbackData?.StartsWith("join_session:") == true);
|
||||||
|
|
||||||
|
Assert.Contains("ожидания", joinButton.Text);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -167,6 +167,83 @@ public sealed class AuthorizedSessionServiceTests
|
|||||||
Assert.Equal(5, store.LastUpdatedMaxPlayers);
|
Assert.Equal(5, store.LastUpdatedMaxPlayers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateSessionForGmAsync_LogsAudit_WhenTitleChanges()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var originalTime = DateTime.UtcNow;
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", gmId)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(sessionId, groupId, "Session A", originalTime, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
await service.UpdateSessionForGmAsync(sessionId, gmId, "Updated Title", originalTime, "https://example.test/a", 4);
|
||||||
|
|
||||||
|
Assert.Single(store.LogEntries);
|
||||||
|
Assert.Equal("Title", store.LogEntries[0].ChangeType);
|
||||||
|
Assert.Equal("Session A", store.LogEntries[0].OldValue);
|
||||||
|
Assert.Equal("Updated Title", store.LogEntries[0].NewValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateSessionForGmAsync_LogsMultipleAudits_WhenMultipleFieldsChange()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var originalTime = DateTime.UtcNow;
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", gmId)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(sessionId, groupId, "Session A", originalTime, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
var newTime = originalTime.AddDays(1);
|
||||||
|
await service.UpdateSessionForGmAsync(sessionId, gmId, "Updated Title", newTime, "https://example.test/b", 5);
|
||||||
|
|
||||||
|
Assert.Equal(4, store.LogEntries.Count);
|
||||||
|
Assert.Contains(store.LogEntries, e => e.ChangeType == "Title");
|
||||||
|
Assert.Contains(store.LogEntries, e => e.ChangeType == "Time");
|
||||||
|
Assert.Contains(store.LogEntries, e => e.ChangeType == "Link");
|
||||||
|
Assert.Contains(store.LogEntries, e => e.ChangeType == "MaxPlayers");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateSessionForGmAsync_DoesNotLogAudit_WhenNothingChanges()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var originalTime = DateTime.UtcNow;
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", gmId)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(sessionId, groupId, "Session A", originalTime, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
await service.UpdateSessionForGmAsync(sessionId, gmId, "Session A", originalTime, "https://example.test/a", 4);
|
||||||
|
|
||||||
|
Assert.Empty(store.LogEntries);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task PromoteWaitlistedPlayerForGmAsync_PromotesOwnedSession()
|
public async Task PromoteWaitlistedPlayerForGmAsync_PromotesOwnedSession()
|
||||||
{
|
{
|
||||||
@@ -655,6 +732,17 @@ public sealed class AuthorizedSessionServiceTests
|
|||||||
public string? LastAddedCoGmUsername { get; private set; }
|
public string? LastAddedCoGmUsername { get; private set; }
|
||||||
public Guid? LastRemovedCoGmGroupId { get; private set; }
|
public Guid? LastRemovedCoGmGroupId { get; private set; }
|
||||||
public long? LastRemovedCoGmTelegramId { get; private set; }
|
public long? LastRemovedCoGmTelegramId { get; private set; }
|
||||||
|
public bool RemovePlayerCalled { get; private set; }
|
||||||
|
public Guid? LastRemovedPlayerSessionId { get; private set; }
|
||||||
|
public Guid? LastRemovedPlayerGroupId { get; private set; }
|
||||||
|
public Guid? LastRemovedPlayerParticipantId { get; private set; }
|
||||||
|
public List<SessionAuditLogEntry> LogEntries { get; private set; } = new();
|
||||||
|
public Guid? LastLogSessionId { get; private set; }
|
||||||
|
public long? LastLogActorTelegramId { get; private set; }
|
||||||
|
public string? LastLogActorName { get; private set; }
|
||||||
|
public string? LastLogChangeType { get; private set; }
|
||||||
|
public string? LastLogOldValue { get; private set; }
|
||||||
|
public string? LastLogNewValue { get; private set; }
|
||||||
|
|
||||||
public Task<List<WebGameGroup>> GetGroupsForGmAsync(long gmId) =>
|
public Task<List<WebGameGroup>> GetGroupsForGmAsync(long gmId) =>
|
||||||
Task.FromResult(groupsById.Values.Where(group => IsManager(group.Id, gmId)).ToList());
|
Task.FromResult(groupsById.Values.Where(group => IsManager(group.Id, gmId)).ToList());
|
||||||
@@ -870,6 +958,37 @@ public sealed class AuthorizedSessionServiceTests
|
|||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Task<List<WebParticipant>> GetSessionParticipantsAsync(Guid sessionId) =>
|
||||||
|
Task.FromResult(new List<WebParticipant>());
|
||||||
|
|
||||||
|
public Task RemovePlayerFromSessionAsync(Guid sessionId, Guid groupId, Guid participantId)
|
||||||
|
{
|
||||||
|
RemovePlayerCalled = true;
|
||||||
|
LastRemovedPlayerSessionId = sessionId;
|
||||||
|
LastRemovedPlayerGroupId = groupId;
|
||||||
|
LastRemovedPlayerParticipantId = participantId;
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<List<PlayerAttendanceStats>> GetGroupAttendanceStatsAsync(Guid groupId) =>
|
||||||
|
Task.FromResult(new List<PlayerAttendanceStats>());
|
||||||
|
|
||||||
|
public Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue)
|
||||||
|
{
|
||||||
|
var entry = new SessionAuditLogEntry(Guid.NewGuid(), sessionId, actorTelegramId, actorName, changeType, oldValue, newValue, DateTime.UtcNow);
|
||||||
|
LogEntries.Add(entry);
|
||||||
|
LastLogSessionId = sessionId;
|
||||||
|
LastLogActorTelegramId = actorTelegramId;
|
||||||
|
LastLogActorName = actorName;
|
||||||
|
LastLogChangeType = changeType;
|
||||||
|
LastLogOldValue = oldValue;
|
||||||
|
LastLogNewValue = newValue;
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId) =>
|
||||||
|
Task.FromResult(LogEntries.Where(e => e.SessionId == sessionId).OrderByDescending(e => e.ChangedAt).ToList());
|
||||||
|
|
||||||
private bool IsManager(Guid groupId, long telegramId) =>
|
private bool IsManager(Guid groupId, long telegramId) =>
|
||||||
IsOwner(groupId, telegramId) ||
|
IsOwner(groupId, telegramId) ||
|
||||||
managers.Any(manager => manager.GroupId == groupId && manager.TelegramId == telegramId);
|
managers.Any(manager => manager.GroupId == groupId && manager.TelegramId == telegramId);
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Tests.Web;
|
namespace GmRelay.Bot.Tests.Web;
|
||||||
|
|
||||||
public sealed class CampaignTemplatesNavigationTests
|
public sealed class CampaignTemplatesNavigationTests
|
||||||
@@ -11,6 +13,20 @@ public sealed class CampaignTemplatesNavigationTests
|
|||||||
Assert.Contains("Шаблоны", navMenu, StringComparison.Ordinal);
|
Assert.Contains("Шаблоны", navMenu, StringComparison.Ordinal);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task NavMenu_ShouldExposeCurrentProjectVersion()
|
||||||
|
{
|
||||||
|
var navMenu = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/Components/Layout/NavMenu.razor"));
|
||||||
|
var props = XDocument.Load(FindRepositoryFile("Directory.Build.props"));
|
||||||
|
var version = props.Root?
|
||||||
|
.Element("PropertyGroup")?
|
||||||
|
.Element("Version")?
|
||||||
|
.Value;
|
||||||
|
|
||||||
|
Assert.False(string.IsNullOrWhiteSpace(version));
|
||||||
|
Assert.Contains($"v{version}", navMenu, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task NavMenuStyles_ShouldStyleNavLinkAnchorsAsStackedRows()
|
public async Task NavMenuStyles_ShouldStyleNavLinkAnchorsAsStackedRows()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
namespace GmRelay.Bot.Tests.Web;
|
||||||
|
|
||||||
|
public sealed class MiniAppDashboardTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public async Task MiniAppPage_ShouldExposeTelegramWebAppDashboardEntryPoint()
|
||||||
|
{
|
||||||
|
var miniAppPage = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/Components/Pages/MiniApp.razor"));
|
||||||
|
|
||||||
|
Assert.Contains("@page \"/miniapp\"", miniAppPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("authenticateTelegramMiniApp", miniAppPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("/auth/telegram-webapp", miniAppPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("watchTelegramMiniAppLogin", miniAppPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("/auth/status", miniAppPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("miniAppAuthStatus", miniAppPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("telegram-webapp-missing", miniAppPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("telegram-init-data-empty", miniAppPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("telegram-auth-failed", miniAppPage, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task AppShell_ShouldLoadTelegramWebAppScriptAndAuthenticator()
|
||||||
|
{
|
||||||
|
var appShell = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/Components/App.razor"));
|
||||||
|
|
||||||
|
Assert.Contains("telegram-web-app.js", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("window.authenticateTelegramMiniApp", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("Telegram.WebApp.initData", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("window.waitForTelegramMiniAppInitData", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("window.watchTelegramMiniAppLogin", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("window.handleTelegramLogin", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("/auth/telegram-login", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("data-onauth", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.DoesNotContain("data-auth-url", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("setTimeout(resolve, 100)", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("reloadOnReturn", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("gmRelayMiniAppLoginLeftPage", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("window.location.reload()", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("syncTelegramMiniAppViewport", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("safeAreaChanged", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("contentSafeAreaChanged", appShell, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("viewportChanged", appShell, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Program_ShouldMapTelegramWebAppAuthEndpoint()
|
||||||
|
{
|
||||||
|
var program = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/Program.cs"));
|
||||||
|
|
||||||
|
Assert.Contains("MapPost(\"/auth/telegram-webapp\"", program, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("MapPost(\"/auth/telegram-login\"", program, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("VerifyWebAppInitData", program, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("VerifyLoginPayload", program, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("MapGet(\"/auth/status\"", program, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("authenticated", program, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Styles_ShouldIncludeMiniAppMobileDashboardRules()
|
||||||
|
{
|
||||||
|
var css = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/wwwroot/app.css"));
|
||||||
|
|
||||||
|
Assert.Contains("mini-app-page", css, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("mini-app-auth-card", css, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("@media (max-width: 768px)", css, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("--tg-safe-area-inset-top", css, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("--tg-content-safe-area-inset-top", css, StringComparison.Ordinal);
|
||||||
|
Assert.Contains(".telegram-mini-app .nav-header", css, StringComparison.Ordinal);
|
||||||
|
Assert.Contains(".telegram-mini-app .nav-toggle", css, StringComparison.Ordinal);
|
||||||
|
Assert.Contains(".telegram-mini-app .mini-app-page", css, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task LoginPage_ShouldAuthenticateMiniAppFallbackInsideCurrentWebView()
|
||||||
|
{
|
||||||
|
var loginPage = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/Components/Pages/Login.razor"));
|
||||||
|
|
||||||
|
Assert.Contains(
|
||||||
|
"JS.InvokeVoidAsync(\"loadTelegramWidget\", BotUsername, \"/auth/telegram-login\")",
|
||||||
|
loginPage,
|
||||||
|
StringComparison.Ordinal);
|
||||||
|
Assert.Contains(
|
||||||
|
"JS.InvokeVoidAsync(\"watchTelegramMiniAppLogin\", \"/auth/status\", \"/\", false)",
|
||||||
|
loginPage,
|
||||||
|
StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FindRepositoryFile(string relativePath)
|
||||||
|
{
|
||||||
|
var directory = new DirectoryInfo(AppContext.BaseDirectory);
|
||||||
|
while (directory is not null)
|
||||||
|
{
|
||||||
|
var candidate = Path.Combine(directory.FullName, relativePath);
|
||||||
|
if (File.Exists(candidate))
|
||||||
|
{
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
|
||||||
|
directory = directory.Parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using System.Text.Json;
|
||||||
using GmRelay.Web.Services;
|
using GmRelay.Web.Services;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
@@ -77,6 +78,183 @@ public sealed class TelegramAuthServiceTests
|
|||||||
Assert.False(verified);
|
Assert.False(verified);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyWebAppInitData_ShouldAcceptValidTelegramWebAppPayload()
|
||||||
|
{
|
||||||
|
const string botToken = "test-bot-token";
|
||||||
|
var initData = CreateWebAppInitData(
|
||||||
|
botToken,
|
||||||
|
new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["auth_date"] = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(),
|
||||||
|
["query_id"] = "AAHdF6IQAAAAAN0XohDhrOrc",
|
||||||
|
["user"] = """{"id":424242,"first_name":"Ada","last_name":"Lovelace","username":"ada"}"""
|
||||||
|
});
|
||||||
|
var service = new TelegramAuthService(CreateConfiguration(botToken));
|
||||||
|
|
||||||
|
var verified = service.VerifyWebAppInitData(initData, out var telegramId, out var name);
|
||||||
|
|
||||||
|
Assert.True(verified);
|
||||||
|
Assert.Equal(424242L, telegramId);
|
||||||
|
Assert.Equal("Ada Lovelace", name);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyWebAppInitData_ShouldRejectTamperedHash()
|
||||||
|
{
|
||||||
|
const string botToken = "test-bot-token";
|
||||||
|
var initData = CreateWebAppInitData(
|
||||||
|
botToken,
|
||||||
|
new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["auth_date"] = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(),
|
||||||
|
["user"] = """{"id":424242,"first_name":"Ada"}"""
|
||||||
|
});
|
||||||
|
var tamperedInitData = initData.Replace("hash=", "hash=00", StringComparison.Ordinal);
|
||||||
|
var service = new TelegramAuthService(CreateConfiguration(botToken));
|
||||||
|
|
||||||
|
var verified = service.VerifyWebAppInitData(tamperedInitData, out _, out _);
|
||||||
|
|
||||||
|
Assert.False(verified);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyWebAppInitData_ShouldRejectExpiredPayload()
|
||||||
|
{
|
||||||
|
const string botToken = "test-bot-token";
|
||||||
|
var initData = CreateWebAppInitData(
|
||||||
|
botToken,
|
||||||
|
new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["auth_date"] = DateTimeOffset.UtcNow.AddDays(-2).ToUnixTimeSeconds().ToString(),
|
||||||
|
["user"] = """{"id":424242,"first_name":"Ada"}"""
|
||||||
|
});
|
||||||
|
var service = new TelegramAuthService(CreateConfiguration(botToken));
|
||||||
|
|
||||||
|
var verified = service.VerifyWebAppInitData(initData, out _, out _);
|
||||||
|
|
||||||
|
Assert.False(verified);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyLoginPayload_ShouldAcceptValidTelegramWidgetCallbackPayload()
|
||||||
|
{
|
||||||
|
const string botToken = "test-bot-token";
|
||||||
|
var authDate = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
var values = new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["auth_date"] = authDate.ToString(),
|
||||||
|
["first_name"] = "Ada",
|
||||||
|
["id"] = "424242",
|
||||||
|
["last_name"] = "Lovelace",
|
||||||
|
["photo_url"] = "https://t.me/i/userpic/320/ada.jpg",
|
||||||
|
["username"] = "ada"
|
||||||
|
};
|
||||||
|
var payload = new TelegramLoginPayload(
|
||||||
|
424242,
|
||||||
|
"Ada",
|
||||||
|
"Lovelace",
|
||||||
|
"ada",
|
||||||
|
"https://t.me/i/userpic/320/ada.jpg",
|
||||||
|
authDate,
|
||||||
|
ComputeTelegramHash(botToken, values));
|
||||||
|
var service = new TelegramAuthService(CreateConfiguration(botToken));
|
||||||
|
|
||||||
|
var verified = service.VerifyLoginPayload(payload, out var telegramId, out var name);
|
||||||
|
|
||||||
|
Assert.True(verified);
|
||||||
|
Assert.Equal(424242L, telegramId);
|
||||||
|
Assert.Equal("Ada Lovelace", name);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyLoginPayload_ShouldRejectTamperedCallbackHash()
|
||||||
|
{
|
||||||
|
var payload = new TelegramLoginPayload(
|
||||||
|
424242,
|
||||||
|
"Ada",
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
|
||||||
|
"00");
|
||||||
|
var service = new TelegramAuthService(CreateConfiguration("test-bot-token"));
|
||||||
|
|
||||||
|
var verified = service.VerifyLoginPayload(payload, out _, out _);
|
||||||
|
|
||||||
|
Assert.False(verified);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyLoginPayload_ShouldRejectExpiredCallbackPayload()
|
||||||
|
{
|
||||||
|
const string botToken = "test-bot-token";
|
||||||
|
var authDate = DateTimeOffset.UtcNow.AddDays(-2).ToUnixTimeSeconds();
|
||||||
|
var values = new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["auth_date"] = authDate.ToString(),
|
||||||
|
["first_name"] = "Ada",
|
||||||
|
["id"] = "424242"
|
||||||
|
};
|
||||||
|
var payload = new TelegramLoginPayload(
|
||||||
|
424242,
|
||||||
|
"Ada",
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
authDate,
|
||||||
|
ComputeTelegramHash(botToken, values));
|
||||||
|
var service = new TelegramAuthService(CreateConfiguration(botToken));
|
||||||
|
|
||||||
|
var verified = service.VerifyLoginPayload(payload, out _, out _);
|
||||||
|
|
||||||
|
Assert.False(verified);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyLoginPayload_ShouldRejectMissingRequiredCallbackFields()
|
||||||
|
{
|
||||||
|
var payload = new TelegramLoginPayload(
|
||||||
|
0,
|
||||||
|
"",
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
|
||||||
|
"");
|
||||||
|
var service = new TelegramAuthService(CreateConfiguration("test-bot-token"));
|
||||||
|
|
||||||
|
var verified = service.VerifyLoginPayload(payload, out _, out _);
|
||||||
|
|
||||||
|
Assert.False(verified);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void TelegramLoginPayload_ShouldDeserializeTelegramWidgetSnakeCaseJson()
|
||||||
|
{
|
||||||
|
var payload = JsonSerializer.Deserialize<TelegramLoginPayload>(
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"id": 424242,
|
||||||
|
"first_name": "Ada",
|
||||||
|
"last_name": "Lovelace",
|
||||||
|
"username": "ada",
|
||||||
|
"photo_url": "https://t.me/i/userpic/320/ada.jpg",
|
||||||
|
"auth_date": 1714300000,
|
||||||
|
"hash": "abcdef"
|
||||||
|
}
|
||||||
|
""");
|
||||||
|
|
||||||
|
Assert.NotNull(payload);
|
||||||
|
Assert.Equal(424242L, payload.Id);
|
||||||
|
Assert.Equal("Ada", payload.FirstName);
|
||||||
|
Assert.Equal("Lovelace", payload.LastName);
|
||||||
|
Assert.Equal("ada", payload.Username);
|
||||||
|
Assert.Equal("https://t.me/i/userpic/320/ada.jpg", payload.PhotoUrl);
|
||||||
|
Assert.Equal(1714300000L, payload.AuthDate);
|
||||||
|
Assert.Equal("abcdef", payload.Hash);
|
||||||
|
}
|
||||||
|
|
||||||
private static IConfiguration CreateConfiguration(string botToken) =>
|
private static IConfiguration CreateConfiguration(string botToken) =>
|
||||||
new ConfigurationBuilder()
|
new ConfigurationBuilder()
|
||||||
.AddInMemoryCollection(new Dictionary<string, string?>
|
.AddInMemoryCollection(new Dictionary<string, string?>
|
||||||
@@ -106,4 +284,27 @@ public sealed class TelegramAuthServiceTests
|
|||||||
var hashBytes = HMACSHA256.HashData(secretKey, Encoding.UTF8.GetBytes(dataCheckString));
|
var hashBytes = HMACSHA256.HashData(secretKey, Encoding.UTF8.GetBytes(dataCheckString));
|
||||||
return Convert.ToHexString(hashBytes).ToLowerInvariant();
|
return Convert.ToHexString(hashBytes).ToLowerInvariant();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static string CreateWebAppInitData(string botToken, IReadOnlyDictionary<string, string> values)
|
||||||
|
{
|
||||||
|
var hash = ComputeTelegramWebAppHash(botToken, values);
|
||||||
|
var encodedPairs = values
|
||||||
|
.OrderBy(pair => pair.Key, StringComparer.Ordinal)
|
||||||
|
.Select(pair => $"{Uri.EscapeDataString(pair.Key)}={Uri.EscapeDataString(pair.Value)}")
|
||||||
|
.Append($"hash={hash}");
|
||||||
|
|
||||||
|
return string.Join("&", encodedPairs);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string ComputeTelegramWebAppHash(string botToken, IReadOnlyDictionary<string, string> values)
|
||||||
|
{
|
||||||
|
var dataCheckString = string.Join(
|
||||||
|
"\n",
|
||||||
|
values
|
||||||
|
.OrderBy(pair => pair.Key, StringComparer.Ordinal)
|
||||||
|
.Select(pair => $"{pair.Key}={pair.Value}"));
|
||||||
|
var secretKey = HMACSHA256.HashData(Encoding.UTF8.GetBytes("WebAppData"), Encoding.UTF8.GetBytes(botToken));
|
||||||
|
var hashBytes = HMACSHA256.HashData(secretKey, Encoding.UTF8.GetBytes(dataCheckString));
|
||||||
|
return Convert.ToHexString(hashBytes).ToLowerInvariant();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,69 @@ public sealed class WebStylesTests
|
|||||||
css);
|
css);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task AppCss_ShouldReserveTelegramMiniAppSafeAreaForMobileChrome()
|
||||||
|
{
|
||||||
|
var appCss = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/wwwroot/app.css"));
|
||||||
|
Assert.Contains("--gm-tg-safe-top", appCss, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("--tg-safe-area-inset-top", appCss, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("--tg-content-safe-area-inset-top", appCss, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("env(safe-area-inset-top", appCss, StringComparison.Ordinal);
|
||||||
|
Assert.Contains(".telegram-mini-app .content", appCss, StringComparison.Ordinal);
|
||||||
|
Assert.Contains(".telegram-mini-app .nav-header", appCss, StringComparison.Ordinal);
|
||||||
|
Assert.Contains(".telegram-mini-app .nav-toggle", appCss, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task AppCss_ShouldKeepDesktopSessionActionsReadableWhenTableOverflows()
|
||||||
|
{
|
||||||
|
var appCss = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/wwwroot/app.css"));
|
||||||
|
|
||||||
|
Assert.Matches(
|
||||||
|
@"\.session-table-desktop\s*\{[\s\S]*overflow-x:\s*auto;",
|
||||||
|
appCss);
|
||||||
|
Assert.Matches(
|
||||||
|
@"\.session-table-desktop\s+\.gm-table\s*\{[\s\S]*min-width:\s*760px;",
|
||||||
|
appCss);
|
||||||
|
Assert.Matches(
|
||||||
|
@"\.session-table-actions\s+\.btn-gm\s*\{[\s\S]*white-space:\s*nowrap;",
|
||||||
|
appCss);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task AppCss_ShouldUseCardSessionLayoutInsideTelegramMiniApp()
|
||||||
|
{
|
||||||
|
var appCss = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/wwwroot/app.css"));
|
||||||
|
|
||||||
|
Assert.Matches(
|
||||||
|
@"body\.telegram-mini-app\s+\.session-table-desktop\s*\{[\s\S]*display:\s*none;",
|
||||||
|
appCss);
|
||||||
|
Assert.Matches(
|
||||||
|
@"body\.telegram-mini-app\s+\.session-card-mobile\s*\{[\s\S]*display:\s*block;",
|
||||||
|
appCss);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task AppCss_ShouldUseCardSessionLayoutWhenDesktopSidebarLeavesNarrowContent()
|
||||||
|
{
|
||||||
|
var appCss = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/wwwroot/app.css"));
|
||||||
|
|
||||||
|
Assert.Matches(
|
||||||
|
@"@media\s*\(max-width:\s*1024px\)\s*\{[\s\S]*\.session-table-desktop\s*\{[\s\S]*display:\s*none;[\s\S]*\.session-card-mobile\s*\{[\s\S]*display:\s*block;",
|
||||||
|
appCss);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task GroupDetailsPage_ShouldUseSessionTableLayoutClasses()
|
||||||
|
{
|
||||||
|
var groupDetailsPage = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/Components/Pages/GroupDetails.razor"));
|
||||||
|
|
||||||
|
Assert.Contains("session-table-desktop-card", groupDetailsPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("session-table-actions", groupDetailsPage, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("session-join-link", groupDetailsPage, StringComparison.Ordinal);
|
||||||
|
Assert.DoesNotContain("overflow: hidden", groupDetailsPage, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
private static string FindRepositoryFile(string relativePath)
|
private static string FindRepositoryFile(string relativePath)
|
||||||
{
|
{
|
||||||
var directory = new DirectoryInfo(AppContext.BaseDirectory);
|
var directory = new DirectoryInfo(AppContext.BaseDirectory);
|
||||||
|
|||||||
Reference in New Issue
Block a user