mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-28 17:43:27 +00:00
Fix process mentions for local users, as local users are considered to use OStatus (#5618)
This commit is contained in:
parent
3f16caaa50
commit
889ada5ee2
|
@ -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}"
|
||||||
|
|
Loading…
Reference in a new issue