Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e15652399b | |||
| 40b13db320 | |||
| e0ee8fc962 | |||
| 6707a2850c | |||
| d137c334d6 | |||
| 27f9ceb038 | |||
| f53c1f6aae | |||
| e59b0a78fd | |||
| b952be23eb | |||
| 4054d49ccb |
@@ -70,6 +70,13 @@ jobs:
|
|||||||
needs: build-and-push
|
needs: build-and-push
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
- name: Login to Gitea Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: git.codeanddice.ru
|
||||||
|
username: toutsu
|
||||||
|
password: ${{ secrets.GIT_TOKEN }}
|
||||||
|
|
||||||
- name: Install Trivy
|
- name: Install Trivy
|
||||||
run: |
|
run: |
|
||||||
# Install Trivy from the official Docker image instead of the
|
# Install Trivy from the official Docker image instead of the
|
||||||
@@ -78,7 +85,7 @@ jobs:
|
|||||||
# GitHub releases API; when a release is unpublished or
|
# GitHub releases API; when a release is unpublished or
|
||||||
# yanked, the script fails with
|
# yanked, the script fails with
|
||||||
# `unable to find '<tag>' - use 'latest' or see ...`
|
# `unable to find '<tag>' - use 'latest' or see ...`
|
||||||
# even when the release once existed. We hit this with
|
# when the release once existed. We hit this with
|
||||||
# v0.71.0.
|
# v0.71.0.
|
||||||
# 2. Docker Hub tags are content-addressed and rarely
|
# 2. Docker Hub tags are content-addressed and rarely
|
||||||
# removed, so a pinned image tag is much more stable.
|
# removed, so a pinned image tag is much more stable.
|
||||||
@@ -94,9 +101,16 @@ jobs:
|
|||||||
chmod +x /usr/local/bin/trivy
|
chmod +x /usr/local/bin/trivy
|
||||||
trivy --version
|
trivy --version
|
||||||
|
|
||||||
|
- name: Pull images for scan
|
||||||
|
run: |
|
||||||
|
docker pull git.codeanddice.ru/toutsu/gmrelay-bot:${{ env.VERSION }}
|
||||||
|
docker pull git.codeanddice.ru/toutsu/gmrelay-discord-bot:${{ env.VERSION }}
|
||||||
|
docker pull git.codeanddice.ru/toutsu/gmrelay-web:${{ env.VERSION }}
|
||||||
|
|
||||||
- name: Scan Bot image
|
- name: Scan Bot image
|
||||||
run: |
|
run: |
|
||||||
trivy image \
|
trivy image \
|
||||||
|
--timeout 30m \
|
||||||
--severity HIGH,CRITICAL \
|
--severity HIGH,CRITICAL \
|
||||||
--exit-code 1 \
|
--exit-code 1 \
|
||||||
--format table \
|
--format table \
|
||||||
@@ -105,6 +119,7 @@ jobs:
|
|||||||
- name: Scan Discord Bot image
|
- name: Scan Discord Bot image
|
||||||
run: |
|
run: |
|
||||||
trivy image \
|
trivy image \
|
||||||
|
--timeout 30m \
|
||||||
--severity HIGH,CRITICAL \
|
--severity HIGH,CRITICAL \
|
||||||
--exit-code 1 \
|
--exit-code 1 \
|
||||||
--format table \
|
--format table \
|
||||||
@@ -113,6 +128,7 @@ jobs:
|
|||||||
- name: Scan Web image
|
- name: Scan Web image
|
||||||
run: |
|
run: |
|
||||||
trivy image \
|
trivy image \
|
||||||
|
--timeout 30m \
|
||||||
--severity HIGH,CRITICAL \
|
--severity HIGH,CRITICAL \
|
||||||
--exit-code 1 \
|
--exit-code 1 \
|
||||||
--format table \
|
--format table \
|
||||||
|
|||||||
@@ -36,19 +36,19 @@ internal static class SessionListMessageRenderer
|
|||||||
|
|
||||||
actions.Add(new PlatformMessageAction(
|
actions.Add(new PlatformMessageAction(
|
||||||
$"cancel_session:{session.Id}",
|
$"cancel_session:{session.Id}",
|
||||||
$"❌ {dateTitle}",
|
$"❌ Отменить {dateTitle}",
|
||||||
$"cancel_session:{session.Id}"));
|
$"cancel_session:{session.Id}"));
|
||||||
|
|
||||||
actions.Add(new PlatformMessageAction(
|
actions.Add(new PlatformMessageAction(
|
||||||
$"reschedule_session:{session.Id}",
|
$"reschedule_session:{session.Id}",
|
||||||
$"⏰ {dateTitle}",
|
$"⏰ Перенести {dateTitle}",
|
||||||
$"reschedule_session:{session.Id}"));
|
$"reschedule_session:{session.Id}"));
|
||||||
|
|
||||||
if (SessionCapacityRules.CanPromoteWaitlistedPlayer(session.MaxPlayers, session.PlayerCount, session.WaitlistCount))
|
if (SessionCapacityRules.CanPromoteWaitlistedPlayer(session.MaxPlayers, session.PlayerCount, session.WaitlistCount))
|
||||||
{
|
{
|
||||||
actions.Add(new PlatformMessageAction(
|
actions.Add(new PlatformMessageAction(
|
||||||
$"promote_waitlist:{session.Id}",
|
$"promote_waitlist:{session.Id}",
|
||||||
$"⬆️ Из ожидания {dateTitle}",
|
$"⬆️ С ожидания {dateTitle}",
|
||||||
$"promote_waitlist:{session.Id}"));
|
$"promote_waitlist:{session.Id}"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
using Telegram.Bot;
|
||||||
|
using Telegram.Bot.Types;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Infrastructure.Telegram;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Registers the bot's command list with Telegram so users see the
|
||||||
|
/// command menu when they type "/" in a chat.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class TelegramCommandsSetupService(
|
||||||
|
ITelegramBotClient bot,
|
||||||
|
ILogger<TelegramCommandsSetupService> logger) : IHostedService
|
||||||
|
{
|
||||||
|
public async Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var commands = new[]
|
||||||
|
{
|
||||||
|
new BotCommand { Command = "start", Description = "Начать работу с ботом" },
|
||||||
|
new BotCommand { Command = "newsession", Description = "Создать новую игровую сессию" },
|
||||||
|
new BotCommand { Command = "listsessions", Description = "Список предстоящих сессий" },
|
||||||
|
new BotCommand { Command = "exportcalendar", Description = "Экспортировать расписание в ICS" },
|
||||||
|
new BotCommand { Command = "help", Description = "Справка по командам" }
|
||||||
|
};
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await bot.SetMyCommands(
|
||||||
|
commands,
|
||||||
|
scope: new BotCommandScopeAllPrivateChats(),
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
|
||||||
|
await bot.SetMyCommands(
|
||||||
|
commands,
|
||||||
|
scope: new BotCommandScopeAllGroupChats(),
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
|
||||||
|
logger.LogInformation("Telegram command menu registered for private chats and groups.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogWarning(ex, "Failed to register Telegram command menu.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
@@ -366,6 +366,13 @@ public sealed class UpdateRouter(
|
|||||||
text: """
|
text: """
|
||||||
GM-Relay — бот для управления игровыми сессиями.
|
GM-Relay — бот для управления игровыми сессиями.
|
||||||
|
|
||||||
|
/start — начать работу с ботом
|
||||||
|
/newsession — создать новую игровую сессию
|
||||||
|
/listsessions — список предстоящих сессий
|
||||||
|
/exportcalendar — экспортировать расписание в ICS
|
||||||
|
/help — эта справка
|
||||||
|
|
||||||
|
Пример создания сессии:
|
||||||
/newsession
|
/newsession
|
||||||
Название: My Game
|
Название: My Game
|
||||||
Время: 15.05.2026 19:30
|
Время: 15.05.2026 19:30
|
||||||
@@ -377,10 +384,8 @@ public sealed class UpdateRouter(
|
|||||||
Игр: 4
|
Игр: 4
|
||||||
Интервал: 7
|
Интервал: 7
|
||||||
|
|
||||||
/listsessions — список предстоящих сессий
|
|
||||||
Для owner/co-GM /listsessions показывает кнопки отмены, переноса, удаления и повышения из листа ожидания.
|
Для owner/co-GM /listsessions показывает кнопки отмены, переноса, удаления и повышения из листа ожидания.
|
||||||
Игроки могут записаться кнопкой «На дату» и сняться кнопкой «Выйти».
|
Игроки могут записаться кнопкой «На дату» и сняться кнопкой «Выйти».
|
||||||
/help — эта справка
|
|
||||||
""",
|
""",
|
||||||
cancellationToken: ct);
|
cancellationToken: ct);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ builder.Services.AddSingleton<DirectSessionNotificationSender>();
|
|||||||
// ── Telegram infrastructure ──────────────────────────────────────────
|
// ── Telegram infrastructure ──────────────────────────────────────────
|
||||||
builder.Services.AddSingleton<UpdateRouter>();
|
builder.Services.AddSingleton<UpdateRouter>();
|
||||||
builder.Services.AddSingleton<ITelegramUpdateHandler>(sp => sp.GetRequiredService<UpdateRouter>());
|
builder.Services.AddSingleton<ITelegramUpdateHandler>(sp => sp.GetRequiredService<UpdateRouter>());
|
||||||
|
builder.Services.AddHostedService<TelegramCommandsSetupService>();
|
||||||
builder.Services.AddHostedService<TelegramMiniAppMenuButtonService>();
|
builder.Services.AddHostedService<TelegramMiniAppMenuButtonService>();
|
||||||
builder.Services.AddHostedService<TelegramBotService>();
|
builder.Services.AddHostedService<TelegramBotService>();
|
||||||
|
|
||||||
|
|||||||
+6
@@ -32,6 +32,12 @@ public sealed class SessionListMessageRendererTests
|
|||||||
Assert.Contains(actions, a => a.Payload == $"reschedule_session:{sessionId}");
|
Assert.Contains(actions, a => a.Payload == $"reschedule_session:{sessionId}");
|
||||||
Assert.Contains(actions, a => a.Payload == $"promote_waitlist:{sessionId}");
|
Assert.Contains(actions, a => a.Payload == $"promote_waitlist:{sessionId}");
|
||||||
Assert.Contains(actions, a => a.Payload == $"delete_session:{sessionId}");
|
Assert.Contains(actions, a => a.Payload == $"delete_session:{sessionId}");
|
||||||
|
|
||||||
|
var shortDate = new DateTime(2026, 5, 7, 16, 30, 0, DateTimeKind.Utc).FormatMoscowShort();
|
||||||
|
Assert.Contains(actions, a => a.Label == $"❌ Отменить {shortDate}");
|
||||||
|
Assert.Contains(actions, a => a.Label == $"⏰ Перенести {shortDate}");
|
||||||
|
Assert.Contains(actions, a => a.Label == $"⬆️ С ожидания {shortDate}");
|
||||||
|
Assert.Contains(actions, a => a.Label == $"🗑 Удалить {shortDate}");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
|
|||||||
Reference in New Issue
Block a user