[maven-release-plugin] prepare release stbf-parent-0.0.3

- Upgrade `java-telegram-bot-api` dependency from version 7.1.1 to 9.4.1 in `pom.xml`.
- Modify `sendFile` method in `BotResponseImpl` to log the sent message ID.
- Replace deprecated `disableWebPagePreview` with `linkPreviewOptions` in `editMessage` and `edit` methods.
- Refactor `createFromScreen` and related methods in `SendMethodUtils` to handle chat ID as a long type for better type safety.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ru.penkrat.stbf</groupId>
     <artifactId>stbf-parent</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>0.0.3</version>
     <name>stbf-parent</name>
 
     <description>Simple Telegram Bot Facade</description>
@@ -14,8 +14,8 @@
     <scm>
         <connection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</connection>
         <developerConnection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</developerConnection>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>stbf-parent-0.0.3</tag>
+    </scm>
 
     <licenses>
         <license>
@@ -65,6 +65,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-api/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ru.penkrat.stbf</groupId>
 		<artifactId>stbf-parent</artifactId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.3</version>
   	</parent>
 
 	<artifactId>stbf-api</artifactId>

stbf-api/src/main/java/ru/penkrat/stbf/api/BotRequest.java

@@ -14,4 +14,5 @@ public interface BotRequest {
 
 	Long getChatId();
 
+	BotSession getSession();
 }

stbf-api/src/main/java/ru/penkrat/stbf/api/BotSession.java

@@ -0,0 +1,9 @@
+package ru.penkrat.stbf.api;
+
+public interface BotSession {
+
+    Object getAttribute(String name);
+
+    void setAttribute(String name, Object value);
+
+}

stbf-api/src/main/java/ru/penkrat/stbf/api/SessionProvider.java

@@ -0,0 +1,8 @@
+package ru.penkrat.stbf.api;
+
+@FunctionalInterface
+public interface SessionProvider {
+
+    BotSession get(Long chatId);
+
+}

stbf-common/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.3</version>
 	</parent>
 
 	<artifactId>stbf-common</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

stbf-common/src/main/java/ru/penkrat/stbf/common/command/SessionAwareCommandChain.java

@@ -0,0 +1,20 @@
+package ru.penkrat.stbf.common.command;
+
+import lombok.RequiredArgsConstructor;
+import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotResponse;
+import ru.penkrat.stbf.api.CommandChain;
+import ru.penkrat.stbf.api.SessionProvider;
+import ru.penkrat.stbf.common.session.SessionAwareBotRequest;
+
+@RequiredArgsConstructor
+public class SessionAwareCommandChain implements CommandChain {
+
+	private final CommandChain delegate;
+	private final SessionProvider sessionProvider;
+
+	@Override
+	public void processCommand(BotRequest botRequest, BotResponse botResponse) {
+		delegate.processCommand(new SessionAwareBotRequest(botRequest, sessionProvider), botResponse);
+	}
+}

stbf-common/src/main/java/ru/penkrat/stbf/common/command/ThreadPolledCommandChain.java

@@ -0,0 +1,31 @@
+package ru.penkrat.stbf.common.command;
+
+import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotResponse;
+import ru.penkrat.stbf.api.CommandChain;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class ThreadPolledCommandChain implements CommandChain {
+
+	private final CommandChain delegate;
+	private final ExecutorService executor;
+
+	public ThreadPolledCommandChain(CommandChain delegate) {
+		this(delegate, 4);
+	}
+
+	public ThreadPolledCommandChain(CommandChain delegate, int nThreads) {
+		this.delegate = delegate;
+		this.executor = Executors.newFixedThreadPool(nThreads);
+	}
+
+	@Override
+	public void processCommand(BotRequest botRequest, BotResponse botResponse) {
+		executor.execute(() -> {
+			delegate.processCommand(botRequest, botResponse);
+		});
+	}
+
+}

stbf-common/src/main/java/ru/penkrat/stbf/common/session/InMemBotSessionProvider.java

