Do some cleanups to emoji reaction code

This commit is contained in:
Inhishonor
2025-12-17 16:34:04 -08:00
parent b4bce2c1a9
commit 67bbe0e831
@@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.repository
import android.content.Context
import com.squareup.moshi.Moshi
import dev.octoshrimpy.quik.extensions.insertOrUpdate
import dev.octoshrimpy.quik.manager.KeyManager
import dev.octoshrimpy.quik.model.EmojiReaction
import dev.octoshrimpy.quik.model.Message
@@ -39,12 +38,20 @@ class EmojiReactionRepositoryImpl @Inject constructor(
private val reactionPatterns: LinkedHashMap<Regex, (MatchResult) -> ParsedEmojiReaction?> = linkedMapOf(
Regex( // Google Messages
"(?s)^\u200a[^\u200b\u200a]*\u200b([^\u200b]*)\u200b[^\u200b\u200a]*\u200a(.*)\u200a[^\u200b\u200a]*\u200a\\Z"
) to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) }
) to { match ->
ParsedEmojiReaction(
match.groupValues[1], match.groupValues[2]
)
}
)
private val removalPatterns: LinkedHashMap<Regex, (MatchResult) -> ParsedEmojiReaction?> = linkedMapOf(
Regex( // Google Messages
"(?s)^\u200a[^\u200c\u200a]*\u200c([^\u200c]*)\u200c[^\u200c\u200a]*\u200a(.*)\u200a[^\u200c\u200a]*\u200a\\Z"
) to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) }
) to { match ->
ParsedEmojiReaction(
match.groupValues[1], match.groupValues[2], isRemoval = true
)
}
)
init {
@@ -107,7 +114,10 @@ class EmojiReactionRepositoryImpl @Inject constructor(
.mapNotNull { filename ->
val localeTag = filename.removeSuffix(".json")
try {
val json = context.assets.open("$dir/$filename").bufferedReader().use { it.readText() }
val json = context.assets.open("$dir/$filename")
.bufferedReader().use {
it.readText()
}
val data = parseEmojiPatternsJson(json)
localeTag to data
} catch (e: Exception) {
@@ -127,11 +137,8 @@ class EmojiReactionRepositoryImpl @Inject constructor(
if (removal != null) return removal
for ((pattern, parser) in reactionPatterns) {
val match = pattern.find(body)
if (match == null) continue;
val result = parser(match)
if (result == null) continue
val match = pattern.find(body) ?: continue
val result = parser(match) ?: continue
Timber.d("Reaction found with ${result.emoji}")
return result
@@ -142,11 +149,8 @@ class EmojiReactionRepositoryImpl @Inject constructor(
private fun parseRemoval(body: String): ParsedEmojiReaction? {
for ((pattern, parser) in removalPatterns) {
val match = pattern.find(body)
if (match == null) continue;
val result = parser(match)
if (result == null) continue
val match = pattern.find(body) ?: continue
val result = parser(match) ?: continue
Timber.d("Removal found with ${result.emoji}")
return result