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

Get the nodeinfo address from the well-known

Browse Source
This commit is contained in:
Ekaterina Vaartis 2019-09-18 19:48:25 +03:00
parent a1325d5fd9
commit b585134c90
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/web/pleroma_api/emoji_api_controller.ex
View File

@ -148,7 +148,13 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
""" """
def download_from(conn, %{"instance_address" => address, "pack_name" => name} = data) do def download_from(conn, %{"instance_address" => address, "pack_name" => name} = data) do
shareable_packs_available = shareable_packs_available =
"#{address}/nodeinfo/2.1.json" "#{address}/.well-known/nodeinfo"
|> Tesla.get!()
|> Map.get(:body)
|> Jason.decode!()
|> List.last()
|> Map.get("href")
# Get the actual nodeinfo address and fetch it
|> Tesla.get!() |> Tesla.get!()
|> Map.get(:body) |> Map.get(:body)
|> Jason.decode!() |> Jason.decode!()

6
test/web/emoji_api_controller_test.exs
View File

@ -54,9 +54,15 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end) end)
mock(fn mock(fn
%{method: :get, url: "https://old-instance/.well-known/nodeinfo"} ->
json([%{href: "https://old-instance/nodeinfo/2.1.json"}])
%{method: :get, url: "https://old-instance/nodeinfo/2.1.json"} -> %{method: :get, url: "https://old-instance/nodeinfo/2.1.json"} ->
json(%{metadata: %{features: []}}) json(%{metadata: %{features: []}})
%{method: :get, url: "https://example.com/.well-known/nodeinfo"} ->
json([%{href: "https://example.com/nodeinfo/2.1.json"}])
%{method: :get, url: "https://example.com/nodeinfo/2.1.json"} -> %{method: :get, url: "https://example.com/nodeinfo/2.1.json"} ->
json(%{metadata: %{features: ["shareable_emoji_packs"]}}) json(%{metadata: %{features: ["shareable_emoji_packs"]}})