Add custom revoked message style support

Make revoked message mask style experimental

WeChatTweak.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19B88</string>
+	<string>19C57</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11B500</string>
+	<string>11C29</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>19B89</string>
+	<string>19B90</string>
 	<key>DTSDKName</key>
 	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1120</string>
+	<string>1130</string>
 	<key>DTXcodeBuild</key>
-	<string>11B500</string>
+	<string>11C29</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.10</string>
 	<key>NSHumanReadableCopyright</key>

WeChatTweak.framework/Versions/A/Resources/en.lproj/TweakPreferencesController.strings

@@ -31,3 +31,8 @@
 
 /* Class = "NSTextFieldCell"; title = "Alfred JSON compressing:"; ObjectID = "jHw-2a-B2t"; */
 "jHw-2a-B2t.title" = "Alfred JSON compressing:";
+
+"7wK-v5-BgQ.title" = "Revoked message style:";
+"wRC-UO-k1G.title" = "Classic";
+"gH0-wV-Bx0.title" = "Mask";
+"ftV-1F-OnB.title" = "Experimental feature"

WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/TweakPreferencesController.strings

@@ -31,3 +31,8 @@
 
 /* Class = "NSTextFieldCell"; title = "Alfred JSON compressing:"; ObjectID = "jHw-2a-B2t"; */
 "jHw-2a-B2t.title" = "Alfred JSON 压缩：";
+
+"7wK-v5-BgQ.title" = "消息撤回样式：";
+"wRC-UO-k1G.title" = "经典";
+"gH0-wV-Bx0.title" = "遮罩";
+"ftV-1F-OnB.title" = "试验性功能"

WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/TweakPreferencesController.strings

@@ -31,3 +31,8 @@
 
 /* Class = "NSTextFieldCell"; title = "Alfred JSON compressing:"; ObjectID = "jHw-2a-B2t"; */
 "jHw-2a-B2t.title" = "Alfred JSON 壓縮：";
+
+"7wK-v5-BgQ.title" = "消息撤回樣式：";
+"wRC-UO-k1G.title" = "經典";
+"gH0-wV-Bx0.title" = "遮罩";
+"ftV-1F-OnB.title" = "試驗性功能"

WeChatTweak/Controller/Base.lproj/TweakPreferencesController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -11,17 +11,18 @@
                 <outlet property="autoAuthButton" destination="5by-EJ-3f2" id="VIV-sZ-ybx"/>
                 <outlet property="compressedJSONEnabledButton" destination="ylY-lF-oFq" id="yqW-Bl-hNf"/>
                 <outlet property="notificationTypeButton" destination="6x2-KV-p8w" id="Kfn-2a-Yup"/>
+                <outlet property="revokedMessageStyleButton" destination="eqS-1n-9dO" id="QVg-Sy-CoY"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="430" height="123"/>
+            <rect key="frame" x="0.0" y="0.0" width="431" height="152"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RFE-oR-GRm">
-                    <rect key="frame" x="58" y="86" width="138" height="17"/>
+                    <rect key="frame" x="58" y="116" width="138" height="16"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Auto login:" usesSingleLineMode="YES" id="UiV-zj-l6I">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -29,7 +30,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="B87-eD-uhI">
-                    <rect key="frame" x="10" y="53" width="186" height="17"/>
+                    <rect key="frame" x="10" y="84" width="186" height="16"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Message recalled notification:" usesSingleLineMode="YES" id="UKv-CM-nGt">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -37,10 +38,10 @@
                     </textFieldCell>
                 </textField>
                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5by-EJ-3f2">
-                    <rect key="frame" x="200" y="81" width="91" height="25"/>
+                    <rect key="frame" x="200" y="111" width="91" height="25"/>
                     <popUpButtonCell key="cell" type="push" title="Disabled" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="axesIndependently" inset="2" selectedItem="Vcv-eD-OM9" id="8qB-Jj-tlv">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
+                        <font key="font" metaFont="system"/>
                         <menu key="menu" id="sFO-8T-61S">
                             <items>
                                 <menuItem title="Disabled" state="on" id="Vcv-eD-OM9">
@@ -57,10 +58,10 @@
                     </connections>
                 </popUpButton>
                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6x2-KV-p8w">
