send file

cnvoid · Aug 11, 2017 · bc2b4bc · bc2b4bc
1 parent 199d291
commit bc2b4bc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/src/js/pages/Footer/Home.js b/src/js/pages/Footer/Home.js
@@ -36,12 +36,20 @@ export default class Input extends Component {
         this.refs.input.value += `[${emoji}]`;
     }
 
-    process(file) {
+    async process(file) {
         if (!file) return;
 
-        var mediaid = this.props.upload(file);
+        var mediaId = await this.props.upload(file);
 
-        this.props.sendFile(mediaid);
+        this.props.sendMessage(this.props.user, {
+            type: 49 + 6,
+            file: {
+                name: file.name,
+                size: file.size,
+                mediaId,
+                extension: file.name.split('.').slice(-1).pop()
+            },
+        });
     }
 
     render() {

diff --git a/src/js/stores/chat.js b/src/js/stores/chat.js
@@ -405,6 +405,7 @@ class Chat {
                 isme: true,
                 CreateTime: +new Date() / 1000,
                 MsgId: response.data.MsgID,
+                MsgType: 3,
                 HeadImgUrl: session.user.User.HeadImgUrl,
             }),
         };
@@ -417,11 +418,7 @@ class Chat {
     }
 
     @action async sendFileMessage(auth, message, isForward) {
-        var response = await axios.post((
-            isForward
-                ? '/cgi-bin/mmwebwx-bin/webwxsendappmsg?fun=async&f=json'
-                : '/cgi-bin/mmwebwx-bin/webwxsendmsgimg&fun=async'
-        ), {
+        var response = await axios.post('/cgi-bin/mmwebwx-bin/webwxsendappmsg?fun=async&f=json', {
             BaseRequest: {
                 Sid: auth.wxsid,
                 Uin: auth.wxuin,
@@ -461,6 +458,7 @@ class Chat {
                 isme: true,
                 CreateTime: +new Date() / 1000,
                 MsgId: response.data.MsgID,
+                MsgType: 49 + 6,
                 HeadImgUrl: session.user.User.HeadImgUrl,
             }),
         };
@@ -576,10 +574,10 @@ class Chat {
         formdata.append('pass_ticket', auth.passTicket);
         formdata.append('filename', file.slice(0, file.size));
 
-        var response = axios.post(server, formdata);
+        var response = await axios.post(server, formdata);
 
-        if (response.BaseResponse.Ret === 0) {
-            return response.MediaId;
+        if (response.data.BaseResponse.Ret === 0) {
+            return response.data.MediaId;
         }
 
         return false;