diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-11-27 00:54:40 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-11-27 00:54:40 +0000 |
| commit | 384a602fd4117a73338542c59985f54acf5fb3f8 (patch) | |
| tree | 2885959ad124784985daa7709cd645a5a8802a07 /app/controllers/accounts_controller.rb | |
| parent | 72444f73ef4e04118f9c66b965c3c903cff8ef37 (diff) | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/accounts_controller.rb')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 85d9e784a..3a4382850 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -32,7 +32,7 @@ class AccountsController < ApplicationController format.atom do @entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(PAGE_SIZE, params[:max_id], params[:since_id]) - render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, @entries.reject { |entry| entry.status.nil? })) + render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, @entries.reject { |entry| entry.status.nil? || entry.status.local_only? })) end format.rss do |