aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/controller_helper.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-05 16:53:56 +0200
committerlain <lain@soykaf.club>2020-06-05 16:53:56 +0200
commita8ca030d85368285af1b960e14dab5b847ecb35a (patch)
tree5d8c8922eea940f455946435c073d534df1dec57 /lib/pleroma/web/controller_helper.ex
parent115d08a7542b92c5e1d889da41c0ee6837a1235e (diff)
parent657e1583f8af1ecdf218ba283de4234233bfe5fd (diff)
downloadpleroma-a8ca030d85368285af1b960e14dab5b847ecb35a.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
-rw-r--r--lib/pleroma/web/controller_helper.ex5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index 5a1316a5f..bf832fe94 100644
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -99,11 +99,6 @@ defmodule Pleroma.Web.ControllerHelper 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)
-
@doc """
Returns true if request specifies to include embedded relationships in account objects.
May only be used in selected account-related endpoints; has no effect for status- or