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

User: Move public_key from source_data to own field

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-04-01 06:58:48 +02:00
commit 19eedb3d04
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
4 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/user.ex
View file

@ -82,6 +82,7 @@ defmodule Pleroma.User do
field(:password, :string, virtual: true)
field(:password_confirmation, :string, virtual: true)
field(:keys, :string)
field(:public_key, :string)
field(:ap_id, :string)
field(:avatar, :map)
field(:local, :boolean, default: true)
@ -366,6 +367,7 @@ defmodule Pleroma.User do
:name,
:ap_id,
:nickname,
:public_key,
:avatar,
:ap_enabled,
:source_data,
@ -407,6 +409,7 @@ defmodule Pleroma.User do
:bio,
:name,
:avatar,
:public_key,
:locked,
:no_rich_text,
:default_scope,
@ -503,6 +506,7 @@ defmodule Pleroma.User do
:name,
:follower_address,
:following_address,
:public_key,
:avatar,
:last_refreshed_at,
:ap_enabled,
@ -1616,8 +1620,7 @@ defmodule Pleroma.User do
|> set_cache()
end
# AP style
def public_key(%{source_data: %{"publicKey" => %{"publicKeyPem" => public_key_pem}}}) do
def public_key(%{public_key: public_key_pem}) when is_binary(public_key_pem) do
key =
public_key_pem
|> :public_key.pem_decode()
@ -1627,7 +1630,7 @@ defmodule Pleroma.User do
{:ok, key}
end
def public_key(_), do: {:error, "not found key"}
def public_key(_), do: {:error, "key not found"}
def get_public_key_for_ap_id(ap_id) do
with {:ok, %User{} = user} <- get_or_fetch_by_ap_id(ap_id),