feat: проверка forward из того же чата при анализе дубликатов

Djaler · Feb 18, 2024 · d3bb5a2 · d3bb5a2
1 parent e690edf
commit d3bb5a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/main/kotlin/com/github/djaler/evilbot/handlers/SeenMemeHandler.kt b/src/main/kotlin/com/github/djaler/evilbot/handlers/SeenMemeHandler.kt
@@ -1,14 +1,13 @@
 package com.github.djaler.evilbot.handlers
 
+import com.github.djaler.evilbot.entity.Chat
 import com.github.djaler.evilbot.handlers.base.MessageHandler
 import com.github.djaler.evilbot.service.ChatService
 import com.github.djaler.evilbot.service.DuplicateImageChecker
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.extensions.api.files.downloadFile
 import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.extensions.utils.asContentMessage
-import dev.inmo.tgbotapi.extensions.utils.asPhotoContent
-import dev.inmo.tgbotapi.extensions.utils.asPublicChat
+import dev.inmo.tgbotapi.extensions.utils.*
 import dev.inmo.tgbotapi.extensions.utils.formatting.makeLinkToMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.utils.buildEntities
@@ -33,13 +32,17 @@ class SeenMemeHandler(
         }
 
         val (chatEntity, _) = chatService.getOrCreateChatFrom(chat)
-        val originalMessageId: Long? = duplicateImageChecker.findDuplicate(image, chatEntity)
+        val originalMessageInfo = duplicateImageChecker.findDuplicate(image, chatEntity)
 
-        if (originalMessageId == null) {
+        if (originalMessageInfo == null) {
             duplicateImageChecker.saveHash(image, chatEntity, message.messageId, imageFile.fileId)
             return false
         } else {
-            val messageLink = makeLinkToMessage(message.chat, originalMessageId) ?: return false
+            if (isForwardFromSameChat(message, chatEntity)) {
+                return false
+            }
+
+            val messageLink = makeLinkToMessage(message.chat, originalMessageInfo.messageId) ?: return false
 
             requestExecutor.reply(
                 message,
@@ -50,4 +53,11 @@ class SeenMemeHandler(
             return true
         }
     }
+
+    private fun isForwardFromSameChat(message: Message, chatEntity: Chat): Boolean {
+        val forwardChat = message.asPossiblyForwardedMessage()?.forwardInfo?.asForwardFromPublicChatInfo()?.chat
+            ?: return false
+        val (forwardChatEntity, _) = chatService.getOrCreateChatFrom(forwardChat)
+        return chatEntity.id == forwardChatEntity.id
+    }
 }
diff --git a/src/main/kotlin/com/github/djaler/evilbot/service/DuplicateImageChecker.kt b/src/main/kotlin/com/github/djaler/evilbot/service/DuplicateImageChecker.kt
@@ -17,12 +17,10 @@ import javax.imageio.ImageIO
 class DuplicateImageChecker(
     private val imageHashRepository: ImageHashRepository,
 ) {
-    fun findDuplicate(image: BufferedImage, chat: Chat): MessageIdentifier? {
+    fun findDuplicate(image: BufferedImage, chat: Chat): ImageHash? {
         val hash = resizeAndGetHash(image)
 
-        val duplicate = imageHashRepository.findByChatIdAndHash(chat.id, hash)
-
-        return duplicate?.messageId
+        return imageHashRepository.findByChatIdAndHash(chat.id, hash)
     }
 
     fun saveHash(image: BufferedImage, chat: Chat, messageId: MessageIdentifier, fileId: FileId) {