Animated stickers validation - improve readability

src/main/java/com/github/stickerifier/stickerify/media/MediaConstraints.java

@@ -16,8 +16,8 @@ public final class MediaConstraints {
 	static final String MATROSKA_FORMAT = "matroska";
 	static final long MAX_VIDEO_FILE_SIZE = 256_000L;
 	static final long MAX_ANIMATION_FILE_SIZE = 64_000L;
-	static final int ANIMATION_FRAMERATE = 60;
-	static final int MAX_ANIMATION_DURATION_SECONDS = 180;
+	static final int MAX_ANIMATION_FRAMERATE = 60;
+	static final float MAX_ANIMATION_DURATION_SECONDS = 3F;
 
 	private MediaConstraints() {
 		throw new UnsupportedOperationException();

src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java

@@ -1,9 +1,9 @@
 package com.github.stickerifier.stickerify.media;
 
-import static com.github.stickerifier.stickerify.media.MediaConstraints.ANIMATION_FRAMERATE;
 import static com.github.stickerifier.stickerify.media.MediaConstraints.MATROSKA_FORMAT;
 import static com.github.stickerifier.stickerify.media.MediaConstraints.MAX_ANIMATION_DURATION_SECONDS;
 import static com.github.stickerifier.stickerify.media.MediaConstraints.MAX_ANIMATION_FILE_SIZE;
+import static com.github.stickerifier.stickerify.media.MediaConstraints.MAX_ANIMATION_FRAMERATE;
 import static com.github.stickerifier.stickerify.media.MediaConstraints.MAX_SIZE;
 import static com.github.stickerifier.stickerify.media.MediaConstraints.MAX_VIDEO_DURATION_MILLIS;
 import static com.github.stickerifier.stickerify.media.MediaConstraints.MAX_VIDEO_FILE_SIZE;
@@ -133,13 +133,11 @@ private static boolean isAnimatedStickerCompliant(File file, String mimeType) th
 		return false;
 	}
 
-	private record AnimationDetails(
-			@SerializedName("w") int width,
-			@SerializedName("h") int height,
-			@SerializedName("fr") int frameRate,
-			@SerializedName("ip") int start,
-			@SerializedName("op") int end
-	) {}
+	private record AnimationDetails(@SerializedName("w") int width, @SerializedName("h") int height, @SerializedName("fr") int frameRate, @SerializedName("ip") float start, @SerializedName("op") float end) {
+		private float duration() {
+			return (end() - start()) / frameRate();
+		}
+	}
 
 	/**
 	 * Checks if passed-in animation is already compliant with Telegram's requisites.
@@ -149,9 +147,10 @@ private record AnimationDetails(
 	 * @return {@code true} if the animation is compliant
 	 */
 	private static boolean isAnimationCompliant(AnimationDetails animation) {
-		return animation != null && animation.frameRate() <= ANIMATION_FRAMERATE
-				&& animation.end() - animation.start() <= MAX_ANIMATION_DURATION_SECONDS
-				&& animation.width() == MAX_SIZE && animation.width() == animation.height();
+		return animation != null
+				&& animation.frameRate() <= MAX_ANIMATION_FRAMERATE
+				&& animation.duration() <= MAX_ANIMATION_DURATION_SECONDS
+				&& animation.width() == MAX_SIZE && animation.height() == MAX_SIZE;
 	}
 
 	/**

src/test/java/com/github/stickerifier/stickerify/bot/MockResponses.java

@@ -103,7 +103,7 @@ public final class MockResponses {
 							id: 1
 						},
 						sticker: {
-							file_id: "animated_sticker.gz",
+							file_id: "animated_sticker.tgs",
 							file_size: 64000
 						}
 					}

src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java

@@ -111,8 +111,8 @@ void fileTooBig() throws Exception {
 	@Test
 	void fileAlreadyValid() throws Exception {
 		server.enqueue(MockResponses.ANIMATED_STICKER);
-		server.enqueue(MockResponses.fileInfo("animated_sticker.gz"));
-		server.enqueue(MockResponses.fileDownload(resources.loadResource("animated_sticker.gz")));
+		server.enqueue(MockResponses.fileInfo("animated_sticker.tgs"));
+		server.enqueue(MockResponses.fileDownload(resources.loadResource("animated_sticker.tgs")));
 
 		startBot();
 
@@ -121,10 +121,10 @@ void fileAlreadyValid() throws Exception {
 
 		var getFile = server.takeRequest();
 		assertEquals("/api/token/getFile", getFile.getPath());
-		assertEquals("file_id=animated_sticker.gz", getFile.getBody().readUtf8());
+		assertEquals("file_id=animated_sticker.tgs", getFile.getBody().readUtf8());
 
 		var download = server.takeRequest();
-		assertEquals("/files/token/animated_sticker.gz", download.getPath());
+		assertEquals("/files/token/animated_sticker.tgs", download.getPath());
 
 		var sendMessage = server.takeRequest();
 		assertEquals("/api/token/sendMessage", sendMessage.getPath());

src/test/java/com/github/stickerifier/stickerify/media/MediaHelperTest.java

@@ -175,7 +175,7 @@ void noVideoConversionNeeded() throws Exception {
 
 	@Test
 	void noAnimatedStickerConversionNeeded() throws Exception {
-		var animatedSticker = resources.loadResource("animated_sticker.gz");
+		var animatedSticker = resources.loadResource("animated_sticker.tgs");
 		var result = MediaHelper.convert(animatedSticker);
 
 		assertThat(result, is(nullValue()));