Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Introduce Ostatus name space (#4164)

Browse source 
* Wrap methods of ProcessFeedService::ProcessEntry in classes

This is a change same with 425acecfdb, except
that it has the following changes:

* Revert irrelevant change in find_or_create_conversation
* Fix error handling for RemoteActivity

* Introduce Ostatus name space
This commit is contained in:
Akihiko Odaki 2017-07-18 23:39:47 +09:00 • committed by Eugen Rochko
parent 4d42a38954
commit 89b988cab5
23 changed files with 516 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View file

@ -13,7 +13,7 @@ class AccountsController < ApplicationController
format.atom do
@entries = @account.stream_entries.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))
render xml: Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, @entries.to_a))
end
format.json do