diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index c4cf4a77b..5eedbe8c8 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -84,7 +84,9 @@ class AccountsController < ApplicationController tag = Tag.find_normalized(params[:tag]) if tag - Status.tagged_with(tag.id) + return Status.none if !user_signed_in && (tag.local || tag.private) || tag.private && current_account.id != @account.id + scope = tag.private ? current_account.statuses : tag.local ? Status.local : Status + scope.tagged_with(tag.id) else Status.none end diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index 8a216ce0d..11661ce08 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -72,7 +72,9 @@ class Api::V1::Accounts::StatusesController < Api::BaseController tag = Tag.find_normalized(params[:tagged]) if tag - Status.tagged_with(tag.id) + return Status.none if !user_signed_in && (tag.local || tag.private) || tag.private && current_account.id != @account.id + scope = tag.private ? current_account.statuses : tag.local ? Status.local : Status + scope.tagged_with(tag.id) else Status.none end |