From b25f085727371cafa3a29265b00b1a166e4bc2f8 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Tue, 13 Dec 2022 22:03:48 +0300
Subject: [PATCH] godfather up to 0.0.32

---
 pom.xml                                       |  4 ++--
 telegram-consumer/pom.xml                     |  4 ++--
 .../telegram-consumer-main/pom.xml            |  4 ++--
 .../telegram-consumer-quarkus/pom.xml         |  4 ++--
 .../telegram-consumer-simple/pom.xml          |  4 ++--
 telegram-context/pom.xml                      |  4 ++--
 .../telegram-context-main/pom.xml             |  4 ++--
 .../telegram-context-quarkus/pom.xml          |  4 ++--
 .../context/service/TelegramSending.java      |  2 +-
 .../telegram-context-simple/pom.xml           |  4 ++--
 .../context/service/TelegramSending.java      |  2 +-
 telegram-core/pom.xml                         |  3 ++-
 telegram-core/telegram-core-main/pom.xml      |  4 ++--
 telegram-core/telegram-core-quarkus/pom.xml   |  4 ++--
 telegram-core/telegram-core-simple/pom.xml    |  4 ++--
 telegram-domain/pom.xml                       |  4 ++--
 telegram-sender/pom.xml                       |  4 ++--
 telegram-sender/telegram-sender-main/pom.xml  |  4 ++--
 .../telegram-sender-quarkus/pom.xml           |  4 ++--
 .../quarkus/sender/TelegramSender.java        | 19 ++++++++-------
 .../telegram-sender-simple/pom.xml            |  4 ++--
 .../simple/sender/TelegramSender.java         | 24 ++++++++++---------
 telegram-simple/pom.xml                       |  4 ++--
 23 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/pom.xml b/pom.xml
index 24aa0d3..ea9a358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>dev.struchkov.godfather.telegram</groupId>
     <artifactId>telegram-bot</artifactId>
-    <version>0.0.42</version>
+    <version>0.0.43</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <godfather.core.ver>0.0.31</godfather.core.ver>
+        <godfather.core.ver>0.0.32</godfather.core.ver>
         <telegrambots.ver>6.3.0</telegrambots.ver>
 
         <haiti.version>2.0.0</haiti.version>
diff --git a/telegram-consumer/pom.xml b/telegram-consumer/pom.xml
index 234f3ab..3c16217 100644
--- a/telegram-consumer/pom.xml
+++ b/telegram-consumer/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>telegram-bot</artifactId>
         <groupId>dev.struchkov.godfather.telegram</groupId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-consumer</artifactId>
     <packaging>pom</packaging>
diff --git a/telegram-consumer/telegram-consumer-main/pom.xml b/telegram-consumer/telegram-consumer-main/pom.xml
index f30b803..0880278 100644
--- a/telegram-consumer/telegram-consumer-main/pom.xml
+++ b/telegram-consumer/telegram-consumer-main/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-consumer</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-consumer-main</artifactId>
 
diff --git a/telegram-consumer/telegram-consumer-quarkus/pom.xml b/telegram-consumer/telegram-consumer-quarkus/pom.xml
index 0c4317f..fad1cdf 100644
--- a/telegram-consumer/telegram-consumer-quarkus/pom.xml
+++ b/telegram-consumer/telegram-consumer-quarkus/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-consumer</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-consumer-quarkus</artifactId>
 
diff --git a/telegram-consumer/telegram-consumer-simple/pom.xml b/telegram-consumer/telegram-consumer-simple/pom.xml
index 42403fa..38247dd 100644
--- a/telegram-consumer/telegram-consumer-simple/pom.xml
+++ b/telegram-consumer/telegram-consumer-simple/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-consumer</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-consumer-simple</artifactId>
 
diff --git a/telegram-context/pom.xml b/telegram-context/pom.xml
index 3ffa36a..cfcdc96 100644
--- a/telegram-context/pom.xml
+++ b/telegram-context/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>telegram-bot</artifactId>
         <groupId>dev.struchkov.godfather.telegram</groupId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-context</artifactId>
     <packaging>pom</packaging>
diff --git a/telegram-context/telegram-context-main/pom.xml b/telegram-context/telegram-context-main/pom.xml
index a429938..42af965 100644
--- a/telegram-context/telegram-context-main/pom.xml
+++ b/telegram-context/telegram-context-main/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-context</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-context-main</artifactId>
 
diff --git a/telegram-context/telegram-context-quarkus/pom.xml b/telegram-context/telegram-context-quarkus/pom.xml
index e9728cf..b55fc28 100644
--- a/telegram-context/telegram-context-quarkus/pom.xml
+++ b/telegram-context/telegram-context-quarkus/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-context</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-context-quarkus</artifactId>
 
