Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1bcd88db32 | |||
| 63e613c061 | |||
| dbf59c544a | |||
| 14b9bf15f2 | |||
| 5dee2d87f5 | |||
| b71488097e | |||
| 6e92419cff | |||
| fdb3445bec | |||
| c1f5d96e25 | |||
| c874f7b797 | |||
| aefed5abd4 |
@@ -6,7 +6,7 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
VERSION: 1.9.5
|
VERSION: 1.10.0
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
||||||
|
|||||||
BIN
Binary file not shown.
@@ -0,0 +1,250 @@
|
|||||||
|
# Issue #19: Выровнять /newsession с batch-сценарием лендинга
|
||||||
|
|
||||||
|
> **Goal:** Сделать `/newsession` атомарным: либо весь batch создаётся целиком, либо ничего — с понятным сообщением об ошибках. Убрать создание частичных сессий при наличии любых ошибок ввода.
|
||||||
|
|
||||||
|
**Architecture:** Изменить `NewSessionParseResult.IsValid` так, чтобы он учитывал ЛЮБЫЕ parse-ошибки (некорректные даты, лимиты, повторы, прошедшие даты). Обновить `CreateSessionHandler`, чтобы при `!IsValid` отправлялось одно детальное сообщение с перечислением ошибок и help-шаблоном, и creation прерывался до транзакции БД.
|
||||||
|
|
||||||
|
**Tech Stack:** C#, .NET, Dapper, Telegram.Bot, xUnit
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: Добавить `HasErrors` и ужесточить `IsValid`
|
||||||
|
|
||||||
|
**Objective:** Запретить частичное создание: `IsValid == false`, если есть хоть одна ошибка парсинга.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/NewSessionCommandParser.cs`
|
||||||
|
- Test: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs`
|
||||||
|
|
||||||
|
**Step 1: RED — написать failing test**
|
||||||
|
|
||||||
|
Добавить в конец `NewSessionCommandParserTests.cs`:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public void Parse_ShouldBeInvalid_WhenAnyErrorsPresent()
|
||||||
|
{
|
||||||
|
var nowUtc = new DateTimeOffset(2026, 4, 23, 12, 0, 0, TimeSpan.Zero);
|
||||||
|
var text = """
|
||||||
|
Название: Delta Green
|
||||||
|
Время: 25.04.2026 19:30
|
||||||
|
Время: 31.04.2026 19:30
|
||||||
|
Ссылка: https://example.test/dg
|
||||||
|
""";
|
||||||
|
|
||||||
|
var result = NewSessionCommandParser.Parse(text, nowUtc);
|
||||||
|
|
||||||
|
Assert.True(result.HasErrors);
|
||||||
|
Assert.False(result.IsValid);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Run test and verify RED**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /repo && dotnet test tests/GmRelay.Bot.Tests --filter "FullyQualifiedName~NewSessionCommandParserTests" -v n
|
||||||
|
```
|
||||||
|
Expected: `HasErrors` property not found → compile error or FAIL.
|
||||||
|
|
||||||
|
**Step 3: GREEN — minimal implementation**
|
||||||
|
|
||||||
|
В `NewSessionCommandParser.cs`, в `NewSessionParseResult`, заменить `IsValid` на:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public bool HasErrors =>
|
||||||
|
PastTimeInputs.Count > 0 ||
|
||||||
|
InvalidTimeInputs.Count > 0 ||
|
||||||
|
InvalidSeatLimitInputs.Count > 0 ||
|
||||||
|
InvalidRecurringInputs.Count > 0;
|
||||||
|
|
||||||
|
public bool IsValid =>
|
||||||
|
!string.IsNullOrWhiteSpace(Title) &&
|
||||||
|
!string.IsNullOrWhiteSpace(Link) &&
|
||||||
|
ScheduledTimes.Count > 0 &&
|
||||||
|
!HasErrors;
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 4: Run test and verify GREEN**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /repo && dotnet test tests/GmRelay.Bot.Tests --filter "FullyQualifiedName~NewSessionCommandParserTests" -v n
|
||||||
|
```
|
||||||
|
Expected: 7 passed (включая новый).
|
||||||
|
|
||||||
|
**Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Bot/Features/Sessions/CreateSession/NewSessionCommandParser.cs
|
||||||
|
git add tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs
|
||||||
|
git commit -m "feat(#19): add HasErrors to prevent partial batch creation"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 2: Обновить существующий тест на Past/Invalid times
|
||||||
|
|
||||||
|
**Objective:** Старый тест ожидал `IsValid == true` при partial invalid — теперь это баг, нужно обновить assertion.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs:114`
|
||||||
|
|
||||||
|
**Step 1: Write failing expectation first**
|
||||||
|
|
||||||
|
Заменить в методе `Parse_ShouldCollectPastAndInvalidTimes` (примерно строка 114):
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// Было:
|
||||||
|
Assert.True(result.IsValid);
|
||||||
|
// Стало:
|
||||||
|
Assert.False(result.IsValid);
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Run test and verify RED**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /repo && dotnet test tests/GmRelay.Bot.Tests --filter "Parse_ShouldCollectPastAndInvalidTimes" -v n
|
||||||
|
```
|
||||||
|
Expected: FAIL — expected False, actual True.
|
||||||
|
|
||||||
|
**Step 3: Fix already done in Task 1**
|
||||||
|
|
||||||
|
Task 1 уже изменил `IsValid`. Перезапустить тест.
|
||||||
|
|
||||||
|
**Step 4: Run test and verify GREEN**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /repo && dotnet test tests/GmRelay.Bot.Tests --filter "Parse_ShouldCollectPastAndInvalidTimes" -v n
|
||||||
|
```
|
||||||
|
Expected: PASS.
|
||||||
|
|
||||||
|
**Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs
|
||||||
|
git commit -m "test(#19): update assertion - partial invalid means invalid"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 3: Обновить `CreateSessionHandler` для атомарной валидации и единого сообщения об ошибках
|
||||||
|
|
||||||
|
**Objective:** Убрать разбросанные warning-сообщения. При любых ошибках — одно сообщение с перечнем ошибок + help-шаблон. Не создавать сессии.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs`
|
||||||
|
|
||||||
|
**Step 1: RED — напишем интеграционный поведенческий тест (опционально, landing test уже покрывает happy path)**
|
||||||
|
|
||||||
|
Просто запустим landing promise smoke test и убедимся, что он ещё green (happy path не сломан).
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /repo && dotnet test tests/GmRelay.Bot.Tests --filter "TelegramLandingPromisesSmokeTests" -v n
|
||||||
|
```
|
||||||
|
Expected: PASS.
|
||||||
|
|
||||||
|
**Step 2: GREEN — minimal change in handler**
|
||||||
|
|
||||||
|
В `CreateSessionHandler.cs`, метод `HandleAsync`, заменить начало (строки 19–59) на:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
var parseResult = NewSessionCommandParser.Parse(message.Text ?? message.Caption, DateTimeOffset.UtcNow);
|
||||||
|
|
||||||
|
var errorMessages = new List<string>();
|
||||||
|
|
||||||
|
foreach (var timeInput in parseResult.PastTimeInputs)
|
||||||
|
errorMessages.Add($"⚠️ Дата {timeInput} находится в прошлом и будет пропущена.");
|
||||||
|
|
||||||
|
foreach (var timeInput in parseResult.InvalidTimeInputs)
|
||||||
|
errorMessages.Add($"⚠️ Некорректный формат времени '{timeInput}'. Пропущено.");
|
||||||
|
|
||||||
|
foreach (var seatLimitInput in parseResult.InvalidSeatLimitInputs)
|
||||||
|
errorMessages.Add($"⚠️ Некорректный лимит мест '{seatLimitInput}'. Укажите целое число больше 0.");
|
||||||
|
|
||||||
|
foreach (var recurringInput in parseResult.InvalidRecurringInputs)
|
||||||
|
errorMessages.Add($"⚠️ Некорректный повтор расписания '{recurringInput}'. Укажите число игр 1–52 и шаг 1–365 дней.");
|
||||||
|
|
||||||
|
if (!parseResult.IsValid)
|
||||||
|
{
|
||||||
|
var helpText = """
|
||||||
|
❌ Не удалось распознать формат. Пожалуйста, используйте шаблон:
|
||||||
|
|
||||||
|
/newsession
|
||||||
|
Название: My Game
|
||||||
|
Время: 15.05.2026 19:30
|
||||||
|
Время: 22.05.2026 19:30
|
||||||
|
Мест: 4
|
||||||
|
Ссылка: https://link
|
||||||
|
Картинка: https://cover
|
||||||
|
|
||||||
|
Для повтора можно указать одну дату и строки:
|
||||||
|
Игр: 4
|
||||||
|
Интервал: 7
|
||||||
|
""";
|
||||||
|
|
||||||
|
if (errorMessages.Count > 0)
|
||||||
|
{
|
||||||
|
helpText = string.Join('\n', errorMessages) + "\n\n" + helpText;
|
||||||
|
}
|
||||||
|
|
||||||
|
await botClient.SendMessage(
|
||||||
|
chatId: message.Chat.Id,
|
||||||
|
text: helpText,
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Build and verify**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /repo && dotnet build src/GmRelay.Bot
|
||||||
|
```
|
||||||
|
Expected: Build succeeded.
|
||||||
|
|
||||||
|
**Step 4: Run all relevant tests**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /repo && dotnet test tests/GmRelay.Bot.Tests --filter "FullyQualifiedName~CreateSession|FullyQualifiedName~Landing" -v n
|
||||||
|
```
|
||||||
|
Expected: All passed.
|
||||||
|
|
||||||
|
**Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs
|
||||||
|
git commit -m "feat(#19): atomic validation with detailed error message in /newsession"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 4: Проверить полный test suite на регрессии
|
||||||
|
|
||||||
|
**Objective:** Убедиться, что изменения не сломали существующие тесты.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Test: все тесты проекта `GmRelay.Bot.Tests`
|
||||||
|
|
||||||
|
**Step 1: Run full test suite**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /repo && dotnet test tests/GmRelay.Bot.Tests -v n
|
||||||
|
```
|
||||||
|
Expected: All passed.
|
||||||
|
|
||||||
|
**Step 2: Commit (if any test baseline updated)**
|
||||||
|
|
||||||
|
Если всё зелёное — commit message:
|
||||||
|
```bash
|
||||||
|
git commit --allow-empty -m "test(#19): verify full suite green after atomic validation"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Verification Checklist
|
||||||
|
|
||||||
|
- [ ] `NewSessionCommandParser.Parse` возвращает `IsValid = false` при любых ошибках (past/invalid times, seat limits, recurring).
|
||||||
|
- [ ] `HasErrors` true ↔ есть хотя бы одна ошибка.
|
||||||
|
- [ ] `CreateSessionHandler` не открывает БД-транзакцию, если `!IsValid`.
|
||||||
|
- [ ] Пользователь получает одно сообщение с перечислением ошибок + help.
|
||||||
|
- [ ] Landing promise smoke test проходит (happy path не сломан).
|
||||||
|
- [ ] Полный test suite зелёный.
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.9.5</Version>
|
<Version>1.10.0</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.5`.
|
**Текущая версия:** `v1.9.9`.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -12,11 +12,12 @@
|
|||||||
|
|
||||||
### 🤖 Telegram Бот
|
### 🤖 Telegram Бот
|
||||||
- **📅 Создание расписаний (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 новых времени и дедлайн, игроки голосуют кнопками, а бот показывает текущие результаты и применяет победивший вариант.
|
- **🔄 Голосование за перенос**: При переносе сессии GM предлагает 2-3 новых времени и дедлайн, игроки голосуют кнопками, а бот показывает текущие результаты и применяет победивший вариант.
|
||||||
- **🔔 Персональные уведомления**: Игроки получают DM о RSVP за 24 часа, напоминание за 1 час, ссылку перед игрой, отмены и переносы; групповые уведомления при этом остаются.
|
- **🔔 Персональные уведомления**: Игроки получают DM о RSVP за 24 часа, напоминание за 1 час, ссылку перед игрой, отмены и переносы; групповые уведомления при этом остаются.
|
||||||
- **🗓 Экспорт в Календарь**: Генерация файла `.ics` для добавления всех игр в Google, Apple или Яндекс Календарь одной командой.
|
- **🗓 Экспорт в Календарь**: Генерация файла `.ics` для добавления всех игр в Google, Apple или Яндекс Календарь одной командой.
|
||||||
@@ -130,10 +131,13 @@ docker compose up -d
|
|||||||
Время: 22.05.2024 19:00
|
Время: 22.05.2024 19:00
|
||||||
Мест: 4
|
Мест: 4
|
||||||
Ссылка: https://discord.gg/invite-link
|
Ссылка: https://discord.gg/invite-link
|
||||||
|
Картинка: https://example.com/adventure-cover.jpg
|
||||||
```
|
```
|
||||||
|
|
||||||
Строка `Мест:` необязательна. Если она указана, игроки сверх лимита попадут в лист ожидания, а ГМ сможет повысить первого ожидающего через кнопку в Telegram или Web Dashboard.
|
Строка `Мест:` необязательна. Если она указана, игроки сверх лимита попадут в лист ожидания, а ГМ сможет повысить первого ожидающего через кнопку в Telegram или Web Dashboard.
|
||||||
|
|
||||||
|
Строка `Картинка:` тоже необязательна. Вместо ссылки можно прикрепить фото к сообщению `/newsession` и поместить команду в подпись к фото; бот возьмёт прикреплённое изображение и отправит его перед расписанием.
|
||||||
|
|
||||||
Для регулярной кампании можно не перечислять все даты вручную. Укажите одну строку `Время:`, количество игр и интервал в днях:
|
Для регулярной кампании можно не перечислять все даты вручную. Укажите одну строку `Время:`, количество игр и интервал в днях:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
@@ -154,7 +158,7 @@ docker compose up -d
|
|||||||
На странице группы Web Dashboard показывает owner и список co-GM. Owner может добавить помощника по Telegram ID, имени и username, а также снять роль co-GM. Назначенный co-GM видит группу в панели управления и может редактировать сессии, управлять batch-операциями, очередью, переносами и удалением игр, но не может назначать других co-GM.
|
На странице группы Web Dashboard показывает owner и список co-GM. Owner может добавить помощника по Telegram ID, имени и username, а также снять роль co-GM. Назначенный co-GM видит группу в панели управления и может редактировать сессии, управлять batch-операциями, очередью, переносами и удалением игр, но не может назначать других co-GM.
|
||||||
|
|
||||||
### Перенос сессии голосованием
|
### Перенос сессии голосованием
|
||||||
Owner или co-GM нажимает кнопку `⏰ Перенести` у нужной сессии и отправляет в чат 2-3 варианта нового времени вместе с дедлайном:
|
Owner или co-GM вызывает `/listsessions`, нажимает кнопку `⏰` у нужной сессии и отправляет в чат 2-3 варианта нового времени вместе с дедлайном:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
25.04.2026 19:30
|
25.04.2026 19:30
|
||||||
@@ -186,8 +190,8 @@ Owner и co-GM могут открыть мобильный dashboard прямо
|
|||||||
Если автоматический вход не сработал, Mini App покажет понятное сообщение и кнопку входа через Telegram. Нажмите её, подтвердите вход, и dashboard откроется в том же окне Telegram.
|
Если автоматический вход не сработал, Mini App покажет понятное сообщение и кнопку входа через Telegram. Нажмите её, подтвердите вход, и dashboard откроется в том же окне Telegram.
|
||||||
|
|
||||||
### Другие команды
|
### Другие команды
|
||||||
- `/listsessions` — Показать список всех актуальных игр в этой группе.
|
- `/listsessions` — Показать список всех актуальных игр в этой группе. Для owner/co-GM команда также показывает кнопки отмены, переноса, повышения из листа ожидания и удаления.
|
||||||
- `⏰ Перенести` в сообщении расписания — Запустить голосование по 2-3 вариантам нового времени.
|
- `⏰` в панели `/listsessions` — Запустить голосование по 2-3 вариантам нового времени.
|
||||||
- `/deletesession` — Удалить сессию.
|
- `/deletesession` — Удалить сессию.
|
||||||
- `/exportcalendar` — Получить `.ics` файл с играми.
|
- `/exportcalendar` — Получить `.ics` файл с играми.
|
||||||
- `/help` — Справка по формату.
|
- `/help` — Справка по формату.
|
||||||
@@ -208,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.5
|
image: git.codeanddice.ru/toutsu/gmrelay-bot:1.10.0
|
||||||
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.5
|
image: git.codeanddice.ru/toutsu/gmrelay-web:1.10.0
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|
||||||
|
---
|
||||||
@@ -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
|
||||||
@@ -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;
|
||||||
@@ -182,15 +184,66 @@ public sealed class CreateSessionHandler(
|
|||||||
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;
|
||||||
|
|
||||||
@@ -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;
|
||||||
|
|
||||||
@@ -182,15 +183,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
|
||||||
@@ -161,15 +163,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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-5
@@ -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;
|
||||||
|
|
||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
+6
-4
@@ -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;
|
||||||
|
|
||||||
@@ -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 (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,57 @@
|
|||||||
|
// NOTE: duplicated in GmRelay.Web/Services/TelegramSessionBatchRenderer.cs
|
||||||
|
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 (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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -42,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)
|
||||||
@@ -216,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);
|
||||||
|
|||||||
@@ -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);
|
||||||
|
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,59 @@
|
|||||||
|
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,
|
||||||
|
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}";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
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,
|
||||||
|
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);
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<div class="nav-version">v1.9.5</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);
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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(
|
||||||
@@ -507,6 +518,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();
|
||||||
@@ -731,7 +884,8 @@ public sealed class SessionService(
|
|||||||
|
|
||||||
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,
|
||||||
@@ -939,7 +1093,8 @@ public sealed class SessionService(
|
|||||||
|
|
||||||
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,
|
||||||
@@ -1046,13 +1201,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,56 @@
|
|||||||
|
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 (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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ============================================
|
/* ============================================
|
||||||
GM-Relay Design System v1.9.5
|
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,392 @@
|
|||||||
|
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,
|
||||||
|
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 view = SessionBatchViewBuilder.Build(
|
||||||
|
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());
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
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,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),
|
||||||
|
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 = 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) };
|
||||||
|
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.Equal(2, session.ActivePlayers.Count);
|
||||||
|
Assert.Equal(1, session.WaitlistedPlayers.Count);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Build_ShouldIncludeActionsForActiveSessions()
|
||||||
|
{
|
||||||
|
var sessionId = Guid.NewGuid();
|
||||||
|
var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4) };
|
||||||
|
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", actions[0].ActionKey);
|
||||||
|
Assert.Equal("leave_session", actions[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) };
|
||||||
|
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) };
|
||||||
|
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,76 @@
|
|||||||
|
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),
|
||||||
|
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 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);
|
||||||
|
|
||||||
|
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) };
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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