diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-26 18:34:27 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-26 18:34:27 +0200 |
| commit | f13d910f3ea3af1e6b5ff2ebfa084a86b1d7dfde (patch) | |
| tree | 6e373aa9ced74f68ee366cc50e23d14a524c36f9 /app/services | |
| parent | 444b65009411a08ddab95ec60b86b3cf63086c2e (diff) | |
| parent | 088dc0ec5a383006952c0b15508af882a4c1109c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/process_mentions_service.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index 9d239fc65..8c63b611d 100644 --- 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) |