Fix a recalled message overwritten issue

sunnyyoung · Sep 2, 2023 · 5d82b85 · 5d82b85
1 parent 65e6346
commit 5d82b85
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/WeChatTweak/AntiRevoke.m b/WeChatTweak/AntiRevoke.m
@@ -24,7 +24,7 @@ - (void)tweak_DelRevokedMsg:(NSString *)session msgData:(MessageData *)messageDa
     if (messageData.isSendFromSelf) {
         [self tweak_DelRevokedMsg:session msgData:messageData];
     } else {
-        messageData.mesSvrID = LONG_LONG_MAX;
+        messageData.mesSvrID = messageData.mesLocalID;
         [((FFProcessReqsvrZZ *)self) ModifyMsgData:session msgData:messageData];
         dispatch_async(dispatch_get_main_queue(), ^{
             [((FFProcessReqsvrZZ *)self) notifyDelMsgOnMainThread:session msgData:messageData isRevoke:YES];
@@ -35,7 +35,7 @@ - (void)tweak_DelRevokedMsg:(NSString *)session msgData:(MessageData *)messageDa
 
 - (void)tweak_notifyAddRevokePromptMsgOnMainThread:(NSString *)session msgData:(MessageData *)messageData {
     MessageData *localMessage = [((FFProcessReqsvrZZ *)self) GetMsgData:session localId:messageData.mesLocalID];
-    if (!localMessage || localMessage.mesSvrID != LONG_LONG_MAX) {
+    if (!localMessage || localMessage.mesSvrID != messageData.mesLocalID) {
         [self tweak_notifyAddRevokePromptMsgOnMainThread:session msgData:messageData];
     } else {
         MMServiceCenter *serviceCenter = [objc_getClass("MMServiceCenter") defaultCenter];
@@ -84,7 +84,7 @@ - (instancetype)tweak_initWithFrame:(NSRect)arg1 {
 
 - (void)tweak_populateWithMessage:(MMMessageTableItem *)tableItem {
     [self tweak_populateWithMessage:tableItem];
-    BOOL recalled = tableItem.message.mesSvrID == LONG_LONG_MAX;
+    BOOL recalled = tableItem.message.mesSvrID && tableItem.message.mesSvrID == tableItem.message.mesLocalID;
     [((MMMessageCellView *)self).subviews enumerateObjectsUsingBlock:^(__kindof NSView * _Nonnull view, NSUInteger index, BOOL * _Nonnull stop) {
         if (view.tag != 9527) {
             return ;