From 5af88fcc05e9cd0da84462c4bfd1b31b2a60f313 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Aug 2025 13:37:06 +0000 Subject: [PATCH 1/2] Update dependency com.github.pengrad:java-telegram-bot-api to v9 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1ca02ea1..80d94266 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ scrimage-core = { module = "com.sksamuel.scrimage:scrimage-core", version.ref = scrimage-formats-extra = { module = "com.sksamuel.scrimage:scrimage-formats-extra", version.ref = "scrimage" } scrimage-webp = { module = "com.sksamuel.scrimage:scrimage-webp", version.ref = "scrimage" } slf4j-api = "org.slf4j:slf4j-api:2.0.17" -telegram-bot-api = "com.github.pengrad:java-telegram-bot-api:8.3.0" +telegram-bot-api = "com.github.pengrad:java-telegram-bot-api:9.2.0" tika = "org.apache.tika:tika-core:3.2.2" [plugins] From d28c5180987db3a04396bf3e3a9137a4f9695d3b Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 23 Aug 2025 18:27:10 +0200 Subject: [PATCH 2/2] Unbox chatId value to prevent using deprecated methods in telegram bot library, add notnull annotation --- .../com/github/stickerifier/stickerify/media/MediaHelper.java | 2 ++ .../stickerify/telegram/model/TelegramRequest.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java b/src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java index 1bcd38eb..9b87c8fc 100644 --- a/src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java +++ b/src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java @@ -25,6 +25,7 @@ import com.sksamuel.scrimage.ImmutableImage; import com.sksamuel.scrimage.webp.WebpWriter; import org.apache.tika.Tika; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ws.schild.jave.EncoderException; @@ -152,6 +153,7 @@ private float duration() { return (end - start) / frameRate; } + @NotNull @Override public String toString() { return "animated sticker [" + diff --git a/src/main/java/com/github/stickerifier/stickerify/telegram/model/TelegramRequest.java b/src/main/java/com/github/stickerifier/stickerify/telegram/model/TelegramRequest.java index 84805cc8..f1e5f86c 100644 --- a/src/main/java/com/github/stickerifier/stickerify/telegram/model/TelegramRequest.java +++ b/src/main/java/com/github/stickerifier/stickerify/telegram/model/TelegramRequest.java @@ -12,6 +12,7 @@ import com.pengrad.telegrambot.model.Sticker; import com.pengrad.telegrambot.model.Video; import com.pengrad.telegrambot.model.VideoNote; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.Objects; @@ -59,7 +60,7 @@ private TelegramFile getBestPhoto(PhotoSize[] photos) { .orElse(TelegramFile.TOO_LARGE); } - public Long getChatId() { + public long getChatId() { return message.chat().id(); } @@ -95,6 +96,7 @@ public Answer getAnswerMessage() { }; } + @NotNull @Override public String toString() { var file = Optional.ofNullable(getFile()).map(TelegramFile::id).orElse(null);