aboutsummaryrefslogtreecommitdiff
path: root/lib/mix
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mix')
-rw-r--r--lib/mix/tasks/pleroma/emoji.ex14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex
index 0a1bf24e2..02cfaa774 100644
--- a/lib/mix/tasks/pleroma/emoji.ex
+++ b/lib/mix/tasks/pleroma/emoji.ex
@@ -137,11 +137,8 @@ defmodule Mix.Tasks.Pleroma.Emoji do
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
- static_path = Path.join(:code.priv_dir(:pleroma), "static")
-
pack_path =
Path.join([
- static_path,
Pleroma.Config.get!([:instance, :static_dir]),
"emoji",
pack_name
@@ -161,19 +158,12 @@ defmodule Mix.Tasks.Pleroma.Emoji do
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 =
Enum.map(
files,
fn {shortcode, path} ->
- "#{shortcode}, #{Path.join(common_pack_path, path)}"
+ emojo_path = Path.join("/emoji/#{pack_name}", path)
+ "#{shortcode}, #{emojo_path}"
end
)
|> Enum.join("\n")