Фикс сканнера

Spliterash · Aug 29, 2024 · a4189f7 · a4189f7
1 parent 533a77b
commit a4189f7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/ru/spliterash/vkVideoUnlocker/longpoll/message/Attachment.kt b/src/main/java/ru/spliterash/vkVideoUnlocker/longpoll/message/Attachment.kt
@@ -4,12 +4,13 @@ import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
 import com.fasterxml.jackson.annotation.JsonProperty
 import ru.spliterash.vkVideoUnlocker.longpoll.message.attachments.SomethingWithAttachments
 import ru.spliterash.vkVideoUnlocker.longpoll.message.attachments.VkLink
+import ru.spliterash.vkVideoUnlocker.longpoll.message.attachments.Wall
 import ru.spliterash.vkVideoUnlocker.story.vkModels.VkStory
 import ru.spliterash.vkVideoUnlocker.video.vkModels.VkVideo
 
 data class Attachment(
     @JsonProperty("video") val video: VkVideo?,
-    @JsonProperty("wall") val wall: SomethingWithAttachments?,
+    @JsonProperty("wall") val wall: Wall?,
     @JsonProperty("wall_reply") val wallReply: SomethingWithAttachments?,
     @JsonProperty("story") val story: VkStory?,
     @JsonProperty("link") val link: VkLink?,

diff --git a/src/main/java/ru/spliterash/vkVideoUnlocker/longpoll/message/attachments/Wall.kt b/src/main/java/ru/spliterash/vkVideoUnlocker/longpoll/message/attachments/Wall.kt
@@ -0,0 +1,15 @@
+package ru.spliterash.vkVideoUnlocker.longpoll.message.attachments
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import ru.spliterash.vkVideoUnlocker.longpoll.message.Attachment
+
+data class Wall(
+    @JsonProperty("attachments")
+    val attachments: List<Attachment> = listOf(),
+    @JsonProperty("copy_history")
+    val copyHistory: List<Wall> = listOf(),
+) : AttachmentContainer, AttachmentContent {
+    override fun containers(): List<AttachmentContainer> = copyHistory
+
+    override fun attachments(): List<Attachment> = attachments
+}
diff --git a/src/main/java/ru/spliterash/vkVideoUnlocker/message/utils/MessageUtils.kt b/src/main/java/ru/spliterash/vkVideoUnlocker/message/utils/MessageUtils.kt
@@ -13,6 +13,7 @@ import ru.spliterash.vkVideoUnlocker.video.vkModels.VkVideo
 import ru.spliterash.vkVideoUnlocker.vk.MessageScanner
 import ru.spliterash.vkVideoUnlocker.vk.actor.GroupUser
 import ru.spliterash.vkVideoUnlocker.vk.api.VkApi
+import ru.spliterash.vkVideoUnlocker.wall.vkModels.WallPost
 import java.util.function.Predicate
 import java.util.regex.Pattern
 
@@ -34,7 +35,7 @@ class MessageUtils(
             root,
             listOf(
                 MessageScanner.Checker { it.video },
-                MessageScanner.Checker { it.story }
+                MessageScanner.Checker { it.story },
             ),
             containerPredicate
         )