X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=2b359dd7256a27e5a80c7bb32331d6054aa9facf;hb=af854f7e01efa24d57b68283a9884d3fc80d6438;hp=2d9fdaf6c0e32ede50db7bfeb68d356beb91eace;hpb=5436dbaeaf0765c5d651cd16b02018edbc6793d4;p=akkoma

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 2d9fdaf6c..2b359dd72 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -62,8 +62,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
   end
 
   def format_input(text, mentions, _tags) do
-    Phoenix.HTML.html_escape(text)
-    |> elem(1)
+    text
+    |> Formatter.html_escape
     |> Formatter.linkify
     |> String.replace("\n", "<br>")
     |> add_user_links(mentions)
@@ -95,7 +95,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
 
     Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
       short_match = String.split(match, "@") |> tl() |> hd()
-      String.replace(text, uuid, "<a href='#{ap_id}'>@#{short_match}</a>")
+      String.replace(text, uuid, "<span><a href='#{ap_id}'>@<span>#{short_match}</span></a></span>")
     end)
   end