projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add OpenAPI spec for AdminAPI.UserController
[akkoma]
/
lib
/
pleroma
/
web
/
controller_helper.ex
diff --git
a/lib/pleroma/web/controller_helper.ex
b/lib/pleroma/web/controller_helper.ex
index 69946fb81ee6a5571728586e8c8fbde681ccb351..61d65e7a336161390eec6dbcace41a175e8a4306 100644
(file)
--- a/
lib/pleroma/web/controller_helper.ex
+++ b/
lib/pleroma/web/controller_helper.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ControllerHelper do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ControllerHelper do
@@
-18,6
+18,12
@@
defmodule Pleroma.Web.ControllerHelper do
def truthy_param?(value), do: not falsy_param?(value)
def truthy_param?(value), do: not falsy_param?(value)
+ def json_response(conn, status, _) when status in [204, :no_content] do
+ conn
+ |> put_resp_header("content-type", "application/json")
+ |> send_resp(status, "")
+ end
+
def json_response(conn, status, json) do
conn
|> put_status(status)
def json_response(conn, status, json) do
conn
|> put_status(status)
@@
-42,13
+48,13
@@
defmodule Pleroma.Web.ControllerHelper do
defp param_to_integer(_, default), do: default
defp param_to_integer(_, default), do: default
- def add_link_headers(conn,
activit
ies, extra_params \\ %{})
+ def add_link_headers(conn,
entr
ies, extra_params \\ %{})
- def add_link_headers(%{assigns: %{skip_link_headers: true}} = conn, _
activit
ies, _extra_params),
+ def add_link_headers(%{assigns: %{skip_link_headers: true}} = conn, _
entr
ies, _extra_params),
do: conn
do: conn
- def add_link_headers(conn,
activit
ies, extra_params) do
- case get_pagination_fields(conn,
activit
ies, extra_params) do
+ def add_link_headers(conn,
entr
ies, extra_params) do
+ case get_pagination_fields(conn,
entr
ies, extra_params) do
%{"next" => next_url, "prev" => prev_url} ->
put_resp_header(conn, "link", "<#{next_url}>; rel=\"next\", <#{prev_url}>; rel=\"prev\"")
%{"next" => next_url, "prev" => prev_url} ->
put_resp_header(conn, "link", "<#{next_url}>; rel=\"next\", <#{prev_url}>; rel=\"prev\"")
@@
-61,7
+67,7
@@
defmodule Pleroma.Web.ControllerHelper do
defp build_pagination_fields(conn, min_id, max_id, extra_params) do
params =
conn.params
defp build_pagination_fields(conn, min_id, max_id, extra_params) do
params =
conn.params
- |> Map.drop(Map.keys(conn.path_params))
+ |> Map.drop(Map.keys(conn.path_params)
|> Enum.map(&String.to_existing_atom/1)
)
|> Map.merge(extra_params)
|> Map.drop(@id_keys)
|> Map.merge(extra_params)
|> Map.drop(@id_keys)
@@
-72,19
+78,15
@@
defmodule Pleroma.Web.ControllerHelper do
}
end
}
end
- def get_pagination_fields(conn,
activit
ies, extra_params \\ %{}) do
- case List.last(
activit
ies) do
+ def get_pagination_fields(conn,
entr
ies, extra_params \\ %{}) do
+ case List.last(
entr
ies) do
%{pagination_id: max_id} when not is_nil(max_id) ->
%{pagination_id: max_id} when not is_nil(max_id) ->
- %{pagination_id: min_id} =
- activities
- |> List.first()
+ %{pagination_id: min_id} = List.first(entries)
build_pagination_fields(conn, min_id, max_id, extra_params)
%{id: max_id} ->
build_pagination_fields(conn, min_id, max_id, extra_params)
%{id: max_id} ->
- %{id: min_id} =
- activities
- |> List.first()
+ %{id: min_id} = List.first(entries)
build_pagination_fields(conn, min_id, max_id, extra_params)
build_pagination_fields(conn, min_id, max_id, extra_params)