@@ -0,0 +1,18 @@
+package ru.penkrat.stbf.common.session;
+
+import ru.penkrat.stbf.api.BotSession;
+import ru.penkrat.stbf.api.SessionProvider;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class InMemBotSessionProvider implements SessionProvider {
+
+    private static final Map<Long, BotSession> MAP = new ConcurrentHashMap<>();
+
+    @Override
+    public BotSession get(Long chatId) {
+        return MAP.computeIfAbsent(chatId, k -> new MapBackedBotSession(new ConcurrentHashMap<>()));
+    }
+
+}

stbf-common/src/main/java/ru/penkrat/stbf/common/session/MapBackedBotSession.java

@@ -0,0 +1,22 @@
+package ru.penkrat.stbf.common.session;
+
+import lombok.RequiredArgsConstructor;
+import ru.penkrat.stbf.api.BotSession;
+
+import java.util.Map;
+
+@RequiredArgsConstructor
+class MapBackedBotSession implements BotSession {
+
+    private final Map<String, Object> map;
+
+    @Override
+    public Object getAttribute(String name) {
+        return map.get(name);
+    }
+
+    @Override
+    public void setAttribute(String name, Object value) {
+        map.put(name, value);
+    }
+}

stbf-common/src/main/java/ru/penkrat/stbf/common/session/SessionAwareBotRequest.java

@@ -0,0 +1,49 @@
+package ru.penkrat.stbf.common.session;
+
+import lombok.RequiredArgsConstructor;
+import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotSession;
+import ru.penkrat.stbf.api.SessionProvider;
+
+import java.util.Objects;
+import java.util.Optional;
+
+@RequiredArgsConstructor
+public class SessionAwareBotRequest implements BotRequest {
+
+	private final BotRequest delegate;
+
+	private final SessionProvider sessionProvider;
+
+	private BotSession botSession;
+
+	@Override
+	public BotSession getSession() {
+		if (botSession == null) {
+			botSession = sessionProvider.get(getChatId());
+			Objects.requireNonNull(botSession, "Session can not be null");
+		}
+		return botSession;
+	}
+
+	public Optional<String> getMessageText() {
+		return this.delegate.getMessageText();
+	}
+
+	public Optional<String> getPhoneNumber() {
+		return this.delegate.getPhoneNumber();
+	}
+
+	public Optional<String> getCallbackData() {
+		return this.delegate.getCallbackData();
+	}
+
+	public Optional<String> getCallbackMessageText() {
+		return this.delegate.getCallbackMessageText();
+	}
+
+	public Long getChatId() {
+		return this.delegate.getChatId();
+	}
+
+}

stbf-demo/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>stbf-parent</artifactId>
         <groupId>ru.penkrat.stbf</groupId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>0.0.3</version>
     </parent>
 
     <groupId>ru.penkrat.stbf</groupId>
@@ -34,6 +34,11 @@
             <groupId>ru.penkrat.stbf</groupId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <artifactId>stbf-common</artifactId>
+            <groupId>ru.penkrat.stbf</groupId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>

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

@@ -5,64 +5,67 @@ import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import ru.penkrat.stbf.api.BotCommandChain;
 import ru.penkrat.stbf.api.CommandChain;
