diff options
Diffstat (limited to 'app/controllers/stream_entries_controller.rb')
| -rw-r--r-- | app/controllers/stream_entries_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb index 0f7e9e0f5..1ee85592c 100644 --- a/app/controllers/stream_entries_controller.rb +++ b/app/controllers/stream_entries_controller.rb @@ -15,6 +15,8 @@ class StreamEntriesController < ApplicationController def show respond_to do |format| format.html do + use_pack 'public' + expires_in 5.minutes, public: true unless @stream_entry.hidden? redirect_to short_account_status_url(params[:account_username], @stream_entry.activity) @@ -52,7 +54,7 @@ class StreamEntriesController < ApplicationController @type = 'status' raise ActiveRecord::RecordNotFound if @stream_entry.activity.nil? - authorize @stream_entry.activity, :show? if @stream_entry.hidden? + authorize @stream_entry.activity, :show? if @stream_entry.hidden? || @stream_entry.local_only? rescue Mastodon::NotPermittedError # Reraise in order to get a 404 raise ActiveRecord::RecordNotFound |