diff options
author | Holly 'Frinkel' Lotor <admin@frinkel.tech> | 2020-01-20 21:14:05 +0000 |
---|---|---|
committer | Holly 'Frinkel' Lotor <admin@frinkel.tech> | 2020-01-20 16:58:12 -0500 |
commit | 7dc114f5895905151d7d903b1adb6928da46a45a (patch) | |
tree | c2d195213a8514f5c020d9927b3386bb976d4d06 /app/services/follow_service.rb | |
parent | e37c5a967af4b9c4338df709646375ea427f157e (diff) |
More smoke testing, I believe the stability is passable now
Diffstat (limited to 'app/services/follow_service.rb')
-rw-r--r-- | app/services/follow_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index e3f4bf19d..7b714bfb2 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -13,7 +13,7 @@ class FollowService < BaseService target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true) raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? - raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? || (!target_account.local? && target_account.ostatus?) + raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? target_account.mark_known! unless !Setting.auto_mark_known || target_account.known? @@ -52,7 +52,7 @@ class FollowService < BaseService if target_account.local? LocalNotificationWorker.perform_async(target_account.id, follow_request.id, follow_request.class.name) - elsif target_account.activitypub? + else ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), source_account.id, target_account.inbox_url) end |