Godfather-Bots/telegram-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Добавил в ButtonClickAttachment информацию о сообщении
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details

Browse Source
This commit is contained in:
Struchkov Mark 2023-12-02 10:46:23 +03:00
parent d6f28d53a8
commit de25a6033b
Signed by: upagge
GPG Key ID: D3018BE7BA428CA6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/CallbackQueryConvert.java
View File

@ -3,6 +3,7 @@ package dev.struchkov.godfather.telegram.main.context.convert;
import dev.struchkov.godfather.main.domain.content.Mail; import dev.struchkov.godfather.main.domain.content.Mail;
import dev.struchkov.godfather.telegram.domain.attachment.ButtonClickAttachment; import dev.struchkov.godfather.telegram.domain.attachment.ButtonClickAttachment;
import org.telegram.telegrambots.meta.api.objects.CallbackQuery; import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
import org.telegram.telegrambots.meta.api.objects.Message;
import org.telegram.telegrambots.meta.api.objects.User; import org.telegram.telegrambots.meta.api.objects.User;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -21,7 +22,7 @@ public class CallbackQueryConvert {
mail.setId(callbackQuery.getMessage().getMessageId().toString()); mail.setId(callbackQuery.getMessage().getMessageId().toString());
mail.setCreateDate(LocalDateTime.now()); mail.setCreateDate(LocalDateTime.now());
mail.setText(callbackData); mail.setText(callbackData);
mail.addAttachment(convertToButtonClick(callbackData, callbackQuery.getMessage().getMessageId())); mail.addAttachment(convertToButtonClick(callbackData, callbackQuery.getMessage()));
final Long chatId = callbackQuery.getFrom().getId(); final Long chatId = callbackQuery.getFrom().getId();
mail.setFromPersonId(chatId.toString()); mail.setFromPersonId(chatId.toString());
@ -32,10 +33,10 @@ public class CallbackQueryConvert {
return mail; return mail;
} }
private static ButtonClickAttachment convertToButtonClick(String callbackData, Integer messageId) { private static ButtonClickAttachment convertToButtonClick(String callbackData, Message message) {
final ButtonClickAttachment buttonClickAttachment = new ButtonClickAttachment(); final ButtonClickAttachment buttonClickAttachment = new ButtonClickAttachment();
buttonClickAttachment.setRawCallBackData(callbackData); buttonClickAttachment.setRawCallBackData(callbackData);
buttonClickAttachment.setMessageId(messageId.toString()); buttonClickAttachment.setMessage(MessageMailConvert.apply(message));
if (callbackData.charAt(0) == '[' && callbackData.charAt(callbackData.length() - 1) == ']') { if (callbackData.charAt(0) == '[' && callbackData.charAt(callbackData.length() - 1) == ']') {
final String[] args = callbackData.substring(1, callbackData.length() - 1).split(";"); final String[] args = callbackData.substring(1, callbackData.length() - 1).split(";");
for (String arg : args) { for (String arg : args) {

6
telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/attachment/ButtonClickAttachment.java
View File

@ -2,6 +2,7 @@ package dev.struchkov.godfather.telegram.domain.attachment;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import dev.struchkov.godfather.main.domain.content.Attachment; import dev.struchkov.godfather.main.domain.content.Attachment;
import dev.struchkov.godfather.main.domain.content.Mail;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -17,11 +18,8 @@ import static dev.struchkov.haiti.utils.Inspector.isNotNull;
@Setter @Setter
public class ButtonClickAttachment extends Attachment { public class ButtonClickAttachment extends Attachment {
/**
* Идентификатор сообщения, под которым пользователь нажал кнопку.
*/
private String messageId;
private String rawCallBackData; private String rawCallBackData;
private Mail message;
private Map<String, ButtonArg> args = new HashMap<>(); private Map<String, ButtonArg> args = new HashMap<>();