about summary refs log tree commit diff
path: root/app/workers
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2017-07-18 23:39:47 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-07-18 16:39:47 +0200
commit89b988cab5e4729bd80400a2b25ec2b790ebd18d (patch)
tree44d8596f508876c7ad17fa40c3212abfbe4b3c3c /app/workers
parent4d42a389540690b32886f2a38af1f86aee617d27 (diff)
Introduce Ostatus name space (#4164)
* Wrap methods of ProcessFeedService::ProcessEntry in classes

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

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

* Introduce Ostatus name space
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/pubsubhubbub/distribution_worker.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
index 7592354cc..9c1fa76cb 100644
--- a/app/workers/pubsubhubbub/distribution_worker.rb
+++ b/app/workers/pubsubhubbub/distribution_worker.rb
@@ -22,7 +22,7 @@ class Pubsubhubbub::DistributionWorker
   def distribute_public!(stream_entries)
     return if stream_entries.empty?
 
-    @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries))
+    @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries))
 
     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions) do |subscription|
       [subscription.id, @payload]
@@ -32,7 +32,7 @@ class Pubsubhubbub::DistributionWorker
   def distribute_hidden!(stream_entries)
     return if stream_entries.empty?
 
-    @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries))
+    @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries))
     @domains = @account.followers.domains
 
     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url, s.domain) }) do |subscription|