diff options
| author | Starfall <root@starfall.blue> | 2020-02-04 17:44:29 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-02-04 17:44:29 -0600 |
| commit | 6d24d3bcb84abd04f31da95f97f6d60ef0afdc00 (patch) | |
| tree | e7c38251a9e92bdf3a464b4aa7f1880aa5139bf0 /app/controllers/statuses_controller.rb | |
| parent | c0c9529df269816f52915a9802e5e30fbce9576b (diff) | |
| parent | 885e9227c6e8e1ce5e4a5625d5126ba76dce2c00 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/statuses_controller.rb')
| -rw-r--r-- | app/controllers/statuses_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 1b00d38c9..588063d01 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -49,7 +49,7 @@ class StatusesController < ApplicationController def embed use_pack 'embed' - raise ActiveRecord::RecordNotFound if @status.hidden? + return not_found if @status.hidden? expires_in 180, public: true response.headers['X-Frame-Options'] = 'ALLOWALL' @@ -71,7 +71,7 @@ class StatusesController < ApplicationController @status = @account.statuses.find(params[:id]) authorize @status, :show? rescue Mastodon::NotPermittedError - raise ActiveRecord::RecordNotFound + not_found end def set_instance_presenter |