Make auto-play GIFs preference affect custom emojis in web UI (#5254)

2017-10-07 02:38:52 +02:00
parent 4413d81d7f
commit 45682f876d
5 changed files with 17 additions and 7 deletions
--- a/app/javascript/mastodon/reducers/custom_emojis.js
+++ b/app/javascript/mastodon/reducers/custom_emojis.js
@ -8,7 +8,7 @@ const initialState = ImmutableList();
 export default function custom_emojis(state = initialState, action) {
  switch(action.type) {
  case STORE_HYDRATE:
-    emojiSearch('', { custom: buildCustomEmojis(action.state.get('custom_emojis', [])) });
+    emojiSearch('', { custom: buildCustomEmojis(action.state.get('custom_emojis', []), action.state.getIn(['meta', 'auto_play_gif'], false)) });
    return action.state.get('custom_emojis');
  default:
    return state;