diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-20 16:37:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 16:37:35 -0600 |
| commit | 24b6e4121f656d24adc5676e8a207ded610a7ea7 (patch) | |
| tree | 1c7b908468e12a40a6433f02f86f2cf47fa53cf9 /app/lib/activitypub/activity.rb | |
| parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
| parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) | |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'app/lib/activitypub/activity.rb')
| -rw-r--r-- | app/lib/activitypub/activity.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 820189d29..0f9e4f263 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -69,12 +69,13 @@ class ActivityPub::Activity def distribute(status) crawl_links(status) + notify_about_reblog(status) if reblog_of_local_account?(status) + notify_about_mentions(status) + # Only continue if the status is supposed to have # arrived in real-time return unless @options[:override_timestamps] - notify_about_reblog(status) if reblog_of_local_account?(status) - notify_about_mentions(status) distribute_to_followers(status) end |