-                    <rect key="frame" x="200" y="48" width="92" height="25"/>
+                    <rect key="frame" x="200" y="79" width="92" height="25"/>
                     <popUpButtonCell key="cell" type="push" title="Inherited" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="axesIndependently" inset="2" selectedItem="gec-CY-E1x" id="wek-GT-N5V">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
+                        <font key="font" metaFont="system"/>
                         <menu key="menu" id="H2J-gJ-aGD">
                             <items>
                                 <menuItem title="Inherited" state="on" id="gec-CY-E1x">
@@ -80,18 +81,26 @@
                     </connections>
                 </popUpButton>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zsd-Bb-6l4">
-                    <rect key="frame" x="32" y="20" width="164" height="17"/>
+                    <rect key="frame" x="32" y="52" width="164" height="16"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Alfred JSON compressing:" usesSingleLineMode="YES" id="jHw-2a-B2t">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7wK-v5-BgQ">
+                    <rect key="frame" x="46" y="20" width="150" height="16"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Revoked message style:" usesSingleLineMode="YES" id="mPT-nA-idf">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ylY-lF-oFq">
-                    <rect key="frame" x="200" y="15" width="91" height="25"/>
+                    <rect key="frame" x="200" y="47" width="91" height="25"/>
                     <popUpButtonCell key="cell" type="push" title="Disabled" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="axesIndependently" inset="2" selectedItem="MEN-Kg-wfj" id="taL-8q-Quu">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
+                        <font key="font" metaFont="system"/>
                         <menu key="menu" id="2qr-A3-Yo5">
                             <items>
                                 <menuItem title="Enabled" id="10G-t9-s4T">
@@ -108,36 +117,72 @@
                     </connections>
                 </popUpButton>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kNm-y0-HmG">
-                    <rect key="frame" x="296" y="20" width="96" height="17"/>
+                    <rect key="frame" x="296" y="52" width="96" height="16"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" title="Need to restart" usesSingleLineMode="YES" id="2vl-mc-m3L">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eqS-1n-9dO">
+                    <rect key="frame" x="200" y="15" width="82" height="25"/>
+                    <popUpButtonCell key="cell" type="push" title="Classic" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="axesIndependently" inset="2" selectedItem="wRC-UO-k1G" id="6UY-90-fFH">
+                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                        <menu key="menu" id="FiI-39-AD8">
+                            <items>
+                                <menuItem title="Classic" state="on" id="wRC-UO-k1G">
+                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                </menuItem>
+                                <menuItem title="Mask" id="gH0-wV-Bx0">
+                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                </menuItem>
+                            </items>
+                        </menu>
+                    </popUpButtonCell>
+                    <connections>
+                        <action selector="switchRevokedMessageStyleButton:" target="-2" id="n3n-hX-s3H"/>
+                    </connections>
+                </popUpButton>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ftV-1F-OnB">
+                    <rect key="frame" x="287" y="20" width="134" height="16"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="center" title="Experimental feature" usesSingleLineMode="YES" id="lHs-du-a6F">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
             </subviews>
             <constraints>
                 <constraint firstItem="B87-eD-uhI" firstAttribute="trailing" secondItem="RFE-oR-GRm" secondAttribute="trailing" id="3p1-WF-TYr"/>
                 <constraint firstItem="zsd-Bb-6l4" firstAttribute="top" secondItem="B87-eD-uhI" secondAttribute="bottom" constant="16" id="62W-9V-E2u"/>
+                <constraint firstItem="7wK-v5-BgQ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="12" id="BjP-RS-ASM"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ftV-1F-OnB" secondAttribute="trailing" constant="12" id="Bug-Cf-VNT"/>
                 <constraint firstItem="RFE-oR-GRm" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="CWK-cO-DBz"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="5by-EJ-3f2" secondAttribute="trailing" constant="12" id="KRA-o3-Ab4"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="kNm-y0-HmG" secondAttribute="trailing" constant="12" id="Le8-Ns-wyj"/>
