diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-21 16:40:02 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-21 16:40:02 +0200 |
commit | a4c9bda771c04526005f708dfb9ca2ccced60d52 (patch) | |
tree | 9ed60f78e2e8acc823bccb7c75ecaa3fdb1b7ab6 /app/services/remove_status_service.rb | |
parent | 98ecadbf99aa823164608f796a40ab1cd067bdc2 (diff) | |
parent | 46061dc041b0a2a4a3907976cc3432abdb1d67ec (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.
Diffstat (limited to 'app/services/remove_status_service.rb')
-rw-r--r-- | app/services/remove_status_service.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index e164c03ab..8c3e18444 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -20,6 +20,7 @@ class RemoveStatusService < BaseService remove_reblogs remove_from_hashtags remove_from_public + remove_from_media if status.media_attachments.any? remove_from_direct if status.direct_visibility? @status.destroy! @@ -131,6 +132,13 @@ class RemoveStatusService < BaseService Redis.current.publish('timeline:public:local', @payload) if @status.local? end + def remove_from_media + return unless @status.public_visibility? + + Redis.current.publish('timeline:public:media', @payload) + Redis.current.publish('timeline:public:local:media', @payload) if @status.local? + end + def remove_from_direct @mentions.each do |mention| Redis.current.publish("timeline:direct:#{mention.account.id}", @payload) if mention.account.local? |