Simplify the way the embed view is created (#1590)

* Add coverage for embedded status view

* Refactor embed view to eliminate @external_links variable
feature/8296-invite_api
Matt Jankowski 6 years ago committed by Eugen
parent b352a8e5d4
commit dd1ae3b109
  1. 2
      app/controllers/stream_entries_controller.rb
  2. 12
      app/helpers/stream_entries_helper.rb
  3. 4
      app/views/stream_entries/_detailed_status.html.haml
  4. 4
      app/views/stream_entries/_simple_status.html.haml
  5. 10
      spec/controllers/stream_entries_controller_spec.rb

@ -27,8 +27,6 @@ class StreamEntriesController < ApplicationController
def embed
response.headers['X-Frame-Options'] = 'ALLOWALL'
@external_links = true
return gone if @stream_entry.activity.nil?
render layout: 'embedded'

@ -5,8 +5,12 @@ module StreamEntriesHelper
account.display_name.blank? ? account.username : account.display_name
end
def stream_link_target
embedded_view? ? '_blank' : nil
end
def acct(account)
"@#{account.acct}#{@external_links && account.local? ? "@#{Rails.configuration.x.local_domain}" : ''}"
"@#{account.acct}#{embedded_view? && account.local? ? "@#{Rails.configuration.x.local_domain}" : ''}"
end
def entry_classes(status, is_predecessor, is_successor, include_threads)
@ -30,4 +34,10 @@ module StreamEntriesHelper
rtl_size / ltr_size > 0.3
end
private
def embedded_view?
params[:controller] == 'stream_entries' && params[:action] == 'embed'
end
end

@ -1,5 +1,5 @@
.detailed-status.light
= link_to TagManager.instance.url_for(status.account), class: 'detailed-status__display-name p-author h-card', target: @external_links ? '_blank' : nil, rel: 'noopener' do
= link_to TagManager.instance.url_for(status.account), class: 'detailed-status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do
%div
%div.avatar
= image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'u-photo'
@ -30,7 +30,7 @@
%div.detailed-status__meta
%data.dt-published{ value: status.created_at.to_time.iso8601 }
= link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: @external_links ? '_blank' : nil, rel: 'noopener' do
= link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: stream_link_target, rel: 'noopener' do
%span= l(status.created_at)
·
- if status.application

@ -1,10 +1,10 @@
.status.light
.status__header
.status__meta
= link_to time_ago_in_words(status.created_at), TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', title: l(status.created_at), target: @external_links ? '_blank' : nil, rel: 'noopener'
= link_to time_ago_in_words(status.created_at), TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', title: l(status.created_at), target: stream_link_target, rel: 'noopener'
%data.dt-published{ value: status.created_at.to_time.iso8601 }
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name p-author h-card', target: @external_links ? '_blank' : nil, rel: 'noopener' do
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do
.status__avatar
%div
= image_tag status.account.avatar(:original), width: 48, height: 48, alt: '', class: 'u-photo'

@ -17,4 +17,14 @@ RSpec.describe StreamEntriesController, type: :controller do
expect(response).to have_http_status(:success)
end
end
describe 'GET #embed' do
it 'returns embedded view of status' do
get :embed, params: { account_username: alice.username, id: status.stream_entry.id }
expect(response).to have_http_status(:success)
expect(response.headers['X-Frame-Options']).to eq 'ALLOWALL'
expect(response).to render_template(layout: 'embedded')
end
end
end

Loading…
Cancel
Save