+                <constraint firstItem="eqS-1n-9dO" firstAttribute="centerY" secondItem="7wK-v5-BgQ" secondAttribute="centerY" id="Pbm-17-TcF"/>
                 <constraint firstItem="5by-EJ-3f2" firstAttribute="centerY" secondItem="RFE-oR-GRm" secondAttribute="centerY" id="QLN-KI-HUD"/>
                 <constraint firstItem="RFE-oR-GRm" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="60" id="R8y-0p-4Sk"/>
                 <constraint firstItem="B87-eD-uhI" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="12" id="TgK-yZ-mK1"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6x2-KV-p8w" secondAttribute="trailing" constant="12" id="VbQ-1W-cmx"/>
                 <constraint firstItem="6x2-KV-p8w" firstAttribute="leading" secondItem="5by-EJ-3f2" secondAttribute="leading" id="WSG-53-r8r"/>
                 <constraint firstItem="zsd-Bb-6l4" firstAttribute="trailing" secondItem="RFE-oR-GRm" secondAttribute="trailing" id="Wlh-6X-UJN"/>
+                <constraint firstItem="7wK-v5-BgQ" firstAttribute="top" secondItem="zsd-Bb-6l4" secondAttribute="bottom" constant="16" id="Ynk-No-M1P"/>
                 <constraint firstItem="kNm-y0-HmG" firstAttribute="centerY" secondItem="ylY-lF-oFq" secondAttribute="centerY" id="eMk-RJ-Mbw"/>
+                <constraint firstItem="ftV-1F-OnB" firstAttribute="leading" secondItem="eqS-1n-9dO" secondAttribute="trailing" constant="10" id="g0f-zV-Ldd"/>
                 <constraint firstItem="6x2-KV-p8w" firstAttribute="centerY" secondItem="B87-eD-uhI" secondAttribute="centerY" id="gqp-om-e0O"/>
                 <constraint firstItem="ylY-lF-oFq" firstAttribute="centerY" secondItem="zsd-Bb-6l4" secondAttribute="centerY" id="h7g-u6-ZwV"/>
                 <constraint firstItem="zsd-Bb-6l4" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="12" id="icK-YZ-ZLo"/>
                 <constraint firstItem="B87-eD-uhI" firstAttribute="top" secondItem="RFE-oR-GRm" secondAttribute="bottom" constant="16" id="lG1-vw-epo"/>
+                <constraint firstItem="eqS-1n-9dO" firstAttribute="leading" secondItem="5by-EJ-3f2" secondAttribute="leading" id="qb1-VH-ddg"/>
                 <constraint firstItem="kNm-y0-HmG" firstAttribute="leading" secondItem="ylY-lF-oFq" secondAttribute="trailing" constant="10" id="urr-9v-Okd"/>
+                <constraint firstItem="ftV-1F-OnB" firstAttribute="centerY" secondItem="eqS-1n-9dO" secondAttribute="centerY" id="v6d-17-iac"/>
                 <constraint firstItem="5by-EJ-3f2" firstAttribute="leading" secondItem="RFE-oR-GRm" secondAttribute="trailing" constant="8" id="v9V-TW-Voc"/>
                 <constraint firstItem="ylY-lF-oFq" firstAttribute="leading" secondItem="5by-EJ-3f2" secondAttribute="leading" id="wQB-cU-fmf"/>
+                <constraint firstItem="7wK-v5-BgQ" firstAttribute="trailing" secondItem="RFE-oR-GRm" secondAttribute="trailing" id="wQn-0O-HSa"/>
             </constraints>
-            <point key="canvasLocation" x="139" y="179.5"/>
+            <point key="canvasLocation" x="139" y="194"/>
         </customView>
     </objects>
 </document>

WeChatTweak/Controller/TweakPreferencesController.m

@@ -15,6 +15,7 @@
 @property (weak) IBOutlet NSPopUpButton *autoAuthButton;
 @property (weak) IBOutlet NSPopUpButton *notificationTypeButton;
 @property (weak) IBOutlet NSPopUpButton *compressedJSONEnabledButton;
+@property (weak) IBOutlet NSPopUpButton *revokedMessageStyleButton;
 
 @end
 
@@ -37,6 +38,7 @@
     [self.autoAuthButton selectItemAtIndex:enabledAutoAuth ? 1 : 0];
     [self.notificationTypeButton selectItemAtIndex:notificationType];
     [self.compressedJSONEnabledButton selectItemAtIndex:configManager.compressedJSONEnabled ? 0 : 1];
