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

godfather up to 0.0.32

Browse Source
This commit is contained in:
Struchkov Mark 2022-12-13 22:03:48 +03:00
parent 7fda16b63c
commit b25f085727
23 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -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>

4
telegram-consumer/pom.xml
View File

@ -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>

4
telegram-consumer/telegram-consumer-main/pom.xml
View File

@ -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>

4
telegram-consumer/telegram-consumer-quarkus/pom.xml
View File

@ -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>

4
telegram-consumer/telegram-consumer-simple/pom.xml
View File

@ -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>

4
telegram-context/pom.xml
View File

@ -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>

4
telegram-context/telegram-context-main/pom.xml
View File

@ -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>

4
telegram-context/telegram-context-quarkus/pom.xml
View File

@ -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>

2
telegram-context/telegram-context-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/context/service/TelegramSending.java
View File

@ -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);
}

4
telegram-context/telegram-context-simple/pom.xml
View File

@ -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>

2
telegram-context/telegram-context-simple/src/main/java/dev/struchkov/godfather/telegram/simple/context/service/TelegramSending.java
View File

@ -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);
}

3
telegram-core/pom.xml
View File

@ -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>

4
telegram-core/telegram-core-main/pom.xml
View File

@ -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>

4
telegram-core/telegram-core-quarkus/pom.xml
View File

@ -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>

4
telegram-core/telegram-core-simple/pom.xml
View File

@ -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>

4
telegram-domain/pom.xml
View File

@ -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>

4
telegram-sender/pom.xml
View File

@ -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>

4
telegram-sender/telegram-sender-main/pom.xml
View File

@ -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>

4
telegram-sender/telegram-sender-quarkus/pom.xml
View File

@ -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>

19
telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java
View File

@ -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);
}
}
);

4
telegram-sender/telegram-sender-simple/pom.xml
View File

@ -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>

24
telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java
View File

@ -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());

4
telegram-simple/pom.xml
View File

@ -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>