diff --git a/telegram-context/telegram-context-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/context/service/TelegramSending.java b/telegram-context/telegram-context-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/context/service/TelegramSending.java
index aae48c6..f60763f 100644
--- a/telegram-context/telegram-context-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/context/service/TelegramSending.java
+++ b/telegram-context/telegram-context-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/context/service/TelegramSending.java
@@ -7,6 +7,6 @@ import org.jetbrains.annotations.NotNull;
 
 public interface TelegramSending extends Sending {
 
-    Uni<Void> sendNotSave(@NotNull String personId, @NotNull BoxAnswer boxAnswer);
+    Uni<Void> sendNotSave(@NotNull BoxAnswer boxAnswer);
 
 }
diff --git a/telegram-context/telegram-context-simple/pom.xml b/telegram-context/telegram-context-simple/pom.xml
index 68d7105..efe33b9 100644
--- a/telegram-context/telegram-context-simple/pom.xml
+++ b/telegram-context/telegram-context-simple/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>telegram-context</artifactId>
         <groupId>dev.struchkov.godfather.telegram</groupId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-context-simple</artifactId>
 
diff --git a/telegram-context/telegram-context-simple/src/main/java/dev/struchkov/godfather/telegram/simple/context/service/TelegramSending.java b/telegram-context/telegram-context-simple/src/main/java/dev/struchkov/godfather/telegram/simple/context/service/TelegramSending.java
index 1dbc554..d2d612e 100644
--- a/telegram-context/telegram-context-simple/src/main/java/dev/struchkov/godfather/telegram/simple/context/service/TelegramSending.java
+++ b/telegram-context/telegram-context-simple/src/main/java/dev/struchkov/godfather/telegram/simple/context/service/TelegramSending.java
@@ -6,6 +6,6 @@ import org.jetbrains.annotations.NotNull;
 
 public interface TelegramSending extends Sending {
 
-    void sendNotSave(@NotNull String personId, @NotNull BoxAnswer boxAnswer);
+    void sendNotSave(@NotNull BoxAnswer boxAnswer);
 
 }
diff --git a/telegram-core/pom.xml b/telegram-core/pom.xml
index 4f849b9..77d45bd 100644
--- a/telegram-core/pom.xml
+++ b/telegram-core/pom.xml
@@ -5,8 +5,9 @@
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-bot</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
+
     <modules>
         <module>telegram-core-main</module>
         <module>telegram-core-simple</module>
diff --git a/telegram-core/telegram-core-main/pom.xml b/telegram-core/telegram-core-main/pom.xml
index 6046194..50d888e 100644
--- a/telegram-core/telegram-core-main/pom.xml
+++ b/telegram-core/telegram-core-main/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-core</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-core-main</artifactId>
 
diff --git a/telegram-core/telegram-core-quarkus/pom.xml b/telegram-core/telegram-core-quarkus/pom.xml
index 76ea4c5..25b24a8 100644
--- a/telegram-core/telegram-core-quarkus/pom.xml
+++ b/telegram-core/telegram-core-quarkus/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>telegram-core</artifactId>
         <groupId>dev.struchkov.godfather.telegram</groupId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-core-quarkus</artifactId>
 
diff --git a/telegram-core/telegram-core-simple/pom.xml b/telegram-core/telegram-core-simple/pom.xml
index 8896c2c..0a3ceb0 100644
--- a/telegram-core/telegram-core-simple/pom.xml
+++ b/telegram-core/telegram-core-simple/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-core</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-core-simple</artifactId>
 
diff --git a/telegram-domain/pom.xml b/telegram-domain/pom.xml
index b9b050f..2db927b 100644
--- a/telegram-domain/pom.xml
+++ b/telegram-domain/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-bot</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-domain</artifactId>
 
diff --git a/telegram-sender/pom.xml b/telegram-sender/pom.xml
index 5afc1c8..c2c1703 100644
--- a/telegram-sender/pom.xml
+++ b/telegram-sender/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-bot</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-sender</artifactId>
     <packaging>pom</packaging>
diff --git a/telegram-sender/telegram-sender-main/pom.xml b/telegram-sender/telegram-sender-main/pom.xml
index 081365e..d3e1c43 100644
--- a/telegram-sender/telegram-sender-main/pom.xml
+++ b/telegram-sender/telegram-sender-main/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-sender</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-sender-main</artifactId>
 
diff --git a/telegram-sender/telegram-sender-quarkus/pom.xml b/telegram-sender/telegram-sender-quarkus/pom.xml
index adde14e..cd7ca43 100644
--- a/telegram-sender/telegram-sender-quarkus/pom.xml
+++ b/telegram-sender/telegram-sender-quarkus/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-sender</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-sender-quarkus</artifactId>
 
diff --git a/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java b/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java
index 280ed3b..7357618 100644
--- a/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java
+++ b/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java
@@ -50,8 +50,8 @@ public class TelegramSender implements TelegramSending {
     }
 
     @Override
