projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted fixes.
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 1bf0f568ccfd392a19ed20e375d3c5ee02a70e57..bed8fd1b46d57bbc5851953b18d0468a968bb8e4 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-112,6
+112,7
@@
defmodule Pleroma.User do
end
end
end
end
+ # TODO: Check if this still used
def update_changeset(struct, params \\ %{}) do
struct
|> cast(params, [:bio, :name])
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(%{
# 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)
}) do
key =
:public_key.pem_decode(public_key_pem)
@@
-741,7
+742,7
@@
defmodule Pleroma.User do
end
# OStatus Magic Key
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
{:ok, Pleroma.Web.Salmon.decode_key(magic_key)}
end