diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-23 15:23:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 15:23:12 +0100 |
| commit | 8a3e4a48838405a7a78f2b46cc2b2a7c8fa412fa (patch) | |
| tree | b5d7908956cab9d18dceda381e18cdb4a6e0e4ba /app/controllers/api | |
| parent | 1a3088364fe602bb48647d78dda440b174424e17 (diff) | |
| parent | cb98e7dbd35c730a58f65112c3fa32ee180a2518 (diff) | |
Merge pull request #871 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/web/embeds_controller.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index b68a8805f..d3f1197f8 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Api::V1::Accounts::StatusesController < Api::BaseController - before_action -> { doorkeeper_authorize! :read, :'read:statuses' } + before_action -> { authorize_if_got_token! :read, :'read:statuses' } before_action :set_account after_action :insert_pagination_headers diff --git a/app/controllers/api/web/embeds_controller.rb b/app/controllers/api/web/embeds_controller.rb index 987290a14..6231733b7 100644 --- a/app/controllers/api/web/embeds_controller.rb +++ b/app/controllers/api/web/embeds_controller.rb @@ -10,6 +10,7 @@ class Api::Web::EmbedsController < Api::Web::BaseController render json: status, serializer: OEmbedSerializer, width: 400 rescue ActiveRecord::RecordNotFound oembed = FetchOEmbedService.new.call(params[:url]) + oembed[:html] = Formatter.instance.sanitize(oembed[:html], Sanitize::Config::MASTODON_OEMBED) if oembed[:html].present? if oembed render json: oembed |