X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=b7513ef284991428881ec2297cfb8cc74466623e;hb=a3a9cec4835738216800d2cebd295fb8dbf10f34;hp=20123854d5b922b0fc276bfc100cad1488d47344;hpb=c3ac9424d2affe87df82c14dc243f507fa639343;p=akkoma

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 20123854d..b7513ef28 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -6,14 +6,14 @@ defmodule Pleroma.Web.CommonAPI.Utils do
   alias Calendar.Strftime
   alias Comeonin.Pbkdf2
   alias Pleroma.Activity
+  alias Pleroma.Config
   alias Pleroma.Formatter
   alias Pleroma.Object
   alias Pleroma.Repo
   alias Pleroma.User
-  alias Pleroma.Config
+  alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.MediaProxy
-  alias Pleroma.Web.ActivityPub.Utils
 
   # This is a hack for twidere.
   def get_by_id_or_ap_id(id) do
@@ -186,9 +186,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     options = Keyword.put(options, :mentions_escape, true)
 
     text
-    |> Formatter.html_escape("text/html")
     |> Formatter.linkify(options)
     |> (fn {text, mentions, tags} -> {Earmark.as_html!(text), mentions, tags} end).()
+    |> Formatter.html_escape("text/html")
   end
 
   def make_note_data(