diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:13:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:13:06 -0400 |
| commit | cf13c97cb2890d7bf51540f632cf725f89baefd9 (patch) | |
| tree | d58925eed77815140c011bb70667fdc4b80173c5 /app/controllers/accounts_controller.rb | |
| parent | 65b3a2a5a6e3151cf4da89132326b796a5c0687a (diff) | |
| parent | 90a408f5927956f0cbe9b81812daca7b4a92d807 (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 |