+import ru.penkrat.stbf.common.command.SessionAwareCommandChain;
+import ru.penkrat.stbf.common.command.ThreadPolledCommandChain;
+import ru.penkrat.stbf.common.session.InMemBotSessionProvider;
 import ru.penkrat.stbf.impl.pengrad.PengradTelegramBot;
 import ru.penkrat.stbf.templates.xml.XmlFlowResolver;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 @CommandLine.Command(name = "java -jar stbf-demo.jar", mixinStandardHelpOptions = true, description = "Run bot",
-        version = "Simple Telegram bot framework Demo app v. 0.0.1")
+		version = "Simple Telegram bot framework Demo app v. 0.0.2")
 public class App implements Runnable {
 
-    private static final Logger log = LoggerFactory.getLogger(App.class);
+	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";
+	@CommandLine.Option(names = {"-f", "--file"}, description = "The file with config.")
+	private String flowFile = "classpath:/flow.xml";
 
-    @CommandLine.Option(names = {"-t", "--token"}, required = true, description = "bot token 1234:abscdf...")
-    private String botToken = "";
+	@CommandLine.Option(names = {"-t", "--token"}, required = true, description = "bot token 1234:abscdf...")
+	private String botToken = "";
 
-    public static void main(String[] args) {
-        new CommandLine(new App()).execute(args);
-    }
+	public static void main(String[] args) {
+		new CommandLine(new App()).execute(args);
+	}
 
-    private BotCommandChain getCommandChain(String filename) {
-        XmlFlowResolver flow = new XmlFlowResolver(filename);
+	private CommandChain getCommandChain(String filename) {
+		XmlFlowResolver flow = new XmlFlowResolver(filename);
 
-        BotCommandChain chain = new BotCommandChain();
-        flow.getCommands().forEach(chain::add);
+		BotCommandChain chain = new BotCommandChain();
+		flow.getCommands().forEach(chain::add);
 
-        return chain;
-    }
+		return new ThreadPolledCommandChain(new SessionAwareCommandChain(chain, new InMemBotSessionProvider()));
+	}
 
-    private Runnable start(String token, CommandChain chain) {
-        return () -> botAtomicReference.set(new PengradTelegramBot(token, chain));
-    }
+	private Runnable start(String token, CommandChain chain) {
+		return () -> botAtomicReference.set(new PengradTelegramBot(token, chain));
+	}
 
-    private void onShutdown() {
-        try {
-            if (botAtomicReference.get() != null) {
-                botAtomicReference.get().close();
-                log.info("Bot finished.");
-            }
-        } catch (Exception e) {
-            log.error("Error:", e);
-        }
-    }
+	private void onShutdown() {
+		try {
+			if (botAtomicReference.get() != null) {
+				botAtomicReference.get().close();
+				log.info("Bot finished.");
+			}
+		} catch (Exception e) {
+			log.error("Error:", e);
+		}
+	}
 
-    @Override
-    public void run() {
-        Thread botThread = new Thread(start(botToken, getCommandChain(flowFile)));
-        botThread.setDaemon(false);
-        botThread.setName("stbf-bot-thread");
+	@Override
+	public void run() {
+		Thread botThread = new Thread(start(botToken, getCommandChain(flowFile)));
+		botThread.setDaemon(false);
+		botThread.setName("stbf-bot-thread");
 
-        Runtime.getRuntime().addShutdownHook(new Thread(this::onShutdown));
+		Runtime.getRuntime().addShutdownHook(new Thread(this::onShutdown));
 
-        log.info("Starting bot...");
-        botThread.start();
-        log.info("Bot started.");
-        log.info("Press Ctrl+C to exit.");
-    }
+		log.info("Starting bot...");
+		botThread.start();
+		log.info("Bot started.");
+		log.info("Press Ctrl+C to exit.");
+	}
 }

stbf-pengrad/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ru.penkrat.stbf</groupId>
 		<artifactId>stbf-parent</artifactId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.3</version>
   	</parent>
 
 	<artifactId>stbf-pengrad</artifactId>
@@ -16,12 +16,12 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.pengrad</groupId>
 			<artifactId>java-telegram-bot-api</artifactId>
-			<version>[4.9.0,5.2.0]</version>
+			<version>9.4.1</version>
 		</dependency>
 	</dependencies>
 

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

@@ -1,17 +1,17 @@
 package ru.penkrat.stbf.impl.pengrad;
 
-import static lombok.AccessLevel.PROTECTED;
-
-import java.util.Optional;
-
 import com.pengrad.telegrambot.model.CallbackQuery;
 import com.pengrad.telegrambot.model.Contact;
 import com.pengrad.telegrambot.model.Message;
 import com.pengrad.telegrambot.model.Update;
