ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #634 - Only include innermost-level statuses in report UI 

Fix #635 - Include the initially-reported status in report UI even if it's not
among the user's most recent statuses
rebase/4.0.0rc2
Eugen Rochko 2017-02-14 23:59:46 +01:00
parent e571a01853
commit 0a2427f79b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/components/features/report/components/status_check_box.jsx
View File

@ -18,6 +18,10 @@ const StatusCheckBox = React.createClass({
const { status, checked, onToggle, disabled } = this.props; const { status, checked, onToggle, disabled } = this.props;
const content = { __html: emojify(status.get('content')) }; const content = { __html: emojify(status.get('content')) };
if (status.get('reblog')) {
return null;
}
return ( return (
<div className='status-check-box' style={{ display: 'flex' }}> <div className='status-check-box' style={{ display: 'flex' }}>
<div <div

2
app/assets/javascripts/components/features/report/index.jsx
View File

@ -27,7 +27,7 @@ const makeMapStateToProps = () => {
isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']), isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
account: getAccount(state, accountId), account: getAccount(state, accountId),
comment: state.getIn(['reports', 'new', 'comment']), comment: state.getIn(['reports', 'new', 'comment']),
statusIds: state.getIn(['timelines', 'accounts_timelines', accountId, 'items'], Immutable.List()) statusIds: Immutable.OrderedSet(state.getIn(['timelines', 'accounts_timelines', accountId, 'items'])).union(state.getIn(['reports', 'new', 'status_ids']))
}; };
}; };

4
app/assets/javascripts/components/reducers/reports.jsx
View File

@ -25,10 +25,10 @@ export default function reports(state = initialState, action) {
map.setIn(['new', 'account_id'], action.account.get('id')); map.setIn(['new', 'account_id'], action.account.get('id'));
if (state.getIn(['new', 'account_id']) !== action.account.get('id')) { if (state.getIn(['new', 'account_id']) !== action.account.get('id')) {
map.setIn(['new', 'status_ids'], action.status ? Immutable.Set([action.status.get('id')]) : Immutable.Set()); map.setIn(['new', 'status_ids'], action.status ? Immutable.Set([action.status.getIn(['reblog', 'id'], action.status.get('id'))]) : Immutable.Set());
map.setIn(['new', 'comment'], ''); map.setIn(['new', 'comment'], '');
} else { } else {
map.updateIn(['new', 'status_ids'], Immutable.Set(), set => set.add(action.status.get('id'))); map.updateIn(['new', 'status_ids'], Immutable.Set(), set => set.add(action.status.getIn(['reblog', 'id'], action.status.get('id'))));
} }
}); });
case REPORT_STATUS_TOGGLE: case REPORT_STATUS_TOGGLE: