about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2017-10-09 09:56:17 -0400
committerGitHub <noreply@github.com>2017-10-09 09:56:17 -0400
commitf0a2a6c875e9294f0ea1d4c6bc90529e41a2dc37 (patch)
treebe9174c3c262f38376b7c49b26495bd17e19e61b /app/controllers
parent92a3181dc685aa4b3736b56f8a5d1c4d85b99544 (diff)
try to tighten up local only toot stuff, like... properly (#163)
* try to tighten up local only toot stuff, like... properly

* try to un-break tests
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/stream_entries_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index cc579dbc8..5f61e2182 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -48,7 +48,7 @@ class StreamEntriesController < ApplicationController
     @type         = @stream_entry.activity_type.downcase
 
     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