More fixes.
This commit is contained in:
parent
ec464ef20a
commit
badbe2656c
5 changed files with 26 additions and 21 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ defmodule Pleroma.User.Info do
|
|||
field(:is_moderator, :boolean, default: false)
|
||||
field(:keys, :string, default: nil)
|
||||
field(:settings, :map, default: nil)
|
||||
field(:magic_key, :string, default: nil)
|
||||
# topic, subject, salmon, subscribe_address
|
||||
end
|
||||
|
||||
def set_activation_status(info, deactivated) do
|
||||
|
|
@ -94,7 +96,8 @@ defmodule Pleroma.User.Info do
|
|||
:ap_enabled,
|
||||
:source_data,
|
||||
:banner,
|
||||
:locked
|
||||
:locked,
|
||||
:magic_key
|
||||
])
|
||||
end
|
||||
|
||||
|
|
@ -104,7 +107,8 @@ defmodule Pleroma.User.Info do
|
|||
:ap_enabled,
|
||||
:source_data,
|
||||
:banner,
|
||||
:locked
|
||||
:locked,
|
||||
:magic_key
|
||||
])
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue