Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / lib / pleroma / emoji.ex

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index c7620b57358e6a6b75c53c07f368310d5ab99943..6390cce4c5ff13a00569d7c5eabb85a5fe00475f 100644 (file)
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -6,7 +6,7 @@ defmodule Pleroma.Emoji do
   @moduledoc """
   The emojis are loaded from:
 
-    * the built-in Finmojis (if enabled in configuration),
+    * emoji packs in INSTANCE-DIR/emoji
     * the files: `config/emoji.txt` and `config/custom_emoji.txt`
     * glob paths, nested folder is used as tag name for grouping e.g. priv/static/emoji/custom/nested_folder
 
@@ -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} ->
@@ -104,22 +101,27 @@ defmodule Pleroma.Emoji do
         # Print the packs we've found
         Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}")
 
-        # compat thing for old custom emoji handling
-        shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
-
         emojis =
-        (Enum.flat_map(
-              packs,
-              fn pack -> load_pack(Path.join(emoji_dir_path, pack)) end
-            ) ++
-          load_from_file("config/emoji.txt") ++
-          load_from_file("config/custom_emoji.txt") ++
-          load_from_globs(shortcode_globs))
-          |> Enum.reject(fn value -> value == nil end)
+          Enum.flat_map(
+            packs,
+            fn pack -> load_pack(Path.join(emoji_dir_path, pack)) end
+          )
 
         true = :ets.insert(@ets, emojis)
     end
 
+    # Compat thing for old custom emoji handling & default emoji,
+    # it should run even if there are no emoji packs
+    shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
+
+    emojis =
+      (load_from_file("config/emoji.txt") ++
+         load_from_file("config/custom_emoji.txt") ++
+         load_from_globs(shortcode_globs))
+      |> Enum.reject(fn value -> value == nil end)
+
+    true = :ets.insert(@ets, emojis)
+
     :ok
   end
 
@@ -127,29 +129,28 @@ defmodule Pleroma.Emoji 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")
+      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)
+      make_shortcode_to_file_map(pack_dir, [".png"])
+      |> Enum.map(fn {shortcode, rel_file} ->
+        filename = Path.join("/emoji/#{pack_name}", rel_file)
 
-          # If no tag matches, use the pack name as a tag
-          {shortcode, filename, to_string(match_extra(@groups, filename))}
-        end)
+        {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(%{})
+    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
@@ -158,13 +159,15 @@ defmodule Pleroma.Emoji do
       [],
       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)
+    )
+    |> Enum.filter(fn f -> Path.extname(f) in exts end)
   end
 
   defp load_from_file(file) do
@@ -180,11 +183,11 @@ defmodule Pleroma.Emoji do
     |> Stream.map(&String.trim/1)
     |> Stream.map(fn line ->
       case String.split(line, ~r/,\s*/) do
-        [name, file, tags] ->
-          {name, file, tags}
-
         [name, file] ->
-          {name, file, to_string(match_extra(@groups, file))}
+          {name, file, [to_string(match_extra(@groups, file))]}
+
+        [name, file | tags] ->
+          {name, file, tags}
 
         _ ->
           nil
@@ -207,7 +210,7 @@ defmodule Pleroma.Emoji do
       tag = match_extra(@groups, Path.join("/", Path.relative_to(path, static_path)))
       shortcode = Path.basename(path, Path.extname(path))
       external_path = Path.join("/", Path.relative_to(path, static_path))
-      {shortcode, external_path, to_string(tag)}
+      {shortcode, external_path, [to_string(tag)]}
     end)
   end