diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-09 20:11:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-09 20:11:48 -0400 |
commit | 3dff74eecf5387b92b862893248710d2efb90eec (patch) | |
tree | 0d29d8c952a0c62e7de4348a1d63963fd5eca237 /app/serializers/oembed_serializer.rb | |
parent | e18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37 (diff) | |
parent | 14e1fb8d36763e5255e7b8e440ecaf02208db004 (diff) |
Merge pull request #141 from yipdw/sync/upstream
Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
Diffstat (limited to 'app/serializers/oembed_serializer.rb')
-rw-r--r-- | app/serializers/oembed_serializer.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/app/serializers/oembed_serializer.rb b/app/serializers/oembed_serializer.rb index 78376d253..bd05da585 100644 --- a/app/serializers/oembed_serializer.rb +++ b/app/serializers/oembed_serializer.rb @@ -21,7 +21,7 @@ class OEmbedSerializer < ActiveModel::Serializer end def author_url - account_url(object.account) + short_account_url(object.account) end def provider_name @@ -37,13 +37,15 @@ class OEmbedSerializer < ActiveModel::Serializer end def html - tag :iframe, - src: embed_account_stream_entry_url(object.account, object), - style: 'width: 100%; overflow: hidden', - frameborder: '0', - scrolling: 'no', - width: width, - height: height + attributes = { + src: embed_short_account_status_url(object.account, object), + class: 'mastodon-embed', + style: 'max-width: 100%; border: none;', + width: width, + height: height, + } + + content_tag :iframe, nil, attributes end def width |