From 2fa2542c224310a1e8d401691f608e8ec6cff7e7 Mon Sep 17 00:00:00 2001 From: Sunnyyoung Date: Sat, 9 Sep 2017 00:00:28 +0800 Subject: [PATCH] Fixed issue #22 #25 --- WeChatTweak.framework/Versions/A/WeChatTweak | Bin 38460 -> 38460 bytes WeChatTweak/WeChatTweak.m | 6 +++--- WeChatTweak/WeChatTweakHeaders.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WeChatTweak.framework/Versions/A/WeChatTweak b/WeChatTweak.framework/Versions/A/WeChatTweak index 3fe6342e0da02cc852cae4a8b0661248b4f71ed6..e3eb3e7178dda7692fcae9fabccdbb5bcd491beb 100755 GIT binary patch delta 7726 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 J?#Hhb{5RnZ_Q3!E delta 7825 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 KW7j=TW&Jn8jv<@? diff --git a/WeChatTweak/WeChatTweak.m b/WeChatTweak/WeChatTweak.m index 04a032d..65476f3 100755 --- a/WeChatTweak/WeChatTweak.m +++ b/WeChatTweak/WeChatTweak.m @@ -46,7 +46,7 @@ static void __attribute__((constructor)) tweak(void) { data.mesLocalID = localMessageData.mesLocalID; data.msgContent = replaceMessage; } else { - data.mesLocalID = localMessageData.mesLocalID + 1; + data.mesLocalID = localMessageData.mesLocalID; data.msgContent = [NSString stringWithFormat:@"[已拦截]\n%@", replaceMessage]; } data; @@ -74,9 +74,9 @@ static void __attribute__((constructor)) tweak(void) { // Delete message if it is revoke from myself if ([localMessageData isSendFromSelf]) { [((MessageService *)self) DelMsg:session msgList:@[localMessageData] isDelAll:NO isManual:YES]; - [((MessageService *)self) AddRevokePromptMsg:session msgData:promptMessageData]; + [((MessageService *)self) AddLocalMsg:session msgData:promptMessageData]; } else { - [((MessageService *)self) AddRevokePromptMsg:session msgData:promptMessageData]; + [((MessageService *)self) AddLocalMsg:session msgData:promptMessageData]; [((MessageService *)self) notifyAddMsgOnMainThread:session msgData:promptMessageData]; } // Deliver notification diff --git a/WeChatTweak/WeChatTweakHeaders.h b/WeChatTweak/WeChatTweakHeaders.h index 0931a3c..8f34bee 100644 --- a/WeChatTweak/WeChatTweakHeaders.h +++ b/WeChatTweak/WeChatTweakHeaders.h @@ -54,7 +54,7 @@ - (id)GetMsgData:(id)arg1 svrId:(unsigned long long)arg2; - (void)DelMsg:(id)arg1 msgList:(id)arg2 isDelAll:(BOOL)arg3 isManual:(BOOL)arg4; -- (void)AddRevokePromptMsg:(id)arg1 msgData:(id)arg2; +- (void)AddLocalMsg:(id)arg1 msgData:(id)arg2; - (void)notifyAddMsgOnMainThread:(id)arg1 msgData:(id)arg2; @end