gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

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

Browse source
This commit is contained in:
Eugen Rochko 2017-10-07 02:38:52 +02:00 • committed by GitHub
parent 4413d81d7f
commit 45682f876d
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/reducers/custom_emojis.js
View file

@ -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;

5
app/javascript/mastodon/reducers/statuses.js
View file

@ -58,9 +58,10 @@ const normalizeStatus = (state, status) => {
normalStatus.reblog = status.reblog.id;
}
const searchContent = [status.spoiler_text, status.content].join(' ').replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n');
const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n');
const emojiMap = normalStatus.emojis.reduce((obj, emoji) => {
obj[`:${emoji.shortcode}:`] = emoji.static_url;
obj[`:${emoji.shortcode}:`] = emoji;
return obj;
}, {});