+    [self.revokedMessageStyleButton selectItemAtIndex:configManager.revokedMessageStyle];
 }
 
 #pragma mark - Event method
@@ -57,6 +59,10 @@
     WTConfigManager.sharedInstance.compressedJSONEnabled = enabled;
 }
 
+- (IBAction)switchRevokedMessageStyleButton:(NSPopUpButton *)sender {
+    WTConfigManager.sharedInstance.revokedMessageStyle = sender.indexOfSelectedItem;
+}
+
 #pragma mark - MASPreferencesViewController
 
 - (NSString *)identifier {

WeChatTweak/Controller/en.lproj/TweakPreferencesController.strings

@@ -31,3 +31,8 @@
 
 /* Class = "NSTextFieldCell"; title = "Alfred JSON compressing:"; ObjectID = "jHw-2a-B2t"; */
 "jHw-2a-B2t.title" = "Alfred JSON compressing:";
+
+"7wK-v5-BgQ.title" = "Revoked message style:";
+"wRC-UO-k1G.title" = "Classic";
+"gH0-wV-Bx0.title" = "Mask";
+"ftV-1F-OnB.title" = "Experimental feature"

WeChatTweak/Controller/zh-Hans.lproj/TweakPreferencesController.strings

@@ -31,3 +31,8 @@
 
 /* Class = "NSTextFieldCell"; title = "Alfred JSON compressing:"; ObjectID = "jHw-2a-B2t"; */
 "jHw-2a-B2t.title" = "Alfred JSON 压缩：";
+
+"7wK-v5-BgQ.title" = "消息撤回样式：";
+"wRC-UO-k1G.title" = "经典";
+"gH0-wV-Bx0.title" = "遮罩";
+"ftV-1F-OnB.title" = "试验性功能"

WeChatTweak/Controller/zh-Hant.lproj/TweakPreferencesController.strings

@@ -31,3 +31,8 @@
 
 /* Class = "NSTextFieldCell"; title = "Alfred JSON compressing:"; ObjectID = "jHw-2a-B2t"; */
 "jHw-2a-B2t.title" = "Alfred JSON 壓縮：";
+
+"7wK-v5-BgQ.title" = "消息撤回樣式：";
+"wRC-UO-k1G.title" = "經典";
+"gH0-wV-Bx0.title" = "遮罩";
+"ftV-1F-OnB.title" = "試驗性功能"

WeChatTweak/Manager/RecallCacheManager.m

@@ -35,12 +35,12 @@
 }
 
 + (void)insertRevokedMessage:(MessageData *)message {
-    NSString *identifer = [NSString stringWithFormat:@"%lld-%ud", message.mesSvrID, message.msgCreateTime];
+    NSString *identifer = [NSString stringWithFormat:@"%ud-%lld-%ud", message.mesLocalID, message.mesSvrID, message.msgCreateTime];
     [RecallCacheManager.sharedInstance.kv setBool:YES forKey:identifer];
 }
 
 + (BOOL)containsRevokedMessage:(MessageData *)message {
-    NSString *identifer = [NSString stringWithFormat:@"%lld-%ud", message.mesSvrID, message.msgCreateTime];
+    NSString *identifer = [NSString stringWithFormat:@"%ud-%lld-%ud", message.mesLocalID, message.mesSvrID, message.msgCreateTime];
     return [RecallCacheManager.sharedInstance.kv containsKey:identifer];
 }
 

WeChatTweak/Manager/WTConfigManager.h

@@ -10,9 +10,15 @@
 #import <objc/runtime.h>
 #import <objc/message.h>
 
+typedef NS_ENUM(NSUInteger, WTRevokedMessageStyle) {
+    WTRevokedMessageStylePlain = 0,
+    WTRevokedMessageStyleMask
+};
+
 @interface WTConfigManager : NSObject
 
 @property (nonatomic, assign) BOOL compressedJSONEnabled;
+@property (nonatomic, assign) WTRevokedMessageStyle revokedMessageStyle;
 
 + (instancetype)sharedInstance;
 

WeChatTweak/Manager/WTConfigManager.m

