Telegram-Bots/gitlab-notification
4
1
Fork 0
Code Issues 21 Pull Requests Packages Projects 2 Releases 1 Activity

Исправление форматирования сообщений

Browse Source
This commit is contained in:
Struchkov Mark 2024-01-19 20:41:34 +03:00
parent 4eb678ce53
commit 905e13053e
No known key found for this signature in database
GPG Key ID: A3F0AC3F0FA52F3C
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewMrForAssigneeNotifyGenerator.java
View File

@ -3,6 +3,7 @@ package dev.struchkov.bot.gitlab.telegram.service.notify;
import dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.NewMrForAssignee; import dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.NewMrForAssignee;
import dev.struchkov.bot.gitlab.context.utils.Icons; import dev.struchkov.bot.gitlab.context.utils.Icons;
import dev.struchkov.godfather.simple.domain.BoxAnswer; import dev.struchkov.godfather.simple.domain.BoxAnswer;
import dev.struchkov.godfather.telegram.main.context.BoxAnswerPayload;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@ -12,7 +13,6 @@ import static dev.struchkov.bot.gitlab.telegram.utils.Const.BUTTON_ARG_CONFIRMAT
import static dev.struchkov.bot.gitlab.telegram.utils.Const.BUTTON_ARG_DISABLE_NOTIFY_MR_ID; import static dev.struchkov.bot.gitlab.telegram.utils.Const.BUTTON_ARG_DISABLE_NOTIFY_MR_ID;
import static dev.struchkov.bot.gitlab.telegram.utils.Const.BUTTON_VALUE_FALSE; import static dev.struchkov.bot.gitlab.telegram.utils.Const.BUTTON_VALUE_FALSE;
import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.DELETE_MESSAGE; import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.DELETE_MESSAGE;
import static dev.struchkov.godfather.simple.domain.BoxAnswer.boxAnswer;
import static dev.struchkov.godfather.telegram.domain.keyboard.InlineKeyBoard.inlineKeyBoard; import static dev.struchkov.godfather.telegram.domain.keyboard.InlineKeyBoard.inlineKeyBoard;
import static dev.struchkov.godfather.telegram.domain.keyboard.SimpleKeyBoardLine.keyBoardLine; import static dev.struchkov.godfather.telegram.domain.keyboard.SimpleKeyBoardLine.keyBoardLine;
import static dev.struchkov.godfather.telegram.domain.keyboard.button.SimpleButton.simpleButton; import static dev.struchkov.godfather.telegram.domain.keyboard.button.SimpleButton.simpleButton;
@ -59,16 +59,19 @@ public class NewMrForAssigneeNotifyGenerator implements NotifyBoxAnswerGenerator
final String notifyMessage = builder.toString(); final String notifyMessage = builder.toString();
return boxAnswer( return BoxAnswer.builder()
notifyMessage, .message(notifyMessage)
inlineKeyBoard( .keyBoard(
keyBoardLine( inlineKeyBoard(
simpleButton(Icons.VIEW, DELETE_MESSAGE), keyBoardLine(
urlButton(Icons.LINK, notify.getUrl()), simpleButton(Icons.VIEW, DELETE_MESSAGE),
simpleButton(Icons.DISABLE_NOTIFY, "[" + BUTTON_ARG_DISABLE_NOTIFY_MR_ID + ":" + notify.getMrId() + ";" + BUTTON_ARG_CONFIRMATION + ":" + BUTTON_VALUE_FALSE + "]") urlButton(Icons.LINK, notify.getUrl()),
simpleButton(Icons.DISABLE_NOTIFY, "[" + BUTTON_ARG_DISABLE_NOTIFY_MR_ID + ":" + notify.getMrId() + ";" + BUTTON_ARG_CONFIRMATION + ":" + BUTTON_VALUE_FALSE + "]")
)
) )
) )
); .payload(BoxAnswerPayload.ENABLE_MARKDOWN)
.build();
} }
@Override @Override

3
telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/unit/flow/InitSettingFlow.java
View File

@ -50,6 +50,7 @@ import static dev.struchkov.godfather.telegram.domain.keyboard.InlineKeyBoard.in
import static dev.struchkov.godfather.telegram.domain.keyboard.SimpleKeyBoardLine.keyBoardLine; import static dev.struchkov.godfather.telegram.domain.keyboard.SimpleKeyBoardLine.keyBoardLine;
import static dev.struchkov.godfather.telegram.domain.keyboard.button.SimpleButton.simpleButton; import static dev.struchkov.godfather.telegram.domain.keyboard.button.SimpleButton.simpleButton;
import static dev.struchkov.godfather.telegram.main.context.BoxAnswerPayload.DISABLE_WEB_PAGE_PREVIEW; import static dev.struchkov.godfather.telegram.main.context.BoxAnswerPayload.DISABLE_WEB_PAGE_PREVIEW;
import static dev.struchkov.godfather.telegram.main.context.BoxAnswerPayload.ENABLE_MARKDOWN;
import static dev.struchkov.godfather.telegram.main.core.util.InlineKeyBoards.verticalMenuButton; import static dev.struchkov.godfather.telegram.main.core.util.InlineKeyBoards.verticalMenuButton;
import static dev.struchkov.godfather.telegram.main.core.util.UnitTrigger.clickButtonRaw; import static dev.struchkov.godfather.telegram.main.core.util.UnitTrigger.clickButtonRaw;
import static dev.struchkov.godfather.telegram.main.core.util.UnitTrigger.isButtonClick; import static dev.struchkov.godfather.telegram.main.core.util.UnitTrigger.isButtonClick;
@ -118,6 +119,7 @@ public class InitSettingFlow implements PersonUnitConfiguration {
""" """
) )
.payload(DISABLE_WEB_PAGE_PREVIEW, true) .payload(DISABLE_WEB_PAGE_PREVIEW, true)
.payload(ENABLE_MARKDOWN, true)
.keyBoard( .keyBoard(
inlineKeyBoard( inlineKeyBoard(
keyBoardLine( keyBoardLine(
@ -609,6 +611,7 @@ public class InitSettingFlow implements PersonUnitConfiguration {
""" """
).keyBoard(inlineKeyBoard(simpleButton("Open Menu", "/start"))) ).keyBoard(inlineKeyBoard(simpleButton("Open Menu", "/start")))
.payload(DISABLE_WEB_PAGE_PREVIEW, true) .payload(DISABLE_WEB_PAGE_PREVIEW, true)
.payload(ENABLE_MARKDOWN)
.build(); .build();
} }
) )