aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/api/v1/mutes_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/api/v1/mutes_controller.rb')
-rw-r--r--app/controllers/api/v1/mutes_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index 65439fe9b..fd52511d7 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -7,7 +7,7 @@ class Api::V1::MutesController < Api::BaseController
def index
@accounts = load_accounts
- render json: @accounts, each_serializer: REST::AccountSerializer
+ render json: @accounts, each_serializer: REST::MutedAccountSerializer
end
private
@@ -18,6 +18,8 @@ class Api::V1::MutesController < Api::BaseController
def paginated_mutes
@paginated_mutes ||= Mute.eager_load(:target_account)
+ .joins(:target_account)
+ .merge(Account.without_suspended)
.where(account: current_account)
.paginate_by_max_id(
limit_param(DEFAULT_ACCOUNTS_LIMIT),