diff --git a/WeChatTweak.framework/Versions/A/Resources/Info.plist b/WeChatTweak.framework/Versions/A/Resources/Info.plist index 3d20d75..7359603 100644 --- a/WeChatTweak.framework/Versions/A/Resources/Info.plist +++ b/WeChatTweak.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 18C54 + 18A391 CFBundleDevelopmentRegion en CFBundleExecutable @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 10B61 + 9F2000 DTPlatformVersion GM DTSDKBuild - 18B71 + 17E189 DTSDKName - macosx10.14 + macosx10.13 DTXcode - 1010 + 0941 DTXcodeBuild - 10B61 + 9F2000 NSHumanReadableCopyright Copyright © 2017年 Sunnyyoung. All rights reserved. diff --git a/WeChatTweak.framework/Versions/A/Resources/en.lproj/Localizable.strings b/WeChatTweak.framework/Versions/A/Resources/en.lproj/Localizable.strings index a452625..b82861a 100644 Binary files a/WeChatTweak.framework/Versions/A/Resources/en.lproj/Localizable.strings and b/WeChatTweak.framework/Versions/A/Resources/en.lproj/Localizable.strings differ diff --git a/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/Localizable.strings b/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/Localizable.strings index e9b609d..5a30397 100644 Binary files a/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/Localizable.strings and b/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/Localizable.strings differ diff --git a/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/Localizable.strings b/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/Localizable.strings index bcb6bfb..3b0bee6 100644 Binary files a/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/Localizable.strings and b/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/Localizable.strings differ diff --git a/WeChatTweak.framework/Versions/A/WeChatTweak b/WeChatTweak.framework/Versions/A/WeChatTweak index 8181ba0..4cb8b23 100755 Binary files a/WeChatTweak.framework/Versions/A/WeChatTweak and b/WeChatTweak.framework/Versions/A/WeChatTweak differ diff --git a/WeChatTweak/Supporting Files/en.lproj/Localizable.strings b/WeChatTweak/Supporting Files/en.lproj/Localizable.strings index cd7e590..f94baff 100644 --- a/WeChatTweak/Supporting Files/en.lproj/Localizable.strings +++ b/WeChatTweak/Supporting Files/en.lproj/Localizable.strings @@ -9,3 +9,10 @@ "Tweak.Title.LoginAnotherAccount" = "Login new account"; "Tweak.Title.Group" = "Group"; "Tweak.Message.CatchARecalledMessage" = "[Catched]\n%@"; +"Tweak.Message.Recalled" = "recalled"; +"Tweak.Message.Photo" = "Photo"; +"Tweak.Message.Voice" = "Voice"; +"Tweak.Message.Video" = "Video"; +"Tweak.Message.Sticker" = "Sticker"; +"Tweak.Message.Link" = "Link"; +"Tweak.Message.AMessage" = "a message"; diff --git a/WeChatTweak/Supporting Files/zh-Hans.lproj/Localizable.strings b/WeChatTweak/Supporting Files/zh-Hans.lproj/Localizable.strings index 586059d..c6f429b 100644 --- a/WeChatTweak/Supporting Files/zh-Hans.lproj/Localizable.strings +++ b/WeChatTweak/Supporting Files/zh-Hans.lproj/Localizable.strings @@ -9,3 +9,10 @@ "Tweak.Title.LoginAnotherAccount" = "登录新的账号"; "Tweak.Title.Group" = "群组"; "Tweak.Message.CatchARecalledMessage" = "[已拦截]\n%@"; +"Tweak.Message.Recalled" = "撤回了"; +"Tweak.Message.Photo" = "图片"; +"Tweak.Message.Voice" = "语音"; +"Tweak.Message.Video" = "视频"; +"Tweak.Message.Sticker" = "表情"; +"Tweak.Message.Link" = "链接"; +"Tweak.Message.AMessage" = "一条消息"; diff --git a/WeChatTweak/Supporting Files/zh-Hant.lproj/Localizable.strings b/WeChatTweak/Supporting Files/zh-Hant.lproj/Localizable.strings index 5c1f297..0a20728 100644 --- a/WeChatTweak/Supporting Files/zh-Hant.lproj/Localizable.strings +++ b/WeChatTweak/Supporting Files/zh-Hant.lproj/Localizable.strings @@ -9,3 +9,10 @@ "Tweak.Title.LoginAnotherAccount" = "登錄新的賬號"; "Tweak.Title.Group" = "群組"; "Tweak.Message.CatchARecalledMessage" = "[已攔截]\n%@"; +"Tweak.Message.Recalled" = "撤回了"; +"Tweak.Message.Photo" = "图片"; +"Tweak.Message.Voice" = "语音"; +"Tweak.Message.Video" = "视频"; +"Tweak.Message.Sticker" = "表情"; +"Tweak.Message.Link" = "链接"; +"Tweak.Message.AMessage" = "一条消息"; diff --git a/WeChatTweak/WeChatTweak.m b/WeChatTweak/WeChatTweak.m index 8226dc7..b925daf 100755 --- a/WeChatTweak/WeChatTweak.m +++ b/WeChatTweak/WeChatTweak.m @@ -81,6 +81,7 @@ static void __attribute__((constructor)) tweak(void) { NSString *session = [message.msgContent tweak_subStringFrom:@"" to:@""]; NSUInteger newMessageID = [message.msgContent tweak_subStringFrom:@"" to:@""].longLongValue; NSString *replaceMessage = [message.msgContent tweak_subStringFrom:@""]; + // Prepare message data MessageData *localMessageData = [((MessageService *)self) GetMsgData:session svrId:newMessageID]; MessageData *promptMessageData = ({ @@ -94,7 +95,27 @@ static void __attribute__((constructor)) tweak(void) { if ([localMessageData isSendFromSelf]) { data.msgContent = replaceMessage; } else { - data.msgContent = [NSString stringWithFormat:[NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.CatchARecalledMessage"], replaceMessage]; + NSString *fromUserName = [[replaceMessage stringByReplacingOccurrencesOfString:@"\"" withString:@""] componentsSeparatedByString:@" "].firstObject; + NSString *userRevoke = [NSString stringWithFormat:@"\"%@\" %@ ", fromUserName, [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Recalled"]]; + NSString *tips = [NSString stringWithFormat:[NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.CatchARecalledMessage"], userRevoke]; + NSMutableString *msgContent = [NSMutableString stringWithString:tips]; + switch (localMessageData.messageType) { + case 1: //Text + [msgContent appendFormat:@"\"%@\"", localMessageData.msgContent]; break; + case 3: //Photo + [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Photo"]]; break; + case 34: //Voice + [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Voice"]]; break; + case 43: //Video + [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Video"]]; break; + case 47: //Sticker + [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Sticker"]]; break; + case 49: //Forward Link + [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Link"]]; break; + default: + [msgContent appendString:[NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.AMessage"]]; break; + } + data.msgContent = msgContent; } data; });