|
|
@ -38,7 +38,7 @@ class ProcessMentionsService < BaseService
|
|
|
|
mentioned_account = Account.find_remote(username, domain)
|
|
|
|
mentioned_account = Account.find_remote(username, domain)
|
|
|
|
|
|
|
|
|
|
|
|
# Unapproved and unconfirmed accounts should not be mentionable
|
|
|
|
# Unapproved and unconfirmed accounts should not be mentionable
|
|
|
|
next if mentioned_account&.local? && !(mentioned_account.user_confirmed? && mentioned_account.user_approved?)
|
|
|
|
next match if mentioned_account&.local? && !(mentioned_account.user_confirmed? && mentioned_account.user_approved?)
|
|
|
|
|
|
|
|
|
|
|
|
# If the account cannot be found or isn't the right protocol,
|
|
|
|
# If the account cannot be found or isn't the right protocol,
|
|
|
|
# first try to resolve it
|
|
|
|
# first try to resolve it
|
|
|
|