diff --git a/pom.xml b/pom.xml
index 24aa0d3..ea9a358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
dev.struchkov.godfather.telegram
telegram-bot
- 0.0.42
+ 0.0.43
pom
@@ -38,7 +38,7 @@
UTF-8
UTF-8
- 0.0.31
+ 0.0.32
6.3.0
2.0.0
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 @@
+ 4.0.0
telegram-bot
dev.struchkov.godfather.telegram
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-consumer
pom
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-consumer
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-consumer-main
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-consumer
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-consumer-quarkus
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-consumer
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-consumer-simple
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 @@
+ 4.0.0
telegram-bot
dev.struchkov.godfather.telegram
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-context
pom
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-context
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-context-main
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-context
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-context-quarkus
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 sendNotSave(@NotNull String personId, @NotNull BoxAnswer boxAnswer);
+ Uni 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 @@
+ 4.0.0
telegram-context
dev.struchkov.godfather.telegram
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-context-simple
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 @@
dev.struchkov.godfather.telegram
telegram-bot
- 0.0.42
+ 0.0.43
+
telegram-core-main
telegram-core-simple
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-core
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-core-main
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 @@
+ 4.0.0
telegram-core
dev.struchkov.godfather.telegram
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-core-quarkus
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-core
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-core-simple
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-bot
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-domain
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-bot
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-sender
pom
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-sender
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-sender-main
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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-sender
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-sender-quarkus
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 send(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer) {
- return sendBoxAnswer(telegramId, boxAnswer, true);
+ public Uni send(@NotNull BoxAnswer boxAnswer) {
+ return sendBoxAnswer(boxAnswer, true);
}
@Override
@@ -60,27 +60,28 @@ public class TelegramSender implements TelegramSending {
}
@Override
- public Uni sendNotSave(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer) {
- return sendBoxAnswer(telegramId, boxAnswer, false);
+ public Uni sendNotSave(@NotNull BoxAnswer boxAnswer) {
+ return sendBoxAnswer(boxAnswer, false);
}
- private Uni sendBoxAnswer(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer, boolean saveMessageId) {
+ private Uni 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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-sender
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-sender-simple
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 optLastId = senderRepository.getLastSendMessage(telegramId);
+ final Optional 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 @@
+ 4.0.0
dev.struchkov.godfather.telegram
telegram-bot
- 0.0.42
+ 0.0.43
- 4.0.0
telegram-simple