From: ThibG <thib@sitedethib.com>
Date: Tue, 7 Nov 2017 21:15:15 +0000 (+0100)
Subject: Fix process mentions for local users, as local users are considered to use OStatus... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=889ada5ee257f7cecce55bd2366161d0a673a4f8;p=mastodon.git

Fix process mentions for local users, as local users are considered to use OStatus (#5618)
---

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 65e6b1361..c1ff68209 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -17,7 +17,7 @@ class ProcessMentionsService < BaseService
         mentioned_account = nil
       end
 
-      next match if mentioned_account.nil? || (mentioned_account.ostatus? && status.stream_entry.hidden?)
+      next match if mentioned_account.nil? || (!mentioned_account.local? && mentioned_account.ostatus? && status.stream_entry.hidden?)
 
       mentioned_account.mentions.where(status: status).first_or_create(status: status)
       "@#{mentioned_account.acct}"