moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mix format.

This commit is contained in:
lain 2018-11-18 21:41:35 +01:00
parent 4c918392c6
commit cafa15131a
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/pleroma/user.ex
View File

@ -80,8 +80,9 @@ def user_info(%User{} = 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])?)*$/ @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 def remote_user_creation(params) do
params = params params =
|> Map.put(:info, params[:info] || %{}) params
|> Map.put(:info, params[:info] || %{})
info_cng = User.Info.remote_user_creation(%User.Info{}, params[:info]) info_cng = User.Info.remote_user_creation(%User.Info{}, params[:info])
@ -598,21 +599,25 @@ def blocks?(user, %{ap_id: ap_id}) do
end end
def block_domain(user, domain) do def block_domain(user, domain) do
info_cng = user.info info_cng =
|> User.Info.add_to_domain_block(domain) user.info
|> User.Info.add_to_domain_block(domain)
cng = change(user) cng =
|> put_embed(:info, info_cng) change(user)
|> put_embed(:info, info_cng)
update_and_set_cache(cng) update_and_set_cache(cng)
end end
def unblock_domain(user, domain) do def unblock_domain(user, domain) do
info_cng = user.info info_cng =
|> User.Info.remove_from_domain_block(domain) user.info
|> User.Info.remove_from_domain_block(domain)
cng = change(user) cng =
|> put_embed(:info, info_cng) change(user)
|> put_embed(:info, info_cng)
update_and_set_cache(cng) update_and_set_cache(cng)
end end

10
lib/pleroma/web/web_finger/web_finger.ex
View File

@ -120,11 +120,13 @@ def ensure_keys_present(user) do
else else
{:ok, pem} = Salmon.generate_rsa_pem() {:ok, pem} = Salmon.generate_rsa_pem()
info_cng = info info_cng =
|> Pleroma.User.Info.set_keys(pem) info
|> Pleroma.User.Info.set_keys(pem)
cng = Ecto.Changeset.change(user) cng =
|> Ecto.Changeset.put_embed(:info, info_cng) Ecto.Changeset.change(user)
|> Ecto.Changeset.put_embed(:info, info_cng)
User.update_and_set_cache(cng) User.update_and_set_cache(cng)
end end