Change TelegramFile to work with nullable size to comply with recent Telegram objects

Author: rob93c

src/main/java/com/github/stickerifier/stickerify/telegram/model/TelegramFile.java

@@ -1,18 +1,19 @@
 package com.github.stickerifier.stickerify.telegram.model;
 
-public record TelegramFile(String id, long size) {
+import org.jspecify.annotations.Nullable;
+
+public record TelegramFile(String id, @Nullable Long size) {
 	private static final String INVALID_ID = "";
-	private static final long INVALID_SIZE = -1L;
 	private static final long MAX_DOWNLOADABLE_FILE_SIZE_IN_BYTES = 20_000_000L;
 
-	public static final TelegramFile NOT_SUPPORTED = new TelegramFile(INVALID_ID);
+	public static final TelegramFile NOT_SUPPORTED = new TelegramFile(INVALID_ID, null);
 	public static final TelegramFile TOO_LARGE = new TelegramFile(INVALID_ID, MAX_DOWNLOADABLE_FILE_SIZE_IN_BYTES + 1);
 
-	public TelegramFile(String id) {
-		this(id, INVALID_SIZE);
+	public boolean canBeDownloaded() {
+		return size != null && size <= MAX_DOWNLOADABLE_FILE_SIZE_IN_BYTES;
 	}
 
-	public boolean canBeDownloaded() {
-		return size <= MAX_DOWNLOADABLE_FILE_SIZE_IN_BYTES;
+	public long sizeValue() {
+		return size == null ? -1L : size;
 	}
 }

src/main/java/com/github/stickerifier/stickerify/telegram/model/TelegramRequest.java

@@ -35,11 +35,11 @@ public record TelegramRequest(Message message) {
 	public @Nullable TelegramFile getFile() {
 		return getMessageMedia()
 				.map(media -> switch (media) {
-					case LivePhoto livePhoto -> getLivePhoto(livePhoto);
+					case LivePhoto livePhoto -> new TelegramFile(livePhoto.fileId(), livePhoto.fileSize());
 					case PhotoSize[] photos when photos.length > 0 -> getBestPhoto(photos);
 					case Document document -> new TelegramFile(document.fileId(), document.fileSize());
 					case Sticker sticker -> new TelegramFile(sticker.fileId(), sticker.fileSize());
-					case Video video -> getVideo(video);
+					case Video video -> new TelegramFile(video.fileId(), video.fileSize());
 					case VideoNote videoNote -> new TelegramFile(videoNote.fileId(), videoNote.fileSize());
 					default -> TelegramFile.NOT_SUPPORTED;
 				})
@@ -54,34 +54,14 @@ private Optional<?> getMessageMedia() {
 				.findFirst();
 	}
 
-	private TelegramFile getLivePhoto(LivePhoto livePhoto) {
-		var id = livePhoto.fileId();
-		var fileSize = livePhoto.fileSize();
-		return getTelegramFile(id, fileSize);
-	}
-
-	private TelegramFile getTelegramFile(String fileId, @Nullable Long size) {
-		if (size == null) {
-			return new TelegramFile(fileId);
-		} else {
-			return new TelegramFile(fileId, size);
-		}
-	}
-
 	private TelegramFile getBestPhoto(PhotoSize[] photos) {
 		return Arrays.stream(photos)
 				.map(photo -> new TelegramFile(photo.fileId(), photo.fileSize()))
 				.filter(TelegramFile::canBeDownloaded)
-				.max(comparing(TelegramFile::size))
+				.max(comparing(TelegramFile::sizeValue))
 				.orElse(TelegramFile.TOO_LARGE);
 	}
 
-	private TelegramFile getVideo(Video video) {
-		var id = video.fileId();
-		var fileSize = video.fileSize();
-		return getTelegramFile(id, fileSize);
-	}
-
 	public long getChatId() {
 		return message.chat().id();
 	}