From 036f422877693ae30079c322bbd3ebf9155a8409 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Wed, 17 Apr 2019 13:43:29 -0500 Subject: Make sure only distributable statuses are marked curated; move bangtags processing into own helper lib. --- app/services/favourite_service.rb | 2 +- app/services/reblog_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/services') diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb index 2573bde0c..98275b37e 100644 --- a/app/services/favourite_service.rb +++ b/app/services/favourite_service.rb @@ -56,7 +56,7 @@ class FavouriteService < BaseService end def curate_status(status) - return if status.curated || status.direct_visibility? || (status.reply? && status.in_reply_to_account_id != status.account_id) + return if status.curated || !status.distributable? || (status.reply? && status.in_reply_to_account_id != status.account_id) status.curated = true status.save FanOutOnWriteService.new.call(status) diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb index a9b662b0c..1a39c6c95 100644 --- a/app/services/reblog_service.rb +++ b/app/services/reblog_service.rb @@ -65,7 +65,7 @@ class ReblogService < BaseService end def curate_status(status) - return if status.curated || status.direct_visibility? || (status.reply? && status.in_reply_to_account_id != status.account_id) + return if status.curated || !status.distributable? || (status.reply? && status.in_reply_to_account_id != status.account_id) status.curated = true status.save FanOutOnWriteService.new.call(status) -- cgit