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

Добавил вывод логина пользователя, который пытается написать боту
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Struchkov Mark 2023-02-15 22:56:16 +03:00
parent d9b5a28fa5
commit d1c1783c63
Signed by: upagge
GPG Key ID: D3018BE7BA428CA6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewProjectNotifyGenerator.java
View File

@ -27,7 +27,7 @@ public class NewProjectNotifyGenerator implements NotifyBoxAnswerGenerator<NewPr
.filter(Checker::checkNotBlank) .filter(Checker::checkNotBlank)
.map(Strings::escapeMarkdown); .map(Strings::escapeMarkdown);
final StringBuilder builder = new StringBuilder(Icons.FUN).append("* New project*") final StringBuilder builder = new StringBuilder(Icons.FUN).append(" *New project*")
.append(Icons.HR) .append(Icons.HR)
.append(escapeMarkdown(notify.getProjectName())) .append(escapeMarkdown(notify.getProjectName()))
.append(Icons.HR); .append(Icons.HR);

9
telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/unit/MenuConfig.java
View File

@ -18,6 +18,7 @@ import dev.struchkov.godfather.simple.core.unit.AnswerText;
import dev.struchkov.godfather.simple.core.unit.MainUnit; import dev.struchkov.godfather.simple.core.unit.MainUnit;
import dev.struchkov.godfather.telegram.domain.attachment.LinkAttachment; import dev.struchkov.godfather.telegram.domain.attachment.LinkAttachment;
import dev.struchkov.godfather.telegram.domain.keyboard.InlineKeyBoard; import dev.struchkov.godfather.telegram.domain.keyboard.InlineKeyBoard;
import dev.struchkov.godfather.telegram.main.context.MailPayload;
import dev.struchkov.godfather.telegram.main.core.util.Attachments; import dev.struchkov.godfather.telegram.main.core.util.Attachments;
import dev.struchkov.haiti.utils.Checker; import dev.struchkov.haiti.utils.Checker;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -69,9 +70,13 @@ public class MenuConfig {
return AnswerText.<Mail>builder() return AnswerText.<Mail>builder()
.triggerCheck(mail -> !personInformation.getTelegramId().equals(mail.getPersonId())) .triggerCheck(mail -> !personInformation.getTelegramId().equals(mail.getPersonId()))
.answer(message -> { .answer(message -> {
final String messageText = new StringBuilder("\uD83D\uDEA8 *Попытка несанкционированного доступа к боту*") final String messageText = new StringBuilder("\uD83D\uDEA8 *Attempted unauthorized access to the bot*")
.append(Icons.HR) .append(Icons.HR)
.append("\uD83E\uDDB9\u200D♂️: ").append(message.getPersonId()).append("\n") .append("\uD83E\uDDB9\u200D♂️: ").append(
message.getPayLoad(MailPayload.USERNAME)
.map(username -> "@" + username)
.orElseThrow()
).append("\n")
.append("\uD83D\uDCAC: ").append(message.getText()) .append("\uD83D\uDCAC: ").append(message.getText())
.toString(); .toString();
return BoxAnswer.builder().recipientPersonId(personInformation.getTelegramId()).message(messageText).build(); return BoxAnswer.builder().recipientPersonId(personInformation.getTelegramId()).message(messageText).build();