about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2017-11-07 22:15:15 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-11-07 22:15:15 +0100
commit889ada5ee257f7cecce55bd2366161d0a673a4f8 (patch)
tree1610be01119f13a90d67281f9f589799257a92f7
parent3f16caaa50beae1ea4a4e2df5820f5cca627d2be (diff)
Fix process mentions for local users, as local users are considered to use OStatus (#5618)
-rw-r--r--app/services/process_mentions_service.rb2
1 files changed, 1 insertions, 1 deletions
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}"