diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-15 04:36:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 04:36:41 +0100 |
| commit | ba84b6d4d7b2e1ccdcbfcdd5e0d09fbfdb241f45 (patch) | |
| tree | df510bf1efe17af68a5cfd9a1536c8bd21b9c46e /app/services | |
| parent | 317c43b75be027f971c1c7e28890fdd37b63e931 (diff) | |
Add `visibility` param to reblog REST API (#9851)
Use async worker for creating reblog notification to improve performance
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/reblog_service.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb index 33ddef8b8..ff48d9c75 100644 --- a/app/services/reblog_service.rb +++ b/app/services/reblog_service.rb @@ -7,8 +7,9 @@ class ReblogService < BaseService # Reblog a status and notify its remote author # @param [Account] account Account to reblog from # @param [Status] reblogged_status Status to be reblogged + # @param [Hash] options # @return [Status] - def call(account, reblogged_status) + def call(account, reblogged_status, options = {}) reblogged_status = reblogged_status.reblog if reblogged_status.reblog? authorize_with account, reblogged_status, :reblog? @@ -17,7 +18,7 @@ class ReblogService < BaseService return reblog unless reblog.nil? - reblog = account.statuses.create!(reblog: reblogged_status, text: '') + reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: options[:visibility] || account.user&.setting_default_privacy) DistributionWorker.perform_async(reblog.id) Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id) @@ -35,7 +36,7 @@ class ReblogService < BaseService reblogged_status = reblog.reblog if reblogged_status.account.local? - NotifyService.new.call(reblogged_status.account, reblog) + LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name) elsif reblogged_status.account.ostatus? NotificationWorker.perform_async(stream_entry_to_xml(reblog.stream_entry), reblog.account_id, reblogged_status.account_id) elsif reblogged_status.account.activitypub? && !reblogged_status.account.following?(reblog.account) |