add animated emoji

RiYonte · Oct 30, 2017 · 814faeb · 814faeb
1 parent bbb5ed7
commit 814faeb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/js/pages/Home/ChatContent/index.js b/src/js/pages/Home/ChatContent/index.js
@@ -138,6 +138,7 @@ export default class ChatContent extends Component {
                     </div>
                 `;
             case 47:
+            case 49 + 8:
                 // External emoji
                 let emoji = message.emoji;
 
@@ -288,7 +289,7 @@ export default class ChatContent extends Component {
                     [classes.isText]: type === 1 && !message.location,
                     [classes.isLocation]: type === 1 && message.location,
                     [classes.isImage]: type === 3,
-                    [classes.isEmoji]: type === 47,
+                    [classes.isEmoji]: type === 47 || type === 49 + 8,
                     [classes.isVoice]: type === 34,
                     [classes.isContact]: type === 42,
                     [classes.isVideo]: type === 43,

diff --git a/src/js/stores/chat.js b/src/js/stores/chat.js
@@ -48,10 +48,12 @@ async function resolveMessage(message) {
             // External emoji
             if (!content) break;
 
-            let emoji = helper.parseKV(content);
+            {
+                let emoji = helper.parseKV(content);
 
-            emoji.src = `${axios.defaults.baseURL}cgi-bin/mmwebwx-bin/webwxgetmsgimg?&msgid=${message.MsgId}&skey=${auth.skey}`;
-            message.emoji = emoji;
+                emoji.src = `${axios.defaults.baseURL}cgi-bin/mmwebwx-bin/webwxgetmsgimg?&msgid=${message.MsgId}&skey=${auth.skey}`;
+                message.emoji = emoji;
+            }
             break;
 
         case 42:
@@ -112,6 +114,19 @@ async function resolveMessage(message) {
                     };
                     break;
 
+                case 8:
+                    // Animated emoji
+                    if (!content) break;
+
+                    {
+                        let emoji = helper.parseKV(content) || {};
+
+                        emoji.src = `${axios.defaults.baseURL}cgi-bin/mmwebwx-bin/webwxgetmsgimg?&msgid=${message.MsgId}&skey=${auth.skey}&type=big`;
+                        message.MsgType += 8;
+                        message.emoji = emoji;
+                    }
+                    break;
+
                 default:
                     console.error('Unknow app message: %o', Object.assign({}, message));
                     message.Content = `收到一条暂不支持的消息类型，请在手机上查看（${message.FileName || 'No Title'}）。`;

diff --git a/src/js/utils/helper.js b/src/js/utils/helper.js
@@ -128,6 +128,7 @@ const helper = {
                 return '[Video]';
 
             case 47:
+            case 49 + 8:
                 // Emoji
                 return '[Emoji]';