gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix: 引用付きの投稿をブーストし、さらに引用された投稿を編集した時、フィルターがWeb表示に反映されない問題

Browse source
This commit is contained in:
KMY 2023-10-02 15:22:26 +09:00
parent 926f1df1a9
commit f5b6592911
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/selectors/index.js
View file

@ -38,23 +38,25 @@ export const makeGetStatus = () => {
(state, { id }) => state.getIn(['statuses', id]), (state, { id }) => state.getIn(['statuses', id]),
(state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]), (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
(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(['statuses', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), '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'])]),
getFilters, getFilters,
], ],
(statusBase, statusReblog, statusQuote, accountBase, accountReblog, filters) => { (statusBase, statusReblog, statusQuote, statusReblogQuote, accountBase, accountReblog, filters) => {
if (!statusBase || statusBase.get('isLoading')) { if (!statusBase || statusBase.get('isLoading')) {
return null; return null;
} }
if (statusReblog) { if (statusReblog) {
statusReblog = statusReblog.set('account', accountReblog); statusReblog = statusReblog.set('account', accountReblog);
statusQuote = statusReblogQuote;
} else { } else {
statusReblog = null; statusReblog = null;
} }
if (hideBlockingQuote && statusBase.getIn(['quote', 'quote_muted'])) { if (hideBlockingQuote && (statusReblog || statusBase).getIn(['quote', 'quote_muted'])) {
return null; return null;
} }