forked from upstream-mirrors/quik
Merge pull request #496 from peanut250/feat/message-content-filters
Block messages based on content
This commit is contained in:
@@ -23,7 +23,9 @@ import dev.octoshrimpy.quik.blocking.BlockingClient
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.manager.ActiveConversationManager
|
||||
import dev.octoshrimpy.quik.manager.NotificationManager
|
||||
import dev.octoshrimpy.quik.repository.ContactRepository
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageContentFilterRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.repository.SyncRepository
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
@@ -39,7 +41,9 @@ class ReceiveMms @Inject constructor(
|
||||
private val syncManager: SyncRepository,
|
||||
private val messageRepo: MessageRepository,
|
||||
private val notificationManager: NotificationManager,
|
||||
private val updateBadge: UpdateBadge
|
||||
private val updateBadge: UpdateBadge,
|
||||
private val filterRepo: MessageContentFilterRepository,
|
||||
private val contactsRepo: ContactRepository
|
||||
) : Interactor<Uri>() {
|
||||
|
||||
override fun buildObservable(params: Uri): Flowable<*> {
|
||||
@@ -75,6 +79,12 @@ class ReceiveMms @Inject constructor(
|
||||
else -> Unit
|
||||
}
|
||||
|
||||
if (filterRepo.isBlocked(message.getText(), message.address, contactsRepo)) {
|
||||
Timber.v("message dropped based on content filters")
|
||||
messageRepo.deleteMessages(listOf(message.id))
|
||||
return@mapNotNull null
|
||||
}
|
||||
|
||||
message
|
||||
}
|
||||
.doOnNext { message ->
|
||||
|
||||
@@ -22,7 +22,9 @@ import dev.octoshrimpy.quik.blocking.BlockingClient
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.manager.NotificationManager
|
||||
import dev.octoshrimpy.quik.manager.ShortcutManager
|
||||
import dev.octoshrimpy.quik.repository.ContactRepository
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageContentFilterRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import io.reactivex.Flowable
|
||||
@@ -36,7 +38,9 @@ class ReceiveSms @Inject constructor(
|
||||
private val messageRepo: MessageRepository,
|
||||
private val notificationManager: NotificationManager,
|
||||
private val updateBadge: UpdateBadge,
|
||||
private val shortcutManager: ShortcutManager
|
||||
private val shortcutManager: ShortcutManager,
|
||||
private val filterRepo: MessageContentFilterRepository,
|
||||
private val contactsRepo: ContactRepository
|
||||
) : Interactor<Long>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<*> {
|
||||
@@ -69,6 +73,12 @@ class ReceiveSms @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
if (filterRepo.isBlocked(it.getText(), it.address, contactsRepo)) {
|
||||
Timber.v("message dropped based on content filters")
|
||||
messageRepo.deleteMessages(listOf(it.id))
|
||||
return@mapNotNull null
|
||||
}
|
||||
|
||||
// update and fetch conversation
|
||||
conversationRepo.updateConversations(it.threadId)
|
||||
conversationRepo.getOrCreateConversation(it.threadId)
|
||||
|
||||
Reference in New Issue
Block a user