-
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotSession;
+
+import java.util.Optional;
+
+import static lombok.AccessLevel.PROTECTED;
 
 @RequiredArgsConstructor
 public class BotRequestImpl implements BotRequest {
@@ -44,18 +44,21 @@ public class BotRequestImpl implements BotRequest {
 
 	@Override
 	public Optional<String> getCallbackMessageText() {
-		return Optional.of(update)
-				.map(Update::callbackQuery)
-				.map(CallbackQuery::message)
-				.map(Message::text);
+		// unsupported ? todo: check doc
+		return Optional.empty();
 	}
 
 	@Override
 	public Long getChatId() {
 		return Optional.of(update)
 				.map(Update::callbackQuery)
-				.map(CallbackQuery::message)
-				.orElseGet(() -> update.message()).chat().id();
+				.map(CallbackQuery::maybeInaccessibleMessage)
+				.orElseGet(update::message).chat().id();
+	}
+
+	@Override
+	public BotSession getSession() {
+		throw new UnsupportedOperationException("Session is not supported");
 	}
 
 }

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

@@ -1,6 +1,8 @@
 package ru.penkrat.stbf.impl.pengrad;
 
 import com.pengrad.telegrambot.TelegramBot;
+import com.pengrad.telegrambot.model.LinkPreviewOptions;
+import com.pengrad.telegrambot.model.Message;
 import com.pengrad.telegrambot.model.Update;
 import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
 import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
@@ -11,6 +13,7 @@ import com.pengrad.telegrambot.request.AbstractSendRequest;
 import com.pengrad.telegrambot.request.DeleteMessage;
 import com.pengrad.telegrambot.request.EditMessageText;
 import com.pengrad.telegrambot.request.SendDocument;
+import com.pengrad.telegrambot.response.BaseResponse;
 import com.pengrad.telegrambot.response.SendResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,17 +30,17 @@ public class BotResponseImpl implements BotResponse {
 
     @Override
     public void send(Screen screen) {
-        log.debug("Send message: \n============\n{}\n============", screen.getText().trim());
+        log.trace("Send trace: \n============\n{}\n============", screen.getText().trim());
 
-        AbstractSendRequest<? extends AbstractSendRequest> sendMessage = SendMethodUtils.createFromScreen(chatId(), screen);
+        AbstractSendRequest<? extends AbstractSendRequest<?>> sendMessage = SendMethodUtils.createFromScreen(chatId(), screen);
 
         if (screen.getKeyboard() instanceof KeyboardImpl) {
             KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard();
             KeyboardButton[][] keyboard = kk.getKeyboard();
             InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
 
-            if (log.isDebugEnabled()) {
-                log.debug("{}", kk.toFriendlyString());
+            if (log.isTraceEnabled()) {
+                log.trace("{}", kk.toFriendlyString());
             }
 
             if (inlineKeyboard != null && inlineKeyboard.length > 0) {
@@ -45,17 +48,22 @@ public class BotResponseImpl implements BotResponse {
             } else if (keyboard != null && keyboard.length > 0) {
                 sendMessage = sendMessage.replyMarkup(new ReplyKeyboardMarkup(keyboard));
             } else {
-                log.debug("No keyboard");
+                log.trace("No keyboard");
             }
         }
 
         final SendResponse sendResponse = telegramBot.execute(sendMessage);
         SendMethodUtils.processResponse(screen, sendResponse);
+
+        log.debug("Response message = {}", sendResponse.message().messageId());
     }
 
     @Override
     public void sendFile(String filename, byte[] data) {
-        telegramBot.execute(new SendDocument(chatId(), data).fileName(filename));
+        Message message = telegramBot.execute(new SendDocument((long) chatId(), data)
+                .fileName(filename)
+        ).message();
+        log.debug("Send file message = {}", message.messageId());
     }
 
     @Override
@@ -63,31 +71,36 @@ public class BotResponseImpl implements BotResponse {
     public void editMessage(String text) {
         telegramBot.execute(new EditMessageText(chatId(), messageId(), text)
                 .parseMode(ParseMode.HTML)
-                .disableWebPagePreview(true));
+                .linkPreviewOptions(new LinkPreviewOptions().isDisabled(true)));
     }
 
     @Override
     public void edit(Screen screen) {
         EditMessageText editMessage = new EditMessageText(chatId(), messageId(), screen.getText())
                 .parseMode(screen.getScreenProperties().isParseModeHtml() ? ParseMode.HTML : ParseMode.MarkdownV2)
-                .disableWebPagePreview(screen.getScreenProperties().isDisableWebPagePreview());
+                .linkPreviewOptions(new LinkPreviewOptions().isDisabled(screen.getScreenProperties().isDisableWebPagePreview()));
 
         if (screen.getKeyboard() instanceof KeyboardImpl) {
             KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard();
             InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
 
-            if (log.isDebugEnabled()) {
-                log.debug("{}", kk.toFriendlyString());
+            if (log.isTraceEnabled()) {
+                log.trace("{}", kk.toFriendlyString());
             }
 
             if (inlineKeyboard != null && inlineKeyboard.length > 0) {
                 editMessage = editMessage.replyMarkup(new InlineKeyboardMarkup(inlineKeyboard));
             } else {
-                log.debug("No keyboard");
+                log.trace("No keyboard");
             }
         }
 
-        telegramBot.execute(editMessage);
+        final BaseResponse response = telegramBot.execute(editMessage);
+        if (response.isOk()) {
+            log.debug("Response ok, edit message = {}", messageId());
+        } else {
+            log.debug("Response error code {}", response.errorCode());
+        }
     }
 
     @Override
@@ -97,14 +110,14 @@ public class BotResponseImpl implements BotResponse {
 
     private Long chatId() {
         if (update.callbackQuery() != null) {
-            return update.callbackQuery().message().chat().id();
+            return update.callbackQuery().maybeInaccessibleMessage().chat().id();
         }
         return update.message().chat().id();
     }
 
     private Integer messageId() {
         if (update.callbackQuery() != null) {
-            return update.callbackQuery().message().messageId();
+            return update.callbackQuery().maybeInaccessibleMessage().messageId();
         }
         return update.message().messageId();
     }

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

@@ -1,6 +1,6 @@
 package ru.penkrat.stbf.impl.pengrad;
 
-import com.google.gson.internal.reflect.ReflectionAccessor;
+import com.google.gson.internal.reflect.ReflectionHelper;
 import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
 import com.pengrad.telegrambot.model.request.KeyboardButton;
 import lombok.Value;
@@ -15,11 +15,11 @@ import java.util.stream.Stream;
 @Value
 class KeyboardImpl implements Keyboard {
 
-    private KeyboardButton[][] keyboard;
+    KeyboardButton[][] keyboard;
 
-    private InlineKeyboardButton[][] inlineKeyboard;
+    InlineKeyboardButton[][] inlineKeyboard;
 
-    private Map<Object, String> text = new HashMap<>();
+    Map<Object, String> text = new HashMap<>();
 
     @Override
     public String toString() {
@@ -58,7 +58,7 @@ class KeyboardImpl implements Keyboard {
         return text.computeIfAbsent(btn, o -> {
             try {
                 Field text = btn.getClass().getDeclaredField("text");
-                ReflectionAccessor.getInstance().makeAccessible(text);
+                ReflectionHelper.makeAccessible(text);
                 return String.valueOf(text.get(btn));
             } catch (NoSuchFieldException | IllegalAccessException e) {
                 return "*error*";

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

@@ -118,9 +118,14 @@ public class PengradKeyboardBuilder implements KeyboardBuilder {
 
     private void put(Action action) {
         if (action.isInline()) {
-            put(new InlineKeyboardButton(action.getText())
-                    .callbackData(action.getCallbackData())
-                    .url(action.getUrl()));
+            InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton(action.getText());
+            if (action.getCallbackData() != null) {
+                inlineKeyboardButton.setCallbackData(action.getCallbackData());
+            }
+            if (action.getUrl() != null) {
+                inlineKeyboardButton.url(action.getUrl());
+            }
+            put(inlineKeyboardButton);
         } else {
             put(new KeyboardButton(action.getText())
                     .requestContact(action.isRequestContact())

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

@@ -3,7 +3,6 @@ package ru.penkrat.stbf.impl.pengrad;
 import com.pengrad.telegrambot.TelegramBot;
 import com.pengrad.telegrambot.UpdatesListener;
 import com.pengrad.telegrambot.model.Update;
-
 import lombok.extern.slf4j.Slf4j;
 import ru.penkrat.stbf.api.CommandChain;
 
@@ -15,6 +14,14 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
 		this.setUpdatesListener(updates -> {
 			for (Update update : updates) {
 				try {
+					final Long chatId = findChatId(update);
+					if (chatId == null) {
+						log.warn("Chat not found, Update [id={}]", update.updateId());
+						log.info("Details: {}", update);
+						continue;
+					}
+					log.debug("New message in chat {}", chatId);
+
 					commandChain.processCommand(
 							new BotRequestImpl(update),
 							new BotResponseImpl(update, this));
@@ -27,9 +34,20 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
 	}
 
 	@Override
-	public void close() throws Exception {
+	public void close() {
 		removeGetUpdatesListener();
 		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;
+	}
+
 }

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

@@ -1,5 +1,6 @@
 package ru.penkrat.stbf.impl.pengrad;
 
+import com.pengrad.telegrambot.model.LinkPreviewOptions;
 import com.pengrad.telegrambot.model.Message;
 import com.pengrad.telegrambot.model.request.ParseMode;
 import com.pengrad.telegrambot.request.AbstractSendRequest;
@@ -23,7 +24,8 @@ import java.util.function.Consumer;
 @UtilityClass
 class SendMethodUtils {
 
-    public AbstractSendRequest<? extends AbstractSendRequest> createFromScreen(@NonNull Object chatId, @NonNull Screen screen) {
+    public AbstractSendRequest<? extends AbstractSendRequest<?>> createFromScreen(@NonNull Object chatIdObj, @NonNull Screen screen) {
+       long chatId = chatIdObj instanceof Long ? (Long) chatIdObj : 0;
         if (isMedia(screen)) {
             final Media media = screen.getMedia();
             switch (media.getMediaType()) {
@@ -77,7 +79,7 @@ class SendMethodUtils {
 
         return new SendMessage(chatId, screen.getText().trim())
                 .parseMode(screen.getScreenProperties().isParseModeHtml() ? ParseMode.HTML : ParseMode.MarkdownV2)
-                .disableWebPagePreview(screen.getScreenProperties().isDisableWebPagePreview())
+                .linkPreviewOptions(new LinkPreviewOptions().isDisabled(screen.getScreenProperties().isDisableWebPagePreview()))
                 .disableNotification(screen.getScreenProperties().isDisableNotification());
     }
 
@@ -102,7 +104,7 @@ class SendMethodUtils {
     }
 
     @NotNull
-    private SendVoice createSendVoice(@NotNull Object chatId, Media media) {
+    private SendVoice createSendVoice(long chatId, Media media) {
         if (media.getData() != null) {
             return new SendVoice(chatId, media.getData().get());
         }
@@ -113,7 +115,7 @@ class SendMethodUtils {
     }
 
     @NotNull
-    private SendVideo createSendVideo(@NotNull Object chatId, Media media) {
+    private SendVideo createSendVideo(long chatId, Media media) {
         if (media.getData() != null) {
             return new SendVideo(chatId, media.getData().get());
         }
@@ -124,7 +126,7 @@ class SendMethodUtils {
     }
 
     @NotNull
-    private SendAudio createSendAudio(@NotNull Object chatId, Media media) {
+    private SendAudio createSendAudio(long chatId, Media media) {
         if (media.getData() != null) {
             return new SendAudio(chatId, media.getData().get());
         }
@@ -135,7 +137,7 @@ class SendMethodUtils {
     }
 
     @NotNull
-    private SendAnimation createSendAnimation(@NotNull Object chatId, Media media) {
+    private SendAnimation createSendAnimation(long chatId, Media media) {
         if (media.getData() != null) {
             return new SendAnimation(chatId, media.getData().get());
         }
@@ -146,7 +148,7 @@ class SendMethodUtils {
     }
 
     @NotNull
-    private SendPhoto createSendPhoto(@NotNull Object chatId, Media media) {
+    private SendPhoto createSendPhoto(long chatId, Media media) {
         if (media.getData() != null) {
             return new SendPhoto(chatId, media.getData().get());
         }

stbf-rubenlagus/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.3</version>
 	</parent>
 
 	<artifactId>stbf-rubenlagus</artifactId>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.telegram</groupId>

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

@@ -1,17 +1,17 @@
 package ru.penkrat.stbf.impl.rubenlagus;
 
-import static lombok.AccessLevel.PROTECTED;
-
-import java.util.Optional;
-
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
 import org.telegram.telegrambots.meta.api.objects.Contact;
 import org.telegram.telegrambots.meta.api.objects.Message;
 import org.telegram.telegrambots.meta.api.objects.Update;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotSession;
+
+import java.util.Optional;
+
+import static lombok.AccessLevel.PROTECTED;
 
 @RequiredArgsConstructor
 class BotRequestImpl implements BotRequest {
@@ -52,7 +52,12 @@ class BotRequestImpl implements BotRequest {
 
 	@Override
 	public Long getChatId() {
-		return update.getMessage().getChatId();
+		return Utils.getChatId(update);
+	}
+
+	@Override
+	public BotSession getSession() {
+		throw new UnsupportedOperationException("Session is not supported");
 	}
 
 }

stbf-rubenlagus/src/main/java/ru/penkrat/stbf/impl/rubenlagus/RubenlagusTelegramBot.java

@@ -1,12 +1,11 @@
 package ru.penkrat.stbf.impl.rubenlagus;
 
+import lombok.extern.slf4j.Slf4j;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
 import org.telegram.telegrambots.meta.TelegramBotsApi;
 import org.telegram.telegrambots.meta.api.objects.Update;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
 import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
-
-import lombok.extern.slf4j.Slf4j;
 import ru.penkrat.stbf.api.BotCommandChain;
 
 @Slf4j

stbf-rubenlagus/src/main/java/ru/penkrat/stbf/impl/rubenlagus/Utils.java

@@ -0,0 +1,21 @@
+package ru.penkrat.stbf.impl.rubenlagus;
+
+import lombok.experimental.UtilityClass;
+import org.telegram.telegrambots.meta.api.objects.Update;
+
+@UtilityClass
+class Utils {
+
+    Long getChatId(Update update) {
+        if (update.getMessage() != null) {
+            return update.getMessage().getChatId();
+        }
+
+        if (update.getCallbackQuery() != null) {
+            update.getCallbackQuery().getMessage().getChatId();
+        }
+
+        throw new IllegalStateException("Can't extract chatId from 'Update'");
+    }
+
+}

stbf-templates/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.3</version>
 	</parent>
 	<artifactId>stbf-templates</artifactId>
 	<properties>

stbf-templates/src/main/java/ru/penkrat/stbf/templates/xml/FlowScreenResolverDelegate.java

@@ -83,7 +83,7 @@ class FlowScreenResolverDelegate implements ScreenResolver {
         if (context instanceof KeyboardProvider) {
             final Keyboard keyboard = ((KeyboardProvider) context).getKeyboard();
             if (keyboard == null) {
-                log.warn("Method 'getKeyboard' returns NULL value!", wrapper.getFactoryMethod());
+                log.warn("Method 'getKeyboard' {} returns NULL value!", wrapper.getFactoryMethod());
             }
             return keyboard;
         }
@@ -106,12 +106,12 @@ class FlowScreenResolverDelegate implements ScreenResolver {
             for (ButtonsRow row : wrapper.getRows()) {
                 List<Action> buttons = row.getButtons().stream()
                         .filter(btn -> checkIfCondition(context, btn.getIfCondition()))
-                        .map(btn -> getAction(btn))
+                        .map(this::getAction)
                         .collect(Collectors.toList());
 
                 log.info("Keyboard: {}", buttons);
 
-                builder.row(buttons.toArray(new Action[buttons.size()]));
+                builder.row(buttons.toArray(new Action[0]));
             }
 
             keyboard = builder.build();

stbf-test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.3</version>
 	</parent>
 
 	<artifactId>stbf-test</artifactId>
@@ -14,12 +14,12 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-common</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

stbf-test/src/main/java/ru/penkrat/stbf/test/BotRequestImpl.java

@@ -6,6 +6,7 @@ import java.util.Random;
 import lombok.Builder;
 import lombok.Getter;
 import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotSession;
 
 @Builder
 class BotRequestImpl implements BotRequest {
@@ -14,6 +15,7 @@ class BotRequestImpl implements BotRequest {
 	private String phoneNumber;
 	private String callbackData;
 	private String callbackMessageText;
+	private BotSession session;
 
 	@Getter
 	@Builder.Default
@@ -39,4 +41,9 @@ class BotRequestImpl implements BotRequest {
 		return Optional.ofNullable(callbackMessageText);
 	}
 
+	@Override
+	public BotSession getSession() {
+		return session;
+	}
+
 }