diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-09-21 02:22:56 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-09-21 14:52:42 -0500 |
| commit | 39b07aad85c0abd897f37860f5c9da854dcf523d (patch) | |
| tree | 42e31cdcf95baa357ca1d5e91476421a9803f4ab /app/controllers/activitypub | |
| parent | 97d578eebdcbbc4705a303e8923e0332651890c1 (diff) | |
Drop Monsterfork v2 thread permissions; simplify feed filters
Diffstat (limited to 'app/controllers/activitypub')
| -rw-r--r-- | app/controllers/activitypub/outboxes_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/activitypub/replies_controller.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index 51945656f..4f2ed4db4 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -63,7 +63,6 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController include_replies: true, include_reblogs: true, public: !(owner? || follower?), - include_semiprivate: owner? || mutual_follower?, exclude_local_only: true ) end diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb index 4d553fc07..fd12f0745 100644 --- a/app/controllers/activitypub/replies_controller.rb +++ b/app/controllers/activitypub/replies_controller.rb @@ -33,7 +33,6 @@ class ActivityPub::RepliesController < ActivityPub::BaseController def set_replies @replies = only_other_accounts? ? Status.where.not(account_id: @account.id) : @account.statuses @replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted]) - @replies = @replies.without_semiprivate unless authenticated_or_following?(@account) @replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id]) end |