diff options
author | foxiehkins <foxiehkins@gmail.com> | 2017-04-07 14:01:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 14:01:20 +0100 |
commit | 41396de7a90f23dd0afe1afa3dab1be43b7b6ecd (patch) | |
tree | 5cacec3a442a671990f972196fa90c90903e83cf /app/controllers/accounts_controller.rb | |
parent | ac1989d2c07b707699641987d62697103698393c (diff) | |
parent | 4e41cd9ab8f51120d558b70528b163c98993be53 (diff) |
Merge branch 'master' into master
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 |