about summary refs log tree commit diff
path: root/app/controllers/api/web
diff options
context:
space:
mode:
authorpluralcafe-docker <git@plural.cafe>2018-12-27 21:35:47 +0000
committerpluralcafe-docker <git@plural.cafe>2018-12-27 21:35:47 +0000
commit797a8429a0deb511e6d6092edad39f856231534e (patch)
tree6e44d3c2a5a662dfc4e4087fdc391b8e7bb41dba /app/controllers/api/web
parent94894b8a6ad1247306497dc8c0c47d52a8a2f72c (diff)
parentf349fe2159fb36e598263f2797f041417ef7c2da (diff)
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/api/web')
-rw-r--r--app/controllers/api/web/embeds_controller.rb1
1 files changed, 1 insertions, 0 deletions
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