From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 4 Sep 2016 19:07:29 +0000 (+0200)
Subject: Fix wrongful mentions breaking status update
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=29996a7e8b5bde15d3409f3f19820afa13dd1e33;p=mastodon.git

Fix wrongful mentions breaking status update
---

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 288f56be4..fb605326d 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -12,9 +12,10 @@ class ProcessMentionsService < BaseService
 
       if mentioned_account.nil? && !domain.nil?
         mentioned_account = follow_remote_account_service.("#{match.first}")
-        next if mentioned_account.nil?
       end
 
+      next if mentioned_account.nil?
+
       mentioned_account.mentions.where(status: status).first_or_create(status: status)
     end