moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull expandSpoilers from Redux store

This commit is contained in:
Alex Gleason 2020-04-17 16:24:36 -05:00
parent 5fdcd80ceb
commit f20e5f7899
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/gabsocial/actions/importer/index.js
View File

@ -64,7 +64,10 @@ export function importFetchedStatuses(statuses) {
const polls = []; const polls = [];
function processStatus(status) { function processStatus(status) {
pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id]))); const normalOldStatus = getState().getIn(['statuses', status.id]);
const readingPrefs = getState().getIn(['preferences', 'reading']);
pushUnique(normalStatuses, normalizeStatus(status, normalOldStatus, readingPrefs));
pushUnique(accounts, status.account); pushUnique(accounts, status.account);
if (status.reblog && status.reblog.id) { if (status.reblog && status.reblog.id) {

5
app/gabsocial/actions/importer/normalizer.js
View File

@ -1,7 +1,6 @@
import escapeTextContentForBrowser from 'escape-html'; import escapeTextContentForBrowser from 'escape-html';
import emojify from '../../features/emoji/emoji'; import emojify from '../../features/emoji/emoji';
import { unescapeHTML } from '../../utils/html'; import { unescapeHTML } from '../../utils/html';
import { expandSpoilers } from '../../initial_state';
const domParser = new DOMParser(); const domParser = new DOMParser();
@ -35,8 +34,10 @@ export function normalizeAccount(account) {
return account; return account;
} }
export function normalizeStatus(status, normalOldStatus) { export function normalizeStatus(status, normalOldStatus, readingPrefs) {
const normalStatus = { ...status }; const normalStatus = { ...status };
const expandSpoilers = readingPrefs.getIn(['expand', 'spoilers']);
normalStatus.account = status.account.id; normalStatus.account = status.account.id;
if (status.reblog && status.reblog.id) { if (status.reblog && status.reblog.id) {

1
app/gabsocial/initial_state.js
View File

@ -8,7 +8,6 @@ const getMeta = (prop) => initialState && initialState.meta && initialState.meta
export const reduceMotion = getMeta('reduce_motion'); export const reduceMotion = getMeta('reduce_motion');
export const autoPlayGif = getMeta('auto_play_gif'); export const autoPlayGif = getMeta('auto_play_gif');
export const displayMedia = getMeta('display_media'); export const displayMedia = getMeta('display_media');
export const expandSpoilers = getMeta('expand_spoilers');
export const unfollowModal = getMeta('unfollow_modal'); export const unfollowModal = getMeta('unfollow_modal');
export const boostModal = getMeta('boost_modal'); export const boostModal = getMeta('boost_modal');
export const deleteModal = getMeta('delete_modal'); export const deleteModal = getMeta('delete_modal');