Post decomposition

src/main/java/com/github/yvasyliev/config/RedTelBotConfiguration.java

@@ -6,7 +6,8 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.github.yvasyliev.bots.telegram.RedTelBot;
 import com.github.yvasyliev.model.dto.ExternalMessageData;
-import com.github.yvasyliev.model.dto.Post;
+import com.github.yvasyliev.model.dto.post.PhotoGroupPost;
+import com.github.yvasyliev.model.dto.post.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -89,7 +90,13 @@ protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
 
     @Bean
     @Scope(BeanDefinition.SCOPE_PROTOTYPE)
-    public Map<Integer, Post> intPostMap(@Value("16") int maxSize) {
+    public Map<Integer, Post> integerPostMap(@Value("16") int maxSize) {
+        return synchronizedFixedSizeMap(maxSize);
+    }
+
+    @Bean
+    @Scope(BeanDefinition.SCOPE_PROTOTYPE)
+    public Map<Integer, PhotoGroupPost> integerPhotoGroupPostMap(@Value("16") int maxSize) {
         return synchronizedFixedSizeMap(maxSize);
     }
 

src/main/java/com/github/yvasyliev/model/dto/post/GifPost.java

@@ -0,0 +1,8 @@
+package com.github.yvasyliev.model.dto.post;
+
+public class GifPost extends MediaPost {
+    @Override
+    public String getType() {
+        return Type.GIF;
+    }
+}

src/main/java/com/github/yvasyliev/model/dto/post/MediaPost.java

@@ -0,0 +1,13 @@
+package com.github.yvasyliev.model.dto.post;
+
+public abstract class MediaPost extends SpoilerablePost {
+    private String mediaUrl;
+
+    public String getMediaUrl() {
+        return mediaUrl;
+    }
+
+    public void setMediaUrl(String mediaUrl) {
+        this.mediaUrl = mediaUrl;
+    }
+}

src/main/java/com/github/yvasyliev/model/dto/post/PhotoGroupPost.java

@@ -0,0 +1,20 @@
+package com.github.yvasyliev.model.dto.post;
+
+import java.util.List;
+
+public class PhotoGroupPost extends SpoilerablePost {
+    private List<List<String>> photoUrlsPages;
+
+    public List<List<String>> getPhotoUrlsPages() {
+        return photoUrlsPages;
+    }
+
+    public void setPhotoUrlsPages(List<List<String>> photoUrlsPages) {
+        this.photoUrlsPages = photoUrlsPages;
+    }
+
+    @Override
+    public String getType() {
+        return Type.PHOTO_GROUP;
+    }
+}

src/main/java/com/github/yvasyliev/model/dto/post/PhotoPost.java

@@ -0,0 +1,8 @@
+package com.github.yvasyliev.model.dto.post;
+
+public class PhotoPost extends MediaPost {
+    @Override
+    public String getType() {
+        return Type.PHOTO;
+    }
+}

src/main/java/com/github/yvasyliev/model/dto/post/PollPost.java

@@ -0,0 +1,20 @@
+package com.github.yvasyliev.model.dto.post;
+
+import java.util.List;
+
+public class PollPost extends Post {
+    private List<String> options;
+
+    public List<String> getOptions() {
+        return options;
+    }
+
+    public void setOptions(List<String> options) {
+        this.options = options;
+    }
+
+    @Override
+    public String getType() {
+        return Type.POLL;
+    }
+}

src/main/java/com/github/yvasyliev/model/dto/post/Post.java

@@ -0,0 +1,65 @@
+package com.github.yvasyliev.model.dto.post;
+
+public abstract class Post implements Comparable<Post> {
+    private int created;
+    private String author;
+    private boolean approved;
+    private String postUrl;
+    private String text;
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public abstract String getType();
+
+    public int getCreated() {
+        return created;
+    }
+
+    public void setCreated(int created) {
+        this.created = created;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public boolean isApproved() {
+        return approved;
+    }
+
+    public void setApproved(boolean approved) {
+        this.approved = approved;
+    }
+
+    public String getPostUrl() {
+        return postUrl;
+    }
+
+    public void setPostUrl(String postUrl) {
+        this.postUrl = postUrl;
+    }
+
+    @Override
+    public int compareTo(Post post) {
+        return Integer.compare(created, post.created);
+    }
+
+    public interface Type {
+        String GIF = "GIF";
+        String PHOTO_GROUP = "PHOTO_GROUP";
+        String PHOTO = "PHOTO";
+        String POLL = "POLL";
+        String TEXT = "TEXT";
+        String VIDEO = "VIDEO";
+    }
+}

src/main/java/com/github/yvasyliev/model/dto/post/SpoilerablePost.java

@@ -0,0 +1,14 @@
+package com.github.yvasyliev.model.dto.post;
+
+public abstract class SpoilerablePost extends Post {
+
+    private boolean hasSpoiler;
+
+    public boolean isHasSpoiler() {
+        return hasSpoiler;
+    }
+
+    public void setHasSpoiler(boolean hasSpoiler) {
+        this.hasSpoiler = hasSpoiler;
+    }
+}

src/main/java/com/github/yvasyliev/model/dto/post/TextPost.java

@@ -0,0 +1,8 @@
+package com.github.yvasyliev.model.dto.post;
+
+public class TextPost extends Post {
+    @Override
+    public String getType() {
+        return Type.TEXT;
+    }
+}

src/main/java/com/github/yvasyliev/model/dto/post/VideoPost.java

@@ -0,0 +1,8 @@
+package com.github.yvasyliev.model.dto.post;
+
+public class VideoPost extends MediaPost {
+    @Override
+    public String getType() {
+        return Type.VIDEO;
+    }
+}

src/main/java/com/github/yvasyliev/service/deserializers/PostDeserializer.java

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.yvasyliev.model.dto.Post;
+import com.github.yvasyliev.model.dto.post.Post;
 import com.github.yvasyliev.service.state.StateManager;
 import org.hibernate.MappingException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +30,6 @@ public Post deserialize(JsonParser jsonParser, DeserializationContext deserializ
         var node = jsonParser.getCodec().readTree(jsonParser);
         if (node instanceof JsonNode jsonPost) {
             var author = jsonPost.get("author").textValue();
-            var hasSpoiler = "nsfw".equals(jsonPost.get("thumbnail").textValue());
             var created = jsonPost.get("created").intValue();
             var postUrl = jsonPost.get("url_overridden_by_dest").textValue();
             var blockedAuthors = context.getBean(StateManager.class).getBlockedAuthors();
@@ -40,7 +39,6 @@ public Post deserialize(JsonParser jsonParser, DeserializationContext deserializ
                 try {
                     var optionalPost = postMapper.applyWithException(jsonPost).map(post -> {
                         post.setAuthor(author);
-                        post.setHasSpoiler(hasSpoiler);
                         post.setCreated(created);
                         post.setApproved(blockedAuthors.contains(author));
                         post.setPostUrl(postUrl);

src/main/java/com/github/yvasyliev/service/deserializers/mappers/GifPostMapper.java

@@ -1,8 +1,8 @@
 package com.github.yvasyliev.service.deserializers.mappers;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.yvasyliev.model.dto.Post;
-import com.github.yvasyliev.model.dto.PostType;
+import com.github.yvasyliev.model.dto.post.GifPost;
+import com.github.yvasyliev.model.dto.post.Post;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
@@ -23,10 +23,10 @@ public Optional<Post> applyWithException(JsonNode jsonPost) {
                     .get("source")
                     .get("url")
                     .textValue();
-            var post = new Post();
-            post.setType(PostType.GIF);
+            var post = new GifPost();
             post.setText(jsonPost.get("title").textValue());
             post.setMediaUrl(gifUrl);
+            post.setHasSpoiler("nsfw".equals(jsonPost.get("thumbnail").textValue()));
             return Optional.of(post);
         }
         return Optional.empty();

src/main/java/com/github/yvasyliev/service/deserializers/mappers/PhotoGroupPostMapper.java

@@ -1,8 +1,8 @@
 package com.github.yvasyliev.service.deserializers.mappers;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.yvasyliev.model.dto.PostType;
-import com.github.yvasyliev.model.dto.Post;
+import com.github.yvasyliev.model.dto.post.PhotoGroupPost;
+import com.github.yvasyliev.model.dto.post.Post;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
@@ -24,10 +24,10 @@ public Optional<Post> applyWithException(JsonNode jsonPost) {
         if (jsonPost.has("gallery_data")) {
             var photoUrlsPages = extractPhotoUrlsPages(jsonPost);
             var title = jsonPost.get("title").textValue();
-            var post = new Post();
-            post.setType(PostType.PHOTO_GROUP);
+            var post = new PhotoGroupPost();
             post.setText(title);
             post.setPhotoUrlsPages(photoUrlsPages);
+            post.setHasSpoiler("nsfw".equals(jsonPost.get("thumbnail").textValue()));
             return Optional.of(post);
         }
         return Optional.empty();