From 53a3e61016592b25cca4876c4f8f7be8aa6efa9b Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sat, 20 Apr 2019 15:06:56 +0300
Subject: [PATCH] Fix priv/static/instance/static to be just instance/static

It was a misunderstanding
---
 lib/mix/tasks/pleroma/emoji.ex | 14 ++------------
 lib/pleroma/emoji.ex           | 25 +++++++------------------
 2 files changed, 9 insertions(+), 30 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")
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 15455b779..169094438 100644
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -81,14 +81,11 @@ defmodule Pleroma.Emoji do
   end
 
   defp load do
-    static_path = Path.join(:code.priv_dir(:pleroma), "static")
-
     emoji_dir_path =
-      Path.join([
-        static_path,
+      Path.join(
         Pleroma.Config.get!([:instance, :static_dir]),
         "emoji"
-      ])
+      )
 
     case File.ls(emoji_dir_path) do
       {:error, :enoent} ->
@@ -135,20 +132,12 @@ defmodule Pleroma.Emoji do
         "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("/emoji/#{pack_name}", rel_file)
 
-      make_shortcode_to_file_map(pack_dir, [".png"])
-      |> Enum.map(fn {shortcode, rel_file} ->
-        filename = Path.join(common_pack_path, rel_file)
-
-        {shortcode, filename, [to_string(match_extra(@groups, filename))]}
-      end)
+          {shortcode, filename, [to_string(match_extra(@groups, filename))]}
+        end)
     end
   end