Merge branch 'main' into glitch-soc/merge-upstream

2023-07-06 15:16:34 +02:00
parent 30ad9d976b 5e1752ce3f
commit ff7aae3037
17 changed files with 214 additions and 33 deletions
--- a/app/serializers/rest/preview_card_serializer.rb
+++ b/app/serializers/rest/preview_card_serializer.rb
@@ -11,4 +11,8 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer
  def image
    object.image? ? full_asset_url(object.image.url(:original)) : nil
  end
+
+  def html
+    Sanitize.fragment(object.html, Sanitize::Config::MASTODON_OEMBED)
+  end
 end