diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:17:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:17:53 -0400 |
commit | 3e8c1a1c36b9d5cba96968d351cae2e2eefc3d22 (patch) | |
tree | 691bb470a0811e28b2ebd5d32255048a7df763b3 /app/controllers/accounts_controller.rb | |
parent | 7aede8e72092fa2b8846f2212dff411247a841b1 (diff) | |
parent | 9fd8bbe15c18e0931ccf2c00fb6a1e69acfb0b0c (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 |