Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire committed 2022-05-26 18:34:27 +02:00
commit f13d910f3e
29 files changed
+833 -369

No files matched your search

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