projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/object-pruning' into 'develop'
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
emoji.ex
diff --git
a/lib/mix/tasks/pleroma/emoji.ex
b/lib/mix/tasks/pleroma/emoji.ex
index 5cb54c3ca01b11cb568c279bebe96f6863b9ab5a..d2ddf450aeb58f89b4c03fb99c5fe4ec66c38701 100644
(file)
--- a/
lib/mix/tasks/pleroma/emoji.ex
+++ b/
lib/mix/tasks/pleroma/emoji.ex
@@
-137,7
+137,7
@@
defmodule Mix.Tasks.Pleroma.Emoji do
])
)
])
)
- files = Tesla.get!(client(), files_url).body |>
Poi
son.decode!()
+ files = Tesla.get!(client(), files_url).body |>
Ja
son.decode!()
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
@@
-239,7
+239,7
@@
defmodule Mix.Tasks.Pleroma.Emoji do
emoji_map = Pleroma.Emoji.make_shortcode_to_file_map(tmp_pack_dir, exts)
emoji_map = Pleroma.Emoji.make_shortcode_to_file_map(tmp_pack_dir, exts)
- File.write!(files_name,
Poi
son.encode!(emoji_map, pretty: true))
+ File.write!(files_name,
Ja
son.encode!(emoji_map, pretty: true))
IO.puts("""
IO.puts("""
@@
-248,11
+248,11
@@
defmodule Mix.Tasks.Pleroma.Emoji do
""")
if File.exists?("index.json") do
""")
if File.exists?("index.json") do
- existing_data = File.read!("index.json") |>
Poi
son.decode!()
+ existing_data = File.read!("index.json") |>
Ja
son.decode!()
File.write!(
"index.json",
File.write!(
"index.json",
-
Poi
son.encode!(
+
Ja
son.encode!(
Map.merge(
existing_data,
pack_json
Map.merge(
existing_data,
pack_json
@@
-263,14
+263,14
@@
defmodule Mix.Tasks.Pleroma.Emoji do
IO.puts("index.json file has been update with the #{name} pack")
else
IO.puts("index.json file has been update with the #{name} pack")
else
- File.write!("index.json",
Poi
son.encode!(pack_json, pretty: true))
+ File.write!("index.json",
Ja
son.encode!(pack_json, pretty: true))
IO.puts("index.json has been created with the #{name} pack")
end
end
defp fetch_manifest(from) do
IO.puts("index.json has been created with the #{name} pack")
end
end
defp fetch_manifest(from) do
-
Poi
son.decode!(
+
Ja
son.decode!(
if String.starts_with?(from, "http") do
Tesla.get!(client(), from).body
else
if String.starts_with?(from, "http") do
Tesla.get!(client(), from).body
else