From af627cd7b74c507e9e5faa7a74c04afd300379bd Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Mon, 4 Jul 2022 09:40:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=B5=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 6 +++---
 telegram-core/pom.xml                                       | 2 +-
 .../godfather/telegram/convert/CallbackQueryConvert.java    | 5 +++++
 .../godfather/telegram/convert/MessageMailConvert.java      | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f71600b..7f12fd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>dev.struchkov.godfather</groupId>
     <artifactId>telegram-bot</artifactId>
-    <version>0.0.9</version>
+    <version>0.0.10</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -33,8 +33,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <godfather.core.ver>0.0.7</godfather.core.ver>
-        <telegrambots.ver>6.0.1</telegrambots.ver>
+        <godfather.core.ver>0.0.8</godfather.core.ver>
+        <telegrambots.ver>6.1.0</telegrambots.ver>
 
         <plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver>
         <plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver>
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 @@
     <parent>
         <groupId>dev.struchkov.godfather</groupId>
         <artifactId>telegram-bot</artifactId>
-        <version>0.0.9</version>
+        <version>0.0.10</version>
     </parent>
 
     <artifactId>telegram-core</artifactId>
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<MessageEntity> entities = message.getEntities();
         if (entities != null) {
             mail.setAttachments(convertAttachments(entities));