diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-29 15:35:42 +0400 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-29 15:35:42 +0400 |
commit | fa902867c07212a7d2936a953037c22a40cda51e (patch) | |
tree | e324c9afc7651ee6f79f6718d7b46b09b1ed20be /lib/pleroma/web/common_api/utils.ex | |
parent | 76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f (diff) | |
parent | 0e0a6aef70fc0cac1f9176e4f50a7fe4930242fa (diff) | |
download | pleroma-fa902867c07212a7d2936a953037c22a40cda51e.tar.gz |
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 21f4d43e9..3b71adf0e 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -274,7 +274,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do def format_input(text, format, options \\ []) @doc """ - Formatting text to plain text. + Formatting text to plain text, BBCode, HTML, or Markdown """ def format_input(text, "text/plain", options) do text @@ -285,9 +285,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do end).() end - @doc """ - Formatting text as BBCode. - """ def format_input(text, "text/bbcode", options) do text |> String.replace(~r/\r/, "") @@ -297,18 +294,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do |> Formatter.linkify(options) end - @doc """ - Formatting text to html. - """ def format_input(text, "text/html", options) do text |> Formatter.html_escape("text/html") |> Formatter.linkify(options) end - @doc """ - Formatting text to markdown. - """ def format_input(text, "text/markdown", options) do text |> Formatter.mentions_escape(options) |