diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-11 11:23:50 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-11 11:23:50 +0100 |
commit | 89bee860cdae399b796814f80a48eafa8b838d92 (patch) | |
tree | 7f31aaa85f78b170f22cadd8c53fca8d09f8e795 /app/services/post_status_service.rb | |
parent | 3cef04610cd809c7bd01adc00d34fb3d25261a16 (diff) | |
parent | 13a7f05030cdcbab24aeb25944a9a430238dbff1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.
Diffstat (limited to 'app/services/post_status_service.rb')
-rw-r--r-- | app/services/post_status_service.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 8a9d26c56..b9952369d 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -91,10 +91,13 @@ class PostStatusService < BaseService def postprocess_status! LinkCrawlWorker.perform_async(@status.id) unless @status.spoiler_text? DistributionWorker.perform_async(@status.id) + unless @status.local_only? Pubsubhubbub::DistributionWorker.perform_async(@status.stream_entry.id) ActivityPub::DistributionWorker.perform_async(@status.id) end + + PollExpirationNotifyWorker.perform_at(@status.poll.expires_at, @status.poll.id) if @status.poll end def validate_media! |