hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More fixes.

Browse source
This commit is contained in:
lain 2018-11-27 18:12:03 +01:00
commit badbe2656c
5 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/user.ex
View file

@ -112,6 +112,7 @@ defmodule Pleroma.User do
end
end
# TODO: Check if this still used
def update_changeset(struct, params \\ %{}) do
struct
|> cast(params, [:bio, :name])
@ -730,7 +731,7 @@ defmodule Pleroma.User do
# AP style
def public_key_from_info(%{
"source_data" => %{"publicKey" => %{"publicKeyPem" => public_key_pem}}
source_data: %{"publicKey" => %{"publicKeyPem" => public_key_pem}}
}) do
key =
:public_key.pem_decode(public_key_pem)
@ -741,7 +742,7 @@ defmodule Pleroma.User do
end
# OStatus Magic Key
def public_key_from_info(%{"magic_key" => magic_key}) do
def public_key_from_info(%{magic_key: magic_key}) do
{:ok, Pleroma.Web.Salmon.decode_key(magic_key)}
end