mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

No replies filter on home timeline no longer hides self-replies

This commit is contained in:
Eugen Rochko 2017-02-05 02:02:46 +01:00
parent dbb7e5a644
commit 21972bb398
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
View File

@ -7,8 +7,9 @@ import { createSelector } from 'reselect';
const getStatusIds = createSelector([ const getStatusIds = createSelector([
(state, { type }) => state.getIn(['settings', type], Immutable.Map()), (state, { type }) => state.getIn(['settings', type], Immutable.Map()),
(state, { type }) => state.getIn(['timelines', type, 'items'], Immutable.List()), (state, { type }) => state.getIn(['timelines', type, 'items'], Immutable.List()),
(state) => state.get('statuses') (state) => state.get('statuses'),
], (columnSettings, statusIds, statuses) => statusIds.filter(id => { (state) => state.getIn(['meta', 'me'])
], (columnSettings, statusIds, statuses, me) => statusIds.filter(id => {
const statusForId = statuses.get(id); const statusForId = statuses.get(id);
let showStatus = true; let showStatus = true;
@ -17,7 +18,7 @@ const getStatusIds = createSelector([
} }
if (columnSettings.getIn(['shows', 'reply']) === false) { if (columnSettings.getIn(['shows', 'reply']) === false) {
showStatus = showStatus && statusForId.get('in_reply_to_id') === null; showStatus = showStatus && (statusForId.get('in_reply_to_id') === null || statusForId.get('in_reply_to_account_id') === me);
} }
if (columnSettings.getIn(['regex', 'body'], '').trim().length > 0) { if (columnSettings.getIn(['regex', 'body'], '').trim().length > 0) {

2
app/views/api/v1/statuses/_show.rabl
View File

@ -1,4 +1,4 @@
attributes :id, :created_at, :in_reply_to_id, :sensitive, :spoiler_text, :visibility attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id, :sensitive, :spoiler_text, :visibility
node(:uri) { |status| TagManager.instance.uri_for(status) } node(:uri) { |status| TagManager.instance.uri_for(status) }
node(:content) { |status| Formatter.instance.format(status) } node(:content) { |status| Formatter.instance.format(status) }