From f58258107f6a0de70a82341c099c5aa0d7ce325c Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Thu, 22 Aug 2024 12:15:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=D0=B7?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=83=D0=B2=D0=B5=D0=B4=D0=BE?= =?UTF-8?q?=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F.=20=D0=98=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=BD=D0=B3=D0=B0=20=D1=81=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D1=8B=D1=85=20=D0=BF=D0=B0=D0=B9=D0=BF=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bot/gitlab/core/service/parser/PipelineParser.java | 2 +- .../service/notify/NewMrForAssigneeNotifyGenerator.java | 2 +- .../gitlab/telegram/service/notify/UpdateMrNotifyGenerator.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/parser/PipelineParser.java b/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/parser/PipelineParser.java index 4e25be2..4da35ca 100644 --- a/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/parser/PipelineParser.java +++ b/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/parser/PipelineParser.java @@ -149,7 +149,7 @@ public class PipelineParser { .projectId(pipeline.getProjectId()) .pipelineId(pipeline.getId()) .urlPipeline(gitlabProperty.getPipelineUrl()) - .gitlabToken(gitlabProperty.getPipelineUrl()) + .gitlabToken(personProperty.getToken()) .build() ) .map(forkJoinPool::submit) diff --git a/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewMrForAssigneeNotifyGenerator.java b/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewMrForAssigneeNotifyGenerator.java index 1e64fcb..28d1764 100644 --- a/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewMrForAssigneeNotifyGenerator.java +++ b/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewMrForAssigneeNotifyGenerator.java @@ -32,7 +32,7 @@ public class NewMrForAssigneeNotifyGenerator implements NotifyBoxAnswerGenerator final StringBuilder builder = new StringBuilder(Icons.ASSIGNEE).append(" *You have become responsible*") .append(Icons.HR) - .append(notify.getTitle()); + .append(escapeMarkdown(notify.getTitle())); if (!labelText.isEmpty()) { builder.append("\n\n").append(labelText); diff --git a/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/UpdateMrNotifyGenerator.java b/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/UpdateMrNotifyGenerator.java index 7df0de2..511e038 100644 --- a/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/UpdateMrNotifyGenerator.java +++ b/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/UpdateMrNotifyGenerator.java @@ -26,7 +26,7 @@ public class UpdateMrNotifyGenerator implements NotifyBoxAnswerGenerator