hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'

Browse source 
Make mutes and blocks behave the same as other lists

Closes #2384

See merge request pleroma/pleroma!3693
This commit is contained in:
Haelwenn 2022-07-28 04:37:10 +00:00
commit 0f9f3d2897
2 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View file

@ -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)