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

Добавил юнит, который уведомит, если кто-то, кроме владельца, попробует написать боту

Browse Source
This commit is contained in:
Struchkov Mark 2022-12-13 22:08:59 +03:00
parent 1623fc8f8b
commit a5790235c6
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -44,7 +44,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<godfather.telegram.core.version>0.0.42</godfather.telegram.core.version>
<godfather.telegram.core.version>0.0.43</godfather.telegram.core.version>
<javax.persistance.version>2.2</javax.persistance.version>

5
telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/MessageSendTelegramService.java
View File

@ -3,6 +3,7 @@ package dev.struchkov.bot.gitlab.telegram.service;
import dev.struchkov.bot.gitlab.context.domain.PersonInformation;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
import dev.struchkov.bot.gitlab.context.service.MessageSendService;
import dev.struchkov.godfather.main.domain.BoxAnswer;
import dev.struchkov.godfather.telegram.simple.context.service.TelegramSending;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
@ -25,7 +26,9 @@ public class MessageSendTelegramService implements MessageSendService {
@Override
public void send(@NonNull Notify notify) {
sending.send(personInformation.getTelegramId(), boxAnswer(notify.generateMessage()));
final BoxAnswer boxAnswer = boxAnswer(notify.generateMessage());
boxAnswer.setRecipientIfNull(personInformation.getTelegramId());
sending.send(boxAnswer);
}
}

24
telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/unit/UnitConfig.java
View File

@ -6,8 +6,8 @@ import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.service.DiscussionService;
import dev.struchkov.bot.gitlab.context.service.NoteService;
import dev.struchkov.bot.gitlab.context.service.NotifyService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.core.service.parser.ProjectParser;
import dev.struchkov.bot.gitlab.telegram.utils.UnitName;
import dev.struchkov.godfather.main.core.unit.UnitActiveType;
import dev.struchkov.godfather.main.domain.BoxAnswer;
import dev.struchkov.godfather.main.domain.annotation.Unit;
@ -27,7 +27,9 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.ACCESS_ERROR;
import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.ANSWER_NOTE;
import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.AUTHORIZATION;
import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.CHECK_FIRST_START;
import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.CHECK_MENU_OR_ANSWER;
import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.CHECK_PARSER_PRIVATE_PROJECT;
@ -64,13 +66,29 @@ public class UnitConfig {
private final ProjectParser projectParser;
@Unit(value = UnitName.AUTHORIZATION, main = true)
@Unit(value = AUTHORIZATION, main = true)
public AnswerCheck<Mail> auth(
@Unit(CHECK_FIRST_START) MainUnit<Mail> checkFirstStart
@Unit(CHECK_FIRST_START) MainUnit<Mail> checkFirstStart,
@Unit(ACCESS_ERROR) MainUnit<Mail> accessError
) {
return AnswerCheck.<Mail>builder()
.check(mail -> personInformation.getTelegramId().equals(mail.getPersonId()))
.unitTrue(checkFirstStart)
.unitFalse(accessError)
.build();
}
@Unit(value = ACCESS_ERROR)
public AnswerText<Mail> accessError() {
return AnswerText.<Mail>builder()
.answer(message -> {
final String messageText = new StringBuilder("\uD83D\uDEA8 *Попытка несанкционированного доступа к боту*")
.append(Smile.HR.getValue())
.append("\uD83E\uDDB9\u200D♂️: ").append(message.getPersonId()).append("\n")
.append("\uD83D\uDCAC: ").append(message.getText())
.toString();
return BoxAnswer.builder().recipientPersonId(personInformation.getTelegramId()).message(messageText).build();
})
.build();
}

1
telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/utils/UnitName.java
View File

@ -21,6 +21,7 @@ public final class UnitName {
public static final String PARSE_OWNER_PROJECT = "parseOwnerProject";
public static final String END_SETTING = "endSetting";
public static final String AUTHORIZATION = "AUTHORIZATION";
public static final String ACCESS_ERROR = "ACCESS_ERROR";
private UnitName() {
utilityClass();