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.
This commit is contained in:
@@ -44,18 +44,16 @@ 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
|
||||
|
||||
@@ -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)
|
||||
.map(Update::callbackQuery)
|
||||
.map(CallbackQuery::message)
|
||||
.orElseGet(() -> update.message()).chat().id();
|
||||
|
||||
final Long chatId = findChatId(update);
|
||||
if (chatId == null) {
|
||||
log.warn("Chat not found, Update [id={}]", update.updateId());
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user