]> cat aescling's git repositories - mastodon.git/commitdiff
Fix process mentions for local users, as local users are considered to use OStatus...
authorThibG <thib@sitedethib.com>
Tue, 7 Nov 2017 21:15:15 +0000 (22:15 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 7 Nov 2017 21:15:15 +0000 (22:15 +0100)
app/services/process_mentions_service.rb

index 65e6b1361887d2f8af7cff1ea62c6dfce75a2c85..c1ff6820903f319c3ec7ccfdccca61ff4b69447d 100644 (file)
@@ -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}"