zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Use null as default oEmbed height (#2842) 

Height 640 is too big for most toots.
Twitter use null value to support flexible height.
This commit is contained in:
rch850 2017-05-06 23:31:43 +09:00 committed by Eugen Rochko
parent 59804abc3d
commit 453fb84c9c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/oembed_controller.rb
View File

@ -6,7 +6,7 @@ class Api::OEmbedController < ApiController
def show def show
@stream_entry = stream_entry_from_url(params[:url]) @stream_entry = stream_entry_from_url(params[:url])
@width = params[:maxwidth].present? ? params[:maxwidth].to_i : 400 @width = params[:maxwidth].present? ? params[:maxwidth].to_i : 400
@height = params[:maxheight].present? ? params[:maxheight].to_i : 600 @height = params[:maxheight].present? ? params[:maxheight].to_i : nil
end end
private private