projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into global-status-expiration
[akkoma]
/
lib
/
pleroma
/
web
/
controller_helper.ex
diff --git
a/lib/pleroma/web/controller_helper.ex
b/lib/pleroma/web/controller_helper.ex
index 9a4e322c920e24b7a7e655c45177fac53cb5cbc8..b49523ec38513455a20f88c5daea3ab2be812f94 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-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
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
@@
-34,7
+34,12
@@
defmodule Pleroma.Web.ControllerHelper do
defp param_to_integer(_, default), do: default
defp param_to_integer(_, default), do: default
- def add_link_headers(conn, activities, extra_params \\ %{}) do
+ def add_link_headers(conn, activities, extra_params \\ %{})
+
+ def add_link_headers(%{assigns: %{skip_link_headers: true}} = conn, _activities, _extra_params),
+ do: conn
+
+ def add_link_headers(conn, activities, extra_params) do
case List.last(activities) do
%{id: max_id} ->
params =
case List.last(activities) do
%{id: max_id} ->
params =
@@
-76,8
+81,7
@@
defmodule Pleroma.Web.ControllerHelper do
end
end
end
end
- def try_render(conn, target, params)
- when is_binary(target) do
+ def try_render(conn, target, params) when is_binary(target) do
case render(conn, target, params) do
nil -> render_error(conn, :not_implemented, "Can't display this activity")
res -> res
case render(conn, target, params) do
nil -> render_error(conn, :not_implemented, "Can't display this activity")
res -> res
@@
-87,4
+91,9
@@
defmodule Pleroma.Web.ControllerHelper do
def try_render(conn, _, _) do
render_error(conn, :not_implemented, "Can't display this activity")
end
def try_render(conn, _, _) do
render_error(conn, :not_implemented, "Can't display this activity")
end
+
+ @spec put_if_exist(map(), atom() | String.t(), any) :: map()
+ def put_if_exist(map, _key, nil), do: map
+
+ def put_if_exist(map, key, value), do: Map.put(map, key, value)
end
end