diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:33:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:33:40 -0400 |
| commit | d7d165db5b1b7b1959a36e1f0e3da875befc2574 (patch) | |
| tree | 5be0ded23cf8a3190a3173bd5b16f4c4af77207f /app/controllers/accounts_controller.rb | |
| parent | 73b8e67f4b103fc3400064d153807d6d88f758d4 (diff) | |
| parent | d7f4300ee3ff44a42453ea8042034d651a9789da (diff) | |
Merge branch 'master' into add-infinimatix.net-instance
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 |