diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-11-02 17:17:22 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-11-02 17:17:22 +0300 |
commit | d51b8b2d82f2812b4d4e52c30970eb51f57e4326 (patch) | |
tree | 7035176b8f67d43ea7ae0e69b4471cc9d2df0e68 /lib/pleroma/web/common_api/utils.ex | |
parent | 3607e453e47884f59d24b0c54f3172ff854e7d87 (diff) | |
parent | 24ce3249736c96686c00a10abe47659579535259 (diff) | |
download | pleroma-d51b8b2d82f2812b4d4e52c30970eb51f57e4326.tar.gz |
Merge branch 'develop' into issue/2205
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) |