From a4189f73ba31fe4813da5971a391204e2cb9f77c Mon Sep 17 00:00:00 2001 From: Spliterash Date: Fri, 30 Aug 2024 00:38:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81=D0=BA=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../longpoll/message/Attachment.kt | 3 ++- .../longpoll/message/attachments/Wall.kt | 15 +++++++++++++++ .../vkVideoUnlocker/message/utils/MessageUtils.kt | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 src/main/java/ru/spliterash/vkVideoUnlocker/longpoll/message/attachments/Wall.kt diff --git a/src/main/java/ru/spliterash/vkVideoUnlocker/longpoll/message/Attachment.kt b/src/main/java/ru/spliterash/vkVideoUnlocker/longpoll/message/Attachment.kt index 58d2ed5..b634af4 100644 --- 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 new file mode 100644 index 0000000..06445f3 --- /dev/null +++ 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 = listOf(), + @JsonProperty("copy_history") + val copyHistory: List = listOf(), +) : AttachmentContainer, AttachmentContent { + override fun containers(): List = copyHistory + + override fun attachments(): List = attachments +} \ No newline at end of file diff --git a/src/main/java/ru/spliterash/vkVideoUnlocker/message/utils/MessageUtils.kt b/src/main/java/ru/spliterash/vkVideoUnlocker/message/utils/MessageUtils.kt index 0e68022..c8a6ceb 100644 --- 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 )