squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Salmon: Take both versions of public keys.

Browse Source
This commit is contained in:
lain 2018-02-18 22:57:07 +01:00
parent dc1d3ceb72
commit 78516a8daa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/salmon/salmon.ex
View File

@ -29,7 +29,8 @@ defmodule Pleroma.Web.Salmon do
with [data, _, _, _, _] <- decode(salmon), with [data, _, _, _, _] <- decode(salmon),
doc <- XML.parse_document(data), doc <- XML.parse_document(data),
uri when not is_nil(uri) <- XML.string_from_xpath("/entry/author[1]/uri", doc), uri when not is_nil(uri) <- XML.string_from_xpath("/entry/author[1]/uri", doc),
{:ok, %{info: %{"magic_key" => magic_key}}} <- Pleroma.Web.OStatus.find_or_make_user(uri) do {:ok, public_key} <- User.get_public_key_for_ap_id(uri),
magic_key <- encode_key(public_key) do
{:ok, magic_key} {:ok, magic_key}
end end
end end