@@ -9,6 +9,7 @@
 #import "WTConfigManager.h"
 
 static NSString * const WeChatTweakCompressedJSONEnabledKey = @"WeChatTweakCompressedJSONEnabledKey";
+static NSString * const WeChatTweakRevokedMessageStyleKey = @"WeChatTweakRevokedMessageStyleKey";
 
 @interface WTConfigManager()
 
@@ -34,6 +35,7 @@ static NSString * const WeChatTweakCompressedJSONEnabledKey = @"WeChatTweakCompr
         } else {
             _compressedJSONEnabled = YES;
         }
+        _revokedMessageStyle = [userDefaults integerForKey:WeChatTweakRevokedMessageStyleKey];
     }
     return self;
 }
@@ -46,4 +48,10 @@ static NSString * const WeChatTweakCompressedJSONEnabledKey = @"WeChatTweakCompr
     [NSUserDefaults.standardUserDefaults synchronize];
 }
 
+- (void)setRevokedMessageStyle:(WTRevokedMessageStyle)revokedMessageStyle {
+    _revokedMessageStyle = revokedMessageStyle;
+    [NSUserDefaults.standardUserDefaults setInteger:revokedMessageStyle forKey:WeChatTweakRevokedMessageStyleKey];
+    [NSUserDefaults.standardUserDefaults synchronize];
+}
+
 @end

WeChatTweak/WeChatTweak.m

