From 46ec29546f57f3fafc215af26ef58d5d6dd566d1 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 17:30:28 -0400 Subject: [PATCH] Parse google messages emoji removal --- .../com/moez/QKSMS/migration/QkRealmMigration.kt | 1 - .../java/com/moez/QKSMS/util/EmojiReactionUtils.kt | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 9e291652..442eeae3 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -261,7 +261,6 @@ class QkRealmMigration @Inject constructor( .addField("emoji", String::class.java, FieldAttribute.REQUIRED) .addField("originalMessageText", String::class.java, FieldAttribute.REQUIRED) .addField("threadId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) - .addField("patternType", String::class.java, FieldAttribute.REQUIRED) realm.schema.get("Message") ?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED) diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt index 89ebe5de..251a69bd 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -36,16 +36,18 @@ object EmojiReactionUtils { } val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( - // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], ) + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) }, + // iOS Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> if (match.groupValues[1] == "with a sticker") null else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) }, + // iOS tapbacks Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), @@ -55,13 +57,18 @@ object EmojiReactionUtils { ) val removalPatterns: Map ParsedEmojiReaction?> = mapOf( - // TODO: google messages removal + // Google Messages + Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, + // iOS tapbacks Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), + // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) },