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

This commit is contained in:
Thibaut Girka committed 2018-08-19 09:27:18 +02:00
commit 88a0395a58
22 files changed
+108 -28

No files matched your search

+1 -1
View File
@@ -25,7 +25,7 @@ class ProcessMentionsService < BaseService
end
end
next match if mention_undeliverable?(mentioned_account)
next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended
mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status)