Instantiate service classes for each call (fixes #5540) (#5543)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index e37cd94df4ba969b1f50bb3f3314a9eeb4c6a350..de350f8e6f4d064352cf960b48cf3eadaf7622f9 100644 (file)
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -70,11 +70,11 @@ class PostStatusService < BaseService
   end
 
   def process_mentions_service
-    @process_mentions_service ||= ProcessMentionsService.new
+    ProcessMentionsService.new
   end
 
   def process_hashtags_service
-    @process_hashtags_service ||= ProcessHashtagsService.new
+    ProcessHashtagsService.new
   end
 
   def redis

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 1c3eea3697bc56221d2d3047d879510c019ee3f0..1fd2ece1c7a1b1f64a7604e7e468a0a94c9792a6 100644 (file)
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -16,7 +16,7 @@ class ProcessMentionsService < BaseService
 
       if mentioned_account.nil? && !domain.nil?
         begin
-          mentioned_account = follow_remote_account_service.call(match.first.to_s)
+          mentioned_account = resolve_remote_account_service.call(match.first.to_s)
         rescue Goldfinger::Error, HTTP::Error
           mentioned_account = nil
         end
@@ -54,7 +54,7 @@ class ProcessMentionsService < BaseService
     ).as_json).sign!(status.account))
   end
 
-  def follow_remote_account_service
-    @follow_remote_account_service ||= ResolveRemoteAccountService.new
+  def resolve_remote_account_service
+    ResolveRemoteAccountService.new
   end
 end