diff options
| author | Ekaterina Vaartis <vaartis@cock.li> | 2019-09-18 18:09:57 +0300 |
|---|---|---|
| committer | Ekaterina Vaartis <vaartis@cock.li> | 2019-09-19 00:16:34 +0300 |
| commit | a1325d5fd9b540017cbffbb73db85ee9fa9f12d0 (patch) | |
| tree | f1a42a73543cf2ec4facdee16ca68107ec41ba6f | |
| parent | 86795d5ac2604e08654b872927678d3e05a68e85 (diff) | |
| download | pleroma-a1325d5fd9b540017cbffbb73db85ee9fa9f12d0.tar.gz | |
Change path from nodeinfo to metadata->features
| -rw-r--r-- | lib/pleroma/web/pleroma_api/emoji_api_controller.ex | 2 | ||||
| -rw-r--r-- | test/web/emoji_api_controller_test.exs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/pleroma_api/emoji_api_controller.ex b/lib/pleroma/web/pleroma_api/emoji_api_controller.ex index bc1639095..391c317e7 100644 --- a/lib/pleroma/web/pleroma_api/emoji_api_controller.ex +++ b/lib/pleroma/web/pleroma_api/emoji_api_controller.ex @@ -152,7 +152,7 @@ keeping it in cache for #{div(cache_ms, 1000)}s") |> Tesla.get!() |> Map.get(:body) |> Jason.decode!() - |> Map.get("features") + |> get_in(["metadata", "features"]) |> Enum.member?("shareable_emoji_packs") if shareable_packs_available do diff --git a/test/web/emoji_api_controller_test.exs b/test/web/emoji_api_controller_test.exs index 1af4d3720..297dc092f 100644 --- a/test/web/emoji_api_controller_test.exs +++ b/test/web/emoji_api_controller_test.exs @@ -55,10 +55,10 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do mock(fn %{method: :get, url: "https://old-instance/nodeinfo/2.1.json"} -> - json(%{features: []}) + json(%{metadata: %{features: []}}) %{method: :get, url: "https://example.com/nodeinfo/2.1.json"} -> - json(%{features: ["shareable_emoji_packs"]}) + json(%{metadata: %{features: ["shareable_emoji_packs"]}}) %{ method: :get, |