diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-18 19:47:11 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-18 19:47:11 +0100 |
commit | 5ae1b39ec9b4d5269d2f01aeaa4304252b694519 (patch) | |
tree | 7b9f058c315189d2e557830b4108b5755ede5603 /app/controllers/stream_entries_controller.rb | |
parent | aed25932b528f16861c4e016cbeb7a3de6231fe7 (diff) |
Adjusting public display of statuses to look similar to logged-in UI,
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive content behind a spoiler on public pages
Diffstat (limited to 'app/controllers/stream_entries_controller.rb')
-rw-r--r-- | app/controllers/stream_entries_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb index 933bdf737..58dd423f7 100644 --- a/app/controllers/stream_entries_controller.rb +++ b/app/controllers/stream_entries_controller.rb @@ -9,8 +9,6 @@ class StreamEntriesController < ApplicationController before_action :check_account_suspension def show - @type = @stream_entry.activity_type.downcase - respond_to do |format| format.html do return gone if @stream_entry.activity.nil? @@ -27,7 +25,7 @@ class StreamEntriesController < ApplicationController def embed response.headers['X-Frame-Options'] = 'ALLOWALL' - @type = @stream_entry.activity_type.downcase + @external_links = true return gone if @stream_entry.activity.nil? @@ -46,6 +44,7 @@ class StreamEntriesController < ApplicationController def set_stream_entry @stream_entry = @account.stream_entries.find(params[:id]) + @type = @stream_entry.activity_type.downcase end def check_account_suspension |