v2.3.1

pom.xml

@@ -76,12 +76,12 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>6.0.9</version>
+            <version>6.0.7</version>
         </dependency>
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>6.7.0</version>
+            <version>6.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.16.1</version>
+            <version>1.15.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -109,4 +109,4 @@
             <version>2.20.0</version>
         </dependency>
     </dependencies>
-</project>
+</project>

src/main/java/com/github/yvasyliev/telegram/chain/RepeatPhoto.java

@@ -11,6 +11,7 @@
 import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Properties;
 import java.util.Set;
@@ -41,16 +42,25 @@ public void repeatRedditPost(JsonNode data, TelegramSenderBot telegramSenderBot,
                 } catch (TelegramApiRequestException e) {
                     var apiResponse = e.getApiResponse();
 
-                    switch (apiResponse) {
-                        case "Bad Request: wrong file identifier/HTTP URL specified":
-                            try (var inputStream = new URL(photoUrl).openStream()) {
-                                var filename = photoUrl.substring(photoUrl.lastIndexOf('/') + 1);
-                                telegramSenderBot.sendPhoto(inputStream, filename, text, hasSpoiler, needModerate);
-                            }
-                            break;
+                    if ("Bad Request: wrong file identifier/HTTP URL specified".equals(apiResponse)) {
+                        try {
+                            sendPhotoInputStream(
+                                    photoUrl,
+                                    (inputStream, filename) -> telegramSenderBot.sendPhoto(inputStream, filename, text, hasSpoiler, needModerate)
+                            );
+                            return;
+                        } catch (TelegramApiRequestException ex) {
+                            apiResponse = ex.getApiResponse();
+                        }
+                    }
 
-                        default:
-                            throw e;
+                    if ("Bad Request: PHOTO_INVALID_DIMENSIONS".equals(apiResponse)) {
+                        sendPhotoInputStream(
+                                photoUrl,
+                                (inputStream, filename) -> telegramSenderBot.sendDocument(inputStream, filename, text, needModerate)
+                        );
+                    } else {
+                        throw e;
                     }
                 }
                 appData.setProperty("PREVIOUS_REDDIT_POST_CREATED", String.valueOf(data.get("created").intValue()));
@@ -90,4 +100,16 @@ private String extractPhotoUrl(JsonNode data) {
 
         return null;
     }
+
+    private void sendPhotoInputStream(String photoUrl, SenderFunction senderFunction) throws IOException, TelegramApiException {
+        try (var inputStream = new URL(photoUrl).openStream()) {
+            var filename = photoUrl.substring(photoUrl.lastIndexOf('/') + 1);
+            senderFunction.send(inputStream, filename);
+        }
+    }
+
+    @FunctionalInterface
+    private interface SenderFunction {
+        void send(InputStream inputStream, String filename) throws TelegramApiException;
+    }
 }