zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

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

This commit is contained in:
ThibG 2017-11-07 22:15:15 +01:00 committed by Eugen Rochko
parent 3f16caaa50
commit 889ada5ee2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/process_mentions_service.rb
View File

@ -17,7 +17,7 @@ class ProcessMentionsService < BaseService
mentioned_account = nil mentioned_account = nil
end 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.mentions.where(status: status).first_or_create(status: status)
"@#{mentioned_account.acct}" "@#{mentioned_account.acct}"