filter messages by also looking at media descriptions (#2285)

2022-01-04 19:28:49 +01:00 · 2022-01-04 19:28:49 +01:00 · c0c8eec36b
commit c0c8eec36b
parent a221a7b916
2 changed files with 40 additions and 3 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/network/FilterModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/network/FilterModel.kt
@ -29,9 +29,16 @@ class FilterModel @Inject constructor() {
        }

        val spoilerText = status.actionableStatus.spoilerText
+        val attachmentsDescriptions = status.attachments
+            .mapNotNull { it.description }
+
        return (
            matcher.reset(status.actionableStatus.content).find() ||
-                spoilerText.isNotEmpty() && matcher.reset(spoilerText).find()
+                (spoilerText.isNotEmpty() && matcher.reset(spoilerText).find()) ||
+                (
+                    attachmentsDescriptions.isNotEmpty() &&
+                        matcher.reset(attachmentsDescriptions.joinToString("\n")).find()
+                    )
            )
    }