From 059ebbf48dc56971b88e26a15303a75643de8b98 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 20 Sep 2016 00:39:03 +0200
Subject: Separate PuSH subscriptions from following, add mastodon:push:refresh
 task, respect hub.lease_seconds (fix #46)

---
 app/services/process_interaction_service.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/services/process_interaction_service.rb')

diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index 3266f73e3..1e3ed6b12 100644
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -14,7 +14,7 @@ class ProcessInteractionService < BaseService
     account  = Account.find_by(username: username, domain: domain)
 
     if account.nil?
-      account = follow_remote_account_service.("#{username}@#{domain}", false)
+      account = follow_remote_account_service.("#{username}@#{domain}")
     end
 
     if salmon.verify(envelope, account.keypair)
@@ -71,7 +71,7 @@ class ProcessInteractionService < BaseService
     return if status.nil?
 
     if account.id == status.account_id
-      RemoveStatusService.new.(status)
+      remove_status_service.(status)
     end
   end
 
@@ -108,4 +108,8 @@ class ProcessInteractionService < BaseService
   def update_remote_profile_service
     @update_remote_profile_service ||= UpdateRemoteProfileService.new
   end
+
+  def remove_status_service
+    @remove_status_service ||= RemoveStatusService.new
+  end
 end
-- 
cgit