Update PengradTelegramBot to improve chat ID retrieval and upgrade Telegram API version

- Refactor chat ID extraction logic into a separate method for clarity and maintainability.
- Handle cases where chat ID may not be accessible, logging a warning when not found.
- Upgrade Telegram Bot API dependency version from 6.2.0 to 7.1.1.
- Adjust BotRequestImpl to accommodate changes in chat ID retrieval logic.
- Make botAtomicReference in App class final for better thread safety.

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <packaging>pom</packaging>
@@ -65,6 +66,43 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- explicitly define maven-deploy-plugin after other to force exec order -->
+                <artifactId>maven-deploy-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>

stbf-demo/src/main/java/ru/penkrat/stbf/demo/App.java

@@ -19,7 +19,7 @@ public class App implements Runnable {
 
 	private static final Logger log = LoggerFactory.getLogger(App.class);
 
-	private static AtomicReference<PengradTelegramBot> botAtomicReference = new AtomicReference<>();
+	private static final AtomicReference<PengradTelegramBot> botAtomicReference = new AtomicReference<>();
 
 	@CommandLine.Option(names = {"-f", "--file"}, description = "The file with config.")
 	private String flowFile = "classpath:/flow.xml";

stbf-pengrad/pom.xml

@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>com.github.pengrad</groupId>
 			<artifactId>java-telegram-bot-api</artifactId>
-			<version>6.2.0</version>
+			<version>7.1.1</version>
 		</dependency>
 	</dependencies>
 

stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotRequestImpl.java

@@ -44,18 +44,16 @@ public class BotRequestImpl implements BotRequest {
 
 	@Override
 	public Optional<String> getCallbackMessageText() {
-		return Optional.of(update)
+		// unsupported ? todo: check doc
-				.map(Update::callbackQuery)
+		return Optional.empty();
-				.map(CallbackQuery::message)
-				.map(Message::text);
 	}
 
 	@Override
 	public Long getChatId() {
 		return Optional.of(update)
 				.map(Update::callbackQuery)
-				.map(CallbackQuery::message)
+				.map(CallbackQuery::maybeInaccessibleMessage)
-				.orElseGet(() -> update.message()).chat().id();
+				.orElseGet(update::message).chat().id();
 	}
 
 	@Override

stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/PengradTelegramBot.java

@@ -2,13 +2,10 @@ package ru.penkrat.stbf.impl.pengrad;
 
 import com.pengrad.telegrambot.TelegramBot;
 import com.pengrad.telegrambot.UpdatesListener;
-import com.pengrad.telegrambot.model.CallbackQuery;
 import com.pengrad.telegrambot.model.Update;
 import lombok.extern.slf4j.Slf4j;
 import ru.penkrat.stbf.api.CommandChain;
 
-import java.util.Optional;
-
 @Slf4j
 public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
 
@@ -17,11 +14,11 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
 		this.setUpdatesListener(updates -> {
 			for (Update update : updates) {
 				try {
-					final Long chatId = Optional.of(update)
+					final Long chatId = findChatId(update);
-							.map(Update::callbackQuery)
+					if (chatId == null) {
-							.map(CallbackQuery::message)
+						log.warn("Chat not found, Update [id={}]", update.updateId());
-							.orElseGet(() -> update.message()).chat().id();
+						continue;
-
+					}
 					log.debug("New message in chat {}", chatId);
 
 					commandChain.processCommand(
@@ -41,4 +38,15 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
 		log.debug("Bot closed.");
 	}
 
+	private Long findChatId(Update update) {
+		if (update.callbackQuery() != null && update.callbackQuery().maybeInaccessibleMessage() != null) {
+			return update.callbackQuery().maybeInaccessibleMessage().chat().id();
+		}
+		if (update.message() != null) {
+			return update.message().chat().id();
+		}
+
+		return null;
+	}
+
 }