Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails
This commit is contained in:
parent
6de079a5af
commit
aed25932b5
11 changed files with 72 additions and 7 deletions
|
@ -5,8 +5,8 @@ class Api::OembedController < ApiController
|
|||
|
||||
def show
|
||||
@stream_entry = stream_entry_from_url(params[:url])
|
||||
@width = [300, params[:maxwidth].to_i].min
|
||||
@height = [200, params[:maxheight].to_i].min
|
||||
@width = [300, params[:maxwidth].to_i].max
|
||||
@height = [200, params[:maxheight].to_i].max
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -25,6 +25,15 @@ class StreamEntriesController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
def embed
|
||||
response.headers['X-Frame-Options'] = 'ALLOWALL'
|
||||
@type = @stream_entry.activity_type.downcase
|
||||
|
||||
return gone if @stream_entry.activity.nil?
|
||||
|
||||
render layout: 'embedded'
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def set_account
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue