Assume packs without emoji.txt only have emoji pictures, unhardcode
unhardcode: remove hardcoded /instance/static and actually use the config option as it is used in other places. packs without emoji.txt: these are now assumed to have .png files that are all emojis, their names are used as shortcodes
This commit is contained in:
parent
eff725c3af
commit
a141f0807b
|
@ -100,8 +100,8 @@
|
||||||
shortcode_globs: ["/emoji/custom/**/*.png"],
|
shortcode_globs: ["/emoji/custom/**/*.png"],
|
||||||
groups: [
|
groups: [
|
||||||
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
|
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
|
||||||
Finmoji: ["/finmoji/128px/*-128.png", "/instance/static/emoji/finmoji/128px/*-128.png"],
|
Finmoji: ["/finmoji/128px/*-128.png"],
|
||||||
Custom: ["/emoji/*.png", "/emoji/custom/*.png", "/instance/static/emoji/**/*.png"]
|
Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
|
||||||
]
|
]
|
||||||
|
|
||||||
config :pleroma, :uri_schemes,
|
config :pleroma, :uri_schemes,
|
||||||
|
|
|
@ -115,11 +115,14 @@ def run(["get-packs" | args]) do
|
||||||
|
|
||||||
IO.puts(IO.ANSI.format(["Writing emoji.txt for ", :bright, pack_name]))
|
IO.puts(IO.ANSI.format(["Writing emoji.txt for ", :bright, pack_name]))
|
||||||
|
|
||||||
|
common_pack_path = Path.join([
|
||||||
|
"/", Pleroma.Config.get!([:instance, :static_dir]), "emoji", pack_name
|
||||||
|
])
|
||||||
emoji_txt_str =
|
emoji_txt_str =
|
||||||
Enum.map(
|
Enum.map(
|
||||||
files,
|
files,
|
||||||
fn {shortcode, path} ->
|
fn {shortcode, path} ->
|
||||||
"#{shortcode}, /instance/static/emoji/#{pack_name}/#{path}"
|
"#{shortcode}, #{Path.join(common_pack_path, path)}"
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
|> Enum.join("\n")
|
|> Enum.join("\n")
|
||||||
|
@ -182,11 +185,8 @@ def run(["gen-pack", src]) do
|
||||||
cwd: tmp_pack_dir
|
cwd: tmp_pack_dir
|
||||||
)
|
)
|
||||||
|
|
||||||
emoji_map =
|
emoji_map = Pleroma.Emoji.make_shortcode_to_file_map(tmp_pack_dir, exts)
|
||||||
find_all_emoji(tmp_pack_dir, exts) |>
|
|
||||||
Enum.map(&Path.relative_to(&1, tmp_pack_dir)) |>
|
|
||||||
Enum.map(fn f -> {f |> Path.basename() |> Path.rootname(), f} end) |>
|
|
||||||
Enum.into(%{})
|
|
||||||
|
|
||||||
File.write!(files_name, Poison.encode!(emoji_map, pretty: true))
|
File.write!(files_name, Poison.encode!(emoji_map, pretty: true))
|
||||||
|
|
||||||
|
@ -219,21 +219,6 @@ def run(["gen-pack", src]) do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
defp find_all_emoji(dir, exts) do
|
|
||||||
Enum.reduce(
|
|
||||||
File.ls!(dir),
|
|
||||||
[],
|
|
||||||
fn f, acc ->
|
|
||||||
filepath = Path.join(dir, f)
|
|
||||||
if File.dir?(filepath) do
|
|
||||||
acc ++ find_all_emoji(filepath, exts)
|
|
||||||
else
|
|
||||||
acc ++ [filepath]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
) |> Enum.filter(fn f -> Path.extname(f) in exts end)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp fetch_manifest(from) do
|
defp fetch_manifest(from) do
|
||||||
Tesla.get!(from).body |> Poison.decode!()
|
Tesla.get!(from).body |> Poison.decode!()
|
||||||
end
|
end
|
||||||
|
|
|
@ -108,13 +108,13 @@ defp load do
|
||||||
shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
|
shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
|
||||||
|
|
||||||
emojis =
|
emojis =
|
||||||
(Enum.flat_map(
|
(Enum.flat_map(
|
||||||
packs,
|
packs,
|
||||||
fn pack -> load_from_file(Path.join([emoji_dir_path, pack, "emoji.txt"])) end
|
fn pack -> load_pack(Path.join(emoji_dir_path, pack)) end
|
||||||
) ++
|
) ++
|
||||||
load_from_file("config/emoji.txt") ++
|
load_from_file("config/emoji.txt") ++
|
||||||
load_from_file("config/custom_emoji.txt") ++
|
load_from_file("config/custom_emoji.txt") ++
|
||||||
load_from_globs(shortcode_globs))
|
load_from_globs(shortcode_globs))
|
||||||
|> Enum.reject(fn value -> value == nil end)
|
|> Enum.reject(fn value -> value == nil end)
|
||||||
|
|
||||||
true = :ets.insert(@ets, emojis)
|
true = :ets.insert(@ets, emojis)
|
||||||
|
@ -123,6 +123,50 @@ defp load do
|
||||||
:ok
|
:ok
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp load_pack(pack_dir) do
|
||||||
|
pack_name = Path.basename(pack_dir)
|
||||||
|
|
||||||
|
emoji_txt = Path.join(pack_dir, "emoji.txt")
|
||||||
|
if File.exists?(emoji_txt) do
|
||||||
|
load_from_file(emoji_txt)
|
||||||
|
else
|
||||||
|
Logger.info("No emoji.txt found for pack \"#{pack_name}\", assuming all .png files are emoji")
|
||||||
|
|
||||||
|
common_pack_path = Path.join([
|
||||||
|
"/", Pleroma.Config.get!([:instance, :static_dir]), "emoji", pack_name
|
||||||
|
])
|
||||||
|
make_shortcode_to_file_map(pack_dir, [".png"]) |>
|
||||||
|
Enum.map(fn {shortcode, rel_file} ->
|
||||||
|
filename = Path.join(common_pack_path, rel_file)
|
||||||
|
|
||||||
|
# If no tag matches, use the pack name as a tag
|
||||||
|
{shortcode, filename, to_string(match_extra(@groups, filename))}
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def make_shortcode_to_file_map(pack_dir, exts) do
|
||||||
|
find_all_emoji(pack_dir, exts) |>
|
||||||
|
Enum.map(&Path.relative_to(&1, pack_dir)) |>
|
||||||
|
Enum.map(fn f -> {f |> Path.basename() |> Path.rootname(), f} end) |>
|
||||||
|
Enum.into(%{})
|
||||||
|
end
|
||||||
|
|
||||||
|
def find_all_emoji(dir, exts) do
|
||||||
|
Enum.reduce(
|
||||||
|
File.ls!(dir),
|
||||||
|
[],
|
||||||
|
fn f, acc ->
|
||||||
|
filepath = Path.join(dir, f)
|
||||||
|
if File.dir?(filepath) do
|
||||||
|
acc ++ find_all_emoji(filepath, exts)
|
||||||
|
else
|
||||||
|
acc ++ [filepath]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
) |> Enum.filter(fn f -> Path.extname(f) in exts end)
|
||||||
|
end
|
||||||
|
|
||||||
defp load_from_file(file) do
|
defp load_from_file(file) do
|
||||||
if File.exists?(file) do
|
if File.exists?(file) do
|
||||||
load_from_file_stream(File.stream!(file))
|
load_from_file_stream(File.stream!(file))
|
||||||
|
|
Loading…
Reference in New Issue