From 21972bb39886942d6946757ff8c8f9fe329bb20f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 5 Feb 2017 02:02:46 +0100
Subject: [PATCH] No replies filter on home timeline no longer hides
self-replies
---
.../features/ui/containers/status_list_container.jsx | 7 ++++---
app/views/api/v1/statuses/_show.rabl | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
index 8af7b0c3c..100989d22 100644
--- a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
+++ b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
@@ -7,8 +7,9 @@ import { createSelector } from 'reselect';
const getStatusIds = createSelector([
(state, { type }) => state.getIn(['settings', type], Immutable.Map()),
(state, { type }) => state.getIn(['timelines', type, 'items'], Immutable.List()),
- (state) => state.get('statuses')
-], (columnSettings, statusIds, statuses) => statusIds.filter(id => {
+ (state) => state.get('statuses'),
+ (state) => state.getIn(['meta', 'me'])
+], (columnSettings, statusIds, statuses, me) => statusIds.filter(id => {
const statusForId = statuses.get(id);
let showStatus = true;
@@ -17,7 +18,7 @@ const getStatusIds = createSelector([
}
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) {
diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl
index 7309a78b8..059e0d13f 100644
--- a/app/views/api/v1/statuses/_show.rabl
+++ b/app/views/api/v1/statuses/_show.rabl
@@ -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(:content) { |status| Formatter.instance.format(status) }