hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change YAML to JSON

Browse source
This commit is contained in:
Ekaterina Vaartis 2019-08-15 11:39:39 +03:00
commit 2a94eca096
9 changed files with 58 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/emoji.ex
View file

@ -146,12 +146,12 @@ defmodule Pleroma.Emoji do
defp load_pack(pack_dir, emoji_groups) do
pack_name = Path.basename(pack_dir)
pack_yaml = Path.join(pack_dir, "pack.yml")
pack_file = Path.join(pack_dir, "pack.json")
if File.exists?(pack_yaml) do
yaml = RelaxYaml.Decoder.read_from_file(pack_yaml)
if File.exists?(pack_file) do
contents = Jason.decode!(File.read!(pack_file))
yaml["files"]
contents["files"]
|> Enum.map(fn {name, rel_file} ->
filename = Path.join("/emoji/#{pack_name}", rel_file)
{name, filename, pack_name}