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

Update Telegram Bot API version and enhance message handling

Browse Source 
- 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.
This commit is contained in:
Ruslan Penkrat
2026-03-28 18:45:17 +03:00
parent 6fc2748779
commit 0e1b44a920
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stbf-pengrad/pom.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>com.github.pengrad</groupId> <groupId>com.github.pengrad</groupId>
<artifactId>java-telegram-bot-api</artifactId> <artifactId>java-telegram-bot-api</artifactId>
<version>7.1.1</version> <version>9.4.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotResponseImpl.java
+8 -3
View File
@@ -1,6 +1,8 @@
package ru.penkrat.stbf.impl.pengrad; package ru.penkrat.stbf.impl.pengrad;
import com.pengrad.telegrambot.TelegramBot; 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.Update;
import com.pengrad.telegrambot.model.request.InlineKeyboardButton; import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup; import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
@@ -58,7 +60,10 @@ public class BotResponseImpl implements BotResponse {
@Override @Override
public void sendFile(String filename, byte[] data) { 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 @Override
@@ -66,14 +71,14 @@ public class BotResponseImpl implements BotResponse {
public void editMessage(String text) { public void editMessage(String text) {
telegramBot.execute(new EditMessageText(chatId(), messageId(), text) telegramBot.execute(new EditMessageText(chatId(), messageId(), text)
.parseMode(ParseMode.HTML) .parseMode(ParseMode.HTML)
.disableWebPagePreview(true)); .linkPreviewOptions(new LinkPreviewOptions().isDisabled(true)));
} }
@Override @Override
public void edit(Screen screen) { public void edit(Screen screen) {
EditMessageText editMessage = new EditMessageText(chatId(), messageId(), screen.getText()) EditMessageText editMessage = new EditMessageText(chatId(), messageId(), screen.getText())
.parseMode(screen.getScreenProperties().isParseModeHtml() ? ParseMode.HTML : ParseMode.MarkdownV2) .parseMode(screen.getScreenProperties().isParseModeHtml() ? ParseMode.HTML : ParseMode.MarkdownV2)
.disableWebPagePreview(screen.getScreenProperties().isDisableWebPagePreview()); .linkPreviewOptions(new LinkPreviewOptions().isDisabled(screen.getScreenProperties().isDisableWebPagePreview()));
if (screen.getKeyboard() instanceof KeyboardImpl) { if (screen.getKeyboard() instanceof KeyboardImpl) {
KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard(); KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard();
stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/SendMethodUtils.java
+15 -7
View File
@@ -1,5 +1,6 @@
package ru.penkrat.stbf.impl.pengrad; package ru.penkrat.stbf.impl.pengrad;
import com.pengrad.telegrambot.model.LinkPreviewOptions;
import com.pengrad.telegrambot.model.Message; import com.pengrad.telegrambot.model.Message;
import com.pengrad.telegrambot.model.request.ParseMode; import com.pengrad.telegrambot.model.request.ParseMode;
import com.pengrad.telegrambot.request.AbstractSendRequest; import com.pengrad.telegrambot.request.AbstractSendRequest;
@@ -23,7 +24,8 @@ import java.util.function.Consumer;
@UtilityClass @UtilityClass
class SendMethodUtils { 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)) { if (isMedia(screen)) {
final Media media = screen.getMedia(); final Media media = screen.getMedia();
switch (media.getMediaType()) { switch (media.getMediaType()) {
@@ -77,7 +79,8 @@ class SendMethodUtils {
return new SendMessage(chatId, screen.getText().trim()) return new SendMessage(chatId, screen.getText().trim())
.parseMode(screen.getScreenProperties().isParseModeHtml() ? ParseMode.HTML : ParseMode.MarkdownV2) .parseMode(screen.getScreenProperties().isParseModeHtml() ? ParseMode.HTML : ParseMode.MarkdownV2)
.disableWebPagePreview(screen.getScreenProperties().isDisableWebPagePreview()) .linkPreviewOptions(new LinkPreviewOptions().isDisabled(screen.getScreenProperties().isDisableWebPagePreview()))
// .disableWebPagePreview(screen.getScreenProperties().isDisableWebPagePreview())
.disableNotification(screen.getScreenProperties().isDisableNotification()); .disableNotification(screen.getScreenProperties().isDisableNotification());
} }
@@ -102,7 +105,8 @@ class SendMethodUtils {
} }
@NotNull @NotNull
private SendVoice createSendVoice(@NotNull Object chatId, Media media) { private SendVoice createSendVoice(@NotNull Object chatIdObj, Media media) {
long chatId = chatIdObj instanceof Long ? (Long) chatIdObj : 0;
if (media.getData() != null) { if (media.getData() != null) {
return new SendVoice(chatId, media.getData().get()); return new SendVoice(chatId, media.getData().get());
} }
@@ -113,7 +117,8 @@ class SendMethodUtils {
} }
@NotNull @NotNull
private SendVideo createSendVideo(@NotNull Object chatId, Media media) { private SendVideo createSendVideo(@NotNull Object chatIdObj, Media media) {
long chatId = chatIdObj instanceof Long ? (Long) chatIdObj : 0;
if (media.getData() != null) { if (media.getData() != null) {
return new SendVideo(chatId, media.getData().get()); return new SendVideo(chatId, media.getData().get());
} }
@@ -124,7 +129,8 @@ class SendMethodUtils {
} }
@NotNull @NotNull
private SendAudio createSendAudio(@NotNull Object chatId, Media media) { private SendAudio createSendAudio(@NotNull Object chatIdObj, Media media) {
long chatId = chatIdObj instanceof Long ? (Long) chatIdObj : 0;
if (media.getData() != null) { if (media.getData() != null) {
return new SendAudio(chatId, media.getData().get()); return new SendAudio(chatId, media.getData().get());
} }
@@ -135,7 +141,8 @@ class SendMethodUtils {
} }
@NotNull @NotNull
private SendAnimation createSendAnimation(@NotNull Object chatId, Media media) { private SendAnimation createSendAnimation(@NotNull Object chatIdObj, Media media) {
long chatId = chatIdObj instanceof Long ? (Long) chatIdObj : 0;
if (media.getData() != null) { if (media.getData() != null) {
return new SendAnimation(chatId, media.getData().get()); return new SendAnimation(chatId, media.getData().get());
} }
@@ -146,7 +153,8 @@ class SendMethodUtils {
} }
@NotNull @NotNull
private SendPhoto createSendPhoto(@NotNull Object chatId, Media media) { private SendPhoto createSendPhoto(@NotNull Object chatIdObj, Media media) {
long chatId = chatIdObj instanceof Long ? (Long) chatIdObj : 0;
if (media.getData() != null) { if (media.getData() != null) {
return new SendPhoto(chatId, media.getData().get()); return new SendPhoto(chatId, media.getData().get());
} }