Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-27 04:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thibaut Girka
2018-08-19 09:27:18 +02:00
parent 44e31c3e53 59c68c1a74
commit 88a0395a58
22 changed files with 108 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/process_mentions_service.rb
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)