Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5dee2d87f5 | |||
| b71488097e | |||
| 6e92419cff | |||
| fdb3445bec | |||
| c1f5d96e25 | |||
| c874f7b797 |
@@ -6,7 +6,7 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
VERSION: 1.9.6
|
VERSION: 1.9.9
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
||||||
|
|||||||
BIN
Binary file not shown.
@@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.9.6</Version>
|
<Version>1.9.9</Version>
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Проект разработан с упором на производительность, архитектуру Vertical Slice, Native AOT (для бота) и удобство развертывания с использованием .NET Aspire.
|
Проект разработан с упором на производительность, архитектуру Vertical Slice, Native AOT (для бота) и удобство развертывания с использованием .NET Aspire.
|
||||||
|
|
||||||
**Текущая версия:** `v1.9.6`.
|
**Текущая версия:** `v1.9.9`.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -212,5 +212,17 @@ Owner и co-GM могут открыть мобильный dashboard прямо
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 🧪 Тестирование
|
||||||
|
|
||||||
|
Основной набор проверок запускается командой:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --collect:"XPlat Code Coverage"
|
||||||
|
```
|
||||||
|
|
||||||
|
Начиная с `v1.9.9`, тестовый набор включает функциональный smoke-сценарий обещаний лендинга для Telegram: batch-сессии на несколько дат, inline-кнопки записи/выхода, лимиты мест, waitlist, автоповышение игрока, голосование за перенос, direct-notification mode и перерисовку Telegram batch-поста после dashboard-изменений. Smoke работает через fake Telegram messenger и не требует внешнего Telegram API.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 📜 Лицензия
|
## 📜 Лицензия
|
||||||
Проект распространяется под лицензией MIT. Использование в некоммерческих целях приветствуется.
|
Проект распространяется под лицензией MIT. Использование в некоммерческих целях приветствуется.
|
||||||
|
|||||||
+2
-2
@@ -17,7 +17,7 @@ services:
|
|||||||
retries: 10
|
retries: 10
|
||||||
|
|
||||||
bot:
|
bot:
|
||||||
image: git.codeanddice.ru/toutsu/gmrelay-bot:1.9.6
|
image: git.codeanddice.ru/toutsu/gmrelay-bot:1.9.9
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
@@ -30,7 +30,7 @@ services:
|
|||||||
- gmrelay
|
- gmrelay
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: git.codeanddice.ru/toutsu/gmrelay-web:1.9.6
|
image: git.codeanddice.ru/toutsu/gmrelay-web:1.9.9
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|
||||||
|
---
|
||||||
@@ -106,13 +106,13 @@ public sealed class CancelSessionHandler(
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: command.ChatId,
|
chatId: command.ChatId,
|
||||||
messageId: session.BatchMessageId ?? 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);
|
||||||
|
|
||||||
|
|||||||
@@ -185,31 +185,63 @@ public sealed class CreateSessionHandler(
|
|||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(title, sessions, Array.Empty<ParticipantBatchDto>());
|
var renderResult = SessionBatchRenderer.Render(title, sessions, Array.Empty<ParticipantBatchDto>());
|
||||||
|
|
||||||
if (imageReference is not null)
|
Message batchMessage;
|
||||||
|
|
||||||
|
if (imageReference is not null && renderResult.Text.Length <= 1024)
|
||||||
{
|
{
|
||||||
|
// Картинка + расписание умещаются в одном Telegram-фото с подписью
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await botClient.SendPhoto(
|
batchMessage = await botClient.SendPhoto(
|
||||||
chatId: chatId,
|
chatId: chatId,
|
||||||
messageThreadId: messageThreadId,
|
messageThreadId: messageThreadId,
|
||||||
photo: InputFile.FromString(imageReference),
|
photo: InputFile.FromString(imageReference),
|
||||||
caption: $"🎲 {System.Net.WebUtility.HtmlEncode(title)}",
|
caption: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: cancellationToken);
|
cancellationToken: cancellationToken);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
logger.LogWarning(ex, "Не удалось отправить картинку для батча {BatchId}", batchId);
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var batchMessage = await botClient.SendMessage(
|
batchMessage = await botClient.SendMessage(
|
||||||
chatId: chatId,
|
chatId: chatId,
|
||||||
messageThreadId: messageThreadId,
|
messageThreadId: messageThreadId,
|
||||||
text: renderResult.Text,
|
text: renderResult.Text,
|
||||||
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
replyMarkup: renderResult.Markup,
|
replyMarkup: renderResult.Markup,
|
||||||
cancellationToken: cancellationToken);
|
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",
|
||||||
|
|||||||
@@ -138,13 +138,13 @@ public sealed class JoinSessionHandler(
|
|||||||
// 4. Перерисовываем сообщение
|
// 4. Перерисовываем сообщение
|
||||||
var renderResult = SessionBatchRenderer.Render(batchInfo.Title, batchSessions.ToList(), batchParticipants.ToList());
|
var renderResult = SessionBatchRenderer.Render(batchInfo.Title, batchSessions.ToList(), batchParticipants.ToList());
|
||||||
|
|
||||||
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
|
||||||
? "Основной состав заполнен. Вы добавлены в лист ожидания."
|
? "Основной состав заполнен. Вы добавлены в лист ожидания."
|
||||||
|
|||||||
@@ -184,13 +184,13 @@ public sealed class LeaveSessionHandler(
|
|||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
|
var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
|
||||||
|
|
||||||
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
|
||||||
? "Вы удалены из листа ожидания."
|
? "Вы удалены из листа ожидания."
|
||||||
|
|||||||
@@ -164,13 +164,13 @@ public sealed class PromoteWaitlistedPlayerHandler(
|
|||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
|
var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
|
||||||
|
|
||||||
await bot.EditMessageText(
|
await BatchMessageEditor.EditBatchMessageAsync(
|
||||||
|
bot,
|
||||||
chatId: command.ChatId,
|
chatId: command.ChatId,
|
||||||
messageId: session.BatchMessageId ?? 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);
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -378,13 +378,13 @@ public sealed class HandleRescheduleTimeInputHandler(
|
|||||||
var renderResult = SessionBatchRenderer.Render(
|
var renderResult = SessionBatchRenderer.Render(
|
||||||
proposal.Title, batchSessions, batchParticipants);
|
proposal.Title, batchSessions, batchParticipants);
|
||||||
|
|
||||||
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
|
||||||
{
|
{
|
||||||
|
|||||||
+3
-3
@@ -306,13 +306,13 @@ public sealed class RescheduleVotingDeadlineService(
|
|||||||
{
|
{
|
||||||
var renderResult = SessionBatchRenderer.Render(proposal.Title, batchSessions, batchParticipants);
|
var renderResult = SessionBatchRenderer.Render(proposal.Title, batchSessions, batchParticipants);
|
||||||
|
|
||||||
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.Shared.Rendering;
|
||||||
|
|
||||||
|
/// <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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<div class="nav-version">v1.9.6</div>
|
<div class="nav-version">v1.9.9</div>
|
||||||
</div>
|
</div>
|
||||||
</Authorized>
|
</Authorized>
|
||||||
<NotAuthorized>
|
<NotAuthorized>
|
||||||
|
|||||||
@@ -229,8 +229,13 @@
|
|||||||
<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>
|
||||||
@@ -255,6 +260,49 @@
|
|||||||
</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>
|
||||||
@@ -264,9 +312,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">
|
||||||
@@ -294,6 +345,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>
|
||||||
@@ -316,6 +406,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()
|
||||||
{
|
{
|
||||||
@@ -447,6 +541,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;
|
||||||
|
|||||||
@@ -219,6 +219,28 @@ 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 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);
|
||||||
|
}
|
||||||
|
|
||||||
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);
|
||||||
|
|||||||
@@ -25,4 +25,6 @@ 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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,6 +39,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(
|
||||||
@@ -507,6 +517,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();
|
||||||
@@ -1048,11 +1200,11 @@ public sealed class SessionService(
|
|||||||
|
|
||||||
var renderResult = SessionBatchRenderer.Render(title, sessions, participants);
|
var renderResult = SessionBatchRenderer.Render(title, sessions, participants);
|
||||||
|
|
||||||
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)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ============================================
|
/* ============================================
|
||||||
GM-Relay Design System v1.9.6
|
GM-Relay Design System v1.9.9
|
||||||
Dark RPG Dashboard Theme
|
Dark RPG Dashboard Theme
|
||||||
============================================ */
|
============================================ */
|
||||||
|
|
||||||
@@ -1115,3 +1115,56 @@ body.telegram-mini-app .session-card-mobile {
|
|||||||
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;
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,390 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
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,
|
||||||
|
SessionNotificationMode notificationMode)
|
||||||
|
{
|
||||||
|
Title = title;
|
||||||
|
this.notificationMode = notificationMode;
|
||||||
|
sessions = scheduledTimes
|
||||||
|
.Select(scheduledAt => new SmokeSession(
|
||||||
|
Guid.NewGuid(),
|
||||||
|
scheduledAt.UtcDateTime,
|
||||||
|
SessionStatus.Planned,
|
||||||
|
maxPlayers))
|
||||||
|
.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,
|
||||||
|
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 renderResult = SessionBatchRenderer.Render(
|
||||||
|
Title,
|
||||||
|
sessions
|
||||||
|
.Select(session => new SessionBatchDto(
|
||||||
|
session.Id,
|
||||||
|
session.ScheduledAt,
|
||||||
|
session.Status,
|
||||||
|
session.MaxPlayers))
|
||||||
|
.ToList(),
|
||||||
|
participants
|
||||||
|
.Select(participant => new ParticipantBatchDto(
|
||||||
|
participant.SessionId,
|
||||||
|
participant.DisplayName,
|
||||||
|
participant.TelegramUsername,
|
||||||
|
participant.RegistrationStatus))
|
||||||
|
.ToList());
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -655,6 +655,10 @@ 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 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 +874,18 @@ 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;
|
||||||
|
}
|
||||||
|
|
||||||
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()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user