Browse Source
Fix error when fetching followers/following from REST API when user has network hidden (#12716)
Fix #12510
master^2
Eugen Rochko
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
app/controllers/api/v1/accounts/follower_accounts_controller.rb
-
app/controllers/api/v1/accounts/following_accounts_controller.rb
|
|
@@ -25,7 +25,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController |
|
|
|
end |
|
|
|
|
|
|
|
def hide_results? |
|
|
|
(@account.user_hides_network? && current_account.id != @account.id) || (current_account && @account.blocking?(current_account)) |
|
|
|
(@account.user_hides_network? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account)) |
|
|
|
end |
|
|
|
|
|
|
|
def default_accounts |
|
|
|
|
|
@@ -25,7 +25,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController |
|
|
|
end |
|
|
|
|
|
|
|
def hide_results? |
|
|
|
(@account.user_hides_network? && current_account.id != @account.id) || (current_account && @account.blocking?(current_account)) |
|
|
|
(@account.user_hides_network? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account)) |
|
|
|
end |
|
|
|
|
|
|
|
def default_accounts |
|
|
|