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

2022-05-26 18:34:27 +02:00
parent 444b650094 088dc0ec5a
commit f13d910f3e
29 changed files with 833 additions and 369 deletions
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -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)