Небольшие доработки
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Struchkov Mark 2023-02-15 23:18:03 +03:00
parent 022fb152f7
commit b49b7d2829
Signed by: upagge
GPG Key ID: D3018BE7BA428CA6
3 changed files with 16 additions and 4 deletions

View File

@ -92,7 +92,7 @@ public class ProjectParser {
.header(ACCEPT) .header(ACCEPT)
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken()) .header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.execute(ProjectJson.class) .execute(ProjectJson.class)
.orElseThrow(convertException("Ошибка получения репозитория.")); .orElseThrow(convertException("Error adding a repository"));
if (!projectService.existsById(projectJson.getId())) { if (!projectService.existsById(projectJson.getId())) {
createNewPersons(List.of(projectJson)); createNewPersons(List.of(projectJson));
final Project newProject = conversionService.convert(projectJson, Project.class); final Project newProject = conversionService.convert(projectJson, Project.class);

View File

@ -10,6 +10,9 @@ import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import static dev.struchkov.godfather.main.domain.keyboard.button.SimpleButton.simpleButton;
import static dev.struchkov.godfather.telegram.domain.keyboard.InlineKeyBoard.inlineKeyBoard;
/** /**
* @author upagge 19.01.2021 * @author upagge 19.01.2021
*/ */
@ -34,6 +37,11 @@ public class StartNotify {
"\n\uD83D\uDC68\u200D\uD83D\uDCBB Developer: [uPagge](https://mark.struchkov.dev)" + "\n\uD83D\uDC68\u200D\uD83D\uDCBB Developer: [uPagge](https://mark.struchkov.dev)" +
"\n\uD83D\uDC1B Issue: [GitHub Issue](https://github.com/uPagge/gitlab-notification/issues)" "\n\uD83D\uDC1B Issue: [GitHub Issue](https://github.com/uPagge/gitlab-notification/issues)"
) )
.keyBoard(
inlineKeyBoard(
simpleButton("Open General Menu", "/start")
)
)
.payload(BoxAnswerPayload.DISABLE_WEB_PAGE_PREVIEW, true) .payload(BoxAnswerPayload.DISABLE_WEB_PAGE_PREVIEW, true)
.build(); .build();

View File

@ -84,7 +84,7 @@ public class MenuConfig {
.build(); .build();
} }
@Unit(value = GENERAL_MENU, main = true) @Unit(value = GENERAL_MENU, main = true, global = true)
public AnswerText<Mail> menu( public AnswerText<Mail> menu(
@Unit(SETTINGS) MainUnit<Mail> settings, @Unit(SETTINGS) MainUnit<Mail> settings,
@Unit(TEXT_ADD_NEW_PROJECT) MainUnit<Mail> textAddNewProject, @Unit(TEXT_ADD_NEW_PROJECT) MainUnit<Mail> textAddNewProject,
@ -102,9 +102,13 @@ public class MenuConfig {
return false; return false;
}) })
.answer(mail -> { .answer(mail -> {
final String messageText = "This is the bot menu, select a new item"; final String messageText = """
This is the bot menu, select a item.
-- -- -- -- --
At the moment, you can only add new repositories. But in future versions, the possibilities will expand.
""";
final InlineKeyBoard generalMenuKeyBoard = inlineKeyBoard( final InlineKeyBoard generalMenuKeyBoard = inlineKeyBoard(
simpleLine(simpleButton("Add project", TEXT_ADD_NEW_PROJECT)) simpleLine(simpleButton("Add repository", TEXT_ADD_NEW_PROJECT))
// simpleLine( // simpleLine(
// simpleButton("My tasks", GET_TASKS), // simpleButton("My tasks", GET_TASKS),
// simpleButton("Merge Request", GET_ASSIGNEE_MERGE_REQUEST) // simpleButton("Merge Request", GET_ASSIGNEE_MERGE_REQUEST)