|
|
@ -62,16 +62,20 @@ const normalizeStatus = (state, status) => { |
|
|
|
normalStatus.reblog = status.reblog.id; |
|
|
|
normalStatus.reblog = status.reblog.id; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n'); |
|
|
|
// Only calculate these values when status first encountered
|
|
|
|
|
|
|
|
// Otherwise keep the ones already in the reducer
|
|
|
|
|
|
|
|
if (!state.has(status.id)) { |
|
|
|
|
|
|
|
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) => { |
|
|
|
const emojiMap = normalStatus.emojis.reduce((obj, emoji) => { |
|
|
|
obj[`:${emoji.shortcode}:`] = emoji; |
|
|
|
obj[`:${emoji.shortcode}:`] = emoji; |
|
|
|
return obj; |
|
|
|
return obj; |
|
|
|
}, {}); |
|
|
|
}, {}); |
|
|
|
|
|
|
|
|
|
|
|
normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent; |
|
|
|
normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent; |
|
|
|
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap); |
|
|
|
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap); |
|
|
|
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap); |
|
|
|
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus))); |
|
|
|
return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus))); |
|
|
|
}; |
|
|
|
}; |
|
|
|