@@ -142,15 +142,114 @@ static void __attribute__((constructor)) tweak(void) {
 }
 
 - (void)tweak_onRevokeMsg:(MessageData *)message sessionMessageList:(nullable id)sessionMessageList {
+    switch (WTConfigManager.sharedInstance.revokedMessageStyle) {
+        case WTRevokedMessageStylePlain:
+            [self handleRevokedMessageIntoClassicStyle:message]; break;
+        case WTRevokedMessageStyleMask:
+            [self handleRevokedMessageIntoMaskStyle:message]; break;
+        default:
+            break;
+    }
+}
+
+- (void)handleRevokedMessageIntoClassicStyle:(MessageData *)message {
     // 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>"];
-    
+    // Prepare message data
-    // Get message data
+    MessageData *localMessageData = [((MessageService *)self) GetMsgData:session svrId:newMessageID];
-    MessageData *messageData = [((MessageService *)self) GetMsgData:session svrId:newMessageID];
+    MessageData *promptMessageData = ({
-    [RecallCacheManager insertRevokedMessage:messageData];
+        MessageData *data = [[objc_getClass("MessageData") alloc] initWithMsgType:10000];
-    
+        data.msgStatus = 4;
+        data.toUsrName = localMessageData.toUsrName;
+        data.fromUsrName = localMessageData.fromUsrName;
+        data.mesSvrID = localMessageData.mesSvrID;
+        data.mesLocalID = localMessageData.mesLocalID;
+        data.msgCreateTime = localMessageData.msgCreateTime;
+        if ([localMessageData isSendFromSelf]) {
+            data.msgContent = replaceMessage;
+        } else {
+            NSString *fromUserName = [replaceMessage componentsSeparatedByString:@" "].firstObject;
+            NSString *userRevoke = [NSString stringWithFormat:@"%@ %@ ", fromUserName, [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Recalled"]];
+            NSString *tips = [NSString stringWithFormat:[NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.InterceptedARecalledMessage"], userRevoke];
+            NSMutableString *msgContent = [NSMutableString stringWithString:tips];
+            switch (localMessageData.messageType) {
+                case MessageDataTypeText: {
+                    if (localMessageData.msgContent.length) {
+                        if ([session rangeOfString:@"@chatroom"].location == NSNotFound) {
+                            [msgContent appendFormat:@"\"%@\"", localMessageData.msgContent];
+                        } else {
+                            [msgContent appendFormat:@"\"%@\"", [localMessageData.msgContent componentsSeparatedByString:@":\n"].lastObject];
+                        }
+                    } else {
+                        [msgContent appendString:[NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.AMessage"]];
+                    }
+                    break;
+                }
+                case MessageDataTypeImage:
+                    [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Image"]]; break;
+                case MessageDataTypeVoice:
+                    [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Voice"]]; break;
+                case MessageDataTypeVideo:
+                    [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Video"]]; break;
+                case MessageDataTypeSticker:
+                    [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Sticker"]]; break;
+                case MessageDataTypeAppUrl:
+                    [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Link"]]; break;
+                default:
+                    [msgContent appendString:[NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.AMessage"]]; break;
+            }
+            data.msgContent = msgContent;
+        }
+        data;
+    });
+    // Prepare notification information
+    MMServiceCenter *serviceCenter = [objc_getClass("MMServiceCenter") defaultCenter];
+    NSUserNotification *userNotification = [[NSUserNotification alloc] init];
+    BOOL isChatStatusNotifyOpen = YES;
+    if ([session rangeOfString:@"@chatroom"].location == NSNotFound) {
+        ContactStorage *contactStorage = [serviceCenter getService:objc_getClass("ContactStorage")];
+        WCContactData *contact = [contactStorage GetContact:session];
+        isChatStatusNotifyOpen = [contact isChatStatusNotifyOpen];
+        userNotification.informativeText = replaceMessage;
+    } else {
+        GroupStorage *groupStorage = [serviceCenter getService:objc_getClass("GroupStorage")];
+        WCContactData *groupContact = [groupStorage GetGroupContact:session];
+        isChatStatusNotifyOpen = [groupContact isChatStatusNotifyOpen];
+        NSString *groupName = groupContact.m_nsNickName.length ? groupContact.m_nsNickName : [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Title.Group"];
+        userNotification.informativeText = [NSString stringWithFormat:@"%@: %@", groupName, replaceMessage];
+    }
+    // Delete message if it is revoke from myself
+    if ([localMessageData isSendFromSelf]) {
+        [((MessageService *)self) DelMsg:session msgList:@[localMessageData] isDelAll:NO isManual:YES];
+        [((MessageService *)self) AddLocalMsg:session msgData:promptMessageData];
+    } else {
+        if (localMessageData.messageType == MessageDataTypeText) {
+            [((MessageService *)self) DelMsg:session msgList:@[localMessageData] isDelAll:NO isManual:YES];
+        }
+        [((MessageService *)self) AddLocalMsg:session msgData:promptMessageData];
+    }
+    // Dispatch notification
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // Deliver notification
+        if (![localMessageData isSendFromSelf]) {
+            RevokeNotificationType notificationType = [[NSUserDefaults standardUserDefaults] integerForKey:WeChatTweakPreferenceRevokeNotificationTypeKey];
+            if (notificationType == RevokeNotificationTypeReceiveAll || (notificationType == RevokeNotificationTypeFollow && isChatStatusNotifyOpen)) {
+                [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:userNotification];
+            }
+        }
+    });
+}
+
+- (void)handleRevokedMessageIntoMaskStyle:(MessageData *)message {
+    // 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>"];
+    // Get message data
+    MessageData *messageData = [((MessageService *)self) GetMsgData:session svrId:newMessageID];
+    [RecallCacheManager insertRevokedMessage:messageData];
     // Prepare notification information
     MMServiceCenter *serviceCenter = [objc_getClass("MMServiceCenter") defaultCenter];
     NSUserNotification *userNotification = [[NSUserNotification alloc] init];
@@ -167,7 +266,6 @@ static void __attribute__((constructor)) tweak(void) {
         NSString *groupName = groupContact.m_nsNickName.length ? groupContact.m_nsNickName : [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Title.Group"];
         userNotification.informativeText = [NSString stringWithFormat:@"%@: %@", groupName, replaceMessage];
     }
-    
     if ([messageData isSendFromSelf]) {
         MessageData *promptMessageData = ({
             MessageData *data = [[objc_getClass("MessageData") alloc] initWithMsgType:MessageDataTypePrompt];
@@ -188,7 +286,6 @@ static void __attribute__((constructor)) tweak(void) {
         [((MessageService *)self) notifyDelMsgOnMainThread:messageData.getChatNameForCurMsg msgData:messageData];
         [((MessageService *)self) notifyAddRevokePromptMsgOnMainThread:messageData.getChatNameForCurMsg msgData:messageData];
     }
-
     // Dispatch notification
     dispatch_async(dispatch_get_main_queue(), ^{
         // Deliver notification