- Added a fix for invalid WP image URLs

Eukon05 · Nov 10, 2024 · 5f20735 · 5f20735
1 parent ed5706e
commit 5f20735
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/infodb-source-wp/src/main/java/ovh/eukon05/infodb/source/wp/WpAdapter.java b/infodb-source-wp/src/main/java/ovh/eukon05/infodb/source/wp/WpAdapter.java
@@ -20,7 +20,7 @@ final class WpAdapter {
 
     private static final String ARTICLE_DETAILS_QUERY = """
             {
-              "query": "query Collections { collections(productId: \\"5973184000386177\\") { article(id: \\"%s\\") { created tags { slug } } }}"
+              "query": "query Collections { collections(productId: \\"5973184000386177\\") { article(id: \\"%s\\") { created tags { slug } image { height width } } }}"
             }""";
 
     private static final Gson GSON = new Gson();

diff --git a/infodb-source-wp/src/main/java/ovh/eukon05/infodb/source/wp/WpArticleMapper.java b/infodb-source-wp/src/main/java/ovh/eukon05/infodb/source/wp/WpArticleMapper.java
@@ -9,14 +9,22 @@
 import java.util.List;
 
 final class WpArticleMapper {
+    private static final String IMAGE_URL_TEMPLATE = "https://i.wpimg.pl/O/%dx%d/%s";
+    private static final String IMAGE = "image";
+
     private WpArticleMapper() {
     }
 
     static Article mapFromJson(JsonObject articleJson, JsonObject articleDetailsJson, ArticleSourceInfo sourceInfo) {
         String title = articleJson.get("title").getAsString();
         String id = articleJson.get("contentId").getAsString();
         String url = articleJson.get("url").getAsString();
-        String imageUrl = articleJson.get("image").getAsString();
+        String imageUrl = articleJson.get(IMAGE).getAsString().replace("https://", "");
+
+        int imageHeight = articleDetailsJson.getAsJsonObject(IMAGE).get("height").getAsInt();
+        int imageWidth = articleDetailsJson.getAsJsonObject(IMAGE).get("width").getAsInt();
+
+        String finalImageUrl = String.format(IMAGE_URL_TEMPLATE, imageWidth, imageHeight, imageUrl);
 
         long createdAt = articleDetailsJson.get("created").getAsLong();
         List<String> tags = articleDetailsJson.getAsJsonArray("tags")
@@ -27,6 +35,6 @@ static Article mapFromJson(JsonObject articleJson, JsonObject articleDetailsJson
                 .map(JsonElement::getAsString)
                 .toList();
 
-        return new Article(id, sourceInfo.name(), title, url, imageUrl, Instant.ofEpochSecond(createdAt), tags);
+        return new Article(id, sourceInfo.name(), title, url, finalImageUrl, Instant.ofEpochSecond(createdAt), tags);
     }
 }