summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEkaterina Vaartis <vaartis@kotobank.ch>2024-01-07 15:28:40 +0300
committerEkaterina Vaartis <vaartis@kotobank.ch>2024-01-07 15:30:52 +0300
commit69e4ebbb8ea5d273c4a82ee8dcc275da8ee1dace (patch)
tree1db0cae5de6ad7f053ea6b6c6cdba6a0251b1864 /lib
parent67a5542a73a8fab8c79da21022877bc233e8a760 (diff)
downloadpleroma-69e4ebbb8ea5d273c4a82ee8dcc275da8ee1dace.tar.gz
pleroma-69e4ebbb8ea5d273c4a82ee8dcc275da8ee1dace.zip
Make remote emoji packs API use specifically the V1 URL
Akkoma does not understand it without V1, and it works either way with normal pleroma, so no reason to not do this
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/emoji/pack.ex8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/emoji/pack.ex b/lib/pleroma/emoji/pack.ex
index 6e58f8898..49bb93799 100644
--- a/lib/pleroma/emoji/pack.ex
+++ b/lib/pleroma/emoji/pack.ex
@@ -209,7 +209,9 @@ defmodule Pleroma.Emoji.Pack do
with :ok <- validate_shareable_packs_available(uri) do
uri
- |> URI.merge("/api/pleroma/emoji/packs?page=#{opts[:page]}&page_size=#{opts[:page_size]}")
+ |> URI.merge(
+ "/api/v1/pleroma/emoji/packs?page=#{opts[:page]}&page_size=#{opts[:page_size]}"
+ )
|> http_get()
end
end
@@ -250,7 +252,7 @@ defmodule Pleroma.Emoji.Pack do
with :ok <- validate_shareable_packs_available(uri),
{:ok, remote_pack} <-
- uri |> URI.merge("/api/pleroma/emoji/pack?name=#{name}") |> http_get(),
+ uri |> URI.merge("/api/v1/pleroma/emoji/pack?name=#{name}") |> http_get(),
{:ok, %{sha: sha, url: url} = pack_info} <- fetch_pack_info(remote_pack, uri, name),
{:ok, archive} <- download_archive(url, sha),
pack <- copy_as(remote_pack, as || name),
@@ -592,7 +594,7 @@ defmodule Pleroma.Emoji.Pack do
{:ok,
%{
sha: sha,
- url: URI.merge(uri, "/api/pleroma/emoji/packs/archive?name=#{name}") |> to_string()
+ url: URI.merge(uri, "/api/v1/pleroma/emoji/packs/archive?name=#{name}") |> to_string()
}}
%{"fallback-src" => src, "fallback-src-sha256" => sha} when is_binary(src) ->