引用をBTしたとき、アカウント情報が書き換わる問題を修正
This commit is contained in:
parent
e1ac510c65
commit
ddcf4eb090
1 changed files with 1 additions and 8 deletions
|
@ -40,11 +40,10 @@ export const makeGetStatus = () => {
|
||||||
(state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id'])]),
|
(state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id'])]),
|
||||||
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
|
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
|
||||||
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
|
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
|
||||||
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
|
|
||||||
getFilters,
|
getFilters,
|
||||||
],
|
],
|
||||||
|
|
||||||
(statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, filters) => {
|
(statusBase, statusReblog, statusQuote, accountBase, accountReblog, filters) => {
|
||||||
if (!statusBase || statusBase.get('isLoading')) {
|
if (!statusBase || statusBase.get('isLoading')) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -55,12 +54,6 @@ export const makeGetStatus = () => {
|
||||||
statusReblog = null;
|
statusReblog = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusQuote) {
|
|
||||||
statusQuote = statusQuote.set('account', accountQuote);
|
|
||||||
} else {
|
|
||||||
statusQuote = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hideBlockingQuote && statusBase.getIn(['quote', 'quote_muted'])) {
|
if (hideBlockingQuote && statusBase.getIn(['quote', 'quote_muted'])) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue