игнор reply_message

Spliterash · Jan 23, 2024 · 5a4fded · 5a4fded
1 parent f358282
commit 5a4fded
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/src/main/java/ru/spliterash/vkVideoUnlocker/message/utils/MessageUtils.kt b/src/main/java/ru/spliterash/vkVideoUnlocker/message/utils/MessageUtils.kt
@@ -1,27 +1,42 @@
 package ru.spliterash.vkVideoUnlocker.message.utils
 
 import jakarta.inject.Singleton
+import ru.spliterash.vkVideoUnlocker.longpoll.message.FwdMessage
 import ru.spliterash.vkVideoUnlocker.longpoll.message.RootMessage
+import ru.spliterash.vkVideoUnlocker.longpoll.message.attachments.AttachmentContainer
+import ru.spliterash.vkVideoUnlocker.longpoll.message.hasPing
+import ru.spliterash.vkVideoUnlocker.longpoll.message.isPersonalChat
 import ru.spliterash.vkVideoUnlocker.story.vkModels.VkStory
 import ru.spliterash.vkVideoUnlocker.video.holder.VideoContentHolder
 import ru.spliterash.vkVideoUnlocker.video.service.VideoService
 import ru.spliterash.vkVideoUnlocker.video.vkModels.VkVideo
 import ru.spliterash.vkVideoUnlocker.vk.AttachmentScanner
+import ru.spliterash.vkVideoUnlocker.vk.actor.GroupUser
+import ru.spliterash.vkVideoUnlocker.vk.api.VkApi
+import java.util.function.Predicate
 import java.util.regex.Pattern
 
 @Singleton
 class MessageUtils(
+    @GroupUser private val groupUser: VkApi,
     private val attachmentScanner: AttachmentScanner,
     private val videoService: VideoService,
 ) {
     private val vkUrlPattern = Pattern.compile("(?:https?://)?vk\\.com/(?<attachment>(?:video|wall|story)-?\\d+_\\d+)")
     suspend fun scanForVideoContent(root: RootMessage): VideoContentHolder? {
+        val containerPredicate: Predicate<AttachmentContainer> =
+            if (root.isPersonalChat() || root.hasPing(groupUser))
+                Predicate { true }
+            else
+                Predicate { it !is FwdMessage }
+
         val attachmentContent = attachmentScanner.scanForAttachment(
             root,
             listOf(
                 AttachmentScanner.Checker { it.video },
                 AttachmentScanner.Checker { it.story }
-            )
+            ),
+            containerPredicate
         )
         if (attachmentContent != null) {
             return when (attachmentContent) {

diff --git a/src/main/java/ru/spliterash/vkVideoUnlocker/vk/AttachmentScanner.kt b/src/main/java/ru/spliterash/vkVideoUnlocker/vk/AttachmentScanner.kt
@@ -4,15 +4,24 @@ import jakarta.inject.Singleton
 import ru.spliterash.vkVideoUnlocker.longpoll.message.Attachment
 import ru.spliterash.vkVideoUnlocker.longpoll.message.attachments.AttachmentContainer
 import ru.spliterash.vkVideoUnlocker.longpoll.message.attachments.AttachmentContent
+import java.util.function.Predicate
 
 @Singleton
 class AttachmentScanner {
-    fun <T : AttachmentContent> scanForAttachment(root: AttachmentContainer, checker: Checker<T>): T? {
+    fun <T : AttachmentContent> scanForAttachment(
+        root: AttachmentContainer,
+        checker: Checker<T>,
+    ): T? {
         return scanForAttachment(root, listOf(checker)) as T?
     }
 
     @Suppress("MemberVisibilityCanBePrivate")
-    fun scanForAttachment(root: AttachmentContainer, checkers: List<Checker<*>>): AttachmentContent? {
+    fun scanForAttachment(
+        root: AttachmentContainer,
+        checkers: List<Checker<*>>,
+        allowedContainerChecker: Predicate<AttachmentContainer> = Predicate { true }
+    ): AttachmentContent? {
+        if (!allowedContainerChecker.test(root)) return null
         for (attachment in root.attachments()) {
             for (checker in checkers) {
                 val needle = checker.check(attachment)
@@ -21,19 +30,19 @@ class AttachmentScanner {
             }
 
             if (attachment.wall != null) {
-                val scanResult = scanForAttachment(attachment.wall, checkers)
+                val scanResult = scanForAttachment(attachment.wall, checkers, allowedContainerChecker)
                 if (scanResult != null)
                     return scanResult
             }
 
             if (attachment.wallReply != null) {
-                val scanResult = scanForAttachment(attachment.wallReply, checkers)
+                val scanResult = scanForAttachment(attachment.wallReply, checkers, allowedContainerChecker)
                 if (scanResult != null)
                     return scanResult
             }
         }
         for (somethingWithAttachments in root.containers()) {
-            val result = scanForAttachment(somethingWithAttachments, checkers)
+            val result = scanForAttachment(somethingWithAttachments, checkers, allowedContainerChecker)
             if (result != null)
                 return result
         }