Remove explicit corrupted file handling

Author: rob93c

src/main/java/com/github/stickerifier/stickerify/bot/Stickerify.java

@@ -5,7 +5,6 @@
 import static com.github.stickerifier.stickerify.logger.StructuredLogger.FILE_PATH_LOG_KEY;
 import static com.github.stickerifier.stickerify.logger.StructuredLogger.ORIGINAL_REQUEST_LOG_KEY;
 import static com.github.stickerifier.stickerify.logger.StructuredLogger.REQUEST_DETAILS_VALUE;
-import static com.github.stickerifier.stickerify.telegram.Answer.CORRUPTED;
 import static com.github.stickerifier.stickerify.telegram.Answer.ERROR;
 import static com.github.stickerifier.stickerify.telegram.Answer.FILE_ALREADY_VALID;
 import static com.github.stickerifier.stickerify.telegram.Answer.FILE_READY;
@@ -14,7 +13,6 @@
 import static java.util.HashSet.newHashSet;
 import static java.util.concurrent.Executors.newThreadPerTaskExecutor;
 
-import com.github.stickerifier.stickerify.exception.CorruptedFileException;
 import com.github.stickerifier.stickerify.exception.FileOperationException;
 import com.github.stickerifier.stickerify.exception.TelegramApiException;
 import com.github.stickerifier.stickerify.logger.StructuredLogger;
@@ -184,13 +182,8 @@ private void processFailure(TelegramRequest request, Exception e) {
 			}
 		}
 
-		if (e instanceof CorruptedFileException) {
-			LOGGER.at(Level.WARN).log("Unable to reply to the request: the file is corrupted");
-			answerText(CORRUPTED, request);
-		} else {
-			LOGGER.at(Level.ERROR).setCause(e).log("Unable to process file");
-			answerText(ERROR, request);
-		}
+		LOGGER.at(Level.ERROR).setCause(e).log("Unable to process file");
+		answerText(ERROR, request);
 	}
 
 	private boolean processTelegramFailure(TelegramApiException e, boolean logUnmatchedFailure) {

src/main/java/com/github/stickerifier/stickerify/exception/CorruptedFileException.java

@@ -16,7 +16,6 @@
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.github.stickerifier.stickerify.exception.CorruptedFileException;
 import com.github.stickerifier.stickerify.exception.FileOperationException;
 import com.github.stickerifier.stickerify.exception.MediaException;
 import com.github.stickerifier.stickerify.exception.ProcessException;
@@ -146,10 +145,10 @@ private static boolean isSupportedVideo(String mimeType) {
 	 *
 	 * @param file the file to check
 	 * @return {@code true} if the file is compliant
-	 * @throws FileOperationException if an error occurred retrieving the size of the file
+	 * @throws MediaException if an error occurred retrieving video information
 	 * @throws InterruptedException if the current thread is interrupted while retrieving file info
 	 */
-	private static boolean isVideoCompliant(File file) throws FileOperationException, CorruptedFileException, InterruptedException {
+	private static boolean isVideoCompliant(File file) throws MediaException, InterruptedException {
 		var mediaInfo = retrieveMultimediaInfo(file);
 
 		var formatInfo = mediaInfo.format();
@@ -180,10 +179,10 @@ private static boolean isVideoCompliant(File file) throws FileOperationException
 	 *
 	 * @param file the video to check
 	 * @return passed-in video's multimedia information
-	 * @throws CorruptedFileException if an error occurred retrieving file information
+	 * @throws MediaException if an error occurred retrieving file information
 	 * @throws InterruptedException if the current thread is interrupted while retrieving file info
 	 */
-	static MultimediaInfo retrieveMultimediaInfo(File file) throws CorruptedFileException, InterruptedException {
+	static MultimediaInfo retrieveMultimediaInfo(File file) throws MediaException, InterruptedException {
 		var command = new String[] {
 				"ffprobe",
 				"-hide_banner",
@@ -199,7 +198,7 @@ static MultimediaInfo retrieveMultimediaInfo(File file) throws CorruptedFileExce
 
 			return GSON.fromJson(output, MultimediaInfo.class);
 		} catch (ProcessException | JsonSyntaxException e) {
-			throw new CorruptedFileException("The file could not be processed successfully", e);
+			throw new MediaException("Unable to retrieve media information", e);
 		}
 	}
 
@@ -356,10 +355,10 @@ private static boolean isAnimatedWebp(File file) {
 	 * @param image the image to check
 	 * @param mimeType the MIME type of the file
 	 * @return {@code true} if the file is compliant
-	 * @throws CorruptedFileException if an error occurred retrieving image information
+	 * @throws MediaException if an error occurred retrieving image information
 	 * @throws InterruptedException if the current thread is interrupted while retrieving file info
 	 */
-	private static boolean isImageCompliant(File image, String mimeType) throws CorruptedFileException, InterruptedException {
+	private static boolean isImageCompliant(File image, String mimeType) throws MediaException, InterruptedException {
 		var mediaInfo = retrieveMultimediaInfo(image);
 
 		var formatInfo = mediaInfo.format();

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

@@ -35,11 +35,6 @@ public enum Answer {
 	ERROR("""
 			The file conversion was unsuccessful: only images, gifs, standard and video stickers are supported\\.
 
-			If you think it should have worked, please report the issue on [Github](https://github.com/Stickerifier/Stickerify/issues/new/choose)\\.
-			""", true),
-	CORRUPTED("""
-			The conversion was unsuccessful: the media might be corrupted and it cannot be processed\\.
-
 			If you think it should have worked, please report the issue on [Github](https://github.com/Stickerifier/Stickerify/issues/new/choose)\\.
 			""", true),
 	PRIVACY_POLICY("""

src/main/java/com/github/stickerifier/stickerify/telegram/Answer.java

@@ -295,30 +295,6 @@ public final class MockResponses {
 			}
 			""").build();
 
-	static final MockResponse CORRUPTED_FILE = new MockResponse.Builder().body("""
-			{
-				ok: true,
-				result: [
-					{
-						update_id: 1,
-						message: {
-							message_id: 1,
-							from: {
-								id: 123456
-							},
-							chat: {
-								id: 1
-							},
-							video: {
-								file_id: "corrupted.mp4",
-								file_size: 200000
-							}
-						}
-					}
-				]
-			}
-			""").build();
-
 	static MockResponse fileInfo(String fileName) {
 		return new MockResponse.Builder().body("""
 				{

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

@@ -290,28 +290,4 @@ void documentNotSupported() throws Exception {
 			assertResponseContainsMessage(sendMessage, Answer.ERROR);
 		}
 	}
-
-	@Test
-	void corruptedVideo() throws Exception {
-		server.enqueue(MockResponses.CORRUPTED_FILE);
-		server.enqueue(MockResponses.fileInfo("corrupted.mp4"));
-		server.enqueue(MockResponses.fileDownload("corrupted.mp4"));
-
-		try (var _ = runBot()) {
-			var getUpdates = server.takeRequest();
-			assertEquals("/api/token/getUpdates", getUpdates.getTarget());
-
-			var getFile = server.takeRequest();
-			assertEquals("/api/token/getFile", getFile.getTarget());
-			assertNotNull(getFile.getBody());
-			assertEquals("file_id=corrupted.mp4", getFile.getBody().utf8());
-
-			var download = server.takeRequest();
-			assertEquals("/files/token/corrupted.mp4", download.getTarget());
-
-			var sendMessage = server.takeRequest();
-			assertEquals("/api/token/sendMessage", sendMessage.getTarget());
-			assertResponseContainsMessage(sendMessage, Answer.CORRUPTED);
-		}
-	}
 }