diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:59:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:59:21 -0400 |
| commit | 4c05f0e630aacad594e7b21147340e2c0a0ac8ad (patch) | |
| tree | 4ef28c2f42dd8e4cdfd9815dd6550b5bd2601f36 /app/controllers/accounts_controller.rb | |
| parent | 96812a6c792c8b048ed8d4a50351d9696dcf0f77 (diff) | |
| parent | d438eab67301e767bdd040c6f9bd831c92214656 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/controllers/accounts_controller.rb')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index dc1aeb5ea..619c04be2 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -16,7 +16,8 @@ class AccountsController < ApplicationController end format.atom do - @entries = @account.stream_entries.order('id desc').where(activity_type: 'Status').where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) + @entries = @account.stream_entries.order('id desc').where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) + render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a)) end format.activitystreams2 |