diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-07-28 04:37:10 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-07-28 04:37:10 +0000 |
| commit | 0f9f3d28970d0a4c86184d60166712ce605f7713 (patch) | |
| tree | 8b78b96ca35721bad0b2ba05769b619760c6f40b /lib | |
| parent | 18d6a58c7ed26c5ca76db5c252227f44bfe9feb9 (diff) | |
| parent | c1874bc8f943599383fe0a03f129d3113c1cf301 (diff) | |
| download | pleroma-0f9f3d28970d0a4c86184d60166712ce605f7713.tar.gz pleroma-0f9f3d28970d0a4c86184d60166712ce605f7713.zip | |
Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'
Make mutes and blocks behave the same as other lists
Closes #2384
See merge request pleroma/pleroma!3693
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex index eb59a0a96..2aeb339f0 100644 --- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex @@ -491,7 +491,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do users = user |> User.muted_users_relation(_restrict_deactivated = true) - |> Pleroma.Pagination.fetch_paginated(Map.put(params, :skip_order, true)) + |> Pleroma.Pagination.fetch_paginated(params) conn |> add_link_headers(users) @@ -509,7 +509,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do users = user |> User.blocked_users_relation(_restrict_deactivated = true) - |> Pleroma.Pagination.fetch_paginated(Map.put(params, :skip_order, true)) + |> Pleroma.Pagination.fetch_paginated(params) conn |> add_link_headers(users) |