From 89c77fe225a7550e19d0631ce2172fd2b49a605a Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 27 Oct 2017 19:08:30 +0200
Subject: [PATCH] Instantiate service classes for each call (fixes #5540)
 (#5543)

---
 app/services/post_status_service.rb      | 4 ++--
 app/services/process_mentions_service.rb | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index e37cd94df4..de350f8e6f 100644
--- 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 1c3eea3697..1fd2ece1c7 100644
--- 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