Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(auto_save): prevent saving outside a conversation

Browse Source
This commit is contained in:
rhunk
2023-09-02 13:24:18 +02:00
parent 3ba4e573ad
commit 3656024c98
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt
View File

@ -9,7 +9,7 @@ import java.util.UUID
class SnapUUID(obj: Any?) : AbstractWrapper(obj) {
private val uuidString by lazy { toUUID().toString() }
val bytes: ByteArray get() = instanceNonNull().getObjectField("mId") as ByteArray
private val bytes: ByteArray get() = instanceNonNull().getObjectField("mId") as ByteArray
private fun toUUID(): UUID {
val buffer = ByteBuffer.wrap(bytes)
@ -20,6 +20,10 @@ class SnapUUID(obj: Any?) : AbstractWrapper(obj) {
return uuidString
}
override fun equals(other: Any?): Boolean {
return other is SnapUUID && other.uuidString == uuidString
}
companion object {
fun fromString(uuid: String): SnapUUID {
return fromUUID(UUID.fromString(uuid))

30
core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt
View File

@ -67,15 +67,15 @@ class AutoSave : MessagingRuleFeature("Auto Save", MessagingRuleType.AUTO_SAVE,
return autoSaveFilter.any { it == contentType }
}
private fun canSave(): Boolean {
if (autoSaveFilter.isEmpty()) return false
private fun canSaveInConversation(targetConversationId: String): Boolean {
val messaging = context.feature(Messaging::class)
val openedConversationId = messaging.openedConversationUUID?.toString() ?: return false
if (openedConversationId != targetConversationId) return false
if (context.feature(StealthMode::class).canUseRule(openedConversationId)) return false
if (!canUseRule(openedConversationId)) return false
with(context.feature(Messaging::class)) {
if (openedConversationUUID == null) return@canSave false
val conversation = openedConversationUUID.toString()
if (context.feature(StealthMode::class).canUseRule(conversation)) return@canSave false
if (!canUseRule(conversation)) return@canSave false
}
return true
}
@ -85,9 +85,11 @@ class AutoSave : MessagingRuleFeature("Auto Save", MessagingRuleType.AUTO_SAVE,
context.mappings.getMappedClass("callbacks", "FetchConversationWithMessagesCallback"),
"onFetchConversationWithMessagesComplete",
HookStage.BEFORE,
{ canSave() }
{ autoSaveFilter.isNotEmpty() }
) { param ->
val conversationId = SnapUUID(param.arg<Any>(0).getObjectField("mConversationId")!!)
if (!canSaveInConversation(conversationId.toString())) return@hook
val messages = param.arg<List<Any>>(1).map { Message(it) }
messages.forEach {
if (!canSaveMessage(it)) return@forEach
@ -102,11 +104,12 @@ class AutoSave : MessagingRuleFeature("Auto Save", MessagingRuleType.AUTO_SAVE,
context.mappings.getMappedClass("callbacks", "FetchMessageCallback"),
"onFetchMessageComplete",
HookStage.BEFORE,
{ canSave() }
{ autoSaveFilter.isNotEmpty() }
) { param ->
val message = Message(param.arg(0))
if (!canSaveMessage(message)) return@hook
val conversationId = message.messageDescriptor.conversationId
if (!canSaveInConversation(conversationId.toString())) return@hook
if (!canSaveMessage(message)) return@hook
asyncSaveExecutorService.submit {
saveMessage(conversationId, message)
@ -117,20 +120,19 @@ class AutoSave : MessagingRuleFeature("Auto Save", MessagingRuleType.AUTO_SAVE,
context.mappings.getMappedClass("callbacks", "SendMessageCallback"),
"onSuccess",
HookStage.BEFORE,
{ canSave() }
{ autoSaveFilter.isNotEmpty() }
) {
val callback = CallbackBuilder(fetchConversationWithMessagesCallbackClass).build()
runCatching {
fetchConversationWithMessagesPaginatedMethod.invoke(
messaging.conversationManager, messaging.openedConversationUUID!!.instanceNonNull(),
Long.MAX_VALUE,
3,
10,
callback
)
}.onFailure {
Logger.xposedLog("failed to save message", it)
}
}
}
}