block message recall

MaloneQQ · Aug 27, 2017 · b4ecd45 · b4ecd45
1 parent 53fae2b
commit b4ecd45
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 10 deletions.
diff --git a/README.MD b/README.MD
@@ -11,6 +11,7 @@ API from [https://web.wechat.com/](https://web.wechat.com/)
 ## Feature
 - Work on desktop
 - On macOS, window vibrancy effect
+- Block message recall
 - Desktop notifications
 - Send image by paste
 ![preview](https://raw.githubusercontent.com/trazyn/weweChat/master/screenshots/pasteconfirmation.png)

diff --git a/src/js/pages/Settings/index.js b/src/js/pages/Settings/index.js
@@ -20,6 +20,8 @@ import helper from 'utils/helper';
     setDownloads: stores.settings.setDownloads,
     confirmImagePaste: stores.settings.confirmImagePaste,
     setConfirmImagePaste: stores.settings.setConfirmImagePaste,
+    blockRecall: stores.settings.blockRecall,
+    setBlockRecall: stores.settings.setBlockRecall,
     user: stores.session.user,
     logout: stores.session.logout,
 
@@ -72,6 +74,8 @@ export default class Settings extends Component {
             setDownloads,
             confirmImagePaste,
             setConfirmImagePaste,
+            blockRecall,
+            setBlockRecall,
             plugins,
             user,
         } = this.props;
@@ -120,6 +124,13 @@ export default class Settings extends Component {
                             </label>
                         </li>
 
+                        <li>
+                            <label htmlFor="blockRecall">
+                                <span>Block Message Recall</span>
+                                <Switch id="blockRecall" checked={blockRecall} onChange={e => setBlockRecall(e.target.checked)} />
+                            </label>
+                        </li>
+
                         <li>
                             <label htmlFor="confirmImagePaste">
                                 <span>Image paste Confirmation</span>

diff --git a/src/js/stores/chat.js b/src/js/stores/chat.js
@@ -6,6 +6,7 @@ import { ipcRenderer } from 'electron';
 import storage from 'utils/storage';
 import helper from 'utils/helper';
 import contacts from './contacts';
+import settings from './settings';
 import session from './session';
 import members from './members';
 import snackbar from './snackbar';
@@ -82,7 +83,7 @@ async function resolveMessage(message) {
 
                     message.MsgType += 2000;
                     message.transfer = {
-                        desc: value,
+                        desc: value.des,
                         money: +value.match(/[\d.]+元/)[0].slice(0, -1),
                     };
                     break;
@@ -122,9 +123,13 @@ async function resolveMessage(message) {
 
         case 10002:
             let text = isChatRoom ? message.Content.split(':<br/>').slice(-1).pop() : message.Content;
-            let { value } = helper.parseXml(text, 'replacemsg');
+            let { value } = helper.parseXml(text, ['replacemsg', 'msgid']);
 
-            message.Content = value;
+            if (!settings.blockRecall) {
+                self.deleteMessage(message.FromUserName, value.msgid);
+            }
+
+            message.Content = value.replacemsg;
             message.MsgType = 19999;
             break;
 

diff --git a/src/js/stores/settings.js b/src/js/stores/settings.js
@@ -11,6 +11,7 @@ class Settings {
     @observable showNotification = true;
     @observable confirmImagePaste = true;
     @observable startup = false;
+    @observable blockRecall = false;
     @observable downloads = '';
     @observable plugins = [{
         name: 'Message Backup',
@@ -26,6 +27,11 @@ class Settings {
         self.save();
     }
 
+    @action setBlockRecall(blockRecall) {
+        self.blockRecall = blockRecall;
+        self.save();
+    }
+
     @action setShowOnTray(showOnTray) {
         self.showOnTray = showOnTray;
         self.save();
@@ -53,7 +59,7 @@ class Settings {
 
     @action async init() {
         var settings = await storage.get('settings');
-        var { alwaysOnTop, showOnTray, showNotification, startup, downloads } = self;
+        var { alwaysOnTop, showOnTray, showNotification, blockRecall, startup, downloads } = self;
 
         if (settings && Object.keys(settings).length) {
             // Use !! force convert to a bool value
@@ -62,14 +68,16 @@ class Settings {
             self.showNotification = !!settings.showNotification;
             self.confirmImagePaste = !!settings.confirmImagePaste;
             self.startup = !!settings.startup;
-            self.downloads = !!settings.downloads;
+            self.downloads = settings.downloads;
+            self.blockRecall = !!settings.blockRecall;
         } else {
             await storage.set('settings', {
                 alwaysOnTop,
                 showOnTray,
                 showNotification,
                 startup,
                 downloads,
+                blockRecall,
             });
         }
 
@@ -87,7 +95,7 @@ class Settings {
     }
 
     save() {
-        var { alwaysOnTop, showOnTray, showNotification, confirmImagePaste, startup, downloads } = self;
+        var { alwaysOnTop, showOnTray, showNotification, confirmImagePaste, blockRecall, startup, downloads } = self;
 
         storage.set('settings', {
             alwaysOnTop,
@@ -96,6 +104,7 @@ class Settings {
             confirmImagePaste,
             startup,
             downloads,
+            blockRecall,
         });
 
         ipcRenderer.send('settings-apply', {
@@ -106,6 +115,7 @@ class Settings {
                 confirmImagePaste,
                 startup,
                 downloads,
+                blockRecall,
             }
         });
     }

diff --git a/src/js/utils/helper.js b/src/js/utils/helper.js
@@ -56,11 +56,13 @@ const helper = {
     parseXml: (text, tagName) => {
         var parser = new window.DOMParser();
         var xml = parser.parseFromString(text.replace(/&lt;/g, '<').replace(/&gt;/g, '>'), 'text/xml');
-        var value;
+        var value = {};
 
-        if (tagName) {
-            value = xml.getElementsByTagName(tagName)[0].childNodes[0].nodeValue;
-        }
+        tagName = Array.isArray(tagName) ? tagName : [tagName];
+
+        tagName.map(e => {
+            value[e] = xml.getElementsByTagName(e)[0].childNodes[0].nodeValue;
+        });
 
         return { xml, value };
     },