signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Target latest edit for reaction/delete

Browse Source
This commit is contained in:
Pete Walters 2023-06-27 12:49:28 -05:00 committed by GitHub
parent 63df0a72f2
commit c9573488fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SignalServiceKit/src/Messages/Interactions/TSMessage.swift
View File

@ -219,7 +219,22 @@ public extension TSMessage {
if messageToDelete is TSOutgoingMessage, authorAddress.isLocalAddress {
messageToDelete.markMessageAsRemotelyDeleted(transaction: transaction)
return .success
} else if let incomingMessageToDelete = messageToDelete as? TSIncomingMessage {
} else if var incomingMessageToDelete = messageToDelete as? TSIncomingMessage {
if incomingMessageToDelete.editState == .pastRevision {
// The remote delete targeted an old revision, fetch
// swap out the target message for the latest (or return an error)
// This avoids cases where older edits could be deleted and
// leave newer revisions
if let latestEdit = EditMessageFinder.findMessage(
fromEdit: incomingMessageToDelete,
transaction: transaction) as? TSIncomingMessage {
incomingMessageToDelete = latestEdit
} else {
Logger.info("Ignoring delete for missing edit target.")
return .invalidDelete
}
}
guard let messageToDeleteServerTimestamp = incomingMessageToDelete.serverTimestamp?.uint64Value else {
// Older messages might be missing this, but since we only allow deleting for a small
// window after you send a message we should generally never hit this path.

15
SignalServiceKit/src/Messages/Reactions/ReactionManager.swift
View File

@ -140,12 +140,25 @@ public class ReactionManager: NSObject {
return .invalidReaction
}
if let message = InteractionFinder.findMessage(
if var message = InteractionFinder.findMessage(
withTimestamp: reaction.timestamp,
threadId: thread.uniqueId,
author: SignalServiceAddress(messageAuthor),
transaction: transaction
) {
if message.editState == .pastRevision {
// Reaction targeted an old edit revision, fetch the latest
// version to ensure the reaction shows up properly.
if let latestEdit = EditMessageFinder.findMessage(
fromEdit: message,
transaction: transaction) {
message = latestEdit
} else {
Logger.info("Ignoring reaction for missing edit target.")
return .invalidReaction
}
}
guard !message.wasRemotelyDeleted else {
Logger.info("Ignoring reaction for a message that was remotely deleted")
return .invalidReaction