From 21698f754d42e9537469ab8ba691020f7e9a239b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 22 Jan 2021 18:16:00 +0100 Subject: [PATCH] Change some String.to_atom/1 to String.to_existing_atom/1 Signed-off-by: Thomas Citharel --- lib/graphql/resolvers/admin.ex | 8 ++++---- lib/mobilizon/actors/actors.ex | 12 ------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/lib/graphql/resolvers/admin.ex b/lib/graphql/resolvers/admin.ex index 21698b06c..b8485d0ae 100644 --- a/lib/graphql/resolvers/admin.ex +++ b/lib/graphql/resolvers/admin.ex @@ -123,7 +123,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do # Changes are stored as %{"key" => "value"} so we need to convert them back as struct defp convert_changes_to_struct(struct, %{"report_id" => _report_id} = changes) do - with data <- for({key, val} <- changes, into: %{}, do: {String.to_atom(key), val}), + with data <- for({key, val} <- changes, into: %{}, do: {String.to_existing_atom(key), val}), data <- Map.put(data, :report, Mobilizon.Reports.get_report(data.report_id)) do struct(struct, data) end @@ -135,7 +135,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do for( {key, val} <- changes, into: %{}, - do: {String.to_atom(key), process_eventual_type(changeset, key, val)} + do: {String.to_existing_atom(key), process_eventual_type(changeset, key, val)} ) do struct(struct, data) end @@ -144,11 +144,11 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do # datetimes are not unserialized as DateTime/NaiveDateTime so we do it manually with changeset data defp process_eventual_type(changeset, key, val) do cond do - changeset[String.to_atom(key)] == :utc_datetime and not is_nil(val) -> + changeset[String.to_existing_atom(key)] == :utc_datetime and not is_nil(val) -> {:ok, datetime, _} = DateTime.from_iso8601(val) datetime - changeset[String.to_atom(key)] == :naive_datetime and not is_nil(val) -> + changeset[String.to_existing_atom(key)] == :naive_datetime and not is_nil(val) -> {:ok, datetime} = NaiveDateTime.from_iso8601(val) datetime diff --git a/lib/mobilizon/actors/actors.ex b/lib/mobilizon/actors/actors.ex index 763d2abb5..306ac56a2 100644 --- a/lib/mobilizon/actors/actors.ex +++ b/lib/mobilizon/actors/actors.ex @@ -296,18 +296,6 @@ defmodule Mobilizon.Actors do end end - # defp transform_media_file(nil), do: nil - - # defp transform_media_file(file) do - # file = for({key, val} <- file, into: %{}, do: {String.to_atom(key), val}) - - # if is_nil(file) do - # nil - # else - # struct(Mobilizon.Medias.File, file) - # end - # end - @delete_actor_default_options [reserve_username: true, suspension: false] def delete_actor(%Actor{} = actor, options \\ @delete_actor_default_options) do