open-source/WeChatTweak-macOS
1
0
Fork 0
mirror of https://github.com/Sunnyyoung/WeChatTweak-macOS.git synced 2025-05-22 22:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #367

Browse Source
This commit is contained in:
Sunnyyoung 2022-02-01 19:35:43 +08:00
parent 3f3ec79543
commit d3e6823f86
4 changed files with 5 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WeChatTweak.xcodeproj/project.pbxproj
View File

@ -19,8 +19,6 @@
7D64151027A94DE200A8A398 /* PreferencesWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D64150F27A94DE200A8A398 /* PreferencesWindow.m */; };
7D9049F51F82A41A004E6370 /* fishhook.c in Sources */ = {isa = PBXBuildFile; fileRef = 7D9049F31F82A415004E6370 /* fishhook.c */; };
7D9049F61F82A41A004E6370 /* fishhook.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D9049F41F82A415004E6370 /* fishhook.h */; };
7D9049F91F82B6FB004E6370 /* NSString+WeChatTweak.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D9049F81F82B6FB004E6370 /* NSString+WeChatTweak.m */; };
7D9049FA1F82B708004E6370 /* NSString+WeChatTweak.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D9049F71F82B6FB004E6370 /* NSString+WeChatTweak.h */; };
7DF8422C1F40583F00D42D79 /* WeChatTweak.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DF8422A1F40583F00D42D79 /* WeChatTweak.h */; settings = {ATTRIBUTES = (Public, ); }; };
7DF842341F4058AB00D42D79 /* WeChatTweak.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF842331F4058AB00D42D79 /* WeChatTweak.m */; };
7DF842521F4058C600D42D79 /* TweakPreferencesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DF8424F1F4058C600D42D79 /* TweakPreferencesController.h */; };
@ -51,8 +49,6 @@
7D64B96927853C2B00A07164 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/TweakPreferencesController.strings"; sourceTree = "<group>"; };
7D9049F31F82A415004E6370 /* fishhook.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fishhook.c; sourceTree = "<group>"; };
7D9049F41F82A415004E6370 /* fishhook.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fishhook.h; sourceTree = "<group>"; };
7D9049F71F82B6FB004E6370 /* NSString+WeChatTweak.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+WeChatTweak.h"; sourceTree = "<group>"; };
7D9049F81F82B6FB004E6370 /* NSString+WeChatTweak.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+WeChatTweak.m"; sourceTree = "<group>"; };
7DF842271F40583F00D42D79 /* WeChatTweak.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WeChatTweak.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7DF8422A1F40583F00D42D79 /* WeChatTweak.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeChatTweak.h; sourceTree = "<group>"; };
7DF8422B1F40583F00D42D79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -102,8 +98,6 @@
children = (
7DF842571F4058DD00D42D79 /* NSBundle+WeChatTweak.h */,
7DF842581F4058DD00D42D79 /* NSBundle+WeChatTweak.m */,
7D9049F71F82B6FB004E6370 /* NSString+WeChatTweak.h */,
7D9049F81F82B6FB004E6370 /* NSString+WeChatTweak.m */,
);
path = Category;
sourceTree = "<group>";
@ -191,7 +185,6 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
7D9049FA1F82B708004E6370 /* NSString+WeChatTweak.h in Headers */,
7DF8422C1F40583F00D42D79 /* WeChatTweak.h in Headers */,
7DF8425B1F4058DD00D42D79 /* NSBundle+WeChatTweak.h in Headers */,
7D9049F61F82A41A004E6370 /* fishhook.h in Headers */,
@ -318,7 +311,6 @@
files = (
7D14E5A51F6447DB00D75132 /* Alfred.m in Sources */,
7DF842531F4058C600D42D79 /* TweakPreferencesController.m in Sources */,
7D9049F91F82B6FB004E6370 /* NSString+WeChatTweak.m in Sources */,
7D64150827A9469900A8A398 /* ContextMenu.m in Sources */,
7D2194CC264701950068F4CC /* AntiRevoke.m in Sources */,
7DF842341F4058AB00D42D79 /* WeChatTweak.m in Sources */,

10
WeChatTweak/AntiRevoke.m
View File

@ -7,7 +7,6 @@
//
#import "WeChatTweak.h"
#import "NSString+WeChatTweak.h"
#import "NSBundle+WeChatTweak.h"
@implementation NSObject (AntiRevoke)
@ -28,11 +27,12 @@ static void __attribute__((constructor)) tweak(void) {
return [self tweak_FFToNameFavChatZZ:message sessionMsgList:sessionMsgList];
}
// Decode message
NSString *session = [message.msgContent tweak_subStringFrom:@"<session>" to:@"</session>"];
NSUInteger newMessageID = [message.msgContent tweak_subStringFrom:@"<newmsgid>" to:@"</newmsgid>"].longLongValue;
NSString *replaceMessage = [message.msgContent tweak_subStringFrom:@"<replacemsg><![CDATA[" to:@"]]></replacemsg>"];
NSDictionary *dictionary = [NSDictionary dictionaryWithXMLString:message.msgContent];
NSString *session = dictionary[@"revokemsg"][@"session"];
NSString *newMessageID = dictionary[@"revokemsg"][@"newmsgid"];
NSString *replaceMessage = dictionary[@"revokemsg"][@"replacemsg"];
// Get message data
MessageData *messageData = ((id (*)(id, SEL, id, unsigned long long))objc_msgSend)(self, GetMsgDataSelector, session, newMessageID);
MessageData *messageData = ((id (*)(id, SEL, id, unsigned long long))objc_msgSend)(self, GetMsgDataSelector, session, newMessageID.longLongValue);
if (messageData.isSendFromSelf) {
// Fallback to origin method
[self tweak_FFToNameFavChatZZ:message sessionMsgList:sessionMsgList];

15
WeChatTweak/Category/NSString+WeChatTweak.h
View File

@ -1,15 +0,0 @@
//
// NSString+WeChatTweak.h
// WeChatTweak
//
// Created by Sunnyyoung on 2017/8/12.
// Copyright © 2017年 Sunnyyoung. All rights reserved.
//
#import <Cocoa/Cocoa.h>
@interface NSString (WeChatTweak)
- (NSString *)tweak_subStringFrom:(NSString *)beginString to:(NSString *)endString;
@end

29
WeChatTweak/Category/NSString+WeChatTweak.m
View File

@ -1,29 +0,0 @@
//
// NSString+WeChatTweak.m
// WeChatTweak
//
// Created by Sunnyyoung on 2017/8/12.
// Copyright © 2017年 Sunnyyoung. All rights reserved.
//
#import "NSString+WeChatTweak.h"
@implementation NSString (WeChatTweak)
- (NSString *)tweak_subStringFrom:(NSString *)beginString to:(NSString *)endString {
NSRange begin = [self rangeOfString:beginString];
if (begin.location == NSNotFound) {
return nil;
}
NSRange end = [self rangeOfString:endString];
if (end.location == NSNotFound) {
return nil;
}
NSRange range = NSMakeRange(begin.location + begin.length, end.location - begin.location - begin.length);
if (range.location == NSNotFound) {
return nil;
}
return [self substringWithRange:range];
}
@end