diff --git a/pom.xml b/pom.xml
index f71600b..7f12fd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
dev.struchkov.godfather
telegram-bot
- 0.0.9
+ 0.0.10
pom
@@ -33,8 +33,8 @@
UTF-8
UTF-8
- 0.0.7
- 6.0.1
+ 0.0.8
+ 6.1.0
3.10.1
1.6.13
diff --git a/telegram-core/pom.xml b/telegram-core/pom.xml
index 2622ad6..b13e2f5 100644
--- a/telegram-core/pom.xml
+++ b/telegram-core/pom.xml
@@ -5,7 +5,7 @@
dev.struchkov.godfather
telegram-bot
- 0.0.9
+ 0.0.10
telegram-core
diff --git a/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/CallbackQueryConvert.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/CallbackQueryConvert.java
index 25f7d72..05338d1 100644
--- a/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/CallbackQueryConvert.java
+++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/CallbackQueryConvert.java
@@ -2,6 +2,7 @@ package dev.struchkov.godfather.telegram.convert;
import dev.struchkov.godfather.context.domain.content.Mail;
import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
+import org.telegram.telegrambots.meta.api.objects.User;
import java.time.LocalDateTime;
@@ -17,6 +18,10 @@ public class CallbackQueryConvert {
mail.setText(callbackQuery.getData());
mail.setPersonId(callbackQuery.getMessage().getChatId());
mail.setAddDate(LocalDateTime.now());
+
+ final User user = callbackQuery.getFrom();
+ mail.setFirstName(user.getFirstName());
+ mail.setLastName(user.getLastName());
return mail;
}
diff --git a/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/MessageMailConvert.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/MessageMailConvert.java
index 85b9f98..d225c8e 100644
--- a/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/MessageMailConvert.java
+++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/MessageMailConvert.java
@@ -34,6 +34,7 @@ public final class MessageMailConvert {
mail.setCreateDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(message.getDate()), ZoneId.systemDefault()));
mail.setFirstName(message.getChat().getFirstName());
mail.setLastName(message.getChat().getLastName());
+
final List entities = message.getEntities();
if (entities != null) {
mail.setAttachments(convertAttachments(entities));