diff options
author | ThibG <thib@sitedethib.com> | 2019-04-01 21:36:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-01 21:36:36 +0200 |
commit | 3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (patch) | |
tree | 4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /app/controllers/api/v1/statuses | |
parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
parent | 12dae9d58316bec32adaac016998ab1cf69d2b45 (diff) |
Merge pull request #978 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/statuses')
-rw-r--r-- | app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb | 1 | ||||
-rw-r--r-- | app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb index 657e57831..e00c4d708 100644 --- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb +++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb @@ -22,6 +22,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController def default_accounts Account + .without_blocking(current_account) .includes(:favourites, :account_stat) .references(:favourites) .where(favourites: { status_id: @status.id }) diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb index 6851099f6..9b2d0e59e 100644 --- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb +++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb @@ -21,7 +21,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController end def default_accounts - Account.includes(:statuses, :account_stat).references(:statuses) + Account.without_blocking(current_account).includes(:statuses, :account_stat).references(:statuses) end def paginated_statuses |