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/controllers | |
| parent | cfe8a3218addfd7e0cc82c6f0054572f3d8aa296 (diff) | |
Always use indirect federation
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/accounts/credentials_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/settings/profiles_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/statuses_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb index 3c8187a99..886c00282 100644 --- a/app/controllers/api/v1/accounts/credentials_controller.rb +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -22,7 +22,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController def account_params params.permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, - :require_dereference, :show_replies, :show_unlisted, + :show_replies, :show_unlisted, fields_attributes: [:name, :value]) end diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb index 541ba2d5d..e71ebbb10 100644 --- a/app/controllers/settings/profiles_controller.rb +++ b/app/controllers/settings/profiles_controller.rb @@ -21,7 +21,7 @@ class Settings::ProfilesController < Settings::BaseController def account_params params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, - :require_dereference, :show_replies, :show_unlisted, :private, :require_auth, + :show_replies, :show_unlisted, :private, :require_auth, fields_attributes: [:name, :value]) end diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 596ce9b84..a3ba43d7b 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -46,7 +46,7 @@ class StatusesController < ApplicationController def activity expires_in 3.minutes, public: @status.distributable? && public_fetch_mode? - render_with_cache json: ActivityPub::ActivityPresenter.from_status(@status, current_account&.domain), + render_with_cache json: ActivityPub::ActivityPresenter.from_status(@status, current_account&.domain, embed: true), content_type: 'application/activity+json', serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter, |