diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-11-18 22:10:15 -0600 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-11-18 22:10:15 -0600 |
| commit | 930f7145374adb79e92e9bdfcbc0d0044690b6c8 (patch) | |
| tree | 6188688d3e48cd8a40fbe89adaf8db6bbf07d082 /app/services | |
| parent | cfe8a3218addfd7e0cc82c6f0054572f3d8aa296 (diff) | |
Always use indirect federation
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 1 | ||||
| -rw-r--r-- | app/services/backup_service.rb | 2 | ||||
| -rw-r--r-- | app/services/process_mentions_service.rb | 2 | ||||
| -rw-r--r-- | app/services/reblog_service.rb | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 7e50dc776..ec1041b3d 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -92,7 +92,6 @@ class ActivityPub::ProcessAccountService < BaseService @account.also_known_as = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) } @account.actor_type = actor_type @account.discoverable = @json['discoverable'] || false - @account.require_dereference = @json['requireDereference'] || false @account.show_replies = @json['showReplies'] || true @account.show_unlisted = @json['showUnlisted'] || true @account.private = @json['private'] || false diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb index b83c08a98..e4d4c5a89 100644 --- a/app/services/backup_service.rb +++ b/app/services/backup_service.rb @@ -22,7 +22,7 @@ class BackupService < BaseService account.statuses.with_includes.reorder(nil).find_in_batches do |statuses| statuses.each do |status| - item = serialize_payload(ActivityPub::ActivityPresenter.from_status(status, nil), ActivityPub::ActivitySerializer, signer: @account, allow_local_only: true) + item = serialize_payload(ActivityPub::ActivityPresenter.from_status(status, nil, embed: true), ActivityPub::ActivitySerializer, signer: @account, allow_local_only: true) item.delete(:'@context') unless item[:type] == 'Announce' || item[:object][:attachment].blank? diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index 51c368264..6ee8550c4 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -37,7 +37,7 @@ class ProcessMentionsService < BaseService end def activitypub_json(domain) - @activitypub_json[domain] ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status, domain, embed: false), ActivityPub::ActivitySerializer, signer: @status.account, domain: domain)) + @activitypub_json[domain] ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status, domain), ActivityPub::ActivitySerializer, signer: @status.account, domain: domain)) end def check_for_spam(status) diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb index 93b0c160b..ef7468194 100644 --- a/app/services/reblog_service.rb +++ b/app/services/reblog_service.rb @@ -61,7 +61,7 @@ class ReblogService < BaseService end def build_json(reblog) - Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(reblog, reblog.account.domain, embed: false), ActivityPub::ActivitySerializer, signer: reblog.account, domain: reblog.account.domain)) + Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(reblog, reblog.account.domain), ActivityPub::ActivitySerializer, signer: reblog.account, domain: reblog.account.domain)) end def curate!(status) |