diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 |
| commit | 9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch) | |
| tree | e6755e3d585d753ad7da171a858508d4a1603a49 /lib/pleroma/web/controller_helper.ex | |
| parent | 51ce0813d351cad900966aea49a6f6d17d33f964 (diff) | |
| parent | d74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff) | |
| download | pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz | |
Merge branch 'develop' into gun
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index c9a3a2585..ad293cda9 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -87,7 +87,8 @@ defmodule Pleroma.Web.ControllerHelper do render_error(conn, :not_implemented, "Can't display this activity") end - @spec put_in_if_exist(map(), atom() | String.t(), any) :: map() - def put_in_if_exist(map, _key, nil), do: map - def put_in_if_exist(map, key, value), do: put_in(map, key, value) + @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 |