about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/ui
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-12-06 22:20:55 -0600
committerGitHub <noreply@github.com>2017-12-06 22:20:55 -0600
commit935c1944e27be4df9ba821a0f38fd599d1877a31 (patch)
tree9361644967707c69669131c52a47646cafac0f4c /app/javascript/flavours/glitch/features/ui
parentde5620995175b7c1c0fc458bd78c12d8c5860aad (diff)
parent2f2467ce8e4403ef6a21d6a64ecb208124eca0ee (diff)
Merge pull request #241 from glitch-soc/no-dm-option
Add option to remove DMs from home (#126)
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui')
-rw-r--r--app/javascript/flavours/glitch/features/ui/containers/status_list_container.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js b/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
index 69508f9ff..eca85b8e6 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
@@ -32,6 +32,10 @@ const makeGetStatusIds = () => createSelector([
       showStatus = showStatus && (statusForId.get('in_reply_to_id') === null || statusForId.get('in_reply_to_account_id') === me);
     }
 
+    if (columnSettings.getIn(['shows', 'direct']) === false) {
+      showStatus = showStatus && statusForId.get('visibility') !== 'direct';
+    }
+
     if (showStatus && regex && statusForId.get('account') !== me) {
       const searchIndex = statusForId.get('reblog') ? statuses.getIn([statusForId.get('reblog'), 'search_index']) : statusForId.get('search_index');
       showStatus = !regex.test(searchIndex);