diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/formatter.ex | 23 | 
1 files changed, 22 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index df7ffbc41..0aaf21538 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -116,7 +116,28 @@ defmodule Pleroma.Formatter do                        _ -> []                      end) -  @emoji @finmoji_with_filenames ++ @emoji_from_file +  @emoji_from_globs ( +                      static_path = Path.join(:code.priv_dir(:pleroma), "static") + +                      globs = +                        Application.get_env(:pleroma, :emoji, []) +                        |> Keyword.get(:shortcode_globs, []) + +                      paths = +                        Enum.map(globs, fn glob -> +                          Path.join(static_path, glob) +                          |> Path.wildcard() +                        end) +                        |> Enum.concat() + +                      Enum.map(paths, fn path -> +                        shortcode = Path.basename(path, Path.extname(path)) +                        external_path = Path.join("/", Path.relative_to(path, static_path)) +                        {shortcode, external_path} +                      end) +                    ) + +  @emoji @finmoji_with_filenames ++ @emoji_from_globs ++ @emoji_from_file    def emojify(text, emoji \\ @emoji)    def emojify(text, nil), do: text  | 
