diff options
| author | lain <lain@soykaf.club> | 2018-11-18 21:41:35 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-11-18 21:41:35 +0100 |
| commit | cafa15131a59ae404eaa48d056885db1f052c9ed (patch) | |
| tree | f7d7b2d2433bd5564d76b5244bb93ff1fc6f7d5e /lib | |
| parent | 4c918392c61ca30f46d8e5f8e964993844b70ad8 (diff) | |
| download | pleroma-cafa15131a59ae404eaa48d056885db1f052c9ed.tar.gz | |
Mix format.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 25 | ||||
| -rw-r--r-- | lib/pleroma/web/web_finger/web_finger.ex | 10 |
2 files changed, 21 insertions, 14 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 23e0346a5..e71b33304 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -80,8 +80,9 @@ defmodule Pleroma.User do @email_regex ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/ def remote_user_creation(params) do - params = params - |> Map.put(:info, params[:info] || %{}) + params = + params + |> Map.put(:info, params[:info] || %{}) info_cng = User.Info.remote_user_creation(%User.Info{}, params[:info]) @@ -598,21 +599,25 @@ defmodule Pleroma.User do end def block_domain(user, domain) do - info_cng = user.info - |> User.Info.add_to_domain_block(domain) + info_cng = + user.info + |> User.Info.add_to_domain_block(domain) - cng = change(user) - |> put_embed(:info, info_cng) + cng = + change(user) + |> put_embed(:info, info_cng) update_and_set_cache(cng) end def unblock_domain(user, domain) do - info_cng = user.info - |> User.Info.remove_from_domain_block(domain) + info_cng = + user.info + |> User.Info.remove_from_domain_block(domain) - cng = change(user) - |> put_embed(:info, info_cng) + cng = + change(user) + |> put_embed(:info, info_cng) update_and_set_cache(cng) end diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex index 18cdc057e..5bf529840 100644 --- a/lib/pleroma/web/web_finger/web_finger.ex +++ b/lib/pleroma/web/web_finger/web_finger.ex @@ -120,11 +120,13 @@ defmodule Pleroma.Web.WebFinger do else {:ok, pem} = Salmon.generate_rsa_pem() - info_cng = info - |> Pleroma.User.Info.set_keys(pem) + info_cng = + info + |> Pleroma.User.Info.set_keys(pem) - cng = Ecto.Changeset.change(user) - |> Ecto.Changeset.put_embed(:info, info_cng) + cng = + Ecto.Changeset.change(user) + |> Ecto.Changeset.put_embed(:info, info_cng) User.update_and_set_cache(cng) end |