Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'

[akkoma] / lib / pleroma / web / common_api / utils.ex

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 8f2625cefc2bdffe39fb18e322ac81231cb7bc08..142283684b4d176448edd7605c8bae7eb7b79b0f 100644 (file)
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -1,11 +1,12 @@
 defmodule Pleroma.Web.CommonAPI.Utils do
-  alias Pleroma.{Repo, Object, Formatter, Activity}
+  alias Calendar.Strftime
+  alias Comeonin.Pbkdf2
+  alias Pleroma.{Activity, Formatter, Object, Repo}
+  alias Pleroma.User
+  alias Pleroma.Web
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.MediaProxy
-  alias Pleroma.User
-  alias Calendar.Strftime
-  alias Comeonin.Pbkdf2
 
   # This is a hack for twidere.
   def get_by_id_or_ap_id(id) do
@@ -111,6 +112,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     Enum.join([text | attachment_text], "<br>")
   end
 
+  @doc """
+  Formatting text to plain text.
+  """
   def format_input(text, mentions, tags, "text/plain") do
     text
     |> Formatter.html_escape("text/plain")
@@ -122,6 +126,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Formatter.finalize()
   end
 
+  @doc """
+  Formatting text to html.
+  """
   def format_input(text, mentions, _tags, "text/html") do
     text
     |> Formatter.html_escape("text/html")
@@ -131,8 +138,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Formatter.finalize()
   end
 
+  @doc """
+  Formatting text to markdown.
+  """
   def format_input(text, mentions, tags, "text/markdown") do
     text
+    |> Formatter.mentions_escape(mentions)
     |> Earmark.as_html!()
     |> Formatter.html_escape("text/html")
     |> String.replace(~r/\r?\n/, "")
@@ -148,7 +159,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
       |> Enum.sort_by(fn {tag, _} -> -String.length(tag) end)
 
     Enum.reduce(tags, text, fn {full, tag}, text ->
-      url = "<a href='#{Pleroma.Web.base_url()}/tag/#{tag}' rel='tag'>##{tag}</a>"
+      url = "<a href='#{Web.base_url()}/tag/#{tag}' rel='tag'>##{tag}</a>"
       String.replace(text, full, url)
     end)
   end