ruslan/stbf
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

change log level
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Ruslan Penkrat
2021-09-23 15:17:24 +03:00
parent c62de38f17
commit 56a4d4957b
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ import com.pengrad.telegrambot.request.AbstractSendRequest;
import com.pengrad.telegrambot.request.DeleteMessage; import com.pengrad.telegrambot.request.DeleteMessage;
import com.pengrad.telegrambot.request.EditMessageText; import com.pengrad.telegrambot.request.EditMessageText;
import com.pengrad.telegrambot.request.SendDocument; import com.pengrad.telegrambot.request.SendDocument;
import com.pengrad.telegrambot.response.BaseResponse;
import com.pengrad.telegrambot.response.SendResponse; import com.pengrad.telegrambot.response.SendResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -27,7 +28,7 @@ public class BotResponseImpl implements BotResponse {
@Override @Override
public void send(Screen screen) { 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);
@@ -36,8 +37,8 @@ public class BotResponseImpl implements BotResponse {
KeyboardButton[][] keyboard = kk.getKeyboard(); KeyboardButton[][] keyboard = kk.getKeyboard();
InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard(); InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
if (log.isDebugEnabled()) { if (log.isTraceEnabled()) {
log.debug("{}", kk.toFriendlyString()); log.trace("{}", kk.toFriendlyString());
} }
if (inlineKeyboard != null && inlineKeyboard.length > 0) { if (inlineKeyboard != null && inlineKeyboard.length > 0) {
@@ -45,12 +46,14 @@ public class BotResponseImpl implements BotResponse {
} else if (keyboard != null && keyboard.length > 0) { } else if (keyboard != null && keyboard.length > 0) {
sendMessage = sendMessage.replyMarkup(new ReplyKeyboardMarkup(keyboard)); sendMessage = sendMessage.replyMarkup(new ReplyKeyboardMarkup(keyboard));
} else { } else {
log.debug("No keyboard"); log.trace("No keyboard");
} }
} }
final SendResponse sendResponse = telegramBot.execute(sendMessage); final SendResponse sendResponse = telegramBot.execute(sendMessage);
SendMethodUtils.processResponse(screen, sendResponse); SendMethodUtils.processResponse(screen, sendResponse);
log.debug("Response message = {}", sendResponse.message().messageId());
} }
@Override @Override
@@ -76,18 +79,23 @@ public class BotResponseImpl implements BotResponse {
KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard(); KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard();
InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard(); InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
if (log.isDebugEnabled()) { if (log.isTraceEnabled()) {
log.debug("{}", kk.toFriendlyString()); log.trace("{}", kk.toFriendlyString());
} }
if (inlineKeyboard != null && inlineKeyboard.length > 0) { if (inlineKeyboard != null && inlineKeyboard.length > 0) {
editMessage = editMessage.replyMarkup(new InlineKeyboardMarkup(inlineKeyboard)); editMessage = editMessage.replyMarkup(new InlineKeyboardMarkup(inlineKeyboard));
} else { } 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 @Override

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

@@ -29,6 +29,8 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
.map(CallbackQuery::message) .map(CallbackQuery::message)
.orElseGet(() -> update.message()).chat().id(); .orElseGet(() -> update.message()).chat().id();
log.debug("New message in chat {}", chatId);
commandChain.processCommand( commandChain.processCommand(
new BotRequestImpl(update, sessionProvider.get(chatId)), new BotRequestImpl(update, sessionProvider.get(chatId)),
new BotResponseImpl(update, this)); new BotResponseImpl(update, this));