projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix: Reuse Controller.Helper pagination for APC2S
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
search_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
index 1c2860cc719bf9b594f8c669863faec4cb284283..77e2224e43ec3477a02a22390dfbb5e89a5ef5bc 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
@@
-33,12
+33,10
@@
defmodule Pleroma.Web.MastodonAPI.SearchController do
conn
|> put_view(AccountView)
conn
|> put_view(AccountView)
- # https://git.pleroma.social/pleroma/pleroma-fe/-/issues/838#note_59223
|> render("index.json",
users: accounts,
for: user,
|> render("index.json",
users: accounts,
for: user,
- as: :user,
- embed_relationships: ControllerHelper.with_relationships?(params)
+ as: :user
)
end
)
end
@@
-82,7
+80,7
@@
defmodule Pleroma.Web.MastodonAPI.SearchController do
offset: params[:offset],
type: params[:type],
author: get_author(params),
offset: params[:offset],
type: params[:type],
author: get_author(params),
- embed_relationships: ControllerHelper.
with
_relationships?(params),
+ embed_relationships: ControllerHelper.
embed
_relationships?(params),
for_user: user
]
|> Enum.filter(&elem(&1, 1))
for_user: user
]
|> Enum.filter(&elem(&1, 1))
@@
-95,7
+93,6
@@
defmodule Pleroma.Web.MastodonAPI.SearchController do
users: accounts,
for: options[:for_user],
as: :user,
users: accounts,
for: options[:for_user],
as: :user,
- # https://git.pleroma.social/pleroma/pleroma-fe/-/issues/838#note_59223
embed_relationships: options[:embed_relationships]
)
end
embed_relationships: options[:embed_relationships]
)
end