projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only...
[akkoma]
/
lib
/
pleroma
/
emoji
/
pack.ex
diff --git
a/lib/pleroma/emoji/pack.ex
b/lib/pleroma/emoji/pack.ex
index 0670f29f178f90910d83a9a01369fac095c5df30..ca58e543296b145a91ada6508a6ed0fb4e096f21 100644
(file)
--- a/
lib/pleroma/emoji/pack.ex
+++ b/
lib/pleroma/emoji/pack.ex
@@
-594,7
+594,7
@@
defmodule Pleroma.Emoji.Pack do
end
defp download_archive(url, sha) do
end
defp download_archive(url, sha) do
- with {:ok, %{body: archive}} <-
Tesla
.get(url) do
+ with {:ok, %{body: archive}} <-
Pleroma.HTTP
.get(url) do
if Base.decode16!(sha) == :crypto.hash(:sha256, archive) do
{:ok, archive}
else
if Base.decode16!(sha) == :crypto.hash(:sha256, archive) do
{:ok, archive}
else
@@
-617,7
+617,7
@@
defmodule Pleroma.Emoji.Pack do
end
defp update_sha_and_save_metadata(pack, data) do
end
defp update_sha_and_save_metadata(pack, data) do
- with {:ok, %{body: zip}} <-
Tesla
.get(data[:"fallback-src"]),
+ with {:ok, %{body: zip}} <-
Pleroma.HTTP
.get(data[:"fallback-src"]),
:ok <- validate_has_all_files(pack, zip) do
fallback_sha = :sha256 |> :crypto.hash(zip) |> Base.encode16()
:ok <- validate_has_all_files(pack, zip) do
fallback_sha = :sha256 |> :crypto.hash(zip) |> Base.encode16()