aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-17 10:36:06 +0000
committerlain <lain@soykaf.club>2020-07-17 10:36:06 +0000
commit067caacb296bb26a6d7197426f36be1f4ff079b7 (patch)
tree9470f72f393a7a97c35138553cb8a2b35e7e9740 /src
parent950ae6d89a95e74e74b3f2e5abcd9233c3db8958 (diff)
parentf28ba3dfdbeed48a641319a29c4924700b4fe209 (diff)
Merge branch 'fix/reply-filtering-limit-to-friends-public' into 'develop'
Fix #898 and #900 Limit reply filtering to home and public timelines Closes #900 and #898 See merge request pleroma/pleroma-fe!1197
Diffstat (limited to 'src')
-rw-r--r--src/services/timeline_fetcher/timeline_fetcher.service.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 214294eb..d0cddf84 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -43,7 +43,9 @@ const fetchAndUpdate = ({
args['userId'] = userId
args['tag'] = tag
args['withMuted'] = !hideMutedPosts
- if (loggedIn) args['replyVisibility'] = replyVisibility
+ if (loggedIn && ['friends', 'public', 'publicAndExternal'].includes(timeline)) {
+ args['replyVisibility'] = replyVisibility
+ }
const numStatusesBeforeFetch = timelineData.statuses.length