added code\path fields without html tags in ets

lib/pleroma/emoji/loader.ex

@@ -78,7 +78,17 @@ defmodule Pleroma.Emoji.Loader do
          load_from_globs(shortcode_globs, emoji_groups))
       |> Enum.reject(fn value -> value == nil end)
 
-    emojis ++ emojis_txt
+    Enum.map(emojis ++ emojis_txt, &prepare_emoji/1)
+  end
+
+  defp prepare_emoji({code, file, tags} = _emoji) do
+    {
+      code,
+      file,
+      tags,
+      Pleroma.HTML.strip_tags(code),
+      Pleroma.HTML.strip_tags(file)
+    }
   end
 
   defp load_pack(pack_dir, emoji_groups) do

lib/pleroma/formatter.ex

@@ -107,19 +107,22 @@ defmodule Pleroma.Formatter do
   def emojify(text, nil), do: text
 
   def emojify(text, emoji, strip \\ false) do
-    Enum.reduce(emoji, text, fn emoji_data, text ->
+    Enum.reduce(emoji, text, fn
+      {_, _, _, emoji, file}, text ->
+        String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip))
+
+      emoji_data, text ->
         emoji = HTML.strip_tags(elem(emoji_data, 0))
         file = HTML.strip_tags(elem(emoji_data, 1))
-
+        String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip))
-      html =
+    end)
-        if not strip do
+    |> HTML.filter_tags()
-          "<img class='emoji' alt='#{emoji}' title='#{emoji}' src='#{MediaProxy.url(file)}' />"
-        else
-          ""
   end
 
-      String.replace(text, ":#{emoji}:", html) |> HTML.filter_tags()
+  defp prepare_emoji_html(_emoji, _file, true), do: ""
-    end)
+
+  defp prepare_emoji_html(emoji, file, _strip) do
+    "<img class='emoji' alt='#{emoji}' title='#{emoji}' src='#{MediaProxy.url(file)}' />"
   end
 
   def demojify(text) do
@@ -130,7 +133,9 @@ defmodule Pleroma.Formatter do
 
   @doc "Outputs a list of the emoji-shortcodes in a text"
   def get_emoji(text) when is_binary(text) do
-    Enum.filter(Emoji.get_all(), fn {emoji, _, _} -> String.contains?(text, ":#{emoji}:") end)
+    Enum.filter(Emoji.get_all(), fn {emoji, _, _, _, _} ->
+      String.contains?(text, ":#{emoji}:")
+    end)
   end
 
   def get_emoji(_), do: []
@@ -138,7 +143,7 @@ defmodule Pleroma.Formatter do
   @doc "Outputs a list of the emoji-Maps in a text"
   def get_emoji_map(text) when is_binary(text) do
     get_emoji(text)
-    |> Enum.reduce(%{}, fn {name, file, _group}, acc ->
+    |> Enum.reduce(%{}, fn {name, file, _group, _, _}, acc ->
       Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}")
     end)
   end

lib/pleroma/web/common_api/utils.ex

@@ -435,7 +435,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
 
   def emoji_from_profile(%{info: _info} = user) do
     (Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
-    |> Enum.map(fn {shortcode, url, _} ->
+    |> Enum.map(fn {shortcode, url, _, _, _} ->
       %{
         "type" => "Emoji",
         "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"},

lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex

@@ -331,7 +331,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
 
   defp mastodonized_emoji do
     Pleroma.Emoji.get_all()
-    |> Enum.map(fn {shortcode, relative_url, tags} ->
+    |> Enum.map(fn {shortcode, relative_url, tags, _, _} ->
       url = to_string(URI.merge(Web.base_url(), relative_url))
 
       %{

lib/pleroma/web/twitter_api/controllers/util_controller.ex

@@ -240,7 +240,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
   def emoji(conn, _params) do
     emoji =
       Emoji.get_all()
-      |> Enum.map(fn {short_code, path, tags} ->
+      |> Enum.map(fn {short_code, path, tags, _, _} ->
         {short_code, %{image_url: path, tags: tags}}
       end)
       |> Enum.into(%{})

test/emoji_test.exs

@@ -14,9 +14,9 @@ defmodule Pleroma.EmojiTest do
 
     test "first emoji", %{emoji_list: emoji_list} do
       [emoji | _others] = emoji_list
-      {code, path, tags} = emoji
+      {code, path, tags, _, _} = emoji
 
-      assert tuple_size(emoji) == 3
+      assert tuple_size(emoji) == 5
       assert is_binary(code)
       assert is_binary(path)
       assert is_list(tags)
@@ -24,9 +24,9 @@ defmodule Pleroma.EmojiTest do
 
     test "random emoji", %{emoji_list: emoji_list} do
       emoji = Enum.random(emoji_list)
-      {code, path, tags} = emoji
+      {code, path, tags, _, _} = emoji
 
-      assert tuple_size(emoji) == 3
+      assert tuple_size(emoji) == 5
       assert is_binary(code)
       assert is_binary(path)
       assert is_list(tags)

test/formatter_test.exs

@@ -217,22 +217,6 @@ defmodule Pleroma.FormatterTest do
 
       assert expected_text =~ "how are you doing?"
     end
-  end
-
-  describe ".parse_tags" do
-    test "parses tags in the text" do
-      text = "Here's a #Test. Maybe these are #working or not. What about #漢字? And #は｡"
-
-      expected_tags = [
-        {"#Test", "test"},
-        {"#working", "working"},
-        {"#は", "は"},
-        {"#漢字", "漢字"}
-      ]
-
-      assert {_text, [], ^expected_tags} = Formatter.linkify(text)
-    end
-  end
 
     test "it can parse mentions and return the relevant users" do
       text =
@@ -254,7 +238,24 @@ defmodule Pleroma.FormatterTest do
 
       assert {_text, ^expected_mentions, []} = Formatter.linkify(text)
     end
+  end
 
+  describe ".parse_tags" do
+    test "parses tags in the text" do
+      text = "Here's a #Test. Maybe these are #working or not. What about #漢字? And #は｡"
+
+      expected_tags = [
+        {"#Test", "test"},
+        {"#working", "working"},
+        {"#は", "は"},
+        {"#漢字", "漢字"}
+      ]
+
+      assert {_text, [], ^expected_tags} = Formatter.linkify(text)
+    end
+  end
+
+  describe "emojify" do
     test "it adds cool emoji" do
       text = "I love :firefox:"
 
@@ -278,12 +279,14 @@ defmodule Pleroma.FormatterTest do
 
       assert Formatter.emojify(text, custom_emoji) == expected_result
     end
+  end
 
+  describe "get_emoji" do
     test "it returns the emoji used in the text" do
       text = "I love :firefox:"
 
       assert Formatter.get_emoji(text) == [
-             {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"]}
+               {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"], "firefox", "/emoji/Firefox.gif"}
              ]
     end
 
@@ -296,6 +299,7 @@ defmodule Pleroma.FormatterTest do
       text = nil
       assert Formatter.get_emoji(text) == []
     end
+  end
 
   test "it escapes HTML in plain text" do
     text = "hello & world google.com/?a=b&c=d \n http://test.com/?a=b&c=d 1"