diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-09 11:30:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 11:30:28 +0100 |
| commit | 67125534bc0fd48a45d6cb17a5c78712d8e87150 (patch) | |
| tree | b718c8b54a0bd63eab69abaef2267c8f0aa9a9b9 /app/controllers/activitypub/replies_controller.rb | |
| parent | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (diff) | |
| parent | ecd83f495c18486bc7ea901423f6fccfd910b277 (diff) | |
Merge pull request #1454 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/activitypub/replies_controller.rb')
| -rw-r--r-- | app/controllers/activitypub/replies_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb index 43bf4e657..fde6c861f 100644 --- a/app/controllers/activitypub/replies_controller.rb +++ b/app/controllers/activitypub/replies_controller.rb @@ -31,7 +31,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController end def set_replies - @replies = only_other_accounts? ? Status.where.not(account_id: @account.id) : @account.statuses + @replies = only_other_accounts? ? Status.where.not(account_id: @account.id).joins(:account).merge(Account.without_suspended) : @account.statuses @replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted]) @replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id]) end |