From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 11 Mar 2019 10:23:50 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=89bee860cdae399b796814f80a48eafa8b838d92;p=mastodon.git

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.
---

89bee860cdae399b796814f80a48eafa8b838d92
diff --cc app/services/post_status_service.rb
index 8a9d26c56,a1705a6ad..b9952369d
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@@ -91,10 -88,9 +91,13 @@@ class PostStatusService < BaseServic
    def postprocess_status!
      LinkCrawlWorker.perform_async(@status.id) unless @status.spoiler_text?
      DistributionWorker.perform_async(@status.id)
 -    Pubsubhubbub::DistributionWorker.perform_async(@status.stream_entry.id)
 -    ActivityPub::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!