aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEkaterina Vaartis <vaartis@cock.li>2019-04-18 20:06:59 +0300
committerEkaterina Vaartis <vaartis@cock.li>2019-04-20 11:17:17 +0300
commit98d4b3de53a5eaf412e3b200d4f0ed04c9c4622d (patch)
treee4e25128d3044b1dc30e9f1d4e55e1f00a562bfa /lib
parentaaaa428512db8ace56ca5ab7ebf1488d64ac5e35 (diff)
downloadpleroma-98d4b3de53a5eaf412e3b200d4f0ed04c9c4622d.tar.gz
Treat the manifest path as a file if it doesn't start with http
Diffstat (limited to 'lib')
-rw-r--r--lib/mix/tasks/pleroma/emoji.ex8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex
index fed3dcb40..9cb6fb88d 100644
--- a/lib/mix/tasks/pleroma/emoji.ex
+++ b/lib/mix/tasks/pleroma/emoji.ex
@@ -231,7 +231,13 @@ defmodule Mix.Tasks.Pleroma.Emoji do
end
defp fetch_manifest(from) do
- Tesla.get!(from).body |> Poison.decode!()
+ Poison.decode!(
+ if String.starts_with?(from, "http") do
+ Tesla.get!(from).body
+ else
+ File.read!(from)
+ end
+ )
end
defp parse_global_opts(args) do