-    public Uni<Void> send(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer) {
-        return sendBoxAnswer(telegramId, boxAnswer, true);
+    public Uni<Void> send(@NotNull BoxAnswer boxAnswer) {
+        return sendBoxAnswer(boxAnswer, true);
     }
 
     @Override
@@ -60,27 +60,28 @@ public class TelegramSender implements TelegramSending {
     }
 
     @Override
-    public Uni<Void> sendNotSave(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer) {
-        return sendBoxAnswer(telegramId, boxAnswer, false);
+    public Uni<Void> sendNotSave(@NotNull BoxAnswer boxAnswer) {
+        return sendBoxAnswer(boxAnswer, false);
     }
 
-    private Uni<Void> sendBoxAnswer(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer, boolean saveMessageId) {
+    private Uni<Void> sendBoxAnswer(@NotNull BoxAnswer boxAnswer, boolean saveMessageId) {
         return Uni.createFrom().voidItem()
                 .onItem().transformToUni(
                         v -> {
+                            final String recipientTelegramId = boxAnswer.getRecipientPersonId();
                             if (boxAnswer.isReplace() && checkNotNull(senderRepository)) {
-                                return senderRepository.getLastSendMessage(telegramId)
+                                return senderRepository.getLastSendMessage(recipientTelegramId)
                                         .onItem().transformToUni(
                                                 lastId -> {
                                                     if (checkNotNull(lastId)) {
-                                                        return replaceMessage(telegramId, lastId, boxAnswer);
+                                                        return replaceMessage(recipientTelegramId, lastId, boxAnswer);
                                                     } else {
-                                                        return sendMessage(telegramId, boxAnswer, saveMessageId);
+                                                        return sendMessage(recipientTelegramId, boxAnswer, saveMessageId);
                                                     }
                                                 }
                                         );
                             } else {
-                                return sendMessage(telegramId, boxAnswer, saveMessageId);
+                                return sendMessage(recipientTelegramId, boxAnswer, saveMessageId);
                             }
                         }
                 );
diff --git a/telegram-sender/telegram-sender-simple/pom.xml b/telegram-sender/telegram-sender-simple/pom.xml
index 3d1d7df..f6bc57c 100644
--- a/telegram-sender/telegram-sender-simple/pom.xml
+++ b/telegram-sender/telegram-sender-simple/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-sender</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-sender-simple</artifactId>
 
diff --git a/telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java b/telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java
index 2626f6b..0d01459 100644
--- a/telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java
+++ b/telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java
@@ -50,8 +50,9 @@ public class TelegramSender implements TelegramSending {
     }
 
     @Override
-    public void send(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer) {
-        sendBoxAnswer(telegramId, boxAnswer, true);
+    public void send(@NotNull BoxAnswer boxAnswer) {
+        isNotNull(boxAnswer.getRecipientPersonId());
+        sendBoxAnswer(boxAnswer, true);
     }
 
     @Override
@@ -60,12 +61,13 @@ public class TelegramSender implements TelegramSending {
     }
 
     @Override
-    public void sendNotSave(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer) {
-        sendBoxAnswer(telegramId, boxAnswer, false);
+    public void sendNotSave(@NotNull BoxAnswer boxAnswer) {
+        sendBoxAnswer(boxAnswer, false);
     }
 
-    private void sendBoxAnswer(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer, boolean saveMessageId) {
-        isNotNull(telegramId, boxAnswer);
+    private void sendBoxAnswer(BoxAnswer boxAnswer, boolean saveMessageId) {
+        final String recipientTelegramId = boxAnswer.getRecipientPersonId();
+        isNotNull(recipientTelegramId);
 
         for (PreSendProcessing preSendProcessor : preSendProcessors) {
             boxAnswer = preSendProcessor.pretreatment(boxAnswer);
@@ -73,19 +75,19 @@ public class TelegramSender implements TelegramSending {
 
         try {
             if (boxAnswer.isReplace() && checkNotNull(senderRepository)) {
-                final Optional<Integer> optLastId = senderRepository.getLastSendMessage(telegramId);
+                final Optional<Integer> optLastId = senderRepository.getLastSendMessage(recipientTelegramId);
                 if (optLastId.isPresent()) {
-                    replaceMessage(telegramId, optLastId.get(), boxAnswer);
+                    replaceMessage(recipientTelegramId, optLastId.get(), boxAnswer);
                 } else {
-                    sendMessage(telegramId, boxAnswer, saveMessageId);
+                    sendMessage(recipientTelegramId, boxAnswer, saveMessageId);
                 }
             } else {
-                sendMessage(telegramId, boxAnswer, saveMessageId);
+                sendMessage(recipientTelegramId, boxAnswer, saveMessageId);
             }
         } catch (TelegramApiRequestException e) {
             log.error(e.getApiResponse());
             if (ERROR_REPLACE_MESSAGE.equals(e.getApiResponse())) {
-                sendMessage(telegramId, boxAnswer, saveMessageId);
+                sendMessage(recipientTelegramId, boxAnswer, saveMessageId);
             }
         } catch (TelegramApiException e) {
             log.error(e.getMessage());
diff --git a/telegram-simple/pom.xml b/telegram-simple/pom.xml
index fadd244..3ca9aea 100644
--- a/telegram-simple/pom.xml
+++ b/telegram-simple/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>dev.struchkov.godfather.telegram</groupId>
         <artifactId>telegram-bot</artifactId>
-        <version>0.0.42</version>
+        <version>0.0.43</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>telegram-simple</artifactId>