parent
cce1c3252f
commit
0d19fcc2fb
19 changed files with 284 additions and 414 deletions
@ -0,0 +1,75 @@ |
|||||||
|
import { normalizeAccount, normalizeStatus } from './normalizer'; |
||||||
|
|
||||||
|
export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT'; |
||||||
|
export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT'; |
||||||
|
export const STATUS_IMPORT = 'STATUS_IMPORT'; |
||||||
|
export const STATUSES_IMPORT = 'STATUSES_IMPORT'; |
||||||
|
|
||||||
|
function pushUnique(array, object) { |
||||||
|
if (array.every(element => element.id !== object.id)) { |
||||||
|
array.push(object); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
export function importAccount(account) { |
||||||
|
return { type: ACCOUNT_IMPORT, account }; |
||||||
|
} |
||||||
|
|
||||||
|
export function importAccounts(accounts) { |
||||||
|
return { type: ACCOUNTS_IMPORT, accounts }; |
||||||
|
} |
||||||
|
|
||||||
|
export function importStatus(status) { |
||||||
|
return { type: STATUS_IMPORT, status }; |
||||||
|
} |
||||||
|
|
||||||
|
export function importStatuses(statuses) { |
||||||
|
return { type: STATUSES_IMPORT, statuses }; |
||||||
|
} |
||||||
|
|
||||||
|
export function importFetchedAccount(account) { |
||||||
|
return importFetchedAccounts([account]); |
||||||
|
} |
||||||
|
|
||||||
|
export function importFetchedAccounts(accounts) { |
||||||
|
const normalAccounts = []; |
||||||
|
|
||||||
|
function processAccount(account) { |
||||||
|
pushUnique(normalAccounts, normalizeAccount(account)); |
||||||
|
|
||||||
|
if (account.moved) { |
||||||
|
processAccount(account.moved); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
accounts.forEach(processAccount); |
||||||
|
//putAccounts(normalAccounts, !autoPlayGif);
|
||||||
|
|
||||||
|
return importAccounts(normalAccounts); |
||||||
|
} |
||||||
|
|
||||||
|
export function importFetchedStatus(status) { |
||||||
|
return importFetchedStatuses([status]); |
||||||
|
} |
||||||
|
|
||||||
|
export function importFetchedStatuses(statuses) { |
||||||
|
return (dispatch, getState) => { |
||||||
|
const accounts = []; |
||||||
|
const normalStatuses = []; |
||||||
|
|
||||||
|
function processStatus(status) { |
||||||
|
pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id]))); |
||||||
|
pushUnique(accounts, status.account); |
||||||
|
|
||||||
|
if (status.reblog && status.reblog.id) { |
||||||
|
processStatus(status.reblog); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
statuses.forEach(processStatus); |
||||||
|
//putStatuses(normalStatuses);
|
||||||
|
|
||||||
|
dispatch(importFetchedAccounts(accounts)); |
||||||
|
dispatch(importStatuses(normalStatuses)); |
||||||
|
}; |
||||||
|
} |
@ -0,0 +1,63 @@ |
|||||||
|
import escapeTextContentForBrowser from 'escape-html'; |
||||||
|
import emojify from 'flavours/glitch/util/emoji'; |
||||||
|
import { unescapeHTML } from 'flavours/glitch/util/html'; |
||||||
|
import { expandSpoilers } from 'flavours/glitch/util/initial_state'; |
||||||
|
|
||||||
|
const domParser = new DOMParser(); |
||||||
|
|
||||||
|
const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => { |
||||||
|
obj[`:${emoji.shortcode}:`] = emoji; |
||||||
|
return obj; |
||||||
|
}, {}); |
||||||
|
|
||||||
|
export function normalizeAccount(account) { |
||||||
|
account = { ...account }; |
||||||
|
|
||||||
|
const emojiMap = makeEmojiMap(account); |
||||||
|
const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name; |
||||||
|
|
||||||
|
account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap); |
||||||
|
account.note_emojified = emojify(account.note, emojiMap); |
||||||
|
|
||||||
|
if (account.fields) { |
||||||
|
account.fields = account.fields.map(pair => ({ |
||||||
|
...pair, |
||||||
|
name_emojified: emojify(escapeTextContentForBrowser(pair.name)), |
||||||
|
value_emojified: emojify(pair.value, emojiMap), |
||||||
|
value_plain: unescapeHTML(pair.value), |
||||||
|
})); |
||||||
|
} |
||||||
|
|
||||||
|
if (account.moved) { |
||||||
|
account.moved = account.moved.id; |
||||||
|
} |
||||||
|
|
||||||
|
return account; |
||||||
|
} |
||||||
|
|
||||||
|
export function normalizeStatus(status, normalOldStatus) { |
||||||
|
const normalStatus = { ...status }; |
||||||
|
normalStatus.account = status.account.id; |
||||||
|
|
||||||
|
if (status.reblog && status.reblog.id) { |
||||||
|
normalStatus.reblog = status.reblog.id; |
||||||
|
} |
||||||
|
|
||||||
|
// Only calculate these values when status first encountered
|
||||||
|
// Otherwise keep the ones already in the reducer
|
||||||
|
if (normalOldStatus) { |
||||||
|
normalStatus.search_index = normalOldStatus.get('search_index'); |
||||||
|
normalStatus.contentHtml = normalOldStatus.get('contentHtml'); |
||||||
|
normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml'); |
||||||
|
} else { |
||||||
|
const spoilerText = normalStatus.spoiler_text || ''; |
||||||
|
const searchContent = [spoilerText, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n'); |
||||||
|
const emojiMap = makeEmojiMap(normalStatus); |
||||||
|
|
||||||
|
normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent; |
||||||
|
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap); |
||||||
|
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(spoilerText), emojiMap); |
||||||
|
} |
||||||
|
|
||||||
|
return normalStatus; |
||||||
|
} |
Loading…
Reference in new issue